Rename “Update” to “Update from Code”

Rename the confusing toolbar button to mention (source) code. Since the menu item with the terminology too. Hopefully this will reduce misunderstandings of the button’s purpose.
c72578 · Jul 9, 2018 · 770551f · 770551f
1 parent e1f1495
commit 770551f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/resources/menus.xrc b/src/resources/menus.xrc
@@ -221,8 +221,8 @@
       <label>C_atalog</label>
       <style>wxMENU_TEAROFF</style>
       <object class="wxMenuItem" name="menu_update_from_src">
-        <label platform="win">_Update from sources</label>
-        <label platform="unix|mac">_Update from Sources</label>
+        <label platform="win">_Update from source code</label>
+        <label platform="unix|mac">_Update from Source Code</label>
       </object>
       <object class="wxMenuItem" name="menu_update_from_pot">
         <label platform="win">Update from _POT file…</label>

diff --git a/src/resources/toolbar.xrc b/src/resources/toolbar.xrc
@@ -29,8 +29,8 @@
       <label>Save</label>
       <tooltip>Save catalog</tooltip>
     </object>
-    <object class="separator" platform="unix"/>
-    <object class="separator" platform="win"/>
+
+    <object class="separator" platform="unix|win"/>
 
     <object class="tool" name="menu_validate">
       <bitmap stock_id="poedit-validate"/>
@@ -42,7 +42,8 @@
     <object class="tool" name="toolbar_update">
       <bitmap stock_id="poedit-update"/>
       <bitmap2 platform="win" stock_id="poedit-update@disabled"/>
-      <label>Update</label>
+      <label platform="win">Update from code</label>
+      <label platform="mac|unix">Update from Code</label>
       <tooltip>Update catalog - synchronize it with sources</tooltip>
     </object>
 

diff --git a/src/wx/main_toolbar.cpp b/src/wx/main_toolbar.cpp
@@ -80,7 +80,7 @@ class WXMainToolbar : public MainToolbar
         }
         else
         {
-            tool->SetLabel(_("Update"));
+            tool->SetLabel(MSW_OR_OTHER(_("Update from code"), _("Update from Code")));
             tool->SetShortHelp(_("Update catalog - synchronize it with sources"));
             m_tb->SetToolNormalBitmap(m_idUpdate, wxArtProvider::GetBitmap("poedit-update", wxART_TOOLBAR));
             #ifdef __WXMSW__