# HG changeset patch # User Mark Doliner # Date 1266178800 0 # Node ID 89858e3a0464044004b21e00dca8084d1104d218 # Parent 97974856c920b8d8f6c82e32d94016d8a17872ee# Parent 2fc38fb61418befd97a2064aa80df1ad814d4878 merge of '2aa174ad4c0e50a229c8c951b836b5f788fe7393' and '633db1f2c83f666e4ac7a26601725cb01233681e' diff -r 2fc38fb61418 -r 89858e3a0464 libpurple/protocols/jabber/message.c --- a/libpurple/protocols/jabber/message.c Sun Feb 14 06:57:53 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Sun Feb 14 20:20:00 2010 +0000 @@ -930,20 +930,13 @@ } static gboolean -jabber_conv_support_custom_smileys(const PurpleConnection *gc, +jabber_conv_support_custom_smileys(JabberStream *js, PurpleConversation *conv, const gchar *who) { - JabberStream *js = (JabberStream *) gc->proto_data; JabberBuddy *jb; JabberChat *chat; - if (!js) { - purple_debug_error("jabber", - "jabber_conv_support_custom_smileys: could not find stream\n"); - return FALSE; - } - switch (purple_conversation_get_type(conv)) { case PURPLE_CONV_TYPE_IM: jb = jabber_buddy_find(js, who, FALSE); @@ -979,7 +972,7 @@ purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, jm->to, account); - if (jabber_conv_support_custom_smileys(jm->js->gc, conv, jm->to)) { + if (jabber_conv_support_custom_smileys(jm->js, conv, jm->to)) { GList *found_smileys = jabber_message_xhtml_find_smileys(xhtml); if (found_smileys) { diff -r 2fc38fb61418 -r 89858e3a0464 libpurple/proxy.c --- a/libpurple/proxy.c Sun Feb 14 06:57:53 2010 +0000 +++ b/libpurple/proxy.c Sun Feb 14 20:20:00 2010 +0000 @@ -2100,8 +2100,12 @@ addr = connect_data->hosts->data; connect_data->hosts = g_slist_remove(connect_data->hosts, connect_data->hosts->data); #ifdef HAVE_INET_NTOP - inet_ntop(addr->sa_family, &((struct sockaddr_in *)addr)->sin_addr, - ipaddr, sizeof(ipaddr)); + if (addr->sa_family == AF_INET) + inet_ntop(addr->sa_family, &((struct sockaddr_in *)addr)->sin_addr, + ipaddr, sizeof(ipaddr)); + else if (addr->sa_family == AF_INET6) + inet_ntop(addr->sa_family, &((struct sockaddr_in6 *)addr)->sin6_addr, + ipaddr, sizeof(ipaddr)); #else memcpy(ipaddr, inet_ntoa(((struct sockaddr_in *)addr)->sin_addr), sizeof(ipaddr)); diff -r 2fc38fb61418 -r 89858e3a0464 po/cs.po --- a/po/cs.po Sun Feb 14 06:57:53 2010 +0000 +++ b/po/cs.po Sun Feb 14 20:20:00 2010 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: pidgin VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-14 12:19-0800\n" -"PO-Revision-Date: 2010-01-14 21:08+0100\n" +"POT-Creation-Date: 2010-02-13 23:29-0800\n" +"PO-Revision-Date: 2010-02-12 22:16+0100\n" "Last-Translator: David Vachulka \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -4669,6 +4669,9 @@ msgid "(Code %s)" msgstr "(Kód %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "Vlastní smajlík ve zprávě je pro poslání příliš velký." + msgid "XML Parse error" msgstr "Chyba zpracování XML" @@ -6654,7 +6657,10 @@ msgid "Server port" msgstr "Port serveru" -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "Přijata neočekávaná odpověď od %s: %s" + #, c-format msgid "Received unexpected response from %s" msgstr "Přijata neočekávaná odpověď od %s" @@ -6672,6 +6678,13 @@ msgid "Error requesting %s: %s" msgstr "Chyba žádosti %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 "" +"Server požádal o vyplnění CAPTCHA pro přihlášení, ale klient v současné době " +"CAPTCHA nepodporuje." + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL neumožňuje ověřit jméno tady" @@ -7244,14 +7257,6 @@ "[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné " "znaky.]" -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 "" -"Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože " -"jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to " -"znovu.\n" - #, c-format msgid "You have been disconnected from chat room %s." msgstr "Byl jste odpojen z místnosti chatu %s." @@ -11911,6 +11916,9 @@ msgid "Occitan" msgstr "Occitan" +msgid "Oriya" +msgstr "Oriya" + msgid "Punjabi" msgstr "Punjabi" @@ -13619,6 +13627,9 @@ msgid "_Save File" msgstr "_Uložit soubor" +msgid "Do you really want to clear?" +msgstr "Opravdu chcete vymazat?" + msgid "Select color" msgstr "Zvolte barvu" @@ -14813,6 +14824,14 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP." #~ 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 "" +#~ "Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože " +#~ "jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to " +#~ "znovu.\n" + +#~ msgid "" #~ "Unable to find alternative XMPP connection methods after failing to " #~ "connect directly." #~ msgstr "" diff -r 2fc38fb61418 -r 89858e3a0464 po/nn.po --- a/po/nn.po Sun Feb 14 06:57:53 2010 +0000 +++ b/po/nn.po Sun Feb 14 20:20:00 2010 +0000 @@ -1,16 +1,20 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Pidgin 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-13 17:24-0800\n" -"PO-Revision-Date: 2010-01-07 15:35+0100\n" +"POT-Creation-Date: 2010-02-13 23:32-0800\n" +"PO-Revision-Date: 2010-02-12 23:52+0100\n" "Last-Translator: Yngve Spjeld Landro \n" "Language-Team: \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-Poedit-Bookmarks: -1,1060,1063,3712,-1,-1,-1,-1,-1,-1\n" #. Translators may want to transliterate the name. #. It is not to be translated. @@ -4697,6 +4701,9 @@ msgid "(Code %s)" msgstr "(Kode %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "Eit tilpassa smilefjes i meldinga er for stor til å kunna sendast." + msgid "XML Parse error" msgstr "Feil i XML-tolkinga" @@ -6693,7 +6700,10 @@ msgid "Server port" msgstr "Tenarport" -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "Fekk uventa svar frå %s: %s" + #, c-format msgid "Received unexpected response from %s" msgstr "Fekk uventa svar frå %s" @@ -6711,6 +6721,13 @@ msgid "Error requesting %s: %s" msgstr "Klarte ikkje å henta %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 "" +"Tenaren bad deg skriva inn ein CAPTCHA for å logga deg på, men denne " +"klienten støttar enno ikkje CAPTCHA-er." + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL tillèt ikkje at brukarnamnet ditt kan autentiserast her" @@ -7267,14 +7284,6 @@ "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege " "teikn.]" -# mengdegrensa? -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 "" -"Klarte ikkje å utføra den siste handlinga sidan du er over mengdegrensa. " -"Vent i 10 sekund og prøv igjen.\n" - #, c-format msgid "You have been disconnected from chat room %s." msgstr "Du er blitt fråkopla praterommet %s." @@ -11934,6 +11943,9 @@ msgid "Mongolian" msgstr "Mongolsk" +msgid "Marathi" +msgstr "Marathi" + msgid "Malay" msgstr "Malayisk" @@ -11952,6 +11964,9 @@ msgid "Occitan" msgstr "Oksitansk" +msgid "Oriya" +msgstr "Oriya" + msgid "Punjabi" msgstr "Panjabi" @@ -13673,6 +13688,9 @@ msgid "_Save File" msgstr "_Lagra fila" +msgid "Do you really want to clear?" +msgstr "Vil du verkeleg tømma?" + msgid "Select color" msgstr "Vel farge" @@ -14876,6 +14894,14 @@ msgstr "" "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar." +# mengdegrensa? +#~ 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 "" +#~ "Klarte ikkje å utføra den siste handlinga sidan du er over mengdegrensa. " +#~ "Vent i 10 sekund og prøv igjen.\n" + #~ msgid "%s" #~ msgstr "%s"