diff options
author | Alan Fitton <ajf@eth0.org.uk> | 2011-03-06 21:39:14 +0000 |
---|---|---|
committer | Alan Fitton <ajf@eth0.org.uk> | 2011-03-06 21:39:14 +0000 |
commit | c8f532bd4192bc3d5a8dfda1b1db943870475658 (patch) | |
tree | 22e6f6a88c86b8bd029fadfbf82caa0adc432f0e /src | |
parent | 333b26cbd471c2fb60cc0bdd6f37ca0bf5267c0d (diff) |
all (I hope) strings in _(string) macro for localisation
Diffstat (limited to 'src')
-rw-r--r-- | src/trg-about-window.c | 7 | ||||
-rw-r--r-- | src/trg-cell-renderer-priority.c | 7 | ||||
-rw-r--r-- | src/trg-cell-renderer-wanted.c | 5 | ||||
-rw-r--r-- | src/trg-files-tree-view.c | 21 | ||||
-rw-r--r-- | src/trg-general-panel.c | 43 | ||||
-rw-r--r-- | src/trg-main-window.c | 65 | ||||
-rw-r--r-- | src/trg-menu-bar.c | 47 | ||||
-rw-r--r-- | src/trg-peers-tree-view.c | 17 | ||||
-rw-r--r-- | src/trg-preferences-dialog.c | 35 | ||||
-rw-r--r-- | src/trg-remote-prefs-dialog.c | 85 | ||||
-rw-r--r-- | src/trg-state-selector.c | 17 | ||||
-rw-r--r-- | src/trg-stats-dialog.c | 27 | ||||
-rw-r--r-- | src/trg-status-bar.c | 5 | ||||
-rw-r--r-- | src/trg-toolbar.c | 21 | ||||
-rw-r--r-- | src/trg-torrent-add-url-dialog.c | 5 | ||||
-rw-r--r-- | src/trg-torrent-graph.c | 27 | ||||
-rw-r--r-- | src/trg-torrent-move-dialog.c | 11 | ||||
-rw-r--r-- | src/trg-torrent-props-dialog.c | 37 | ||||
-rw-r--r-- | src/trg-torrent-tree-view.c | 25 | ||||
-rw-r--r-- | src/trg-trackers-tree-view.c | 13 | ||||
-rw-r--r-- | src/util.c | 29 |
21 files changed, 279 insertions, 270 deletions
diff --git a/src/trg-about-window.c b/src/trg-about-window.c index 60aa7d7..542ff7d 100644 --- a/src/trg-about-window.c +++ b/src/trg-about-window.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> @@ -49,23 +50,19 @@ GtkWidget *trg_about_window_new(GtkWindow * parent) g_object_unref(logo); } - /* Set application data that will be displayed in the main dialog. */ gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog), PACKAGE_NAME); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), PACKAGE_VERSION); gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog), "(C) 2011 Alan Fitton"); gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog), - "A remote client to transmission-daemon."); - /* Set the license text, which is usually loaded from a file. Also, set the - * web site address and label. */ + _("A remote client to transmission-daemon.")); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), "GPL2"); gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "http://code.google.com/p/transmission-remote-gtk/"); gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(dialog), "http://code.google.com/p/transmission-remote-gtk/"); - /* Set the application authors, documenters and translators. */ gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), trgAuthors); /*gtk_about_dialog_set_documenters(GTK_ABOUT_DIALOG(dialog), documenters); gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(dialog), diff --git a/src/trg-cell-renderer-priority.c b/src/trg-cell-renderer-priority.c index 77fe4f9..eb16580 100644 --- a/src/trg-cell-renderer-priority.c +++ b/src/trg-cell-renderer-priority.c @@ -18,6 +18,7 @@ */ #include <stdint.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-cell-renderer-priority.h" @@ -68,11 +69,11 @@ trg_cell_renderer_priority_set_property(GObject * object, if (property_id == PROP_PRIORITY_VALUE) { priv->priority_value = g_value_get_int64(value); if (priv->priority_value == T_PRIORITY_LOW) { - g_object_set(object, "text", "Low", NULL); + g_object_set(object, "text", _("Low"), NULL); } else if (priv->priority_value == T_PRIORITY_HIGH) { - g_object_set(object, "text", "High", NULL); + g_object_set(object, "text", _("High"), NULL); } else { - g_object_set(object, "text", "Normal", NULL); + g_object_set(object, "text", _("Normal"), NULL); } } else { G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); diff --git a/src/trg-cell-renderer-wanted.c b/src/trg-cell-renderer-wanted.c index d364bd2..57daaa6 100644 --- a/src/trg-cell-renderer-wanted.c +++ b/src/trg-cell-renderer-wanted.c @@ -18,6 +18,7 @@ */ #include <stdint.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-cell-renderer-wanted.h" @@ -63,9 +64,9 @@ trg_cell_renderer_wanted_set_property(GObject * object, guint property_id, if (property_id == PROP_WANTED_VALUE) { priv->wanted_value = g_value_get_boolean(value); if (priv->wanted_value) { - g_object_set(object, "text", "Yes", NULL); + g_object_set(object, "text", _("Yes"), NULL); } else { - g_object_set(object, "text", "No", NULL); + g_object_set(object, "text", _("No"), NULL); } } else { G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c index 9ef4eda..27e0b99 100644 --- a/src/trg-files-tree-view.c +++ b/src/trg-files-tree-view.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-client.h" @@ -249,16 +250,16 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event, menu = gtk_menu_new(); - menuitem = gtk_menu_item_new_with_label("High Priority"); + menuitem = gtk_menu_item_new_with_label(_("High Priority")); g_signal_connect(menuitem, "activate", G_CALLBACK(set_high), treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - menuitem = gtk_menu_item_new_with_label("Normal Priority"); + menuitem = gtk_menu_item_new_with_label(_("Normal Priority")); g_signal_connect(menuitem, "activate", G_CALLBACK(set_normal), treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - menuitem = gtk_menu_item_new_with_label("Low Priority"); + menuitem = gtk_menu_item_new_with_label(_("Low Priority")); g_signal_connect(menuitem, "activate", G_CALLBACK(set_low), treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -269,7 +270,7 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event, gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(menuitem), TRUE); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), "Download"); + gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), _("Download")); g_signal_connect(menuitem, "activate", G_CALLBACK(set_wanted), treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -278,7 +279,7 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event, gtk_image_menu_item_set_use_stock(GTK_IMAGE_MENU_ITEM(menuitem), TRUE); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM (menuitem), TRUE); - gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), "Skip"); + gtk_menu_item_set_label(GTK_MENU_ITEM(menuitem), _("Skip")); g_signal_connect(menuitem, "activate", G_CALLBACK(set_unwanted), treeview); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); @@ -360,14 +361,14 @@ static void trg_files_tree_view_init(TrgFilesTreeView * self) { trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(self), FILESCOL_ICON, FILESCOL_NAME, - "Name", -1); - trg_tree_view_add_column(TRG_TREE_VIEW(self), "Size", FILESCOL_SIZE); - trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), "Progress", + _("Name"), -1); + trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Size"), FILESCOL_SIZE); + trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), _("Progress"), FILESCOL_PROGRESS, -1); trg_files_tree_view_add_wanted_column(TRG_TREE_VIEW(self), - "Wanted", FILESCOL_WANTED, -1); + _("Wanted"), FILESCOL_WANTED, -1); trg_files_tree_view_add_priority_column(TRG_TREE_VIEW(self), - "Priority", + _("Priority"), FILESCOL_PRIORITY, -1); g_signal_connect(self, "button-press-event", diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c index a5139df..9045744 100644 --- a/src/trg-general-panel.c +++ b/src/trg-general-panel.c @@ -19,6 +19,7 @@ #include <string.h> #include <glib-object.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "torrent.h" @@ -144,14 +145,18 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, keyLabel = gen_panel_label_get_key_label(GTK_LABEL(priv->gen_error_label)); if (strlen(errorStr) > 0) { - gchar *errorValMarkup = + gchar *markup = g_markup_printf_escaped("<span fgcolor=\"red\">%s</span>", errorStr); gtk_label_set_markup(GTK_LABEL(priv->gen_error_label), - errorValMarkup); - g_free(errorValMarkup); + markup); + g_free(markup); + + markup = g_markup_printf_escaped("<span fgcolor=\"red\">%s</span>", + _("Error")); gtk_label_set_markup(keyLabel, - "<span fgcolor=\"red\">Error:</span>"); + markup); + g_free(markup); } else { gtk_label_clear(GTK_LABEL(priv->gen_error_label)); gtk_label_clear(keyLabel); @@ -161,7 +166,7 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, tr_strltime_long(buf, eta, sizeOfBuf); gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), buf); } else { - gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), "N/A"); + gtk_label_set_text(GTK_LABEL(priv->gen_eta_label), _("N/A")); } seeders = 0; @@ -184,7 +189,7 @@ static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * fixed, gchar *keyMarkup; keyLabel = gtk_label_new(NULL); - keyMarkup = g_markup_printf_escaped("<b>%s</b>", key); + keyMarkup = g_markup_printf_escaped("<b>%s:</b>", key); gtk_label_set_markup(GTK_LABEL(keyLabel), keyMarkup); g_free(keyMarkup); gtk_fixed_put(GTK_FIXED(fixed), keyLabel, 10 + (col * 280), @@ -204,35 +209,35 @@ static void trg_general_panel_init(TrgGeneralPanel * self) TrgGeneralPanelPrivate *priv = TRG_GENERAL_PANEL_GET_PRIVATE(self); priv->gen_name_label = - trg_general_panel_add_label(self, "Name:", 0, 0); + trg_general_panel_add_label(self, _("Name"), 0, 0); priv->gen_size_label = - trg_general_panel_add_label(self, "Size:", 0, 1); - priv->gen_eta_label = trg_general_panel_add_label(self, "ETA:", 1, 1); + trg_general_panel_add_label(self, _("Size"), 0, 1); + priv->gen_eta_label = trg_general_panel_add_label(self, _("ETA"), 1, 1); priv->gen_completed_label = - trg_general_panel_add_label(self, "Completed:", 2, 1); + trg_general_panel_add_label(self, _("Completed"), 2, 1); priv->gen_seeders_label = - trg_general_panel_add_label(self, "Seeders:", 0, 2); + trg_general_panel_add_label(self, _("Seeders"), 0, 2); priv->gen_down_rate_label = - trg_general_panel_add_label(self, "Rate Down:", 1, 2); + trg_general_panel_add_label(self, _("Rate Down"), 1, 2); priv->gen_downloaded_label = - trg_general_panel_add_label(self, "Downloaded:", 2, 2); + trg_general_panel_add_label(self, _("Downloaded"), 2, 2); priv->gen_leechers_label = - trg_general_panel_add_label(self, "Leechers:", 0, 3); + trg_general_panel_add_label(self, _("Leechers"), 0, 3); priv->gen_up_rate_label = - trg_general_panel_add_label(self, "Rate Up:", 1, 3); + trg_general_panel_add_label(self, _("Rate Up"), 1, 3); priv->gen_uploaded_label = - trg_general_panel_add_label(self, "Uploaded:", 2, 3); + trg_general_panel_add_label(self, _("Uploaded"), 2, 3); priv->gen_status_label = - trg_general_panel_add_label(self, "Status:", 0, 4); + trg_general_panel_add_label(self, _("Status"), 0, 4); priv->gen_ratio_label = - trg_general_panel_add_label(self, "Ratio:", 1, 4); + trg_general_panel_add_label(self, _("Ratio"), 1, 4); priv->gen_downloaddir_label = - trg_general_panel_add_label(self, "Location:", 0, 5); + trg_general_panel_add_label(self, _("Location"), 0, 5); priv->gen_error_label = trg_general_panel_add_label(self, "", 0, 6); diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 1f24bd4..c54f2c6 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -26,6 +26,7 @@ #include <glib.h> #include <glib/gprintf.h> #include <glib/gstdio.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> #include <gdk/gdkkeysyms.h> @@ -423,7 +424,7 @@ static void add_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) filter = gtk_file_filter_new(); gtk_file_filter_add_pattern(filter, "*.torrent"); - gtk_file_filter_set_name(filter, "BitTorrent Metadata"); + gtk_file_filter_set_name(filter, _("BitTorrent Metadata")); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { @@ -508,13 +509,13 @@ static void connect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) switch (populate_result) { case TRG_GCONF_SCHEMA_ERROR: msg = - "Unable to retrieve connection settings from GConf. Schema not installed?"; + _("Unable to retrieve connection settings from GConf. Schema not installed?"); break; case TRG_NO_HOSTNAME_SET: - msg = "No hostname set"; + msg = _("No hostname set"); break; default: - msg = "Unknown error getting settings"; + msg = _("Unknown error getting settings"); break; } @@ -531,7 +532,7 @@ static void connect_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) return; } - trg_status_bar_push_connection_msg(priv->statusBar, "Connecting..."); + trg_status_bar_push_connection_msg(priv->statusBar, _("Connecting...")); dispatch_async(priv->client, session_get(), on_session_get, data); } @@ -702,8 +703,8 @@ static void remove_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) ids = build_json_id_array(priv->torrentTreeView); if (confirm_action_dialog (GTK_WINDOW(data), selection, - "<big><b>Remove torrent \"%s\"?</b></big>", - "<big><b>Remove %d torrents?</b></big>", + _("<big><b>Remove torrent \"%s\"?</b></big>"), + _("<big><b>Remove %d torrents?</b></big>"), GTK_STOCK_REMOVE) == GTK_RESPONSE_ACCEPT) dispatch_async(priv->client, torrent_remove(ids, @@ -727,8 +728,8 @@ static void delete_cb(GtkWidget * w G_GNUC_UNUSED, gpointer data) if (confirm_action_dialog (GTK_WINDOW(data), selection, - "<big><b>Remove and delete torrent \"%s\"?</b></big>", - "<big><b>Remove and delete %d torrents?</b></big>", + _("<big><b>Remove and delete torrent \"%s\"?</b></big>"), + _("<big><b>Remove and delete %d torrents?</b></big>"), GTK_STOCK_DELETE) == GTK_RESPONSE_ACCEPT) dispatch_async(priv->client, torrent_remove(ids, @@ -796,7 +797,7 @@ GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win) priv->genDetails = trg_general_panel_new(priv->sortedTorrentModel); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), GTK_WIDGET(priv->genDetails), - gtk_label_new("General")); + gtk_label_new(_("General"))); priv->trackersModel = trg_trackers_model_new(); priv->trackersTreeView = @@ -804,7 +805,7 @@ GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), my_scrolledwin_new(GTK_WIDGET (priv->trackersTreeView)), - gtk_label_new("Trackers")); + gtk_label_new(_("Trackers"))); priv->filesModel = trg_files_model_new(); priv->filesTreeView = @@ -812,19 +813,19 @@ GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win) gtk_notebook_append_page(GTK_NOTEBOOK(notebook), my_scrolledwin_new(GTK_WIDGET (priv->filesTreeView)), - gtk_label_new("Files")); + gtk_label_new(_("Files"))); priv->peersModel = trg_peers_model_new(); priv->peersTreeView = trg_peers_tree_view_new(priv->peersModel); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), my_scrolledwin_new(GTK_WIDGET (priv->peersTreeView)), - gtk_label_new("Peers")); + gtk_label_new(_("Peers"))); priv->graph = trg_torrent_graph_new(gtk_widget_get_style(notebook)); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), GTK_WIDGET(priv->graph), - gtk_label_new("Graph")); + gtk_label_new(_("Graph"))); trg_torrent_graph_start(priv->graph); return notebook; @@ -912,7 +913,7 @@ on_torrent_get(JsonObject * response, int mode, msg = make_error_message(response, status); statusBarMsg = - g_strdup_printf("Request %d/%d failed: %s", + g_strdup_printf(_("Request %d/%d failed: %s"), client->failCount, 3, msg); trg_status_bar_push_connection_msg(priv->statusBar, statusBarMsg); @@ -1411,7 +1412,7 @@ static GtkWidget *limit_menu_new(TrgMainWindow * win, gchar * title, g_object_set_data_full(G_OBJECT(menu), "limit-ids", ids, (GDestroyNotify) json_array_unref); - item = gtk_check_menu_item_new_with_label("No Limit"); + item = gtk_check_menu_item_new_with_label(_("No Limit")); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), limit < 0); g_object_set_data(G_OBJECT(item), "limit", GINT_TO_POINTER(-1)); g_signal_connect(item, "activate", G_CALLBACK(set_limit_cb), win); @@ -1448,36 +1449,36 @@ trg_torrent_tv_view_menu(GtkWidget * treeview, menu = gtk_menu_new(); ids = build_json_id_array(TRG_TORRENT_TREE_VIEW(treeview)); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Properties", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Properties"), GTK_STOCK_PROPERTIES, TRUE, G_CALLBACK(open_props_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Resume", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Resume"), GTK_STOCK_MEDIA_PLAY, TRUE, G_CALLBACK(resume_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Pause", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Pause"), GTK_STOCK_MEDIA_PAUSE, TRUE, G_CALLBACK(pause_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Verify", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Verify"), GTK_STOCK_REFRESH, TRUE, G_CALLBACK(verify_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Re-announce", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Re-announce"), GTK_STOCK_REFRESH, TRUE, G_CALLBACK(reannounce_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Move", GTK_STOCK_HARDDISK, + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Move"), GTK_STOCK_HARDDISK, TRUE, G_CALLBACK(move_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Remove", GTK_STOCK_REMOVE, + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove"), GTK_STOCK_REMOVE, TRUE, G_CALLBACK(remove_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Remove & Delete", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Remove & Delete"), GTK_STOCK_DELETE, TRUE, G_CALLBACK(delete_cb), data); gtk_menu_shell_append(GTK_MENU_SHELL(menu), limit_menu_new(TRG_MAIN_WINDOW(data), - "Down Limit", + _("Down Limit"), FIELD_DOWNLOAD_LIMITED, FIELD_DOWNLOAD_LIMIT, ids)); gtk_menu_shell_append(GTK_MENU_SHELL(menu), - limit_menu_new(TRG_MAIN_WINDOW(data), "Up Limit", + limit_menu_new(TRG_MAIN_WINDOW(data), _("Up Limit"), FIELD_UPLOAD_LIMITED, FIELD_UPLOAD_LIMIT, ids)); @@ -1499,28 +1500,28 @@ trg_status_icon_view_menu(GtkStatusIcon * icon G_GNUC_UNUSED, menu = gtk_menu_new(); if (!connected) { - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Connect", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Connect"), GTK_STOCK_CONNECT, !connected, G_CALLBACK(connect_cb), data); } else { - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Disconnect", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Disconnect"), GTK_STOCK_DISCONNECT, connected, G_CALLBACK(disconnect_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Add"), GTK_STOCK_ADD, connected, G_CALLBACK(add_cb), data); - trg_imagemenuitem_new(GTK_MENU_SHELL(menu), "Add from URL", + trg_imagemenuitem_new(GTK_MENU_SHELL(menu), _("Add from URL"), GTK_STOCK_ADD, connected, G_CALLBACK(add_url_cb), data); gtk_menu_shell_append(GTK_MENU_SHELL(menu), limit_menu_new(TRG_MAIN_WINDOW(data), - "Down Limit", + _("Down Limit"), SGET_SPEED_LIMIT_DOWN_ENABLED, SGET_SPEED_LIMIT_DOWN, NULL)); gtk_menu_shell_append(GTK_MENU_SHELL(menu), limit_menu_new(TRG_MAIN_WINDOW(data), - "Up Limit", + _("Up Limit"), SGET_SPEED_LIMIT_UP_ENABLED, SGET_SPEED_LIMIT_UP, NULL)); } diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c index adf15e6..c94f8ff 100644 --- a/src/trg-menu-bar.c +++ b/src/trg-menu-bar.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-main-window.h" #include "trg-menu-bar.h" @@ -204,21 +205,21 @@ GtkWidget *trg_menu_bar_item_new(GtkMenuShell * shell, char *text, static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBarPrivate * priv) { - GtkWidget *view = gtk_menu_item_new_with_mnemonic("_View"); + GtkWidget *view = gtk_menu_item_new_with_mnemonic(_("_View")); GtkWidget *viewMenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(view), viewMenu); priv->mb_view_states = - gtk_check_menu_item_new_with_label("State selector"); + gtk_check_menu_item_new_with_label(_("State selector")); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (priv->mb_view_states), TRUE); priv->mb_view_notebook = - gtk_check_menu_item_new_with_mnemonic("Torrent _details"); + gtk_check_menu_item_new_with_mnemonic(_("Torrent _details")); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (priv->mb_view_notebook), TRUE); - priv->mb_view_stats = gtk_menu_item_new_with_mnemonic("_Statistics"); + priv->mb_view_stats = gtk_menu_item_new_with_mnemonic(_("_Statistics")); gtk_widget_set_sensitive(priv->mb_view_stats, FALSE); gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_states); @@ -232,18 +233,18 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBarPrivate * priv) static GtkWidget *trg_menu_bar_options_menu_new(TrgMenuBarPrivate * priv) { - GtkWidget *opts = gtk_menu_item_new_with_mnemonic("_Options"); + GtkWidget *opts = gtk_menu_item_new_with_mnemonic(_("_Options")); GtkWidget *optsMenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(opts), optsMenu); priv->mb_local_prefs = trg_menu_bar_item_new(GTK_MENU_SHELL(optsMenu), - "_Local Preferences", + _("_Local Preferences"), GTK_STOCK_PREFERENCES, TRUE); priv->mb_remote_prefs = trg_menu_bar_item_new(GTK_MENU_SHELL(optsMenu), - "_Remote Preferences", + _("_Remote Preferences"), GTK_STOCK_NETWORK, FALSE); return opts; @@ -252,25 +253,25 @@ GtkWidget *trg_menu_bar_options_menu_new(TrgMenuBarPrivate * priv) static GtkWidget *trg_menu_bar_file_file_menu_new(TrgMenuBarPrivate * priv) { - GtkWidget *file = gtk_menu_item_new_with_mnemonic("_File"); + GtkWidget *file = gtk_menu_item_new_with_mnemonic(_("_File")); GtkWidget *fileMenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(file), fileMenu); priv->mb_connect = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "_Connect", + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), _("_Connect"), GTK_STOCK_CONNECT, TRUE); priv->mb_disconnect = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "_Disconnect", + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), _("_Disconnect"), GTK_STOCK_DISCONNECT, FALSE); priv->mb_add = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "_Add", + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), _("_Add"), GTK_STOCK_ADD, FALSE); priv->mb_add_url = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "Add from _URL", + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), _("Add from _URL"), GTK_STOCK_ADD, FALSE); priv->mb_quit = - trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), "_Quit", + trg_menu_bar_item_new(GTK_MENU_SHELL(fileMenu), _("_Quit"), GTK_STOCK_QUIT, TRUE); return file; @@ -279,7 +280,7 @@ GtkWidget *trg_menu_bar_file_file_menu_new(TrgMenuBarPrivate * priv) static GtkWidget *trg_menu_bar_torrent_menu_new(TrgMenuBarPrivate * priv) { - GtkWidget *torrent = gtk_menu_item_new_with_mnemonic("_Torrent"); + GtkWidget *torrent = gtk_menu_item_new_with_mnemonic(_("_Torrent")); GtkWidget *torrentMenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(torrent), torrentMenu); @@ -287,26 +288,26 @@ GtkWidget *trg_menu_bar_torrent_menu_new(TrgMenuBarPrivate * priv) trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Properties", GTK_STOCK_PROPERTIES, FALSE); priv->mb_resume = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "_Resume", + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("_Resume"), GTK_STOCK_MEDIA_PLAY, FALSE); priv->mb_pause = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "_Pause", + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("_Pause"), GTK_STOCK_MEDIA_PAUSE, FALSE); priv->mb_verify = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "_Verify", + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("_Verify"), GTK_STOCK_REFRESH, FALSE); priv->mb_reannounce = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Re-_announce", + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("Re-_announce"), GTK_STOCK_REFRESH, FALSE); priv->mb_move = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "_Move", + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("_Move"), GTK_STOCK_HARDDISK, FALSE); priv->mb_remove = - trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), "Remove", + trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), _("Remove"), GTK_STOCK_REMOVE, FALSE); priv->mb_delete = trg_menu_bar_item_new(GTK_MENU_SHELL(torrentMenu), - "Remove and Delete", GTK_STOCK_DELETE, + _("Remove and Delete"), GTK_STOCK_DELETE, FALSE); return torrent; @@ -317,13 +318,13 @@ GtkWidget *trg_menu_bar_help_menu_new(TrgMenuBar * menuBar) { TrgMenuBarPrivate *priv = TRG_MENU_BAR_GET_PRIVATE(menuBar); - GtkWidget *help = gtk_menu_item_new_with_mnemonic("_Help"); + GtkWidget *help = gtk_menu_item_new_with_mnemonic(_("_Help")); GtkWidget *helpMenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(help), helpMenu); gtk_menu_shell_append(GTK_MENU_SHELL(menuBar), help); priv->mb_about = - trg_menu_bar_item_new(GTK_MENU_SHELL(helpMenu), "_About", + trg_menu_bar_item_new(GTK_MENU_SHELL(helpMenu), _("_About"), GTK_STOCK_ABOUT, TRUE); return helpMenu; diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c index 6d75331..719de63 100644 --- a/src/trg-peers-tree-view.c +++ b/src/trg-peers-tree-view.c @@ -26,6 +26,7 @@ #endif #include <glib-object.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-tree-view.h" @@ -44,21 +45,21 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self) trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW (self), PEERSCOL_ICON, - PEERSCOL_IP, "IP", 160); - trg_tree_view_add_column_fixed_width(TRG_TREE_VIEW(self), "Host", + PEERSCOL_IP, _("IP"), 160); + trg_tree_view_add_column_fixed_width(TRG_TREE_VIEW(self), _("Host"), PEERSCOL_HOST, 250); #ifdef HAVE_GEOIP - trg_tree_view_add_column(TRG_TREE_VIEW(self), "Country", + trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Country"), PEERSCOL_COUNTRY); #endif - trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), "Down Speed", + trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), _("Down Speed"), PEERSCOL_DOWNSPEED, -1); - trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), "Up Speed", + trg_tree_view_add_speed_column(TRG_TREE_VIEW(self), _("Up Speed"), PEERSCOL_UPSPEED, -1); - trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), "Progress", + trg_tree_view_add_prog_column(TRG_TREE_VIEW(self), _("Progress"), PEERSCOL_PROGRESS, -1); - trg_tree_view_add_column(TRG_TREE_VIEW(self), "Flags", PEERSCOL_FLAGS); - trg_tree_view_add_column(TRG_TREE_VIEW(self), "Client", + trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Flags"), PEERSCOL_FLAGS); + trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Client"), PEERSCOL_CLIENT); } diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c index 09f23c7..02c831c 100644 --- a/src/trg-preferences-dialog.c +++ b/src/trg-preferences-dialog.c @@ -22,6 +22,7 @@ #endif #include <glib.h> +#include <glib/gi18n.h> #include <glib-object.h> #include <gtk/gtk.h> #include <gconf/gconf-client.h> @@ -223,15 +224,15 @@ static GtkWidget *trg_prefs_desktopPage(GConfClient * gconf, t = hig_workarea_create(); - hig_workarea_add_section_title(t, &row, "System Tray"); + hig_workarea_add_section_title(t, &row, _("System Tray")); - tray = new_check_button(gconf, "Show in system tray", + tray = new_check_button(gconf, _("Show in system tray"), TRG_GCONF_KEY_SYSTEM_TRAY); g_signal_connect(G_OBJECT(tray), "toggled", G_CALLBACK(toggle_tray_icon), win); hig_workarea_add_wide_control(t, &row, tray); - w = new_check_button(gconf, "Minimise to system tray", + w = new_check_button(gconf, _("Minimise to system tray"), TRG_GCONF_KEY_SYSTEM_TRAY_MINIMISE); gtk_widget_set_sensitive(w, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON @@ -240,7 +241,7 @@ static GtkWidget *trg_prefs_desktopPage(GConfClient * gconf, G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_wide_control(t, &row, w); - w = new_check_button(gconf, "Torrent added notifications", + w = new_check_button(gconf, _("Torrent added notifications"), TRG_GCONF_KEY_ADD_NOTIFY); gtk_widget_set_sensitive(w, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON @@ -249,7 +250,7 @@ static GtkWidget *trg_prefs_desktopPage(GConfClient * gconf, G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_wide_control(t, &row, w); - w = new_check_button(gconf, "Torrent complete notifications", + w = new_check_button(gconf, _("Torrent complete notifications"), TRG_GCONF_KEY_COMPLETE_NOTIFY); gtk_widget_set_sensitive(w, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON @@ -269,35 +270,35 @@ static GtkWidget *trg_prefs_serverPage(GConfClient * gconf, t = hig_workarea_create(); - hig_workarea_add_section_title(t, &row, "Server"); + hig_workarea_add_section_title(t, &row, _("Server")); w = new_entry(gconf, TRG_GCONF_KEY_HOSTNAME); - hig_workarea_add_row(t, &row, "Host:", w, NULL); + hig_workarea_add_row(t, &row, _("Host:"), w, NULL); w = new_spin_button(gconf, TRG_GCONF_KEY_PORT, 1, 65535, 1); - hig_workarea_add_row(t, &row, "Port:", w, NULL); + hig_workarea_add_row(t, &row, _("Port:"), w, NULL); - w = new_check_button(gconf, "Automatically connect", + w = new_check_button(gconf, _("Automatically connect"), TRG_GCONF_KEY_AUTO_CONNECT); hig_workarea_add_wide_control(t, &row, w); - w = new_check_button(gconf, "SSL", TRG_GCONF_KEY_SSL); + w = new_check_button(gconf, _("SSL"), TRG_GCONF_KEY_SSL); hig_workarea_add_wide_control(t, &row, w); w = new_spin_button(gconf, TRG_GCONF_KEY_UPDATE_INTERVAL, 1, 60, 1); g_signal_connect(w, "value-changed", G_CALLBACK(interval_changed_cb), client); - hig_workarea_add_row(t, &row, "Update interval:", w, NULL); + hig_workarea_add_row(t, &row, _("Update interval:"), w, NULL); hig_workarea_add_section_divider(t, &row); - hig_workarea_add_section_title(t, &row, "Authentication"); + hig_workarea_add_section_title(t, &row, _("Authentication")); w = new_entry(gconf, TRG_GCONF_KEY_USERNAME); - hig_workarea_add_row(t, &row, "Username:", w, NULL); + hig_workarea_add_row(t, &row, _("Username:"), w, NULL); w = new_entry(gconf, TRG_GCONF_KEY_PASSWORD); gtk_entry_set_visibility(GTK_ENTRY(w), FALSE); - hig_workarea_add_row(t, &row, "Password:", w, NULL); + hig_workarea_add_row(t, &row, _("Password:"), w, NULL); return t; } @@ -324,7 +325,7 @@ static GObject *trg_preferences_dialog_constructor(GType type, gtk_window_set_destroy_with_parent(GTK_WINDOW(object), TRUE); gtk_dialog_add_button(GTK_DIALOG(object), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); - gtk_window_set_title(GTK_WINDOW(object), "Local Preferences"); + gtk_window_set_title(GTK_WINDOW(object), _("Local Preferences")); gtk_container_set_border_width(GTK_CONTAINER(object), GUI_PAD); g_signal_connect(G_OBJECT(object), @@ -336,11 +337,11 @@ static GObject *trg_preferences_dialog_constructor(GType type, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), trg_prefs_serverPage(priv->gconf, priv->client), - gtk_label_new("Connection")); + gtk_label_new(_("Connection"))); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), trg_prefs_desktopPage(priv->gconf, priv->win), - gtk_label_new("Desktop")); + gtk_label_new(_("Desktop"))); gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD); diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c index b0ca1c5..1536293 100644 --- a/src/trg-remote-prefs-dialog.c +++ b/src/trg-remote-prefs-dialog.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> @@ -160,9 +161,9 @@ static void trg_remote_prefs_response_cb(GtkDialog * dlg, gint res_id, gpointer data G_GNUC_UNUSED) { - if (res_id == GTK_RESPONSE_ACCEPT) { + if (res_id == GTK_RESPONSE_ACCEPT) update_session(dlg); - } + gtk_widget_destroy(GTK_WIDGET(dlg)); instance = NULL; } @@ -214,10 +215,10 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win, t = hig_workarea_create(); - hig_workarea_add_section_title(t, &row, "Bandwidth"); + hig_workarea_add_section_title(t, &row, _("Bandwidth")); tb = priv->speed_limit_down_check = gtk_check_button_new_with_mnemonic - ("Limit download speed (KB/s)"); + (_("Limit download speed (KB/s)")); widget_set_json_key(tb, SGET_SPEED_LIMIT_DOWN_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), session_get_speed_limit_down_enabled @@ -236,7 +237,7 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win, hig_workarea_add_row_w(t, &row, tb, w, NULL); tb = priv->speed_limit_up_check = gtk_check_button_new_with_mnemonic - ("Limit upload speed (KB/s)"); + (_("Limit upload speed (KB/s)")); widget_set_json_key(tb, SGET_SPEED_LIMIT_UP_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), session_get_speed_limit_up_enabled(json)); @@ -253,10 +254,10 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win, (tb))); hig_workarea_add_row_w(t, &row, tb, w, NULL); - hig_workarea_add_section_title(t, &row, "Seeding"); + hig_workarea_add_section_title(t, &row, _("Seeding")); tb = priv->seed_ratio_limit_check = gtk_check_button_new_with_mnemonic - ("Seed ratio limit"); + (_("Seed ratio limit")); widget_set_json_key(tb, SGET_SEED_RATIO_LIMITED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), session_get_seed_ratio_limited(json)); @@ -273,21 +274,21 @@ static GtkWidget *trg_rprefs_limitsPage(TrgRemotePrefsDialog * win, G_CALLBACK(toggle_active_arg_is_sensitive), w); hig_workarea_add_row_w(t, &row, tb, w, NULL); - hig_workarea_add_section_title(t, &row, "Peers"); + hig_workarea_add_section_title(t, &row, _("Peers")); w = priv->peer_limit_global_spin = gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(GTK_WIDGET(w), SGET_PEER_LIMIT_GLOBAL); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), session_get_peer_limit_global(json)); - hig_workarea_add_row(t, &row, "Global peer limit", w, w); + hig_workarea_add_row(t, &row, _("Global peer limit"), w, w); w = priv->peer_limit_per_torrent_spin = gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(GTK_WIDGET(w), SGET_PEER_LIMIT_PER_TORRENT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), session_get_peer_limit_per_torrent(json)); - hig_workarea_add_row(t, &row, "Per torrent peer limit", w, w); + hig_workarea_add_row(t, &row, _("Per torrent peer limit"), w, w); return t; } @@ -301,7 +302,7 @@ static void on_port_tested(JsonObject * response, int status, TrgRemotePrefsDialogPrivate *priv = TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(data); - gtk_button_set_label(GTK_BUTTON(priv->port_test_button), "Retest"); + gtk_button_set_label(GTK_BUTTON(priv->port_test_button), _("Retest")); gtk_widget_set_sensitive(priv->port_test_button, TRUE); if (status == CURLE_OK) { @@ -310,10 +311,10 @@ static void on_port_tested(JsonObject * response, int status, "port-is-open"); if (isOpen) gtk_label_set_markup(GTK_LABEL(priv->port_test_label), - "Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>"); + _("Port is <span font_weight=\"bold\" fgcolor=\"darkgreen\">open</span>")); else gtk_label_set_markup(GTK_LABEL(priv->port_test_label), - "Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>"); + _("Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>")); } else { trg_error_dialog(GTK_WINDOW(data), status, response); } @@ -329,8 +330,8 @@ static void port_test_cb(GtkButton * b, gpointer data) TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(data); JsonNode *req = port_test(); - gtk_label_set_text(GTK_LABEL(priv->port_test_label), "Port test"); - gtk_button_set_label(b, "Testing..."); + gtk_label_set_text(GTK_LABEL(priv->port_test_label), _("Port test")); + gtk_button_set_label(b, _("Testing...")); gtk_widget_set_sensitive(GTK_WIDGET(b), FALSE); dispatch_async(priv->client, req, on_port_tested, data); @@ -352,7 +353,7 @@ static void on_blocklist_updated(JsonObject * response, int status, if (status == CURLE_OK) { JsonObject *args = get_arguments(response); gchar *labelText = - g_strdup_printf("Blocklist (%ld entries)", + g_strdup_printf(_("Blocklist (%ld entries)"), json_object_get_int_member(args, SGET_BLOCKLIST_SIZE)); gtk_button_set_label(GTK_BUTTON(priv->blocklist_check), @@ -375,7 +376,7 @@ static void update_blocklist_cb(GtkButton * b, gpointer data) JsonNode *req = blocklist_update(); gtk_widget_set_sensitive(GTK_WIDGET(b), FALSE); - gtk_button_set_label(b, "Updating..."); + gtk_button_set_label(b, _("Updating...")); dispatch_async(priv->client, req, on_blocklist_updated, data); } @@ -394,9 +395,9 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, w = priv->encryption_combo = gtk_combo_box_new_text(); widget_set_json_key(GTK_WIDGET(w), SGET_ENCRYPTION); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Required"); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Preferred"); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Tolerated"); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Required")); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Preferred")); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Tolerated")); stringValue = session_get_encryption(s); if (g_strcmp0(stringValue, "required") == 0) { gtk_combo_box_set_active(GTK_COMBO_BOX(w), 0); @@ -405,46 +406,46 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, } else { gtk_combo_box_set_active(GTK_COMBO_BOX(w), 1); } - hig_workarea_add_row(t, &row, "Encryption", w, NULL); + hig_workarea_add_row(t, &row, _("Encryption"), w, NULL); w = priv->peer_port_spin = gtk_spin_button_new_with_range(0, 65535, 1); widget_set_json_key(w, SGET_PEER_PORT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), session_get_peer_port(s)); - hig_workarea_add_row(t, &row, "Peer port", w, w); + hig_workarea_add_row(t, &row, _("Peer port"), w, w); - priv->port_test_label = gtk_label_new("Port test"); - w = priv->port_test_button = gtk_button_new_with_label("Test"); + priv->port_test_label = gtk_label_new(_("Port test")); + w = priv->port_test_button = gtk_button_new_with_label(_("Test")); g_signal_connect(w, "clicked", G_CALLBACK(port_test_cb), win); hig_workarea_add_row_w(t, &row, priv->port_test_label, w, NULL); w = priv->peer_port_random_check = hig_workarea_add_wide_checkbutton(t, &row, - "Random peer port on start", + _("Random peer port on start"), session_get_peer_port_random(s)); widget_set_json_key(w, SGET_PEER_PORT_RANDOM_ON_START); w = priv->peer_port_forwarding_check = hig_workarea_add_wide_checkbutton(t, &row, - "Peer port forwarding", + _("Peer port forwarding"), session_get_port_forwarding_enabled (s)); widget_set_json_key(w, SGET_PORT_FORWARDING_ENABLED); w = priv->pex_enabled_check = hig_workarea_add_wide_checkbutton(t, &row, - "Peer exchange (PEX)", + _("Peer exchange (PEX)"), session_get_pex_enabled(s)); widget_set_json_key(w, SGET_PEX_ENABLED); w = priv->lpd_enabled_check = hig_workarea_add_wide_checkbutton(t, &row, - "Local peer discovery", + _("Local peer discovery"), session_get_lpd_enabled(s)); widget_set_json_key(w, SGET_LPD_ENABLED); stringValue = - g_strdup_printf("Blocklist (%ld entries)", + g_strdup_printf(_("Blocklist (%ld entries)"), session_get_blocklist_size(s)); tb = priv->blocklist_check = gtk_check_button_new_with_mnemonic(stringValue); @@ -454,7 +455,7 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, session_get_blocklist_enabled(s)); w = priv->blocklist_update_button = - gtk_button_new_with_label("Update"); + gtk_button_new_with_label(_("Update")); g_signal_connect(G_OBJECT(w), "clicked", G_CALLBACK(update_blocklist_cb), win); @@ -470,7 +471,7 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, (GTK_TOGGLE_BUTTON(tb))); g_signal_connect(G_OBJECT(tb), "toggled", G_CALLBACK(toggle_active_arg_is_sensitive), w); - hig_workarea_add_row(t, &row, "Blocklist URL:", w, NULL); + hig_workarea_add_row(t, &row, _("Blocklist URL:"), w, NULL); } return t; @@ -491,10 +492,10 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win, w = priv->download_dir_entry = gtk_entry_new(); widget_set_json_key(w, SGET_DOWNLOAD_DIR); gtk_entry_set_text(GTK_ENTRY(w), session_get_download_dir(s)); - hig_workarea_add_row(t, &row, "Download directory", w, NULL); + hig_workarea_add_row(t, &row, _("Download directory"), w, NULL); tb = priv->incomplete_dir_check = - gtk_check_button_new_with_mnemonic("Incomplete download dir"); + gtk_check_button_new_with_mnemonic(_("Incomplete download dir")); widget_set_json_key(tb, SGET_INCOMPLETE_DIR_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), session_get_incomplete_dir_enabled(s)); @@ -510,7 +511,7 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win, hig_workarea_add_row_w(t, &row, tb, w, NULL); tb = priv->done_script_enabled_check = - gtk_check_button_new_with_mnemonic("Torrent done script"); + gtk_check_button_new_with_mnemonic(_("Torrent done script")); widget_set_json_key(tb, SGET_SCRIPT_TORRENT_DONE_ENABLED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), session_get_torrent_done_enabled(s)); @@ -531,26 +532,26 @@ static GtkWidget *trg_rprefs_generalPage(TrgRemotePrefsDialog * win, gtk_spin_button_new_with_range(0, INT_MAX, 1); widget_set_json_key(w, SGET_CACHE_SIZE_MB); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), cache_size_mb); - hig_workarea_add_row(t, &row, "Cache size (MB)", w, w); + hig_workarea_add_row(t, &row, _("Cache size (MB)"), w, w); } w = priv->rename_partial_files_check = hig_workarea_add_wide_checkbutton(t, &row, - "Rename partial files", + _("Rename partial files"), session_get_rename_partial_files (s)); widget_set_json_key(w, SGET_RENAME_PARTIAL_FILES); w = priv->trash_original_torrent_files_check = hig_workarea_add_wide_checkbutton(t, &row, - "Trash original torrent files", + _("Trash original torrent files"), session_get_trash_original_torrent_files (s)); widget_set_json_key(w, SGET_TRASH_ORIGINAL_TORRENT_FILES); w = priv->start_added_torrent_check = hig_workarea_add_wide_checkbutton(t, &row, - "Start added torrents", + _("Start added torrents"), session_get_start_added_torrents (s)); widget_set_json_key(w, SGET_START_ADDED_TORRENTS); @@ -576,7 +577,7 @@ static GObject *trg_remote_prefs_dialog_constructor(GType type, priv = TRG_REMOTE_PREFS_DIALOG_GET_PRIVATE(object); session = priv->client->session; - gtk_window_set_title(GTK_WINDOW(object), "Remote Preferences"); + gtk_window_set_title(GTK_WINDOW(object), _("Remote Preferences")); gtk_window_set_transient_for(GTK_WINDOW(object), GTK_WINDOW(priv->parent)); gtk_window_set_destroy_with_parent(GTK_WINDOW(object), TRUE); @@ -604,17 +605,17 @@ static GObject *trg_remote_prefs_dialog_constructor(GType type, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), trg_rprefs_generalPage (TRG_REMOTE_PREFS_DIALOG(object), - session), gtk_label_new("General")); + session), gtk_label_new(_("General"))); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), trg_rprefs_connPage (TRG_REMOTE_PREFS_DIALOG(object), - session), gtk_label_new("Connections")); + session), gtk_label_new(_("Connections"))); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), trg_rprefs_limitsPage (TRG_REMOTE_PREFS_DIALOG(object), - session), gtk_label_new("Limits")); + session), gtk_label_new(_("Limits"))); gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD); diff --git a/src/trg-state-selector.c b/src/trg-state-selector.c index deb3301..8c9045b 100644 --- a/src/trg-state-selector.c +++ b/src/trg-state-selector.c @@ -18,6 +18,7 @@ */ #include <glib-object.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "torrent.h" @@ -127,21 +128,21 @@ static void trg_state_selector_init(TrgStateSelector * self) gtk_list_store_new(STATE_SELECTOR_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT); - trg_state_selector_add_state(store, &iter, GTK_STOCK_ABOUT, "All", 0); + trg_state_selector_add_state(store, &iter, GTK_STOCK_ABOUT, _("All"), 0); trg_state_selector_add_state(store, &iter, GTK_STOCK_GO_DOWN, - "Downloading", TORRENT_FLAG_DOWNLOADING); + _("Downloading"), TORRENT_FLAG_DOWNLOADING); trg_state_selector_add_state(store, &iter, GTK_STOCK_MEDIA_PAUSE, - "Paused", TORRENT_FLAG_PAUSED); + _("Paused"), TORRENT_FLAG_PAUSED); trg_state_selector_add_state(store, &iter, GTK_STOCK_REFRESH, - "Checking", TORRENT_FLAG_CHECKING); + _("Checking"), TORRENT_FLAG_CHECKING); trg_state_selector_add_state(store, &iter, GTK_STOCK_APPLY, - "Complete", TORRENT_FLAG_COMPLETE); + _("Complete"), TORRENT_FLAG_COMPLETE); trg_state_selector_add_state(store, &iter, GTK_STOCK_SELECT_ALL, - "Incomplete", TORRENT_FLAG_INCOMPLETE); + _("Incomplete"), TORRENT_FLAG_INCOMPLETE); trg_state_selector_add_state(store, &iter, GTK_STOCK_GO_UP, - "Seeding", TORRENT_FLAG_SEEDING); + _("Seeding"), TORRENT_FLAG_SEEDING); trg_state_selector_add_state(store, &iter, - GTK_STOCK_DIALOG_WARNING, "Error", + GTK_STOCK_DIALOG_WARNING, _("Error"), TORRENT_FLAG_ERROR); gtk_tree_view_set_model(GTK_TREE_VIEW(self), GTK_TREE_MODEL(store)); diff --git a/src/trg-stats-dialog.c b/src/trg-stats-dialog.c index 315d3e2..1649019 100644 --- a/src/trg-stats-dialog.c +++ b/src/trg-stats-dialog.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> #include <curl/curl.h> @@ -90,14 +91,6 @@ trg_stats_dialog_set_property(GObject * object, guint property_id, } } -/*static void -trg_stats_dialog_dispose (GObject *object) -{ - TrgStatsDialogPrivate *priv = TRG_STATS_DIALOG_GET_PRIVATE(object); - - G_OBJECT_CLASS (trg_stats_dialog_parent_class)->dispose (object); -}*/ - static void trg_stats_response_cb(GtkDialog * dlg, gint res_id, gpointer data G_GNUC_UNUSED) @@ -271,7 +264,7 @@ static GObject *trg_stats_dialog_constructor(GType type, construct_params); TrgStatsDialogPrivate *priv = TRG_STATS_DIALOG_GET_PRIVATE(obj); - gtk_window_set_title(GTK_WINDOW(obj), "Statistics"); + gtk_window_set_title(GTK_WINDOW(obj), _("Statistics")); gtk_window_set_transient_for(GTK_WINDOW(obj), GTK_WINDOW(priv->parent)); gtk_window_set_destroy_with_parent(GTK_WINDOW(obj), TRUE); @@ -290,23 +283,23 @@ static GObject *trg_stats_dialog_constructor(GType type, G_TYPE_STRING); priv->rr_down = - stats_dialog_add_statistic(priv->model, "Download Total"); - priv->rr_up = stats_dialog_add_statistic(priv->model, "Upload Total"); + stats_dialog_add_statistic(priv->model, _("Download Total")); + priv->rr_up = stats_dialog_add_statistic(priv->model, _("Upload Total")); priv->rr_files_added = - stats_dialog_add_statistic(priv->model, "Files Added"); + stats_dialog_add_statistic(priv->model, _("Files Added")); priv->rr_session_count = - stats_dialog_add_statistic(priv->model, "Session Count"); + stats_dialog_add_statistic(priv->model, _("Session Count")); priv->rr_active = - stats_dialog_add_statistic(priv->model, "Time Active"); + stats_dialog_add_statistic(priv->model, _("Time Active")); tv = priv->tv = trg_tree_view_new(); gtk_widget_set_sensitive(tv, TRUE); - trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_STAT, "Statistic", + trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_STAT, _("Statistic"), 170); - trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_SESSION, "Session", + trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_SESSION, _("Session"), 100); - trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_CUMULAT, "Cumulative", + trg_stats_add_column(GTK_TREE_VIEW(tv), STATCOL_CUMULAT, _("Cumulative"), 100); gtk_tree_view_set_model(GTK_TREE_VIEW(tv), diff --git a/src/trg-status-bar.c b/src/trg-status-bar.c index 7f21412..8b82eeb 100644 --- a/src/trg-status-bar.c +++ b/src/trg-status-bar.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <glib/gprintf.h> #include <gtk/gtk.h> @@ -70,7 +71,7 @@ void trg_status_bar_connect(TrgStatusBar * sb, JsonObject * session) session_get_version(session, &version); statusMsg = g_strdup_printf - ("Connected to Transmission %g, getting torrents...", version); + (_("Connected to Transmission %g, getting torrents..."), version); g_printf("%s\n", statusMsg); trg_status_bar_push_connection_msg(sb, statusMsg); g_free(statusMsg); @@ -91,7 +92,7 @@ void trg_status_bar_update(TrgStatusBar * sb, statusBarUpdate = g_strdup_printf - ("%d torrents .. Down %s, Up %s .. %d seeding, %d downloading, %d paused", + (_("%d torrents .. Down %s, Up %s .. %d seeding, %d downloading, %d paused"), stats->count, downRateTotalString, upRateTotalString, stats->seeding, stats->down, stats->paused); diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c index 38e47ff..c364329 100644 --- a/src/trg-toolbar.c +++ b/src/trg-toolbar.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-toolbar.h" @@ -211,13 +212,13 @@ static void trg_toolbar_init(TrgToolbar * self) gtk_toolbar_set_style(GTK_TOOLBAR(self), GTK_TOOLBAR_ICONS); priv->tb_connect = - trg_toolbar_item_new(self, "Connect", &position, + trg_toolbar_item_new(self, _("Connect"), &position, GTK_STOCK_CONNECT, TRUE); priv->tb_disconnect = - trg_toolbar_item_new(self, "Disconnect", &position, + trg_toolbar_item_new(self, _("Disconnect"), &position, GTK_STOCK_DISCONNECT, FALSE); priv->tb_add = - trg_toolbar_item_new(self, "Add", &position, GTK_STOCK_ADD, FALSE); + trg_toolbar_item_new(self, _("Add"), &position, GTK_STOCK_ADD, FALSE); /*priv->tb_add_url = trg_toolbar_item_new(self, "Add URL", 3, GTK_STOCK_ADD, FALSE); */ @@ -226,22 +227,22 @@ static void trg_toolbar_init(TrgToolbar * self) gtk_toolbar_insert(GTK_TOOLBAR(self), separator, position++); priv->tb_resume = - trg_toolbar_item_new(self, "Resume", &position, + trg_toolbar_item_new(self, _("Resume"), &position, GTK_STOCK_MEDIA_PLAY, FALSE); priv->tb_pause = - trg_toolbar_item_new(self, "Pause", &position, + trg_toolbar_item_new(self, _("Pause"), &position, GTK_STOCK_MEDIA_PAUSE, FALSE); priv->tb_props = - trg_toolbar_item_new(self, "Properties", &position, + trg_toolbar_item_new(self, _("Properties"), &position, GTK_STOCK_PROPERTIES, FALSE); priv->tb_remove = - trg_toolbar_item_new(self, "Remove", &position, + trg_toolbar_item_new(self, _("Remove"), &position, GTK_STOCK_REMOVE, FALSE); priv->tb_delete = - trg_toolbar_item_new(self, "Remove with data", + trg_toolbar_item_new(self, _("Remove with data"), &position, GTK_STOCK_DELETE, FALSE); /*priv->tb_verify = @@ -252,11 +253,11 @@ static void trg_toolbar_init(TrgToolbar * self) gtk_toolbar_insert(GTK_TOOLBAR(self), separator, position++); priv->tb_local_prefs = - trg_toolbar_item_new(self, "Local Preferences", &position, + trg_toolbar_item_new(self, _("Local Preferences"), &position, GTK_STOCK_PREFERENCES, TRUE); priv->tb_remote_prefs = - trg_toolbar_item_new(self, "Remote Preferences", + trg_toolbar_item_new(self, _("Remote Preferences"), &position, GTK_STOCK_NETWORK, FALSE); } diff --git a/src/trg-torrent-add-url-dialog.c b/src/trg-torrent-add-url-dialog.c index a2b35df..5b65581 100644 --- a/src/trg-torrent-add-url-dialog.c +++ b/src/trg-torrent-add-url-dialog.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> @@ -85,9 +86,9 @@ static void trg_torrent_add_url_dialog_init(TrgTorrentAddUrlDialog * self) w = hig_workarea_add_row(t, &row, "URL:", w, NULL); priv->startCheck = - hig_workarea_add_wide_checkbutton(t, &row, "Start Paused", FALSE); + hig_workarea_add_wide_checkbutton(t, &row, _("Start Paused"), FALSE); - gtk_window_set_title(GTK_WINDOW(self), "Add torrent from URL"); + gtk_window_set_title(GTK_WINDOW(self), _("Add torrent from URL")); gtk_window_set_destroy_with_parent(GTK_WINDOW(self), TRUE); gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_CLOSE, diff --git a/src/trg-torrent-graph.c b/src/trg-torrent-graph.c index aaadd67..1fc21a6 100644 --- a/src/trg-torrent-graph.c +++ b/src/trg-torrent-graph.c @@ -26,8 +26,8 @@ #include <glib.h> #include <cairo.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> -#include <gtk/gtkenums.h> #include "trg-torrent-graph.h" #include "util.h" @@ -39,6 +39,7 @@ #define GRAPH_OUT_COLOR "#2D7DB3" #define GRAPH_IN_COLOR "#844798" #define GRAPH_LINE_WIDTH 3 +#define GRAPH_FRAME_WIDTH 4 G_DEFINE_TYPE(TrgTorrentGraph, trg_torrent_graph, GTK_TYPE_VBOX) #define TRG_TORRENT_GRAPH_GET_PRIVATE(o) \ @@ -46,7 +47,6 @@ G_DEFINE_TYPE(TrgTorrentGraph, trg_torrent_graph, GTK_TYPE_VBOX) typedef struct _TrgTorrentGraphPrivate TrgTorrentGraphPrivate; struct _TrgTorrentGraphPrivate { - double fontsize; double rmargin; double indent; @@ -101,7 +101,6 @@ trg_torrent_graph_set_property(GObject * object, guint property_id, } } -#define FRAME_WIDTH 4 void trg_torrent_graph_draw_background(TrgTorrentGraph * g) { TrgTorrentGraphPrivate *priv; @@ -125,7 +124,7 @@ void trg_torrent_graph_draw_background(TrgTorrentGraph * g) (priv->draw_width - 2.0 - priv->rmargin - priv->indent) / (GRAPH_NUM_POINTS - 3); priv->graph_buffer_offset = - (int) (1.5 * priv->graph_delx) + FRAME_WIDTH; + (int) (1.5 * priv->graph_delx) + GRAPH_FRAME_WIDTH; gtk_widget_get_allocation(priv->disp, &allocation); priv->background = @@ -135,7 +134,7 @@ void trg_torrent_graph_draw_background(TrgTorrentGraph * g) gdk_cairo_set_source_color(cr, &priv->style->bg[GTK_STATE_NORMAL]); cairo_paint(cr); - cairo_translate(cr, FRAME_WIDTH, FRAME_WIDTH); + cairo_translate(cr, GRAPH_FRAME_WIDTH, GRAPH_FRAME_WIDTH); cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); cairo_rectangle(cr, priv->rmargin + priv->indent, 0, priv->draw_width - priv->rmargin - priv->indent, @@ -159,7 +158,6 @@ void trg_torrent_graph_draw_background(TrgTorrentGraph * g) y = i * priv->graph_dely + priv->fontsize / 2.0; gdk_cairo_set_source_color(cr, &priv->style->fg[GTK_STATE_NORMAL]); - /* operation orders matters so it's 0 if i == num_bars */ rate = priv->max - (i * priv->max / num_bars); trg_strlspeed(caption, (gint64) (rate / 1024)); cairo_text_extents(cr, caption, &extents); @@ -228,8 +226,8 @@ trg_torrent_graph_configure(GtkWidget * widget, TrgTorrentGraphPrivate *priv = TRG_TORRENT_GRAPH_GET_PRIVATE(data_ptr); gtk_widget_get_allocation(widget, &allocation); - priv->draw_width = allocation.width - 2 * FRAME_WIDTH; - priv->draw_height = allocation.height - 2 * FRAME_WIDTH; + priv->draw_width = allocation.width - 2 * GRAPH_FRAME_WIDTH; + priv->draw_height = allocation.height - 2 * GRAPH_FRAME_WIDTH; trg_torrent_graph_clear_background(g); @@ -256,9 +254,8 @@ trg_torrent_graph_expose(GtkWidget * widget, float *fp; gdouble sample_width, x_offset; - if (priv->background == NULL) { + if (priv->background == NULL) trg_torrent_graph_draw_background(g); - } window = gtk_widget_get_window(priv->disp); gtk_widget_get_allocation(priv->disp, &allocation); @@ -280,10 +277,10 @@ trg_torrent_graph_expose(GtkWidget * widget, cairo_set_line_width(cr, GRAPH_LINE_WIDTH); cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND); - cairo_rectangle(cr, priv->rmargin + priv->indent + FRAME_WIDTH + 1, - FRAME_WIDTH - 1, + cairo_rectangle(cr, priv->rmargin + priv->indent + GRAPH_FRAME_WIDTH + 1, + GRAPH_FRAME_WIDTH - 1, priv->draw_width - priv->rmargin - priv->indent - 1, - priv->real_draw_height + FRAME_WIDTH - 1); + priv->real_draw_height + GRAPH_FRAME_WIDTH - 1); cairo_clip(cr); for (j = 0; j < GRAPH_NUM_LINES; ++j) { @@ -394,12 +391,12 @@ static void trg_torrent_graph_update_net(TrgTorrentGraph * g) fp[1] = 1.0f * priv->in / priv->max; trg_strlspeed(speed, (gint64)(priv->out/1024)); - labelMarkup = g_markup_printf_escaped("<span font_size=\"small\" color=\""GRAPH_OUT_COLOR"\">Uploading: %s</span>", speed); + labelMarkup = g_markup_printf_escaped("<span font_size=\"small\" color=\""GRAPH_OUT_COLOR"\">%s: %s</span>", _("Total Uploading"), speed); gtk_label_set_markup(GTK_LABEL(priv->label_out), labelMarkup); g_free(labelMarkup); trg_strlspeed(speed, (gint64)(priv->in/1024)); - labelMarkup = g_markup_printf_escaped("<span font_size=\"small\" color=\""GRAPH_IN_COLOR"\">Downloading: %s</span>", speed); + labelMarkup = g_markup_printf_escaped("<span font_size=\"small\" color=\""GRAPH_IN_COLOR"\">%s: %s</span>", _("Total Downloading"), speed); gtk_label_set_markup(GTK_LABEL(priv->label_in), labelMarkup); g_free(labelMarkup); diff --git a/src/trg-torrent-move-dialog.c b/src/trg-torrent-move-dialog.c index 53d7264..77781c6 100644 --- a/src/trg-torrent-move-dialog.c +++ b/src/trg-torrent-move-dialog.c @@ -18,6 +18,7 @@ */ #include <string.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> @@ -92,17 +93,17 @@ static void trg_torrent_move_dialog_init(TrgTorrentMoveDialog * self) w = priv->location_combo = gtk_combo_box_entry_new_text(); g_signal_connect(w, "changed", G_CALLBACK(location_changed), self); - w = hig_workarea_add_row(t, &row, "Location:", w, NULL); + w = hig_workarea_add_row(t, &row, _("Location:"), w, NULL); priv->move_check = - hig_workarea_add_wide_checkbutton(t, &row, "Move", TRUE); + hig_workarea_add_wide_checkbutton(t, &row, _("Move"), TRUE); gtk_window_set_destroy_with_parent(GTK_WINDOW(self), TRUE); gtk_dialog_add_button(GTK_DIALOG(self), GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL); priv->move_button = - gtk_dialog_add_button(GTK_DIALOG(self), "Move", + gtk_dialog_add_button(GTK_DIALOG(self), _("Move"), GTK_RESPONSE_ACCEPT); gtk_widget_set_sensitive(priv->move_button, FALSE); @@ -150,10 +151,10 @@ TrgTorrentMoveDialog *trg_torrent_move_dialog_new(TrgMainWindow * win, gtk_combo_box_append_text(GTK_COMBO_BOX(priv->location_combo), current_location); gtk_combo_box_set_active(GTK_COMBO_BOX(priv->location_combo), 0); - msg = g_strdup_printf("Move %s", name); + msg = g_strdup_printf(_("Move %s"), name); g_free(name); } else { - msg = g_strdup_printf("Move %d torrents", count); + msg = g_strdup_printf(_("Move %d torrents"), count); } gtk_window_set_transient_for(GTK_WINDOW(obj), GTK_WINDOW(win)); diff --git a/src/trg-torrent-props-dialog.c b/src/trg-torrent-props-dialog.c index 6c8f19b..2b80aef 100644 --- a/src/trg-torrent-props-dialog.c +++ b/src/trg-torrent-props-dialog.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <json-glib/json-glib.h> @@ -169,26 +170,26 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, t = hig_workarea_create(); - hig_workarea_add_section_title(t, &row, "Bandwidth"); + hig_workarea_add_section_title(t, &row, _("Bandwidth")); w = priv->honor_limits_check = hig_workarea_add_wide_checkbutton(t, &row, - "Honor global limits", + _("Honor global limits"), torrent_get_honors_session_limits (json)); widget_set_json_key(w, FIELD_HONORS_SESSION_LIMITS); w = priv->bandwidthPriorityCombo = gtk_combo_box_new_text(); widget_set_json_key(w, FIELD_BANDWIDTH_PRIORITY); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Low"); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Normal"); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "High"); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Low")); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Normal")); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("High")); gtk_combo_box_set_active(GTK_COMBO_BOX(w), torrent_get_bandwidth_priority(json) + 1); - hig_workarea_add_row(t, &row, "Torrent priority:", w, NULL); + hig_workarea_add_row(t, &row, _("Torrent priority:"), w, NULL); tb = priv->down_limited_check = gtk_check_button_new_with_mnemonic - ("Limit download speed (Kbps)"); + (_("Limit download speed (Kbps)")); widget_set_json_key(tb, FIELD_DOWNLOAD_LIMITED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), torrent_get_download_limited(json)); @@ -201,7 +202,7 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, hig_workarea_add_row_w(t, &row, tb, w, NULL); tb = priv->up_limited_check = gtk_check_button_new_with_mnemonic - ("Limit upload speed (Kbps)"); + (_("Limit upload speed (Kbps)")); widget_set_json_key(tb, FIELD_UPLOAD_LIMITED); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tb), torrent_get_upload_limited(json)); @@ -213,17 +214,17 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, torrent_get_upload_limit(json)); hig_workarea_add_row_w(t, &row, tb, w, NULL); - hig_workarea_add_section_title(t, &row, "Seeding"); + hig_workarea_add_section_title(t, &row, _("Seeding")); w = priv->seedRatioMode = gtk_combo_box_new_text(); widget_set_json_key(GTK_WIDGET(w), FIELD_SEED_RATIO_MODE); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Use global settings"); - gtk_combo_box_append_text(GTK_COMBO_BOX(w), "Stop seeding at ratio"); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Use global settings")); + gtk_combo_box_append_text(GTK_COMBO_BOX(w), _("Stop seeding at ratio")); gtk_combo_box_append_text(GTK_COMBO_BOX(w), - "Seed regardless of ratio"); + _("Seed regardless of ratio")); gtk_combo_box_set_active(GTK_COMBO_BOX(w), torrent_get_seed_ratio_mode(json)); - hig_workarea_add_row(t, &row, "Seed ratio mode:", w, NULL); + hig_workarea_add_row(t, &row, _("Seed ratio mode:"), w, NULL); w = priv->seedRatioLimit = gtk_spin_button_new_with_range(0, INT_MAX, 0.2); @@ -231,18 +232,18 @@ static GtkWidget *trg_props_limitsPage(TrgTorrentPropsDialog * win, widget_set_json_key(GTK_WIDGET(w), FIELD_SEED_RATIO_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), torrent_get_seed_ratio_limit(json)); - hig_workarea_add_row(t, &row, "Seed ratio limit:", w, w); + hig_workarea_add_row(t, &row, _("Seed ratio limit:"), w, w); g_signal_connect(G_OBJECT(priv->seedRatioMode), "changed", G_CALLBACK(seed_ratio_mode_changed_cb), w); - hig_workarea_add_section_title(t, &row, "Peers"); + hig_workarea_add_section_title(t, &row, _("Peers")); w = priv->peer_limit_spin = gtk_spin_button_new_with_range(0, INT_MAX, 5); widget_set_json_key(GTK_WIDGET(w), FIELD_PEER_LIMIT); gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), torrent_get_peer_limit(json)); - hig_workarea_add_row(t, &row, "Peer limit:", w, w); + hig_workarea_add_row(t, &row, _("Peer limit:"), w, w); return t; } @@ -275,7 +276,7 @@ static GObject *trg_torrent_props_dialog_constructor(GType type, if (rowCount > 1) { gchar *windowTitle = - g_strdup_printf("Multiple (%d) torrent properties", + g_strdup_printf(_("Multiple (%d) torrent properties"), rowCount); gtk_window_set_title(GTK_WINDOW(object), windowTitle); g_free(windowTitle); @@ -309,7 +310,7 @@ static GObject *trg_torrent_props_dialog_constructor(GType type, gtk_notebook_append_page(GTK_NOTEBOOK(notebook), trg_props_limitsPage (TRG_TORRENT_PROPS_DIALOG(object), json), - gtk_label_new("Limits")); + gtk_label_new(_("Limits"))); gtk_container_set_border_width(GTK_CONTAINER(notebook), GUI_PAD); diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c index 4e37dd6..ee8cfd8 100644 --- a/src/trg-torrent-tree-view.c +++ b/src/trg-torrent-tree-view.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-tree-view.h" @@ -36,28 +37,28 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tv) { trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(tv), TORRENT_COLUMN_ICON, - TORRENT_COLUMN_NAME, "Name", 300); - trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), "Size", + TORRENT_COLUMN_NAME, _("Name"), 300); + trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), _("Size"), TORRENT_COLUMN_SIZE, -1); - trg_tree_view_add_prog_column(TRG_TREE_VIEW(tv), "Done", + trg_tree_view_add_prog_column(TRG_TREE_VIEW(tv), _("Done"), TORRENT_COLUMN_DONE, 70); - trg_tree_view_add_column(TRG_TREE_VIEW(tv), "Status", + trg_tree_view_add_column(TRG_TREE_VIEW(tv), _("Status"), TORRENT_COLUMN_STATUS); - trg_tree_view_add_column(TRG_TREE_VIEW(tv), "Seeds", + trg_tree_view_add_column(TRG_TREE_VIEW(tv), _("Seeds"), TORRENT_COLUMN_SEEDS); - trg_tree_view_add_column(TRG_TREE_VIEW(tv), "Leechers", + trg_tree_view_add_column(TRG_TREE_VIEW(tv), _("Leechers"), TORRENT_COLUMN_LEECHERS); - trg_tree_view_add_speed_column(TRG_TREE_VIEW(tv), "Down Speed", + trg_tree_view_add_speed_column(TRG_TREE_VIEW(tv), _("Down Speed"), TORRENT_COLUMN_DOWNSPEED, -1); - trg_tree_view_add_speed_column(TRG_TREE_VIEW(tv), "Up Speed", + trg_tree_view_add_speed_column(TRG_TREE_VIEW(tv), _("Up Speed"), TORRENT_COLUMN_UPSPEED, -1); - trg_tree_view_add_eta_column(TRG_TREE_VIEW(tv), "ETA", + trg_tree_view_add_eta_column(TRG_TREE_VIEW(tv), _("ETA"), TORRENT_COLUMN_ETA, -1); - trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), "Uploaded", + trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), _("Uploaded"), TORRENT_COLUMN_UPLOADED, -1); - trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), "Downloaded", + trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), _("Downloaded"), TORRENT_COLUMN_DOWNLOADED, -1); - trg_tree_view_add_ratio_column(TRG_TREE_VIEW(tv), "Ratio", + trg_tree_view_add_ratio_column(TRG_TREE_VIEW(tv), _("Ratio"), TORRENT_COLUMN_RATIO, -1); } diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index 3621987..5cedc67 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <glib/gi18n.h> #include <gtk/gtk.h> #include "trg-trackers-tree-view.h" @@ -148,7 +149,7 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(self), TRACKERCOL_ICON, - TRACKERCOL_TIER, "Tier", -1); + TRACKERCOL_TIER, _("Tier"), -1); priv->announceRenderer = gtk_cell_renderer_text_new(); g_signal_connect(priv->announceRenderer, "edited", @@ -161,7 +162,7 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) self); priv->announceColumn = - gtk_tree_view_column_new_with_attributes("Announce URL", + gtk_tree_view_column_new_with_attributes(_("Announce URL"), priv->announceRenderer, "text", TRACKERCOL_ANNOUNCE, @@ -171,7 +172,7 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) TRACKERCOL_ANNOUNCE, -1); gtk_tree_view_append_column(GTK_TREE_VIEW(self), priv->announceColumn); - trg_tree_view_add_column(TRG_TREE_VIEW(self), "Scrape URL", + trg_tree_view_add_column(TRG_TREE_VIEW(self), _("Scrape URL"), TRACKERCOL_SCRAPE); } @@ -247,7 +248,7 @@ view_popup_menu_add_only(GtkWidget * treeview, GdkEventButton * event, menu = gtk_menu_new(); menuitem = - trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), GTK_STOCK_ADD, TRUE); g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), treeview); @@ -268,13 +269,13 @@ view_popup_menu(GtkWidget * treeview, GdkEventButton * event, menu = gtk_menu_new(); menuitem = - trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Delete", + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Delete"), GTK_STOCK_DELETE, TRUE); g_signal_connect(menuitem, "activate", G_CALLBACK(delete_tracker), treeview); menuitem = - trg_menu_bar_item_new(GTK_MENU_SHELL(menu), "Add", GTK_STOCK_ADD, + trg_menu_bar_item_new(GTK_MENU_SHELL(menu), _("Add"), GTK_STOCK_ADD, TRUE); g_signal_connect(menuitem, "activate", G_CALLBACK(add_tracker), treeview); @@ -23,6 +23,7 @@ #include <math.h> #include <string.h> +#include <glib/gi18n.h> #include <glib-object.h> #include <curl/curl.h> #include <json-glib/json-glib.h> @@ -42,7 +43,7 @@ void trg_error_dialog(GtkWindow * parent, int status, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg); - gtk_window_set_title(GTK_WINDOW(dialog), "Error"); + gtk_window_set_title(GTK_WINDOW(dialog), _("Error")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); g_free((gpointer) msg); @@ -51,16 +52,16 @@ void trg_error_dialog(GtkWindow * parent, int status, const gchar *make_error_message(JsonObject * response, int status) { if (status == FAIL_JSON_DECODE) { - return g_strdup("JSON decoding error."); + return g_strdup(_("JSON decoding error.")); } else if (status == FAIL_RESPONSE_UNSUCCESSFUL) { const gchar *resultStr = json_object_get_string_member(response, "result"); if (resultStr == NULL) - return g_strdup("Server responded, but with no result."); + return g_strdup(_("Server responded, but with no result.")); else return g_strdup(resultStr); } else if (status <= -100) { - return g_strdup_printf("Request failed with HTTP code %d", + return g_strdup_printf(_("Request failed with HTTP code %d"), -(status + 100)); } else { return g_strdup(curl_easy_strerror(status)); @@ -123,7 +124,7 @@ char *tr_strlratio(char *buf, double ratio, size_t buflen) char *tr_strlsize(char *buf, guint64 size, size_t buflen) { if (!size) - g_strlcpy(buf, "None", buflen); + g_strlcpy(buf, _("None"), buflen); #if GLIB_CHECK_VERSION( 2, 16, 0 ) else { char *tmp = g_format_size_for_display(size); @@ -157,13 +158,13 @@ char *tr_strlspeed(char *buf, double kb_sec, size_t buflen) const double speed = kb_sec; if (speed < 1000.0) /* 0.0 KB to 999.9 KB */ - g_snprintf(buf, buflen, "%.1f KB/s", speed); + g_snprintf(buf, buflen, _("%.1f KB/s"), speed); else if (speed < 102400.0) /* 0.98 MB to 99.99 MB */ - g_snprintf(buf, buflen, "%.2f MB/s", (speed / KILOBYTE_FACTOR)); + g_snprintf(buf, buflen, _("%.2f MB/s"), (speed / KILOBYTE_FACTOR)); else if (speed < 1024000.0) /* 100.0 MB to 999.9 MB */ - g_snprintf(buf, buflen, "%.1f MB/s", (speed / MEGABYTE_FACTOR)); + g_snprintf(buf, buflen, _("%.1f MB/s"), (speed / MEGABYTE_FACTOR)); else /* insane speeds */ - g_snprintf(buf, buflen, "%.2f GB/s", (speed / GIGABYTE_FACTOR)); + g_snprintf(buf, buflen, _("%.2f GB/s"), (speed / GIGABYTE_FACTOR)); return buf; } @@ -197,12 +198,12 @@ char *tr_strltime_long(char *buf, gint64 seconds, size_t buflen) minutes = (seconds % 3600) / 60; seconds = (seconds % 3600) % 60; - g_snprintf(d, sizeof(d), days > 1 ? "%d days" : "%d day", days); - g_snprintf(h, sizeof(h), hours > 1 ? "%d hours" : "%d hour", hours); - g_snprintf(m, sizeof(m), minutes > 1 ? "%d minutes" : "%d minute", - minutes); + g_snprintf(d, sizeof(d), ngettext("%d days", "%d day", days), days); + g_snprintf(h, sizeof(h), ngettext("%d hours", "%d hour", hours), hours); + g_snprintf(m, sizeof(m), ngettext("%d minutes", "%d minute", + minutes), minutes); g_snprintf(s, sizeof(s), - seconds > 1 ? "%ld seconds" : "%ld second", seconds); + ngettext("%ld seconds", "%ld second", seconds), seconds); if (days) { if (days >= 4 || !hours) { |