Mercurial > pidgin
changeset 29361: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 (2010-02-11) |
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"