SimpleWebServerGUI: restored punctuation improvements in resource strings (they were lost in commit 322e4f468e), regenerated translations and updated Russian translation

components/simplewebservergui/languages/simplewebsrvstrconsts.pot

@@ -26,7 +26,7 @@ msgid "Binding of socket failed"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswbrowsertoopenhtmlpagemacroswsbrowser
-msgid "Browser to open HTML page, macro $(SWSBrowser)"
+msgid "Browser to open HTML page (macro $(SWSBrowser))"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswcannotfindbrowsersee
@@ -52,7 +52,7 @@ msgid "Delete server at \"%s\"?"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswdirectorynotfound
-msgid "Directory not found"
+msgid "Directory not found."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswerror
@@ -61,7 +61,7 @@ msgstr ""
 
 #: simplewebsrvstrconsts.rsswerrorcheckingwhichprocessusestcpport
 #, object-pascal-format
-msgid "Error checking which process uses TCP port %s"
+msgid "Error checking which process uses TCP port %s:"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswerrorcreatingdirectory
@@ -74,12 +74,12 @@ msgstr ""
 
 #: simplewebsrvstrconsts.rsswerrorkillingprocess
 #, object-pascal-format
-msgid "Error killing process %s"
+msgid "Error killing process %s:"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswerrorwriting
 #, object-pascal-format
-msgid "Error writing \"%s\""
+msgid "Error writing \"%s\":"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswexecutable
@@ -96,7 +96,7 @@ msgid "Invalid macro. See"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswinvalidport
-msgid "Invalid Port"
+msgid "Invalid Port."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswkillpid
@@ -121,7 +121,7 @@ msgid "Location"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswlocationalreadyused
-msgid "Location already used"
+msgid "Location already used."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswmissingcontroller
@@ -129,23 +129,23 @@ msgid "missing controller"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswmissinglocaldirectory
-msgid "Missing local directory"
+msgid "Missing local directory."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswmissinglocation
-msgid "Missing Location"
+msgid "Missing Location."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswmissingserverexecutable
-msgid "Missing server executable"
+msgid "Missing server executable."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswparameterspleaseusemacroport
-msgid "Parameters, please use macro $(port)"
+msgid "Parameters (please use macro $(port))"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswportalreadyused
-msgid "Port already used"
+msgid "Port already used."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswsaddress
@@ -166,7 +166,7 @@ msgid "Server directory \"%s\" not found."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswserverexecutablenotfound
-msgid "Server executable not found"
+msgid "Server executable not found."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswserverexecutablenotfoundinpath
@@ -175,7 +175,7 @@ msgid "Server executable \"%s\" not found in PATH."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswserverexecutablenotfoundinpath2
-msgid "Server executable not found in PATH"
+msgid "Server executable not found in PATH."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswserverexeisnotexecutable
@@ -184,7 +184,7 @@ msgid "Server exe is not executable: \"%s\""
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswserverexeisnotexecutable2
-msgid "Server exe is not executable"
+msgid "Server exe is not executable."
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswserverextracommandlineoptionsoneperline
@@ -228,7 +228,7 @@ msgid "User"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswtcpport102465535youcanusemacroportforbelowparams
-msgid "TCP Port 1024..65535, you can use macro $(Port) for below params"
+msgid "TCP Port 1024..65535 (you can use macro $(port) for below params)"
 msgstr ""
 
 #: simplewebsrvstrconsts.rsswthefollowingprocessalreadylistens

components/simplewebservergui/languages/simplewebsrvstrconsts.ru.po

@@ -36,9 +36,7 @@ msgid "Binding of socket failed"
 msgstr "Не удалось привязать сокет"
 
 #: simplewebsrvstrconsts.rsswbrowsertoopenhtmlpagemacroswsbrowser
-#, fuzzy
+msgid "Browser to open HTML page (macro $(SWSBrowser))"
-#| msgid "Browser to open HTML page (macro $(SWSBrowser))"
-msgid "Browser to open HTML page, macro $(SWSBrowser)"
 msgstr "Браузер для открытия страницы HTML (макрос $(SWSBrowser))"
 
 #: simplewebsrvstrconsts.rsswcannotfindbrowsersee
