# HG changeset patch # User Paul Aurich # Date 1266287675 0 # Node ID 2c955a6f1fa877a86b27101b4a0a278a30b23157 # Parent 529233281dfe6394feb07af010c1459fce1c8c4c# Parent d48173c456060efc6f075bbc4649fe0444356835 propagate from branch 'im.pidgin.pidgin' (head bd1da3489eef317a805524eef94fd4e08719159b) to branch 'im.pidgin.pidgin.next.minor' (head b1a88e6744bf54989e88f6d91369c834026683ac) diff -r 529233281dfe -r 2c955a6f1fa8 ChangeLog --- a/ChangeLog Tue Feb 16 02:21:33 2010 +0000 +++ b/ChangeLog Tue Feb 16 02:34:35 2010 +0000 @@ -80,6 +80,9 @@ * The default value for the file transfer proxies is automatically updated when an account connects, if it is still the old (broken) default (from 'proxy.jabber.org' to 'proxy.eu.jabber.org'). + * Fix an issue where libpurple created duplicate buddies if the roster + contains a buddy in two groups that differ only by case + (e.g. "XMPP" and "xmpp") (or not at all). Yahoo: * Don't send and tags. (Fartash Faghri) diff -r 529233281dfe -r 2c955a6f1fa8 libpurple/protocols/jabber/roster.c --- a/libpurple/protocols/jabber/roster.c Tue Feb 16 02:21:33 2010 +0000 +++ b/libpurple/protocols/jabber/roster.c Tue Feb 16 02:34:35 2010 +0000 @@ -259,7 +259,16 @@ seen_empty = TRUE; } - groups = g_slist_prepend(groups, group_name); + /* + * See the note in add_purple_buddy_to_groups; the core handles + * names case-insensitively and this is required to not + * end up with duplicates if a buddy is in, e.g., + * 'XMPP' and 'xmpp' + */ + if (g_slist_find_custom(groups, group_name, (GCompareFunc)purple_utf8_strcasecmp)) + g_free(group_name); + else + groups = g_slist_prepend(groups, group_name); } add_purple_buddy_to_groups(js, jid, name, groups); diff -r 529233281dfe -r 2c955a6f1fa8 po/ChangeLog --- a/po/ChangeLog Tue Feb 16 02:21:33 2010 +0000 +++ b/po/ChangeLog Tue Feb 16 02:34:35 2010 +0000 @@ -6,7 +6,10 @@ * Afrikaans translation updated (Friedel Wolff) * Albanian translation updated (Besnik Bleta) * Bengali translation updated (Jamil Ahmed) + * Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R. Liu) * Chinese (Simplified) translation updated (Aron Xu) + * Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R. + Liu) * Czech translation updated (David Vachulka) * French translation updated (Éric Boumaour) * German translation updated (Björn Voigt and Jochen Kemnade) @@ -22,6 +25,7 @@ * Polish win32 installer updated (Piotr Drąg) * Punjabi translation updated (Amanpreet Singh Alam) * Russian translation updated (Антон Самохвалов) + * Slovak translation updated (loptosko) * Slovenian translation updated (Martin Srebotnjak) * Spanish translation updated (Francisco Javier F. Serrador) * Tamil translation updated (I. Felix) diff -r 529233281dfe -r 2c955a6f1fa8 po/sk.po --- a/po/sk.po Tue Feb 16 02:21:33 2010 +0000 +++ b/po/sk.po Tue Feb 16 02:34:35 2010 +0000 @@ -1,7 +1,7 @@ # translation of pidgin.po to Slovak # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the Pidgin package. -# loptosko , 2007, 2008, 2009. +# loptosko , 2007, 2008, 2009, 2010. # Jozef Káčer , 2007. # Ivan Masár , 2007. # Pavol Klačanský , 2008. @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Pidgin 2.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-14 20:36-0500\n" -"PO-Revision-Date: 2009-09-03 14:47+0100\n" +"POT-Creation-Date: 2010-02-15 18:31-0800\n" +"PO-Revision-Date: 2010-02-15 21:06+0100\n" "Last-Translator: loptosko \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -635,9 +635,8 @@ msgid "Enable Sounds" msgstr "Zapnúť zvuky" -#, fuzzy msgid "You are not connected." -msgstr "Nepodarilo sa pripojiť" +msgstr "Nie ste pripojený." msgid " " msgstr " " @@ -649,9 +648,8 @@ msgstr[1] "Zoznam %d používateľov:\n" msgstr[2] "Zoznam %d používateľov:\n" -#, fuzzy msgid "Supported debug options are: plugins version" -msgstr "Podporované ladiace voľby sú: version" +msgstr "Podporované ladiace voľby sú: plugins version" msgid "No such command (in this context)." msgstr "Tento príkaz neexistuje (v tejto situácii)." @@ -1529,10 +1527,10 @@ #, c-format msgid "TinyURL for above: %s" -msgstr "" +msgstr "TinyURL pre vyššie: %s" msgid "Please wait while TinyURL fetches a shorter URL ..." -msgstr "" +msgstr "Čakajte, prosím, kým TinyURL získa kratšiu URL ..." msgid "Only create TinyURL for URLs of this length or greater" msgstr "TinyURL vytvárať iba pre adresy tejto dĺžky alebo dlhšie" @@ -1552,6 +1550,7 @@ msgid "Online" msgstr "Prihlásený" +#. primative, no, id, name msgid "Offline" msgstr "Odhlásený" @@ -1661,6 +1660,8 @@ "The certificate is not trusted because no certificate that can verify it is " "currently trusted." msgstr "" +"Certifikát nie je dôverihodný, pretože žiadny z certifikátov, ktoré ho môžu " +"overiť, momentálne nie je dôverihodný. " msgid "The certificate is not valid yet." msgstr "Certifikát zatiaľ nie je platný." @@ -1892,9 +1893,9 @@ msgid "Resolver process exited without answering our request" msgstr "Proces resolvera bol ukončený bez toho, aby odpovedal na požiadavku" -#, fuzzy, c-format +#, c-format msgid "Error converting %s to punycode: %d" -msgstr "Chyba pri preklade %s: %d" +msgstr "Chyba pri preklade %s na punycode: %d" #, c-format msgid "Thread creation failure: %s" @@ -1941,6 +1942,9 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n" msgstr "%s nie je bežný súbor. Odmietam ho prepísať.\n" +msgid "File is not readable." +msgstr "Nie je možné čítať súbor." + #, c-format msgid "%s wants to send you %s (%s)" msgstr "Používateľ %s vám chce poslať súbor %s (%s)" @@ -2203,17 +2207,14 @@ msgid "A non-recoverable Farsight2 error has occurred." msgstr "Vyskytla sa závažná chyba v Farsight2." -#, fuzzy msgid "Conference error" -msgstr "Chyba konferencie." - -#, fuzzy +msgstr "Chyba konferencie" + msgid "Error with your microphone" -msgstr "Chyba mikrofónu." - -#, fuzzy +msgstr "Chyba mikrofónu" + msgid "Error with your webcam" -msgstr "Chyba webkamery." +msgstr "Chyba webkamery" #, c-format msgid "Error creating session: %s" @@ -3149,10 +3150,12 @@ msgid "Add to chat..." msgstr "Pridať na chat..." +#. 0 #. Global msgid "Available" msgstr "Prihlásený" +#. 1 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message #. Away stuff @@ -3779,6 +3782,13 @@ msgid "Server requires plaintext authentication over an unencrypted stream" msgstr "Server vyžaduje textovú autentifikáciu cez nezašifrovaný prúd" +#. This should never happen! +msgid "Invalid response from server" +msgstr "Chybná odpoveď zo servera" + +msgid "Server does not use any supported authentication method" +msgstr "Server nepoužíva žiadny z podporovaných spôsobov autentifikácie" + #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " @@ -3790,25 +3800,34 @@ msgid "Plaintext Authentication" msgstr "Čisto textová autentifikácia" -msgid "SASL authentication failed" -msgstr "SASL autentifikácia zlyhala" - -msgid "Invalid response from server" -msgstr "Chybná odpoveď zo servera" - -msgid "Server does not use any supported authentication method" -msgstr "Server nepoužíva žiadny z podporovaných spôsobov autentifikácie" - msgid "You require encryption, but it is not available on this server." msgstr "Požadovali ste šifrovanie, ale na tomto serveri nie je dostupné." msgid "Invalid challenge from server" msgstr "Chybná výzva zo servera" +msgid "Server thinks authentication is complete, but client does not" +msgstr "Server považuje autentizáciu za dokončenú, ale klient nie" + +msgid "SASL authentication failed" +msgstr "SASL autentifikácia zlyhala" + #, c-format msgid "SASL error: %s" msgstr "Chyba SASL: %s" +msgid "Unable to canonicalize username" +msgstr "Nebolo možné kanonikalizovať používateľské meno" + +msgid "Unable to canonicalize password" +msgstr "Nebolo možné kanonikalizovať heslo" + +msgid "Malicious challenge from server" +msgstr "Nebezpečná výzva zo servera" + +msgid "Unexpected response from server" +msgstr "Nečakaná odpoveď zo servera" + msgid "The BOSH connection manager terminated your session." msgstr "Manažér pripojení BOSH prerušil vaše sedenie." @@ -3909,13 +3928,16 @@ msgid "Resource" msgstr "Zdroj" +msgid "Uptime" +msgstr "Čas v prevádzke" + +msgid "Logged Off" +msgstr "Odhlásený" + #, c-format msgid "%s ago" msgstr "%s dozadu" -msgid "Logged Off" -msgstr "Odhlásený" - msgid "Middle Name" msgstr "Prostredné meno" @@ -3964,12 +3986,14 @@ msgid "Log Out" msgstr "Odhlásiť" +#. 2 msgid "Chatty" msgstr "Zhovorčivý" msgid "Extended Away" msgstr "Dlhšie neprítomný" +#. 3 msgid "Do Not Disturb" msgstr "Nerušiť" @@ -4104,12 +4128,6 @@ msgid "Ping timed out" msgstr "Ping vypršal" -msgid "" -"Unable to find alternative XMPP connection methods after failing to connect " -"directly." -msgstr "" -"Neboli nájdené iné metódy XMPP spojenia po tom čo zlyhalo priame spojenie." - msgid "Invalid XMPP ID" msgstr "Chybné XMPP ID" @@ -4234,6 +4252,7 @@ msgid "None (To pending)" msgstr "Žiadny (Čaká sa)" +#. 0 msgid "None" msgstr "Žiadne" @@ -4541,9 +4560,8 @@ msgid "configure: Configure a chat room." msgstr "configure: Nastavenie miestnosti chatu." -#, fuzzy msgid "part [message]: Leave the room." -msgstr "part [miestnosť]: Opustí miestnosť." +msgstr "part [správa]: Opustí miestnosť." msgid "register: Register with a chat room." msgstr "register: Zaregistrovať sa v diskusnej miestnosti." @@ -4663,6 +4681,9 @@ msgid "(Code %s)" msgstr "(Kód %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "Vlastný smajlík v správe je na odoslanie príliš veľký." + msgid "XML Parse error" msgstr "Chyba pri spracovaní XML" @@ -5071,6 +5092,10 @@ msgid "Your new MSN friendly name is too long." msgstr "Vaše nové MSN priateľské meno je príliš dlhé." +#, c-format +msgid "Set friendly name for %s." +msgstr "Vyplňte priateľské meno pre %s." + msgid "Set your friendly name." msgstr "Vyplňte vaše priateľské meno." @@ -5203,13 +5228,13 @@ "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL " "knižnicu." -#, fuzzy, c-format +#, c-format msgid "" "Unable to add the buddy %s because the username is invalid. Usernames must " "be valid email addresses." msgstr "" -"Nepodarilo sa pridať priateľa %s, pretože používateľské meno je chybné. " -"Používateľské mená musia byť správna e-mailová adresa." +"Nepodarilo sa pridať priateľa %s pretože používateľské meno je chybné. " +"Používateľské mená musia byť platná e-mailová adresa." msgid "Unable to Add" msgstr "Nepodarilo sa pridať" @@ -5432,9 +5457,8 @@ msgid "Unknown error (%d)" msgstr "Neznáma chyba (%d)" -#, fuzzy msgid "Unable to remove user" -msgstr "Nebolo možné pridať používateľa" +msgstr "Nebolo možné odstrániť používateľa" msgid "Mobile message was not sent because it was too long." msgstr "Mobilná správa nebola odoslaná, pretože bola príliš dlhá." @@ -5670,28 +5694,82 @@ msgid "%s has removed you from his or her buddy list." msgstr "Používateľ %s vás odstránil zo svojho zoznamu priateľov." +#. 1 +msgid "Angry" +msgstr "Nahnevaný" + +#. 2 +msgid "Excited" +msgstr "Vzrušený" + +#. 3 +msgid "Grumpy" +msgstr "Urazený" + +#. 4 +msgid "Happy" +msgstr "Šťastný" + +#. 5 +msgid "In Love" +msgstr "Zaľúbený" + +#. 6 +msgid "Invincible" +msgstr "Neprekonateľný" + +#. 7 +msgid "Sad" +msgstr "Smutný" + +#. 8 +msgid "Hot" +msgstr "Horúčava" + +#. 9 +msgid "Sick" +msgstr "Chorý" + +#. 10 +msgid "Sleepy" +msgstr "Ospalý" + #. show current mood -#, fuzzy msgid "Current Mood" -msgstr "Vaša aktuálna nálada" +msgstr "Aktuálna nálada" #. add all moods to list -#, fuzzy msgid "New Mood" -msgstr "Nálada používateľa" - -#, fuzzy +msgstr "Nová nálada" + msgid "Change your Mood" -msgstr "Zmeniť heslo" - -#, fuzzy +msgstr "Zmeniť vašu náladu" + msgid "How do you feel right now?" -msgstr "Momentálne nie som prítomný" +msgstr "Ako sa práve cítite?" + +msgid "The PIN you entered is invalid." +msgstr "Zadaný PIN je neplatný" + +msgid "The PIN you entered has an invalid length [4-10]." +msgstr "Zadaný PIN má chybnú dĺžku [4-10]." + +msgid "The PIN is invalid. It should only consist of digits [0-9]." +msgstr "PIN je neplatný. Mal by obsahovať iba číslice [0-9]." + +msgid "The two PINs you entered do not match." +msgstr "Dva PINy ktoré ste zadali sa nezhodujú." + +msgid "The name you entered is invalid." +msgstr "Zadané meno je neplatné" + +msgid "" +"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." +msgstr "Narodeniny sú zadané chybne. Správny formát má byť: 'RRRR-MM-DD'." #. show error to user -#, fuzzy msgid "Profile Update Error" -msgstr "Chyba zápisu" +msgstr "Chyba aktualizácie profilu" #. no profile information yet, so we cannot update #. (reference: "libpurple/request.h") @@ -5699,354 +5777,300 @@ msgstr "Profil" msgid "Your profile information is not yet retrieved. Please try again later." -msgstr "" +msgstr "Údaje z vášho profilu nie sú načítané. Prosím, skúste to znovu neskôr." #. pin -#, fuzzy msgid "PIN" -msgstr "UIN" +msgstr "PIN" msgid "Verify PIN" -msgstr "" +msgstr "Overiť PIN" #. display name -#, fuzzy msgid "Display Name" -msgstr "Priezvisko" +msgstr "Používateľské meno" #. hidden msgid "Hide my number" -msgstr "" +msgstr "Skryť moje číslo" #. mobile number -#, fuzzy msgid "Mobile Number" -msgstr "Telefónne číslo na mobilný telefón" - -#, fuzzy +msgstr "Číslo na mobilný telefón" + msgid "Update your Profile" -msgstr "Profil používateľa" +msgstr "Aktualizovať váš profil" msgid "Here you can update your MXit profile" -msgstr "" +msgstr "Tu môžete aktualizovať váš MXit profil" msgid "View Splash" -msgstr "" +msgstr "Zobraziť úvod" msgid "There is no splash-screen currently available" -msgstr "" - -#, fuzzy +msgstr "Nie je dostupná žiadna úvodná obrazovka" + msgid "About" -msgstr "O mne" +msgstr "O module" #. display / change mood -#, fuzzy msgid "Change Mood..." -msgstr "Zmeniť heslo..." +msgstr "Zmeniť náladu..." #. display / change profile -#, fuzzy msgid "Change Profile..." -msgstr "Zmeniť heslo..." +msgstr "Zmeniť profil..." #. display splash-screen -#, fuzzy msgid "View Splash..." -msgstr "Zobraziť záznam..." +msgstr "Zobraziť úvod..." #. display plugin version -#, fuzzy msgid "About..." -msgstr "O mne" +msgstr "O module..." #. the file is too big -#, fuzzy msgid "The file you are trying to send is too large!" -msgstr "Správa je príliš dlhá." - -msgid "" -"Unable to connect to the mxit HTTP server. Please check your server server " -"settings." -msgstr "" - -#, fuzzy +msgstr "Súbor ktorý chcete poslať je príliš veľký!" + +msgid "" +"Unable to connect to the MXit HTTP server. Please check your server settings." +msgstr "" +"Nepodarilo sa pripojiť na MXit HTTP server. Skontrolujte, prosím, vaše " +"nastavenie serveru." + msgid "Logging In..." -msgstr "Prihlasuje sa" - -#, fuzzy -msgid "" -"Unable to connect to the mxit server. Please check your server server " -"settings." -msgstr "" -"Nepodarilo sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý " -"sa chcete pripojiť." - -#, fuzzy +msgstr "Prihlasuje sa..." + +msgid "" +"Unable to connect to the MXit server. Please check your server settings." +msgstr "" +"Nepodarilo sa pripojiť na MXit server. Skontrolujte, prosím, vaše nastavenie " +"serveru." + msgid "Connecting..." -msgstr "Pripája sa" +msgstr "Pripája sa..." + +msgid "The nick name you entered is invalid." +msgstr "Zadaná prezývka je neplatná." + +msgid "The PIN you entered has an invalid length [7-10]." +msgstr "Zadaný PIN má neplatnú dĺžku [7-10]." #. mxit login name msgid "MXit Login Name" -msgstr "" +msgstr "MXit prihlasovacie meno" #. nick name -#, fuzzy msgid "Nick Name" msgstr "Prezývka" #. show the form to the user to complete -#, fuzzy msgid "Register New MXit Account" -msgstr "Registrovať nový XMPP účet" - -#, fuzzy +msgstr "Registrovať nový MXit účet" + msgid "Please fill in the following fields:" -msgstr "Prosím, vyplňte nasledujúce políčka" +msgstr "Prosím, vyplňte nasledujúce políčka:" #. no reply from the WAP site msgid "Error contacting the MXit WAP site. Please try again later." -msgstr "" +msgstr "Chyba kontaktovania MXit WAP stránky. Prosím, skúste to znovu neskôr." #. wapserver error #. server could not find the user msgid "" "MXit is currently unable to process the request. Please try again later." msgstr "" +"MXit momentálne nedokáže spracovať požiadavku. Prosím, skúste to znovu " +"neskôr." msgid "Wrong security code entered. Please try again later." -msgstr "" +msgstr "Zadaný nesprávny bezpečnostný kód. Prosím, skúste to znovu neskôr." msgid "Your session has expired. Please try again later." -msgstr "" +msgstr "Vaše prihlásenie vypršalo. Prosím, skúste to znovu neskôr." msgid "Invalid country selected. Please try again." -msgstr "" +msgstr "Vybraná chybná krajina. Prosím, skúste to znovu neskôr." msgid "Username is not registered. Please register first." msgstr "" +"Používateľské meno nie je registrované. Prosím, najskôr sa zaregistrujte." msgid "Username is already registered. Please choose another username." -msgstr "" - -#, fuzzy +msgstr "Používateľské meno už je registrované. Prosím, vyberte si iné." + msgid "Internal error. Please try again later." -msgstr "Server je nedostupný; skúste to neskôr" +msgstr "Vnútorná chyba. Prosím, skúste to znovu neskôr." msgid "You did not enter the security code" -msgstr "" - -#, fuzzy +msgstr "Nezadali ste bezpečnostný kód" + msgid "Security Code" -msgstr "Bezpečnosť zapnutá" +msgstr "Bezpečnostný kód" #. ask for input -#, fuzzy msgid "Enter Security Code" -msgstr "Zadajte kód" - -#, fuzzy +msgstr "Zadajte bezpečnostný kód" + msgid "Your Country" -msgstr "Krajina" - -#, fuzzy +msgstr "Vaša krajina" + msgid "Your Language" -msgstr "Preferovaný jazyk" +msgstr "Váš jazyk" #. display the form to the user and wait for his/her input -#, fuzzy msgid "MXit Authorization" -msgstr "Vyžadovať autorizáciu" +msgstr "MXit autorizácia" msgid "MXit account validation" -msgstr "" - -#, fuzzy +msgstr "Overenie MXit účtu" + msgid "Retrieving User Information..." -msgstr "Podrobnosti o serveri" - -#, fuzzy +msgstr "Načítavajú sa používateľské informácie..." + +msgid "Loading menu..." +msgstr "Načítava sa ponuka..." + msgid "Status Message" -msgstr "Odoslané správy" - -#, fuzzy +msgstr "Správa statusu" + msgid "Hidden Number" -msgstr "Prostredné meno" - -#, fuzzy +msgstr "Skryté číslo" + msgid "Your Mobile Number..." -msgstr "Nastaviť číslo mobilného telefónu..." +msgstr "Vaše mobilné číslo..." #. Configuration options #. WAP server (reference: "libpurple/accountopt.h") -#, fuzzy msgid "WAP Server" -msgstr "Server" - -#, fuzzy +msgstr "WAP server" + msgid "Connect via HTTP" -msgstr "Pripojiť sa pomocou TCP" +msgstr "Pripojiť sa cez HTTP" msgid "Enable splash-screen popup" -msgstr "" +msgstr "Zapnúť úvodnú vyskakovaciu obrazovku" #. we must have lost the connection, so terminate it so that we can reconnect msgid "We have lost the connection to MXit. Please reconnect." -msgstr "" +msgstr "Stratili sme pripojenie na MXit. Prosím, pripojte sa znovu." #. packet could not be queued for transmission -#, fuzzy msgid "Message Send Error" -msgstr "Chyba správy XMPP" - -#, fuzzy +msgstr "Chyba odoslania správy" + msgid "Unable to process your request at this time" -msgstr "Nepodarilo sa preložiť meno hostiteľa" +msgstr "Nepodarilo sa teraz spracovať vašu požiadavku" msgid "Timeout while waiting for a response from the MXit server." -msgstr "" - -#, fuzzy +msgstr "Vypršal čas pri čakaní na odpoveď z MXit serveru." + msgid "Successfully Logged In..." -msgstr "Podarilo sa pripojiť do Qun" - -#, fuzzy +msgstr "Úspešne prihlásený..." + +#, c-format +msgid "" +"%s sent you an encrypted message, but it is not supported on this client." +msgstr "%s vám poslal zašifrovanú správu ale tento klient to nepodporuje." + msgid "Message Error" -msgstr "Chyba správy XMPP" +msgstr "Chyba správy" msgid "Cannot perform redirect using the specified protocol" -msgstr "" - -#, fuzzy +msgstr "Nebolo možné vykonať presmerovanie pomocou zadaného protokolu" + +msgid "An internal MXit server error occurred." +msgstr "Vyskytla sa vnútorná chyba MXit serveru." + +#, c-format +msgid "Login error: %s (%i)" +msgstr "Chyba prihlásenia: %s (%i)" + +#, c-format +msgid "Logout error: %s (%i)" +msgstr "Chyba odhlásenia: %s (%i)" + msgid "Contact Error" -msgstr "Chyba pripojenia" - -#, fuzzy +msgstr "Chyba kontaktu" + msgid "Message Sending Error" -msgstr "Chyba správy XMPP" - -#, fuzzy +msgstr "Chyba odoslania správy" + msgid "Status Error" -msgstr "Chyba prúdu" - -#, fuzzy +msgstr "Chyba stavu" + msgid "Mood Error" -msgstr "Chyba ikony" - -#, fuzzy +msgstr "Chyba nálady" + msgid "Invitation Error" -msgstr "Chyba pri rušení registrácie" - -#, fuzzy +msgstr "Chyba pozvánky" + msgid "Contact Removal Error" -msgstr "Chyba pripojenia" - -#, fuzzy +msgstr "Chyba odstránenia kontaktu" + msgid "Subscription Error" -msgstr "Prihlásenie" - -#, fuzzy +msgstr "Chyba zapísania" + msgid "Contact Update Error" -msgstr "Chyba pripojenia" - -#, fuzzy +msgstr "Chyba aktualizácie kontaktu" + msgid "File Transfer Error" -msgstr "Prenos súborov" - -#, fuzzy +msgstr "Chyba prenosu súboru" + msgid "Cannot create MultiMx room" -msgstr "Nebolo možné vytvoriť sledovanie" - -#, fuzzy +msgstr "Nebolo možné vytvoriť MultiMx miestnosť" + msgid "MultiMx Invitation Error" -msgstr "Chyba pri rušení registrácie" - -#, fuzzy +msgstr "Chyba pozvánky MultiMx" + msgid "Profile Error" -msgstr "Chyba zápisu" +msgstr "Chyba profilu" #. bad packet msgid "Invalid packet received from MXit." -msgstr "" +msgstr "Prijatý chybný paket z MXit." #. connection error msgid "A connection error occurred to MXit. (read stage 0x01)" -msgstr "" +msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x01)" #. connection closed msgid "A connection error occurred to MXit. (read stage 0x02)" -msgstr "" +msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x02)" msgid "A connection error occurred to MXit. (read stage 0x03)" -msgstr "" +msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x03)" #. malformed packet length record (too long) msgid "A connection error occurred to MXit. (read stage 0x04)" -msgstr "" +msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x04)" #. connection error msgid "A connection error occurred to MXit. (read stage 0x05)" -msgstr "" +msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x05)" #. connection closed msgid "A connection error occurred to MXit. (read stage 0x06)" -msgstr "" - -msgid "Angry" -msgstr "Nahnevaný" - -msgid "Excited" -msgstr "Vzrušený" - -#, fuzzy -msgid "Grumpy" -msgstr "Skupina" - -msgid "Happy" -msgstr "Šťastný" - -msgid "In Love" -msgstr "Zaľúbený" - -msgid "Invincible" -msgstr "Neprekonateľný" - -msgid "Sad" -msgstr "Smutný" - -#, fuzzy -msgid "Hot" -msgstr "_Hostiteľ:" - -#, fuzzy -msgid "Sick" -msgstr "Prezývka" - -msgid "Sleepy" -msgstr "Ospalý" - -#, fuzzy +msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x06)" + msgid "Pending" -msgstr "Odosiela sa" - -#, fuzzy +msgstr "Čaká sa" + msgid "Invited" -msgstr "Pozvať" - -#, fuzzy +msgstr "Pozvaný" + msgid "Rejected" -msgstr "Odmietnuť" - -#, fuzzy +msgstr "Odmietnutý" + msgid "Deleted" -msgstr "Odstrániť" +msgstr "Odstránený" msgid "MXit Advertising" -msgstr "" - -#, fuzzy +msgstr "MXit reklama" + msgid "More Information" -msgstr "Pracovné informácie" +msgstr "Viac informácií" #, c-format msgid "No such user: %s" @@ -6660,7 +6684,10 @@ msgid "Server port" msgstr "Port servera" -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "Bola prijatá neočakávaná odpoveď od %s: %s" + #, c-format msgid "Received unexpected response from %s" msgstr "Bola prijatá neočakávaná odpoveď od %s" @@ -6678,6 +6705,13 @@ msgid "Error requesting %s: %s" msgstr "Chyba pri požadovaní %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 pre prihlásenie vyžaduje, aby ste vypísali CAPTCHAg, ale tento klient " +"nepodporuje CAPTCHA." + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL neumožňuje vášmu používateľskému menu sa tu autentifikovať" @@ -6826,46 +6860,42 @@ msgstr "Nie, pokým ste na AOL" msgid "Cannot receive IM due to parental controls" -msgstr "" +msgstr "Nie je možné prijať správu kvôli rodičovským obmedzeniam" msgid "Cannot send SMS without accepting terms" -msgstr "" - -#, fuzzy +msgstr "Nie je možné poslať SMS bez odsúhlasenia podmienok" + msgid "Cannot send SMS" -msgstr "Nepodarilo sa odoslať súbor" +msgstr "Nepodarilo sa poslať SMS" #. SMS_WITHOUT_DISCLAIMER is weird -#, fuzzy msgid "Cannot send SMS to this country" -msgstr "Nie je možné odoslať priečinok." +msgstr "Nie je možné poslať SMS do tejto krajiny." #. Undocumented msgid "Cannot send SMS to unknown country" -msgstr "" +msgstr "Nedá sa odoslať SMS do neznámej krajiny" msgid "Bot accounts cannot initiate IMs" -msgstr "" +msgstr "Účty robotov nemôžu zakladať rozhovory" msgid "Bot account cannot IM this user" -msgstr "" +msgstr "Účet robota nemôže komunikovať s týmto používateľom" msgid "Bot account reached IM limit" -msgstr "" +msgstr "Účet robota dosiahol limit komunikácie" msgid "Bot account reached daily IM limit" -msgstr "" +msgstr "Účet robota dosiahol denný limit komunikácie" msgid "Bot account reached monthly IM limit" -msgstr "" - -#, fuzzy +msgstr "Účet robota dosiahol mesačný limit komunikácie" + msgid "Unable to receive offline messages" -msgstr "Nepodarilo sa odoslať správu." - -#, fuzzy +msgstr "Nepodarilo sa prijať offline správy." + msgid "Offline message store full" -msgstr "Offline správa" +msgstr "Úložisko offline správ je plné" msgid "" "(There was an error receiving this message. The buddy you are speaking with " @@ -7034,14 +7064,14 @@ msgstr "Služba AOL je dočasne nedostupná." #. username connecting too frequently -#, fuzzy msgid "" "Your username has been connecting and disconnecting too frequently. Wait ten " "minutes and try again. If you continue to try, you will need to wait even " "longer." msgstr "" -"Pripájali a odpájali ste sa príliš často. Počkajte desať minút a skúste " -"znova. Ak budete i naďalej skúšať, budete musieť čakať este dlhšie." +"Vaše prihlasovacie meno sa pripájalo a odpájalo príliš často. Počkajte desať " +"minút a skúste to znovu. Ak budete pokračovať, budete musieť čakať este " +"dlhšie." #. client too old #, c-format @@ -7051,14 +7081,13 @@ "na %s" #. IP address connecting too frequently -#, fuzzy msgid "" "Your IP address has been connecting and disconnecting too frequently. Wait a " "minute and try again. If you continue to try, you will need to wait even " "longer." msgstr "" -"Pripájali a odpájali ste sa príliš často. Počkajte minútu a skúste to znova. " -"Ak budete pokračovať, budete musieť čakať este dlhšie." +"Vaša IP adresa sa pripájala a odpájala príliš často. Počkajte minútu a " +"skúste to znovu. Ak budete pokračovať, budete musieť čakať este dlhšie." msgid "The SecurID key entered is invalid" msgstr "Zadaný kľúč SecurID je neplatný" @@ -7206,21 +7235,21 @@ msgstr[1] "Z neznámeho dôvodu ste prišli o %hu správu od používateľa %s." msgstr[2] "Z neznámeho dôvodu ste prišli o %hu správy od používateľa %s." -#, fuzzy, c-format +#, c-format msgid "Unable to send message: %s (%s)" -msgstr "Nepodarilo sa odoslať správu (%s)." +msgstr "Nepodarilo sa odoslať správu: %s (%s)" #, c-format msgid "Unable to send message: %s" msgstr "Nemôžem odoslať správu: %s" -#, fuzzy, c-format +#, c-format msgid "Unable to send message to %s: %s (%s)" -msgstr "Nemôžem poslať správu k %s:" - -#, fuzzy, c-format +msgstr "Nemôžem poslať správu k %s: %s (%s)" + +#, c-format msgid "Unable to send message to %s: %s" -msgstr "Nemôžem poslať správu k %s:" +msgstr "Nemôžem poslať správu k %s: %s" #, c-format msgid "User information not available: %s" @@ -7249,14 +7278,6 @@ "[Správa od používateľa obsahovala nesprávne znaky, preto ju nebolo možné " "zobraziť.]" -#, fuzzy -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 "" -"Akciu nebolo možné vykonať, pretože ste prekročili limit hodnotenia. Prosím, " -"počkajte 10 sekúnd a skúste to znovu." - #, c-format msgid "You have been disconnected from chat room %s." msgstr "Boli ste odpojení z miestnosti %s." @@ -10100,13 +10121,13 @@ msgstr "Otvoriť schránku Doručené" msgid "Can't send SMS. Unable to obtain mobile carrier." -msgstr "" +msgstr "Nedá sa poslať SMS. Nebolo možné získať mobilného operátora." msgid "Can't send SMS. Unknown mobile carrier." -msgstr "" +msgstr "Nedá sa poslať SMS. Neznámy mobilný operátor." msgid "Getting mobile carrier to send the SMS." -msgstr "" +msgstr "Zisťuje sa operátor na poslanie SMS." #. Write a local message to this conversation showing that a request for a #. * Doodle session has been made @@ -10654,6 +10675,7 @@ msgid "" "Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more" msgstr "" +"Chat cez IM. Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a ďalšie" msgid "Internet Messenger" msgstr "Internetový komunikátor" @@ -11913,15 +11935,18 @@ msgid "Lao" msgstr "laoština" -msgid "Lithuanian" -msgstr "litovčina" - msgid "Macedonian" msgstr "macedónčina" msgid "Mongolian" msgstr "mongolčina" +msgid "Marathi" +msgstr "maráthčina" + +msgid "Malay" +msgstr "malajčina" + msgid "Bokmål Norwegian" msgstr "nórsky bokmål" @@ -11937,6 +11962,9 @@ msgid "Occitan" msgstr "okcitánčina" +msgid "Oriya" +msgstr "uríjčina" + msgid "Punjabi" msgstr "pandžábčina" @@ -11991,6 +12019,9 @@ msgid "Turkish" msgstr "turečtina" +msgid "Ukranian" +msgstr "ukrajinčina" + msgid "Urdu" msgstr "urdčina" @@ -12012,6 +12043,9 @@ msgid "Amharic" msgstr "amharčina" +msgid "Lithuanian" +msgstr "litovčina" + #, c-format msgid "About %s" msgstr "O programe %s" @@ -12619,7 +12653,7 @@ msgstr "Použitie: %s [VOĽBA]...\n" msgid "DIR" -msgstr "" +msgstr "ADR" msgid "use DIR for config files" msgstr "pre konfiguračné súbory použije ADR" @@ -12640,16 +12674,16 @@ msgstr "neprihlasovať automaticky" msgid "NAME" -msgstr "" - -#, fuzzy +msgstr "MENO" + msgid "" "enable specified account(s) (optional argument NAME\n" " specifies account(s) to use, separated by commas.\n" " Without this only the first account will be enabled)." msgstr "" "povoliť vybrané účty (voliteľný argument MENO\n" -" určuje účty, oddeľované čiarkami" +" určuje účty, oddeľované čiarkami\n" +" Bez toho bude povolený iba prvý účet)." msgid "X display to use" msgstr "X obrazovka, ktorú použiť" @@ -12912,21 +12946,19 @@ msgstr "Neznáme... Oznámte to, prosím!" msgid "(Custom)" -msgstr "" - -#, fuzzy -msgid "(Default)" -msgstr "(predvolené)" +msgstr "(Vlastné)" + +msgid "Penguin Pimps" +msgstr "Autori Pidginu" msgid "The default Pidgin sound theme" -msgstr "" - -#, fuzzy +msgstr "Štandardná zvuková téma programu Pidgin" + msgid "The default Pidgin buddy list theme" -msgstr "Editor témy zoznamu priateľov programu Pidgin" +msgstr "Štandardná téma zoznamu priateľov programu Pidgin" msgid "The default Pidgin status icon theme" -msgstr "" +msgstr "Štandardná téma stavových ikon programu Pidgin" msgid "Theme failed to unpack." msgstr "Nepodarilo sa rozbaliť tému." @@ -12937,19 +12969,30 @@ msgid "Theme failed to copy." msgstr "Nepodarilo sa skopírovať tému." -msgid "Install Theme" -msgstr "Inštalovať tému" - -msgid "" -"Select a smiley theme that you would like to use from the list below. New " -"themes can be installed by dragging and dropping them onto the theme list." -msgstr "" -"Z nasledujúceho zoznamu vyberte tému smajlíkov, ktorú chcete používať. Nové " -"témy je možné nainštalovať pridaním témy do tohto zoznamu metódou „ťahaj a " -"pusť“." - -msgid "Icon" -msgstr "Ikona" +msgid "Theme Selections" +msgstr "Výber témy" + +#. Instructions +msgid "" +"Select a theme that you would like to use from the lists below.\n" +"New themes can be installed by dragging and dropping them onto the theme " +"list." +msgstr "" +"Z nasledujúceho zoznamu vyberte tému smajlíkov, ktorú chcete používať.\n" +"Nové témy je možné nainštalovať pridaním témy do tohto zoznamu metódou " +"„ťahaj a pusť“." + +msgid "Buddy List Theme:" +msgstr "Téma zoznamu priateľov:" + +msgid "Status Icon Theme:" +msgstr "Ikony statusu:" + +msgid "Sound Theme:" +msgstr "Zvuková téma:" + +msgid "Smiley Theme:" +msgstr "Téma smajlíkov:" msgid "Keyboard Shortcuts" msgstr "Klávesové skratky" @@ -12957,10 +13000,6 @@ msgid "Cl_ose conversations with the Escape key" msgstr "Z_avrieť rozhovory klávesom Esc" -#. Buddy List Themes -msgid "Buddy List Theme" -msgstr "Téma zoznamu priateľov" - #. System Tray msgid "System Tray Icon" msgstr "Ikona v oznamovacej oblasti" @@ -13047,9 +13086,6 @@ msgid "Font" msgstr "Písmo" -msgid "Use document font from _theme" -msgstr "Použiť písmo dokumentov _témy" - msgid "Use font from _theme" msgstr "Použiť písmo _témy" @@ -13072,15 +13108,13 @@ msgid "Cannot start browser configuration program." msgstr "Nebolo možné spustiť program na nastavenie prehliadača." -#, fuzzy msgid "Disabled" -msgstr "_Vypnúť" +msgstr "Vypnuté" #, c-format msgid "Use _automatically detected IP address: %s" msgstr "Použiť _automaticky zistenú IP adresu: %s" -#, fuzzy msgid "ST_UN server:" msgstr "ST_UN server:" @@ -13096,78 +13130,27 @@ msgid "_Enable automatic router port forwarding" msgstr "Povoliť _automatické presmerovanie portu routeru" -#, fuzzy msgid "_Manually specify range of ports to listen on:" -msgstr "_Ručne určiť rozsah portov, na ktorých počúvať" - -#, fuzzy +msgstr "_Manuálne zadať rozsah portov, na ktorých načúvať:" + msgid "_Start:" -msgstr "_Status:" - -#, fuzzy +msgstr "Š_tart:" + msgid "_End:" -msgstr "_Rozbaliť" +msgstr "_Koniec:" #. TURN server msgid "Relay Server (TURN)" msgstr "Relay Server (TURN)" -#, fuzzy msgid "_TURN server:" -msgstr "ST_UN server:" - -#, fuzzy +msgstr "_TURN server:" + msgid "Use_rname:" -msgstr "Používateľské meno:" - -#, fuzzy +msgstr "_Používateľské meno:" + msgid "Pass_word:" -msgstr "Heslo:" - -msgid "Proxy Server & Browser" -msgstr "Proxy server a prehliadač" - -msgid "Proxy configuration program was not found." -msgstr "Program na nastavenie proxy nebol nájdený." - -msgid "Browser configuration program was not found." -msgstr "Program na nastavenie prehliadača nebol nájdený." - -msgid "" -"Proxy & Browser preferences are configured\n" -"in GNOME Preferences" -msgstr "" -"Predvoľby proxy a prehliadača sa dajú nastaviť\n" -"v predvoľbách prostredia GNOME" - -msgid "Configure _Proxy" -msgstr "Nastaviť _Proxy" - -msgid "Configure _Browser" -msgstr "Nastaviť _Prehliadač" - -msgid "Proxy Server" -msgstr "Proxy server" - -#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings -#, fuzzy -msgid "Use remote _DNS with SOCKS4 proxies" -msgstr "Použiť vzdialené DNS s proxy SOCKS 4" - -#, fuzzy -msgid "Proxy t_ype:" -msgstr "_Typ proxy:" - -msgid "No proxy" -msgstr "Bez proxy" - -#, fuzzy -msgid "P_ort:" -msgstr "_Port:" - -#, fuzzy -msgid "User_name:" -msgstr "Používateľské meno:" +msgstr "_Heslo:" msgid "Seamonkey" msgstr "Seamonkey" @@ -13208,6 +13191,15 @@ msgid "Browser Selection" msgstr "Výber prehliadača" +msgid "Browser preferences are configured in GNOME preferences" +msgstr "Predvoľby prehliadača sa nastavujú v predvoľbách prostredia GNOME" + +msgid "Browser configuration program was not found." +msgstr "Program na nastavenie prehliadača nebol nájdený." + +msgid "Configure _Browser" +msgstr "Nastaviť _Prehliadač" + msgid "_Browser:" msgstr "_Prehliadač:" @@ -13231,6 +13223,35 @@ "_Ručne:\n" "(%s for URL)" +msgid "Proxy Server" +msgstr "Proxy server" + +msgid "Proxy preferences are configured in GNOME preferences" +msgstr "Predvoľby proxy sa nastavujú v predvoľbách prostredia GNOME" + +msgid "Proxy configuration program was not found." +msgstr "Program na nastavenie proxy nebol nájdený." + +msgid "Configure _Proxy" +msgstr "Nastaviť _Proxy" + +#. This is a global option that affects SOCKS4 usage even with +#. * account-specific proxy settings +msgid "Use remote _DNS with SOCKS4 proxies" +msgstr "Použiť vzdialené _DNS s proxy SOCKS 4" + +msgid "Proxy t_ype:" +msgstr "T_yp proxy:" + +msgid "No proxy" +msgstr "Bez proxy" + +msgid "P_ort:" +msgstr "P_ort:" + +msgid "User_name:" +msgstr "Používateľské me_no:" + msgid "Log _format:" msgstr "_Formát záznamu:" @@ -13314,25 +13335,18 @@ msgid "Based on keyboard or mouse use" msgstr "Podľa využitia klávesnice alebo myši" +msgid "_Minutes before becoming idle:" +msgstr "_Počet minút pred nečinnosťou:" + +msgid "Change to this status when _idle:" +msgstr "Prepnúť na tento status pri _nečinnosti:" + msgid "_Auto-reply:" msgstr "_Automatická odpoveď:" msgid "When both away and idle" msgstr "Pri neprítomnosti a nečinnosti" -#. Auto-away stuff -msgid "Auto-away" -msgstr "Automatická neprítomnosť" - -msgid "_Minutes before becoming idle:" -msgstr "_Počet minút pred nečinnosťou:" - -msgid "Change status when _idle" -msgstr "Zmeniť status pri _nečinnosti" - -msgid "Change _status to:" -msgstr "Zmeniť _status na:" - #. Signon status stuff msgid "Status at Startup" msgstr "Status pri spustení" @@ -13346,15 +13360,15 @@ msgid "Interface" msgstr "Rozhranie" -msgid "Smiley Themes" -msgstr "Témy smajlíkov" - msgid "Browser" msgstr "Prehliadač" msgid "Status / Idle" msgstr "Status / nečinný" +msgid "Themes" +msgstr "Témy" + msgid "Allow all users to contact me" msgstr "Povoliť všetkým používateľom kontaktovať ma" @@ -13660,6 +13674,9 @@ msgid "_Save File" msgstr "_Uložiť súbor" +msgid "Do you really want to clear?" +msgstr "Naozaj chcete vyprázdniť?" + msgid "Select color" msgstr "Vyberte farbu" @@ -13698,9 +13715,6 @@ msgid "Pidgin smileys" msgstr "Smajlíci programu Pidgin" -msgid "Penguin Pimps" -msgstr "Autori Pidginu" - msgid "Selecting this disables graphical emoticons." msgstr "Vyberte túto možnosť, ak nechcete grafických smajlíkov." @@ -14335,6 +14349,9 @@ msgid "Conversation Entry" msgstr "Položka rozhovoru" +msgid "Conversation History" +msgstr "História rozhovoru" + msgid "Request Dialog" msgstr "Dialóg požiadavku" @@ -14799,9 +14816,8 @@ msgid "_Start %s on Windows startup" msgstr "_Spustiť %s pri štarte Windows" -#, fuzzy msgid "Allow multiple instances" -msgstr "Umožniť viacero súbežných prihlásení" +msgstr "Umožniť viacero spustení" msgid "_Dockable Buddy List" msgstr "_Ukotviteľný zoznam priateľov" @@ -14863,6 +14879,42 @@ msgid "This plugin is useful for debbuging XMPP servers or clients." msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov." +#~ msgid "" +#~ "Unable to find alternative XMPP connection methods after failing to " +#~ "connect directly." +#~ msgstr "" +#~ "Neboli nájdené iné metódy XMPP spojenia po tom čo zlyhalo priame spojenie." + +#, fuzzy +#~ 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 "" +#~ "Akciu nebolo možné vykonať, pretože ste prekročili limit hodnotenia. " +#~ "Prosím, počkajte 10 sekúnd a skúste to znovu." + +#, fuzzy +#~ msgid "(Default)" +#~ msgstr "(predvolené)" + +#~ msgid "Install Theme" +#~ msgstr "Inštalovať tému" + +#~ msgid "Icon" +#~ msgstr "Ikona" + +#~ msgid "Use document font from _theme" +#~ msgstr "Použiť písmo dokumentov _témy" + +#~ msgid "Proxy Server & Browser" +#~ msgstr "Proxy server a prehliadač" + +#~ msgid "Auto-away" +#~ msgstr "Automatická neprítomnosť" + +#~ msgid "Change _status to:" +#~ msgstr "Zmeniť _status na:" + #, fuzzy #~ msgid "The root certificate this one claims to be issued by is unknown." #~ msgstr "" @@ -16068,9 +16120,6 @@ #~ "súbore 'COPYRIGHT'. Na tento program vám neposkytujeme žiadnu záruku." #~ "

