GUI aligned with stock text

ZRCola/ZRCola.fbp

@@ -141,7 +141,7 @@
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
+                        <property name="help">Quit this program</property>
                         <property name="id">wxID_EXIT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">E&amp;xit</property>
@@ -210,7 +210,7 @@
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help"></property>
+                        <property name="help">Select all text</property>
                         <property name="id">wxID_SELECTALL</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Select &amp;All</property>
@@ -229,7 +229,7 @@
                         <property name="bitmap">Load From Icon Resource; send_composed.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Sends composed text to source window</property>
+                        <property name="help">Send composed text to source window</property>
                         <property name="id">wxID_SEND_COMPOSED</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">&amp;Send Composed</property>
@@ -244,7 +244,7 @@
                         <property name="bitmap">Load From Icon Resource; send_decomposed.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Sends decomposed text to source window</property>
+                        <property name="help">Send decomposed text to source window</property>
                         <property name="id">wxID_SEND_DECOMPOSED</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Send &amp;Decomposed</property>
@@ -259,7 +259,7 @@
                         <property name="bitmap">Load From Icon Resource; send_abort.ico; [16; 16]</property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Aborts composition and returns focus to source window</property>
+                        <property name="help">Abort composition and return focus to source window</property>
                         <property name="id">wxID_SEND_ABORT</property>
                         <property name="kind">wxITEM_NORMAL</property>
                         <property name="label">Abort (De)composition</property>
@@ -282,7 +282,7 @@
                         <property name="help"></property>
                         <property name="id">wxID_ABOUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">&amp;About</property>
+                        <property name="label"></property>
                         <property name="name">m_menuItemAbout</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
@@ -379,7 +379,7 @@
                     <property name="label">Cut</property>
                     <property name="name">m_toolEditCut</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Cuts selected text and puts it on the clipboard</property>
+                    <property name="statusbar">Cut selection</property>
                     <property name="tooltip">Cut</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -400,7 +400,7 @@
                     <property name="label">Copy</property>
                     <property name="name">m_toolEditCopy</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Copies selected text to the clipboard</property>
+                    <property name="statusbar">Copy selection</property>
                     <property name="tooltip">Copy</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -421,7 +421,7 @@
                     <property name="label">Paste</property>
                     <property name="name">m_toolEditPaste</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Inserts text from the clipboard</property>
+                    <property name="statusbar">Paste selection</property>
                     <property name="tooltip">Paste</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -445,7 +445,7 @@
                     <property name="label">Send Composed</property>
                     <property name="name">m_toolSendComposed</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Sends composed text to source window</property>
+                    <property name="statusbar">Send composed text to source window</property>
                     <property name="tooltip">Send Composed</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -466,7 +466,7 @@
                     <property name="label">Send Decomposed</property>
                     <property name="name">m_toolSendDecomposed</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Sends decomposed text to source window</property>
+                    <property name="statusbar">Send decomposed text to source window</property>
                     <property name="tooltip">Send Decomposed</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>

ZRCola/locale/sl_SI.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-04-08 12:59+0200\n"
+"POT-Creation-Date: 2016-04-08 13:13+0200\n"
-"PO-Revision-Date: 2016-04-08 12:59+0200\n"
+"PO-Revision-Date: 2016-04-08 13:13+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: sl_SI\n"
@@ -54,6 +54,10 @@ msgstr "O ZRColi"
 msgid "E&xit"
 msgstr "I&zhod"
 
+#: zrcolagui.cpp:32
+msgid "Quit this program"
+msgstr "Zapri ta program"
+
 #: zrcolagui.cpp:35
 msgid "&Program"
 msgstr "&Program"
@@ -62,38 +66,38 @@ msgstr "&Program"
 msgid "Select &All"
 msgstr "Izberi &vse"
 
+#: zrcolagui.cpp:68
+msgid "Select all text"
+msgstr "Izberi celotno besedilo"
+
 #: zrcolagui.cpp:74
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
 #: zrcolagui.cpp:74 zrcolagui.cpp:121
-msgid "Sends composed text to source window"
+msgid "Send composed text to source window"
-msgstr "Pošlje sestavljeno besedilo izvornemu oknu"
+msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
 #: zrcolagui.cpp:83
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
 #: zrcolagui.cpp:83 zrcolagui.cpp:123
