opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Translation fixes: remove various unused strings, fix some wrong spelled strings, add some missing strings

Browse Source
This commit is contained in:
Ansgar Becker
2023-09-10 14:22:52 +02:00
parent 122663d88b
commit 587c88e574
7 changed files with 53 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extra/find-unused-translation-strings.php
View File

@ -5,7 +5,7 @@
*/
if(count($argv) < 3) {
die('Usage: '.$argv[0].' <po-file> <pas-dfm-files>');
die('Usage: '.$argv[0].' <po-file> <pas-dfm-folder>');
}
$poFile = $argv[1];
@ -37,19 +37,38 @@ $stringsFound = array_combine(array_keys($msgIds), $zeros);
// Read files and count occurrences
foreach($sourceFiles as $sourceFile) {
$fileContents = file_get_contents($sourceFile);
$sourceContents = file_get_contents($sourceFile);
$sourceContents = preg_replace("#'\s*\+\s*'#", '', $sourceContents);
foreach ($msgIds as $i=>$msgId) {
// Double quote and backslash in translations are escaped with a backslash
$msgId = str_replace('\"', '"', $msgId);
$msgId = str_replace('\\\\', '\\', $msgId);
if(str_contains($fileContents, "'".$msgId."'")) {
// Delphi escapes a single quote with a second single quote
$msgId = str_replace("'", "''", $msgId);
if(str_contains($sourceContents, "'".$msgId."'")) {
$stringsFound[$i]++;
}
}
}
#var_dump($stringsFound);
$unusedNum = 0;
$poContentsNew = $poContents;
foreach($msgIds as $i=>$msgId) {
if($stringsFound[$i] == 0) {
echo "Unused string #".(++$unusedNum).": \"".$msgId."\"\n";
$poContentsNew = preg_replace("#(\r?\n\#[.:]\s+[^\n]*){0,10}\r?\nmsgid\s\"".preg_quote($msgId,'#')."\"\r?\nmsgstr\s\"".preg_quote($msgId, '#')."\"\r?\n#", '', $poContentsNew);
}
}
#$poContentsNew = preg_replace("/(\r?\n)(\r?\n#[.:]\s+[^\n]*){1,10}\r?\n(\r?\n)/", '\\1\\3', $poContentsNew);
#if(preg_last_error() != PREG_NO_ERROR) {
# throw new Exception(preg_last_error_msg());
#}
echo "\n";
echo "Used translation strings: ".(count($msgIds)-$unusedNum)."\n";
if($poContentsNew != $poContents) {
$poFileNew = $poFile.'-without-unused';
$bytesWritten = file_put_contents($poFileNew, $poContentsNew);
echo "New file written with ".(strlen($poContents)-strlen($poContentsNew))." removed bytes: ".$poFileNew."\n";
}

205
out/locale/en/LC_MESSAGES/default.po
View File

@ -153,21 +153,6 @@ msgstr "OK"
msgid "String:"
msgstr "String:"
#. frmClickFilter..groupValue..radioExpression..Caption
#: clickfilter.dfm:81
msgid "Expression:"
msgstr "Expression:"
#. frmClickFilter..groupConcatType..Caption
#: clickfilter.dfm:91
msgid "Append to current filter"
msgstr "Append to current filter"
#. frmClickFilter..groupConcatType....Items.Strings
#: clickfilter.dfm:96
msgid "Reset"
msgstr "Reset"
#. ColumnSelectionForm..pnlBevel..chkSelectAll..Caption
#: column_selection.dfm:55
msgid "Select / Deselect all"
@ -335,17 +320,6 @@ msgstr "Databases:"
msgid "Compressed client/server protocol"
msgstr "Compressed client/server protocol"
#. connform..PageControlDetails..tabSettings..comboNetType..Text
#. connform..PageControlDetails..tabSettings..comboNetType....Items.Strings
#: connections.dfm:359 connections.dfm:362
msgid "TCP/IP"
msgstr "TCP/IP"
#. connform..PageControlDetails..tabSettings..comboNetType....Items.Strings
#: connections.dfm:363
msgid "Named pipe"
msgstr "Named pipe"
#. connform..PageControlDetails..tabSettings..comboNetType....Items.Strings
#. connform..PageControlDetails..tabSSHtunnel..Caption
#: connections.dfm:364 connections.dfm:414
@ -418,11 +392,6 @@ msgstr "SSH host + port:"
msgid "Private key file:"
msgstr "Private key file:"
#. connform..PageControlDetails..tabSSHtunnel..lblDownloadPlink..Caption
#: connections.dfm:473
msgid "Download plink.exe"
msgstr "Download plink.exe"
#. connform..PageControlDetails..tabSSHtunnel..lblPlinkTimeout..Caption
#: connections.dfm:487
msgid "SSH timeout:"
@ -494,11 +463,6 @@ msgstr "Statistics"
msgid "Last connect:"
msgstr "Last connect:"
#. connform..PageControlDetails..tabStatistics..lblCounterLeft..Caption
#: connections.dfm:696
msgid "Counter:"
msgstr "Counter:"
#. connform..PageControlDetails..tabStatistics..lblCreatedLeft..Caption
#: connections.dfm:703
msgid "Created:"
@ -1569,11 +1533,6 @@ msgstr "Query"
msgid "Attributes"
msgstr "Attributes"
#. MainForm..MainMenu1..File1..Caption
#: main.dfm:1679
msgid "&File"
msgstr "&File"
#. MainForm..MainMenu1..File1..Hint
#: main.dfm:1680
msgid "File related commands"
@ -1584,11 +1543,6 @@ msgstr "File related commands"
msgid "Connect to"
msgstr "Connect to"
#. MainForm..MainMenu1..Edit1..Caption
#: main.dfm:1718
msgid "&Edit"
msgstr "&Edit"
#. MainForm..MainMenu1..Edit1..Hint
#: main.dfm:1719
msgid "Edit commands"
@ -1600,16 +1554,6 @@ msgstr "Edit commands"
msgid "Search"
msgstr "Search"
#. MainForm..MainMenu1..Extra1..Caption
#: main.dfm:1762
msgid "&Tools"
msgstr "&Tools"
#. MainForm..MainMenu1..Help1..Caption
#: main.dfm:1837
msgid "&Help"
msgstr "&Help"
#. MainForm..MainMenu1..Help1..Hint
#: main.dfm:1838
msgid "Help topics"
@ -2081,16 +2025,6 @@ msgstr "Support forum"
msgid "Changelog"
msgstr "Changelog"
#. MainForm..ActionList1..actReadme..Caption
#: main.dfm:2249
msgid "Readme"
msgstr "Readme"
#. MainForm..ActionList1..actReadme..Hint
#: main.dfm:2250
msgid "Open readme file"
msgstr "Open readme file"
#. MainForm..ActionList1..actSaveSQLAs..Hint
#: main.dfm:2258
msgid "Save SQL to a textfile"
@ -2460,11 +2394,6 @@ msgstr "Analyze selected process SQL"
msgid "EXPLAIN analyzer on MariaDB.org"
msgstr "EXPLAIN analyzer on MariaDB.org"
#. MainForm..popupHost..menuExplainAnalyzer..Hint
#: main.dfm:8701
msgid "Pass EXPLAIN output to MariaDB's analyzer webpage"
msgstr "Pass EXPLAIN output to MariaDB's analyzer webpage"
#: tabletools.pas:1061 main.pas:2855 connections.pas:1047
msgid "SQL files"
msgstr "SQL files"
@ -2841,11 +2770,6 @@ msgstr "Close tab on doubleclick and middleclick"
msgid "Show query warnings dialog"
msgstr "Show query warnings dialog"
#. optionsform..pagecontrolMain..tabHighlighter..Caption
#: options.dfm:483
msgid "Highlighter"
msgstr "Highlighter"
#. optionsform..pagecontrolMain..tabHighlighter..lblSQLColElement..Caption
#: options.dfm:497
msgid "Element:"
@ -2871,9 +2795,6 @@ msgstr "Bold"
msgid "Italic"
msgstr "Italic"
msgid "Size:"
msgstr "Size:"
msgid "Colors preset:"
msgstr "Colors preset:"
@ -3470,14 +3391,6 @@ msgstr "Remove column"
msgid "Copy selected columns"
msgstr "Copy selected columns"
#. grid export
msgid "Copy selected rows"
msgstr "Copy selected rows"
#. grid export
msgid "Copy selected rows in custom format"
msgstr "Copy selected rows in custom format"
#. frmTableEditor..popupColumns..menuPasteColumns..Caption
#: table_editor.dfm:803
msgid "Paste columns"
@ -3984,14 +3897,6 @@ msgstr "Settings for \"%s\" were changed."
msgid "Socket name:"
msgstr "Socket name:"
#: connections.pas:1049
msgid "Executables"
msgstr "Executables"
#: connections.pas:1051
msgid "PuTTY private key"
msgstr "PuTTY private key"
#: connections.pas:1053
msgid "Privacy Enhanced Mail certificates"
msgstr "Privacy Enhanced Mail certificates"
@ -4064,11 +3969,6 @@ msgstr "Unsupported \"NetType\" value (%d) found in settings for session \"%s\".
msgid "Loaded as MySQL/MariaDB session."
msgstr "Loaded as MySQL/MariaDB session."
#. Comes into SQL log when assigning dll procedures from libmysql.dll
#: dbconnection.pas:1038
msgid "Assign procedure \"%s\""
msgstr "Assign procedure \"%s\""
#: dbconnection.pas:1047
msgid "Your %s is incompatible to %s, or your system is missing a dependent library."
msgstr "Your %s is incompatible to %s, or your system is missing a dependent library."
@ -4138,9 +4038,6 @@ msgstr "OLE DB property \"%s\": %s"
msgid "Loading library file %s ..."
msgstr "Loading library file %s ..."
msgid "Trying to load library with full path: %s"
msgstr "Trying to load library with full path: %s"
#. DLL loading fails on one procedure
msgid "Library error in %s: Could not find procedure address for \"%s\""
msgstr "Library error in %s: Could not find procedure address for \"%s\""
@ -4148,10 +4045,6 @@ msgstr "Library error in %s: Could not find procedure address for \"%s\""
msgid "Library %s could not be loaded. Please select a different one."
msgstr "Library %s could not be loaded. Please select a different one."
#. DLL loading failed entirely
msgid "Library %s seems unusable. Please select a different one."
msgstr "Library %s seems unusable. Please select a different one."
#: dbconnection.pas:1392
msgid "Please launch %s from the directory where you have installed it. Or just reinstall %s."
msgstr "Please launch %s from the directory where you have installed it. Or just reinstall %s."
@ -4409,10 +4302,6 @@ msgstr "Attempt to write session setting without session path"
msgid "%u files, %s, %u files selected."
msgstr "%u files, %s, %u files selected."
#: loaddata.pas:176
msgid "Let server/database decide"
msgstr "Let server/database decide"
#: loaddata.pas:315
msgid "Your file was imported but the server returned %s warnings and/or notes. See the log panel for details."
msgstr "Your file was imported but the server returned %s warnings and/or notes. See the log panel for details."
@ -4509,8 +4398,8 @@ msgid "Checking queries for unsafe UPDATEs/DELETEs ..."
msgstr "Checking queries for unsafe UPDATEs/DELETEs ..."
#. Query execution
msgid "Your query contains UPDATEs and/or DELETEs without a WHERE clause. Please confirm that you know what you''re doing."
msgstr "Your query contains UPDATEs and/or DELETEs without a WHERE clause. Please confirm that you know what you''re doing."
msgid "Your query contains UPDATEs and/or DELETEs without a WHERE clause. Please confirm that you know what you're doing."
msgstr "Your query contains UPDATEs and/or DELETEs without a WHERE clause. Please confirm that you know what you're doing."
#: main.pas:2166
msgid "Query profiling requires %s or later, and the server must not be configured with %s."
@ -5230,16 +5119,6 @@ msgstr "Same as source"
msgid "Create missing %s"
msgstr "Create missing %s"
#. TODO
#: tabletools.pas:155
msgid "Skipped"
msgstr "Skipped"
#. TODO
#: tabletools.pas:156
msgid "One big file"
msgstr "One big file"
#. TODO
#: tabletools.pas:158
msgid "Directory - one file per object in database subdirectories"
@ -5250,21 +5129,6 @@ msgstr "Directory - one file per object in database subdirectories"
msgid "No data"
msgstr "No data"
#. TODO
#: tabletools.pas:162
msgid "truncate existing data"
msgstr "truncate existing data"
#. TODO
#: tabletools.pas:164
msgid "do not update existing"
msgstr "do not update existing"
#. TODO
#: tabletools.pas:165
msgid "existing data"
msgstr "existing data"
#. Export SQL data
msgid "Max INSERT size:"
msgstr "Max INSERT size:"
@ -5345,15 +5209,12 @@ msgstr "Selected operations cannot be applied to a %s"
msgid "Unhandled tree level"
msgstr "Unhandled tree level"
msgid "Export finished"
msgstr "Export finished"
msgid "%s finished"
msgstr "%s finished"
#: table_editor.pas:380
msgid "%s Index \"%s\" does not contain any column. You can add columns using drag''n drop from the columns list."
msgstr "%s Index \"%s\" does not contain any column. You can add columns using drag''n drop from the columns list."
msgid "%s Index \"%s\" does not contain any column. You can add columns using drag'n drop from the columns list."
msgstr "%s Index \"%s\" does not contain any column. You can add columns using drag'n drop from the columns list."
#: table_editor.pas:476
msgid "Composing ALTER statement ..."
@ -5375,10 +5236,6 @@ msgstr "Add duplicated column to index?"
msgid "Index \"%s\" already contains the column \"%s\". It is possible to add a column twice into a index, but total nonsense in practice."
msgstr "Index \"%s\" already contains the column \"%s\". It is possible to add a column twice into a index, but total nonsense in practice."
#: table_editor.pas:1815
msgid "The selected table engine (%s) does not support foreign keys."
msgstr "The selected table engine (%s) does not support foreign keys."
#: table_editor.pas:1946
msgid "Key already exists. Really create another identical one?"
msgstr "Key already exists. Really create another identical one?"
@ -5399,10 +5256,6 @@ msgstr "Reference table \"%s\" seems to be missing, broken or non-accessible."
msgid "Trigger definition not found!"
msgstr "Trigger definition not found!"
#: updatecheck.pas:76
msgid "Initializing"
msgstr "Initializing"
#: updatecheck.pas:77
msgid "Check for %s updates"
msgstr "Check for %s updates"
@ -5411,10 +5264,6 @@ msgstr "Check for %s updates"
msgid "Downloading check file"
msgstr "Downloading check file"
#: updatecheck.pas:95
msgid "Reading check file"
msgstr "Reading check file"
#: updatecheck.pas:100
msgid "Error: Cannot determine current revision. Using a developer version?"
msgstr "Error: Cannot determine current revision. Using a developer version?"
@ -5427,10 +5276,6 @@ msgstr "Your %s is up-to-date (no update available)."
msgid "Updates available."
msgstr "Updates available."
#. Update button on top right of main window
msgid "Update available"
msgstr "Update available"
#: updatecheck.pas:147
msgid "Version %s (yours: %s)"
msgstr "Version %s (yours: %s)"
@ -5523,10 +5368,6 @@ msgstr "Unhandled privilege object: %s"
msgid "Delete user %s@%s?"
msgstr "Delete user %s@%s?"
#. dbconnection.pas
msgid "experimental"
msgstr "experimental"
#. dbconnection.pas
msgid "Yes"
msgstr "Yes"
@ -5716,8 +5557,8 @@ msgid "Unhandled tree node index"
msgstr "Unhandled tree node index"
#. const.inc
msgid "Selected columns don''t contain a sufficient set of key columns to allow editing. Please select primary or unique key columns, or just all columns."
msgstr "Selected columns don''t contain a sufficient set of key columns to allow editing. Please select primary or unique key columns, or just all columns."
msgid "Selected columns don't contain a sufficient set of key columns to allow editing. Please select primary or unique key columns, or just all columns."
msgstr "Selected columns don't contain a sufficient set of key columns to allow editing. Please select primary or unique key columns, or just all columns."
#. const.inc
msgid "Idle."
@ -5945,10 +5786,6 @@ msgstr "%s%% of your file has been processed, but there were %s errors when exec
msgid "Notice: You can disable the \"%s\" option to ignore such errors"
msgstr "Notice: You can disable the \"%s\" option to ignore such errors"
#. ReadTextFileChunk
msgid "End of file block was cut within some multibyte character, at position %s. Increasing chunk size and retry reading..."
msgstr "End of file block was cut within some multibyte character, at position %s. Increasing chunk size and retry reading..."
#. InitConnection, JumpList
msgid "Recent sessions"
msgstr "Recent sessions"
@ -5999,9 +5836,6 @@ msgstr "Query timeout:"
msgid "Ping every X seconds:"
msgstr "Ping every X seconds:"
msgid "Connection attempts:"
msgstr "Connection attempts:"
msgid "Pop up SQL text over result tabs"
msgstr "Pop up SQL text over result tabs"
@ -6359,9 +6193,6 @@ msgstr "Remove AUTO_INCREMENT clauses"
msgid "Remove DEFINER clauses"
msgstr "Remove DEFINER clauses"
msgid "%s%s missing."
msgstr "%s%s missing."
msgid "Filename or path contains illegal characters: \"%s\""
msgstr "Filename or path contains illegal characters: \"%s\""
@ -6462,18 +6293,6 @@ msgstr "Please update %s through the Microsoft Store."
msgid "detected"
msgstr "detected"
msgid "Migrating snippet files to new folder: %s"
msgstr "Migrating snippet files to new folder: %s"
msgid "Successfully moved \"%s\" to \"%s\""
msgstr "Successfully moved \"%s\" to \"%s\""
msgid "Error: Could not move \"%s\" to \"%s\" (Error: %s)"
msgstr "Error: Could not move \"%s\" to \"%s\" (Error: %s)"
msgid "Scaling font size from %d to %d."
msgstr "Scaling font size from %d to %d."
msgid "Current custom settings"
msgstr "Current custom settings"
@ -6735,9 +6554,6 @@ msgstr "Empty recent filters"
msgid "Customize highlighter"
msgstr "Customize highlighter"
msgid "Example text"
msgstr "Example text"
msgid "Color picker"
msgstr "Color picker"
@ -6776,3 +6592,12 @@ msgstr "Copy with tabs to spaces"
msgid "Connection properties"
msgstr "Connection properties"
msgid "Recent prompts:"
msgstr "Recent prompts:"
msgid "Generate SQL"
msgstr "Generate SQL"
msgid "Execute in new tab"
msgstr "Execute in new tab"

2
source/editvar.pas
View File

@ -78,7 +78,7 @@ begin
FVar := MySQLVariables[i];
Found := True;
if not FVar.IsDynamic then
raise EVariableError.CreateFmt(_('"%s" is a read only variable, not editable.'), [Value]);
raise EVariableError.CreateFmt(_('"%s" is a read only variable, not editable'), [Value]);
break;
end;
end;

15
source/main.pas
View File

@ -12851,8 +12851,17 @@ begin
Keystroke.ShortCut2 := Shortcut2;
except
on E:ESynKeyError do begin
LogSQL(f_('Could not apply SynEdit keystroke shortcut "%s" (or secondary: "%s") to %s. %s. Please go to Tools > Preferences > Shortcuts to change this settings.',
[ShortCutToText(Shortcut1), ShortCutToText(Shortcut2), EditorCommandToCodeString(Keystroke.Command), E.Message, _('Tools'), _('Preferences'), _('Shortcuts')]), lcError);
LogSQL(f_('Could not apply SynEdit keystroke shortcut "%s" (or secondary: "%s") to %s. %s. Please go to %s > %s > %s to change this settings.',
[
ShortCutToText(Shortcut1),
ShortCutToText(Shortcut2),
EditorCommandToCodeString(Keystroke.Command),
E.Message,
_('Tools'),
_('Preferences'),
_('Shortcuts')
]),
lcError);
end;
end;
end;
@ -14547,7 +14556,7 @@ begin
Screen.Cursor := crHourGlass;
Filesize := _GetFileSize(Filepath);
LoadSuccess := False;
MainForm.LogSQL(f_('Loading file "%s" (%s) into query tab #%d ...', [Filepath, FormatByteNumber(Filesize), Number]), lcInfo);
MainForm.LogSQL(f_('Loading file "%s" (%s) into query tab #%d', [Filepath, FormatByteNumber(Filesize), Number]), lcInfo);
try
Content := ReadTextfile(Filepath, Encoding);
LoadSuccess := True;

2
source/searchreplace.pas
View File

@ -149,7 +149,7 @@ begin
if QueryTabOpen then
ItemLabel := _('Result grid')+': '+ActiveQueryTab.tabsetQuery.Tabs[ActiveQueryTab.tabsetQuery.TabIndex]
else
ItemLabel := _('Data grid');
ItemLabel := _('Data Grid');
comboSearchIn.Items.AddObject(ItemLabel, ResultGrid);
if ResultGrid.Focused then
comboSearchIn.ItemIndex := comboSearchIn.Items.Count-1;

2
source/tabletools.pas
View File

@ -1803,7 +1803,7 @@ begin
Output('-- '+_('Data exporting was unselected.')+CRLF+CRLF, False, True, True, False, False);
end else if MatchText(DBObj.Engine, ['MRG_MYISAM', 'FEDERATED']) then begin
if menuExportAddComments.Checked then
Output('-- '+f_('Table data not exported because this is %s table which holds its data in separate tables.', [DBObj.Engine])+CRLF+CRLF, False, True, True, False, False);
Output('-- '+f_('Table data not exported because this is a %s table which holds its data in separate tables.', [DBObj.Engine])+CRLF+CRLF, False, True, True, False, False);
end else begin
tmp := FormatNumber(DBObj.Rows)+' rows';
if LowerCase(DBObj.Engine) = 'innodb' then