/pidgin/main: 4bf8cf402f8c: Merge pidgin/main release-2.x.y bran...

Mark Doliner mark at kingant.net
Wed Oct 22 10:20:38 EDT 2014


Changeset: 4bf8cf402f8c235d9744e1273a31650242da75de
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2014-10-16 16:01 -0700
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/4bf8cf402f8c

Description:

Merge pidgin/main release-2.x.y branch in private/main release-2.x.y branch

No merge conflicts.

diffstat:

 po/af.po          |   2718 +---------
 po/am.po          |   6984 +++++++++-------------------
 po/ar.po          |   4571 ++++--------------
 po/as.po          |   5472 ++-------------------
 po/ast.po         |    374 +-
 po/az.po          |   6500 ++++++++------------------
 po/be at latin.po    |    404 +-
 po/bg.po          |   8072 +++++++++-----------------------
 po/bn.po          |   3200 +-----------
 po/bn_IN.po       |   2313 ++-------
 po/brx.po         |   6865 ++-------------------------
 po/bs.po          |  10070 +++++++++++------------------------------
 po/ca.po          |   4156 +----------------
 po/ca at valencia.po |    875 +--
 po/cs.po          |   3108 +-----------
 po/da.po          |   3253 +------------
 po/de.po          |    186 +-
 po/dz.po          |   8567 +++++++---------------------------
 po/el.po          |    375 +-
 po/en_AU.po       |  12632 +++++++++++++++++----------------------------------
 po/en_CA.po       |    397 +-
 po/en_GB.po       |    369 +-
 po/eo.po          |   2605 ++-------
 po/es.po          |   2365 +--------
 po/es_AR.po       |  10161 +++++++++-------------------------------
 po/et.po          |    380 +-
 po/eu.po          |   4222 +++--------------
 po/fa.po          |     87 +-
 po/fi.po          |   5249 ++-------------------
 po/fr.po          |   1459 +----
 po/ga.po          |    390 +-
 po/gl.po          |   3070 +++---------
 po/gu.po          |   1759 +-----
 po/he.po          |    370 +-
 po/hi.po          |   2296 ++-------
 po/hr.po          |    444 +-
 po/hu.po          |    778 +-
 po/id.po          |   6202 +++++-------------------
 po/it.po          |   1386 +----
 po/ja.po          |   4386 +++--------------
 po/ka.po          |   5987 +++++++-----------------
 po/kk.po          |   8025 +++++----------------------------
 po/km.po          |    359 +-
 po/kn.po          |   2857 +----------
 po/ko.po          |   6556 ++++++--------------------
 po/ks.po          |   6865 ++-------------------------
 po/ku.po          |   8191 ++++++++-------------------------
 po/lt.po          |    426 +-
 po/lv.po          |   8553 ++++++----------------------------
 po/mai.po         |   1047 +--
 po/mhr.po         |    399 +-
 po/mk.po          |   5150 +++++----------------
 po/ml.po          |   2306 ++-------
 po/mn.po          |   3570 +++----------
 po/mr.po          |   1855 +-----
 po/my_MM.po       |    374 +-
 po/nb.po          |   4065 +++-------------
 po/ne.po          |   9975 +++++++++++-----------------------------
 po/nl.po          |    394 +-
 po/nn.po          |    401 +-
 po/oc.po          |    706 +--
 po/or.po          |   1859 +-----
 po/pa.po          |    370 +-
 po/pl.po          |    384 +-
 po/ps.po          |   4024 ++++-----------
 po/pt.po          |    381 +-
 po/pt_BR.po       |   2618 +---------
 po/ro.po          |    600 +-
 po/ru.po          |   2336 +--------
 po/sd.po          |   6865 ++-------------------------
 po/si.po          |   2122 ++------
 po/sk.po          |   2875 +----------
 po/sl.po          |    417 +-
 po/sq.po          |   1474 +++--
 po/sr.po          |   4809 ++++---------------
 po/sr at latin.po    |   4807 ++++---------------
 po/sv.po          |   2863 +----------
 po/sw.po          |   4092 +++++----------
 po/ta.po          |   3450 +------------
 po/te.po          |   1763 +-----
 po/th.po          |   5268 ++++++--------------
 po/tr.po          |   5363 +++++----------------
 po/tt.po          |   7007 ++-------------------------
 po/uk.po          |    607 +-
 po/ur.po          |   6274 ++++++-------------------
 po/uz.po          |   8383 +++++----------------------------
 po/vi.po          |   1613 +-----
 po/xh.po          |  10387 +++++++++++-------------------------------
 po/zh_CN.po       |   2585 +---------
 po/zh_HK.po       |   2422 +--------
 po/zh_TW.po       |   2420 +--------
 91 files changed, 70733 insertions(+), 246836 deletions(-)