@@ -64,9 +62,7 @@ msgid "Delete server at \"%s\"?"
 msgstr "Удалить сервер, расположенный в \"%s\"?"
 
 #: simplewebsrvstrconsts.rsswdirectorynotfound
-#, fuzzy
+msgid "Directory not found."
-#| msgid "Directory not found."
-msgid "Directory not found"
 msgstr "Каталог не найден."
 
 #: simplewebsrvstrconsts.rsswerror
@@ -74,9 +70,8 @@ msgid "Error"
 msgstr "Ошибка"
 
 #: simplewebsrvstrconsts.rsswerrorcheckingwhichprocessusestcpport
-#, object-pascal-format, fuzzy
+#, object-pascal-format
-#| msgid "Error checking which process uses TCP port %s:"
+msgid "Error checking which process uses TCP port %s:"
-msgid "Error checking which process uses TCP port %s"
 msgstr "Ошибка при поиске процесса, использующего порт %s:"
 
 #: simplewebsrvstrconsts.rsswerrorcreatingdirectory
@@ -88,15 +83,13 @@ msgid "Error finding free TCP port:"
 msgstr "Ошибка при поиске свободного порта TCP:"
 
 #: simplewebsrvstrconsts.rsswerrorkillingprocess
-#, object-pascal-format, fuzzy
+#, object-pascal-format
-#| msgid "Error killing process %s:"
+msgid "Error killing process %s:"
-msgid "Error killing process %s"
 msgstr "Ошибка при принудительном завершении процесса %s:"
 
 #: simplewebsrvstrconsts.rsswerrorwriting
-#, object-pascal-format, fuzzy
+#, object-pascal-format
-#| msgid "Error writing \"%s\":"
+msgid "Error writing \"%s\":"
-msgid "Error writing \"%s\""
 msgstr "Ошибка при записи \"%s\":"
 
 #: simplewebsrvstrconsts.rsswexecutable
@@ -113,9 +106,7 @@ msgid "Invalid macro. See"
 msgstr "Некорректный макрос. Смотрите"
 
 #: simplewebsrvstrconsts.rsswinvalidport
-#, fuzzy
+msgid "Invalid Port."
-#| msgid "Invalid Port."
-msgid "Invalid Port"
 msgstr "Некорректный порт."
 
 #: simplewebsrvstrconsts.rsswkillpid
@@ -140,9 +131,7 @@ msgid "Location"
 msgstr "Расположение"
 
 #: simplewebsrvstrconsts.rsswlocationalreadyused
-#, fuzzy
+msgid "Location already used."
-#| msgid "Location already used."
-msgid "Location already used"
 msgstr "Расположение уже используется."
 
 #: simplewebsrvstrconsts.rsswmissingcontroller
@@ -150,33 +139,23 @@ msgid "missing controller"
 msgstr "отсутствует контроллер"
 
 #: simplewebsrvstrconsts.rsswmissinglocaldirectory
-#, fuzzy
+msgid "Missing local directory."
-#| msgid "Missing local directory."
-msgid "Missing local directory"
 msgstr "Отсутствует локальный каталог."
 
 #: simplewebsrvstrconsts.rsswmissinglocation
-#, fuzzy
+msgid "Missing Location."
-#| msgid "Missing Location."
-msgid "Missing Location"
 msgstr "Отсутствует расположение."
 
 #: simplewebsrvstrconsts.rsswmissingserverexecutable
-#, fuzzy
+msgid "Missing server executable."
-#| msgid "Missing server executable."
-msgid "Missing server executable"
 msgstr "Отсутствует исполнимый файл сервера."
 
 #: simplewebsrvstrconsts.rsswparameterspleaseusemacroport
-#, fuzzy
+msgid "Parameters (please use macro $(port))"
-#| msgid "Parameters (please use macro $(port))"
-msgid "Parameters, please use macro $(port)"
 msgstr "Параметры (используйте макрос $(port))"
 
 #: simplewebsrvstrconsts.rsswportalreadyused
