Make message strings from const.inc translatable

This commit is contained in:
Ansgar Becker
2012-11-29 06:15:44 +00:00
parent 9d8b4cd83a
commit 645a9f3c7f
10 changed files with 96 additions and 40 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: HeidiSQL\n" "Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n" "POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2012-11-29 00:24+0100\n" "PO-Revision-Date: 2012-11-29 07:04+0100\n"
"Last-Translator: Ansgar Becker <heidisql@anse.de>\n" "Last-Translator: Ansgar Becker <heidisql@anse.de>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/" "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
"language/en/)\n" "language/en/)\n"
@ -4141,10 +4141,6 @@ msgstr "%u files, %s, %u files selected."
msgid "Let server/database decide" msgid "Let server/database decide"
msgstr "Let server/database decide" msgstr "Let server/database decide"
#: loaddata.pas:201
msgid "Unsupported by this server"
msgstr "Unsupported by this server"
#: loaddata.pas:315 #: loaddata.pas:315
msgid "" msgid ""
"Your file was imported but the server returned %s warnings and/or notes. See " "Your file was imported but the server returned %s warnings and/or notes. See "
@ -5406,3 +5402,63 @@ msgstr "Snippets"
#. table_editor.pas #. table_editor.pas
msgid "Index" msgid "Index"
msgstr "Index" msgstr "Index"
#. const.inc
msgid ""
"This file contains NUL characters. They have been converted to ASCII spaces "
"(SP)."
msgstr ""
"This file contains NUL characters. They have been converted to ASCII spaces "
"(SP)."
#. const.inc
msgid ""
"This cell contains NUL characters. They have been converted to ASCII spaces "
"(SP). Press ESC to cancel editing."
msgstr ""
"This cell contains NUL characters. They have been converted to ASCII spaces "
"(SP). Press ESC to cancel editing."
#. const.inc
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."
#. const.inc
msgid "Idle."
msgstr "Idle."
#. const.inc
msgid "Unsupported by this server"
msgstr "Unsupported by this server"
#. const.inc
msgid "Unsupported datatype for setting \"%s\""
msgstr "Unsupported datatype for setting \"%s\""
#. const.inc
msgid "SQL Error (%d): %s"
msgstr "SQL Error (%d): %s"
#. const.inc
msgid "SQL Error (%d) in statement #%d: %s"
msgstr "SQL Error (%d) in statement #%d: %s"
#. const.inc
msgid "Unhandled connection type (%d)"
msgstr "Unhandled connection type (%d)"
#. const.inc
msgid "Connection to %s closed at %s"
msgstr "Connection to %s closed at %s"
#. const.inc
msgid "Column #%d not available. Query returned %d columns and %d rows."
msgstr "Column #%d not available. Query returned %d columns and %d rows."

View File

@ -84,7 +84,7 @@ const
SUnhandledNodeIndex = 'Unhandled tree node index'; SUnhandledNodeIndex = 'Unhandled tree node index';
MSG_NOGRIDEDITING = '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.'; MSG_NOGRIDEDITING = '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.';
SIdle = 'Idle.'; SIdle = 'Idle.';
SUnsupported = 'Not supported by this server'; SUnsupported = 'Unsupported by this server';
SUnsupportedSettingsDatatype = 'Unsupported datatype for setting "%s"'; SUnsupportedSettingsDatatype = 'Unsupported datatype for setting "%s"';
MsgSQLError: String = 'SQL Error (%d): %s'; MsgSQLError: String = 'SQL Error (%d): %s';
MsgSQLErrorMultiStatements: String = 'SQL Error (%d) in statement #%d: %s'; MsgSQLErrorMultiStatements: String = 'SQL Error (%d) in statement #%d: %s';

View File

