FIX: There were the same three non-translatable words in "fMultiArchiveCopyOperationOptions", "fWcxArchiveCopyOperationOptions" and "fWfxPluginCopyMoveOperationOptions". This has been fixed.

UPD: For the three above forms, replace the .lrt files with newer .lrj files.
CHG: Obviously, new language files because of that. French language file fully updated.
This commit is contained in:
Denis Bisson 2018-11-16 04:37:05 +00:00
commit 1604f0124a
43 changed files with 167 additions and 54 deletions

View file

@ -9626,6 +9626,10 @@ msgstr "Не;Так"
msgid "Exported_from_DC"
msgstr "Exported_from_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Пытацца;Аб'ядноўваць;Прамінаць"

View file

@ -10062,6 +10062,10 @@ msgstr "Не;Да"
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -10646,6 +10646,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr ""

View file

@ -9641,6 +9641,10 @@ msgstr "Ne;Ano"
msgid "Exported_from_DC"
msgstr "Exportováno_z_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Zeptat se;Přepsat;Přeskočit"

View file

@ -10171,6 +10171,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr "Eksporteret_fra_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9875,6 +9875,10 @@ msgstr "Ja;Nein"
msgid "Exported_from_DC"
msgstr "Exportiert_aus_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9870,6 +9870,10 @@ msgstr "Όχι;Ναι"
msgid "Exported_from_DC"
msgstr "Έχει_Εξαχθεί_από_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Ερώτηση;Συγχώνευση;Παράβλεψη"

View file

@ -9647,6 +9647,10 @@ msgstr "No;Sí"
msgid "Exported_from_DC"
msgstr "Exportado_desde_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Preguntar;Mezclar;Saltar"

View file

@ -25,7 +25,7 @@ msgstr ""
"Project-Id-Version: Double Commander 0.5.1 beta\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-17 23:08+0300\n"
"PO-Revision-Date: 2018-11-13 21:39-0500\n"
"PO-Revision-Date: 2018-11-15 21:41-0500\n"
"Last-Translator: Denis Bisson <denis.bisson@denisbisson.org>\n"
"Language-Team: Zebulon Tourneboulle <zebulon.tourneboulle@gmail.com>\n"
"MIME-Version: 1.0\n"
@ -9906,6 +9906,10 @@ msgstr "Non;Oui"
msgid "Exported_from_DC"
msgstr "Exporté_de_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr "Demande;Ré-écris;Saute"
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Demande;Copie à l'intérieur;Saute"

View file

@ -10292,6 +10292,10 @@ msgstr "Ne;Da"
msgid "Exported_from_DC"
msgstr "Izvoz iz DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9946,6 +9946,10 @@ msgstr "Nem;Igen"
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -10057,6 +10057,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9881,6 +9881,10 @@ msgstr "いいえ;はい"
msgid "Exported_from_DC"
msgstr "DCからエクスポート済み"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
# どの文脈か不明
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"

View file

@ -10058,6 +10058,10 @@ msgstr "아니요;예"
msgid "Exported_from_DC"
msgstr "DC에서 내보내기된"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9633,6 +9633,10 @@ msgstr "Nee;Ja"
msgid "Exported_from_DC"
msgstr "Geëxporteerd vanuit DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Vraag;Overschrijf;Kopieer naar;Overslaan"

View file

@ -9639,6 +9639,10 @@ msgstr "Nie;Tak"
msgid "Exported_from_DC"
msgstr "Wyeksportowane_z_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Pytaj;Połącz;Pomiń"

View file

@ -9607,6 +9607,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr ""

View file

@ -9876,6 +9876,10 @@ msgstr "Não;Sim"
msgid "Exported_from_DC"
msgstr "Exportado_Do_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Perguntar;Unir;Saltar"

View file

@ -10011,6 +10011,10 @@ msgstr "Não;Sim"
msgid "Exported_from_DC"
msgstr "Exportado do DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9872,6 +9872,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Întreabă;Combină;Sari"

View file

@ -9888,6 +9888,10 @@ msgstr "Нет;Да"
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "Спрашивать;Объединять;Пропускать"
@ -12868,3 +12872,4 @@ msgstr "Число замен: %d"
#: ulng.rszeroreplacement
msgid "No replacement took place."
msgstr "Замена не состоялась."

View file

@ -10714,6 +10714,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9642,6 +9642,10 @@ msgstr "Da;Ne"
msgid "Exported_from_DC"
msgstr "Izvozi iz DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "vprašaj;združi;preskoči"

View file

@ -10102,6 +10102,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -10104,6 +10104,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -10247,6 +10247,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr ""

View file

@ -10159,6 +10159,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr "Експортувати_з_DC"
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -9875,6 +9875,10 @@ msgstr "否;是"
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
msgid "Ask;Merge;Skip"
msgstr "询问;合并;跳过"

View file

