linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 403
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: linuxdcpp-i18n
timestamp: Sun 2010-11-14 00:31:40 -0600
message:
  Even more translations
modified:
  glade/mainwindow.glade
  linux/WulforUtil.cc
  linux/finishedtransfers.cc
  linux/mainwindow.cc
  linux/settingsdialog.cc
  linux/sharebrowser.cc
  linux/treeview.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/mainwindow.glade'
--- glade/mainwindow.glade	2010-11-12 08:07:06 +0000
+++ glade/mainwindow.glade	2010-11-14 06:31:40 +0000
@@ -1003,7 +1003,6 @@
             <child>
               <widget class="GtkLabel" id="ucLabel">
                 <property name="visible">True</property>
-                <property name="use_markup">True</property>
               </widget>
               <packing>
                 <property name="type">label_item</property>

=== modified file 'linux/WulforUtil.cc'
--- linux/WulforUtil.cc	2010-11-10 03:45:41 +0000
+++ linux/WulforUtil.cc	2010-11-14 06:31:40 +0000
@@ -20,7 +20,7 @@
  */
 
 #include "WulforUtil.hh"
-#include <glib/gi18n.h>
+#include "IntlUtil.hh"
 #include <glib/gstdio.h>
 #include <glib.h>
 #include <dcpp/ClientManager.h>

=== modified file 'linux/finishedtransfers.cc'
--- linux/finishedtransfers.cc	2010-11-12 08:07:06 +0000
+++ linux/finishedtransfers.cc	2010-11-14 06:31:40 +0000
@@ -157,7 +157,7 @@
 void FinishedTransfers::updateStatus_gui()
 {
 	// TRANSLATORS: Displays the total number of files in the status bar.
-	string status = P_("%1% File", "%1% Files", % totalFiles, totalFiles);
+	string status = P_("File: %1%", "Files: %1%", % totalFiles, totalFiles);
 
 	string size = Util::formatBytes(totalBytes);
 	string speed = Util::formatBytes((totalTime > 0) ? totalBytes * ((int64_t)1000) / totalTime : 0) + "/s";

=== modified file 'linux/mainwindow.cc'
--- linux/mainwindow.cc	2010-11-12 08:07:06 +0000
+++ linux/mainwindow.cc	2010-11-14 06:31:40 +0000
@@ -749,7 +749,7 @@
 			// TRANSLATORS: Appears in a dialog prompt when a user command requires arguments.
 			string label = F_("Enter a value for '%1%'", % name);
 
-			gtk_label_set_label(GTK_LABEL(getWidget("ucLabel")), label.c_str());
+			gtk_label_set_text(GTK_LABEL(getWidget("ucLabel")), label.c_str());
 			gtk_entry_set_text(GTK_ENTRY(getWidget("ucLineEntry")), "");
 			gtk_widget_grab_focus(getWidget("ucLineEntry"));
 

=== modified file 'linux/settingsdialog.cc'
--- linux/settingsdialog.cc	2010-10-22 04:05:48 +0000
+++ linux/settingsdialog.cc	2010-11-14 06:31:40 +0000
@@ -490,7 +490,7 @@
 		addOption_gui(queueStore, _("Automatically search for alternative download locations"), SettingsManager::AUTO_SEARCH);
 		addOption_gui(queueStore, _("Automatically match queue for auto search hits"), SettingsManager::AUTO_SEARCH_AUTO_MATCH);
 		addOption_gui(queueStore, _("Skip zero-byte files"), SettingsManager::SKIP_ZERO_BYTE);
-		addOption_gui(queueStore, _("Don't download files already in share"), SettingsManager::DONT_DL_ALREADY_SHARED);
+		addOption_gui(queueStore, _("Don't download files already in the share"), SettingsManager::DONT_DL_ALREADY_SHARED);
 		addOption_gui(queueStore, _("Don't download files already in the queue"), SettingsManager::DONT_DL_ALREADY_QUEUED);
 	}
 }
@@ -527,7 +527,9 @@
 			-1);
 	}
 
-	gtk_label_set_text(GTK_LABEL(getWidget("sharedSizeLabel")), string("Total size: " + Util::formatBytes(ShareManager::getInstance()->getShareSize())).c_str());
+	int64_t shareSize = ShareManager::getInstance()->getShareSize();
+	string shareSizeText = F_("Total share size: %1%", % Util::formatBytes(shareSize));
+	gtk_label_set_text(GTK_LABEL(getWidget("sharedSizeLabel")), shareSizeText.c_str());
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(getWidget("shareHiddenCheckButton")), BOOLSETTING(SHARE_HIDDEN));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(getWidget("followLinksCheckButton")), BOOLSETTING(FOLLOW_LINKS));
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(getWidget("sharedExtraSlotSpinButton")), (double)SETTING(MIN_UPLOAD_SPEED));
@@ -586,8 +588,8 @@
 		addOption_gui(colorStore, _("Finished Downloads"), SettingsManager::BOLD_FINISHED_DOWNLOADS);
 		addOption_gui(colorStore, _("Finished Uploads"), SettingsManager::BOLD_FINISHED_UPLOADS);
 		addOption_gui(colorStore, _("Download Queue"), SettingsManager::BOLD_QUEUE);
