Mercurial > pidgin.yaz
changeset 29755:a3e29e210b2e
propagate from branch 'im.pidgin.pidgin' (head 5e48191adf93863395ea1bc8d7efdc62d54c079d)
to branch 'im.pidgin.pidgin.next.minor' (head 6df56a1ab70195e20ac3019502e8bf94eeb4e59a)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 11 Feb 2010 20:14:51 +0000 |
| parents | 4e93d6d57067 (diff) 5dec9d90fb51 (current diff) |
| children | 18773d906caf |
| files | ChangeLog pidgin/gtkcelllayout.c pidgin/gtkcelllayout.h pidgin/gtkcellrendererprogress.c pidgin/gtkcellrendererprogress.h pidgin/gtkcellview.c pidgin/gtkcellview.h pidgin/gtkcellviewmenuitem.c pidgin/gtkcellviewmenuitem.h pidgin/gtkexpander.c pidgin/gtkexpander.h pidgin/pidgincombobox.c pidgin/pidgincombobox.h pidgin/pixmaps/tray/16/tray-away.png pidgin/pixmaps/tray/16/tray-busy.png pidgin/pixmaps/tray/16/tray-connecting.png pidgin/pixmaps/tray/16/tray-extended-away.png pidgin/pixmaps/tray/16/tray-invisible.png pidgin/pixmaps/tray/16/tray-message.png pidgin/pixmaps/tray/16/tray-new-im.png pidgin/pixmaps/tray/16/tray-offline.png pidgin/pixmaps/tray/16/tray-online.png pidgin/pixmaps/tray/22/tray-away.png pidgin/pixmaps/tray/22/tray-busy.png pidgin/pixmaps/tray/22/tray-connecting.png pidgin/pixmaps/tray/22/tray-extended-away.png pidgin/pixmaps/tray/22/tray-invisible.png pidgin/pixmaps/tray/22/tray-message.png pidgin/pixmaps/tray/22/tray-new-im.png pidgin/pixmaps/tray/22/tray-offline.png pidgin/pixmaps/tray/22/tray-online.png pidgin/pixmaps/tray/32/tray-away.png pidgin/pixmaps/tray/32/tray-busy.png pidgin/pixmaps/tray/32/tray-connecting.png pidgin/pixmaps/tray/32/tray-extended-away.png pidgin/pixmaps/tray/32/tray-invisible.png pidgin/pixmaps/tray/32/tray-message.png pidgin/pixmaps/tray/32/tray-new-im.png pidgin/pixmaps/tray/32/tray-offline.png pidgin/pixmaps/tray/32/tray-online.png pidgin/pixmaps/tray/48/tray-away.png pidgin/pixmaps/tray/48/tray-busy.png pidgin/pixmaps/tray/48/tray-connecting.png pidgin/pixmaps/tray/48/tray-extended-away.png pidgin/pixmaps/tray/48/tray-invisible.png pidgin/pixmaps/tray/48/tray-message.png pidgin/pixmaps/tray/48/tray-new-im.png pidgin/pixmaps/tray/48/tray-offline.png pidgin/pixmaps/tray/48/tray-online.png |
| diffstat | 4 files changed, 123 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 11 04:38:48 2010 +0000 +++ b/ChangeLog Thu Feb 11 20:14:51 2010 +0000 @@ -57,11 +57,11 @@ * Fix a leak and crash when retrieving buddy icons. XMPP: - * Upon receipt of a presence change from a contact, send further messages - to that contact's bare JID [username]. A conversation "locks" to a - specific resource upon receipt of a message from that resource. - Previously, it would only "unlock" when that resource went offline, or - upon receipt of a message from a different resource. + * Less likely to send messages to a contact's idle/inactive resource. + Previously, if a message was received from a specific resource, + responses would be sent to that resource until either it went offline + or a message is received from another resource. Now, messages are sent + to the bare JID upon receipt of any presence change from the contact. * Added support for the SCRAM-SHA-1 SASL mechanism. This is only available when built without Cyrus SASL support. * When getting info on a domain-only (server) JID, show uptime
--- a/po/de.po Thu Feb 11 04:38:48 2010 +0000 +++ b/po/de.po Thu Feb 11 20:14:51 2010 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-04 11:33+0100\n" -"PO-Revision-Date: 2010-02-04 11:32+0100\n" +"POT-Creation-Date: 2010-02-11 21:03+0100\n" +"PO-Revision-Date: 2010-02-11 21:02+0100\n" "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -6824,6 +6824,13 @@ msgid "Error requesting %s: %s" msgstr "Fehler beim Anfordern von %s: %s" +msgid "" +"Server requested that you fill out a CAPTCHA in order to sign in, but this " +"client does not currently support CAPTCHAs." +msgstr "" +"Der Server möchte, dass Sie ein CAPTCHA ausfüllen, um sich anzumelden, aber " +"dieser Client unterstützt im Moment keine CAPTCHAs." + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL erlaubt Ihnen nicht, sich hier mit Ihrem Benutzernamen anzumelden" @@ -12129,6 +12136,9 @@ msgid "Occitan" msgstr "Okzitanisch" +msgid "Oriya" +msgstr "Oriya" + msgid "Punjabi" msgstr "Pandschabi" @@ -13876,6 +13886,9 @@ msgid "_Save File" msgstr "Datei _speichern" +msgid "Do you really want to clear?" +msgstr "Wollen Sie wirklich löschen?" + msgid "Select color" msgstr "Farbe auswählen"
--- a/po/fr.po Thu Feb 11 04:38:48 2010 +0000 +++ b/po/fr.po Thu Feb 11 20:14:51 2010 +0000 @@ -4,7 +4,7 @@ # Copyright (C) 2002, Stéphane Pontier <stephane.pontier@free.fr> # Copyright (C) 2002, Stéphane Wirtel <stephane.wirtel@belgacom.net> # Copyright (C) 2002, Loïc Jeannin <loic.jeannin@free.fr> -# Copyright (C) 2002-2009, Éric Boumaour <zongo_fr@users.sourceforge.net> +# Copyright (C) 2002-2010, Éric Boumaour <zongo_fr@users.sourceforge.net> # # This file is distributed under the same license as the Pidgin package. # @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-28 15:44+0100\n" -"PO-Revision-Date: 2009-11-28 15:03+0100\n" +"POT-Creation-Date: 2010-02-11 19:11+0100\n" +"PO-Revision-Date: 2010-02-11 19:10+0100\n" "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n" "Language-Team: fr <fr@li.org>\n" "MIME-Version: 1.0\n" @@ -1961,6 +1961,9 @@ "« %s » n'est pas un fichier régulier. Je refuse lâchement d'écraser ce " "fichier.\n" +msgid "File is not readable." +msgstr "Impossible de lire le fichier." + #, c-format msgid "%s wants to send you %s (%s)" msgstr "%s veut vous envoyer %s (%s)" @@ -3838,6 +3841,13 @@ "Le serveur demande une authentification en texte non chiffré au travers d'un " "flux crypté." +#. This should never happen! +msgid "Invalid response from server" +msgstr "Réponse non valide du serveur" + +msgid "Server does not use any supported authentication method" +msgstr "Le serveur utilise une méthode d'authentification non supportée" + #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " @@ -3849,15 +3859,6 @@ msgid "Plaintext Authentication" msgstr "Authentification en texte non chiffré" -msgid "SASL authentication failed" -msgstr "Échec de l'authentification SASL" - -msgid "Invalid response from server" -msgstr "Réponse non valide du serveur" - -msgid "Server does not use any supported authentication method" -msgstr "Le serveur utilise une méthode d'authentification non supportée" - msgid "You require encryption, but it is not available on this server." msgstr "" "Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur." @@ -3865,10 +3866,29 @@ msgid "Invalid challenge from server" msgstr "Demande d'accès non valide du serveur" +msgid "Server thinks authentication is complete, but client does not" +msgstr "" +"Le serveur pense que l'authentification est terminée, et le client non." + +msgid "SASL authentication failed" +msgstr "Échec de l'authentification SASL" + #, c-format msgid "SASL error: %s" msgstr "Erreur SASL : %s" +msgid "Unable to canonicalize username" +msgstr "Impossible de normaliser le nom d'utilisateur" + +msgid "Unable to canonicalize password" +msgstr "Impossible de normaliser le mot de passe" + +msgid "Malicious challenge from server" +msgstr "Challenge malicieux du serveur" + +msgid "Unexpected response from server" +msgstr "Réponse non attendue du serveur" + msgid "The BOSH connection manager terminated your session." msgstr "Le gestionnaire de connexion BOSH a interrompu votre session." @@ -3969,13 +3989,16 @@ msgid "Resource" msgstr "Ressource" +msgid "Uptime" +msgstr "Connecté depuis" + +msgid "Logged Off" +msgstr "Deconnecté" + #, c-format msgid "%s ago" msgstr "il y a %s" -msgid "Logged Off" -msgstr "Deconnecté" - msgid "Middle Name" msgstr "Deuxième prénom" @@ -4167,13 +4190,6 @@ msgid "Ping timed out" msgstr "Pas de réponse au ping" -msgid "" -"Unable to find alternative XMPP connection methods after failing to connect " -"directly." -msgstr "" -"Impossible de trouver une autre méthode de connexion XMPP après l'échec de " -"connexion directe." - msgid "Invalid XMPP ID" msgstr "Identifiant XMPP non valide." @@ -4732,6 +4748,11 @@ msgid "(Code %s)" msgstr "(Code %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "" +"Une frimousse personnalisée dans le message est trop grosse pour être " +"envoyée." + msgid "XML Parse error" msgstr "Erreur de lecture du XML" @@ -5148,6 +5169,10 @@ msgid "Your new MSN friendly name is too long." msgstr "Le nouvel alias MSN est trop long" +#, c-format +msgid "Set friendly name for %s." +msgstr "Changer l'alias pour %s." + msgid "Set your friendly name." msgstr "Changer l'alias" @@ -6746,7 +6771,10 @@ msgid "Server port" msgstr "Port du serveur" -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "Réception d'une réponse non attendue de %s : %s" + #, c-format msgid "Received unexpected response from %s" msgstr "Réception d'une réponse non attendue de %s" @@ -6765,6 +6793,13 @@ msgid "Error requesting %s: %s" msgstr "Erreur à la demande de %s : %s" +msgid "" +"Server requested that you fill out a CAPTCHA in order to sign in, but this " +"client does not currently support CAPTCHAs." +msgstr "" +"Le serveur s'attend à ce que vous répondiez à un CAPTCHA pour vous " +"connecter, mais ce client ne les supporte pas encore." + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici." @@ -7335,13 +7370,6 @@ "[Impossible d'afficher un message de cet utilisateur car il contient des " "caractères non valides.]" -msgid "" -"The last action you attempted could not be performed because you are over " -"the rate limit. Please wait 10 seconds and try again.\n" -msgstr "" -"La dernière action n'a pas pu être effectuée car vous avez dépassé le quota " -"limite. Veuillez attendre 10 secondes et réessayer.\n" - #, c-format msgid "You have been disconnected from chat room %s." msgstr "Vous avez été déconnecté du salon %s" @@ -12011,15 +12039,15 @@ msgid "Lao" msgstr "Lao" -msgid "Lithuanian" -msgstr "Lituanien" - msgid "Macedonian" msgstr "Macédonien" msgid "Mongolian" msgstr "Mongol" +msgid "Marathi" +msgstr "Marâthî" + msgid "Malay" msgstr "Malaisien" @@ -12038,6 +12066,9 @@ msgid "Occitan" msgstr "Occitan" +msgid "Oriya" +msgstr "Oriya" + msgid "Punjabi" msgstr "Panjâbî" @@ -12116,6 +12147,9 @@ msgid "Amharic" msgstr "Amharique" +msgid "Lithuanian" +msgstr "Lituanien" + #, c-format msgid "About %s" msgstr "À propos de %s" @@ -13761,6 +13795,9 @@ msgid "_Save File" msgstr "_Sauver le fichier" +msgid "Do you really want to clear?" +msgstr "Êtes-vous sûr de vouloir l'effacer ?" + msgid "Select color" msgstr "Choisir la couleur" @@ -14978,9 +15015,19 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP." -#, fuzzy -#~ msgid "(Default)" -#~ msgstr "(défaut)" +#~ msgid "" +#~ "Unable to find alternative XMPP connection methods after failing to " +#~ "connect directly." +#~ msgstr "" +#~ "Impossible de trouver une autre méthode de connexion XMPP après l'échec " +#~ "de connexion directe." + +#~ msgid "" +#~ "The last action you attempted could not be performed because you are over " +#~ "the rate limit. Please wait 10 seconds and try again.\n" +#~ msgstr "" +#~ "La dernière action n'a pas pu être effectuée car vous avez dépassé le " +#~ "quota limite. Veuillez attendre 10 secondes et réessayer.\n" #~ msgid "Install Theme" #~ msgstr "Installer un thème" @@ -14994,12 +15041,6 @@ #~ msgid "Change _status to:" #~ msgstr "_Changer l'état en :" -#, fuzzy -#~ msgid "The root certificate this one claims to be issued by is unknown." -#~ msgstr "" -#~ "Le certificat racine dont est prétendu issu ce certificat est inconnu de " -#~ "Pidgin." - #~ msgid "Send instant messages over multiple protocols" #~ msgstr "Envoie des messages instantanés en utilisant divers protocoles"
--- a/po/or.po Thu Feb 11 04:38:48 2010 +0000 +++ b/po/or.po Thu Feb 11 20:14:51 2010 +0000 @@ -1,14 +1,14 @@ -# translation of pidgin.or.po to Oriya +# translation of or.po to Oriya # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Manoj Kumar Giri <mgiri@redhat.com>, 2009, 2010. msgid "" msgstr "" -"Project-Id-Version: pidgin.or\n" +"Project-Id-Version: or\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-06 16:30-0800\n" -"PO-Revision-Date: 2010-02-02 17:59+0530\n" +"POT-Creation-Date: 2010-02-10 22:30-0800\n" +"PO-Revision-Date: 2010-02-11 11:31+0530\n" "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n" "Language-Team: Oriya <oriya-it@googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -29,6 +29,7 @@ "\n" "\n" "\n" +"\n" "X-Generator: KBabel 1.11.4\n" #. Translators may want to transliterate the name. @@ -4643,9 +4644,8 @@ msgid "(Code %s)" msgstr "(ସଂକେତ %s)" -#, fuzzy msgid "A custom smiley in the message is too large to send." -msgstr "ସଂଦେଶ ପଠାଇବାକୁ ଅସମର୍ଥ: ସଂଦେଶ ବହୁତ ବଡ ଅଟେ ।" +msgstr "ସଂଦେଶରେ ଥିବା ଇଚ୍ଛାରୂପଣ smiley ପଠାଇବା ପାଇଁ ଅତ୍ୟଧିକ ବଡ ଅଟେ।" msgid "XML Parse error" msgstr "XML ପାର୍ସ ଭୂଲ" @@ -6628,9 +6628,9 @@ msgid "Server port" msgstr "ସରଭର ପୋର୍ଟ" -#, fuzzy, c-format +#, c-format msgid "Received unexpected response from %s: %s" -msgstr "%s ରୁ ଅପ୍ରତ୍ୟାଶିତ ଉତ୍ତର ଗ୍ରହଣ କରିଅଛି" +msgstr "%s ରୁ ଅପ୍ରତ୍ୟାଶିତ ଉତ୍ତର ଗ୍ରହଣ କରିଅଛି: %s" #, c-format msgid "Received unexpected response from %s" @@ -6649,6 +6649,13 @@ msgid "Error requesting %s: %s" msgstr "%s କୁ ଅନୁରୋଧ କରିବାରେ ତ୍ରୁଟି: %s" +msgid "" +"Server requested that you fill out a CAPTCHA in order to sign in, but this " +"client does not currently support CAPTCHAs." +msgstr "" +"ସର୍ଭର ଅନୁରୋଧ କରିଥିଲା ଯେ ଆପଣ ଗୋଟିଏ CAPTCHA କୁ ସାଇନ ଇନ କରିବା ପାଇଁ ପୁରଣ କରନ୍ତୁ, କିନ୍ତୁ ଏହି " +"କ୍ଲାଏଣ୍ଟ ବର୍ତ୍ତମାନ CAPTCHA ଗୁଡ଼ିକୁ ସମର୍ଥନ କରେନାହିଁ।" + msgid "AOL does not allow your screen name to authenticate here" msgstr "ଏଠାରେ ବୈଧିକୃତ ହେବା ପାଇଁ AOL ଆପଣଙ୍କର ପରଦା ନାମକୁ ଅନୁମତି ଦେଇନଥାଏ" @@ -6658,13 +6665,6 @@ msgid "Invalid chat room name" msgstr "ଅବୈଧ ଚାର୍ଟ କୋଠରୀ ନାମ" -msgid "" -"The last action you attempted could not be performed because you are over " -"the rate limit. Please wait 10 seconds and try again.\n" -msgstr "" -"ଆପଣ ଚେଷ୍ଟାକରିଥିବା ଅନ୍ତିମ କାର୍ଯ୍ୟକୁ କାର୍ଯ୍ୟକାରୀ କରିହେଲା ନାହିଁ କାରଣ ଆପଣ ହାର ସୀମା ଉପରେ ଅଛନ୍ତି। " -"ଦୟାକରି 10 ସେକଣ୍ଡ ଅପେକ୍ଷା କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।\n" - msgid "Received invalid data on connection with server" msgstr "ସର୍ଭର ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ଅବୈଧ ତଥ୍ୟ ଗ୍ରହଣ କରିଥିଲା" @@ -11796,9 +11796,8 @@ msgid "Mongolian" msgstr "ମୋଙ୍ଗୋଲିୟାନ" -#, fuzzy msgid "Marathi" -msgstr "ଗୁଜୁରାଟୀ" +msgstr "ମୋରାଠୀ" msgid "Malay" msgstr "ମାଳୟ" @@ -11818,9 +11817,8 @@ msgid "Occitan" msgstr "ଓସିଟାନ" -#, fuzzy msgid "Oriya" -msgstr "ଅପେରା" +msgstr "ଓଡ଼ିଆ" msgid "Punjabi" msgstr "ପଞ୍ଜାବୀ" @@ -13522,6 +13520,9 @@ msgid "_Save File" msgstr "ଫାଇଲକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_S)" +msgid "Do you really want to clear?" +msgstr "ଆପଣ ପ୍ରକୃତରେ ବିଲୋପ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?" + msgid "Select color" msgstr "ରଙ୍ଗ ମନୋନୀତକର" @@ -14714,6 +14715,3 @@ #. * description msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "ଏହି ପ୍ଲଗଇନ XMPP ସର୍ଭରଗୁଡିକୁ କିମ୍ବା ଗ୍ରାହକଗୁଡିକୁ ତ୍ରୁଟିନିବାରଣ କରିବା ପାଇଁ ଉପଯୋଗୀ ହୋଇଥାଏ।" - -#~ msgid "%s" -#~ msgstr "%s"