@ -10641,6 +10641,10 @@ msgstr ""
msgid "Exported_from_DC"
msgstr ""
#: ulng.rsfileopcopymovefileexistsoptions
msgid "Ask;Overwrite;Skip"
msgstr ""
#: ulng.rsfileopdirectoryexistsoptions
#, fuzzy
#| msgid "Ask;Overwrite;Copy into;Skip"

View file

@ -1238,7 +1238,8 @@ end;"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="MultiArchiveCopyOperationOptionsUI"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="fMultiArchiveCopyOperationOptions"/>
</Unit151>
<Unit152>
<Filename Value="filesources\multiarchive\umultiarchivecalcstatisticsoperation.pas"/>
@ -1324,7 +1325,8 @@ end;"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="WcxArchiveCopyOperationOptionsUI"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="fWcxArchiveCopyOperationOptions"/>
</Unit169>
<Unit170>
<Filename Value="filesources\wcxarchive\uwcxarchivecalcstatisticsoperation.pas"/>
@ -1370,7 +1372,8 @@ end;"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="WfxPluginCopyMoveOperationOptionsUI"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="fWfxPluginCopyMoveOperationOptions"/>
</Unit178>
<Unit179>
<Filename Value="filesources\wfxplugin\uwfxplugincopyinoperation.pas"/>

View file

@ -1,41 +1,35 @@
inherited MultiArchiveCopyOperationOptionsUI: TMultiArchiveCopyOperationOptionsUI
object MultiArchiveCopyOperationOptionsUI: TMultiArchiveCopyOperationOptionsUI
Left = 535
Height = 158
Top = 391
Width = 549
AutoSize = True
BorderSpacing.Around = 6
ClientHeight = 158
ClientWidth = 549
TabOrder = 0
DesignLeft = 535
DesignTop = 391
object lblFileExists: TLabel[0]
LCLVersion = '1.8.4.0'
object lblFileExists: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = cmbFileExists
AnchorSideTop.Side = asrCenter
Left = 6
Height = 14
Top = 3
Width = 77
Height = 15
Top = 4
Width = 81
BorderSpacing.Around = 6
Caption = 'When file exists'
FocusControl = cmbFileExists
ParentColor = False
end
object cmbFileExists: TComboBox[1]
object cmbFileExists: TComboBox
AnchorSideLeft.Control = lblFileExists
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
Left = 91
Height = 21
Left = 95
Height = 23
Top = 0
Width = 109
BorderSpacing.Left = 8
ItemHeight = 13
Items.Strings = (
'Ask'
'Overwrite'
'Skip'
)
ItemHeight = 15
Style = csDropDownList
TabOrder = 0
end

View file

@ -0,0 +1,3 @@
{"version":1,"strings":[
{"hash":111687171,"name":"tmultiarchivecopyoperationoptionsui.lblfileexists.caption","sourcebytes":[87,104,101,110,32,102,105,108,101,32,101,120,105,115,116,115],"value":"When file exists"}
]}

View file

@ -1 +0,0 @@
TMULTIARCHIVECOPYOPERATIONOPTIONSUI.LBLFILEEXISTS.CAPTION=When file exists

View file

@ -32,13 +32,14 @@ implementation
{$R *.lfm}
uses
uGlobs, uFileSourceOperationOptions;
DCStrUtils, uLng, uGlobs, uFileSourceOperationOptions;
{ TMultiArchiveCopyOperationOptionsUI }
constructor TMultiArchiveCopyOperationOptionsUI.Create(AOwner: TComponent; AFileSource: IInterface);
begin
inherited;
ParseLineToList(rsFileOpCopyMoveFileExistsOptions, cmbFileExists.Items);
// Load default options.
case gOperationOptionFileExists of

View file

@ -1,41 +1,35 @@
inherited WcxArchiveCopyOperationOptionsUI: TWcxArchiveCopyOperationOptionsUI
object WcxArchiveCopyOperationOptionsUI: TWcxArchiveCopyOperationOptionsUI
Left = 535
Height = 158
Top = 391
Width = 549
AutoSize = True
BorderSpacing.Around = 6
ClientHeight = 158
ClientWidth = 549
TabOrder = 0
DesignLeft = 535
DesignTop = 391
object lblFileExists: TLabel[0]
LCLVersion = '1.8.4.0'
object lblFileExists: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = cmbFileExists
AnchorSideTop.Side = asrCenter
Left = 6
Height = 14
Top = 3
Width = 77
Height = 15
Top = 4
Width = 81
BorderSpacing.Around = 6
Caption = 'When file exists'
FocusControl = cmbFileExists
ParentColor = False
end
object cmbFileExists: TComboBox[1]
object cmbFileExists: TComboBox
AnchorSideLeft.Control = lblFileExists
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
Left = 91
Height = 21
Left = 95
Height = 23
Top = 0
Width = 109
BorderSpacing.Left = 8
ItemHeight = 13
Items.Strings = (
'Ask'
'Overwrite'
'Skip'
)
ItemHeight = 15
Style = csDropDownList
TabOrder = 0
end

