removed some doubles from the resourcestrings from Graeme

git-svn-id: trunk@9958 -

ide/idetranslations.pas

@@ -121,6 +121,8 @@ begin
     Result:=rsLanguageChinese
   else if CompareText(ID,'id')=0 then
     Result:=rsLanguageIndonesian
+  else if CompareText(ID,'af_ZA')=0 then
+    Result:=rsLanguageAfrikaans
   else
     Result:=ID;
 end;

ide/keymapping.pp

@@ -1246,16 +1246,16 @@ begin
     ecGotoEditor0            : Result:= Format(srkmecGotoEditor,[cmd-ecGotoEditor1]);
 
     // file menu
-    ecNew                    : Result:= srkmecNew;
+    ecNew                    : Result:= lisMenuNewOther;
-    ecNewUnit                : Result:= srkmecNewUnit;
+    ecNewUnit                : Result:= lisMenuNewUnit;
-    ecNewForm                : Result:= srkmecNewForm;
+    ecNewForm                : Result:= lisMenuNewForm;
     ecOpen                   : Result:= lisMenuOpen;
     ecRevert                 : Result:= lisMenuRevert;
     ecSave                   : Result:= lisMenuSave;
-    ecSaveAs                 : Result:= srkmecSaveAs;
+    ecSaveAs                 : Result:= lisMenuSaveAs;
-    ecSaveAll                : Result:= srkmecSaveAll;
+    ecSaveAll                : Result:= lisMenuSaveAll;
-    ecClose                  : Result:= lismenuclose;
+    ecClose                  : Result:= lisMenuClose;
-    ecCloseAll               : Result:= srkmecCloseAll;
+    ecCloseAll               : Result:= lisMenuCloseAll;
     ecCleanDirectory         : Result:= lisMenuCleanDirectory;
     ecRestart                : Result:= lisMenuRestart;
     ecQuit                   : Result:= lisMenuQuit;
@@ -1415,7 +1415,7 @@ begin
     ecRescanFPCSrcDir        : Result:= lisMenuRescanFPCSourceDirectory;
 
     // help menu
-    ecAboutLazarus           : Result:= lisMenuAboutLazarus;
+    ecAboutLazarus           : Result:= lisAboutLazarus;
     ecOnlineHelp             : Result:= lisMenuOnlineHelp;
     ecConfigureHelp          : Result:= lisMenuConfigureHelp;
     ecContextHelp            : Result:= lisMenuContextHelp;

ide/lazarusidestrconsts.pas

@@ -143,9 +143,8 @@ resourcestring
   lisMenuNewUnit = 'New Unit';
   lisMenuNewForm = 'New Form';
   lisMenuNewOther = 'New ...';
-  lisMenuOpen = 'Open';
+  lisMenuOpen = 'Open ...';
   lisMenuRevert = 'Revert';
-  lisOpen = 'Open ...';
   lisPkgEditPublishPackage = 'Publish Package';
   lisMenuOpenRecent = 'Open Recent ...';
   lisMenuSave = 'Save';
@@ -320,7 +319,6 @@ resourcestring
   lisMenuCodeToolsOptions = 'CodeTools Options ...';
   lisMenuCodeToolsDefinesEditor = 'CodeTools defines editor ...';
   
-  lisMenuAboutLazarus = 'About Lazarus ...';
   lisMenuOnlineHelp = 'Online Help';
   lisMenuConfigureHelp = 'Configure Help ...';
   lisMenuContextHelp = 'Context sensitive Help';
@@ -673,11 +671,9 @@ resourcestring
   lisCopyError = 'Copy Error';
 
   // hints
-  lisHintNewUnit = 'New Unit';
   lisHintOpen = 'Open';
   lisHintSave = 'Save';
   lisHintSaveAll = 'Save all';
-  lisHintNewForm = 'New Form';
   lisHintToggleFormUnit = 'Toggle Form/Unit';
   lisHintViewUnits = 'View Units';
   lisHintViewForms = 'View Forms';
@@ -1474,14 +1470,6 @@ resourcestring
   srkmecMoveEditorRight       = 'Move editor right';
   srkmecGotoEditor            = 'Go to editor %d';
 