-		addOption_gui(colorStore, _("Hub (also sets urgency hint)"), SettingsManager::BOLD_HUB);
-		addOption_gui(colorStore, _("Private Message (also sets urgency hint)"), SettingsManager::BOLD_PM);
+		addOption_gui(colorStore, _("Hub"), SettingsManager::BOLD_HUB);
+		addOption_gui(colorStore, _("Private Message"), SettingsManager::BOLD_PM);
 		addOption_gui(colorStore, _("Search"), SettingsManager::BOLD_SEARCH);
 	}
 
@@ -607,7 +609,7 @@
 
 		addOption_gui(windowStore2, _("Open file list window in the background"), SettingsManager::POPUNDER_FILELIST);
 		addOption_gui(windowStore2, _("Open new private messages from other users in the background"), SettingsManager::POPUNDER_PM);
-		addOption_gui(windowStore2, _("Open new window when using /join"), SettingsManager::JOIN_OPEN_NEW_WINDOW);
+		addOption_gui(windowStore2, _("Open a new window when using /join"), SettingsManager::JOIN_OPEN_NEW_WINDOW);
 		addOption_gui(windowStore2, _("Ignore private messages from the hub"), SettingsManager::IGNORE_HUB_PMS);
 		addOption_gui(windowStore2, _("Ignore private messages from bots"), SettingsManager::IGNORE_BOT_PMS);
 
@@ -669,11 +671,11 @@
 		addOption_gui(advancedStore, _("Enable segmented downloads"), SettingsManager::SEGMENTED_DL);
 		addOption_gui(advancedStore, _("Enable automatic SFV checking"), SettingsManager::SFV_CHECK);
 		addOption_gui(advancedStore, _("Enable safe and compressed transfers"), SettingsManager::COMPRESS_TRANSFERS);
-		addOption_gui(advancedStore, _("Accept custom user commands from hub"), SettingsManager::HUB_USER_COMMANDS);
+		addOption_gui(advancedStore, _("Accept custom user commands from the hub"), SettingsManager::HUB_USER_COMMANDS);
 		addOption_gui(advancedStore, _("Send unknown /commands to the hub"), SettingsManager::SEND_UNKNOWN_COMMANDS);
-		addOption_gui(advancedStore, _("Add finished files to share instantly (if shared)"), SettingsManager::ADD_FINISHED_INSTANTLY);
+		addOption_gui(advancedStore, _("Add finished files to the share instantly (if shared)"), SettingsManager::ADD_FINISHED_INSTANTLY);
 		addOption_gui(advancedStore, _("Don't send the away message to bots"), SettingsManager::NO_AWAYMSG_TO_BOTS);
-		addOption_gui(advancedStore, _("Use fast hashing method (disable if you have problems with hashing)"), SettingsManager::FAST_HASH);
+		addOption_gui(advancedStore, _("Use fast hashing method"), SettingsManager::FAST_HASH);
 		/// @todo: Uncomment when implemented
 		//addOption_gui(advancedStore, _("Register with the OS to handle dchub:// and adc:// URL links"), SettingsManager::URL_HANDLER);
 		//addOption_gui(advancedStore, _("Register with the OS to handle magnet: URL links"), SettingsManager::MAGNET_REGISTER);
@@ -736,8 +738,8 @@
 		createOptionsView_gui(certificatesView, certificatesStore, "certificatesTreeView");
 
 		addOption_gui(certificatesStore, _("Use TLS when remote client supports it"), SettingsManager::USE_TLS);
-		addOption_gui(certificatesStore, _("Allow TLS connections to hubs without trusted certificate"), SettingsManager::ALLOW_UNTRUSTED_HUBS);
-		addOption_gui(certificatesStore, _("Allow TLS connections to clients without trusted certificate"), SettingsManager::ALLOW_UNTRUSTED_CLIENTS);
+		addOption_gui(certificatesStore, _("Allow TLS connections to hubs without a trusted certificate"), SettingsManager::ALLOW_UNTRUSTED_HUBS);
+		addOption_gui(certificatesStore, _("Allow TLS connections to clients without a trusted certificate"), SettingsManager::ALLOW_UNTRUSTED_CLIENTS);
 
 		g_signal_connect(getWidget("generateCertificatesButton"), "clicked", G_CALLBACK(onGenerateCertificatesClicked_gui), (gpointer)this);
 	}
@@ -817,6 +819,7 @@
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(getWidget("commandDialogSeparator"))))
 	{
+		// TRANSLATORS: Name of custom separator user command.
 		name = _("Separator");
 		type = UserCommand::TYPE_SEPARATOR;
 	}
@@ -1103,7 +1106,7 @@
 	GtkTreeViewColumn *col;
 
 	gtk_list_store_append(s->publicListStore, &iter);
