paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 06:16:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

SimpleWebServerGUI: improved i18n, regenerated translations and updated Russian translation

Browse Source
This commit is contained in:
Maxim Ganetsky 2022-05-31 02:28:03 +03:00
parent 3052c2b048
commit 8aee0d78a3
6 changed files with 219 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/simplewebservergui/languages/simplewebsrvstrconsts.pot
View File

@ -1,6 +1,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
#: simplewebsrvstrconsts.rsswadd
msgid "Add"
msgstr ""
#: simplewebsrvstrconsts.rsswaddcustomserver
msgid "Add Custom Server"
msgstr ""
@ -37,10 +41,34 @@ msgstr ""
msgid "Command line parameters"
msgstr ""
#: simplewebsrvstrconsts.rsswconfigure
msgid "Configure"
msgstr ""
#: simplewebsrvstrconsts.rsswcopylocation
msgid "Copy Location"
msgstr ""
#: simplewebsrvstrconsts.rsswcopyorigin
msgid "Copy Origin"
msgstr ""
#: simplewebsrvstrconsts.rsswcopyworkingdirectorypath
msgid "Copy Working Directory Path"
msgstr ""
#: simplewebsrvstrconsts.rsswcustomserver
msgid "Custom Server"
msgstr ""
#: simplewebsrvstrconsts.rsswdelete
msgid "Delete?"
msgstr ""
#: simplewebsrvstrconsts.rsswdelete2
msgid "Delete"
msgstr ""
#: simplewebsrvstrconsts.rsswdeletelocation
#, object-pascal-format
msgid "Delete location \"%s\"?"
@ -140,6 +168,14 @@ msgstr ""
msgid "Missing server executable."
msgstr ""
#: simplewebsrvstrconsts.rsswnote
msgid "Note"
msgstr ""
#: simplewebsrvstrconsts.rssworigin
msgid "Origin"
msgstr ""
#: simplewebsrvstrconsts.rsswparameterspleaseusemacroport
msgid "Parameters (please use macro $(port))"
msgstr ""

36
components/simplewebservergui/languages/simplewebsrvstrconsts.ru.po
View File

@ -11,6 +11,10 @@ msgstr ""
"Language: ru\n"
"X-Generator: Poedit 2.4.3\n"
#: simplewebsrvstrconsts.rsswadd
msgid "Add"
msgstr "Добавить"
#: simplewebsrvstrconsts.rsswaddcustomserver
msgid "Add Custom Server"
msgstr "Добавить пользовательский сервер"
@ -47,10 +51,34 @@ msgstr "Невозможно найти браузер. Смотрите"
msgid "Command line parameters"
msgstr "Параметры командной строки"
#: simplewebsrvstrconsts.rsswconfigure
msgid "Configure"
msgstr "Настроить"
#: simplewebsrvstrconsts.rsswcopylocation
msgid "Copy Location"
msgstr "Копировать расположение"
#: simplewebsrvstrconsts.rsswcopyorigin
msgid "Copy Origin"
msgstr "Копировать происхождение"
#: simplewebsrvstrconsts.rsswcopyworkingdirectorypath
msgid "Copy Working Directory Path"
msgstr "Копировать путь к рабочему каталогу"
#: simplewebsrvstrconsts.rsswcustomserver
msgid "Custom Server"
msgstr "Пользовательский сервер"
#: simplewebsrvstrconsts.rsswdelete
msgid "Delete?"
msgstr "Удалить?"
#: simplewebsrvstrconsts.rsswdelete2
msgid "Delete"
msgstr "Удалить"
#: simplewebsrvstrconsts.rsswdeletelocation
#, object-pascal-format
msgid "Delete location \"%s\"?"
@ -150,6 +178,14 @@ msgstr "Отсутствует расположение."
msgid "Missing server executable."
msgstr "Отсутствует исполнимый файл сервера."
#: simplewebsrvstrconsts.rsswnote
msgid "Note"
msgstr "Примечание"
#: simplewebsrvstrconsts.rssworigin
msgid "Origin"
msgstr "Происхождение"
#: simplewebsrvstrconsts.rsswparameterspleaseusemacroport
msgid "Parameters (please use macro $(port))"
msgstr "Параметры (используйте макрос $(port))"