@ -175,7 +175,7 @@ begin
nKeys: Option := asCopyTableKeys; nKeys: Option := asCopyTableKeys;
nForeignKeys: Option := asCopyTableForeignKeys; nForeignKeys: Option := asCopyTableForeignKeys;
nData: Option := asCopyTableData; nData: Option := asCopyTableData;
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
if not (vsDisabled in Node.States) then if not (vsDisabled in Node.States) then
AppSettings.WriteBool(Option, Node.CheckState in CheckedStates); AppSettings.WriteBool(Option, Node.CheckState in CheckedStates);
@ -229,13 +229,13 @@ begin
nKeys: ImageIndex := 13; nKeys: ImageIndex := 13;
nForeignKeys: ImageIndex := ICONINDEX_FOREIGNKEY; nForeignKeys: ImageIndex := ICONINDEX_FOREIGNKEY;
nData: ImageIndex := 41; nData: ImageIndex := 41;
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
1: case Node.Parent.Index of 1: case Node.Parent.Index of
nColumns: ImageIndex := ICONINDEX_FIELD; nColumns: ImageIndex := ICONINDEX_FIELD;
nKeys: ImageIndex := GetIndexIcon(FKeys[Node.Index].IndexType); nKeys: ImageIndex := GetIndexIcon(FKeys[Node.Index].IndexType);
nForeignKeys: ImageIndex := ICONINDEX_FOREIGNKEY; nForeignKeys: ImageIndex := ICONINDEX_FOREIGNKEY;
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
end; end;
end; end;
@ -255,7 +255,7 @@ begin
nKeys: CellText := _('Indexes'); nKeys: CellText := _('Indexes');
nForeignKeys: CellText := _('Foreign keys'); nForeignKeys: CellText := _('Foreign keys');
nData: CellText := f_('Data (%s rows)', [FormatNumber(FDBObj.Rows)]); nData: CellText := f_('Data (%s rows)', [FormatNumber(FDBObj.Rows)]);
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
if Node.Index <> nData then begin if Node.Index <> nData then begin
CheckedCount := 0; CheckedCount := 0;
@ -272,7 +272,7 @@ begin
nColumns: CellText := FColumns[Node.Index].Name; nColumns: CellText := FColumns[Node.Index].Name;
nKeys: CellText := FKeys[Node.Index].Name; nKeys: CellText := FKeys[Node.Index].Name;
nForeignKeys: CellText := FForeignKeys[Node.Index].KeyName; nForeignKeys: CellText := FForeignKeys[Node.Index].KeyName;
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
end; end;
end; end;
@ -288,7 +288,7 @@ begin
nKeys: ChildCount := FKeys.Count; nKeys: ChildCount := FKeys.Count;
nForeignKeys: ChildCount := FForeignKeys.Count; nForeignKeys: ChildCount := FForeignKeys.Count;
nData: ChildCount := 0; nData: ChildCount := 0;
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
else ChildCount := 0; else ChildCount := 0;
end; end;
@ -310,7 +310,7 @@ begin
nKeys: begin Option := asCopyTableKeys; ChildCount := FKeys.Count; end; nKeys: begin Option := asCopyTableKeys; ChildCount := FKeys.Count; end;
nForeignKeys: begin Option := asCopyTableForeignKeys; ChildCount := FForeignKeys.Count; end; nForeignKeys: begin Option := asCopyTableForeignKeys; ChildCount := FForeignKeys.Count; end;
nData: begin Option := asCopyTableData; ChildCount := -1; end; nData: begin Option := asCopyTableData; ChildCount := -1; end;
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
if ChildCount > 0 then if ChildCount > 0 then
Include(InitialStates, ivsHasChildren); Include(InitialStates, ivsHasChildren);
@ -396,7 +396,7 @@ begin
nColumns: SelectedColumns.Add(FColumns[Node.Index]); nColumns: SelectedColumns.Add(FColumns[Node.Index]);
nKeys: SelectedKeys.Add(FKeys[Node.Index]); nKeys: SelectedKeys.Add(FKeys[Node.Index]);
nForeignkeys: SelectedForeignKeys.Add(FForeignKeys[Node.Index]); nForeignkeys: SelectedForeignKeys.Add(FForeignKeys[Node.Index]);
else raise Exception.Create(SUnhandledNodeIndex); else raise Exception.Create(_(SUnhandledNodeIndex));
end; end;
end; end;
Node := TreeElements.GetNextSibling(Node); Node := TreeElements.GetNextSibling(Node);