diffs (truncated from 585550 to 300 lines):

diff --git a/po/af.po b/po/af.po
--- a/po/af.po
+++ b/po/af.po
@@ -1,23 +1,24 @@
-# Afrikaans translations for pidgin
-# Copyright (C) 2006-2010
-# This file is distributed under the same license as the pidgin package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# F Wolff <friedel at translate.org.za>, 2006-2009, 2010-2011
 # Samuel Murray <afrikaans BY gmail.com>, 2007
-# F Wolff <friedel at translate.org.za>, 2006-2009, 2010, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: 2.7.0\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2014-10-16 15:56-0700\n"
+"PO-Revision-Date: 2014-06-27 08:27+0000\n"
+"Last-Translator: Richard Laager <rlaager at wiktel.com>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/pidgin/"
+"language/af/)\n"
 "Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1-beta1\n"
-"X-Project-Style: gnome\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -1676,7 +1677,6 @@ msgstr ""
 msgid "Unknown"
 msgstr "Onbekend"
 
-#. Changing this string?  Look in add_purple_buddy_to_groups
 msgid "Buddies"
 msgstr "Vriende"
 
@@ -1790,26 +1790,31 @@ msgstr ""
 "Die sertifikaat beweer om van \"%s\" afkomstig te wees. Dit kan beteken dat "
 "u nie tans aan die diens gekoppel is wat u dink nie."
 
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr "Sertifikaatinligting"
+
+msgid "Unable to find Issuer Certificate"
+msgstr ""
+
 #. Make messages
 #, c-format
 msgid ""
 "Common name: %s\n"
 "\n"
+"Issued By: %s\n"
+"\n"
 "Fingerprint (SHA1): %s\n"
 "\n"
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
-"Algemene naam: %s\n"
-"\n"
-"Vingerafdruk (SHA1): %s\n"
-"\n"
-"Aktiveringsdatum: %s\n"
-"Vervaldatum: %s\n"
-
-#. TODO: Find what the handle ought to be
-msgid "Certificate Information"
-msgstr "Sertifikaatinligting"
+
+msgid "(self-signed)"
+msgstr ""
+
+msgid "View Issuer Certificate"
+msgstr ""
 
 #. show error to user
 msgid "Registration Error"
@@ -2265,9 +2270,8 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
 msgid "A non-recoverable Farstream error has occurred."
-msgstr "'n Onbekende sertifikaatfout het voorgekom."
+msgstr ""
 
 msgid "Error with your microphone"
 msgstr "Fout met u mikrofoon"
@@ -3136,9 +3140,8 @@ msgstr "Almal"
 msgid "Only buddies"
 msgstr "Slegs vriende"
 
-#, fuzzy
 msgid "Change status broadcasting"
-msgstr "Verander status na:"
+msgstr ""
 
 msgid "Please, select who can see your status"
 msgstr "Kies wie u status mag sien"
@@ -3214,15 +3217,15 @@ msgstr "Voeg by geselsie"
 msgid "Chat _name:"
 msgstr "Geselsie_naam:"
 
-#, c-format
-msgid "Unable to resolve hostname '%s': %s"
-msgstr "Kon nie gasheernaam '%s' vasstel nie: %s"
-
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
 msgstr "Koppel tans"
 
+#, c-format
+msgid "Unable to resolve hostname: %s"
+msgstr ""
+
 msgid "Chat error"
 msgstr "Geselsiefout"
 
@@ -3376,9 +3379,8 @@ msgstr "Enkoderings"
 msgid "Auto-detect incoming UTF-8"
 msgstr "Outobespeur inkomende UTF-8"
 
-#, fuzzy
 msgid "Ident name"
-msgstr "Ongeldige naam"
+msgstr ""
 
 msgid "Real name"
 msgstr "Regte naam"
@@ -3390,13 +3392,11 @@ msgstr "Regte naam"
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
-#, fuzzy
 msgid "Authenticate with SASL"
-msgstr "Stawing"
-
-#, fuzzy
+msgstr ""
+
 msgid "Allow plaintext SASL auth over unencrypted connection"
