From 7cc8d6fb8401d5462a700a6b915fdb1bd02a2907 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 19 Jan 2015 10:44:43 +0000
Subject: [PATCH] IDE: resourcestring

git-svn-id: trunk@47423 -
---
 ide/frames/editor_keymapping_options.pas | 2 +-
 ide/lazarusidestrconsts.pas              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas
index b5bc30308b..08d1165f01 100644
--- a/ide/frames/editor_keymapping_options.pas
+++ b/ide/frames/editor_keymapping_options.pas
@@ -656,7 +656,7 @@ begin
   end;
 
   if ConflictsTreeView.Items.Count=0 then
-    ConflictsTreeView.Items.Add(nil,'There are no conflicting keys.');
+    ConflictsTreeView.Items.Add(nil, lisThereAreNoConflictingKeys);
 
   ConflictsTreeView.EndUpdate;
 end;
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 64a584b4cb..b1f694fc46 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -2705,6 +2705,7 @@ resourcestring
     +'%s%s?';
   lisAlternativeKeyOr2KeySequence = 'Alternative key (or 2 key sequence)';
   srkmConflic  = 'Conflict ';
+  lisThereAreNoConflictingKeys = 'There are no conflicting keys.';
   srkmEditForCmd = 'Edit keys of command';
   lisChooseAKey = 'Choose a key ...';