View File

@ -748,7 +748,7 @@ begin
ngMSSQL: ngMSSQL:
Result := TAdoDBConnection.Create(AOwner); Result := TAdoDBConnection.Create(AOwner);
else else
raise Exception.CreateFmt(MsgUnhandledNetType, [Integer(FNetType)]); raise Exception.CreateFmt(_(MsgUnhandledNetType), [Integer(FNetType)]);
end; end;
Result.Parameters := Self; Result.Parameters := Self;
end; end;
@ -762,7 +762,7 @@ begin
ngMSSQL: ngMSSQL:
Result := TAdoDBQuery.Create(AOwner); Result := TAdoDBQuery.Create(AOwner);
else else
raise Exception.CreateFmt(MsgUnhandledNetType, [Integer(FNetType)]); raise Exception.CreateFmt(_(MsgUnhandledNetType), [Integer(FNetType)]);
end; end;
end; end;
@ -817,7 +817,7 @@ begin
ntMSSQL_NamedPipe, ntMSSQL_TCPIP, ntMSSQL_SPX, ntMSSQL_VINES, ntMSSQL_RPC: ntMSSQL_NamedPipe, ntMSSQL_TCPIP, ntMSSQL_SPX, ntMSSQL_VINES, ntMSSQL_RPC:
Result := ngMSSQL; Result := ngMSSQL;
else else
raise Exception.CreateFmt(MsgUnhandledNetType, [Integer(FNetType)]); raise Exception.CreateFmt(_(MsgUnhandledNetType), [Integer(FNetType)]);
end; end;
end; end;
@ -1185,7 +1185,7 @@ begin
FConnectionStarted := 0; FConnectionStarted := 0;
FHandle := nil; FHandle := nil;
ClosePlink; ClosePlink;
Log(lcInfo, Format(MsgDisconnect, [FParameters.Hostname, DateTimeToStr(Now)])); Log(lcInfo, f_(MsgDisconnect, [FParameters.Hostname, DateTimeToStr(Now)]));
end; end;
end; end;
@ -1294,7 +1294,7 @@ begin
FActive := False; FActive := False;
ClearCache(False); ClearCache(False);
FConnectionStarted := 0; FConnectionStarted := 0;
Log(lcInfo, Format(MsgDisconnect, [FParameters.Hostname, DateTimeToStr(Now)])); Log(lcInfo, f_(MsgDisconnect, [FParameters.Hostname, DateTimeToStr(Now)]));
end; end;
end; end;
@ -1711,7 +1711,7 @@ begin
lntTable, lntView: Column := 1; lntTable, lntView: Column := 1;
lntFunction, lntProcedure, lntTrigger: Column := 2; lntFunction, lntProcedure, lntTrigger: Column := 2;
lntEvent: Column := 3; lntEvent: Column := 3;
else Exception.CreateFmt(_('Unhandled list node type in %s.GetCreateCode'), [ClassName]); else Exception.CreateFmt(_('Unhandled list node type in %s.%s'), [ClassName, 'GetCreateCode']);
end; end;
if NodeType = lntView then if NodeType = lntView then
Result := GetCreateViewCode(Database, Name) Result := GetCreateViewCode(Database, Name)
@ -1904,9 +1904,9 @@ begin
end; end;
rx.Free; rx.Free;
if FStatementNum = 1 then if FStatementNum = 1 then
Result := Format(MsgSQLError, [LastErrorCode, Msg]) Result := f_(MsgSQLError, [LastErrorCode, Msg])
else else
Result := Format(MsgSQLErrorMultiStatements, [LastErrorCode, FStatementNum, Msg]); Result := f_(MsgSQLErrorMultiStatements, [LastErrorCode, FStatementNum, Msg]);
end; end;
@ -1927,7 +1927,7 @@ begin
rx.Free; rx.Free;
end else end else
Msg := _('unknown'); Msg := _('unknown');
Result := Format(MsgSQLError, [LastErrorCode, Msg]); Result := f_(MsgSQLError, [LastErrorCode, Msg]);
end; end;
@ -3977,7 +3977,7 @@ begin
end; end;
end else if not IgnoreErrors then end else if not IgnoreErrors then
Raise EDatabaseError.CreateFmt(MsgInvalidColumn, [Column, ColumnCount, RecordCount]); Raise EDatabaseError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
end; end;
@ -3994,7 +3994,7 @@ begin
end; end;
end; end;
end else if not IgnoreErrors then end else if not IgnoreErrors then
Raise EDatabaseError.CreateFmt(MsgInvalidColumn, [Column, ColumnCount, RecordCount]); Raise EDatabaseError.CreateFmt(_(MsgInvalidColumn), [Column, ColumnCount, RecordCount]);
end; end;
@ -4676,7 +4676,7 @@ var
i: Integer; i: Integer;
begin begin
if GetKeyColumns.Count = 0 then if GetKeyColumns.Count = 0 then
raise EDatabaseError.Create(MSG_NOGRIDEDITING); raise EDatabaseError.Create(_(MSG_NOGRIDEDITING));
// All column names must be present in order to send valid INSERT/UPDATE/DELETE queries // All column names must be present in order to send valid INSERT/UPDATE/DELETE queries
for i:=0 to FColumnOrgNames.Count-1 do begin for i:=0 to FColumnOrgNames.Count-1 do begin
if FColumnOrgNames[i] = '' then if FColumnOrgNames[i] = '' then