-  // file menu
-  srkmecNew                   = 'New';
-  srkmecNewUnit               = 'New unit';
-  srkmecNewForm               = 'New form';
-  srkmecSaveAs                = 'Save as';
-  srkmecSaveAll               = 'Save all';
-  srkmecCloseAll              = 'Close all';
-
   // edit menu
   srkmecSelectionTabs2Spaces  = 'Convert tabs to spaces in selection';
   srkmecInsertCharacter       = 'Insert from Charactermap';
@@ -1677,6 +1665,7 @@ resourcestring
   rsLanguageJapanese    = 'Japanese';
   rsLanguageChinese     = 'Chinese';
   rsLanguageIndonesian  = 'Indonesian';
+  rsLanguageAfrikaans   = 'Afrikaans';
 
   // Unit dependencies
   dlgUnitDepCaption     = 'Unit dependencies';
@@ -3150,5 +3139,17 @@ resourcestring
 
   // version info tab
   VersionInfoTitle = 'Version Info';
+  
+  // Procedure List dialog
+  lisPListObjects               = '&Objects';
+  lisPListJumpToSelection       = 'Jump To Selection';
+  lisPListFilterAny             = 'Filter by matching any part of method';
+  lisPListFilterStart           = 'Filter by matching with start of method';
+  lisPListChangeFont            = 'Change Font';
+  lisPListCopyMethodToClipboard = 'Copy method name to the clipboard';
+  lisPListType                  = 'Type';
+  lisPListAll                   = '<All>';
+  lisPListNone                  = '<None>';
+
 implementation
 end.

ide/main.pp

@@ -1369,7 +1369,7 @@ begin
 
   ButtonTop := 2;
   ButtonLeft := 2;
-  MainIDEBar.NewUnitSpeedBtn       := CreateButton('NewUnitSpeedBtn'      , 'btn_newunit'   , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuNewUnitClicked, lisHintNewUnit);
+  MainIDEBar.NewUnitSpeedBtn       := CreateButton('NewUnitSpeedBtn'      , 'btn_newunit'   , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuNewUnitClicked, lisMenuNewUnit);
 
   MainIDEBar.OpenFileSpeedBtn      := CreateButton('OpenFileSpeedBtn'     , 'btn_openfile'  , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuOpenClicked, lisHintOpen);
 
@@ -1381,7 +1381,7 @@ begin
 
   MainIDEBar.SaveSpeedBtn          := CreateButton('SaveSpeedBtn'         , 'btn_save'      , 2, ButtonLeft, ButtonTop, [mfLeft], @mnuSaveClicked, lisHintSave);
   MainIDEBar.SaveAllSpeedBtn       := CreateButton('SaveAllSpeedBtn'      , 'btn_saveall'   , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuSaveAllClicked, lisHintSaveAll);
-  MainIDEBar.NewFormSpeedBtn       := CreateButton('NewFormSpeedBtn'      , 'btn_newform'   , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuNewFormClicked, lisHintNewForm);
+  MainIDEBar.NewFormSpeedBtn       := CreateButton('NewFormSpeedBtn'      , 'btn_newform'   , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuNewFormClicked, lisMenuNewForm);
   MainIDEBar.ToggleFormSpeedBtn    := CreateButton('ToggleFormSpeedBtn'   , 'btn_toggleform', 2, ButtonLeft, ButtonTop, [mfLeft, mfTop], @mnuToggleFormUnitCLicked, lisHintToggleFormUnit);
 
   // new row

ide/mainbase.pas

@@ -323,7 +323,7 @@ begin
     CreateMenuSeparatorSection(mnuFile,itmFileOpenSave,'itmFileOpenSave');
     ParentMI:=itmFileOpenSave;
 
-    CreateMenuItem(ParentMI, itmFileOpen, 'itmFileOpen', lisOpen, 'menu_open');
+    CreateMenuItem(ParentMI, itmFileOpen, 'itmFileOpen', lisMenuOpen, 'menu_open');
     CreateMenuItem(ParentMI,itmFileRevert,'itmFileRevert',lisMenuRevert,'menu_undo');
     CreateMenuSubSection(ParentMI,itmFileRecentOpen,'itmFileRecentOpen',lisMenuOpenRecent);
     CreateMenuItem(ParentMI,itmFileSave,'itmFileSave',lisMenuSave,'menu_save');
