/pidgin/main: 5cc893312ea4: Merge release-2.x.y branch into defa...
Mark Doliner
mark at kingant.net
Mon Feb 3 00:11:05 EST 2014
Changeset: 5cc893312ea490ba1c1417839832261ed8bd05b1
Author: Mark Doliner <mark at kingant.net>
Date: 2014-02-02 21:10 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/5cc893312ea4
Description:
Merge release-2.x.y branch into default.
A few easy manual merges in ChangeLog, ChangeLog.API, configure.ac,
and maybe German translation.
diffstat:
.hgtags | 1 +
ChangeLog | 2 +-
Makefile.am | 1 -
po/ChangeLog | 6 +-
po/af.po | 907 ++++++----
po/am.po | 723 +++++----
po/ar.po | 897 ++++++----
po/as.po | 1063 ++++++++-----
po/ast.po | 104 +-
po/az.po | 717 +++++---
po/be at latin.po | 905 ++++++----
po/bg.po | 839 ++++++----
po/bn.po | 914 +++++++----
po/bn_IN.po | 891 ++++++----
po/bs.po | 863 ++++++----
po/ca.po | 897 ++++++----
po/ca at valencia.po | 873 ++++++----
po/cs.po | 895 ++++++----
po/da.po | 119 +-
po/dz.po | 918 ++++++----
po/el.po | 126 +-
po/en_AU.po | 864 ++++++----
po/en_CA.po | 674 ++++---
po/en_GB.po | 2079 ++++++--------------------
po/eo.po | 831 ++++++----
po/es.po | 4099 +++++++++++++++++++++++++++-------------------------
po/et.po | 104 +-
po/eu.po | 901 ++++++----
po/fa.po | 104 +-
po/fi.po | 894 ++++++----
po/fr.po | 907 +++++++----
po/ga.po | 104 +-
po/gl.po | 886 ++++++----
po/gu.po | 862 ++++++----
po/he.po | 104 +-
po/hi.po | 887 ++++++----
po/hr.po | 685 ++++---
po/hu.po | 885 ++++++----
po/hy.po | 654 ++++---
po/id.po | 905 ++++++----
po/it.po | 909 +++++++----
po/ja.po | 883 ++++++----
po/ka.po | 755 +++++----
po/km.po | 2433 ++++++++----------------------
po/kn.po | 873 ++++++----
po/ko.po | 891 ++++++----
po/ku.po | 821 ++++++----
po/lo.po | 628 ++++---
po/lt.po | 104 +-
po/mai.po | 843 ++++++----
po/mhr.po | 843 ++++++----
po/mk.po | 918 +++++++----
po/ml.po | 893 ++++++----
po/mn.po | 839 ++++++----
po/mr.po | 865 ++++++----
po/ms_MY.po | 674 ++++---
po/my_MM.po | 104 +-
po/nb.po | 863 ++++++----
po/ne.po | 862 ++++++----
po/nl.po | 116 +-
po/nn.po | 104 +-
po/oc.po | 702 ++++----
po/or.po | 832 ++++++----
po/pa.po | 104 +-
po/pl.po | 123 +-
po/ps.po | 751 +++++----
po/pt.po | 113 +-
po/pt_BR.po | 964 +++++++-----
po/ro.po | 912 +++++++----
po/ru.po | 119 +-
po/si.po | 721 +++++----
po/sk.po | 885 ++++++----
po/sl.po | 104 +-
po/sq.po | 104 +-
po/sr.po | 847 ++++++----
po/sr at latin.po | 871 ++++++----
po/sv.po | 821 ++++++----
po/sw.po | 751 +++++----
po/ta.po | 892 ++++++----
po/te.po | 824 ++++++----
po/th.po | 731 +++++----
po/tr.po | 894 ++++++----
po/uk.po | 905 +++++++----
po/ur.po | 905 ++++++----
po/vi.po | 900 ++++++----
po/xh.po | 864 ++++++----
po/zh_CN.po | 859 ++++++----
po/zh_HK.po | 815 ++++++----
po/zh_TW.po | 815 ++++++----
89 files changed, 36734 insertions(+), 28705 deletions(-)
diffs (truncated from 92837 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -88,3 +88,4 @@ a3d157700972b48cf0a23b300261a5ab0c6e165b
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7
5010e6877abce3bfc2a4912e6b38fed7d6d3df19 v2.10.8
+9438f4b2904d9574b9e6ffba463d354b3661139f v2.10.9
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ version 3.0.0 (??/??/????):
* Various core components of libpurple are now GObjects.
* Ciphers are now built from the libpurple directory.
-version 2.10.9:
+version 2.10.9 (2/2/2014):
XMPP:
* Fix problems logging into some servers including jabber.org and
chat.facebook.com. (#15879)
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,6 @@ version-check:
# Ensure ChangeLogs have the correct version
head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
- head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
diff --git a/po/ChangeLog b/po/ChangeLog
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,8 +1,8 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
-version 2.10.9
- * German translation updated (Björn Voigt, Jochen Kemnade)
- * Spanish translation updated (Javier Fernández-Sanguino Peña)
+Starting with Pidgin version 2.10.9, this ChangeLog file will no longer be
+updated. Please let us know if this is inconvenient for you by emailing
+devel at pidgin.im. Thanks!
version 2.10.8
* Albanian translation updated (Besnik Bleta)
diff --git a/po/af.po b/po/af.po
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-12 02:49-0700\n"
+"POT-Creation-Date: 2014-02-02 10:38-0800\n"
"PO-Revision-Date: 2011-08-17 21:17+0200\n"
"Last-Translator: F Wolff <friedel at translate.org.za>\n"
"Language-Team: translate-discuss-af at lists.sourceforge.net\n"
@@ -2060,150 +2060,150 @@ msgstr "Lêeroordrag na %s het misluk."
msgid "File transfer from %s failed."
msgstr "Lêeroordrag vanaf %s het misluk."
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Of die gespesifiseerde bevel \"aim\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"aim\"-URL'e "
+"moet hanteer."
+
+msgid "The handler for \"aim\" URLs"
+msgstr "Die vatsel vir \"aim\"-URL'e"
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"aim\"-URL'e te hanteer, indien geaktiveer."
+
msgid "Run the command in a terminal"
msgstr "Loop die bevel in 'n terminaal"
-msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"aim\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"gg\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"icq\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"irc\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"msnim\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"sip\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"xmpp\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
-"Die bevel wat gebruik word om \"ymsgr\"-URL'e te hanteer, indien geaktiveer."
-
-msgid "The handler for \"aim\" URLs"
-msgstr "Die vatsel vir \"aim\"-URL'e"
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Waar indien die bevel wat hierdie tipe URL hanteer in 'n terminaal moet loop."
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Of die gespesifiseerde bevel \"gg\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e "
+"moet hanteer."
msgid "The handler for \"gg\" URLs"
msgstr "Die vatsel vir \"gg\"-URL'e"
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"gg\"-URL'e te hanteer, indien geaktiveer."
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Of die gespesifiseerde bevel \"icq\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"icq\"-URL'e "
+"moet hanteer."
+
msgid "The handler for \"icq\" URLs"
msgstr "Die vatsel vir \"icq\"-URL'e"
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"icq\"-URL'e te hanteer, indien geaktiveer."
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Of die gespesifiseerde bevel \"irc\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"irc\"-URL'e "
+"moet hanteer."
+
msgid "The handler for \"irc\" URLs"
msgstr "Die vatsel vir \"irc\"-URL'e"
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"irc\"-URL'e te hanteer, indien geaktiveer."
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Of die gespesifiseerde bevel \"msnim\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"msnim\"-"
+"URL'e moet hanteer."
+
msgid "The handler for \"msnim\" URLs"
msgstr "Die vatsel vir \"msnim\"-URL'e"
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"msnim\"-URL'e te hanteer, indien geaktiveer."
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Of die gespesifiseerde bevel \"sip\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"sip\"-URL'e "
+"moet hanteer."
+
msgid "The handler for \"sip\" URLs"
msgstr "Die vatsel vir \"sip\"-URL'e"
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"sip\"-URL'e te hanteer, indien geaktiveer."
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Of die gespesifiseerde bevel \"xmpp\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"xmpp\"-"
+"URL'e moet hanteer."
+
msgid "The handler for \"xmpp\" URLs"
msgstr "Die vatsel vir \"xmpp\"-URL'e"
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+"Die bevel wat gebruik word om \"xmpp\"-URL'e te hanteer, indien geaktiveer."
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Of die gespesifiseerde bevel \"ymsgr\"-URL'e moet hanteer"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"ymsgr\"-"
+"URL'e moet hanteer."
+
msgid "The handler for \"ymsgr\" URLs"
msgstr "Die vatsel vir \"ymsgr\"-URL'e"
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"aim\"-URL'e "
-"moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"gg\"-URL'e "
-"moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"icq\"-URL'e "
-"moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"irc\"-URL'e "
-"moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"msnim\"-"
-"URL'e moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"sip\"-URL'e "
-"moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"xmpp\"-"
-"URL'e moet hanteer."
-
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Waar indien die bevel gespesifiseer in die \"command\"-sleutel \"ymsgr\"-"
-"URL'e moet hanteer."
-
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Waar indien die bevel wat hierdie tipe URL hanteer in 'n terminaal moet loop."
-
-msgid "Whether the specified command should handle \"aim\" URLs"
More information about the Commits
mailing list