View File

@ -1104,7 +1104,7 @@ begin
FEdit.Font.Color := clWindowText; FEdit.Font.Color := clWindowText;
FPanel.Color := FCellBackground; FPanel.Color := FCellBackground;
if ScanNulChar(FCellText) then begin if ScanNulChar(FCellText) then begin
MessageDialog(SContainsNulCharGrid, mtInformation, [mbOK]); MessageDialog(_(SContainsNulCharGrid), mtInformation, [mbOK]);
FEdit.Text := RemoveNulChars(FCellText); FEdit.Text := RemoveNulChars(FCellText);
end else end else
FEdit.Text := FCellText; FEdit.Text := FCellText;

View File

@ -3345,7 +3345,7 @@ begin
adInt: I := FSettings[Index].CurrentInt; adInt: I := FSettings[Index].CurrentInt;
adBool: B := FSettings[Index].CurrentBool; adBool: B := FSettings[Index].CurrentBool;
adString: S := FSettings[Index].CurrentString; adString: S := FSettings[Index].CurrentString;
else raise Exception.CreateFmt(SUnsupportedSettingsDatatype, [FSettings[Index].Name]); else raise Exception.CreateFmt(_(SUnsupportedSettingsDatatype), [FSettings[Index].Name]);
end; end;
end else if FRegistry.ValueExists(ValueName) then begin end else if FRegistry.ValueExists(ValueName) then begin
Inc(FReads); Inc(FReads);
@ -3353,7 +3353,7 @@ begin
adInt: I := FRegistry.ReadInteger(ValueName); adInt: I := FRegistry.ReadInteger(ValueName);
adBool: B := FRegistry.ReadBool(ValueName); adBool: B := FRegistry.ReadBool(ValueName);
adString: S := FRegistry.ReadString(ValueName); adString: S := FRegistry.ReadString(ValueName);
else raise Exception.CreateFmt(SUnsupportedSettingsDatatype, [FSettings[Index].Name]); else raise Exception.CreateFmt(_(SUnsupportedSettingsDatatype), [FSettings[Index].Name]);
end; end;
end; end;
if (FormatName = '') and (FSessionPath = '') then begin if (FormatName = '') and (FSessionPath = '') then begin
@ -3443,7 +3443,7 @@ begin
FSettings[Index].CurrentString := S; FSettings[Index].CurrentString := S;
end; end;
else else
raise Exception.CreateFmt(SUnsupportedSettingsDatatype, [FSettings[Index].Name]); raise Exception.CreateFmt(_(SUnsupportedSettingsDatatype), [FSettings[Index].Name]);
end; end;
if SameAsDefault and FRegistry.ValueExists(ValueName) then if SameAsDefault and FRegistry.ValueExists(ValueName) then
FRegistry.DeleteValue(ValueName); FRegistry.DeleteValue(ValueName);