@@ -738,7 +738,7 @@ begin
     ParentMI:=itmInfoHelps;
 
     CreateMenuItem(ParentMI,itmHelpAboutLazarus,'itmHelpAboutLazarus',
-                   lisMenuAboutLazarus);
+                   lisAboutLazarus);
   end;
 end;
 

ide/procedurelist.pas

@@ -115,27 +115,17 @@ uses
   ,LazIDEIntf
   ,IDECommands
   ,Clipbrd
+  ,LazarusIDEStrConsts
   ;
 
 
 const
-  cProcedureList = 'ProcedureList';
   cAbout =
     'Procedure List (Lazarus addon)' + #10#10 +
     'Author: Graeme Geldenhuys  (graemeg@gmail.com)' + #10 +
     'Inspired by: GExperts  (www.gexperts.org)';
 
 
-resourcestring
-  SProcedureListCaption = 'Procedure List...';
-  SAllString            = '<All>';
-  SNoneString           = '<None>';
-  SUnknown              = 'Unknown';
-  SImplementationNotFound = 'Implementation section not found (parser error?)';
-  SObjects              = '&Objects';
-  SSearch               = '&Search';
-  
-  
 { This is where it all starts. Gets called from Lazarus. }
 procedure ExecuteProcedureList(Sender: TObject);
 var
@@ -264,8 +254,19 @@ begin
   self.KeyPreview     := True;
   self.Position       := poDesktopCenter;
 
-  lblObjects.Caption  := SObjects;
+  // assign resource strings to Captions and Hints
-  lblSearch.Caption   := SSearch;
+  self.Caption          := srkmecProcedureList;
+  lblObjects.Caption    := lisPListObjects;
+  lblSearch.Caption     := lisMenuSearch;
+  tbAbout.Hint          := lisMenuTemplateAbout;
+  tbJumpTo.Hint         := lisPListJumpToSelection;
+  tbFilterAny.Hint      := lisPListFilterAny;
+  tbFilterStart.Hint    := lisPListFilterStart;
+  tbChangeFont.Hint     := lisPListChangeFont;
+  tbCopy.Hint           := lisPListCopyMethodToClipboard;
+  LV.Column[1].Caption  := lisProcedure;
+  LV.Column[2].Caption  := lisPListType;
+  LV.Column[3].Caption  := lisToDoLLine;
 
   LV.Column[0].Width  := 20;
   LV.Column[1].Width  := 300;
@@ -384,8 +385,8 @@ var
   lNodeText: string;
 begin
   cbObjects.Items.Clear;
-  cbObjects.Items.Add(SAllString);
+  cbObjects.Items.Add(lisPListAll);
-  cbObjects.Items.Add(SNoneString);
+  cbObjects.Items.Add(lisPListNone);
   try
     { get active source editor }
     lSrcEditor := SourceEditorWindow.ActiveEditor;
@@ -439,7 +440,7 @@ var
   lCaret: TCodeXYPosition;
   FSearchAll: boolean;
 begin
-  FSearchAll := cbObjects.Text = SAllString;
+  FSearchAll := cbObjects.Text = lisPListAll;
   lNodeText := pCodeTool.ExtractProcHead(pNode,
       [phpWithoutClassKeyword, phpWithoutParamList, phpWithoutBrackets,
        phpWithoutSemicolon, phpWithoutClassName]);
@@ -492,7 +493,7 @@ var
   begin
     { lets filter by class selection. }
     lClass := pCodeTool.ExtractClassNameOfProcNode(pNode);
-    if cbObjects.Text = SNoneString then
+    if cbObjects.Text = lisPListNone then
       Result := lClass = ''
     else
       Result := lClass = cbObjects.Text;

packager/addtopackagedlg.pas

@@ -745,7 +745,7 @@ begin
     InputHistories.ApplyFileDialogSettings(SaveDialog);
     SaveDialog.InitialDir :=
       LazPackage.GetFileDialogInitialDir(SaveDialog.InitialDir);
-    SaveDialog.Title:=srkmecSaveAs;
+    SaveDialog.Title := lisMenuSaveAs;
     SaveDialog.Options := SaveDialog.Options+[ofPathMustExist];
     if SaveDialog.Execute then begin
       AFilename := CleanAndExpandFilename(SaveDialog.Filename);