View file

@ -0,0 +1,3 @@
{"version":1,"strings":[
{"hash":111687171,"name":"twcxarchivecopyoperationoptionsui.lblfileexists.caption","sourcebytes":[87,104,101,110,32,102,105,108,101,32,101,120,105,115,116,115],"value":"When file exists"}
]}

View file

@ -1 +0,0 @@
TWCXARCHIVECOPYOPERATIONOPTIONSUI.LBLFILEEXISTS.CAPTION=When file exists

View file

@ -27,13 +27,14 @@ implementation
{$R *.lfm}
uses
uGlobs, uFileSourceOperationOptions, uFileSourceCopyOperation;
DCStrUtils, uLng, uGlobs, uFileSourceOperationOptions, uFileSourceCopyOperation;
{ TWcxArchiveCopyOperationOptionsUI }
constructor TWcxArchiveCopyOperationOptionsUI.Create(AOwner: TComponent; AFileSource: IInterface);
begin
inherited;
ParseLineToList(rsFileOpCopyMoveFileExistsOptions, cmbFileExists.Items);
// Load default options.
case gOperationOptionFileExists of

View file

@ -6,7 +6,7 @@ object WfxPluginCopyMoveOperationOptionsUI: TWfxPluginCopyMoveOperationOptionsUI
AutoSize = True
ClientHeight = 158
ClientWidth = 549
LCLVersion = '1.6.0.4'
LCLVersion = '1.8.4.0'
object pnlComboBoxes: TPanel
AnchorSideLeft.Control = Owner
Left = 0
@ -37,11 +37,6 @@ object WfxPluginCopyMoveOperationOptionsUI: TWfxPluginCopyMoveOperationOptionsUI
Top = 0
Width = 100
ItemHeight = 15
Items.Strings = (
'Ask'
'Overwrite'
'Skip'
)
Style = csDropDownList
TabOrder = 0
end

View file

@ -0,0 +1,5 @@
{"version":1,"strings":[
{"hash":111687171,"name":"twfxplugincopymoveoperationoptionsui.lblfileexists.caption","sourcebytes":[87,104,101,110,32,102,105,108,101,32,101,120,105,115,116,115],"value":"When file exists"},
{"hash":31854361,"name":"twfxplugincopymoveoperationoptionsui.cbworkinbackground.caption","sourcebytes":[87,111,114,107,32,105,110,32,98,97,99,107,103,114,111,117,110,100,32,40,115,101,112,97,114,97,116,101,32,99,111,110,110,101,99,116,105,111,110,41],"value":"Work in background (separate connection)"},
{"hash":231770837,"name":"twfxplugincopymoveoperationoptionsui.cbcopytime.caption","sourcebytes":[67,111,112,121,32,100,38,97,116,101,47,116,105,109,101],"value":"Copy d&ate/time"}
]}

View file

@ -1,3 +0,0 @@
TWFXPLUGINCOPYMOVEOPERATIONOPTIONSUI.LBLFILEEXISTS.CAPTION=When file exists
TWFXPLUGINCOPYMOVEOPERATIONOPTIONSUI.CBWORKINBACKGROUND.CAPTION=Work in background (separate connection)
TWFXPLUGINCOPYMOVEOPERATIONOPTIONSUI.CBCOPYTIME.CAPTION=Copy d&ate/time

View file

@ -63,7 +63,7 @@ implementation
{$R *.lfm}
uses
DCOSUtils, WfxPlugin, fCopyMoveDlg, uGlobs, uWfxPluginFileSource,
DCStrUtils, uLng, DCOSUtils, WfxPlugin, fCopyMoveDlg, uGlobs, uWfxPluginFileSource,
uFileSourceOperationOptions, uOperationsManager;
{ TWfxPluginCopyMoveOperationOptionsUI }
@ -71,6 +71,7 @@ uses
constructor TWfxPluginCopyMoveOperationOptionsUI.Create(AOwner: TComponent; AFileSource: IInterface);
begin
inherited Create(AOwner, AFileSource);
ParseLineToList(rsFileOpCopyMoveFileExistsOptions, cmbFileExists.Items);
// Load default options.
case gOperationOptionFileExists of

View file

@ -438,6 +438,7 @@ resourcestring
// File operations
rsFileOpDirectoryExistsOptions = 'Ask;Merge;Skip';
rsFileOpFileExistsOptions = 'Ask;Overwrite;Overwrite Older;Skip';
rsFileOpCopyMoveFileExistsOptions = 'Ask;Overwrite;Skip';
rsFileOpSetPropertyErrorOptions = 'Ask;Don''t set anymore;Ignore errors';
// Viewer