From a7e56379a256ce3b9f42d915a715f4e36430fe88 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Mon, 12 May 2008 08:30:26 +0200 Subject: [PATCH] Upstream tarball 20080512 --- CVSDATE | 2 +- SVNDATE | 2 +- po/amule.pot | 30 ++++---- po/ar.po | 30 ++++---- po/bg.po | 30 ++++---- po/ca.po | 30 ++++---- po/cs.po | 30 ++++---- po/da.po | 30 ++++---- po/de.po | 30 ++++---- po/el.po | 30 ++++---- po/en_GB.po | 30 ++++---- po/es.po | 30 ++++---- po/et_EE.po | 30 ++++---- po/eu.po | 30 ++++---- po/fa.po | 30 ++++---- po/fi.po | 30 ++++---- po/fr.po | 30 ++++---- po/gl.po | 30 ++++---- po/he.po | 30 ++++---- po/hr.po | 30 ++++---- po/hu.po | 30 ++++---- po/it.po | 30 ++++---- po/it_CH.po | 30 ++++---- po/ja.po | 30 ++++---- po/ko_KR.po | 30 ++++---- po/lt.po | 30 ++++---- po/nl.po | 30 ++++---- po/nn.po | 30 ++++---- po/pl.po | 30 ++++---- po/pt_BR.po | 73 +++++++++--------- po/pt_PT.po | 30 ++++---- po/ru.po | 30 ++++---- po/sl.po | 30 ++++---- po/sq.po | 30 ++++---- po/sv.po | 30 ++++---- po/tr.po | 30 ++++---- po/zh_CN.po | 30 ++++---- po/zh_TW.po | 30 ++++---- src/SearchDlg.cpp | 4 +- src/SearchList.cpp | 102 ++++++++++++++++++++------ src/SearchList.h | 11 ++- src/ServerConnect.cpp | 10 --- src/include/protocol/ed2k/Client2Server/UDP.h | 14 ++-- src/include/tags/ClientTags.h | 91 +++++++++++++++-------- src/include/tags/ServerTags.h | 36 ++++----- 45 files changed, 740 insertions(+), 655 deletions(-) diff --git a/CVSDATE b/CVSDATE index af778e7b..37639bc9 100644 --- a/CVSDATE +++ b/CVSDATE @@ -1 +1 @@ -Sun May 11 07:01:44 CEST 2008 +Mon May 12 07:01:44 CEST 2008 diff --git a/SVNDATE b/SVNDATE index af778e7b..37639bc9 100644 --- a/SVNDATE +++ b/SVNDATE @@ -1 +1 @@ -Sun May 11 07:01:44 CEST 2008 +Mon May 12 07:01:44 CEST 2008 diff --git a/po/amule.pot b/po/amule.pot index 65bc6f62..17326797 100644 --- a/po/amule.pot +++ b/po/amule.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2679,15 +2679,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3312,56 +3312,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/ar.po b/po/ar.po index 0dc7ffc5..69e0d651 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2004-03-28 22:15+0300\n" "Last-Translator: saleh alhathal \n" "Language-Team: \n" @@ -2692,15 +2692,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3327,56 +3327,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "ﻻ يوجد خادمات صحيحة في قائمة الخادمات" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "متصل بي %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "إتصال بي : %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "خطأ قاتل اثناء محاولة اﻹتصال . احتمال أنك غير متصل باﻹنترنت" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "فقد اﻹتصال بي %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) يظهر انه ﻻ يعمل" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية" msgstr[1] "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "اﻹتصال فقد" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/bg.po b/po/bg.po index 6c42c5ca..af929cb7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: source_strings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2004-02-07 21:55+0200\n" "Last-Translator: Boyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -2705,15 +2705,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3342,57 +3342,57 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "Не са намерени валидни сървъри в списъка" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Свързан към %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Връзката установена на: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Фатална грешка при опит за свързване,вероятно не сте се включили към интернет" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Връзката към %s (%s:%i) бе прекъсната" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) изглежда не отговаря" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "На всеки %d секунди ще бъде правен автоматичен опит за свързване" msgstr[1] "На всеки %d секунди ще бъде правен автоматичен опит за свързване" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Връзката е прекъсната" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Грешка:Невалиден сокет при проверка" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/ca.po b/po/ca.po index ddb1267f..360f48d3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ca\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-12-14 00:06+0100\n" "Last-Translator: Carles Escrig i Royo \n" "Language-Team: Catalan\n" @@ -2786,15 +2786,15 @@ msgstr "Enganxa" msgid "Select All" msgstr "Selecciona-ho tot" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "No es pot fer una cerca Kad si la xarxa Kad no està engegada" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "No es pot fer una cerca ED2K si la xarxa ED2K no està connectada" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Error inesperat mentre s'intentava fer una cerca Kad: " @@ -3457,57 +3457,57 @@ msgstr "La xarxa ED2K és inhabilitada a les preferències, no es connectarà." msgid "No valid servers to connect in serverlist found" msgstr "No s'ha trobat cap servidor vàlid a la llista de servidors" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Connectat a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Connexió establerta amb: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Error fatal en intentar connectar. La connexió a Internet pot haver caigut" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "S'ha perdut la connexió a %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) sembla estar mort." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) sembla estar ple." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Es reintentarà la connexió al servidor d'ací %d segons" msgstr[1] "Es reintentarà la connexió al servidor d'ací %d segons" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "S'ha perdut la connexió" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "No s'ha pogut connectar a %s (%s:%i)." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Error: Sòcol invàlid en la comprovació de temps" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "L'intent de connexió a %s (%s:%i) ha excedit el temps." diff --git a/po/cs.po b/po/cs.po index b17c5dae..399cdcff 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-09-03 20:20+0100\n" "Last-Translator: David Watzke \n" "Language-Team: cs \n" @@ -2749,15 +2749,15 @@ msgstr "Vložit" msgid "Select All" msgstr "Označit vše" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Nemohu vyhledávat přes Kad, když není spuštěn" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Nemohu vyhledávat přes ED2K, když neběží" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Neočekávaná chyba během vyhledávání v síti Kad: " @@ -3393,58 +3393,58 @@ msgstr "Síť ED2K je zakázána v nastavení, nepřipojuji se." msgid "No valid servers to connect in serverlist found" msgstr "V seznamu nejsou žádné platné servery" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Připojen k %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Připojení vytvořeno k %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Kritická chyba během pokusu o připojení. Možná je vypnuté/nefunkční " "připojení k Internetu" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Ztracené připojení k %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) se zdá být mrtvý." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) se zdá být plný." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Připojení ztraceno." -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Připojování k %s (%s:%i) selhalo." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Pokusu o připojení k %s (%s:%i) vypršel čas." diff --git a/po/da.po b/po/da.po index 781b9d33..5900836f 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-10-13 18:09+0200\n" "Last-Translator: Alex Thomsen Leth \n" "Language-Team: aMule Team \n" @@ -2712,15 +2712,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3349,56 +3349,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "Ingen brugbare servere i serverliste" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Forbundet til %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Forbindelse oprettet til: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "Kunne ikke forbinde. Internettet må være nede." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Mistede forbindelsen til %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) ser ud til at være død" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Automatisk forbindelse til server vil prøve igen om %d sekunder" msgstr[1] "Automatisk forbindelse til server vil prøve igen om %d sekunder" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Forbindelse afbrudt" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/de.po b/po/de.po index b5a1b583..eadcc8db 100644 --- a/po/de.po +++ b/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-09 12:41+0100\n" "Last-Translator: Johannes Krampf \n" "Language-Team: \n" @@ -2758,15 +2758,15 @@ msgstr "Einfügen" msgid "Select All" msgstr "Alles auswählen" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad-Suche kann nicht ausgeführt werden, wenn Kad nicht läuft" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "eD2k-Suche kann nicht ausgeführt werden, wenn eD2k nicht verbunden ist" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Unerwarteter Fehler bei der Kad-Suche:" @@ -3440,38 +3440,38 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "Keine gültigen Server zum Verbinden in der Serverliste gefunden" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Verbunden mit %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Verbindung hergestellt mit %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Schwerer Fehler beim Verbinden. Möglicherweise ist die Internetverbindung " "getrennt" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Verbindung verloren zu %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) scheint tot zu sein." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) scheint voll zu sein." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3480,20 +3480,20 @@ msgstr[0] "" msgstr[1] "" "Automatische Verbindungsherstellung zum Server wird in %d Sekunden wiederholt" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Verbindung verloren" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Verbindung zu %s (%s:%i) fehlgeschlagen." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Fehler: Ungültiger Socket bei Prüfung auf Zeitüberschreitung" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Verbindungsversuch zu %s (%s:%i): Timeout." diff --git a/po/el.po b/po/el.po index f4b7e3c9..5b09d943 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-12-20 20:59-0600\n" "Last-Translator: Dimitrios Galanakis \n" "Language-Team: Greek\n" @@ -2720,16 +2720,16 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" "Δεν μπορεί να γίνει αναζήτηση στο ED2K αν το ED2K δεν είναι συνδεδεμένο" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Άγνωστο σφάλμα όταν έγινε απόπειρα αναζήτησης στο Kad:" @@ -3366,56 +3366,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Σύνδεση παγιώθηκε στο: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index cb8be719..124af9da 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2004-02-04 07:00+0100\n" "Last-Translator: Angel Vidal Veiga \n" "Language-Team: aMule Team \n" @@ -2677,15 +2677,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3310,56 +3310,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/es.po b/po/es.po index 91e4d9c1..d935b238 100644 --- a/po/es.po +++ b/po/es.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-22 01:38+0200\n" "Last-Translator: Mad-Soft \n" "Language-Team: Spanish \n" @@ -2755,15 +2755,15 @@ msgstr "Pegar" msgid "Select All" msgstr "Seleccionar todo" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "No se buscará en Kad si no está conectado a Kad" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "No se buscará en ED2K si no está conectado a ED2K" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Error inesperado mientras intentaba buscar en Kad: " @@ -3416,57 +3416,57 @@ msgstr "Red ED2K deshabilitada en opciones, no conectará." msgid "No valid servers to connect in serverlist found" msgstr "No hay servidores válidos en la lista de servidores" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Conectado a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Conexión establecida en: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Error fatal conectando. La conexión a Internet podría estar desactivada" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Conexión perdida con %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) parece estar caído." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) parece estar lleno." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Se reintentará la conexión automática al servidor en %d segundo" msgstr[1] "Se reintentará la conexión automática al servidor en %d segundos" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Conexión perdida" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Conectando con %s (%s:%i) fallido" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Error: socket no válido al comprobar el timeout" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Intento de conexión con %s (%s:%i) tiempo agotado." diff --git a/po/et_EE.po b/po/et_EE.po index 61cfdfd7..0fa8c6e5 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: et_EE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-09 19:17+0300\n" "Last-Translator: Hans \n" "Language-Team: \n" @@ -2743,15 +2743,15 @@ msgstr "Aseta" msgid "Select All" msgstr "Vali kõik" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad otsing pole võimalik kui Kad ei tööta" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2K otsing pole võimalik kui ED2K ei tööta" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Ootamatu viga proovides Kad otsingut: " @@ -3397,56 +3397,56 @@ msgstr "ED2K on seadetes väljalülitatud, ei ühendu" msgid "No valid servers to connect in serverlist found" msgstr "Serverite nimekirjas pole ühtegi ühendumiseks sobivat serverit!" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Ühendus %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Ühendus loodud: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "Fataalne viga ühendumisel. Kontrolli ühendust." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Kaotasin ühenduse %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) on vist surnud." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) on vist täis." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Proovin %d sekundi pärast serveriga uuesti automaatselt ühenduda." msgstr[1] "Proovin %d sekundi pärast uuesti serveriga automaatselt ühenduda." -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Ühendus kadunud." -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Ühendumine %s (%s:%i) ebaõnnestus." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "VIGA: Vigane socket aegumise kontrollil" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Katse serveriga %s (%s:%i) ühenduda aegus." diff --git a/po/eu.po b/po/eu.po index b9bb1fe8..75c6e180 100644 --- a/po/eu.po +++ b/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-03-30 18:39+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -2755,15 +2755,15 @@ msgstr "Itsatsi" msgid "Select All" msgstr "Hautatu dena" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Ezin da Kad bilaketarik egin Kad ez badago abiarazirik " -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Ezin da ED2K bilaketarik egin ED2K ez badago konektaturik" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Espero gabeko errorea Kad bilaketa egitean: " @@ -3434,38 +3434,38 @@ msgstr "ED2K sarea ezgaiturik dago hobespenetan, ez da konektatuko." msgid "No valid servers to connect in serverlist found" msgstr "Ez da konektatzeko baliozko zerbitzaririk aurkitu zerbitzari zerrendan" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "%s (%s:%i)-ra konektaturik" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Konexioa sorturik: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Errore konponezina konektatzen saiatzean. Internet konexioa eroria egon " "daiteke" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "%s (%s:%i)-ra konexioa galduta" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) hilik dagoela dirudi." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) beterik dagoela dirudi." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3474,20 +3474,20 @@ msgstr[0] "" msgstr[1] "" "Zerbitzariarekiko konexio automatikoa berriz saiatuko da %d segundotan" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Konexioa galdu egin da" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Huts %s (%s:%i) -ra konektatzerakoan." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Errorea: Socket baliogabea denboraz kanpo arakatzean" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "%s (%s:%i) -ra konexio saiakera denboraz kanpo geratu da." diff --git a/po/fa.po b/po/fa.po index 6f530e3a..eda3d97f 100644 --- a/po/fa.po +++ b/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule SVN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-02-07 09:12+0100\n" "Last-Translator: \n" "Language-Team: Persian\n" @@ -2677,15 +2677,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3310,56 +3310,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/fi.po b/po/fi.po index ccc84efb..0e26240b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-02-24 13:33+0200\n" "Last-Translator: Tapio Rantala \n" "Language-Team: aMule Team \n" @@ -2741,15 +2741,15 @@ msgstr "Liitä" msgid "Select All" msgstr "Valitse kaikki" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad-hakua ei voida tehdä mikäli Kad ei ole päällä" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Ed2k-hakua ei voida tehdä mikäli Ed2k ei ole yhdistettynä" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Odottamaton virhe Kad-hakua tehtäessä: " @@ -3391,57 +3391,57 @@ msgstr "Ed2k-verkko kytketty pois päältä asetuksista, ei yhdistetä." msgid "No valid servers to connect in serverlist found" msgstr "Palvelinlistasta ei löytynyt toimivia palvelimia joihin yhdistää" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Yhdistetty %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Yhteys muodostettu: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Kriittinen virhe yhdistettäessä. Internet-yhteys on mahdollisesti poikki" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Yhteys palvelimeen %s (%s:%i) katkesi" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) näyttää kuolleelta." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) on ilmeisesti täysi." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Yhteys katkesi" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Yhdistäminen kohteeseen %s (%s:%i) epäonnistui." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Virhe: Socket virheellinen aikakatkaisutarkistuksessa" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Yhteysyritys kohteeseen %s (%s:%i) aikakatkaistiin." diff --git a/po/fr.po b/po/fr.po index 0f22d018..d412a51e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-10 11:21+0100\n" "Last-Translator: Youpla \n" "Language-Team: Français \n" @@ -2782,15 +2782,15 @@ msgstr "Coller" msgid "Select All" msgstr "Tout sélectionner" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Une recherche Kad ne peut pas être faite si Kad n'est pas lancé" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Une recherche ED2K ne peut pas être faite si ED2K n'est pas connecté" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Erreur imprévue lors de la tentative de recherche Kad: " @@ -3460,38 +3460,38 @@ msgstr "Le réseau ED2K est désactivé dans les préférences, pas de connexion msgid "No valid servers to connect in serverlist found" msgstr "Aucun serveur valide pour se connecter dans la liste des serveurs" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Connecté à %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Connexion établie sur : %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Erreur fatale lors de la tentative de connexion. la connexion Internet est " "probablement inactive" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Connexion à %s (%s:%i) perdue" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) semble être indisponible." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) semble être plein." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3500,20 +3500,20 @@ msgstr[0] "" msgstr[1] "" "Nouvelle tentative de connexion automatique au serveur dans %d secondes" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Connexion perdue" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Échec de la connexion à %s (%s:%i)." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Erreur : socket invalide au moment du test" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Délai d'attente de la connexion à %s (%s:%i) dépassé." diff --git a/po/gl.po b/po/gl.po index 5ef5d279..a83f3026 100644 --- a/po/gl.po +++ b/po/gl.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-09 13:44+0100\n" "Last-Translator: Festor Wailon Dacoba \n" "Language-Team: Galego \n" @@ -2772,15 +2772,15 @@ msgstr "Pegar" msgid "Select All" msgstr "Seleccionar todo" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "A busca de Kad non pode ser feita se non está executando Kad" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "A busca ED2K non pode ser feita se non está conectado a ED2K" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Erro inesperado tentando buscar en Kad:" @@ -3439,56 +3439,56 @@ msgstr "Rede ED2K desactivada nas preferencias, non conectando." msgid "No valid servers to connect in serverlist found" msgstr "Non hai servidores válidos na lista de servidores" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Conectar a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Conexión establecida en: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "Erro fatal conectando. A conexión a internet podría estar desactivada" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Conexión perdida con %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) parece estar caido." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) parece estar cheo." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Reintentarase a conexión automática ao servidor en %d segundos" msgstr[1] "Reintentarase a conexión automática ao servidor en %d segundo" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Conexión perdida" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Conectando a %s (%s:%i) fallou." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Erro: Socket inválido ao comprobar timeout" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Tentando conectar a %s (%s:%i) fora de tempo." diff --git a/po/he.po b/po/he.po index 69e1ab4e..ce345e1f 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: amule 2.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-11 00:21+0300\n" "Last-Translator: Peace Kramer \n" "Language-Team: Hebrew\n" @@ -2730,15 +2730,15 @@ msgstr "הדבק" msgid "Select All" msgstr "בחר הכל" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "לא יכול להתבצע חיפוש באמצעות קאד אם קאד לא פועל" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "לא יכול להתבצע חיפוש באמצעות ED2K אם ED2K לא פועל" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "שגיאה לא צפויה בעת ניסיון ביצוע חיפוש ב קאד: " @@ -3370,56 +3370,56 @@ msgstr "רשת ה ED2K מנוטרלת בהעדפות, לא מתחבר." msgid "No valid servers to connect in serverlist found" msgstr "לא נמצא ברשימת השרתים אף שרת תקף כדי להתחבר איליו." -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "מחובר ל %s·(%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "חיבור הוקם ל: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "כשל חמור בעת הניסיון להתחבר. יתכן והתקשורת למרשתת לא מקוונת." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "אבד התקשורת ל %s·(%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "נראה כאלו ש %s·(%s:%i) מת." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "נראה כאלו ש %s·(%s:%i) מלא." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות" msgstr[1] "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "החיבור אבד." -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "ההתחברות ל %s·(%s:%i) כשלה" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "שגיאה: מבואה לא תקפה לא התקבל תגובה בזמן." -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "פג הזמן עבור ניסיון ההתחברות ל %s·(%s:%i)" diff --git a/po/hr.po b/po/hr.po index 170e555c..d227fd50 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2004-04-08 00:30+0100\n" "Last-Translator: Tea Lorenzmeier \n" "Language-Team: www.aMule.org \n" @@ -2697,15 +2697,15 @@ msgstr "" msgid "Select All" msgstr "" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3338,57 +3338,57 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "Ni jedan vezeci server u listi nije pronadjen" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Spojen sa %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Uspostavljena veza sa: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Fatalna greska prilikom pokusaja spajanja. Veza interneta je moguce prekinuta" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Izgubljena veza sa %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) je mrtav" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi" msgstr[1] "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Izgubljena veza" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Greska: neispravan socket u vrijeme timeouta" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/hu.po b/po/hu.po index 321783d7..5c1d9377 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-05 01:07+0100\n" "Last-Translator: Dévai Tamás \n" "Language-Team: \n" @@ -2737,15 +2737,15 @@ msgstr "Beillesztés" msgid "Select All" msgstr "Mindent kijelöl" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad keresést nem lehet végrehajtani ha a Kad nem fut" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2K keresést nem lehet végrehajtani ha az ED2K nincs kapcsolódva" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Nem várt hiba amíg a Kad kereséssel próbálkoztam: " @@ -3405,57 +3405,57 @@ msgstr "" "Nem találtam érvényes kiszolgálót a kiszolgáló-listában, amihez kapcsolódni " "lehetne" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Kapcsolódva %s-hez (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Kapcsolat létrejött a %s-vel" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Végzetes hiba kapcsolatfelvétel közben. Lehet, hogy megszakadt az Internet " "kapcsolat" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Megszakadt a kapcsolat %s-vel (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "A %s (%s:%i) halottnak tűnik." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "A %s (%s:%i) úgy látszik megtelt." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Automatikus kapcsolódás a kiszolgálóhoz %d másodperc múlva" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Kapcsolat megszakadt" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Kapcsolódás %s-hez (%s:%i) sikertelen." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Hiba: Érvénytelen socket időtúllépési ellenőrzésnél" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Kapcsolódási kísérlet %s-hez (%s:%i): időtúllépés." diff --git a/po/it.po b/po/it.po index 88f0f073..d3dd78a9 100644 --- a/po/it.po +++ b/po/it.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-09 19:50+0200\n" "Last-Translator: rik \n" "Language-Team: \n" @@ -2765,17 +2765,17 @@ msgstr "Incolla" msgid "Select All" msgstr "Seleziona tutto" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" "Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" "Impossibile effettuare una ricerca sulla rete ed2k senza esserci connessi" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Errore imprevisto durante la ricerca su Kad: " @@ -3447,58 +3447,58 @@ msgstr "" "Nella lista dei server non è stato trovato nessun server valido a cui " "connettersi" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Connesso a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Connessione stabilita con: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Errore grave durante il tentativo di connessione. La connessione a Internet " "potrebbe non essere attiva" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Persa connessione a %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) sembra non essere attivo." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) sembra essere pieno." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Riconnessione automatica al server tra %d secondo" msgstr[1] "Riconnessione automatica al server tra %d secondi" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Connessione persa" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Connessione a %s (%s:%i) non riuscita." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "ERRORE: socket invalido in sede di controllo di timeout" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Connessione a %s (%s:%i) non riuscita per time-out." diff --git a/po/it_CH.po b/po/it_CH.po index efaf1cd4..0bd9c258 100644 --- a/po/it_CH.po +++ b/po/it_CH.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: it_CH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-10 15:42+0100\n" "Last-Translator: Luca Pagliero \n" "Language-Team: Italian_CH\n" @@ -2764,17 +2764,17 @@ msgstr "Incolla" msgid "Select All" msgstr "Seleziona tutto" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" "Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" "Impossibile effettuare una ricerca sulla rete ed2k senza esserci connessi" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Errore imprevisto durante la ricerca su Kad: " @@ -3447,58 +3447,58 @@ msgstr "" "Nella lista dei server non e' stato trovato nessun server valido a cui " "connettersi" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Connesso a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Connessione stabilita con: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Errore fatale durante il tentativo di connessione. La connessione a internet " "potrebbe non essere attiva" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Persa connessione a %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) sembra essere morto" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) sembra essere pieno" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Riconnessione automatica al server tra %d secondo" msgstr[1] "Riconnessione automatica al server tra %d secondi" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Connessione persa" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Connessione a %s (%s:%i) fallita" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "ERRORE: socket invalido in sede di controllo di timeout" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Connessione a %s (%s:%i) fallita per time-out" diff --git a/po/ja.po b/po/ja.po index 5df24384..b21b7988 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-11-18 11:27+0100\n" "Last-Translator: \n" "Language-Team: Japanese\n" @@ -2754,15 +2754,15 @@ msgstr "ペースト" msgid "Select All" msgstr "全ての選択" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kadが走っていない中にはKadの検索は出来ません" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Ed2kに接続されていない中にはEd2kの検索は出来ません" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Kadを検索する間に不明なエラーが発生しました： " @@ -3416,57 +3416,57 @@ msgstr "ED2Kネットワークは個人設定に無効されて、接続はし msgid "No valid servers to connect in serverlist found" msgstr "サーバ・リストに接続出来るために正当なサーバは見付かりません" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "%s（%s：%i）に接続しています" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr " %s にコネクションを確立しました" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "接続中に致命的なエラーが発生しました。インターネット・コネクションがダウンの" "恐れがあります。" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "%s（%s：%i）のコネクションを失いました" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s（%s：%i）は死んでいるそうです。" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s（%s：%i）は一杯だそうです。" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "サーバへの自動的な接続で、後%d秒で再試しします" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "接続を失いました" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "%s（%s：%i）の接続に失敗しました。" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "エラー：timeoutcheckの時ソケットは不正でした" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "%s（%s：%i）の接続の試しがタイム・アウトました。" diff --git a/po/ko_KR.po b/po/ko_KR.po index e28d68ff..6e2ae7c4 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ko_KR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-09-12 16:04+0900\n" "Last-Translator: Hyunju Kang \n" "Language-Team: Korean \n" @@ -2756,15 +2756,15 @@ msgstr "붙이기" msgid "Select All" msgstr "모두 선택" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad를 실행 중이 아니면 Kad 검색을 할 수 없습니다." -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2k가 연결되어 있지 않으면 ED2k 검색을 할 수 없습니다." -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Kad 검색 시도 중에 예기치 못한 에러: " @@ -3405,57 +3405,57 @@ msgstr "ED2k 통신망이 환경설정에서 비활성화되어 있으므로 연 msgid "No valid servers to connect in serverlist found" msgstr "발견된 서버 목록에서 연결할수 있는 유효한 서버가 없습니다." -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "%s (%s:%i)에 연결되었습니다." -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "다음에 연결이 되었습니다: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "연결하는 동안 치명적 오류가 발생하였습니다. 인터넷 연결이 끊긴것 같습니다." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "%s(%s:%i)에 연결이 끊김." -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s(%s:%i)가 죽은것 같습니다." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s(%s:%i)가 가득찬것 같습니다." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "%d 초후에 서버로 자동 접속을 재시도" msgstr[1] "%d 초후에 서버로 자동 접속을 재시도" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "연결 끊김" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "%s(%s:%i)에 연결하지 못했습니다." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "오류: 시간초과 검사에 유효하지 않은 소켓" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "%s(%s:%i)에 접속을 시도하는데 시간이 지났습니다." diff --git a/po/lt.po b/po/lt.po index a7deb1fe..7bf1b705 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lt.new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-09-01 16:53+0100\n" "Last-Translator: Dovydas Sankauskas \n" "Language-Team: Lithuanian \n" @@ -2779,15 +2779,15 @@ msgstr "Įterpti" msgid "Select All" msgstr "Pažymėti viską" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad paieška negalima jei nepaleista Kad tarnyba" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2K paieška negalima jei ED2K tarnyba neprijungta" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Vykdant Kad paiešką įvyko netikėta klaida: " @@ -3449,38 +3449,38 @@ msgstr "ED2K tinklas išjungtas parinktyse, ryšys nebus užmezgamas." msgid "No valid servers to connect in serverlist found" msgstr "Serverių sąraše nėra teisingų serverių" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Ryšys užmegztas: %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Ryšys užmegztas: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Bandant prisijungti įvyko kritinė klaida. Gali būti, kad nėra interneto " "ryšio." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Ryšys nutrūko %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) neatsako, galbūt išjungtas." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) pilnas." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3488,20 +3488,20 @@ msgstr[0] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai msgstr[1] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai" msgstr[2] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Ryšys nutrūko" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Prisijungti prie %s (%s:%i) nepavyko." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Klaida: bandymo susijungti laikas tinklo lizdui baigėsi" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Baigėsi bandymo susijungti laikas %s (%s:%i)." diff --git a/po/nl.po b/po/nl.po index 54fe7851..ea36b414 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-02-28 15:04+0100\n" "Last-Translator: Frank van der Loo \n" "Language-Team: aMule Team \n" @@ -2740,15 +2740,15 @@ msgstr "Plakken" msgid "Select All" msgstr "Alles Selecteren" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad zoekopdracht kan niet worden uitgevoerd als Kad niet draait" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2K zoekopdracht kan niet worden uitgevoerd als ED2K niet draait" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Onverwachte fout bij Kad zoekopdracht: " @@ -3393,57 +3393,57 @@ msgstr "ED2K netwerk is uitgeschakeld in voorkeuren, wordt niet mee verbonden." msgid "No valid servers to connect in serverlist found" msgstr "Geen geldige servers in serverlijst gevonden" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Verbonden met %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Verbinding gemaakt met: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Fatale Fout bij het proberen te verbinden. Internet verbinding kan uit zijn" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Verbinding verbroken met %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) lijkt dood te zijn." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) lijkt vol te zijn." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Verbinding kwijt" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Verbinden met %s (%s:%i) is mislukt." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Fout: Socket ongeldig op timeoutcheck" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Poging tot verbinden met %s (%s:%i) gaf time out." diff --git a/po/nn.po b/po/nn.po index 0916f472..8b969aaa 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-11-30 18:25+0100\n" "Last-Translator: Hallvor Brunstad \n" "Language-Team: Norwegian/Nynorsk \n" @@ -2727,15 +2727,15 @@ msgstr "Lim inn" msgid "Select All" msgstr "Vél alle" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Du kan ikkje søkje på Kad dersom Kad ikkje køyrer" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Du kan ikkje søkje på ED2k dersom du ikkje er tilkopla ED2k" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Uventa feil oppstod under søk på Kad: " @@ -3374,56 +3374,56 @@ msgstr "ED2k nettverket er deaktivert i innstillingar, koplar ikkje til." msgid "No valid servers to connect in serverlist found" msgstr "Ingen gangbare tenarar funne i tenarlista" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Tilkopla %s·(%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Kopling oppretta på: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "Alvorleg feil i oppkopling. Internett kan vere nede" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Mista kopling til %s·(%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s·(%s:%i) ser ut til å vere daud." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s·(%s:%i) ser ut til å vere full." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Kopling mista" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Tilkopling til %s·(%s:%i)·mislukka." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Feil: Ugyldig kontakt ved tidsutsjekking" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Tilkoplingsfreisting til %s·(%s:%i)·gjekk over tida." diff --git a/po/pl.po b/po/pl.po index 795ad4c0..3a0661f7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-05-03 13:50+0200\n" "Last-Translator: Mateusz Butowski\n" "Language-Team: \n" @@ -2765,15 +2765,15 @@ msgstr "Wklej" msgid "Select All" msgstr "Zaznacz wszystko" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Nie można wykonać wyszukiwania Kad, jeśli Kad nie jest włączony" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Nie można wykonać wyszukiwania ED2K, jeśli ED2K nie jest połączony" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Nieoczekiwany błąd podczas próby wyszukiwania Kad: " @@ -3435,37 +3435,37 @@ msgstr "Sieć ED2K wyłączona w preferencjach, nie łączę." msgid "No valid servers to connect in serverlist found" msgstr "Nie ma poprawnych serwerów na liście" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Połączony z %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Nawiązano połączenie z: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Błąd krytyczny podczas próby łączenia. Może nie ma połączenia do internetu" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Utracono połączenie z %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) wygląda na wyłączony." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) wygląda na pełny." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3473,20 +3473,20 @@ msgstr[0] "Automatyczne łączenie do serwera nastąpi za %d sekundę" msgstr[1] "Automatyczne łączenie do serwera nastąpi za %d sekundy" msgstr[2] "Automatyczne łączenie do serwera nastąpi za %d sekund" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Utracono połączenie" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Łączenie z %s (%s:%i) nieudane." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Błąd: Socket nieprawidłowy przy sprawdzaniu timeout-a" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Próba połączenia z %s (%s:%i) przedawniła się." diff --git a/po/pt_BR.po b/po/pt_BR.po index 4d0ac1d8..0e5ff0f9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,15 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" -"PO-Revision-Date: 2008-04-21 13:36-0300\n" -"Last-Translator: Fabio Junior Beneditto \n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" +"PO-Revision-Date: 2008-05-11 10:11-0300\n" +"Last-Translator: felipe augusto \n" "Language-Team: Português (Brasileiro) \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" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: BRAZIL\n" +"X-Poedit-SourceCharset: utf-8\n" #: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94 msgid "You must specify a non-empty password." @@ -469,6 +472,8 @@ msgid "" "Feedback from: %s (%s)\n" "\n" msgstr "" +"Resposta de: %s (%s)\n" +"\n" #: src/SharedFilesCtrl.cpp:306 msgid "You need a HighID to create a valid sourcelink" @@ -2746,15 +2751,15 @@ msgstr "Colar" msgid "Select All" msgstr "Selecionar Tudo" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "A busca do Kad não pode ser feita se o Kad não estiver rodando" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "A busca do ED2K não pode ser feita se o ED2K não estiver conectado" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Erro inesperado quando tentava fazer a busca do Kad:" @@ -3317,7 +3322,7 @@ msgstr "Parado" #: src/PartFile.cpp:3905 msgid "Downloaded" -msgstr "" +msgstr "Baixado" #: src/KnownFileList.cpp:79 msgid "Warning: known.met cannot be opened." @@ -3399,57 +3404,57 @@ msgstr "Rede ED2K esta desativada nas preferências, não conectável." msgid "No valid servers to connect in serverlist found" msgstr "Não houve conexões validas na lista de servidores" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Conectado a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Conexão estabelecida em: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Erro Fatal durante tentativa de conexão. Talvez seu link Internet tenha caído" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Conexão perdida com %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) parece estar desativado." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) parece estar cheio." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Conexão automática com o servidor irá se repetir em %d segundo" msgstr[1] "Conexão automática com o servidor irá se repetir em %d segundos" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Conexão perdida" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Conexão a %s (%s:%i) falhou" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Erro: Socket inválido durante tempo de verificação" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Expirado tempo de espera para conectar a %s (%s:%i)." @@ -4181,27 +4186,27 @@ msgstr "Nome do Arquivo" #: src/KnownFile.cpp:1360 msgid "File size" -msgstr "" +msgstr "Tamanho do arquivo" #: src/KnownFile.cpp:1361 msgid "Share ratio" -msgstr "" +msgstr "Taxa de compartilhamento" #: src/KnownFile.cpp:1362 msgid "Uploaded" -msgstr "" +msgstr "Enviado" #: src/KnownFile.cpp:1363 msgid "Requested" -msgstr "" +msgstr "Requisitado" #: src/KnownFile.cpp:1364 msgid "Accepted" -msgstr "" +msgstr "Aceito" #: src/KnownFile.cpp:1365 msgid "Complete sources" -msgstr "" +msgstr "Fontes completas" #: src/PartFileConvert.cpp:236 #, c-format @@ -4929,11 +4934,11 @@ msgstr "Nome do Servidor:" #: src/muuli_wdr.cpp:1454 msgid "Obfuscation:" -msgstr "" +msgstr "Obfuscação:" #: src/muuli_wdr.cpp:1463 msgid "Kad:" -msgstr "" +msgstr "Kad:" #: src/muuli_wdr.cpp:1474 msgid "Transfers to client" @@ -6492,19 +6497,19 @@ msgstr "Detalhes do Cliente" #: src/ClientDetailDialog.cpp:129 msgid "Enabled" -msgstr "" +msgstr "Habilitado" #: src/ClientDetailDialog.cpp:131 msgid "Supported" -msgstr "" +msgstr "Suportado" #: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193 msgid "Not supported" -msgstr "" +msgstr "Não suportado" #: src/ClientDetailDialog.cpp:137 msgid "Disabled" -msgstr "" +msgstr "Disabilitado" #: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173 #, c-format @@ -7039,16 +7044,16 @@ msgstr "Falha ao baixar arquivo de controle de versão" #: src/amule.cpp:1988 #, c-format msgid "Users: %s | Files: %s" -msgstr "" +msgstr "Usuários:%s | Arquivos: %s" #: src/amule.cpp:1989 #, c-format msgid "Users: E: %s K: %s | Files: E: %s K: %s" -msgstr "" +msgstr "Usuários: E: %s K: %s | Arquivos: E: %s K: %s" #: src/amule.cpp:1998 msgid "No networks selected" -msgstr "" +msgstr "Nenhuma rede selecionada" #: src/amule.cpp:2065 #, c-format diff --git a/po/pt_PT.po b/po/pt_PT.po index 9f22d6d5..163e8fbc 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-15 02:00+0100\n" "Last-Translator: Miguel Almeida \n" "Language-Team: Portuguese \n" @@ -2746,15 +2746,15 @@ msgstr "Colar" msgid "Select All" msgstr "Seleccionar tudo" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Buscas no Kad não podem ser feitas se o Kad não estiver ligado" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Buscas no ED2K não podem ser feitas se o ED2K não estiver ligado" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Erro inesperado enquanto tentava fazer uma busca no Kad: " @@ -3406,57 +3406,57 @@ msgstr "Rede ED2K desactivada nas prefer msgid "No valid servers to connect in serverlist found" msgstr "Não houve conexões válidas na lista de servidores" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Conectado a %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Conexão estabelecida com: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Erro Fatal durante tentativa de conexão. Talvez a sua conexão tenha caído." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Perdida a conexão com %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) aparenta estar morto." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) aparenta estar cheio." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Conexão automática com o servidor irá repetir-se em %d segundos" msgstr[1] "Conexão automática com o servidor irá repetir-se em %d segundos" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Conexão perdida" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "A conexão com %s (%s:%i) falhou." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Erro: Socket inválido durante a verificacão" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "A tentativa de conexão com %s (%s:%i) expirou." diff --git a/po/ru.po b/po/ru.po index 7f893c8f..4f21b440 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: amule_2007-08-29\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-03-05 15:54+0200\n" "Last-Translator: Nick Shaforostoff \n" "Language-Team: Russian \n" @@ -2771,15 +2771,15 @@ msgstr "Вставить" msgid "Select All" msgstr "Выделить все" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Невозможно осуществить поиск через Kad если Кад не запущен" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Неворзможно осуществить поиск через ED2K если нет соединения с ED2K" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Ошибка при поиске через Kad: " @@ -3441,36 +3441,36 @@ msgstr "Сеть ED2K выключена в настройках. Не уста msgid "No valid servers to connect in serverlist found" msgstr "Ни одного действительного сервера для соединения в списке не найдено." -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Подключен к %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Установлено соединение с: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "Ошибка во время соединения. Возможно нет соединения с Интернет." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Утеряно соединение с %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) вероятно умер." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) вероятно заполнен." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3481,20 +3481,20 @@ msgstr[1] "" msgstr[2] "" "Автоматическое соединение с сервером будет предпринято через %d секунд" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Соединение утрачено" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Подключение к %s (%s:%i) завершилось ошибкой." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Ошибка: неверный сокет по истечении времени ожидания" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Время ожидания соединения с %s (%s:%i) вышло." diff --git a/po/sl.po b/po/sl.po index 922408cb..fb4970c2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-08-30 22:58+0200\n" "Last-Translator: Aljoša Vidmar \n" "Language-Team: Slovenščina \n" @@ -2765,15 +2765,15 @@ msgstr "Prilepi" msgid "Select All" msgstr "Izberi vse" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Iskanje preko Kad ni mogoče, če Kad ne teče" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Iskanje preko ED2K ni mogoče, če ED2K ni povezan" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Nepričakovana napaka med iskanjem Kad: " @@ -3431,37 +3431,37 @@ msgstr "" "Na seznamu strežnikov ni veljavnih strežnikov s katerimi bi se lahko " "povezali." -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Povezan z %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Povezava vzpostavljena z: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Kritična napaka med povezovanjem. Internetna povezava je mogoče prekinjena" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Izgubljena povezava z %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) je nedosegljiv." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) je poln." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, fuzzy, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" @@ -3470,20 +3470,20 @@ msgstr[0] "" msgstr[1] "" "Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekund" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Povezava izgubljena" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Povezovanje z %s (%s:%i) ni uspelo." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Napaka: Vtičnica ni bila veljavna ob preverjanju časovne omejitve" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Poskus povezovanja z %s (%s:%i) je potekel." diff --git a/po/sq.po b/po/sq.po index b31e606b..6db2dd8e 100644 --- a/po/sq.po +++ b/po/sq.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: sq\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-20 20:41+0200\n" "Last-Translator: Fation \n" @@ -2759,15 +2759,15 @@ msgstr "Ngjit" msgid "Select All" msgstr "Zgjidhi te gjitha" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kerkimi i Kad nuk mund te behet nqs Kad nuk eshte duke punuar" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "Kerkimi ED2K nuk mund te behet nqs ED2K nuk eshte lidhur" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Gabim i paparashikuar duke kerkuar Kad: " @@ -3429,58 +3429,58 @@ msgstr "Rjeti ED2K eshte c'aktivizuar tek Preferencat, nuk jam duke u lidhur." msgid "No valid servers to connect in serverlist found" msgstr "Ne listen e serverave nuk u gjend asnje server i vlefshem" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "I lidhur tek %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Lidhja u vendos ne: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Gabim i Rende gjate tentatives per tu lidhur. Lidhja e Internetit mund te " "jete shkeputur" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Humbi lidhja tek %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) duket sikur nuk ka shenja jete." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) duket sikur eshte plote." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Rilidhje automatike tek serveri do te behet ne %d sekonde" msgstr[1] "Rilidhje automatike tek serveri do te behet ne %d sekonda" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "LIdhja humbi" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "Lidhja tek %s (%s:%i) deshtoi." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Gabim: Socket i pavlere ne kontrollin timeout" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "Lidhja tek %s (%s:%i) nuk u vendos per time-out." diff --git a/po/sv.po b/po/sv.po index 2b0a6a55..d6727249 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2007-03-12 22:49+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -2700,15 +2700,15 @@ msgstr "Klistra in" msgid "Select All" msgstr "Markera alla" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "" @@ -3337,56 +3337,56 @@ msgstr "" msgid "No valid servers to connect in serverlist found" msgstr "Inga giltiga servrar att ansluta till hittades i serverlista" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "Ansluten till %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "Anslutning etablerad: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Förlorade anslutningen till %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) verkar vara död." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) verkar vara full." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "" msgstr[1] "" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Anslutningen förlorades" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "" diff --git a/po/tr.po b/po/tr.po index 5c054b45..d878630d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: amule\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-23 14:32+0300\n" "Last-Translator: Atilla ÖNTAŞ \n" "Language-Team: Türkçe \n" @@ -2744,15 +2744,15 @@ msgstr "Yapıştır" msgid "Select All" msgstr "Hepsini Seçiniz" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad. çalışmıyorsa, Kad. araması yapılamaz." -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2k bağlı değilse, ED2K araması yapılamaz." -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "Kad. araması sırasında beklenilmeyen hata oluştu." @@ -3398,57 +3398,57 @@ msgstr "ED2K ağı ayarlarda devre dışı bırakılmış, bağlanılmıyor." msgid "No valid servers to connect in serverlist found" msgstr "Sunucu listesinde bağlanılabilecek geçerli bir sunucu bulunamadı" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr " %s (%s:%i) sunucusuna bağlanıldı" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "%s sunucusuna bağlanıldı" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "" "Önemli Hata: Bağlantı sağlanamıyor. İnternet bağlantınız kopmuş olabilir." -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "Bağlantı kaybedildi: %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) görünüşe göre ölü." -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) görünüşe göre dolu." -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek" msgstr[1] "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "Bağlantı Koptu" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "%s (%s:%i) adresine bağlantı başarısız." -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "Hata: Zaman aşımı kontrolündeki soket geçersiz" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "%s (%s:%i) adresine bağlanma denemesi zamanaşımına uğradı." diff --git a/po/zh_CN.po b/po/zh_CN.po index 198aa228..f0d67c9a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-02 23:15+0800\n" "Last-Translator: 小桥 <29551030@qq.com>\n" "Language-Team: 小桥 <29551030@qq.com>\n" @@ -2720,15 +2720,15 @@ msgstr "粘贴" msgid "Select All" msgstr "选择全部" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad 搜索不能使用，因为 Kad 没有连接" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2K 搜索不能使用，因为 ED2K 没有连接" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "尝试 Kad 搜索时出现不可预料的错误：" @@ -3357,56 +3357,56 @@ msgstr "ED2K网络在设置被禁用，没有连接。" msgid "No valid servers to connect in serverlist found" msgstr "服务器列表中没有有效服务器可供连接" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "已连接至 %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "已成功连接到：%s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "尝试连接时出现严重错误，网络可能没有连接" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "连接已断开 %s（%s：%i）" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s（%s：%i）可能已当机" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s（%s：%i）可能已没有空位" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "服务器自动连接会在 %d 秒后重新尝试" msgstr[1] "服务器自动连接会在 %d 秒后重新尝试" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "连接已断" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "连接失败 %s（%s：%i）" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "错误：接口无效" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "连接超时 %s（%s：%i）" diff --git a/po/zh_TW.po b/po/zh_TW.po index 531ea770..a48a3a50 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aMule 2.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-10 03:31+0200\n" +"POT-Creation-Date: 2008-05-12 03:30+0200\n" "PO-Revision-Date: 2008-04-02 23:15+0800\n" "Last-Translator: 小橋 <29551030@qq.com>\n" "Language-Team: Chinese <29551030@qq.com>\n" @@ -2718,15 +2718,15 @@ msgstr "粘貼" msgid "Select All" msgstr "選擇全部" -#: src/SearchList.cpp:265 +#: src/SearchList.cpp:292 msgid "Kad search can't be done if Kad is not running" msgstr "Kad 搜索不能使用，因爲 Kad 沒有連接" -#: src/SearchList.cpp:267 +#: src/SearchList.cpp:294 msgid "ED2K search can't be done if ED2K is not connected" msgstr "ED2k 搜索不能使用，因爲 ED2K 沒有連接" -#: src/SearchList.cpp:311 +#: src/SearchList.cpp:341 msgid "Unexpected error while attempting Kad search: " msgstr "嘗試 Kad 搜索時出現不可預料的錯誤：" @@ -3355,56 +3355,56 @@ msgstr "ED2K網絡在設置被禁用，沒有連接。" msgid "No valid servers to connect in serverlist found" msgstr "伺服器清單中沒有有效伺服器可供連線" -#: src/ServerConnect.cpp:197 +#: src/ServerConnect.cpp:187 #, c-format msgid "Connected to %s (%s:%i)" msgstr "已連線到 %s (%s:%i)" -#: src/ServerConnect.cpp:273 +#: src/ServerConnect.cpp:263 #, c-format msgid "Connection established on: %s" msgstr "已連線到: %s" -#: src/ServerConnect.cpp:345 +#: src/ServerConnect.cpp:335 msgid "Fatal Error while trying to connect. Internet connection might be down" msgstr "連線出現嚴重錯誤. 網絡連線可能有問題" -#: src/ServerConnect.cpp:349 +#: src/ServerConnect.cpp:339 #, c-format msgid "Lost connection to %s (%s:%i)" msgstr "連線已斷 %s (%s:%i)" -#: src/ServerConnect.cpp:359 +#: src/ServerConnect.cpp:349 #, c-format msgid "%s (%s:%i) appears to be dead." msgstr "%s (%s:%i) 可能已當機" -#: src/ServerConnect.cpp:372 +#: src/ServerConnect.cpp:362 #, c-format msgid "%s (%s:%i) appears to be full." msgstr "%s (%s:%i) 可能已沒有空位" -#: src/ServerConnect.cpp:391 +#: src/ServerConnect.cpp:381 #, c-format msgid "Automatic connection to server will retry in %d second" msgid_plural "Automatic connection to server will retry in %d seconds" msgstr[0] "伺服器自動連線會在 %d 秒后重新嘗試" msgstr[1] "伺服器自動連線會在 %d 秒后重新嘗試" -#: src/ServerConnect.cpp:411 +#: src/ServerConnect.cpp:401 msgid "Connection lost" msgstr "連線已斷" -#: src/ServerConnect.cpp:418 +#: src/ServerConnect.cpp:408 #, c-format msgid "Connecting to %s (%s:%i) failed." msgstr "連接失敗 %s (%s:%i)" -#: src/ServerConnect.cpp:460 +#: src/ServerConnect.cpp:450 msgid "Error: Socket invalid at timeoutcheck" msgstr "錯誤: 接口無效" -#: src/ServerConnect.cpp:470 +#: src/ServerConnect.cpp:460 #, c-format msgid "Connection attempt to %s (%s:%i) timed out." msgstr "連接超時 %s (%s:%i)" diff --git a/src/SearchDlg.cpp b/src/SearchDlg.cpp index 1c46b49b..a1c455a8 100644 --- a/src/SearchDlg.cpp +++ b/src/SearchDlg.cpp @@ -517,10 +517,10 @@ void CSearchDlg::StartNewSearch() uint32 sizemax = GetTypeSize( (uint8) CastChild( IDC_SEARCHMAXSIZE, wxChoice )->GetSelection() ); // Parameter Minimum Size - params.minSize = CastChild( IDC_SPINSEARCHMIN, wxSpinCtrl )->GetValue() * sizemin; + params.minSize = (uint64_t)(CastChild( IDC_SPINSEARCHMIN, wxSpinCtrl )->GetValue()) * (uint64_t)sizemin; // Parameter Maximum Size - params.maxSize = CastChild( IDC_SPINSEARCHMAX, wxSpinCtrl )->GetValue() * sizemax; + params.maxSize = (uint64_t)(CastChild( IDC_SPINSEARCHMAX, wxSpinCtrl )->GetValue()) * (uint64_t)sizemax; if ((params.maxSize < params.minSize) && (params.maxSize)) { wxMessageDialog dlg(this, diff --git a/src/SearchList.cpp b/src/SearchList.cpp index 695576c9..aface6b5 100644 --- a/src/SearchList.cpp +++ b/src/SearchList.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include "updownclient.h" // Needed for CUpDownClient @@ -134,10 +135,13 @@ void ParsedSearchExpression(const CSearchExpr* pexpr) class CSearchExprTarget { public: - CSearchExprTarget(CMemFile* pData, EUtf8Str eStrEncode) + CSearchExprTarget(CMemFile* pData, EUtf8Str eStrEncode, bool supports64bit, bool& using64bit) + : m_data(pData), + m_eStrEncode(eStrEncode), + m_supports64bit(supports64bit), + m_using64bit(using64bit) { - m_data = pData; - m_eStrEncode = eStrEncode; + m_using64bit = false; } void WriteBooleanAND() @@ -187,19 +191,39 @@ public: m_data->WriteString(pszMetaTagID); // meta tag ID } - void WriteMetaDataSearchParam(uint8 uMetaTagID, uint8 uOperator, uint32 uValue) + void WriteMetaDataSearchParam(uint8_t uMetaTagID, uint8_t uOperator, uint64_t value) { - m_data->WriteUInt8(3); // numeric parameter type - m_data->WriteUInt32(uValue); // numeric value + bool largeValue = value > wxULL(0xFFFFFFFF); + if (largeValue && m_supports64bit) { + m_using64bit = true; + m_data->WriteUInt8(8); // numeric parameter type (int64) + m_data->WriteUInt64(value); // numeric value + } else { + if (largeValue) { + value = 0xFFFFFFFFu; + } + m_data->WriteUInt8(3); // numeric parameter type (int32) + m_data->WriteUInt32(value); // numeric value + } m_data->WriteUInt8(uOperator); // comparison operator m_data->WriteUInt16(sizeof(uint8)); // meta tag ID length m_data->WriteUInt8(uMetaTagID); // meta tag ID name } - void WriteMetaDataSearchParam(const wxString& pszMetaTagID, uint8 uOperator, uint32 uValue) + void WriteMetaDataSearchParam(const wxString& pszMetaTagID, uint8_t uOperator, uint64_t value) { - m_data->WriteUInt8(3); // numeric parameter type - m_data->WriteUInt32(uValue); // numeric value + bool largeValue = value > wxULL(0xFFFFFFFF); + if (largeValue && m_supports64bit) { + m_using64bit = true; + m_data->WriteUInt8(8); // numeric parameter type (int64) + m_data->WriteUInt64(value); // numeric value + } else { + if (largeValue) { + value = 0xFFFFFFFFu; + } + m_data->WriteUInt8(3); // numeric parameter type (int32) + m_data->WriteUInt32(value); // numeric value + } m_data->WriteUInt8(uOperator); // comparison operator m_data->WriteString(pszMetaTagID); // meta tag ID } @@ -207,6 +231,8 @@ public: protected: CMemFile* m_data; EUtf8Str m_eStrEncode; + bool m_supports64bit; + bool& m_using64bit; }; @@ -225,7 +251,8 @@ CSearchList::CSearchList() m_searchType(LocalSearch), m_searchInProgress(false), m_currentSearch(-1), - m_searchPacket(NULL) + m_searchPacket(NULL), + m_64bitSearchPacket(false) { } @@ -279,8 +306,11 @@ wxString CSearchList::StartNewSearch(uint32* searchID, SearchType type, const CS m_resultType.Clear(); } - // This MemFile is automatically free'd, except for kad searches. - CMemFilePtr data = CreateSearchData(params, type); + bool supports64bit = type == KadSearch ? true : theApp->serverconnect->GetCurrentServer() != NULL && (theApp->serverconnect->GetCurrentServer()->GetTCPFlags() & SRV_TCPFLG_LARGEFILES); + bool packetUsing64bit; + + // This MemFile is automatically free'd + CMemFilePtr data = CreateSearchData(params, type, supports64bit, packetUsing64bit); if (data.get() == NULL) { wxASSERT(_astrParserErrors.Count()); @@ -322,9 +352,8 @@ wxString CSearchList::StartNewSearch(uint32* searchID, SearchType type, const CS if (type == GlobalSearch) { m_searchPacket = searchPacket; - - // The OPCode must be changed since global searches are UDP requests - m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ); + m_64bitSearchPacket = packetUsing64bit; + m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ); // will be changed later when actually sending the packet!! } } @@ -363,7 +392,7 @@ uint32 CSearchList::GetSearchProgress() const / theApp->serverlist->GetServerCount(); case KadSearch: - // We cannot meassure the progress of Kad searches. + // We cannot measure the progress of Kad searches. return 0; default: @@ -395,9 +424,38 @@ void CSearchList::OnGlobalSearchTimer(CTimerEvent& WXUNUSED(evt)) // We've already requested from the local server. continue; } else { - theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize()); - theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false); - CoreNotify_Search_Update_Progress(GetSearchProgress()); + if (server->SupportsLargeFilesUDP() && (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES)) { + CMemFile data(50); + uint32_t tagCount = 1; + data.WriteUInt32(tagCount); + CTagVarInt flags(CT_SERVER_UDPSEARCH_FLAGS, SRVCAP_UDP_NEWTAGS_LARGEFILES); + flags.WriteNewEd2kTag(&data); + CPacket *extSearchPacket = new CPacket(OP_GLOBSEARCHREQ3, m_searchPacket->GetPacketSize() + (uint32_t)data.GetLength(), OP_EDONKEYPROT); + extSearchPacket->CopyToDataBuffer(0, data.GetRawBuffer(), data.GetLength()); + extSearchPacket->CopyToDataBuffer(data.GetLength(), m_searchPacket->GetDataBuffer(), m_searchPacket->GetPacketSize()); + theStats::AddUpOverheadServer(extSearchPacket->GetPacketSize()); + theApp->serverconnect->SendUDPPacket(extSearchPacket, server, true); + AddDebugLogLineM(false, logServerUDP, wxT("Sending OP_GLOBSEARCHREQ3 to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort())); + } else if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES) { + if (!m_64bitSearchPacket || server->SupportsLargeFilesUDP()) { + m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ2); + AddDebugLogLineM(false, logServerUDP, wxT("Sending OP_GLOBSEARCHREQ2 to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort())); + theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize()); + theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false); + } else { + AddDebugLogLineM(false, logServerUDP, wxT("Skipped UDP search on server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + wxT(": No large file support")); + } + } else { + if (!m_64bitSearchPacket || server->SupportsLargeFilesUDP()) { + m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ); + AddDebugLogLineM(false, logServerUDP, wxT("Sending OP_GLOBSEARCHREQ to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort())); + theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize()); + theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false); + } else { + AddDebugLogLineM(false, logServerUDP, wxT("Skipped UDP search on server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + wxT(": No large file support")); + } + } + CoreNotify_Search_Update_Progress(GetSearchProgress()); return; } } @@ -601,7 +659,7 @@ void CSearchList::StopGlobalSearch() } -CSearchList::CMemFilePtr CSearchList::CreateSearchData(const CSearchParams& params, SearchType type) +CSearchList::CMemFilePtr CSearchList::CreateSearchData(const CSearchParams& params, SearchType type, bool supports64bit, bool& packetUsing64bit) { // Count the number of used parameters unsigned int parametercount = 0; @@ -610,7 +668,7 @@ CSearchList::CMemFilePtr CSearchList::CreateSearchData(const CSearchParams& para if ( params.maxSize > 0 ) ++parametercount; if ( params.availability > 0 ) ++parametercount; if ( !params.extension.IsEmpty() ) ++parametercount; - + wxString typeText = params.typeText; if (typeText == ED2KFTSTR_ARCHIVE){ // eDonkeyHybrid 0.48 uses type "Pro" for archives files @@ -665,7 +723,7 @@ CSearchList::CMemFilePtr CSearchList::CreateSearchData(const CSearchParams& para #endif /* Leave the unicode comment there, please... */ - CSearchExprTarget target(data.get(), true /*I assume everyone is unicoded */ ? utf8strRaw : utf8strNone); + CSearchExprTarget target(data.get(), true /*I assume everyone is unicoded */ ? utf8strRaw : utf8strNone, supports64bit, packetUsing64bit); unsigned int iParameterCount = 0; if (_SearchExpr.m_aExpr.GetCount() <= 1) { diff --git a/src/SearchList.h b/src/SearchList.h index 432a70c1..63e7ce92 100644 --- a/src/SearchList.h +++ b/src/SearchList.h @@ -69,11 +69,11 @@ public: //! The filename extension. May be empty. wxString extension; //! The smallest filesize in bytes to accept, zero for any. - uint32 minSize; + uint64_t minSize; //! The largest filesize in bytes to accept, zero for any. - uint32 maxSize; + uint64_t maxSize; //! The minumum available (source-count), zero for any. - uint32 availability; + uint32_t availability; }; /** Constructor. */ @@ -184,7 +184,7 @@ private: typedef std::auto_ptr CMemFilePtr; /** Create a basic search-packet for the given search-type. */ - CMemFilePtr CreateSearchData(const CSearchParams& params, SearchType type); + CMemFilePtr CreateSearchData(const CSearchParams& params, SearchType type, bool supports64bit, bool& packetUsing64bit); //! Timer used for global search intervals. @@ -202,6 +202,9 @@ private: //! The current packet used for searches. CPacket* m_searchPacket; + //! Does the current search packet contain 64bit values? + bool m_64bitSearchPacket; + //! Queue of servers to ask when doing global searches. //! TODO: Replace with 'cookie' system. CQueueObserver m_serverQueue; diff --git a/src/ServerConnect.cpp b/src/ServerConnect.cpp index fe31710e..45b973b1 100644 --- a/src/ServerConnect.cpp +++ b/src/ServerConnect.cpp @@ -174,16 +174,6 @@ void CServerConnect::StopConnectionTry() } } -#define CAPABLE_ZLIB 0x01 -#define CAPABLE_IP_IN_LOGIN_FRAME 0x02 -#define CAPABLE_AUXPORT 0x04 -#define CAPABLE_NEWTAGS 0x08 -#define CAPABLE_UNICODE 0x10 -#define CAPABLE_LARGEFILES 0x100 -#define SRVCAP_SUPPORTCRYPT 0x0200 -#define SRVCAP_REQUESTCRYPT 0x0400 -#define SRVCAP_REQUIRECRYPT 0x0800 - void CServerConnect::ConnectionEstablished(CServerSocket* sender) { if (connecting == false) diff --git a/src/include/protocol/ed2k/Client2Server/UDP.h b/src/include/protocol/ed2k/Client2Server/UDP.h index 88966c30..694e920b 100644 --- a/src/include/protocol/ed2k/Client2Server/UDP.h +++ b/src/include/protocol/ed2k/Client2Server/UDP.h @@ -27,6 +27,8 @@ #define ED2KC2SUDP_H enum OP_ClientToServerUDP { + OP_GLOBSEARCHREQ3 = 0x90, // <1 tag set> + OP_GLOBSEARCHREQ2 = 0x92, // OP_GLOBGETSOURCES2 = 0x94, // // largefiles only: (17.8) OP_GLOBSERVSTATREQ = 0x96, // (null) @@ -45,12 +47,12 @@ enum OP_ClientToServerUDP { }; // Server UDP flags -#define SRV_UDPFLG_EXT_GETSOURCES 0x00000001 -#define SRV_UDPFLG_EXT_GETFILES 0x00000002 -#define SRV_UDPFLG_NEWTAGS 0x00000008 -#define SRV_UDPFLG_UNICODE 0x00000010 -#define SRV_UDPFLG_EXT_GETSOURCES2 0x00000020 -#define SRV_UDPFLG_LARGEFILES 0x00000100 +#define SRV_UDPFLG_EXT_GETSOURCES 0x00000001 +#define SRV_UDPFLG_EXT_GETFILES 0x00000002 +#define SRV_UDPFLG_NEWTAGS 0x00000008 +#define SRV_UDPFLG_UNICODE 0x00000010 +#define SRV_UDPFLG_EXT_GETSOURCES2 0x00000020 +#define SRV_UDPFLG_LARGEFILES 0x00000100 #define SRV_UDPFLG_UDPOBFUSCATION 0x00000200 #define SRV_UDPFLG_TCPOBFUSCATION 0x00000400 diff --git a/src/include/tags/ClientTags.h b/src/include/tags/ClientTags.h index 1a168997..5582fa6e 100644 --- a/src/include/tags/ClientTags.h +++ b/src/include/tags/ClientTags.h @@ -27,42 +27,69 @@ #define CLIENTTAGS_H enum client_tags { - CT_NAME = 0x01, - CT_PORT = 0x0F, - CT_VERSION = 0x11, - CT_SERVER_FLAGS = 0x20, // currently only used to inform a server about supported features - CT_EMULECOMPAT_OPTIONS = 0xEF, - CT_EMULE_RESERVED1 = 0xF0, - CT_EMULE_RESERVED2 = 0xF1, - CT_EMULE_RESERVED3 = 0xF2, - CT_EMULE_RESERVED4 = 0xF3, - CT_EMULE_RESERVED5 = 0xF4, - CT_EMULE_RESERVED6 = 0xF5, - CT_EMULE_RESERVED7 = 0xF6, - CT_EMULE_RESERVED8 = 0xF7, - CT_EMULE_RESERVED9 = 0xF8, - CT_EMULE_UDPPORTS = 0xF9, - CT_EMULE_MISCOPTIONS1 = 0xFA, - CT_EMULE_VERSION = 0xFB, - CT_EMULE_BUDDYIP = 0xFC, - CT_EMULE_BUDDYUDP = 0xFD, - CT_EMULE_MISCOPTIONS2 = 0xFE, - CT_EMULE_RESERVED13 = 0xFF + CT_NAME = 0x01, + CT_SERVER_UDPSEARCH_FLAGS = 0x0E, + CT_PORT = 0x0F, + CT_VERSION = 0x11, + CT_SERVER_FLAGS = 0x20, // currently only used to inform a server about supported features + CT_EMULECOMPAT_OPTIONS = 0xEF, + CT_EMULE_RESERVED1 = 0xF0, + CT_EMULE_RESERVED2 = 0xF1, + CT_EMULE_RESERVED3 = 0xF2, + CT_EMULE_RESERVED4 = 0xF3, + CT_EMULE_RESERVED5 = 0xF4, + CT_EMULE_RESERVED6 = 0xF5, + CT_EMULE_RESERVED7 = 0xF6, + CT_EMULE_RESERVED8 = 0xF7, + CT_EMULE_RESERVED9 = 0xF8, + CT_EMULE_UDPPORTS = 0xF9, + CT_EMULE_MISCOPTIONS1 = 0xFA, + CT_EMULE_VERSION = 0xFB, + CT_EMULE_BUDDYIP = 0xFC, + CT_EMULE_BUDDYUDP = 0xFD, + CT_EMULE_MISCOPTIONS2 = 0xFE, + CT_EMULE_RESERVED13 = 0xFF }; // Old MuleInfo tags enum MuleInfo_tags { - ET_COMPRESSION = 0x20u, - ET_UDPPORT = 0x21u, - ET_UDPVER = 0x22u, - ET_SOURCEEXCHANGE = 0x23u, - ET_COMMENTS = 0x24u, - ET_EXTENDEDREQUEST = 0x25u, - ET_COMPATIBLECLIENT = 0x26u, - ET_FEATURES = 0x27u, //! bit 0: SecIdent v1 - bit 1: SecIdent v2 - ET_MOD_VERSION = 0x55u, - // ET_FEATURESET = 0x54u, // int - [Bloodymad Featureset] // UNUSED - ET_OS_INFO = 0x94u // Reused rand tag (MOD_OXY), because the type is unknown + ET_COMPRESSION = 0x20u, + ET_UDPPORT = 0x21u, + ET_UDPVER = 0x22u, + ET_SOURCEEXCHANGE = 0x23u, + ET_COMMENTS = 0x24u, + ET_EXTENDEDREQUEST = 0x25u, + ET_COMPATIBLECLIENT = 0x26u, + ET_FEATURES = 0x27u, //! bit 0: SecIdent v1 - bit 1: SecIdent v2 + ET_MOD_VERSION = 0x55u, + // ET_FEATURESET = 0x54u, // int - [Bloodymad Featureset] // UNUSED + ET_OS_INFO = 0x94u // Reused rand tag (MOD_OXY), because the type is unknown +}; + +// Server capabilities, values for CT_SERVER_FLAGS +enum ServerCapabilites { + SRVCAP_ZLIB = 0x0001, + SRVCAP_IP_IN_LOGIN = 0x0002, + SRVCAP_AUXPORT = 0x0004, + SRVCAP_NEWTAGS = 0x0008, + SRVCAP_UNICODE = 0x0010, + SRVCAP_LARGEFILES = 0x0100, + SRVCAP_SUPPORTCRYPT = 0x0200, + SRVCAP_REQUESTCRYPT = 0x0400, + SRVCAP_REQUIRECRYPT = 0x0800 +}; + +// aMule used to use these names +#define CAPABLE_ZLIB SRVCAP_ZLIB +#define CAPABLE_IP_IN_LOGIN_FRAME SRVCAP_IP_IN_LOGIN +#define CAPABLE_AUXPORT SRVCAP_AUXPORT +#define CAPABLE_NEWTAGS SRVCAP_NEWTAGS +#define CAPABLE_UNICODE SRVCAP_UNICODE +#define CAPABLE_LARGEFILES SRVCAP_LARGEFILES + +// Server capabilities, values for CT_SERVER_UDPSEARCH_FLAGS +enum ServerUDPCapabilities { + SRVCAP_UDP_NEWTAGS_LARGEFILES = 0x01 }; #endif // CLIENTTAGS_H diff --git a/src/include/tags/ServerTags.h b/src/include/tags/ServerTags.h index 85a4ce02..029dad14 100644 --- a/src/include/tags/ServerTags.h +++ b/src/include/tags/ServerTags.h @@ -28,27 +28,27 @@ // server.met and server status. enum Server_tags { - ST_SERVERNAME = 0x01, // + ST_SERVERNAME = 0x01, // // Unused (0x02-0x0A) - ST_DESCRIPTION = 0x0B, // - ST_PING = 0x0C, // - ST_FAIL = 0x0D, // - ST_PREFERENCE = 0x0E, // + ST_DESCRIPTION = 0x0B, // + ST_PING = 0x0C, // + ST_FAIL = 0x0D, // + ST_PREFERENCE = 0x0E, // // Unused (0x0F-0x84) - ST_DYNIP = 0x85, - ST_LASTPING_DEPRECATED = 0x86, // // DEPRECATED, use 0x90 - ST_MAXUSERS = 0x87, - ST_SOFTFILES = 0x88, - ST_HARDFILES = 0x89, + ST_DYNIP = 0x85, + ST_LASTPING_DEPRECATED = 0x86, // // DEPRECATED, use 0x90 + ST_MAXUSERS = 0x87, + ST_SOFTFILES = 0x88, + ST_HARDFILES = 0x89, // Unused (0x8A-0x8F) - ST_LASTPING = 0x90, // - ST_VERSION = 0x91, // - ST_UDPFLAGS = 0x92, // - ST_AUXPORTSLIST = 0x93, // - ST_LOWIDUSERS = 0x94, // - ST_UDPKEY = 0x95, // - ST_UDPKEYIP = 0x96, // - ST_TCPPORTOBFUSCATION = 0x97, // + ST_LASTPING = 0x90, // + ST_VERSION = 0x91, // + ST_UDPFLAGS = 0x92, // + ST_AUXPORTSLIST = 0x93, // + ST_LOWIDUSERS = 0x94, // + ST_UDPKEY = 0x95, // + ST_UDPKEYIP = 0x96, // + ST_TCPPORTOBFUSCATION = 0x97, // ST_UDPPORTOBFUSCATION = 0x98 // }; -- 2.11.4.GIT