GNOME.org
 

[file-roller] disambiguate translatable strings adding context

commit 44b3677b7c88595c2e91210df097ae452a47502f
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Aug 17 10:08:50 2016 +0200

    disambiguate translatable strings adding context
    
    [bug #696838]

 src/dlg-add.c                     |   10 +++++-----
 src/dlg-extract.c                 |    2 +-
 src/fr-application.c              |    6 +++---
 src/fr-window-actions-callbacks.c |    2 +-
 src/fr-window.c                   |    6 +++---
 src/ui/extract-dialog-options.ui  |    2 +-
 src/ui/menus.ui                   |    6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/dlg-add.c b/src/dlg-add.c
index 9eeada4..d34a36b 100644
--- a/src/dlg-add.c
+++ b/src/dlg-add.c
@@ -179,7 +179,7 @@ dlg_add (FrWindow *window)
        data = g_new0 (DialogData, 1);
        data->settings = g_settings_new (FILE_ROLLER_SCHEMA_ADD);
        data->window = window;
-       data->dialog = fr_file_selector_dialog_new (_("Add Files"), GTK_WINDOW (data->window));
+       data->dialog = fr_file_selector_dialog_new (C_("Window title", "Add Files"), GTK_WINDOW 
(data->window));
        gtk_dialog_set_default_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_OK);
 
        g_object_get (data->dialog, "use-header-bar", &use_header, NULL);
@@ -201,14 +201,14 @@ dlg_add (FrWindow *window)
 
        /* load options */
 
-       menu_item = gtk_menu_item_new_with_label (_("Load Options"));
+       menu_item = gtk_menu_item_new_with_label (C_("Action", "Load Options"));
        gtk_widget_show (menu_item);
        g_signal_connect (menu_item, "activate", G_CALLBACK (load_options_activate_cb), data);
        gtk_menu_shell_append (GTK_MENU_SHELL (options_menu), menu_item);
 
        /* save options */
 
-       menu_item = gtk_menu_item_new_with_label (_("Save Options"));
+       menu_item = gtk_menu_item_new_with_label (C_("Action", "Save Options"));
        gtk_widget_show (menu_item);
        g_signal_connect (menu_item, "activate", G_CALLBACK (save_options_activate_cb), data);
        gtk_menu_shell_append (GTK_MENU_SHELL (options_menu), menu_item);
