From 770551f1ed2d0ad9dedc2bebf1c07f041dc47424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Mon, 9 Jul 2018 18:05:20 +0200
Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=9CUpdate=E2=80=9D=20to=20?=
 =?UTF-8?q?=E2=80=9CUpdate=20from=20Code=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 src/resources/menus.xrc   | 4 ++--
 src/resources/toolbar.xrc | 7 ++++---
 src/wx/main_toolbar.cpp   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/resources/menus.xrc b/src/resources/menus.xrc
index 2f2bd5d139..17ea6004d6 100644
--- 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
index cc524ae606..201d9f6777 100644
--- 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
index 86f3d08e2d..c975df600b 100644
--- 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__