-msgstr "Laat skoonteksstawing oor ongeënkripteerde strome toe"
+msgstr ""
 
 msgid "Bad mode"
 msgstr "Slegte modus"
@@ -3432,13 +3432,11 @@ msgstr " <i>(geïdentifiseer)</i>"
 msgid "Nick"
 msgstr "Bynaam"
 
-#, fuzzy
 msgid "Login name"
-msgstr "MXit-aanmeldnaam"
-
-#, fuzzy
+msgstr ""
+
 msgid "Host name"
-msgstr "Gasheernaam"
+msgstr ""
 
 msgid "Currently on"
 msgstr "Tans in"
@@ -3585,32 +3583,29 @@ msgstr "Bynaam of kanaal is tydelik nie 
 msgid "Wallops from %s"
 msgstr "Loesing van %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to initialize SASL authentication: %s"
-msgstr "Kan nie SILC-kliëntkoppeling inisialiseer nie"
+msgstr ""
 
 msgid "SASL authentication failed: No worthy authentication mechanisms found."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL authentication failed: %s"
-msgstr "SASL-stawing het misluk"
+msgstr ""
 
 msgid ""
 "SASL authentication failed: Server does not support SASL authentication."
 msgstr ""
 
-#, fuzzy
 msgid "SASL authentication failed: Initializing SASL failed."
-msgstr "SASL-stawing het misluk"
-
-#, fuzzy
+msgstr ""
+
 msgid "Incorrect Password"
-msgstr "Verkeerde wagwoord"
-
-#, fuzzy
+msgstr ""
+
 msgid "SASL authentication failed: No worthy mechanisms found"
-msgstr "SASL-stawing het misluk"
+msgstr ""
 
 msgid "action <action to perform>:  Perform an action."
 msgstr "action <aksie om uit te voer>:  Verrig 'n aksie."
@@ -3856,17 +3851,14 @@ msgstr "Ongeldige uitdaging vanaf bedien
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
-#, fuzzy
 msgid "Server may require plaintext authentication over an unencrypted stream"
-msgstr "Bediener vereis skoonteksstawing oor 'n ongeënkripteerde stroom"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid ""
 "%s may require plaintext authentication over an unencrypted connection.  "
 "Allow this and continue authentication?"
 msgstr ""
-"%s vereis skoonteksstawing oor 'n ongeënkripteerde koppeling.  Laat dit toe "
-"en gaan voort met stawing?"
 
 msgid "SASL authentication failed"
 msgstr "SASL-stawing het misluk"
@@ -4635,9 +4627,9 @@ msgstr "Kan nie media inisieer met %s ni
 msgid "Unable to initiate media with %s: user is not online"
 msgstr "Kan nie media inisieer met %s nie: gebruiker is nie aanlyn nie"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: resource is not online"
-msgstr "Kan nie media inisieer met %s nie: gebruiker is nie aanlyn nie"
+msgstr ""
 
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
@@ -5030,9 +5022,8 @@ msgstr "Eensaam"
 msgid "Lost"
 msgstr "Verlore"
 
-#, fuzzy
 msgid "Lucky"
-msgstr "Soos 'n kind met 'n roomys in elke hand"
+msgstr ""
 
 msgid "Mean"
 msgstr "Gemeen"
@@ -5829,29 +5820,23 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Boodskap is nie gestuur nie omdat 'n onbekende fout voorgekom het."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s (There was an error receiving this message. Converting the encoding from "
 "%s to UTF-8 failed.)"
 msgstr ""
-"(Kon nie hierdie boodskap omskakel nie.\t Kontroleer die 'Enkodering'-opsie "
-"in die Rekeningredigeerder)"
-
-#, fuzzy, c-format
+
+#, c-format
 msgid ""
 "%s (There was an error receiving this message. The charset was %s, but it "
 "was not valid UTF-8.)"
 msgstr ""
-"(Kon nie hierdie boodskap ontvang nie.  Óf u en %s het verskillende "
-"enkoderings gekies, óf %s het 'n vrotterige kliënt.)"
-
-#, fuzzy, c-format
+
+#, c-format
 msgid ""
 "%s (There was an error receiving this message. The charset was missing, but "
 "it was not valid UTF-8.)"
 msgstr ""
-"(Kon nie hierdie boodskap omskakel nie.\t Kontroleer die 'Enkodering'-opsie "
-"in die Rekeningredigeerder)"
 
 msgid "Writing error"
 msgstr "Skryffout"
@@ -6007,9 +5992,8 @@ msgid "Where I Live"



More information about the Commits mailing list