From 986deb3fef74046d79dca579041b14dc79e5ef62 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 24 May 2016 21:40:49 +0200 Subject: [PATCH] Text update --- Updater/locale/Updater.pot | 50 +++++++++++++++++------------------ Updater/locale/de_DE.po | 52 ++++++++++++++++++------------------ Updater/locale/ru_RU.po | 52 ++++++++++++++++++------------------ Updater/locale/sl_SI.po | 54 +++++++++++++++++++------------------- Updater/src/chkthread.cpp | 2 +- 5 files changed, 105 insertions(+), 105 deletions(-) diff --git a/Updater/locale/Updater.pot b/Updater/locale/Updater.pot index 2324743..2d9a065 100644 --- a/Updater/locale/Updater.pot +++ b/Updater/locale/Updater.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Updater\n" -"POT-Creation-Date: 2016-05-24 15:34+0200\n" +"POT-Creation-Date: 2016-05-24 17:24+0200\n" "PO-Revision-Date: 2016-02-06 09:04+0100\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -18,104 +18,104 @@ msgstr "" "X-Poedit-SearchPath-0: src\n" "X-Poedit-SearchPath-1: include\n" -#: src/chkthread.cpp:79 src/chkthread.cpp:92 +#: src/chkthread.cpp:100 src/chkthread.cpp:113 msgid "Update check complete. Your product is up to date." msgstr "" -#: src/chkthread.cpp:112 +#: src/chkthread.cpp:133 msgid "Downloading repository catalogue..." msgstr "" -#: src/chkthread.cpp:120 +#: src/chkthread.cpp:141 #, c-format msgid "Contacting repository at %s..." msgstr "" -#: src/chkthread.cpp:128 +#: src/chkthread.cpp:149 #, c-format msgid "Error resolving %s server name." msgstr "" -#: src/chkthread.cpp:133 +#: src/chkthread.cpp:154 msgid "Repository did not change since the last time." msgstr "" -#: src/chkthread.cpp:137 +#: src/chkthread.cpp:158 #, c-format msgid "Error response received from server %s (port %u) requesting %s." msgstr "" -#: src/chkthread.cpp:145 +#: src/chkthread.cpp:166 msgid "Error loading repository catalogue." msgstr "" -#: src/chkthread.cpp:155 +#: src/chkthread.cpp:176 msgid "Verifying repository catalogue signature..." msgstr "" -#: src/chkthread.cpp:186 +#: src/chkthread.cpp:207 msgid "Signature not found in the repository catalogue." msgstr "" -#: src/chkthread.cpp:208 +#: src/chkthread.cpp:229 msgid "Repository catalogue signature does not match its content, or signature verification failed." msgstr "" -#: src/chkthread.cpp:216 +#: src/chkthread.cpp:237 #, c-format msgid "Invalid root element in repository catalogue (actual: %s, expected: %s)." msgstr "" -#: src/chkthread.cpp:234 +#: src/chkthread.cpp:255 msgid "Parsing repository catalogue..." msgstr "" -#: src/chkthread.cpp:319 +#: src/chkthread.cpp:340 #, c-format msgid "Update package found (version: %s)." msgstr "" -#: src/chkthread.cpp:377 +#: src/chkthread.cpp:398 msgid "Reading update package meta-information from cache failed or incomplete." msgstr "" -#: src/chkthread.cpp:399 +#: src/chkthread.cpp:421 msgid "Update package file already downloaded." msgstr "" -#: src/chkthread.cpp:406 +#: src/chkthread.cpp:429 #, c-format msgid "Can not open/create %s file for writing." msgstr "" -#: src/chkthread.cpp:426 +#: src/chkthread.cpp:449 #, c-format msgid "Downloading update package from %s..." msgstr "" -#: src/chkthread.cpp:429 +#: src/chkthread.cpp:452 msgid "Error response received." msgstr "" -#: src/chkthread.cpp:448 +#: src/chkthread.cpp:471 #, c-format msgid "Can not write to %s file." msgstr "" -#: src/chkthread.cpp:462 +#: src/chkthread.cpp:485 msgid "Update package file corrupt." msgstr "" -#: src/chkthread.cpp:471 +#: src/chkthread.cpp:494 msgid "Launching update..." msgstr "" -#: src/chkthread.cpp:491 +#: src/chkthread.cpp:513 #, c-format -msgid "msiexec.exe launch succeeded. For further information, see %s file." +msgid "msiexec.exe launch succeeded. For detailed information, see %s file." msgstr "" -#: src/chkthread.cpp:494 +#: src/chkthread.cpp:516 #, c-format msgid "msiexec.exe launch failed. ShellExecute returned %i." msgstr "" diff --git a/Updater/locale/de_DE.po b/Updater/locale/de_DE.po index 133e07f..516534e 100644 --- a/Updater/locale/de_DE.po +++ b/Updater/locale/de_DE.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Updater\n" -"POT-Creation-Date: 2016-05-24 15:35+0200\n" -"PO-Revision-Date: 2016-05-24 15:35+0200\n" +"POT-Creation-Date: 2016-05-24 17:25+0200\n" +"PO-Revision-Date: 2016-05-24 17:26+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: de_DE\n" @@ -15,108 +15,108 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" -#: src/chkthread.cpp:79 src/chkthread.cpp:92 +#: src/chkthread.cpp:100 src/chkthread.cpp:113 msgid "Update check complete. Your product is up to date." msgstr "" -#: src/chkthread.cpp:112 +#: src/chkthread.cpp:133 msgid "Downloading repository catalogue..." msgstr "" -#: src/chkthread.cpp:120 +#: src/chkthread.cpp:141 #, c-format msgid "Contacting repository at %s..." msgstr "" -#: src/chkthread.cpp:128 +#: src/chkthread.cpp:149 #, c-format msgid "Error resolving %s server name." msgstr "" -#: src/chkthread.cpp:133 +#: src/chkthread.cpp:154 msgid "Repository did not change since the last time." msgstr "" -#: src/chkthread.cpp:137 +#: src/chkthread.cpp:158 #, c-format msgid "Error response received from server %s (port %u) requesting %s." msgstr "" -#: src/chkthread.cpp:145 +#: src/chkthread.cpp:166 msgid "Error loading repository catalogue." msgstr "" -#: src/chkthread.cpp:155 +#: src/chkthread.cpp:176 msgid "Verifying repository catalogue signature..." msgstr "" -#: src/chkthread.cpp:186 +#: src/chkthread.cpp:207 msgid "Signature not found in the repository catalogue." msgstr "" -#: src/chkthread.cpp:208 +#: src/chkthread.cpp:229 msgid "" "Repository catalogue signature does not match its content, or signature " "verification failed." msgstr "" -#: src/chkthread.cpp:216 +#: src/chkthread.cpp:237 #, c-format msgid "" "Invalid root element in repository catalogue (actual: %s, expected: %s)." msgstr "" -#: src/chkthread.cpp:234 +#: src/chkthread.cpp:255 msgid "Parsing repository catalogue..." msgstr "" -#: src/chkthread.cpp:319 +#: src/chkthread.cpp:340 #, c-format msgid "Update package found (version: %s)." msgstr "" -#: src/chkthread.cpp:377 +#: src/chkthread.cpp:398 msgid "" "Reading update package meta-information from cache failed or incomplete." msgstr "" -#: src/chkthread.cpp:399 +#: src/chkthread.cpp:421 msgid "Update package file already downloaded." msgstr "" -#: src/chkthread.cpp:406 +#: src/chkthread.cpp:429 #, c-format msgid "Can not open/create %s file for writing." msgstr "" -#: src/chkthread.cpp:426 +#: src/chkthread.cpp:449 #, c-format msgid "Downloading update package from %s..." msgstr "" -#: src/chkthread.cpp:429 +#: src/chkthread.cpp:452 msgid "Error response received." msgstr "" -#: src/chkthread.cpp:448 +#: src/chkthread.cpp:471 #, c-format msgid "Can not write to %s file." msgstr "" -#: src/chkthread.cpp:462 +#: src/chkthread.cpp:485 msgid "Update package file corrupt." msgstr "" -#: src/chkthread.cpp:471 +#: src/chkthread.cpp:494 msgid "Launching update..." msgstr "" -#: src/chkthread.cpp:491 +#: src/chkthread.cpp:513 #, c-format -msgid "msiexec.exe launch succeeded. For further information, see %s file." +msgid "msiexec.exe launch succeeded. For detailed information, see %s file." msgstr "" -#: src/chkthread.cpp:494 +#: src/chkthread.cpp:516 #, c-format msgid "msiexec.exe launch failed. ShellExecute returned %i." msgstr "" diff --git a/Updater/locale/ru_RU.po b/Updater/locale/ru_RU.po index 129d2f3..08f2698 100644 --- a/Updater/locale/ru_RU.po +++ b/Updater/locale/ru_RU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Updater\n" -"POT-Creation-Date: 2016-05-24 15:35+0200\n" -"PO-Revision-Date: 2016-05-24 15:35+0200\n" +"POT-Creation-Date: 2016-05-24 17:25+0200\n" +"PO-Revision-Date: 2016-05-24 17:25+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: ru_RU\n" @@ -16,108 +16,108 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" -#: src/chkthread.cpp:79 src/chkthread.cpp:92 +#: src/chkthread.cpp:100 src/chkthread.cpp:113 msgid "Update check complete. Your product is up to date." msgstr "" -#: src/chkthread.cpp:112 +#: src/chkthread.cpp:133 msgid "Downloading repository catalogue..." msgstr "" -#: src/chkthread.cpp:120 +#: src/chkthread.cpp:141 #, c-format msgid "Contacting repository at %s..." msgstr "" -#: src/chkthread.cpp:128 +#: src/chkthread.cpp:149 #, c-format msgid "Error resolving %s server name." msgstr "" -#: src/chkthread.cpp:133 +#: src/chkthread.cpp:154 msgid "Repository did not change since the last time." msgstr "" -#: src/chkthread.cpp:137 +#: src/chkthread.cpp:158 #, c-format msgid "Error response received from server %s (port %u) requesting %s." msgstr "" -#: src/chkthread.cpp:145 +#: src/chkthread.cpp:166 msgid "Error loading repository catalogue." msgstr "" -#: src/chkthread.cpp:155 +#: src/chkthread.cpp:176 msgid "Verifying repository catalogue signature..." msgstr "" -#: src/chkthread.cpp:186 +#: src/chkthread.cpp:207 msgid "Signature not found in the repository catalogue." msgstr "" -#: src/chkthread.cpp:208 +#: src/chkthread.cpp:229 msgid "" "Repository catalogue signature does not match its content, or signature " "verification failed." msgstr "" -#: src/chkthread.cpp:216 +#: src/chkthread.cpp:237 #, c-format msgid "" "Invalid root element in repository catalogue (actual: %s, expected: %s)." msgstr "" -#: src/chkthread.cpp:234 +#: src/chkthread.cpp:255 msgid "Parsing repository catalogue..." msgstr "" -#: src/chkthread.cpp:319 +#: src/chkthread.cpp:340 #, c-format msgid "Update package found (version: %s)." msgstr "" -#: src/chkthread.cpp:377 +#: src/chkthread.cpp:398 msgid "" "Reading update package meta-information from cache failed or incomplete." msgstr "" -#: src/chkthread.cpp:399 +#: src/chkthread.cpp:421 msgid "Update package file already downloaded." msgstr "" -#: src/chkthread.cpp:406 +#: src/chkthread.cpp:429 #, c-format msgid "Can not open/create %s file for writing." msgstr "" -#: src/chkthread.cpp:426 +#: src/chkthread.cpp:449 #, c-format msgid "Downloading update package from %s..." msgstr "" -#: src/chkthread.cpp:429 +#: src/chkthread.cpp:452 msgid "Error response received." msgstr "" -#: src/chkthread.cpp:448 +#: src/chkthread.cpp:471 #, c-format msgid "Can not write to %s file." msgstr "" -#: src/chkthread.cpp:462 +#: src/chkthread.cpp:485 msgid "Update package file corrupt." msgstr "" -#: src/chkthread.cpp:471 +#: src/chkthread.cpp:494 msgid "Launching update..." msgstr "" -#: src/chkthread.cpp:491 +#: src/chkthread.cpp:513 #, c-format -msgid "msiexec.exe launch succeeded. For further information, see %s file." +msgid "msiexec.exe launch succeeded. For detailed information, see %s file." msgstr "" -#: src/chkthread.cpp:494 +#: src/chkthread.cpp:516 #, c-format msgid "msiexec.exe launch failed. ShellExecute returned %i." msgstr "" diff --git a/Updater/locale/sl_SI.po b/Updater/locale/sl_SI.po index b69561f..15601e3 100644 --- a/Updater/locale/sl_SI.po +++ b/Updater/locale/sl_SI.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Updater\n" -"POT-Creation-Date: 2016-05-24 15:34+0200\n" -"PO-Revision-Date: 2016-05-24 15:35+0200\n" +"POT-Creation-Date: 2016-05-24 17:24+0200\n" +"PO-Revision-Date: 2016-05-24 17:25+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -16,46 +16,46 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" -#: src/chkthread.cpp:79 src/chkthread.cpp:92 +#: src/chkthread.cpp:100 src/chkthread.cpp:113 msgid "Update check complete. Your product is up to date." msgstr "Preverjanje posodobitev končano. Vaš izdelek je zadnje verzije." -#: src/chkthread.cpp:112 +#: src/chkthread.cpp:133 msgid "Downloading repository catalogue..." msgstr "Prenos repozitorijevega kataloga ..." -#: src/chkthread.cpp:120 +#: src/chkthread.cpp:141 #, c-format msgid "Contacting repository at %s..." msgstr "Dostop do repozitorija na %s ..." -#: src/chkthread.cpp:128 +#: src/chkthread.cpp:149 #, c-format msgid "Error resolving %s server name." msgstr "Napaka pri ugotavljanju naslova strežnika %s." -#: src/chkthread.cpp:133 +#: src/chkthread.cpp:154 msgid "Repository did not change since the last time." msgstr "Repozitorij se od zadnjič ni spremenil." -#: src/chkthread.cpp:137 +#: src/chkthread.cpp:158 #, c-format msgid "Error response received from server %s (port %u) requesting %s." msgstr "Prejet odgovor o napaki s strežnika %s (vrata %u) pri zahtevi za %s." -#: src/chkthread.cpp:145 +#: src/chkthread.cpp:166 msgid "Error loading repository catalogue." msgstr "Napaka pri nalaganju repozitorijevega kataloga." -#: src/chkthread.cpp:155 +#: src/chkthread.cpp:176 msgid "Verifying repository catalogue signature..." msgstr "Preverjanje podpisa repozitorijevega kataloga ..." -#: src/chkthread.cpp:186 +#: src/chkthread.cpp:207 msgid "Signature not found in the repository catalogue." msgstr "V repozitorijevem katalogu ni podpisa." -#: src/chkthread.cpp:208 +#: src/chkthread.cpp:229 msgid "" "Repository catalogue signature does not match its content, or signature " "verification failed." @@ -63,7 +63,7 @@ msgstr "" "Podpis repozitorijevega kataloga ne ustreza njegovi vsebini, oziroma " "preverjanje podpisa ni uspelo." -#: src/chkthread.cpp:216 +#: src/chkthread.cpp:237 #, c-format msgid "" "Invalid root element in repository catalogue (actual: %s, expected: %s)." @@ -71,60 +71,60 @@ msgstr "" "Napačen korenski element v repozitorijevem katalogu (dejanski: %s, " "pričakovan: %s)." -#: src/chkthread.cpp:234 +#: src/chkthread.cpp:255 msgid "Parsing repository catalogue..." msgstr "Razčlemba repozitorijevega kataloga ..." -#: src/chkthread.cpp:319 +#: src/chkthread.cpp:340 #, c-format msgid "Update package found (version: %s)." msgstr "Posodobitveni paket najden (verzija: %s)." -#: src/chkthread.cpp:377 +#: src/chkthread.cpp:398 msgid "" "Reading update package meta-information from cache failed or incomplete." msgstr "" "Branje meta-informacij posodobitvenega paketa iz predpomnilnika ni uspelo " "ali ni bilo celotno." -#: src/chkthread.cpp:399 +#: src/chkthread.cpp:421 msgid "Update package file already downloaded." msgstr "Posodobitveni paket je že prenesen." -#: src/chkthread.cpp:406 +#: src/chkthread.cpp:429 #, c-format msgid "Can not open/create %s file for writing." msgstr "Ne morem odpreti/ustvariti datoteke %s za pisanje." -#: src/chkthread.cpp:426 +#: src/chkthread.cpp:449 #, c-format msgid "Downloading update package from %s..." msgstr "Prenos posodobitvenega paketa s/z %s ..." -#: src/chkthread.cpp:429 +#: src/chkthread.cpp:452 msgid "Error response received." msgstr "Prejet odgovor o napaki." -#: src/chkthread.cpp:448 +#: src/chkthread.cpp:471 #, c-format msgid "Can not write to %s file." msgstr "Ne morem pisati v datoteko %s." -#: src/chkthread.cpp:462 +#: src/chkthread.cpp:485 msgid "Update package file corrupt." msgstr "Posodobitveni paket je pokvarjen." -#: src/chkthread.cpp:471 +#: src/chkthread.cpp:494 msgid "Launching update..." msgstr "Zagon posodobitve ..." -#: src/chkthread.cpp:491 +#: src/chkthread.cpp:513 #, c-format -msgid "msiexec.exe launch succeeded. For further information, see %s file." +msgid "msiexec.exe launch succeeded. For detailed information, see %s file." msgstr "" -"Zagon msiexec.exe je uspel. Za nadaljnje informacije glejte datoteko %s." +"Zagon msiexec.exe je uspel. Za podrobnejše informacije glejte datoteko %s." -#: src/chkthread.cpp:494 +#: src/chkthread.cpp:516 #, c-format msgid "msiexec.exe launch failed. ShellExecute returned %i." msgstr "Zagon msiexec.exe ni uspel. ShellExecute je vrnil %i." diff --git a/Updater/src/chkthread.cpp b/Updater/src/chkthread.cpp index 8cda341..f2a5525 100644 --- a/Updater/src/chkthread.cpp +++ b/Updater/src/chkthread.cpp @@ -509,7 +509,7 @@ bool wxUpdCheckThread::LaunchUpdate() int result = (int)::ShellExecute(NULL, NULL, wxT("msiexec.exe"), param, NULL, SW_SHOWNORMAL); if (result > 32) { - wxLogStatus(_("msiexec.exe launch succeeded. For further information, see %s file."), fileNameLog.c_str()); + wxLogStatus(_("msiexec.exe launch succeeded. For detailed information, see %s file."), fileNameLog.c_str()); return true; } else { wxLogError(_("msiexec.exe launch failed. ShellExecute returned %i."), result);