From 74b73ae3c1c9ac9427a36db725004d6ffd7d75fe Mon Sep 17 00:00:00 2001
From: maxim <maxim@lazarus-ide.org>
Date: Sat, 2 Jul 2016 14:27:40 +0000
Subject: [PATCH] IDE: fixed/improved message (layout, typos and i18n) shown
 when key conflict detected

git-svn-id: trunk@52599 -
---
 components/ideintf/idecommands.pas | 2 +-
 ide/exttooleditdlg.pas             | 4 ++--
 ide/keymapshortcutdlg.pas          | 4 ++--
 ide/lazarusidestrconsts.pas        | 9 ++++-----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/components/ideintf/idecommands.pas b/components/ideintf/idecommands.pas
index 8a775d1a44..b6dd20e031 100644
--- a/components/ideintf/idecommands.pas
+++ b/components/ideintf/idecommands.pas
@@ -1486,7 +1486,7 @@ function TIDECommand.GetCategoryAndName: string;
 begin
   Result:='"'+GetLocalizedName+'"';
   if Category<>nil then
-    Result:=Result+' in "'+Category.Description+'"';
+    Result:='"'+Category.Description+'" -> '+Result;
 end;
 
 function TIDECommand.Execute(Sender: TObject): boolean;
diff --git a/ide/exttooleditdlg.pas b/ide/exttooleditdlg.pas
index 0e204f0eac..0b8ecc21ac 100644
--- a/ide/exttooleditdlg.pas
+++ b/ide/exttooleditdlg.pas
@@ -823,10 +823,10 @@ begin
         ConflictName:=GetCategoryAndName;
         if ct=ctConflictKeyA then
           ConflictName:=ConflictName
-                    +' ('+KeyAndShiftStateToEditorKeyString(ShortcutA)
+                    +' ('+KeyAndShiftStateToEditorKeyString(ShortcutA)+')'
         else
           ConflictName:=ConflictName
-                   +' ('+KeyAndShiftStateToEditorKeyString(ShortcutB);
+                   +' ('+KeyAndShiftStateToEditorKeyString(ShortcutB)+')';
         case IDEMessageDialog(lisPEConflictFound,
            Format(lisTheKeyIsAlreadyAssignedToRemoveTheOldAssignmentAnd,
                   [KeyAndShiftStateToKeyString(Key,Shift), LineEnding,
diff --git a/ide/keymapshortcutdlg.pas b/ide/keymapshortcutdlg.pas
index e0ded80822..f666d63f33 100644
--- a/ide/keymapshortcutdlg.pas
+++ b/ide/keymapshortcutdlg.pas
@@ -348,10 +348,10 @@ begin
       ConflictName:=ConflictRelation.GetCategoryAndName;
       if conflictType=ctConflictKeyA then
         ConflictName:=ConflictName
-                  +' ('+KeyAndShiftStateToEditorKeyString(ConflictRelation.ShortcutA)
+                  +' ('+KeyAndShiftStateToEditorKeyString(ConflictRelation.ShortcutA)+')'
       else
         ConflictName:=ConflictName
-                 +' ('+KeyAndShiftStateToEditorKeyString(ConflictRelation.ShortcutB);
+                 +' ('+KeyAndShiftStateToEditorKeyString(ConflictRelation.ShortcutB)+')';
       case IDEMessageDialog(lisPEConflictFound,
          Format(lisTheKeyIsAlreadyAssignedToRemoveTheOldAssignmentAnd,
                 [KeyAndShiftStateToEditorKeyString(Key),
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 11f47dfd3e..0bed32a228 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -309,9 +309,9 @@ resourcestring
   lisDiscardChangesAll = 'Discard all changes';
   lisDoNotCloseTheProject = 'Do not close the project';
   lisErrorSavingForm = 'Error saving form';
-  lisCannotSaveForm = 'Cannot save form %s';
+  lisCannotSaveForm = 'Cannot save form "%s".';
   lisErrorOpeningForm = 'Error opening form';
-  lisCannotOpenForm = 'Cannot open form %s';
+  lisCannotOpenForm = 'Cannot open form "%s".';
   lisConvert = 'Convert';
   lisPLDShowGlobalLinksIn = 'Show global links in ';
   lisPLDShowUserLinksIn = 'Show user links in ';
@@ -2851,9 +2851,8 @@ resourcestring
   srkmCommand  = 'Command:';
   lisKeyOr2KeySequence = 'Key (or 2 key sequence)';
   lisTheKeyIsAlreadyAssignedToRemoveTheOldAssignmentAnd = 'The key %s'
-    +'%sis already assigned to %s.'
-    +'%sRemove the old assignment and assign the key to the new function'
-    +'%s%s?';
+    +' is already assigned to %s%s.'
+    +'%s%sRemove the old assignment and assign the key to the new function %s?';
   lisAlternativeKeyOr2KeySequence = 'Alternative key (or 2 key sequence)';
   srkmConflic  = 'Conflict ';
   lisThereAreNoConflictingKeys = 'There are no conflicting keys.';