-#, fuzzy
+msgid "Port already used."
-#| msgid "Port already used."
-msgid "Port already used"
 msgstr "Порт уже используется."
 
 #: simplewebsrvstrconsts.rsswsaddress
@@ -197,9 +176,7 @@ msgid "Server directory \"%s\" not found."
 msgstr "Каталог сервера \"%s\" не найден."
 
 #: simplewebsrvstrconsts.rsswserverexecutablenotfound
-#, fuzzy
+msgid "Server executable not found."
-#| msgid "Server executable not found."
-msgid "Server executable not found"
 msgstr "Исполнимый файл сервера не найден."
 
 #: simplewebsrvstrconsts.rsswserverexecutablenotfoundinpath
@@ -208,9 +185,7 @@ msgid "Server executable \"%s\" not found in PATH."
 msgstr "Исполнимый файл сервера \"%s\" не найден в PATH."
 
 #: simplewebsrvstrconsts.rsswserverexecutablenotfoundinpath2
-#, fuzzy
+msgid "Server executable not found in PATH."
-#| msgid "Server executable not found in PATH."
-msgid "Server executable not found in PATH"
 msgstr "Исполнимый файл сервера не найден в PATH."
 
 #: simplewebsrvstrconsts.rsswserverexeisnotexecutable
@@ -219,9 +194,7 @@ msgid "Server exe is not executable: \"%s\""
 msgstr "Файл сервера не является исполнимым: \"%s\""
 
 #: simplewebsrvstrconsts.rsswserverexeisnotexecutable2
-#, fuzzy
+msgid "Server exe is not executable."
-#| msgid "Server exe is not executable."
-msgid "Server exe is not executable"
 msgstr "Файл сервера не является исполнимым."
 
 #: simplewebsrvstrconsts.rsswserverextracommandlineoptionsoneperline
@@ -265,9 +238,7 @@ msgid "User"
 msgstr "Пользователь"
 
 #: simplewebsrvstrconsts.rsswtcpport102465535youcanusemacroportforbelowparams
-#, fuzzy
+msgid "TCP Port 1024..65535 (you can use macro $(port) for below params)"
-#| msgid "TCP Port 1024..65535 (you can use macro $(port) for below params)"
-msgid "TCP Port 1024..65535, you can use macro $(Port) for below params"
 msgstr "Порт TCP из диапазона 1024..65535 (можно использовать макрос $(port) в параметрах ниже)"
 
 #: simplewebsrvstrconsts.rsswthefollowingprocessalreadylistens
@@ -277,7 +248,7 @@ msgstr "Его уже занял следующий процесс:"
 #: simplewebsrvstrconsts.rsswthereisalreadyaserveronportoriginpath
 #, object-pascal-format
 msgid "There is already a server on port %s:%sOrigin: %sPath: %s"
-msgstr ""
+msgstr "На порту %s уже имеется сервер:%sПроисхождение: %sПуть: %s"
 
 #: simplewebsrvstrconsts.rsswtoolsoptionssimplewebserverbrowser
 msgid "Tools / Options / Simple Web Server / Browser"

components/simplewebservergui/simplewebsrvstrconsts.pas

@@ -10,17 +10,17 @@ resourcestring
   rsSWSAddress = 'Address';
   rsSWSPort = 'Port';
   rsSWTCPPort102465535YouCanUseMacroPortForBelowParams = 'TCP Port 1024..65535'
-    +', you can use macro $(Port) for below params';
+    +' (you can use macro $(port) for below params)';
   rsSWExecutable = 'Executable';
   rsSWWorkingDirectory = 'Working Directory';
-  rsSWParametersPleaseUseMacroPort = 'Parameters, please use macro $(port)';
+  rsSWParametersPleaseUseMacroPort = 'Parameters (please use macro $(port))';
   rsSWCommandLineParameters = 'Command line parameters';
   rsSWAddCustomServer = 'Add Custom Server';
   rsSWSelectDirectory = 'Select Directory';
   rsSWServerExtraCommandLineOptionsOnePerLine = 'Server extra command-line '
     +'options (one per line)';