View File

@ -198,7 +198,7 @@ begin
SelectedCharsetIndex := 0; SelectedCharsetIndex := 0;
comboEncoding.ItemIndex := SelectedCharsetIndex; comboEncoding.ItemIndex := SelectedCharsetIndex;
end else begin end else begin
comboEncoding.Items.Add(_('Unsupported by this server')); comboEncoding.Items.Add(_(SUnsupported));
comboEncoding.ItemIndex := 0; comboEncoding.ItemIndex := 0;
end; end;
end else begin end else begin

View File

@ -1073,7 +1073,7 @@ var
begin begin
// Show message in some statusbar panel // Show message in some statusbar panel
if (PanelNr = 6) and (Msg = '') then if (PanelNr = 6) and (Msg = '') then
Msg := SIdle; Msg := _(SIdle);
if Msg <> StatusBar.Panels[PanelNr].Text then begin if Msg <> StatusBar.Panels[PanelNr].Text then begin
StatusBar.Panels[PanelNr].Text := Msg; StatusBar.Panels[PanelNr].Text := Msg;
if PanelNr = 6 then begin if PanelNr = 6 then begin
@ -1103,7 +1103,7 @@ begin
ImageIndex := Conn.Parameters.ImageIndex; ImageIndex := Conn.Parameters.ImageIndex;
end; end;
6: begin 6: begin
if Panel.Text = SIdle then if Panel.Text = _(SIdle) then
ImageIndex := 151 // Green dot ImageIndex := 151 // Green dot
else else
ImageIndex := 150; // Hourglass ImageIndex := 150; // Hourglass
@ -5543,7 +5543,7 @@ begin
if ActiveConnection.ServerVersionInt >= 40003 then if ActiveConnection.ServerVersionInt >= 40003 then
menuEditVariable.Enabled := (PageControlHost.ActivePage = tabVariables) and Assigned(ListVariables.FocusedNode) menuEditVariable.Enabled := (PageControlHost.ActivePage = tabVariables) and Assigned(ListVariables.FocusedNode)
else else
menuEditVariable.Hint := SUnsupported; menuEditVariable.Hint := _(SUnsupported);
end; end;
procedure TMainForm.Saveastextfile1Click(Sender: TObject); procedure TMainForm.Saveastextfile1Click(Sender: TObject);
@ -7192,7 +7192,7 @@ begin
ngMSSQL: ngMSSQL:
SynSQLSyn1.SQLDialect := sqlMSSQL2K; SynSQLSyn1.SQLDialect := sqlMSSQL2K;
else else
raise Exception.CreateFmt(MsgUnhandledNetType, [Integer(FActiveDbObj.Connection.Parameters.NetType)]); raise Exception.CreateFmt(_(MsgUnhandledNetType), [Integer(FActiveDbObj.Connection.Parameters.NetType)]);
end; end;
end; end;
if (FActiveDbObj.NodeType <> lntNone) if (FActiveDbObj.NodeType <> lntNone)
@ -8869,7 +8869,7 @@ begin
tabEditor.ImageIndex := ActiveObjectEditor.DBObject.ImageIndex; tabEditor.ImageIndex := ActiveObjectEditor.DBObject.ImageIndex;
Cap := _(ActiveObjectEditor.DBObject.ObjType)+': '; Cap := _(ActiveObjectEditor.DBObject.ObjType)+': ';
if ActiveObjectEditor.DBObject.Name = '' then if ActiveObjectEditor.DBObject.Name = '' then
Cap := Cap + '['+_('Unnamed')+']' Cap := Cap + '['+_('Untitled')+']'
else else
Cap := sstr(Cap + ActiveObjectEditor.DBObject.Name, 30); Cap := sstr(Cap + ActiveObjectEditor.DBObject.Name, 30);
SetTabCaption(tabEditor.PageIndex, Cap); SetTabCaption(tabEditor.PageIndex, Cap);
@ -10846,7 +10846,7 @@ begin
if ScanNulChar(Content) then begin if ScanNulChar(Content) then begin
Content := RemoveNulChars(Content); Content := RemoveNulChars(Content);
MessageDialog(SContainsNulCharFile, mtInformation, [mbOK]); MessageDialog(_(SContainsNulCharFile), mtInformation, [mbOK]);
end; end;
Memo.BeginUpdate; Memo.BeginUpdate;

