diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp
index 41b0212..5d092f8 100644
--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
@@ -141,7 +141,7 @@
0
1
-
+ Quit this program
wxID_EXIT
wxITEM_NORMAL
E&xit
@@ -210,7 +210,7 @@
0
1
-
+ Select all text
wxID_SELECTALL
wxITEM_NORMAL
Select &All
@@ -229,7 +229,7 @@
Load From Icon Resource; send_composed.ico; [16; 16]
0
1
- Sends composed text to source window
+ Send composed text to source window
wxID_SEND_COMPOSED
wxITEM_NORMAL
&Send Composed
@@ -244,7 +244,7 @@
Load From Icon Resource; send_decomposed.ico; [16; 16]
0
1
- Sends decomposed text to source window
+ Send decomposed text to source window
wxID_SEND_DECOMPOSED
wxITEM_NORMAL
Send &Decomposed
@@ -259,7 +259,7 @@
Load From Icon Resource; send_abort.ico; [16; 16]
0
1
- Aborts composition and returns focus to source window
+ Abort composition and return focus to source window
wxID_SEND_ABORT
wxITEM_NORMAL
Abort (De)composition
@@ -282,7 +282,7 @@
wxID_ABOUT
wxITEM_NORMAL
- &About
+
m_menuItemAbout
none
@@ -379,7 +379,7 @@
Cut
m_toolEditCut
protected
- Cuts selected text and puts it on the clipboard
+ Cut selection
Cut
@@ -400,7 +400,7 @@
Copy
m_toolEditCopy
protected
- Copies selected text to the clipboard
+ Copy selection
Copy
@@ -421,7 +421,7 @@
Paste
m_toolEditPaste
protected
- Inserts text from the clipboard
+ Paste selection
Paste
@@ -445,7 +445,7 @@
Send Composed
m_toolSendComposed
protected
- Sends composed text to source window
+ Send composed text to source window
Send Composed
@@ -466,7 +466,7 @@
Send Decomposed
m_toolSendDecomposed
protected
- Sends decomposed text to source window
+ Send decomposed text to source window
Send Decomposed
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index 4938579..fc91876 100644
--- a/ZRCola/locale/sl_SI.po
+++ b/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"
-"PO-Revision-Date: 2016-04-08 12:59+0200\n"
+"POT-Creation-Date: 2016-04-08 13:13+0200\n"
+"PO-Revision-Date: 2016-04-08 13:13+0200\n"
"Last-Translator: Simon Rozman \n"
"Language-Team: Amebis, d. o. o., Kamnik \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"
-msgstr "Pošlje sestavljeno besedilo izvornemu oknu"
+msgid "Send composed text to source window"
+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"
-msgstr "Pošlje razstavljeno besedilo izvornemu oknu"
+msgid "Send decomposed text to source window"
+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"
-msgstr "Prekine sestavljanje in vrne fokus nazaj izvornemu oknu"
+msgid "Abort composition and return focus to source window"
+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"
-msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+msgid "Cut selection"
+msgstr "Izreži izbor"
#: zrcolagui.cpp:115
msgid "Copy"
msgstr "Kopiraj"
#: zrcolagui.cpp:115
-msgid "Copies selected text to the clipboard"
-msgstr "Kopira izbrano besedilo na odložišče"
+msgid "Copy selection"
+msgstr "Kopiraj izbor"
#: zrcolagui.cpp:117
msgid "Paste"
msgstr "Prilepi"
#: zrcolagui.cpp:117
-msgid "Inserts text from the clipboard"
-msgstr "Vstavi besedilo z odložišča"
+msgid "Paste selection"
+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"
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index 42d3010..b87940f 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/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();
diff --git a/output/locale/sl_SI/wxstd.mo b/output/locale/sl_SI/wxstd.mo
index 65953c3..2f613bf 100644
Binary files a/output/locale/sl_SI/wxstd.mo and b/output/locale/sl_SI/wxstd.mo differ
diff --git a/output/locale/sl_SI/wxstd.po b/output/locale/sl_SI/wxstd.po
index 1ffe67b..76d4dfc 100644
--- a/output/locale/sl_SI/wxstd.po
+++ b/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 \n"
"Language-Team: Simon Rozman \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)"