-  rsSWBrowserToOpenHTMLPageMacroSWSBrowser = 'Browser to open HTML page, macro'
+  rsSWBrowserToOpenHTMLPageMacroSWSBrowser = 'Browser to open HTML page (macro'
-    +' $(SWSBrowser)';
+    +' $(SWSBrowser))';
   rsSWAddExtraCommandLineOptionsForTheCommandWhichStarts = 'Add extra command-'
     +'line options for the command which starts the webserver.';
   rsSWUseThisBrowserWhenOpeningTheURLOrHTMLFileOfAWebBro = 'Use this browser '
@@ -29,7 +29,7 @@ resourcestring
   rsSWSUserOrigin = 'User';
   rsSWUnableToAddLocation = 'Unable to add location:';
   rsSWMissingController = 'missing controller';
-  rsSWMissingLocation = 'Missing Location';
+  rsSWMissingLocation = 'Missing Location.';
   rsSWAddSimpleWebServerLocation = 'Add Simple Web Server Location';
   rsSWLocation = 'Location';
   rsSWAnArbitraryNameForTheURLSubfolder = 'An arbitrary name for the URL '
@@ -42,22 +42,22 @@ resourcestring
   rsSWThereIsAlreadyAServerOnPortOriginPath = 'There is already a server on '
     +'port %s:%sOrigin: %sPath: %s';
   rsSWErrorFindingFreeTCPPort = 'Error finding free TCP port:';
-  rsSWErrorKillingProcess = 'Error killing process %s';
+  rsSWErrorKillingProcess = 'Error killing process %s:';
   rsSWErrorCheckingWhichProcessUsesTCPPort = 'Error checking which process '
-    +'uses TCP port %s';
+    +'uses TCP port %s:';
   rsSWCannotFindBrowserSee = 'Cannot find browser. See';
   rsSWInvalidMacroSee = 'Invalid macro. See';
   rsSWToolsOptionsSimpleWebServerBrowser = 'Tools / Options / Simple Web '
     +'Server / Browser';
-  rsSWServerExecutableNotFound = 'Server executable not found';
+  rsSWServerExecutableNotFound = 'Server executable not found.';
-  rsSWServerExeIsNotExecutable2 = 'Server exe is not executable';
+  rsSWServerExeIsNotExecutable2 = 'Server exe is not executable.';
-  rsSWInvalidPort = 'Invalid Port';
+  rsSWInvalidPort = 'Invalid Port.';
-  rsSWPortAlreadyUsed = 'Port already used';
+  rsSWPortAlreadyUsed = 'Port already used.';
   rsSWLocalDirectoryNotFound = 'Local directory not found:';
-  rsSWLocationAlreadyUsed = 'Location already used';
+  rsSWLocationAlreadyUsed = 'Location already used.';
-  rsSWErrorWriting = 'Error writing "%s"';
+  rsSWErrorWriting = 'Error writing "%s":';
   rsSWErrorCreatingDirectory = 'Error creating directory';
-  rsSWDirectoryNotFound = 'Directory not found';
+  rsSWDirectoryNotFound = 'Directory not found.';
   rsSWSimpleWebServerAddress = 'Simple Web Server Address';
   rsSWSimpleWebServerPort = 'Simple Web Server Port';
   rsSWSimpleWebServerExecutable = 'Simple Web Server Executable';
@@ -73,9 +73,9 @@ resourcestring
   rsSWKillProcess = 'Kill process?';
   rsSWKillPID = 'Kill PID %s';
   rsSWTryAnotherPort = 'Try another port';
-  rsSWMissingServerExecutable = 'Missing server executable';
+  rsSWMissingServerExecutable = 'Missing server executable.';
-  rsSWServerExecutableNotFoundInPATH2 = 'Server executable not found in PATH';
+  rsSWServerExecutableNotFoundInPATH2 = 'Server executable not found in PATH.';
-  rsSWMissingLocalDirectory = 'Missing local directory';
+  rsSWMissingLocalDirectory = 'Missing local directory.';
   rsSWStartServer = 'Start Server';
   rsSWStopServer = 'Stop Server';
   rsSWDelete = 'Delete?';