[nautilus] Improvements to new translatable strings for batch renaming

[Piotr Drąg <piotrdrag src gnome org>]

commit 8ef1b6f2934eb49ca3923329d5ac749f5ec69de4
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Tue Aug 30 14:34:16 2016 +0200

    Improvements to new translatable strings for batch renaming

 src/nautilus-batch-rename-dialog.c               |    8 ++++----
 src/nautilus-file-undo-operations.c              |    4 ++--
 src/resources/ui/nautilus-batch-rename-dialog.ui |   10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index 6f56fe1..d98e497 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -144,7 +144,7 @@ add_numbering_order (GSimpleAction *action,
     if (g_strcmp0 (target_name, "name-ascending") == 0)
     {
         gtk_label_set_label (GTK_LABEL (dialog->numbering_order_label),
-                             _("Original name (Ascending)"));
+                             _("Original Name (Ascending)"));
         dialog->selection = nautilus_batch_rename_dialog_sort (dialog->selection,
                                                                ORIGINAL_ASCENDING,
                                                                NULL);
@@ -153,7 +153,7 @@ add_numbering_order (GSimpleAction *action,
     if (g_strcmp0 (target_name, "name-descending") == 0)
     {
         gtk_label_set_label (GTK_LABEL (dialog->numbering_order_label),
-                             _("Original name (Descending)"));
+                             _("Original Name (Descending)"));
         dialog->selection = nautilus_batch_rename_dialog_sort (dialog->selection,
                                                                ORIGINAL_DESCENDING,
                                                                NULL);
@@ -1201,13 +1201,13 @@ select_nth_conflict (NautilusBatchRenameDialog *dialog)
     if (name_occurences > 1)
     {
         g_string_append_printf (display_text,
-                                _("\"%s\" would not be a unique new name"),
+                                _("“%s” would not be a unique new name."),
                                 conflict_file_name->str);
     }
     else
     {
         g_string_append_printf (display_text,
-                                _("\"%s\" would conflict with an existing file."),
+                                _("“%s” would conflict with an existing file."),
                                 conflict_file_name->str);
     }
 
diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
index 5748d42..5ca65e7 100644
--- a/src/nautilus-file-undo-operations.c
+++ b/src/nautilus-file-undo-operations.c
@@ -1108,8 +1108,8 @@ batch_rename_strings_func (NautilusFileUndoInfo  *info,
     *redo_description = g_strdup_printf (_("Batch rename '%d' files"),
                                          g_list_length (self->priv->new_files));
 
-    *undo_label = g_strdup (_("_Undo Batch rename"));
-    *redo_label = g_strdup (_("_Redo Batch rename"));
+    *undo_label = g_strdup (_("_Undo Batch Rename"));
+    *redo_label = g_strdup (_("_Redo Batch Rename"));
 }
 
 static void
diff --git a/src/resources/ui/nautilus-batch-rename-dialog.ui 
b/src/resources/ui/nautilus-batch-rename-dialog.ui
index ab9cb41..51ef0b7 100644
--- a/src/resources/ui/nautilus-batch-rename-dialog.ui
+++ b/src/resources/ui/nautilus-batch-rename-dialog.ui
@@ -181,7 +181,7 @@
                                 <property name="visible">True</property>
                                 <property name="width-request">180</property>
                                 <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Original name 
(Ascending)</property>
+                                <property name="label" translatable="yes">Original Name 
(Ascending)</property>
                                 <property name="can_focus">False</property>
                               </object>
                             </child>
@@ -204,7 +204,7 @@
                   </object>
                   <packing>
                     <property name="name">format</property>
-                    <property name="title" translatable="yes">Format</property>
+                    <property name="title" translatable="yes" comments="Translators: This is a noun, not a 
verb">Format</property>
                   </packing>
                 </child>
                 <child>
@@ -275,7 +275,7 @@
                   </object>
                   <packing>
                     <property name="name">replace</property>
-                    <property name="title" translatable="yes">Replace</property>
+                    <property name="title" translatable="yes" context="title">Replace</property>
                   </packing>
                 </child>
               </object>
@@ -479,12 +479,12 @@
   <menu id="numbering_order_menu">
     <section>
       <item>
-        <attribute name="label" translatable="yes">Original name (Ascending) </attribute>
+        <attribute name="label" translatable="yes">Original Name (Ascending)</attribute>
         <attribute name="action">dialog.numbering-order-changed</attribute>
         <attribute name="target">name-ascending</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Original name (Descending)</attribute>
+        <attribute name="label" translatable="yes">Original Name (Descending)</attribute>
         <attribute name="action">dialog.numbering-order-changed</attribute>
         <attribute name="target">name-descending</attribute>
       </item>