linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #02777
[Branch ~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n] Rev 412: Normalize strings
------------------------------------------------------------
revno: 412
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: linuxdcpp-i18n
timestamp: Wed 2010-12-22 22:10:02 -0600
message:
Normalize strings
modified:
glade/favoritehubs.glade
glade/favoriteusers.glade
glade/mainwindow.glade
glade/publichubs.glade
glade/search.glade
glade/settingsdialog.glade
glade/sharebrowser.glade
glade/transfers.glade
linux/favoritehubs.cc
linux/favoriteusers.cc
linux/hub.cc
linux/publichubs.cc
linux/search.cc
linux/sharebrowser.cc
linux/wulfor.cc
--
lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n
Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/linuxdcpp-i18n/+edit-subscription
=== modified file 'glade/favoritehubs.glade'
--- glade/favoritehubs.glade 2009-10-11 04:40:31 +0000
+++ glade/favoritehubs.glade 2010-12-23 04:10:02 +0000
@@ -170,7 +170,7 @@
<widget class="GtkLabel" id="labelAddress">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Address:</property>
+ <property name="label" translatable="yes">_Hub address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entryAddress</property>
</widget>
=== modified file 'glade/favoriteusers.glade'
--- glade/favoriteusers.glade 2010-05-22 14:23:56 +0000
+++ glade/favoriteusers.glade 2010-12-23 04:10:02 +0000
@@ -71,14 +71,14 @@
<child>
<widget class="GtkMenuItem" id="connectItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Connect to hub</property>
+ <property name="label" translatable="yes">_Connect to hub</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="descriptionItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Description</property>
+ <property name="label" translatable="yes">_Edit description...</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -130,8 +130,9 @@
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Description</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">_Description:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">descriptionEntry</property>
</widget>
<packing>
<property name="type">label_item</property>
=== modified file 'glade/mainwindow.glade'
--- glade/mainwindow.glade 2010-11-14 06:31:40 +0000
+++ glade/mainwindow.glade 2010-12-23 04:10:02 +0000
@@ -65,7 +65,7 @@
<child>
<widget class="GtkImageMenuItem" id="quickConnectMenuItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Quick connect</property>
+ <property name="label" translatable="yes">_Quick connect...</property>
<property name="use_underline">True</property>
<accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
@@ -751,8 +751,9 @@
</child>
</widget>
<widget class="GtkDialog" id="connectDialog">
- <property name="title" translatable="yes">Connect to a hub</property>
+ <property name="title" translatable="yes">Quick Connect</property>
<property name="destroy_with_parent">True</property>
+ <property name="default_width">400</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox2">
@@ -785,8 +786,9 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Connect to address:</b></property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">_Hub address:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">connectEntry</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -839,7 +841,7 @@
<property name="logo_icon_name">linuxdcpp</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="copyright" translatable="yes">Copyright © 2004-2009 Jens Oknelid</property>
+ <property name="copyright" translatable="yes">Copyright © 2004-2011 Jens Oknelid</property>
<property name="comments" translatable="yes">A DC++ port for Linux
LinuxDC++ version: %s
@@ -1075,7 +1077,7 @@
</child>
</widget>
<widget class="GtkDialog" id="magnetDialog">
- <property name="title" translatable="yes">Magnet properties</property>
+ <property name="title" translatable="yes">Magnet Properties</property>
<property name="modal">True</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -1094,7 +1096,9 @@
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Magnet</property>
+ <property name="label" translatable="yes">_Magnet:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">magnetEntry</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -1105,7 +1109,9 @@
<widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">File name</property>
+ <property name="label" translatable="yes">_Filename</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">magnetNameEntry</property>
</widget>
<packing>
<property name="top_attach">1</property>
@@ -1118,7 +1124,9 @@
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes">_Size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">magnetSizeEntry</property>
</widget>
<packing>
<property name="top_attach">2</property>
@@ -1131,7 +1139,9 @@
<widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">TTH</property>
+ <property name="label" translatable="yes">_TTH:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">tthEntry</property>
</widget>
<packing>
<property name="top_attach">4</property>
@@ -1200,7 +1210,9 @@
<widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Exact size</property>
+ <property name="label" translatable="yes">_Exact size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">exactSizeEntry</property>
</widget>
<packing>
<property name="top_attach">3</property>
=== modified file 'glade/publichubs.glade'
--- glade/publichubs.glade 2008-05-27 00:23:19 +0000
+++ glade/publichubs.glade 2010-12-23 04:10:02 +0000
@@ -323,7 +323,7 @@
<child>
<widget class="GtkImageMenuItem" id="favMenuItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add to favorites</property>
+ <property name="label" translatable="yes">_Add to favorites</property>
<property name="use_underline">True</property>
</widget>
</child>
=== modified file 'glade/search.glade'
--- glade/search.glade 2010-10-11 06:05:22 +0000
+++ glade/search.glade 2010-12-23 04:10:02 +0000
@@ -22,7 +22,9 @@
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Search for</property>
+ <property name="label" translatable="yes">_Search text:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">comboboxentrySearch</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -442,7 +444,7 @@
<child>
<widget class="GtkMenuItem" id="downloadToItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download _to...</property>
+ <property name="label" translatable="yes">Download _to</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="downloadMenu">
@@ -453,14 +455,14 @@
<child>
<widget class="GtkMenuItem" id="downloadWholeDirItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download _whole directory</property>
+ <property name="label" translatable="yes">Do_wnload directory</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="downloadWholeDirToItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download whole director_y to...</property>
+ <property name="label" translatable="yes">Download director_y to</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="downloadDirMenu">
=== modified file 'glade/settingsdialog.glade'
--- glade/settingsdialog.glade 2010-12-10 05:50:31 +0000
+++ glade/settingsdialog.glade 2010-12-23 04:10:02 +0000
@@ -1230,7 +1230,7 @@
<child>
<widget class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download To</property>
+ <property name="label" translatable="yes">Favorite Downloads</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -4034,7 +4034,7 @@
<widget class="GtkRadioButton" id="commandDialogChat">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Cha_t</property>
+ <property name="label" translatable="yes">Ch_at</property>
<property name="use_underline">True</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
@@ -4239,7 +4239,7 @@
<widget class="GtkLabel" id="label72">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Hu_b Address:</property>
+ <property name="label" translatable="yes">_Hub address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">commandDialogHub</property>
</widget>
=== modified file 'glade/sharebrowser.glade'
--- glade/sharebrowser.glade 2010-11-17 07:50:41 +0000
+++ glade/sharebrowser.glade 2010-12-23 04:10:02 +0000
@@ -151,7 +151,7 @@
<widget class="GtkDialog" id="findDialog">
<property name="width_request">275</property>
<property name="height_request">125</property>
- <property name="title" translatable="yes">Find files</property>
+ <property name="title" translatable="yes">Find Files</property>
<property name="modal">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
@@ -179,8 +179,9 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Enter text to search for</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">_Search text:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">findEntry</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -232,14 +233,14 @@
<child>
<widget class="GtkMenuItem" id="dirDownloadItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download</property>
+ <property name="label" translatable="yes">_Download</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="dirDownloadToItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download to...</property>
+ <property name="label" translatable="yes">Download _to</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="dirDownloadMenu">
@@ -255,7 +256,7 @@
<child>
<widget class="GtkMenuItem" id="dirUserCommandItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">User commands</property>
+ <property name="label" translatable="yes">_User commands</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="dirUserCommandMenu">
@@ -268,14 +269,14 @@
<child>
<widget class="GtkMenuItem" id="fileDownloadItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download</property>
+ <property name="label" translatable="yes">_Download</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="fileDownloadToItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Download to...</property>
+ <property name="label" translatable="yes">Download _to</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="fileDownloadMenu">
@@ -305,7 +306,7 @@
<child>
<widget class="GtkMenuItem" id="fileUserCommandItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">User commands</property>
+ <property name="label" translatable="yes">_User commands</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="fileUserCommandMenu">
=== modified file 'glade/transfers.glade'
--- glade/transfers.glade 2009-03-18 00:50:57 +0000
+++ glade/transfers.glade 2010-12-23 04:10:02 +0000
@@ -70,7 +70,7 @@
<child>
<widget class="GtkMenuItem" id="userCommandItem">
<property name="visible">True</property>
- <property name="label" translatable="yes">User commands</property>
+ <property name="label" translatable="yes">_User commands</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="userCommandMenu">
=== modified file 'linux/favoritehubs.cc'
--- linux/favoritehubs.cc 2010-10-22 04:05:48 +0000
+++ linux/favoritehubs.cc 2010-12-23 04:10:02 +0000
@@ -379,7 +379,7 @@
GtkWindow* parent = GTK_WINDOW(WulforManager::get()->getMainWindow()->getContainer());
GtkWidget* dialog = gtk_message_dialog_new(parent,
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
- _("Are you sure you want to delete favorite hub \"%s\"?"), name.c_str());
+ _("Are you sure you want to delete the selected favorite hub?"));
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_REMOVE, GTK_RESPONSE_YES, NULL);
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog), GTK_RESPONSE_YES, GTK_RESPONSE_CANCEL, -1);
gint response = gtk_dialog_run(GTK_DIALOG(dialog));
=== modified file 'linux/favoriteusers.cc'
--- linux/favoriteusers.cc 2010-11-10 07:07:40 +0000
+++ linux/favoriteusers.cc 2010-12-23 04:10:02 +0000
@@ -423,7 +423,7 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
- _("Are you sure you want to delete the selected favorite user(s)?"));
+ _("Are you sure you want to delete the selected favorite users?"));
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_REMOVE,
GTK_RESPONSE_YES, NULL);
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog), GTK_RESPONSE_YES, GTK_RESPONSE_CANCEL, -1);
=== modified file 'linux/hub.cc'
--- linux/hub.cc 2010-11-12 08:07:06 +0000
+++ linux/hub.cc 2010-12-23 04:10:02 +0000
@@ -57,7 +57,7 @@
nickView.insertColumn(N_("Tag"), G_TYPE_STRING, TreeView::STRING, 100);
nickView.insertColumn(N_("Connection"), G_TYPE_STRING, TreeView::STRING, 85);
nickView.insertColumn(N_("IP"), G_TYPE_STRING, TreeView::STRING, 85);
- nickView.insertColumn(N_("eMail"), G_TYPE_STRING, TreeView::STRING, 90);
+ nickView.insertColumn(N_("Email"), G_TYPE_STRING, TreeView::STRING, 90);
nickView.insertHiddenColumn("Icon", G_TYPE_STRING);
nickView.insertHiddenColumn("Nick Order", G_TYPE_STRING);
nickView.insertHiddenColumn("CID", G_TYPE_STRING);
@@ -235,7 +235,7 @@
nickView.col("Tag"), params["Tag"].c_str(),
nickView.col("Connection"), params["Connection"].c_str(),
nickView.col("IP"), params["IP"].c_str(),
- nickView.col("eMail"), params["eMail"].c_str(),
+ nickView.col("Email"), params["Email"].c_str(),
nickView.col("Icon"), icon.c_str(),
nickView.col("Nick Order"), params["Nick Order"].c_str(),
nickView.col("CID"), cid.c_str(),
@@ -253,7 +253,7 @@
nickView.col("Tag"), params["Tag"].c_str(),
nickView.col("Connection"), params["Connection"].c_str(),
nickView.col("IP"), params["IP"].c_str(),
- nickView.col("eMail"), params["eMail"].c_str(),
+ nickView.col("Email"), params["Email"].c_str(),
nickView.col("Icon"), icon.c_str(),
nickView.col("Nick Order"), params["Nick Order"].c_str(),
nickView.col("CID"), cid.c_str(),
@@ -1477,7 +1477,7 @@
params["Tag"] = id.getTag();
params["Connection"] = id.getConnection();
params["IP"] = id.getIp();
- params["eMail"] = id.getEmail();
+ params["Email"] = id.getEmail();
params["CID"] = id.getUser()->getCID().toBase32();
}
=== modified file 'linux/publichubs.cc'
--- linux/publichubs.cc 2010-11-12 08:07:06 +0000
+++ linux/publichubs.cc 2010-12-23 04:10:02 +0000
@@ -427,7 +427,7 @@
void PublicHubs::on(FavoriteManagerListener::DownloadStarting, const string &file) throw()
{
- string msg = F_("Download starting: %1%", % file);
+ string msg = _("Download starting");
typedef Func2<PublicHubs, string, string> Func;
Func *func = new Func(this, &PublicHubs::setStatus_gui, "statusMain", msg);
WulforManager::get()->dispatchGuiFunc(func);
@@ -443,7 +443,7 @@
void PublicHubs::on(FavoriteManagerListener::DownloadFinished, const string &file) throw()
{
- string msg = F_("Download finished: %1%", % file);
+ string msg = _("Download finished");
typedef Func2<PublicHubs, string, string> Func;
Func *f2 = new Func(this, &PublicHubs::setStatus_gui, "statusMain", msg);
WulforManager::get()->dispatchGuiFunc(f2);
=== modified file 'linux/search.cc'
--- linux/search.cc 2010-11-28 16:53:55 +0000
+++ linux/search.cc 2010-12-23 04:10:02 +0000
@@ -299,7 +299,8 @@
}
// Add Browse item
- menuItem = gtk_menu_item_new_with_label(_("Browse..."));
+ menuItem = gtk_menu_item_new_with_label(_("_Browse..."));
+ gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menuItem), TRUE);
g_signal_connect(menuItem, "activate", G_CALLBACK(onDownloadToClicked_gui), (gpointer)this);
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("downloadMenu")), menuItem);
@@ -370,7 +371,8 @@
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("downloadDirMenu")), menuItem);
}
- menuItem = gtk_menu_item_new_with_label(_("Browse..."));
+ menuItem = gtk_menu_item_new_with_label(_("_Browse..."));
+ gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menuItem), TRUE);
g_signal_connect(menuItem, "activate", G_CALLBACK(onDownloadDirToClicked_gui), (gpointer)this);
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("downloadDirMenu")), menuItem);
=== modified file 'linux/sharebrowser.cc'
--- linux/sharebrowser.cc 2010-11-14 06:31:40 +0000
+++ linux/sharebrowser.cc 2010-12-23 04:10:02 +0000
@@ -457,7 +457,8 @@
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("fileDownloadMenu")), menuItem);
}
- menuItem = gtk_menu_item_new_with_label(_("Browse..."));
+ menuItem = gtk_menu_item_new_with_label(_("_Browse..."));
+ gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menuItem), TRUE);
g_signal_connect(menuItem, "activate", G_CALLBACK(onDownloadToClicked_gui), (gpointer)this);
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("fileDownloadMenu")), menuItem);
@@ -525,7 +526,8 @@
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("dirDownloadMenu")), menuItem);
}
- menuItem = gtk_menu_item_new_with_label(_("Browse..."));
+ menuItem = gtk_menu_item_new_with_label(_("_Browse..."));
+ gtk_menu_item_set_use_underline(GTK_MENU_ITEM(menuItem), TRUE);
g_signal_connect(menuItem, "activate", G_CALLBACK(onDownloadDirToClicked_gui), (gpointer)this);
gtk_menu_shell_append(GTK_MENU_SHELL(getWidget("dirDownloadMenu")), menuItem);
=== modified file 'linux/wulfor.cc'
--- linux/wulfor.cc 2010-11-19 07:29:51 +0000
+++ linux/wulfor.cc 2010-12-23 04:10:02 +0000
@@ -78,7 +78,7 @@
GOptionEntry entries[] = {
{ "connect", 'c', 0, G_OPTION_ARG_STRING_ARRAY, &address, N_("Connect to the given hub"), N_("URI") },
- { "existing", 'e', 0, G_OPTION_ARG_NONE, &existing, N_("Direct commands to an already running instance"), NULL },
+ { "existing", 'e', 0, G_OPTION_ARG_NONE, &existing, N_("Send commands to the existing instance (if applicable)"), NULL },
{ "magnet", 'm', 0, G_OPTION_ARG_STRING_ARRAY, &magnet, N_("Search for the given magnet link"), N_("URI") },
{ "refresh", 'r', 0, G_OPTION_ARG_NONE, &refresh, N_("Initiate filelist refresh"), NULL },
{ "show", 's', 0, G_OPTION_ARG_NONE, &show, N_("Show the running instance (default action)"), NULL },
