/pidgin/main: de23d621fc5c: Merge release-2.x.y branch into defa...
Mark Doliner
mark at kingant.net
Thu Feb 6 03:48:53 EST 2014
Changeset: de23d621fc5c4998fe5d6c95b0be535d8a160937
Author: Mark Doliner <mark at kingant.net>
Date: 2014-02-06 00:48 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/de23d621fc5c
Description:
Merge release-2.x.y branch into default.
Easy manual merges in gtkdialogs.c and po/README
diffstat:
configure.ac | 2 +-
pidgin/gtkdialogs.c | 6 +-
po/README | 2 +-
po/hy.po | 14192 --------------------------------------------------
po/lo.po | 14191 -------------------------------------------------
po/ms_MY.po | 14153 -------------------------------------------------
6 files changed, 5 insertions(+), 42541 deletions(-)
diffs (truncated from 42618 to 300 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,7 @@ if test x$enable_i18n = xyes; then
GETTEXT_PACKAGE=pidgin
AC_SUBST(GETTEXT_PACKAGE)
- ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu hy id it ja ka kk km kn ko ku lo lt mai mhr mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ ALL_LINGUAS="af am ar ast az be at latin bg bn bn_IN bs ca ca at valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id it ja ka kk km kn ko ku lt mai mhr mk mn mr my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr at latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
AM_GLIB_GNU_GETTEXT
dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -201,7 +201,6 @@ static const struct translator translato
{NULL, NULL, "Rajesh Ranjan", "rajeshkajha at yahoo.com"},
{N_("Croatian"), "hr", "Sabina Drempetić", "bina91991 at googlemail.com"},
{N_("Hungarian"), "hu", "Kelemen Gábor", "kelemeng at gnome.hu"},
- {N_("Armenian"), "hy", "David Avsharyan", "avsharyan at gmail.com"},
{N_("Indonesian"), "id", "Rai S. Regawa", "raireg at yahoo.com"},
{N_("Italian"), "it", "Claudio Satriano", "satriano at gmail.com"},
{N_("Japanese"), "ja", "Takayuki Kusano", "AE5T-KSN at asahi-net.or.jp"},
@@ -213,7 +212,6 @@ static const struct translator translato
{N_("Kurdish"), "ku", "Amed Ç. Jiyan", "amedcj at hotmail.com"},
{NULL, NULL, "Erdal Ronahi", "erdal.ronahi at gmail.com"},
{NULL, NULL, "Rizoyê Xerzî", "rizoxerzi at hotmail.com"},
- {N_("Lao"), "lo", "Anousak Souphavah", "anousak at gmail.com"},
{N_("Lithuanian"), "lt", "Algimantas MargeviÄius", "margevicius.algimantas at gmail.com"},
{N_("Maithili"), "mai", "Sangeeta Kumari", "sangeeta_0975 at yahoo.com"},
{NULL, NULL, "Rajesh Ranjan", "rajeshkajha at yahoo.com"},
@@ -224,7 +222,6 @@ static const struct translator translato
{N_("Malayalam"), "ml", "Ani Peter", "apeter at redhat.com"},
{N_("Mongolian"), "mn", "gooyo", NULL},
{N_("Marathi"), "mr", "Sandeep Shedmake", "sandeep.shedmake at gmail.com"},
- {N_("Malay"), "ms_MY", "Muhammad Najmi bin Ahmad Zabidi", "najmi.zabidi at gmail.com"},
{N_("Burmese"), "my_MM", "Thura Hlaing", "trhura at gmail.com"},
{N_("Bokmål Norwegian"), "nb", "Hans Fredrik Nordhaug", "hans at nordhaug.priv.no"},
{N_("Nepali"), "ne", "Shyam Krishna Bal", NULL},
@@ -299,6 +296,7 @@ static const struct translator past_tran
{N_("Hebrew"), "he", "Pavel Bibergal", NULL},
{N_("Hindi"), "hi", "Ravishankar Shrivastava", NULL},
{N_("Hungarian"), "hu", "Zoltan Sutto", NULL},
+ {N_("Armenian"), "hy", "David Avsharyan", NULL},
{N_("Italian"), "it", "Salvatore di Maggio", NULL},
{N_("Japanese"), "ja", "Takashi Aihana", NULL},
{NULL, NULL, "Ryosuke Kutsuna", NULL},
@@ -308,10 +306,12 @@ static const struct translator past_tran
{N_("Korean"), "ko", "Sang-hyun S", NULL},
{NULL, NULL, "A Ho-seok Lee", NULL},
{NULL, NULL, "Kyeong-uk Son", NULL},
+ {N_("Lao"), "lo", "Anousak Souphavah", NULL},
{N_("Lithuanian"), "lt", "Laurynas Biveinis", NULL},
{NULL, NULL, "Gediminas ÄŒiÄinskas", NULL},
{NULL, NULL, "Andrius Å tikonas", NULL},
{N_("Macedonian"), "mk", "Tomislav Markovski", NULL},
+ {N_("Malay"), "ms_MY", "Muhammad Najmi bin Ahmad Zabidi", NULL},
{N_("Bokmål Norwegian"), "nb", "Hallvard Glad", NULL},
{NULL, NULL, "Petter Johan Olsen", NULL},
{NULL, NULL, "Espen Stefansen", NULL},
diff --git a/po/README b/po/README
--- a/po/README
+++ b/po/README
@@ -1,2 +1,2 @@
For information on translating Pidgin, libpurple, and Finch, please see
-our wiki page at https://developer.pidgin.im/wiki/TipsForTranslators.
+our wiki page at https://developer.pidgin.im/wiki/TipsForTranslators
diff --git a/po/hy.po b/po/hy.po
deleted file mode 100644
--- a/po/hy.po
+++ /dev/null
@@ -1,14192 +0,0 @@
-# translation of am.po to Armenian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# David Avsharyan <avsharyan at gmail.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: am\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 10:38-0800\n"
-"PO-Revision-Date: 2009-05-20 17:37+0400\n"
-"Last-Translator: David Avsharyan <avsharyan at gmail.com>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-msgid "Finch"
-msgstr "ÕÕ¥Ö€Õ«Õ¶Õ¸Õ½"
-
-#, c-format
-msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Ô±Õ¾Õ¥Õ¬Õ« Õ·Õ¡Õ¿ Õ«Õ¶Ö†Õ¸Ö€Õ´Õ¡ÖÕ«Õ¡ÕµÕ« Õ°Õ¡Õ´Õ¡Ö€ Õ°Õ¡Õ¾Õ¡Õ£Õ¥Ö„ `%s -h'.\n"
-
-#, c-format
-msgid ""
-"%s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-" -c, --config=DIR use DIR for config files\n"
-" -d, --debug print debugging messages to stderr\n"
-" -h, --help display this help and exit\n"
-" -n, --nologin don't automatically login\n"
-" -v, --version display the current version and exit\n"
-msgstr ""
-"%s\n"
-"Ô¿Õ«Ö€Õ¡Õ¼Õ¸Ö‚Õ´: %s [OPTION]...\n"
-"\n"
-" -c, --config=DIR Ö
Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¥Õ¬ DIR Õ¯Õ¸Õ¶Ö†Õ«Õ£Õ¸Ö‚Ö€Õ¡ÖÕ«Õ¸Õ¶ Ö†Õ¡ÕµÕ¬Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€\n"
-" -d, --debug Õ¯Õ¡Ö€Õ£Õ¡Õ¢Õ¥Ö€Õ¾Õ¸Õ² Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ Õ¿ÕºÕ¥Õ¬ Õ¤Õ¥ÕºÕ« Õ½Õ¿Õ¡Õ¶Õ¤Õ¡Ö€Õ¿ "
-"Õ½ÕÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ°Õ¸Õ½Ö„\n"
-" -h, --help ÖÕ¸Ö‚ÕµÖ Õ¿Õ¡Õ¬ Õ¡ÕµÕ½ Ö
Õ£Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Ö‡ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬\n"
-" -n, --nologin Õ¸Õ¹ Õ«Õ¶Ö„Õ¶Õ¡Õ¢Õ¥Ö€Õ¡Õ¢Õ¡Ö€ Õ´Õ¸Ö‚Õ¿Ö„\n"
-" -v, --version ÖÕ¸Ö‚ÕµÖ Õ¿Õ¡Õ¬ Õ¨Õ¶Õ©Õ¡ÖÕ«Õ¯ Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯Õ¨ Ö‡ Õ¤Õ¸Ö‚Ö€Õ½ Õ£Õ¡Õ¬\n"
-
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-
-#. the user did not fill in the captcha
-#, fuzzy
-msgid "Error"
-msgstr "ÕÕÕ¡Õ¬Õ¶Õ¥Ö€Õ¦"
-
-msgid "Account was not modified"
-msgstr ""
-
-msgid "Account was not added"
-msgstr ""
-
-msgid "Username of an account must be non-empty."
-msgstr "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨ ..."
-
-msgid ""
-"The account's protocol cannot be changed while it is connected to the server."
-msgstr ""
-
-msgid ""
-"The account's username cannot be changed while it is connected to the server."
-msgstr ""
-
-msgid "New mail notifications"
-msgstr "Õ†Õ¸Ö€ Õ¶Õ¡Õ´Õ¡Õ¯Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€"
-
-msgid "Remember password"
-msgstr "Õ€Õ«Õ·Õ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨"
-
-msgid "There are no protocol plugins installed."
-msgstr "Ô±ÕµÕ¶Õ¿Õ¥Õ² Õ¿Õ¥Õ²Õ¡Õ¤Ö€Õ¾Õ¡Õ® Õ¹Õ§ ÕºÖ€Õ¸Õ¿Õ¸Õ¯Õ¸Õ¬Õ« Õ¡Õ¾Õ¥Õ¬Õ¡Öումներ․"
-
-msgid "(You probably forgot to 'make install'.)"
-msgstr "(Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ¢Õ¡Ö€ Õ¤Õ¸Ö‚Ö„ Õ´Õ¸Õ¼Õ¡ÖÕ¥Õ¬ Õ¥Ö„ Õ¡Õ¶Õ¥Ö„ 'make install'.)"
-
-msgid "Modify Account"
-msgstr "ÕÖ‡Õ¡ÖƒÕ¸ÕÕ¥Õ¬ Õ€Õ¡Õ·Õ«Õ¾Õ¨"
-
-msgid "New Account"
-msgstr "Õ†Õ¸Ö€ Õ€Õ¡Õ·Õ«Õ¾"
-
-msgid "Protocol:"
-msgstr "Ô±Ö€Õ±Õ¡Õ¶Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Ö‰"
-
-msgid "Username:"
-msgstr "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¸Õ²Õ« Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨Ö‰"
-
-msgid "Password:"
-msgstr "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Ö‰"
-
-msgid "Alias:"
-msgstr "Õ“Õ¸ÕÕ¡Õ¶Õ¸Ö‚Õ¶Ö‰"
-
-#. Register checkbox
-msgid "Create this account on the server"
-msgstr "ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬ Õ¡ÕµÕ½ Õ°Õ¡Õ·Õ«Õ¾Õ¨ Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ¾Ö€Õ¡"
-
-#. Cancel button
-#. Cancel
-msgid "Cancel"
-msgstr "Õ‰Õ¥Õ²ÕµÕ¡Õ¬ Õ°Õ¡Õ´Õ¡Ö€Õ¥Õ¬"
-
-#. Save button
-#. Save
-msgid "Save"
-msgstr "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬"
-
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Ô´Õ¸Ö‚Ö„ Õ°Õ¡Õ´Õ¸Õ¦Õ¾Õ¡Õ® Õ¥Ö„, Õ¸Ö€ ÖÕ¡Õ¶Õ¯Õ¡Õ¶Õ¸Ö‚Õ´ Õ¥Ö„ Õ»Õ¶Õ»Õ¥Õ¬ %s?"
-
-msgid "Delete Account"
-msgstr "Õ‹Õ¶Õ»Õ¥Õ¬ Õ€Õ¡Õ·Õ«Õ¾Õ¨"
-
-#. Delete button
-msgid "Delete"
-msgstr "Õ‹Õ¶Õ»Õ¥Õ¬"
-
-msgid "Accounts"
-msgstr "Õ€Õ¡Õ·Õ«Õ¾Õ¶Õ¥Ö€"
-
-msgid "You can enable/disable accounts from the following list."
-msgstr "Ô´Õ¸Ö‚Ö„ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Ö„ Õ´Õ«Õ¡ÖÕ¶Õ¥Õ¬/Õ¡Õ¶Õ»Õ¡Õ¿Õ¥Õ¬ Õ°Õ¡Õ·Õ«Õ¾Õ¶Õ¥Ö€Õ¨ Õ°Õ¥Õ¿Ö‡ÕµÕ¡Õ¬ ÖÕ¡Õ¶Õ¯Õ«Ö․"
-
-#. Add button
-msgid "Add"
-msgstr "Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬"
-
-#. Modify button
-msgid "Modify"
-msgstr "Õ“Õ¸ÖƒÕ¸ÕÕ¥Õ¬"
-
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr ""
-
-msgid "Add buddy to your list?"
-msgstr ""
-
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr ""
-
-msgid "Authorize buddy?"
-msgstr ""
-
-msgid "Authorize"
-msgstr "Ô¼Õ«Õ¡Õ¦Õ¸Ö€Õ¸Ö‚Õ´"
-
-msgid "Deny"
-msgstr "Õ„Õ¥Ö€ÕªÕ¥Õ¬"
-
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Ô¿Õ¡ÕºÕ« Õ´Õ¥Õ»: %d\n"
-"Ô¸Õ¶Õ¤Õ°Õ¡Õ¶Õ¸Ö‚Ö€: %d"
-
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Õ€Õ¡Õ·Õ«Õ¾: %s (%s"
-
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Last Seen: %s ago"
-
-msgid "Default"
-msgstr ""
-
-msgid "You must provide a username for the buddy."
-msgstr ""
-
-msgid "You must provide a group."
-msgstr ""
-
-msgid "You must select an account."
-msgstr ""
-
-msgid "The selected account is not online."
-msgstr ""
-
-msgid "Error adding buddy"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Alias (optional)"
-msgstr ""
-
-msgid "Invite message (optional)"
-msgstr ""
-
-msgid "Add in group"
-msgstr ""
-
-msgid "Account"
-msgstr ""
-
-msgid "Add Buddy"
-msgstr ""
-
-msgid "Please enter buddy information."
-msgstr ""
-
-msgid "Chats"
-msgstr ""
More information about the Commits
mailing list