[axel-commits] r97 - in /trunk: CHANGES de.po http.c nl.po ru.po text.c zh_CN.po

phihag-guest at users.alioth.debian.org phihag-guest at users.alioth.debian.org
Wed Apr 1 22:16:44 UTC 2009 

Author: phihag-guest
Date: Wed Apr  1 22:16:43 2009
New Revision: 97

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=97
Log:
Fix size limits when copying strings (Closes: #311569)

Modified:
    trunk/CHANGES
    trunk/de.po
    trunk/http.c
    trunk/nl.po
    trunk/ru.po
    trunk/text.c
    trunk/zh_CN.po

Modified: trunk/CHANGES
URL: http://svn.debian.org/wsvn/axel/trunk/CHANGES?rev=97&op=diff
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Wed Apr  1 22:16:43 2009
@@ -1,6 +1,7 @@
 UNRELEASED:
 
 - Fix thread hangups due to incorrect synchronization (Closes: #311469), thanks Yao Shi
+- Fix size limits when copying strings (Closes: #311569), thanks Michael Schwendt and the Fedora project members
 
 Version 2.3
 

Modified: trunk/de.po
URL: http://svn.debian.org/wsvn/axel/trunk/de.po?rev=97&op=diff
==============================================================================
--- trunk/de.po (original)
+++ trunk/de.po Wed Apr  1 22:16:43 2009
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Axel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 19:07+0200\n"
+"POT-Creation-Date: 2009-04-02 00:01+0200\n"
 "PO-Revision-Date: 2008-09-15 22:08+0200\n"
 "Last-Translator: Hermann J. Beckers <hj.beckers at onlinehome.de>\n"
 "Language-Team: deutsch <de at li.org>\n"
@@ -50,35 +50,35 @@
 msgid "Starting download"
 msgstr "Starte Abruf"
 
-#: axel.c:241 axel.c:395
+#: axel.c:242 axel.c:401
 #, c-format
 msgid "Connection %i downloading from %s:%i using interface %s"
 msgstr "Verbindung %i: Abruf von %s:%i über Schnittstelle %s"
 
-#: axel.c:245 axel.c:404
+#: axel.c:249 axel.c:411
 msgid "pthread error!!!"
 msgstr "pthread Fehler!!!"
 
-#: axel.c:314
+#: axel.c:317
 #, c-format
 msgid "Error on connection %i! Connection closed"
 msgstr "Fehler bei Verbindung %i! Verbindung getrennt"
 
-#: axel.c:328
+#: axel.c:331
 #, c-format
 msgid "Connection %i unexpectedly closed"
 msgstr "Verbindung %i unerwartet getrennt"
 
-#: axel.c:332 axel.c:349
+#: axel.c:335 axel.c:352
 #, c-format
 msgid "Connection %i finished"
 msgstr "Verbindung %i beendet"
 
-#: axel.c:361
+#: axel.c:364
 msgid "Write error!"
 msgstr "Schreibfehler!"
 
-#: axel.c:373
+#: axel.c:376
 #, c-format
 msgid "Connection %i timed out"
 msgstr "Time-out bei Verbindung %i"
@@ -143,47 +143,57 @@
 msgid "Can't redirect stdout to /dev/null.\n"
 msgstr "Kann Standardausgabe nicht nach /dev/null umleiten.\n"
 
-#: text.c:182
+#: text.c:176
+#, c-format
+msgid "Error when trying to read URL (Too long?).\n"
+msgstr "Fehler beim Lesen der URL (Zu lang?).\n"
+
+#: text.c:185
 #, c-format
 msgid "Can't handle URLs of length over %d\n"
 msgstr "Kann URLs mit mehr als %d Zeichen nicht nutzen\n"
 
-#: text.c:187
+#: text.c:190
 #, c-format
 msgid "Initializing download: %s\n"
 msgstr "Starte Abruf: %s\n"
 
-#: text.c:194
+#: text.c:197
 #, c-format
 msgid "Doing search...\n"
 msgstr "Suche gestartet...\n"
 
-#: text.c:198
+#: text.c:201
 #, c-format
 msgid "File not found\n"
 msgstr "Datei nicht gefunden\n"
 
-#: text.c:202
+#: text.c:205
 #, c-format
 msgid "Testing speeds, this can take a while...\n"
 msgstr "Teste Geschwindigkeiten, das kann etwas dauern...\n"
 
-#: text.c:207
+#: text.c:210
 #, c-format
 msgid "%i usable servers found, will use these URLs:\n"
 msgstr "%i benutzbare Server gefunden, werde diese URLs benutzen:\n"
 
 #: text.c:269
 #, c-format
+msgid "Filename too long!\n"
+msgstr "Dateiname zu lang!\n"
+
+#: text.c:281
+#, c-format
 msgid "No state file, cannot resume!\n"
 msgstr "Keine Status-Datei, Fortsetzung nicht möglich!\n"
 
-#: text.c:274
+#: text.c:286
 #, c-format
 msgid "State file found, but no downloaded data. Starting from scratch.\n"
 msgstr "Status-Datei gefunden, aber noch nichts übertragen. Neustart.\n"
 
-#: text.c:405
+#: text.c:417
 #, c-format
 msgid ""
 "\n"
@@ -192,47 +202,47 @@
 "\n"
 "%s abgerufen in %s. (%.2f KB/s)\n"
 
-#: text.c:427
+#: text.c:439
 #, fuzzy, c-format
 msgid "%lld byte"
 msgstr "%i Byte"
 
-#: text.c:429
+#: text.c:441
 #, fuzzy, c-format
 msgid "%lld bytes"
 msgstr "%i Bytes"
 
-#: text.c:431
+#: text.c:443
 #, c-format
 msgid "%.1f kilobytes"
 msgstr "%.1f Kilobytes"
 
-#: text.c:433
+#: text.c:445
 #, c-format
 msgid "%.1f megabytes"
 msgstr "%.1f Megabytes"
 
-#: text.c:442
+#: text.c:454
 #, c-format
 msgid "%i second"
 msgstr "%i Sekunde"
 
-#: text.c:444
+#: text.c:456
 #, c-format
 msgid "%i seconds"
 msgstr "%i Sekunden"
 
-#: text.c:446
+#: text.c:458
 #, c-format
 msgid "%i:%02i seconds"
 msgstr "%i:%02i Sekunden"
 
-#: text.c:448
+#: text.c:460
 #, c-format
 msgid "%i:%02i:%02i seconds"
 msgstr "%i:%02i:%02i Sekunden"
 
-#: text.c:528
+#: text.c:540
 #, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -259,8 +269,7 @@
 "-o f\tlokale Ausgabe-Datei\n"
 "-S [x]\tSuche nach Spiegelservern und Abruf von x Servern\n"
 "-H x\tSende HTTP-Header\n"
-"-U x\tSetze Browser-Kennung"
-"-N\tkeinen Proxy-Server benutzen\n"
+"-U x\tSetze Browser-Kennung-N\tkeinen Proxy-Server benutzen\n"
 "-q\tkeine Meldungen auf Standard-Ausgabe\n"
 "-v\tzusätzliche Status-Information\n"
 "-h\tdiese Information\n"
@@ -268,7 +277,7 @@
 "\n"
 "Fehler an lintux at lintux.cx melden.\n"
 
-#: text.c:545
+#: text.c:557
 #, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -304,8 +313,7 @@
 "\n"
 "Fehler an lintux at lintux.cx melden.\n"
 
-#: text.c:566
+#: text.c:578
 #, c-format
 msgid "Axel version %s (%s)\n"
 msgstr "Axel Version %s (%s)\n"
-

Modified: trunk/http.c
URL: http://svn.debian.org/wsvn/axel/trunk/http.c?rev=97&op=diff
==============================================================================
--- trunk/http.c (original)
+++ trunk/http.c Wed Apr  1 22:16:43 2009
@@ -124,7 +124,7 @@
 	strcat( s, "\r\n" );
 	va_end( params );
 	
-	strncat( conn->request, s, MAX_QUERY );
+	strncat( conn->request, s, MAX_QUERY - strlen(conn->request) - 1);
 }
 
 int http_exec( http_t *conn )

Modified: trunk/nl.po
URL: http://svn.debian.org/wsvn/axel/trunk/nl.po?rev=97&op=diff
==============================================================================
--- trunk/nl.po (original)
+++ trunk/nl.po Wed Apr  1 22:16:43 2009
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Axel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 19:07+0200\n"
+"POT-Creation-Date: 2009-04-02 00:04+0200\n"
 "PO-Revision-Date: 2001-11-14 15:22+0200\n"
 "Last-Translator: Wilmer van der Gaast <wilmer at gaast.net>\n"
 "Language-Team: Dutch <nl at li.org>\n"
@@ -49,35 +49,35 @@
 msgid "Starting download"
 msgstr "Begin download"
 
-#: axel.c:241 axel.c:395
+#: axel.c:242 axel.c:401
 #, c-format
 msgid "Connection %i downloading from %s:%i using interface %s"
 msgstr "Verbinding %i gebruikt server %s:%i via interface %s"
 
-#: axel.c:245 axel.c:404
+#: axel.c:249 axel.c:411
 msgid "pthread error!!!"
 msgstr "pthread fout!!!"
 
-#: axel.c:314
+#: axel.c:317
 #, c-format
 msgid "Error on connection %i! Connection closed"
 msgstr "Fout op verbinding %i! Verbinding gesloten"
 
-#: axel.c:328
+#: axel.c:331
 #, c-format
 msgid "Connection %i unexpectedly closed"
 msgstr "Verbinding %i onverwachts gesloten"
 
-#: axel.c:332 axel.c:349
+#: axel.c:335 axel.c:352
 #, c-format
 msgid "Connection %i finished"
 msgstr "Verbinding %i klaar"
 
-#: axel.c:361
+#: axel.c:364
 msgid "Write error!"
 msgstr "Schrijffout!"
 
-#: axel.c:373
+#: axel.c:376
 #, c-format
 msgid "Connection %i timed out"
 msgstr "Time-out op verbinding %i"
@@ -142,47 +142,57 @@
 msgid "Can't redirect stdout to /dev/null.\n"
 msgstr "Fout bij het afsluiten van stdout.\n"
 
-#: text.c:182
+#: text.c:176
+#, c-format
+msgid "Error when trying to read URL (Too long?).\n"
+msgstr ""
+
+#: text.c:185
 #, c-format
 msgid "Can't handle URLs of length over %d\n"
 msgstr ""
 
-#: text.c:187
+#: text.c:190
 #, c-format
 msgid "Initializing download: %s\n"
 msgstr "Begin download: %s\n"
 
-#: text.c:194
+#: text.c:197
 #, c-format
 msgid "Doing search...\n"
 msgstr "Zoeken...\n"
 
-#: text.c:198
+#: text.c:201
 #, c-format
 msgid "File not found\n"
 msgstr "Bestand niet gevonden\n"
 
-#: text.c:202
+#: text.c:205
 #, c-format
 msgid "Testing speeds, this can take a while...\n"
 msgstr "Snelheden testen, dit kan even duren...\n"
 
-#: text.c:207
+#: text.c:210
 #, c-format
 msgid "%i usable servers found, will use these URLs:\n"
 msgstr "%i bruikbare servers gevonden, de volgende worden gebruikt:\n"
 
 #: text.c:269
 #, c-format
+msgid "Filename too long!\n"
+msgstr ""
+
+#: text.c:281
+#, c-format
 msgid "No state file, cannot resume!\n"
 msgstr "Geen .st bestand, kan niet resumen!\n"
 
-#: text.c:274
+#: text.c:286
 #, c-format
 msgid "State file found, but no downloaded data. Starting from scratch.\n"
 msgstr ".st bestand gevonden maar geen uitvoerbestand. Opnieuw beginnen.\n"
 
-#: text.c:405
+#: text.c:417
 #, c-format
 msgid ""
 "\n"
@@ -191,47 +201,47 @@
 "\n"
 "%s gedownload in %s. (%.2f KB/s)\n"
 
-#: text.c:427
+#: text.c:439
 #, fuzzy, c-format
 msgid "%lld byte"
 msgstr "%i byte"
 
-#: text.c:429
+#: text.c:441
 #, fuzzy, c-format
 msgid "%lld bytes"
 msgstr "%i bytes"
 
-#: text.c:431
+#: text.c:443
 #, c-format
 msgid "%.1f kilobytes"
 msgstr "%.1f kilobytes"
 
-#: text.c:433
+#: text.c:445
 #, c-format
 msgid "%.1f megabytes"
 msgstr "%.1f megabytes"
 
-#: text.c:442
+#: text.c:454
 #, c-format
 msgid "%i second"
 msgstr "%i seconde"
 
-#: text.c:444
+#: text.c:456
 #, c-format
 msgid "%i seconds"
 msgstr "%i seconden"
 
-#: text.c:446
+#: text.c:458
 #, c-format
 msgid "%i:%02i seconds"
 msgstr "%i:%02i seconden"
 
-#: text.c:448
+#: text.c:460
 #, c-format
 msgid "%i:%02i:%02i seconds"
 msgstr "%i:%02i:%02i seconden"
 
-#: text.c:528
+#: text.c:540
 #, fuzzy, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -266,7 +276,7 @@
 "\n"
 "Bugs melden aan lintux at lintux.cx\n"
 
-#: text.c:545
+#: text.c:557
 #, fuzzy, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -301,7 +311,7 @@
 "\n"
 "Bugs melden aan lintux at lintux.cx\n"
 
-#: text.c:566
+#: text.c:578
 #, c-format
 msgid "Axel version %s (%s)\n"
 msgstr "Axel versie %s (%s)\n"

Modified: trunk/ru.po
URL: http://svn.debian.org/wsvn/axel/trunk/ru.po?rev=97&op=diff
==============================================================================
--- trunk/ru.po (original)
+++ trunk/ru.po Wed Apr  1 22:16:43 2009
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Axel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 19:07+0200\n"
+"POT-Creation-Date: 2009-04-02 00:05+0200\n"
 "Last-Translator: newhren <colimit at gmail.com>\n"
 "Language-Team: Russian <ru at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -49,35 +49,35 @@
 msgid "Starting download"
 msgstr "Начинаем скачивание"
 
-#: axel.c:241 axel.c:395
+#: axel.c:242 axel.c:401
 #, c-format
 msgid "Connection %i downloading from %s:%i using interface %s"
 msgstr "Соединение %i скачивает с %s:%i через интерфейс %s"
 
-#: axel.c:245 axel.c:404
+#: axel.c:249 axel.c:411
 msgid "pthread error!!!"
 msgstr "ошибка pthread!!!"
 
-#: axel.c:314
+#: axel.c:317
 #, c-format
 msgid "Error on connection %i! Connection closed"
 msgstr "Ошибка в соединении %i! Соединение закрыто"
 
-#: axel.c:328
+#: axel.c:331
 #, c-format
 msgid "Connection %i unexpectedly closed"
 msgstr "Соединение %i неожиданно закрылось"
 
-#: axel.c:332 axel.c:349
+#: axel.c:335 axel.c:352
 #, c-format
 msgid "Connection %i finished"
 msgstr "Соединение %i закончилось"
 
-#: axel.c:361
+#: axel.c:364
 msgid "Write error!"
 msgstr "Ошибка записи!"
 
-#: axel.c:373
+#: axel.c:376
 #, c-format
 msgid "Connection %i timed out"
 msgstr "Время соединения %i вышло"
@@ -142,49 +142,59 @@
 msgid "Can't redirect stdout to /dev/null.\n"
 msgstr "Невозможно перенаправить stdout в /dev/null.\n"
 
-#: text.c:182
+#: text.c:176
+#, c-format
+msgid "Error when trying to read URL (Too long?).\n"
+msgstr ""
+
+#: text.c:185
 #, c-format
 msgid "Can't handle URLs of length over %d\n"
 msgstr "URLs длинной больше %d не поддерживаются\n"
 
-#: text.c:187
+#: text.c:190
 #, c-format
 msgid "Initializing download: %s\n"
 msgstr "Начинаю скачивание: %s\n"
 
-#: text.c:194
+#: text.c:197
 #, c-format
 msgid "Doing search...\n"
 msgstr "Ищем...\n"
 
-#: text.c:198
+#: text.c:201
 #, c-format
 msgid "File not found\n"
 msgstr "Файл не найден\n"
 
-#: text.c:202
+#: text.c:205
 #, c-format
 msgid "Testing speeds, this can take a while...\n"
 msgstr "Пробуем скорости, это может занять некоторое время...\n"
 
-#: text.c:207
+#: text.c:210
 #, c-format
 msgid "%i usable servers found, will use these URLs:\n"
 msgstr "Найдено %i полезныÑ
 серверов, будут использованы следующие URLs:\n"
 
 #: text.c:269
 #, c-format
+msgid "Filename too long!\n"
+msgstr ""
+
+#: text.c:281
+#, c-format
 msgid "No state file, cannot resume!\n"
 msgstr "Файл состояния не найден, возобновление невозможно!\n"
 
-#: text.c:274
+#: text.c:286
 #, c-format
 msgid "State file found, but no downloaded data. Starting from scratch.\n"
 msgstr ""
 "Файл состояния найден, но предварительно скачанные данные отсутствуют. "
 "Начинаем заново.\n"
 
-#: text.c:405
+#: text.c:417
 #, c-format
 msgid ""
 "\n"
@@ -193,47 +203,47 @@
 "\n"
 "%s скачано за %s. (%.2f КБ/с)\n"
 
-#: text.c:427
+#: text.c:439
 #, c-format
 msgid "%lld byte"
 msgstr "%lld байт"
 
-#: text.c:429
+#: text.c:441
 #, c-format
 msgid "%lld bytes"
 msgstr "%lld байта(ов)"
 
-#: text.c:431
+#: text.c:443
 #, c-format
 msgid "%.1f kilobytes"
 msgstr "%.1f килобайта(ов)"
 
-#: text.c:433
+#: text.c:445
 #, c-format
 msgid "%.1f megabytes"
 msgstr "%.1f мегабайта(ов)"
 
-#: text.c:442
+#: text.c:454
 #, c-format
 msgid "%i second"
 msgstr "%i секунда"
 
-#: text.c:444
+#: text.c:456
 #, c-format
 msgid "%i seconds"
 msgstr "%i секунд(ы)"
 
-#: text.c:446
+#: text.c:458
 #, c-format
 msgid "%i:%02i seconds"
 msgstr "%i:%02i секунд(ы)"
 
-#: text.c:448
+#: text.c:460
 #, c-format
 msgid "%i:%02i:%02i seconds"
 msgstr "%i:%02i:%02i секунд(ы)"
 
-#: text.c:528
+#: text.c:540
 #, fuzzy, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -268,7 +278,7 @@
 "\n"
 "Об ошибкаÑ
 сообщайте на http://axel.alioth.debian.org/\n"
 
-#: text.c:545
+#: text.c:557
 #, fuzzy, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -303,7 +313,7 @@
 "\n"
 "Об ошибкаÑ
 сообщайте на http://axel.alioth.debian.org/\n"
 
-#: text.c:566
+#: text.c:578
 #, c-format
 msgid "Axel version %s (%s)\n"
 msgstr "Axel, версия %s (%s)\n"

Modified: trunk/text.c
URL: http://svn.debian.org/wsvn/axel/trunk/text.c?rev=97&op=diff
==============================================================================
--- trunk/text.c (original)
+++ trunk/text.c Wed Apr  1 22:16:43 2009
@@ -172,7 +172,10 @@
 	else if( strcmp( argv[optind], "-" ) == 0 )
 	{
 		s = malloc( MAX_STRING );
-		scanf( "%1024[^\n]s", s );
+		if (scanf( "%1024[^\n]s", s) != 1) {
+			fprintf( stderr, _("Error when trying to read URL (Too long?).\n") );
+			return( 1 );
+		}
 	}
 	else
 	{
@@ -259,8 +262,17 @@
 		{
 			if( S_ISDIR( buf.st_mode ) )
 			{
-				strncat( fn, "/", MAX_STRING );
-				strncat( fn, axel->filename, MAX_STRING );
+				size_t fnlen = strlen(fn);
+				size_t axelfnlen = strlen(axel->filename);
+				
+				if (fnlen + 1 + axelfnlen + 1 > MAX_STRING) {
+					fprintf( stderr, _("Filename too long!\n"));
+					return ( 1 );
+				}
+				
+				fn[fnlen] = '/';
+				memcpy(fn+fnlen+1, axel->filename, axelfnlen);
+				fn[fnlen + 1 + axelfnlen + 1] = '\0';
 			}
 		}
 		sprintf( string, "%s.st", fn );

Modified: trunk/zh_CN.po
URL: http://svn.debian.org/wsvn/axel/trunk/zh_CN.po?rev=97&op=diff
==============================================================================
--- trunk/zh_CN.po (original)
+++ trunk/zh_CN.po Wed Apr  1 22:16:43 2009
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Axel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-29 13:55+0100\n"
+"POT-Creation-Date: 2009-04-02 00:06+0200\n"
 "PO-Revision-Date: 2008-11-08 22:40+0700\n"
 "Last-Translator: Shuge Lee <shuge.lee at gmail.com>\n"
 "Language-Team: Simplified Chinese <i18n-zh at i18n.org>\n"
@@ -52,35 +52,35 @@
 msgid "Starting download"
 msgstr "开始下载"
 
-#: axel.c:241 axel.c:398
+#: axel.c:242 axel.c:401
 #, c-format
 msgid "Connection %i downloading from %s:%i using interface %s"
 msgstr "连接 %i 从 %s:%i 通过接口 %s 下载"
 
-#: axel.c:245 axel.c:407
+#: axel.c:249 axel.c:411
 msgid "pthread error!!!"
 msgstr "线程错误！！！"
 
-#: axel.c:314
+#: axel.c:317
 #, c-format
 msgid "Error on connection %i! Connection closed"
 msgstr "连接 %i 有错误！ 连接中断"
 
-#: axel.c:328
+#: axel.c:331
 #, c-format
 msgid "Connection %i unexpectedly closed"
 msgstr "连接 %i 被异常中断"
 
-#: axel.c:332 axel.c:349
+#: axel.c:335 axel.c:352
 #, c-format
 msgid "Connection %i finished"
 msgstr "连接 %i 结束"
 
-#: axel.c:361
+#: axel.c:364
 msgid "Write error!"
 msgstr "写错误！"
 
-#: axel.c:373
+#: axel.c:376
 #, c-format
 msgid "Connection %i timed out"
 msgstr "连接è¶
æ—¶ %i"
@@ -145,47 +145,57 @@
 msgid "Can't redirect stdout to /dev/null.\n"
 msgstr "stdout 不能重定向到 /dev/null 。\n"
 
-#: text.c:182
+#: text.c:176
+#, c-format
+msgid "Error when trying to read URL (Too long?).\n"
+msgstr ""
+
+#: text.c:185
 #, c-format
 msgid "Can't handle URLs of length over %d\n"
 msgstr "不能处理长度è¶
过 %d 的URLs\n"
 
-#: text.c:187
+#: text.c:190
 #, c-format
 msgid "Initializing download: %s\n"
 msgstr "初始化下载: %s\n"
 
-#: text.c:194
+#: text.c:197
 #, c-format
 msgid "Doing search...\n"
 msgstr "进行搜索中...\n"
 
-#: text.c:198
+#: text.c:201
 #, c-format
 msgid "File not found\n"
 msgstr "文件找不到\n"
 
-#: text.c:202
+#: text.c:205
 #, c-format
 msgid "Testing speeds, this can take a while...\n"
 msgstr "c测试速度，这可能有点费时……\n"
 
-#: text.c:207
+#: text.c:210
 #, c-format
 msgid "%i usable servers found, will use these URLs:\n"
 msgstr "%i 可用的服务器没有找到，将使用这些 URLs ：\n"
 
 #: text.c:269
 #, c-format
+msgid "Filename too long!\n"
+msgstr ""
+
+#: text.c:281
+#, c-format
 msgid "No state file, cannot resume!\n"
 msgstr "没有状态文件，无法恢复！\n"
 
-#: text.c:274
+#: text.c:286
 #, c-format
 msgid "State file found, but no downloaded data. Starting from scratch.\n"
 msgstr "找到状态文件，但没有已下载数据。重新开始。\n"
 
-#: text.c:405
+#: text.c:417
 #, c-format
 msgid ""
 "\n"
@@ -194,47 +204,47 @@
 "\n"
 "%s 已下载，用时 %s。（%.2f 千字节/秒）\n"
 
-#: text.c:427
+#: text.c:439
 #, fuzzy, c-format
 msgid "%lld byte"
 msgstr "%i 字节"
 
-#: text.c:429
+#: text.c:441
 #, fuzzy, c-format
 msgid "%lld bytes"
 msgstr "%i 字节"
 
-#: text.c:431
+#: text.c:443
 #, c-format
 msgid "%.1f kilobytes"
 msgstr "%.1f 千字节"
 
-#: text.c:433
+#: text.c:445
 #, c-format
 msgid "%.1f megabytes"
 msgstr "%.1f å
†å­—节"
 
-#: text.c:442
+#: text.c:454
 #, c-format
 msgid "%i second"
 msgstr "%i 秒"
 
-#: text.c:444
+#: text.c:456
 #, c-format
 msgid "%i seconds"
 msgstr "%i 秒"
 
-#: text.c:446
+#: text.c:458
 #, c-format
 msgid "%i:%02i seconds"
 msgstr "%i:%02i 秒"
 
-#: text.c:448
+#: text.c:460
 #, c-format
 msgid "%i:%02i:%02i seconds"
 msgstr "%i:%02i:%02i 秒"
 
-#: text.c:528
+#: text.c:540
 #, fuzzy, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -270,7 +280,7 @@
 "请向 shuge.lee at gmail.com 提交翻译错误，请向 http://axel.alioth.debian.org/ 提"
 "交程序漏洞\n"
 
-#: text.c:545
+#: text.c:557
 #, fuzzy, c-format
 msgid ""
 "Usage: axel [options] url1 [url2] [url...]\n"
@@ -306,7 +316,7 @@
 "请向 shuge.lee at gmail.com 提交翻译错误，请向 http://axel.alioth.debian.org/ 提"
 "交程序漏洞\n"
 
-#: text.c:566
+#: text.c:578
 #, c-format
 msgid "Axel version %s (%s)\n"
 msgstr "Axel 版本 %s (%s)\n"

More information about the axel-commits mailing list