@@ -760,7 +760,7 @@ load_options_activate_cb (GtkMenuItem *menu_item,
        /* Get the widgets. */
 
        aod_data->dialog = g_object_new (GTK_TYPE_DIALOG,
-                                        "title", _("Load Options"),
+                                        "title", C_("Window title", "Load Options"),
                                         "modal", TRUE,
                                         "use-header-bar", _gtk_settings_get_dialogs_use_header (),
                                         NULL);
@@ -852,7 +852,7 @@ save_options_activate_cb (GtkMenuItem *menu_item,
 
        opt_filename = _gtk_request_dialog_run (GTK_WINDOW (data->dialog),
                                                GTK_DIALOG_MODAL,
-                                               _("Save Options"),
+                                               C_("Window title", "Save Options"),
                                                _("_Options Name:"),
                                                (data->last_options != NULL) ? data->last_options : "",
                                                1024,
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 4457c1e..361417d 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -276,7 +276,7 @@ dlg_extract__common (FrWindow *window,
        data->base_dir_for_selection = base_dir_for_selection;
        data->extract_clicked = FALSE;
 
-       data->dialog = gtk_file_chooser_dialog_new (_("Extract"),
+       data->dialog = gtk_file_chooser_dialog_new (C_("Window title", "Extract"),
                                                    GTK_WINDOW (data->window),
                                                    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
                                                    _GTK_LABEL_CANCEL, GTK_RESPONSE_CANCEL,
diff --git a/src/fr-application.c b/src/fr-application.c
index ad00f2d..06d86a1 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -295,7 +295,7 @@ handle_method_call (GDBusConnection       *connection,
                g_signal_connect (window, "progress", G_CALLBACK (window_progress_cb), connection);
                g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation);
 
-               fr_window_batch_new (FR_WINDOW (window), _("Extract archive"));
+               fr_window_batch_new (FR_WINDOW (window), C_("Window title", "Extract archive"));
                fr_window_batch__extract (FR_WINDOW (window), archive, destination);
                fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
                fr_window_batch_start (FR_WINDOW (window));
@@ -321,7 +321,7 @@ handle_method_call (GDBusConnection       *connection,
                g_signal_connect (window, "progress", G_CALLBACK (window_progress_cb), connection);
                g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation);
 
-               fr_window_batch_new (FR_WINDOW (window), _("Extract archive"));
+               fr_window_batch_new (FR_WINDOW (window), C_("Window title", "Extract archive"));
                fr_window_batch__extract_here (FR_WINDOW (window), archive);
                fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL);
                fr_window_batch_start (FR_WINDOW (window));
@@ -594,7 +594,7 @@ fr_application_command_line (GApplication            *application,
 
                fr_window_set_notify (FR_WINDOW (window), arg_notify);
 
-               fr_window_batch_new (FR_WINDOW (window), _("Extract archive"));
+               fr_window_batch_new (FR_WINDOW (window), C_("Window title", "Extract archive"));
                while ((archive = remaining_args[i++]) != NULL) {
                        GFile *file;
 
diff --git a/src/fr-window-actions-callbacks.c b/src/fr-window-actions-callbacks.c
index 95c6df1..a5319d8 100644
--- a/src/fr-window-actions-callbacks.c
+++ b/src/fr-window-actions-callbacks.c
@@ -286,7 +286,7 @@ fr_window_activate_open (GSimpleAction *action,
        GtkFileFilter *filter;
        int            i;
 
-       file_sel = gtk_file_chooser_dialog_new (_("Open"),
+       file_sel = gtk_file_chooser_dialog_new (C_("Window title", "Open"),
                                                GTK_WINDOW (window),
                                                GTK_FILE_CHOOSER_ACTION_OPEN,
                                                _GTK_LABEL_CANCEL, GTK_RESPONSE_CANCEL,
diff --git a/src/fr-window.c b/src/fr-window.c
index fd161b7..4083a16 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -5762,11 +5762,11 @@ fr_window_construct (FrWindow *window)
 
        header_bar_size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
-       button = _gtk_header_bar_create_text_button (_("Extract"), NULL, "win.extract-files");
+       button = _gtk_header_bar_create_text_button (C_("Action", "Extract"), NULL, "win.extract-files");
        gtk_size_group_add_widget (header_bar_size_group, button);
        gtk_header_bar_pack_start (GTK_HEADER_BAR (window->priv->headerbar), button);
 
-       button = _gtk_header_bar_create_image_button ("list-add-symbolic", _("Add Files"), "win.add-files");
+       button = _gtk_header_bar_create_image_button ("list-add-symbolic", C_("Action", "Add Files"), 
"win.add-files");
        gtk_size_group_add_widget (header_bar_size_group, button);
        gtk_header_bar_pack_start (GTK_HEADER_BAR (window->priv->headerbar), button);
 
@@ -6229,7 +6229,7 @@ _fr_window_notify_creation_complete (FrWindow *window)
        if (notification_supports_actions) {
                notify_notification_add_action (notification,
                                                "document-open-symbolic",
-                                               _("Open"),
+                                               C_("Action", "Open"),
                                                notify_action_open_archive_cb,
                                                g_object_ref (window->priv->saving_file),
                                                g_object_unref);
diff --git a/src/ui/extract-dialog-options.ui b/src/ui/extract-dialog-options.ui
index c284ce7..fa423d3 100644
--- a/src/ui/extract-dialog-options.ui
+++ b/src/ui/extract-dialog-options.ui
@@ -17,7 +17,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Extract</property>
+            <property name="label" translatable="yes" context="Action">Extract</property>
             <property name="xalign">0</property>
             <attributes>
               <attribute name="weight" value="bold"/>
diff --git a/src/ui/menus.ui b/src/ui/menus.ui
index cf90f5c..69b33f2 100644
--- a/src/ui/menus.ui
+++ b/src/ui/menus.ui
@@ -4,7 +4,7 @@
   <menu id="file-popup">
     <section>
       <item>
-        <attribute name="label" translatable="yes">Open</attribute>
+        <attribute name="label" translatable="yes" context="Action">Open</attribute>
         <attribute name="action">win.view-selection</attribute>
       </item>
       <item>
@@ -44,7 +44,7 @@
   <menu id="folder-popup">
     <section>
       <item>
-        <attribute name="label" translatable="yes">Open</attribute>
+        <attribute name="label" translatable="yes" context="Action">Open</attribute>
         <attribute name="action">win.open-folder</attribute>
       </item>
     </section>
@@ -80,7 +80,7 @@
   <menu id="sidebar-popup">
     <section>
       <item>
-        <attribute name="label" translatable="yes">Open</attribute>
+        <attribute name="label" translatable="yes" context="Action">Open</attribute>
         <attribute name="action">win.sidebar-open-folder</attribute>
       </item>
     </section>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]