Hi Cai, On Fri, Dec 16, 2005 at 10:38:36PM +0000, Cai Qian wrote: > I am sorry to have a wrong title in previous email (need some rests after > cross-bug handling).
OK, may happen. I was just a little bit confused. > I don't know what's wrong with the previous > patch. However, if you can send me the patch based on the lastest version, I > will definitely include it in the next upload and forward to the upstream as > well. Sorry, it took longer than expected. Nevertheless I have not only included all of my few fixes into the current file, I also updated it and finished translation. The German file is now 100% up-to-date. I also attached a small patch against d4x which fixes or adds a few strings. PS: I was a little bit astonished that my translation wasn't used by default. The reason is a missing build dependency on de.po for de.mo, so it's important to delete de.mo first (similar is true for po/Makefile to incooperate the change in po/Makevars). After this start make de.mo otherwise it's not included in the install. > From: Jens Seidel <[EMAIL PROTECTED]> > Subject: Bug#314115: acknowledged by developer (xsnow bugs) > Date: Fri, 16 Dec 2005 23:07:43 +0100 > > > On Fri, Dec 16, 2005 at 01:03:24PM -0800, Debian Bug Tracking System wrote: > > > This po file is too old and not work anymore. > > > > I do not wonder about this since the patch was ignored for more than a half > > year. There was also never a help request to check a newer file. > > > > I'm also not sure whether you refer to the d4x bug, your subject contained > > xsnow! Jens
de.po.gz
Description: Binary data
diff -ur d4x-2.5.6/main/config.cc d4x-2.5.6.new/main/config.cc
--- d4x-2.5.6/main/config.cc 2005-10-30 14:02:27.000000000 +0100
+++ d4x-2.5.6.new/main/config.cc 2006-01-01 18:37:13.000000000 +0100
@@ -698,7 +698,7 @@
case OPT_SPEED:{
clt->send_command(PACKET_ASK_SPEED,NULL,0);
rvalue=0;
- g_print(_("Curent speed:
%d\n"),clt->get_answer_int());
+ g_print(_("Current speed:
%d\n"),clt->get_answer_int());
break;
};
case OPT_TRAFFIC_LOW:{
@@ -964,7 +964,7 @@
help_print_args(OPT_STOP);g_print(_("stop a download"));printf("\n");
help_print_args(OPT_COLOR);g_print(_("using colors if run without
interface"));printf("\n");
help_print_args(OPT_GEOMETRY);g_print(_("specifies preferred size and
position of main window"));printf("\n");
- help_print_args(OPT_REFERER);g_print(_("specify rerferer for next added
URL"));printf("\n");
+ help_print_args(OPT_REFERER);g_print(_("specify referer for next added
URL"));printf("\n");
help_print_args(OPT_ADD_OPEN);g_print(_("open \"Add new download\"
dialog for the URL"));printf("\n");
printf("\n");
};
diff -ur d4x-2.5.6/main/dlist.cc d4x-2.5.6.new/main/dlist.cc
--- d4x-2.5.6/main/dlist.cc 2005-10-30 14:02:27.000000000 +0100
+++ d4x-2.5.6.new/main/dlist.cc 2006-01-01 17:10:15.000000000 +0100
@@ -1359,7 +1359,7 @@
if (!who->remote_file_changed()){
finfo.size=size;
finfo.type=T_FILE;
- WL->log(LOG_OK,_("Local file is seems to be equal to
remote one"));
+ WL->log(LOG_OK,_("Local file seems to be equal to
remote one"));
download_completed(D_PROTO_HTTP);
return;
};
diff -ur d4x-2.5.6/main/face/about.cc d4x-2.5.6.new/main/face/about.cc
--- d4x-2.5.6/main/face/about.cc 2005-10-30 14:02:28.000000000 +0100
+++ d4x-2.5.6.new/main/face/about.cc 2006-01-01 22:22:28.000000000 +0100
@@ -30,7 +30,7 @@
"Jerome Couderc [fr.po]",
"Zdenko Podobny [sk.po]",
"Brane Jovanovic [sr.po]",
- "Thomas R. Koll [de.po]",
+ "Jens Seidel [de.po]",
"Gustavo D. Vranjes [es.po]",
"Olexander Kunytsa [uk.po]",
"Marco Martin [es.po]",
diff -ur d4x-2.5.6/main/face/edit.cc d4x-2.5.6.new/main/face/edit.cc
--- d4x-2.5.6/main/face/edit.cc 2005-10-30 14:02:28.000000000 +0100
+++ d4x-2.5.6.new/main/face/edit.cc 2006-01-01 20:44:48.000000000 +0100
@@ -643,7 +643,7 @@
leave_server_check=gtk_check_button_new_with_label(_("Allow leave this
server while recursing via HTTP"));
change_links_check=gtk_check_button_new_with_label(_("Change links in
HTML file to local"));
ihate_etag_check=gtk_check_button_new_with_label(_("Ignore ETag field
in reply"));
- quest_sign_check=gtk_check_button_new_with_label(_("Use '_' instead of
'?' in stored filenames"));;
+ quest_sign_check=gtk_check_button_new_with_label(_("Use '_' instead of
'?' in stored filenames"));
GTK_TOGGLE_BUTTON(leave_server_check)->active=who->config->leave_server;
GTK_TOGGLE_BUTTON(leave_dir_check)->active=who->config->dont_leave_dir;
GTK_TOGGLE_BUTTON(change_links_check)->active=who->config->change_links;
diff -ur d4x-2.5.6/main/face/lmenu.cc d4x-2.5.6.new/main/face/lmenu.cc
--- d4x-2.5.6/main/face/lmenu.cc 2005-10-30 14:02:28.000000000 +0100
+++ d4x-2.5.6.new/main/face/lmenu.cc 2006-01-01 21:40:23.000000000 +0100
@@ -236,13 +236,13 @@
gtk_menu_shell_append(GTK_MENU_SHELL(ListMenu),menu_item);
pixmap=make_pixmap_from_xpm(&bitmap,upmini_xpm);
- menu_item=make_menu_item(_("Move up"),"Shift+Up",pixmap,bitmap,sgroup);
+ menu_item=make_menu_item(_("Move
up"),_("Shift+Up"),pixmap,bitmap,sgroup);
gtk_menu_shell_append(GTK_MENU_SHELL(ListMenu),menu_item);
ListMenuArray[LM_MOVEUP]=menu_item;
g_signal_connect(G_OBJECT(menu_item),"activate",G_CALLBACK(lmenu_move_up),NULL);
pixmap=make_pixmap_from_xpm(&bitmap,downmini_xpm);
- menu_item=make_menu_item(_("Move
down"),"Shift+Down",pixmap,bitmap,sgroup);
+ menu_item=make_menu_item(_("Move
down"),_("Shift+Down"),pixmap,bitmap,sgroup);
gtk_menu_shell_append(GTK_MENU_SHELL(ListMenu),menu_item);
ListMenuArray[LM_MOVEDOWN]=menu_item;
g_signal_connect(G_OBJECT(menu_item),"activate",G_CALLBACK(lmenu_move_down),NULL);
diff -ur d4x-2.5.6/main/face/passface.cc d4x-2.5.6.new/main/face/passface.cc
--- d4x-2.5.6/main/face/passface.cc 2005-10-30 14:02:28.000000000 +0100
+++ d4x-2.5.6.new/main/face/passface.cc 2006-01-01 21:52:14.000000000 +0100
@@ -390,7 +390,7 @@
if (window) {
return(window);
};
- gchar *titles[]={"URL regexp",_("limit"),_("con.")};
+ gchar *titles[]={_("URL regexp"),_("limit"),_("con.")};
list_store = gtk_list_store_new(UM_COL_LAST,
G_TYPE_STRING,
G_TYPE_INT,
diff -ur d4x-2.5.6/main/ftp.cc d4x-2.5.6.new/main/ftp.cc
--- d4x-2.5.6/main/ftp.cc 2005-10-30 14:02:27.000000000 +0100
+++ d4x-2.5.6.new/main/ftp.cc 2006-01-01 18:38:03.000000000 +0100
@@ -47,7 +47,7 @@
DSFlag=1;
if (DataSocket->accepting(hostname.c_str())) {
Status=STATUS_TRIVIAL;
- LOG->log(LOG_ERROR,_("Accepting faild"));
+ LOG->log(LOG_ERROR,_("Accepting failed"));
return RVALUE_TIMEOUT;
};
return RVALUE_OK;
diff -ur d4x-2.5.6/main/httpd.cc d4x-2.5.6.new/main/httpd.cc
--- d4x-2.5.6/main/httpd.cc 2005-10-30 14:02:28.000000000 +0100
+++ d4x-2.5.6.new/main/httpd.cc 2006-01-01 23:05:29.000000000 +0100
@@ -479,7 +479,7 @@
while (first || get_size()>=0) {
if (!ReGet) {
if (LOADED){
- LOG->log(LOG_WARNING,_("It is seemed
REGET not supported! Loading from begin.."));
+ LOG->log(LOG_WARNING,_("It seems that
REGET is not supported! Loading from begin..."));
};
if (ETagChanged && LOADED!=0){
LOG->log(LOG_WARNING,_("ETag was
changed, restarting again..."));
diff -ur d4x-2.5.6/main/ping.cc d4x-2.5.6.new/main/ping.cc
--- d4x-2.5.6/main/ping.cc 2005-10-30 14:02:28.000000000 +0100
+++ d4x-2.5.6.new/main/ping.cc 2006-01-01 20:23:23.000000000 +0100
@@ -74,7 +74,7 @@
tmp=list->next();
};
- WL->log(LOG_OK,_("Pinging (it takes 30 seconds maximum)..."));
+ WL->log(LOG_OK,_("Pinging (it takes 30 seconds maximum)..."));
int step=0;
int connected=0;
while(step<300){
diff -ur d4x-2.5.6/main/signal.cc d4x-2.5.6.new/main/signal.cc
--- d4x-2.5.6/main/signal.cc 2006-01-01 20:10:12.000000000 +0100
+++ d4x-2.5.6.new/main/signal.cc 2006-01-01 20:23:42.000000000 +0100
@@ -50,7 +50,7 @@
void signal_handler(int num) {
tDownload **temp=(my_pthread_key_get());
if (temp){
- (*temp)->LOG->add(_("Download was stopped by
user"),LOG_WARNING);
+ (*temp)->LOG->add(_("Download was stopped by
user"),LOG_WARNING);
if ((*temp)->segments)
(*temp)->segments->save();
D4X_UPDATE.add(*temp,DOWNLOAD_REAL_STOP);
diff -ur d4x-2.5.6/po/d4x.pot d4x-2.5.6.new/po/d4x.pot
--- d4x-2.5.6/po/d4x.pot 2005-10-30 14:06:04.000000000 +0100
+++ d4x-2.5.6.new/po/d4x.pot 2006-01-01 23:02:39.000000000 +0100
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-30 20:06+0700\n"
+"Report-Msgid-Bugs-To: Maxim Koshelev <[EMAIL PROTECTED]>\n"
+"POT-Creation-Date: 2006-01-01 23:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -140,16 +140,11 @@
msgid "Total bytes loaded: %d\n"
msgstr ""
-#: main/config.cc:695
+#: main/config.cc:695 main/config.cc:701
#, c-format
msgid "Current speed: %d\n"
msgstr ""
-#: main/config.cc:701
-#, c-format
-msgid "Curent speed: %d\n"
-msgstr ""
-
#: main/config.cc:851
msgid "Added from command line"
msgstr ""
@@ -239,7 +234,7 @@
msgstr ""
#: main/config.cc:967
-msgid "specify rerferer for next added URL"
+msgid "specify referer for next added URL"
msgstr ""
#: main/config.cc:968
@@ -371,7 +366,7 @@
msgstr ""
#: main/dlist.cc:1362
-msgid "Local file is seems to be equal to remote one"
+msgid "Local file seems to be equal to remote one"
msgstr ""
#: main/dlist.cc:1383
@@ -1387,10 +1382,18 @@
msgid "Move up"
msgstr ""
+#: main/face/lmenu.cc:239
+msgid "Shift+Up"
+msgstr ""
+
#: main/face/lmenu.cc:245
msgid "Move down"
msgstr ""
+#: main/face/lmenu.cc:245
+msgid "Shift+Down"
+msgstr ""
+
#: main/face/lmenu.cc:250
msgid "Alternates"
msgstr ""
@@ -1550,6 +1553,10 @@
msgstr ""
#: main/face/passface.cc:393
+msgid "URL regexp"
+msgstr ""
+
+#: main/face/passface.cc:393
msgid "limit"
msgstr ""
@@ -1974,7 +1981,7 @@
msgstr ""
#: main/ftp.cc:50
-msgid "Accepting faild"
+msgid "Accepting failed"
msgstr ""
#: main/ftp.cc:73
@@ -2144,7 +2151,7 @@
msgstr ""
#: main/httpd.cc:482
-msgid "It is seemed REGET not supported! Loading from begin.."
+msgid "It is seemed REGET not supported! Loading from begin..."
msgstr ""
#: main/httpd.cc:485
@@ -2383,7 +2390,7 @@
msgstr ""
#: main/ping.cc:77
-msgid "Pinging (it takes 30 seconds maximum)..."
+msgid "Pinging (it takes 30 seconds maximum)..."
msgstr ""
#: main/savelog.cc:42
@@ -2400,7 +2407,7 @@
msgstr ""
#: main/signal.cc:53
-msgid "Download was stopped by user"
+msgid "Download was stopped by user"
msgstr ""
#: main/var.cc:101
diff -ur d4x-2.5.6/po/Makevars d4x-2.5.6.new/po/Makevars
--- d4x-2.5.6/po/Makevars 2004-07-01 17:42:53.000000000 +0200
+++ d4x-2.5.6.new/po/Makevars 2006-01-01 22:57:14.000000000 +0100
@@ -23,3 +23,5 @@
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
+MSGID_BUGS_ADDRESS=Maxim Koshelev <[EMAIL PROTECTED]>
+
diff -ur d4x-2.5.6/README d4x-2.5.6.new/README
--- d4x-2.5.6/README 2005-10-30 14:02:27.000000000 +0100
+++ d4x-2.5.6.new/README 2006-01-01 19:30:22.000000000 +0100
@@ -12,7 +12,7 @@
* UPGRADE FROM 2.0x to 2.4 *
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Begining from version 2.4 Downloader for X uses .ntrc_2 directory in your
+Beginning from version 2.4 Downloader for X uses .ntrc_2 directory in your
home directory to store its configuration data, queues of downloads etc.
The main reason to change default directory is switching from GTK1.x to GTK2.
GTK2 is fully unicode library so D4X have to be unicode too. If you want to