-msgid "Sends decomposed text to source window"
+msgid "Send decomposed text to source window"
-msgstr "Pošlje razstavljeno besedilo izvornemu oknu"
+msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
 #: zrcolagui.cpp:92
 msgid "Abort (De)composition"
 msgstr "Prekini raz/sestavljanje"
 
 #: zrcolagui.cpp:92
-msgid "Aborts composition and returns focus to source window"
+msgid "Abort composition and return focus to source window"
-msgstr "Prekine sestavljanje in vrne fokus nazaj izvornemu oknu"
+msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 
 #: zrcolagui.cpp:100
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: zrcolagui.cpp:104
-msgid "&About"
-msgstr "O progr&amu"
-
 #: zrcolagui.cpp:107
 msgid "&Help"
 msgstr "&Pomoč"
@@ -103,24 +107,24 @@ msgid "Cut"
 msgstr "Izreži"
 
 #: zrcolagui.cpp:113
-msgid "Cuts selected text and puts it on the clipboard"
+msgid "Cut selection"
-msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+msgstr "Izreži izbor"
 
 #: zrcolagui.cpp:115
 msgid "Copy"
 msgstr "Kopiraj"
 
 #: zrcolagui.cpp:115
-msgid "Copies selected text to the clipboard"
+msgid "Copy selection"
-msgstr "Kopira izbrano besedilo na odložišče"
+msgstr "Kopiraj izbor"
 
 #: zrcolagui.cpp:117
 msgid "Paste"
 msgstr "Prilepi"
 
 #: zrcolagui.cpp:117
-msgid "Inserts text from the clipboard"
+msgid "Paste selection"
-msgstr "Vstavi besedilo z odložišča"
+msgstr "Prilepi izbor"
 
 #: zrcolagui.cpp:121
 msgid "Send Composed"
@@ -152,6 +156,18 @@ msgstr "1250"
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
 
+#~ msgid "&About"
+#~ msgstr "O progr&amu"
+
+#~ msgid "Cuts selected text and puts it on the clipboard"
+#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#~ msgid "Copies selected text to the clipboard"
+#~ msgstr "Kopira izbrano besedilo na odložišče"
+
+#~ msgid "Inserts text from the clipboard"
+#~ msgstr "Vstavi besedilo z odložišča"
+
 #~ msgid "&Copy"
 #~ msgstr "&Kopiraj"
 

ZRCola/zrcolagui.cpp

@@ -29,7 +29,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menubar = new wxMenuBar( 0 );
 	m_menuProgram = new wxMenu();
 	wxMenuItem* m_menuItemExit;
-	m_menuItemExit = new wxMenuItem( m_menuProgram, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), wxEmptyString, wxITEM_NORMAL );
+	m_menuItemExit = new wxMenuItem( m_menuProgram, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), _("Quit this program"), wxITEM_NORMAL );
 	m_menuProgram->Append( m_menuItemExit );
 	
 	m_menubar->Append( m_menuProgram, _("&Program") ); 
@@ -65,13 +65,13 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->AppendSeparator();
 	
 	wxMenuItem* m_menuSelectAll;
-	m_menuSelectAll = new wxMenuItem( m_menuEdit, wxID_SELECTALL, wxString( _("Select &All") ) + wxT('\t') + wxT("Ctrl+A"), wxEmptyString, wxITEM_NORMAL );
+	m_menuSelectAll = new wxMenuItem( m_menuEdit, wxID_SELECTALL, wxString( _("Select &All") ) + wxT('\t') + wxT("Ctrl+A"), _("Select all text"), wxITEM_NORMAL );
 	m_menuEdit->Append( m_menuSelectAll );
 	
 	m_menuEdit->AppendSeparator();
 	
 	wxMenuItem* m_menuItemSendComposed;
