Changeset 843e2a8 for apps/ministreaming


Ignore:
Timestamp:
Oct 9, 2015 10:17:03 AM (5 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
bb56a11
Parents:
45fe238 (diff), 419d6a8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head 4a63eba1606a8ba2448352876b4177d9e4c753a1)

to branch 'i2p.i2p.unittests' (head 051ea486db9f6f5a4327038827763f350369f932)

Location:
apps/ministreaming
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • apps/ministreaming/java/bundle-messages.sh

    r45fe238 r843e2a8  
    3131fi
    3232# Fast mode - update ondemond
    33 # set LG2 to the language you need in envrionment varibales to enable this
     33# set LG2 to the language you need in environment variables to enable this
    3434
    3535# add ../java/ so the refs will work in the po file
     
    6464                # extract strings from java and jsp files, and update messages.po files
    6565                # translate calls must be one of the forms:
    66                 # _("foo")
     66                # _t("foo")
    6767                # _x("foo")
    6868                # To start a new translation, copy the header from an old translation to the new .po file,
     
    7070                find $JPATHS -name *.java > $TMPFILE
    7171                xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\
    72                          --keyword=_ --keyword=_x \
     72                         --keyword=_t --keyword=_x \
    7373                         -o ${i}t
    7474                if [ $? -ne 0 ]
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketException.java

    r45fe238 r843e2a8  
    125125            default:
    126126                // Translate this one here, can't do it later
    127                 return _("Failure code") + ": " + _status;
     127                return _t("Failure code") + ": " + _status;
    128128        }
    129129    }
     
    137137        if (s == null)
    138138            return null;
    139         return _(s);
     139        return _t(s);
    140140    }
    141141
     
    143143     *  Translate
    144144     */
    145     private static String _(String s) {
     145    private static String _t(String s) {
    146146        return Translate.getString(s, I2PAppContext.getGlobalContext(), BUNDLE_NAME);
    147147    }
  • apps/ministreaming/locale/messages_uk.po

    r45fe238 r843e2a8  
    55#
    66# Translators:
     7# Denis Lysenko <gribua@gmail.com>, 2015
    78# madjong <madjong@i2pmail.org>, 2015
    89# puxud <puxud@alivance.com>, 2014
     
    1213"Report-Msgid-Bugs-To: \n"
    1314"POT-Creation-Date: 2015-03-29 14:30+0000\n"
    14 "PO-Revision-Date: 2015-04-10 13:47+0000\n"
    15 "Last-Translator: madjong <madjong@i2pmail.org>\n"
    16 "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n"
     15"PO-Revision-Date: 2015-08-07 17:12+0000\n"
     16"Last-Translator: Denis Lysenko <gribua@gmail.com>\n"
     17"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n"
    1718"MIME-Version: 1.0\n"
    1819"Content-Type: text/plain; charset=UTF-8\n"
     
    2324#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:69
    2425msgid "Message timeout"
    25 msgstr ""
     26msgstr "Тайм-аут повідомлення"
    2627
    2728#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:72
    2829msgid "Failed delivery to local destination"
    29 msgstr ""
     30msgstr "Не вдалось доставити до локального призначення"
    3031
    3132#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:75
     
    5253#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:90
    5354msgid "Buffer overflow"
    54 msgstr ""
     55msgstr "Буфер заповнено"
    5556
    5657#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:93
    5758msgid "Message expired"
    58 msgstr ""
     59msgstr "Повідомлення застаріло"
    5960
    6061#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:96
Note: See TracChangeset for help on using the changeset viewer.