237
components/simplewebservergui/simplewebsrvadd.lfm
View File

@ -1,32 +1,34 @@
object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
Left = 598
Height = 368
Height = 460
Top = 313
Width = 426
Width = 532
Caption = 'Add Simple Web Server Location'
ClientHeight = 368
ClientWidth = 426
ClientHeight = 460
ClientWidth = 532
DesignTimePPI = 120
OnCreate = FormCreate
Position = poScreenCenter
LCLVersion = '2.3.0.0'
object OptionsPageControl: TPageControl
Left = 0
Height = 368
Height = 460
Top = 0
Width = 426
ActivePage = ServerTabSheet
Width = 532
ActivePage = LocationTabSheet
Align = alClient
TabIndex = 1
TabIndex = 0
TabOrder = 0
object LocationTabSheet: TTabSheet
Caption = 'Location'
ClientHeight = 339
ClientWidth = 416
ClientHeight = 427
ClientWidth = 524
object LocButtonPanel: TButtonPanel
Left = 6
Height = 40
Top = 293
Width = 404
Left = 8
Height = 38
Top = 381
Width = 508
BorderSpacing.Around = 8
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
@ -42,34 +44,34 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideLeft.Control = LocationTabSheet
AnchorSideTop.Control = LocationComboBox
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 14
Width = 47
BorderSpacing.Left = 6
Left = 8
Height = 20
Top = 12
Width = 57
BorderSpacing.Left = 8
Caption = 'Location'
end
object LocationURLLabel: TLabel
AnchorSideLeft.Control = LocationTabSheet
AnchorSideTop.Control = LocationDirComboBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 15
Top = 87
Width = 98
BorderSpacing.Left = 6
BorderSpacing.Top = 15
Left = 8
Height = 20
Top = 91
Width = 119
BorderSpacing.Left = 8
BorderSpacing.Top = 19
Caption = 'LocationURLLabel'
end
object LocationDirLabel: TLabel
AnchorSideLeft.Control = LocationTabSheet
AnchorSideTop.Control = LocationDirComboBox
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 50
Width = 84
BorderSpacing.Left = 6
Left = 8
Height = 20
Top = 48
Width = 100
BorderSpacing.Left = 8
Caption = 'Local Directory'
end
object LocationBrowserButton: TButton
@ -79,13 +81,13 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = LocationDirComboBox
AnchorSideBottom.Side = asrBottom
Left = 385
Height = 30
Top = 42
Width = 25
Left = 481
Height = 28
Top = 44
Width = 35
Anchors = [akTop, akRight, akBottom]
AutoSize = True
BorderSpacing.Right = 6
BorderSpacing.Right = 8
Caption = '...'
OnClick = LocationBrowserButtonClick
TabOrder = 1
@ -96,14 +98,16 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideTop.Control = LocationComboBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = LocationBrowserButton
Left = 96
Height = 30
Top = 42
Width = 289
Left = 116
Height = 28
Top = 44
Width = 365
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
ItemHeight = 0
BorderSpacing.Left = 8
BorderSpacing.Top = 8
ItemHeight = 20
ParentShowHint = False
ShowHint = True
TabOrder = 2
Text = 'LocationDirComboBox'
end
@ -111,27 +115,30 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideLeft.Control = LocationLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = LocationTabSheet
Left = 59
Height = 30
Top = 6
Width = 189
BorderSpacing.Left = 6
BorderSpacing.Top = 6
ItemHeight = 0
Left = 73
Height = 28
Top = 8
Width = 236
BorderSpacing.Left = 8
BorderSpacing.Top = 8
ItemHeight = 20
OnEditingDone = LocationComboBoxEditingDone
ParentShowHint = False
ShowHint = True
TabOrder = 3
Text = 'LocationComboBox'
end
end
object ServerTabSheet: TTabSheet
Caption = 'Custom Server'
ClientHeight = 339
ClientWidth = 416
ClientHeight = 427
ClientWidth = 524
object SrvButtonPanel: TButtonPanel
Left = 6
Height = 40
Top = 293
Width = 404
Left = 8
Height = 38
Top = 381
Width = 508
BorderSpacing.Around = 8
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
@ -146,22 +153,22 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
object SrvPortLabel: TLabel
AnchorSideLeft.Control = ServerTabSheet
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 14
Width = 24
BorderSpacing.Left = 6
Left = 8
Height = 20
Top = 18
Width = 26
BorderSpacing.Left = 8
Caption = 'Port'
end
object SrvWorkDirLabel: TLabel
AnchorSideLeft.Control = ServerTabSheet
AnchorSideTop.Control = SrvWorkDirComboBox
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 86
Width = 85
BorderSpacing.Left = 6
Left = 8
Height = 20
Top = 84
Width = 99
BorderSpacing.Left = 8
Caption = 'Work Directory'
end
object SrvBrowserButton: TButton
@ -171,13 +178,13 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = SrvWorkDirComboBox
AnchorSideBottom.Side = asrBottom
Left = 385
Height = 30
Top = 78
Width = 25
Left = 481
Height = 28
Top = 80
Width = 35
Anchors = [akTop, akRight, akBottom]
AutoSize = True
BorderSpacing.Right = 6
BorderSpacing.Right = 8
Caption = '...'
TabOrder = 1
end
@ -185,11 +192,11 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideLeft.Control = ServerTabSheet
AnchorSideTop.Control = SrvExeComboBox
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 50
Width = 61
BorderSpacing.Left = 6
Left = 8
Height = 20
Top = 48
Width = 72
BorderSpacing.Left = 8
Caption = 'Executable'
end
object SrvExeBrowseButton: TButton
@ -199,13 +206,13 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = SrvExeComboBox
AnchorSideBottom.Side = asrBottom
Left = 385
Height = 30
Top = 42
Width = 25
Left = 481
Height = 28
Top = 44
Width = 35
Anchors = [akTop, akRight, akBottom]
AutoSize = True
BorderSpacing.Right = 6
BorderSpacing.Right = 8
Caption = '...'
TabOrder = 2
end
@ -213,12 +220,12 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideLeft.Control = ServerTabSheet
AnchorSideTop.Control = SrvWorkDirComboBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 15
Top = 114
Width = 63
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Left = 8
Height = 20
Top = 116
Width = 73
BorderSpacing.Left = 8
BorderSpacing.Top = 8
Caption = 'Parameters'
end
object SrvParamsComboBox: TComboBox
@ -227,15 +234,15 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ServerTabSheet
AnchorSideRight.Side = asrBottom
Left = 6
Height = 30
Top = 135
Width = 404
Left = 8
Height = 28
Top = 144
Width = 508
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
ItemHeight = 0
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 8
ItemHeight = 20
ParentShowHint = False
ShowHint = True
TabOrder = 3
@ -246,14 +253,14 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideTop.Control = SrvPortComboBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = SrvExeBrowseButton
Left = 73
Height = 30
Top = 42
Width = 312
Left = 88
Height = 28
Top = 44
Width = 393
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
ItemHeight = 0
BorderSpacing.Left = 8
BorderSpacing.Top = 8
ItemHeight = 20
ParentShowHint = False
ShowHint = True
TabOrder = 4
@ -264,14 +271,14 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideTop.Control = SrvExeComboBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = SrvBrowserButton
Left = 97
Height = 30
Top = 78
Width = 288
Left = 115
Height = 28
Top = 80
Width = 366
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
ItemHeight = 0
BorderSpacing.Left = 8
BorderSpacing.Top = 8
ItemHeight = 20
ParentShowHint = False
ShowHint = True
TabOrder = 5
@ -281,13 +288,13 @@ object SimpleWebSrvAddDialog: TSimpleWebSrvAddDialog
AnchorSideLeft.Control = SrvPortLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ServerTabSheet
Left = 36
Height = 30
Top = 6
Width = 141
BorderSpacing.Left = 6
BorderSpacing.Top = 6
ItemHeight = 0
Left = 42
Height = 28
Top = 8
Width = 176
BorderSpacing.Left = 8
BorderSpacing.Top = 8
ItemHeight = 20
ParentShowHint = False
ShowHint = True
TabOrder = 6