" -#~ msgid "Conversation History" -#~ msgstr "História rozhovoru" - #~ msgid "Log Viewer" #~ msgstr "Zobrazovač záznamov" diff -r 529233281dfe -r 2c955a6f1fa8 po/zh_HK.po --- a/po/zh_HK.po Tue Feb 16 02:21:33 2010 +0000 +++ b/po/zh_HK.po Tue Feb 16 02:34:35 2010 +0000 @@ -1,14 +1,14 @@ -# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.22 2009/11/27 10:02:35 acli Exp +# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.24 2010/02/15 23:14:17 acli Exp # --- # Pidgin's Traditional Chinese translation -# Copyright (C) 2002-2009, Paladin R. Liu -# Copyright (C) 2003-2009, Ambrose C. Li +# Copyright (C) 2002-2010, Paladin R. Liu +# Copyright (C) 2003-2010, Ambrose C. Li # # PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE. # # This file is distributed under the same license as the "Pidgin" package. -# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $ +# $InternalId: zh_TW.po,v 1.619 2010/02/15 23:14:17 acli Exp $ # # ---------------------------------------------------------- # For internal use only: @@ -60,10 +60,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Pidgin 2.6.4\n" +"Project-Id-Version: Pidgin 2.6.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 20:30-0500\n" -"PO-Revision-Date: 2009-09-03 06:04-0400\n" +"POT-Creation-Date: 2010-02-15 18:32-0800\n" +"PO-Revision-Date: 2010-02-14 03:06-0400\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese (Hong Kong) \n" "MIME-Version: 1.0\n" @@ -1652,11 +1652,13 @@ msgid "No Grouping" msgstr "不分組" +# XXX 暫譯 20100215/acli msgid "Nested Subgroup" -msgstr "" - +msgstr "巢狀子羣組" + +# XXX 暫譯 20100215/acli msgid "Nested Grouping (experimental)" -msgstr "" +msgstr "巢狀分組（實驗性功能）" # *< name # *< version @@ -2037,6 +2039,9 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n" msgstr "%s 不是一般檔案，因此不會覆蓋它。\n" +msgid "File is not readable." +msgstr "無法讀取檔案。" + #, c-format msgid "%s wants to send you %s (%s)" msgstr "%s 想要送 %s (%s) 給你" @@ -3902,6 +3907,13 @@ msgid "Server requires plaintext authentication over an unencrypted stream" msgstr "伺服器需要經由未經加密的串流進行明文認證" +#. This should never happen! +msgid "Invalid response from server" +msgstr "伺服器送來了無效的回應" + +msgid "Server does not use any supported authentication method" +msgstr "伺服器並不提供任何一種被支援的認證方式" + #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " @@ -3911,15 +3923,6 @@ msgid "Plaintext Authentication" msgstr "明文認證" -msgid "SASL authentication failed" -msgstr "SASL 認證失敗" - -msgid "Invalid response from server" -msgstr "伺服器送來了無效的回應" - -msgid "Server does not use any supported authentication method" -msgstr "伺服器並不提供任何一種被支援的認證方式" - msgid "You require encryption, but it is not available on this server." msgstr "你要求加密，但這伺服器沒有加密功能。" @@ -3927,10 +3930,28 @@ msgid "Invalid challenge from server" msgstr "伺服器送來了無效的驗證挑戰" +msgid "Server thinks authentication is complete, but client does not" +msgstr "伺服器認為驗證程序已經完畢，但用戶端不認同" + +msgid "SASL authentication failed" +msgstr "SASL 認證失敗" + #, c-format msgid "SASL error: %s" msgstr "SASL 錯誤：%s" +msgid "Unable to canonicalize username" +msgstr "無法把帳號轉成正則形態" + +msgid "Unable to canonicalize password" +msgstr "無法把密碼轉成正則形態" + +msgid "Malicious challenge from server" +msgstr "伺服器送來了惡意的驗證挑戰" + +msgid "Unexpected response from server" +msgstr "伺服器發出了奇怪的回應" + msgid "The BOSH connection manager terminated your session." msgstr "BOSH 連線管理員中斷了你的工作階段。" @@ -4037,13 +4058,17 @@ msgid "Resource" msgstr "" +# NOTE 好像有點怪，但這是標準譯文 20100214 +msgid "Uptime" +msgstr "工作時間" + +msgid "Logged Off" +msgstr "已登出" + #, c-format msgid "%s ago" msgstr "%s前" -msgid "Logged Off" -msgstr "已登出" - # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同 msgid "Middle Name" @@ -4246,11 +4271,6 @@ msgid "Ping timed out" msgstr "Ping逾時" -msgid "" -"Unable to find alternative XMPP connection methods after failing to connect " -"directly." -msgstr "無法直接連線，但無法找到其他的 XMPP 連線方法。" - msgid "Invalid XMPP ID" msgstr "XMPP 帳號無效" @@ -4881,6 +4901,9 @@ msgid "(Code %s)" msgstr "(代碼 %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "訊息中含有一個因檔案大小超過上限而無法送出的自選表情。" + msgid "XML Parse error" msgstr "XML 分析錯誤" @@ -5305,6 +5328,10 @@ msgid "Your new MSN friendly name is too long." msgstr "你的新 MSN 網名太長。" +#, c-format +msgid "Set friendly name for %s." +msgstr "設定 %s 的網名。" + msgid "Set your friendly name." msgstr "設定你的網名。" @@ -6914,7 +6941,11 @@ msgstr "伺服器通訊埠" # NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "%s 發出了奇怪的回應：%s" + +# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html #, c-format msgid "Received unexpected response from %s" msgstr "%s 發出了奇怪的回應" @@ -6933,6 +6964,11 @@ 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 "伺服器表示登入前必須完成圖片驗證，但這用戶端尚未支援圖片驗證。" + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL 不允許你的帳號在這裏登入" @@ -7503,13 +7539,6 @@ "characters.]" 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 "" -"你最近做的一個動作無法完成，因為你已經達到這個動作的速率的上限。請等待十秒後" -"再試一次。\n" - #, c-format msgid "You have been disconnected from chat room %s." msgstr "你已經由聊天室 %s 停止連線。" @@ -11147,7 +11176,7 @@ msgstr "展開的羣組的名稱" msgid "The text information for when a group is expanded" -msgstr "羣組展開時羣組名稱的字體及文字顏色" +msgstr "羣組展開時羣組名稱的字體及字體顏色" #. Note to translators: These two strings refer to the background color #. of a buddy list group when in its collapsed state @@ -11163,7 +11192,7 @@ msgstr "收起的羣組的名稱" msgid "The text information for when a group is collapsed" -msgstr "羣組收起時羣組名稱的字體及文字顏色" +msgstr "羣組收起時羣組名稱的字體及字體顏色" #. Buddy #. Note to translators: These two strings refer to the background color @@ -11184,7 +11213,7 @@ # NOTE 但當contact展開時，我們見到的是一個contact的名稱和包含在contact內的所有buddy # NOTE 照推理，所謂「text information for when a contact is expanded」應該是指contact的名稱 msgid "The text information for when a contact is expanded" -msgstr "好友展開時整組好友的名稱的字體及文字顏色" +msgstr "好友展開時整組好友的名稱的字體及字體顏色" #. Note to translators: These two strings refer to the font and color #. of a buddy list buddy when it is online @@ -11192,7 +11221,7 @@ msgstr "上線好友的名稱" msgid "The text information for when a buddy is online" -msgstr "好友上線時好友名稱的字體及文字顏色" +msgstr "好友上線時好友名稱的字體及字體顏色" #. Note to translators: These two strings refer to the font and color #. of a buddy list buddy when it is away @@ -11200,7 +11229,7 @@ msgstr "離開好友的名稱" msgid "The text information for when a buddy is away" -msgstr "好友離開時好友名稱的字體及文字顏色" +msgstr "好友離開時好友名稱的字體及字體顏色" #. Note to translators: These two strings refer to the font and color #. of a buddy list buddy when it is offline @@ -11208,7 +11237,7 @@ msgstr "離線好友的名稱" msgid "The text information for when a buddy is offline" -msgstr "好友離線時好友名稱的字體及文字顏色" +msgstr "好友離線時好友名稱的字體及字體顏色" #. Note to translators: These two strings refer to the font and color #. of a buddy list buddy when it is idle @@ -11216,7 +11245,7 @@ msgstr "閒置好友的名稱" msgid "The text information for when a buddy is idle" -msgstr "好友閒置時好友名稱的字體及文字顏色" +msgstr "好友閒置時好友名稱的字體及字體顏色" #. Note to translators: These two strings refer to the font and color #. of a buddy list buddy when they have sent you a new message @@ -11224,7 +11253,7 @@ msgstr "有未讀訊息的好友名稱" msgid "The text information for when a buddy has an unread message" -msgstr "好友有未讀訊息時好友名稱的字體及文字顏色" +msgstr "好友有未讀訊息時好友名稱的字體及字體顏色" #. Note to translators: These two strings refer to the font and color #. of a buddy list buddy when they have sent you a new message @@ -11234,10 +11263,10 @@ msgid "" "The text information for when a chat has an unread message that mentions " "your nickname" -msgstr "聊天室中有人提到你的網名而你未讀該訊息時聊天室名稱的字體及文字顏色" +msgstr "聊天室中有人提到你的網名而你未讀該訊息時聊天室名稱的字體及字體顏色" msgid "The text information for a buddy's status" -msgstr "好友狀態的字體及文字顏色" +msgstr "好友狀態的字體及字體顏色" #, c-format msgid "You have %d contact named %s. Would you like to merge them?" @@ -12293,9 +12322,6 @@ msgid "Lao" msgstr "寮國文" -msgid "Lithuanian" -msgstr "立陶宛文" - # NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係 msgid "Macedonian" msgstr "馬其頓文" @@ -12303,6 +12329,10 @@ msgid "Mongolian" msgstr "蒙古文" +# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4 +msgid "Marathi" +msgstr "馬拉提文" + msgid "Malay" msgstr "馬來文" @@ -12328,6 +12358,10 @@ msgid "Occitan" msgstr "奧克文" +# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10 +msgid "Oriya" +msgstr "奧里亞文" + msgid "Punjabi" msgstr "旁遮普文" @@ -12419,6 +12453,9 @@ msgid "Amharic" msgstr "阿姆哈拉文" +msgid "Lithuanian" +msgstr "立陶宛文" + #, c-format msgid "About %s" msgstr "關於 %s" @@ -12848,7 +12885,7 @@ msgstr "選擇字型" msgid "Select Text Color" -msgstr "設定文字顏色" +msgstr "設定字體顏色" msgid "Select Background Color" msgstr "設定背景顏色" @@ -14067,6 +14104,9 @@ msgid "_Save File" msgstr "儲存檔案(_S)" +msgid "Do you really want to clear?" +msgstr "你確定要清除？" + msgid "Select color" msgstr "選擇顏色" @@ -15319,6 +15359,18 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。" #~ msgid "" +#~ "Unable to find alternative XMPP connection methods after failing to " +#~ "connect directly." +#~ msgstr "無法直接連線，但無法找到其他的 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 "" +#~ "您最近做的一個動作無法完成，因為您已經達到這個動作的速率的上限。請等待十秒" +#~ "後再試一次。\n" + +#~ msgid "" #~ "The root certificate this one claims to be issued by is unknown to Pidgin." #~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。" diff -r 529233281dfe -r 2c955a6f1fa8 po/zh_TW.po --- a/po/zh_TW.po Tue Feb 16 02:21:33 2010 +0000 +++ b/po/zh_TW.po Tue Feb 16 02:34:35 2010 +0000 @@ -1,12 +1,12 @@ # Pidgin's Traditional Chinese translation -# Copyright (C) 2002-2009, Paladin R. Liu -# Copyright (C) 2003-2009, Ambrose C. Li +# Copyright (C) 2002-2010, Paladin R. Liu +# Copyright (C) 2003-2010, Ambrose C. Li # # PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE. # # This file is distributed under the same license as the "Pidgin" package. -# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $ +# $InternalId: zh_TW.po,v 1.619 2010/02/15 23:14:17 acli Exp $ # # ---------------------------------------------------------- # For internal use only: @@ -58,10 +58,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Pidgin 2.6.4\n" +"Project-Id-Version: Pidgin 2.6.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-29 20:30-0500\n" -"PO-Revision-Date: 2009-09-03 06:04-0400\n" +"POT-Creation-Date: 2010-02-15 18:33-0800\n" +"PO-Revision-Date: 2010-02-14 03:06-0400\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" @@ -1650,11 +1650,13 @@ msgid "No Grouping" msgstr "不分組" +# XXX 暫譯 20100215/acli msgid "Nested Subgroup" -msgstr "" - +msgstr "巢狀子群組" + +# XXX 暫譯 20100215/acli msgid "Nested Grouping (experimental)" -msgstr "" +msgstr "巢狀分組（實驗性功能）" # *< name # *< version @@ -2035,6 +2037,9 @@ msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n" msgstr "%s 不是一般檔案，因此不會覆蓋它。\n" +msgid "File is not readable." +msgstr "無法讀取檔案。" + #, c-format msgid "%s wants to send you %s (%s)" msgstr "%s 想要送 %s (%s) 給您" @@ -3900,6 +3905,13 @@ msgid "Server requires plaintext authentication over an unencrypted stream" msgstr "伺服器需要經由未經加密的串流進行明文認證" +#. This should never happen! +msgid "Invalid response from server" +msgstr "伺服器送來了無效的回應" + +msgid "Server does not use any supported authentication method" +msgstr "伺服器並不提供任何一種被支援的認證方式" + #, c-format msgid "" "%s requires plaintext authentication over an unencrypted connection. Allow " @@ -3909,15 +3921,6 @@ msgid "Plaintext Authentication" msgstr "明文認證" -msgid "SASL authentication failed" -msgstr "SASL 認證失敗" - -msgid "Invalid response from server" -msgstr "伺服器送來了無效的回應" - -msgid "Server does not use any supported authentication method" -msgstr "伺服器並不提供任何一種被支援的認證方式" - msgid "You require encryption, but it is not available on this server." msgstr "您要求加密，但這伺服器沒有加密功能。" @@ -3925,10 +3928,28 @@ msgid "Invalid challenge from server" msgstr "伺服器送來了無效的驗證挑戰" +msgid "Server thinks authentication is complete, but client does not" +msgstr "伺服器認為驗證程序已經完畢，但用戶端不認同" + +msgid "SASL authentication failed" +msgstr "SASL 認證失敗" + #, c-format msgid "SASL error: %s" msgstr "SASL 錯誤：%s" +msgid "Unable to canonicalize username" +msgstr "無法把帳號轉成正準形式" + +msgid "Unable to canonicalize password" +msgstr "無法把密碼轉成正準形式" + +msgid "Malicious challenge from server" +msgstr "伺服器送來了惡意的驗證挑戰" + +msgid "Unexpected response from server" +msgstr "伺服器發出了奇怪的回應" + msgid "The BOSH connection manager terminated your session." msgstr "BOSH 連線管理員中斷了您的工作階段。" @@ -4035,13 +4056,17 @@ msgid "Resource" msgstr "" +# NOTE 好像有點怪，但這是標準譯文 20100214 +msgid "Uptime" +msgstr "工作時間" + +msgid "Logged Off" +msgstr "已登出" + #, c-format msgid "%s ago" msgstr "%s前" -msgid "Logged Off" -msgstr "已登出" - # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同 msgid "Middle Name" @@ -4244,11 +4269,6 @@ msgid "Ping timed out" msgstr "Ping逾時" -msgid "" -"Unable to find alternative XMPP connection methods after failing to connect " -"directly." -msgstr "無法直接連線，但無法找到其他的 XMPP 連線方法。" - msgid "Invalid XMPP ID" msgstr "XMPP 帳號無效" @@ -4879,6 +4899,9 @@ msgid "(Code %s)" msgstr "(代碼 %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "訊息中含有一個因檔案大小超過上限而無法送出的自訂表情。" + msgid "XML Parse error" msgstr "XML 分析錯誤" @@ -5303,6 +5326,10 @@ msgid "Your new MSN friendly name is too long." msgstr "您的新 MSN 暱稱太長。" +#, c-format +msgid "Set friendly name for %s." +msgstr "設定 %s 的暱稱。" + msgid "Set your friendly name." msgstr "設定您的暱稱。" @@ -6912,7 +6939,11 @@ msgstr "伺服器通訊埠" # NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "%s 發出了奇怪的回應：%s" + +# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html #, c-format msgid "Received unexpected response from %s" msgstr "%s 發出了奇怪的回應" @@ -6931,6 +6962,11 @@ 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 "伺服器表示登入前必須完成圖片驗證，但這用戶端尚未支援圖片驗證。" + msgid "AOL does not allow your screen name to authenticate here" msgstr "AOL 不允許您的帳號在這裏登入" @@ -7501,13 +7537,6 @@ "characters.]" 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 "" -"您最近做的一個動作無法完成，因為您已經達到這個動作的速率的上限。請等待十秒後" -"再試一次。\n" - #, c-format msgid "You have been disconnected from chat room %s." msgstr "您已經由聊天室 %s 停止連線。" @@ -12287,9 +12316,6 @@ msgid "Lao" msgstr "寮國文" -msgid "Lithuanian" -msgstr "立陶宛文" - # NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係 msgid "Macedonian" msgstr "馬其頓文" @@ -12297,6 +12323,10 @@ msgid "Mongolian" msgstr "蒙古文" +# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4 +msgid "Marathi" +msgstr "馬拉提文" + msgid "Malay" msgstr "馬來文" @@ -12322,6 +12352,10 @@ msgid "Occitan" msgstr "奧西坦文" +# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10 +msgid "Oriya" +msgstr "奧里亞文" + msgid "Punjabi" msgstr "旁遮普文" @@ -12413,6 +12447,9 @@ msgid "Amharic" msgstr "阿姆哈拉文" +msgid "Lithuanian" +msgstr "立陶宛文" + #, c-format msgid "About %s" msgstr "關於 %s" @@ -14061,6 +14098,9 @@ msgid "_Save File" msgstr "儲存檔案(_S)" +msgid "Do you really want to clear?" +msgstr "您確定要清除？" + msgid "Select color" msgstr "選擇顏色" @@ -15313,6 +15353,18 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。" #~ msgid "" +#~ "Unable to find alternative XMPP connection methods after failing to " +#~ "connect directly." +#~ msgstr "無法直接連線，但無法找到其他的 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 "" +#~ "您最近做的一個動作無法完成，因為您已經達到這個動作的速率的上限。請等待十秒" +#~ "後再試一次。\n" + +#~ msgid "" #~ "The root certificate this one claims to be issued by is unknown to Pidgin." #~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"