-	m_menuItemSendComposed = new wxMenuItem( m_menuEdit, wxID_SEND_COMPOSED, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Sends composed text to source window"), wxITEM_NORMAL );
+	m_menuItemSendComposed = new wxMenuItem( m_menuEdit, wxID_SEND_COMPOSED, wxString( _("&Send Composed") ) + wxT('\t') + wxT("F5"), _("Send composed text to source window"), wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemSendComposed->SetBitmaps( wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -80,7 +80,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemSendComposed );
 	
 	wxMenuItem* m_menuItemSendDecomposed;
-	m_menuItemSendDecomposed = new wxMenuItem( m_menuEdit, wxID_SEND_DECOMPOSED, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Sends decomposed text to source window"), wxITEM_NORMAL );
+	m_menuItemSendDecomposed = new wxMenuItem( m_menuEdit, wxID_SEND_DECOMPOSED, wxString( _("Send &Decomposed") ) + wxT('\t') + wxT("F6"), _("Send decomposed text to source window"), wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemSendDecomposed->SetBitmaps( wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -89,7 +89,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->Append( m_menuItemSendDecomposed );
 	
 	wxMenuItem* m_menuItemSendAbort;
-	m_menuItemSendAbort = new wxMenuItem( m_menuEdit, wxID_SEND_ABORT, wxString( _("Abort (De)composition") ) + wxT('\t') + wxT("Esc"), _("Aborts composition and returns focus to source window"), wxITEM_NORMAL );
+	m_menuItemSendAbort = new wxMenuItem( m_menuEdit, wxID_SEND_ABORT, wxString( _("Abort (De)composition") ) + wxT('\t') + wxT("Esc"), _("Abort composition and return focus to source window"), wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	m_menuItemSendAbort->SetBitmaps( wxIcon( wxT("send_abort.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
 	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
@@ -101,7 +101,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_menuHelp = new wxMenu();
 	wxMenuItem* m_menuItemAbout;
-	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuHelp->Append( m_menuItemAbout );
 	
 	m_menubar->Append( m_menuHelp, _("&Help") ); 
@@ -110,17 +110,17 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	m_toolbar = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY );
 	m_toolbar->SetToolBitmapSize( wxSize( 16,16 ) );
-	m_toolEditCut = m_toolbar->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cuts selected text and puts it on the clipboard"), NULL ); 
+	m_toolEditCut = m_toolbar->AddTool( wxID_CUT, _("Cut"), wxIcon( wxT("edit_cut.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Cut"), _("Cut selection"), NULL ); 
 	
-	m_toolEditCopy = m_toolbar->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copies selected text to the clipboard"), NULL ); 
+	m_toolEditCopy = m_toolbar->AddTool( wxID_COPY, _("Copy"), wxIcon( wxT("edit_copy.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Copy"), _("Copy selection"), NULL ); 
 	
-	m_toolEditPaste = m_toolbar->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Inserts text from the clipboard"), NULL ); 
+	m_toolEditPaste = m_toolbar->AddTool( wxID_PASTE, _("Paste"), wxIcon( wxT("edit_paste.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Paste"), _("Paste selection"), NULL ); 
 	
 	m_toolbar->AddSeparator(); 
 	
-	m_toolSendComposed = m_toolbar->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Sends composed text to source window"), NULL ); 
+	m_toolSendComposed = m_toolbar->AddTool( wxID_SEND_COMPOSED, _("Send Composed"), wxIcon( wxT("send_composed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); 
 	
-	m_toolSendDecomposed = m_toolbar->AddTool( wxID_SEND_DECOMPOSED, _("Send Decomposed"), wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Sends decomposed text to source window"), NULL ); 
+	m_toolSendDecomposed = m_toolbar->AddTool( wxID_SEND_DECOMPOSED, _("Send Decomposed"), wxIcon( wxT("send_decomposed.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); 
 	
 	m_toolbar->Realize(); 
 	

output/locale/sl_SI/wxstd.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: wxWidgets 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-02 15:21+0100\n"
-"PO-Revision-Date: 2016-03-14 17:12+0100\n"
+"PO-Revision-Date: 2016-04-08 13:05+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language: sl_SI\n"
@@ -2955,7 +2955,7 @@ msgstr "Izreži"
 # generic/dirdlgg.cpp:191
 #: ../src/common/stockitem.cpp:259
 msgid "Cut selection"
-msgstr "Prilepi izbor"
+msgstr "Izreži izbor"
 
 #: ../src/common/fmapbase.cpp:152
 msgid "Cyrillic (ISO-8859-5)"