View File

@ -280,7 +280,7 @@ begin
if idx = -1 then idx := 0; if idx = -1 then idx := 0;
comboOperation.Items.CommaText := 'Check,Analyze,Checksum,Optimize,Repair'; comboOperation.Items.CommaText := 'Check,Analyze,Checksum,Optimize,Repair';
if Mainform.ActiveConnection.ServerVersionInt < 40101 then if Mainform.ActiveConnection.ServerVersionInt < 40101 then
comboOperation.Items.Text := StringReplace(comboOperation.Items.Text, 'Checksum', 'Checksum ('+SUnsupported+')', [rfReplaceAll]); comboOperation.Items.Text := StringReplace(comboOperation.Items.Text, 'Checksum', 'Checksum ('+_(SUnsupported)+')', [rfReplaceAll]);
comboOperation.ItemIndex := idx; comboOperation.ItemIndex := idx;
comboOperation.OnChange(Sender); comboOperation.OnChange(Sender);
@ -370,7 +370,7 @@ begin
lblCheckedSize.Caption := f_('Selected objects size: %s', [FormatByteNumber(FObjectSizes)]); lblCheckedSize.Caption := f_('Selected objects size: %s', [FormatByteNumber(FObjectSizes)]);
if tabsTools.ActivePage = tabMaintenance then begin if tabsTools.ActivePage = tabMaintenance then begin
btnExecute.Caption := _('Execute'); btnExecute.Caption := _('Execute');
btnExecute.Enabled := (Pos(SUnsupported, comboOperation.Text) = 0) and SomeChecked; btnExecute.Enabled := (Pos(_(SUnsupported), comboOperation.Text) = 0) and SomeChecked;
// Only enable available options // Only enable available options
op := LowerCase(comboOperation.Text); op := LowerCase(comboOperation.Text);
chkQuick.Enabled := (op = 'check') or (op = 'checksum') or (op = 'repair'); chkQuick.Enabled := (op = 'check') or (op = 'checksum') or (op = 'repair');

View File

@ -104,7 +104,7 @@ begin
text := StringReplace(text, LB, CRLF, [rfReplaceAll]); text := StringReplace(text, LB, CRLF, [rfReplaceAll]);
if ScanNulChar(text) then begin if ScanNulChar(text) then begin
MessageDialog(SContainsNulCharGrid, mtInformation, [mbOK]); MessageDialog(_(SContainsNulCharGrid), mtInformation, [mbOK]);
text := RemoveNulChars(text); text := RemoveNulChars(text);
end; end;