3
components/simplewebservergui/simplewebsrvadd.pas
View File

@ -87,8 +87,8 @@ begin
Caption:=rsSWAddSimpleWebServerLocation;
// add location page
LocationTabSheet.Caption:=rsSWLocation;
LocationLabel.Caption:=rsSWLocation;
LocationComboBox.TextHint:='location';
LocationComboBox.Hint:=rsSWAnArbitraryNameForTheURLSubfolder;
LocationDirLabel.Caption:=rsSWLocalDirectory;
@ -98,6 +98,7 @@ begin
LocButtonPanel.OKButton.Caption:=rsSWAddLocation;
// add server page
ServerTabSheet.Caption:=rsSWCustomServer;
SrvPortLabel.Caption:=rsSWPort;
SrvPortComboBox.Hint:=rsSWTCPPort102465535YouCanUseMacroPortForBelowParams;
SrvExeLabel.Caption:=rsSWExecutable;

9
components/simplewebservergui/simplewebsrvstrconsts.pas
View File

@ -12,8 +12,14 @@ resourcestring
rsSWTCPPort102465535YouCanUseMacroPortForBelowParams = 'TCP Port 1024..65535'
+' (you can use macro $(port) for below params)';
rsSWPort = 'Port';
rsSWCustomServer = 'Custom Server';
rsSWExecutable = 'Executable';
rsSWWorkingDirectory = 'Working Directory';
rsSWOrigin = 'Origin';
rsSWNote = 'Note';
rsSWCopyLocation = 'Copy Location';
rsSWCopyWorkingDirectoryPath = 'Copy Working Directory Path';
rsSWCopyOrigin = 'Copy Origin';
rsSWParametersPleaseUseMacroPort = 'Parameters (please use macro $(port))';
rsSWCommandLineParameters = 'Command line parameters';
rsSWAddCustomServer = 'Add Custom Server';
@ -81,6 +87,9 @@ resourcestring
rsSWStopServer = 'Stop Server';
rsSWDelete = 'Delete?';
rsSWDeleteServerAt = 'Delete server at "%s"?';
rsSWConfigure = 'Configure';
rsSWAdd = 'Add';
rsSWDelete2 = 'Delete';
rsSWDeleteLocation = 'Delete location "%s"?';
implementation

14
components/simplewebservergui/simplewebsrvwnd.pas
View File

@ -333,6 +333,20 @@ begin
UpdateButtons;
UpdateLocationsView;
Caption:=rsSWSTitle;
ConfigureButton.Caption:=rsSWConfigure;
AddButton.Caption:=rsSWAdd;
DeleteButton.Caption:=rsSWDelete2;
LocationsListView.Columns[0].Caption:=rsSWLocation;
LocationsListView.Columns[1].Caption:=rsSWWorkingDirectory;
LocationsListView.Columns[2].Caption:=rsSWOrigin;
LocationsListView.Columns[3].Caption:=rsSWNote;
CopyLocationMenuItem.Caption:=rsSWCopyLocation;
CopyDirectoryPathMenuItem.Caption:=rsSWCopyWorkingDirectoryPath;
CopyOriginMenuItem.Caption:=rsSWCopyOrigin;
end;
procedure TSimpleWebServerWindow.ConfigureButtonClick(Sender: TObject);