-	gtk_list_store_set(s->publicListStore, &iter, s->publicListView.col("List"), _("New list"), -1);
+	gtk_list_store_set(s->publicListStore, &iter, s->publicListView.col("List"), _("New public hub list"), -1);
 	path = gtk_tree_model_get_path(GTK_TREE_MODEL(s->publicListStore), &iter);
 	col = gtk_tree_view_get_column(s->publicListView.get(), 0);
 	gtk_tree_view_set_cursor(s->publicListView.get(), path, col, TRUE);
@@ -1300,7 +1303,8 @@
 			-1);
 	}
 
-	string text = _("Total size: ") + Util::formatBytes(ShareManager::getInstance()->getShareSize());
+	int64_t shareSize = ShareManager::getInstance()->getShareSize();
+	string text = F_("Total share size: %1%", % Util::formatBytes(shareSize));
 	gtk_label_set_text(GTK_LABEL(s->getWidget("sharedSizeLabel")), text.c_str());
 
 	return FALSE;

=== modified file 'linux/sharebrowser.cc'
--- linux/sharebrowser.cc	2010-10-22 04:05:48 +0000
+++ linux/sharebrowser.cc	2010-11-14 06:31:40 +0000
@@ -34,7 +34,7 @@
 using namespace dcpp;
 
 ShareBrowser::ShareBrowser(UserPtr user, const std::string &file, const std::string &initialDirectory):
-	BookEntry(Entry::SHARE_BROWSER, _("List: ") + WulforUtil::getNicks(user), "sharebrowser.glade", user->getCID().toBase32()),
+	BookEntry(Entry::SHARE_BROWSER, WulforUtil::getNicks(user), "sharebrowser.glade", user->getCID().toBase32()),
 	user(user),
 	file(file),
 	initialDirectory(initialDirectory),
@@ -53,7 +53,7 @@
 		string name = Util::getFileName(file);
 		string::size_type loc = name.find('.');
 		nick = name.substr(0, loc);
-		setLabel_gui(_("List: ") + nick);
+		setLabel_gui(nick);
 	}
 
 	// Configure the dialogs
@@ -156,7 +156,7 @@
 	}
 	catch (const Exception &e)
 	{
-		setStatus_gui("mainStatus", _("Unable to load file list: ") + e.getError());
+		setStatus_gui("mainStatus", F_("Unable to load file list: %1%", % e.getError()));
 	}
 }
 
@@ -319,25 +319,18 @@
 
 void ShareBrowser::updateStatus_gui()
 {
-	string items, files, size, total;
-	files = _("Files: ") + Util::toString(shareItems);
-	total = _("Total: ") + Util::formatBytes(shareSize);
-
-	if (gtk_tree_selection_get_selected(dirSelection, NULL, NULL))
-	{
-		items = _("Items: ") + Util::toString(currentItems);
-		size = _("Size: ") + Util::formatBytes(currentSize);
-	}
-	else
-	{
-		items = _("Items: 0");
-		size = _("Size: 0 B");
-	}
-
-	setStatus_gui("itemsStatus", items);
+	string files = P_("File: %1%", "Files: %1%", % currentItems, currentItems);
+	setStatus_gui("itemsStatus", files);
+
+	// TRANSLATORS: Size of currently visible folder.
+	string size = F_("Size: %1%", % Util::formatBytes(currentSize));
 	setStatus_gui("sizeStatus", size);
-	setStatus_gui("filesStatus", files);
-	setStatus_gui("totalStatus", total);
+
+	string totalFiles = P_("Total File: %1%", "Total Files: %1%", % shareItems, shareItems);
+	setStatus_gui("filesStatus", totalFiles);
+
+	string totalSize = F_("Total Size: %1%", % Util::formatBytes(shareSize));
+	setStatus_gui("totalStatus", totalSize);
 }
 
 void ShareBrowser::setStatus_gui(string statusBar, std::string msg)
@@ -991,7 +984,7 @@
 void ShareBrowser::matchQueue_client()
 {
 	int matched = QueueManager::getInstance()->matchListing(listing, "");
-	string message = _("Matched ") + Util::toString(matched) + _(" files");
+	string message = P_("Matched %1% file", "Matched %1% files", % matched, matched);
 
 	typedef Func2<ShareBrowser, string, string> F2;
 	F2 *f = new F2(this, &ShareBrowser::setStatus_gui, "mainStatus", message);

=== modified file 'linux/treeview.cc'
--- linux/treeview.cc	2010-10-22 04:05:48 +0000
+++ linux/treeview.cc	2010-11-14 06:31:40 +0000
@@ -22,8 +22,7 @@
 #include "treeview.hh"
 #include "settingsmanager.hh"
 #include "WulforUtil.hh"
-
-#include <glib/gi18n.h>
+#include "IntlUtil.hh"
 #include <sstream>
 
 using namespace std;

=== modified file 'linux/wulfor.cc'
--- linux/wulfor.cc	2010-09-13 06:10:13 +0000
+++ linux/wulfor.cc	2010-11-14 06:31:40 +0000
@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <glib/gi18n.h>
+#include "IntlUtil.hh"
 
 #include <dcpp/stdinc.h>
 #include <dcpp/DCPlusPlus.h>