diff --git a/.gitattributes b/.gitattributes
index a8b2b85a70..d4468fe119 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4020,8 +4020,6 @@ ide/genericlisteditor.pas svneol=native#text/plain
 ide/gotofrm.lfm svneol=native#text/plain
 ide/gotofrm.pas svneol=native#text/plain
 ide/helpfpcmessages.pas svneol=native#text/plain
-ide/helpmanager.lfm svneol=native#text/plain
-ide/helpmanager.pas svneol=native#text/pascal
 ide/helpoptions.pas svneol=native#text/pascal
 ide/ide.lpk svneol=native#text/xml
 ide/ide.pas svneol=native#text/pascal
@@ -4031,6 +4029,8 @@ ide/idecontexthelpedit.pas svneol=native#text/plain
 ide/idedefs.pas svneol=native#text/pascal
 ide/idefpcinfo.lfm svneol=native#text/plain
 ide/idefpcinfo.pas svneol=native#text/plain
+ide/idehelpmanager.lfm svneol=native#text/plain
+ide/idehelpmanager.pas svneol=native#text/pascal
 ide/ideinfodlg.lfm svneol=native#text/plain
 ide/ideinfodlg.pas svneol=native#text/plain
 ide/ideminilibc.pas svneol=native#text/plain
diff --git a/ide/helpmanager.lfm b/ide/idehelpmanager.lfm
similarity index 100%
rename from ide/helpmanager.lfm
rename to ide/idehelpmanager.lfm
diff --git a/ide/helpmanager.pas b/ide/idehelpmanager.pas
similarity index 87%
rename from ide/helpmanager.pas
rename to ide/idehelpmanager.pas
index ad1f044047..3c274ce449 100644
--- a/ide/helpmanager.pas
+++ b/ide/idehelpmanager.pas
@@ -26,7 +26,7 @@
  *                                                                         *
  ***************************************************************************
 }
-unit HelpManager;
+unit IDEHelpManager;
 
 {$mode objfpc}{$H+}
 
@@ -51,6 +51,21 @@ uses
 
 type
 
+  { TSimpleFPCKeywordHelpDatabase }
+
+  TSimpleFPCKeywordHelpDatabase = class(THTMLHelpDatabase)
+  private
+    FKeywordPrefixNode: THelpNode;
+  public
+    constructor Create(TheOwner: TComponent); override;
+    function GetNodesForKeyword(const HelpKeyword: string;
+                        var ListOfNodes: THelpNodeQueryList; var ErrMsg: string
+                        ): TShowHelpResult; override;
+    function ShowHelp(Query: THelpQuery; BaseNode, NewNode: THelpNode;
+                      QueryItem: THelpQueryItem;
+                      var ErrMsg: string): TShowHelpResult; override;
+  end;
+
   TLIHProviders = class;
 
   { TLazIDEHTMLProvider }
@@ -136,6 +151,7 @@ type
     procedure mnuHelpReportBugClicked(Sender: TObject);
   private
     FFCLHelpDBPath: THelpBaseURLObject;
+    FFPCKeywordsHelpDB: THelpDatabase;
     FMainHelpDB: THelpDatabase;
     FMainHelpDBPath: THelpBasePathObject;
     FRTLHelpDB: THelpDatabase;
@@ -148,7 +164,6 @@ type
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
-    procedure UpdateFPCDocsHTMLDirectory;
 
     procedure ConnectMainBarEvents; override;
     procedure LoadHelpOptions; override;
@@ -156,7 +171,7 @@ type
 
     procedure ShowLazarusHelpStartPage;
     procedure ShowIDEHelpForContext(HelpContext: THelpContext);
-    procedure ShowIDEHelpForKeyword(const Keyword: string);
+    procedure ShowIDEHelpForKeyword(const Keyword: string); // an arbitrary keyword, not a fpc keyword
 
     function ShowHelpForSourcePosition(const Filename: string;
                                        const CodePos: TPoint;
@@ -183,6 +198,7 @@ type
     property MainHelpDBPath: THelpBasePathObject read FMainHelpDBPath;
     property RTLHelpDB: THelpDatabase read FRTLHelpDB;
     property RTLHelpDBPath: THelpBaseURLObject read FRTLHelpDBPath;
+    property FPCKeywordsHelpDB: THelpDatabase read FFPCKeywordsHelpDB;
   end;
 
   { THelpSelectorDialog }
@@ -252,6 +268,57 @@ begin
   Result:=CompareStr(AnsiString(URL),TLIHProviderStream(Stream).URL);
 end;
 
+{ TSimpleFPCKeywordHelpDatabase }
+
+constructor TSimpleFPCKeywordHelpDatabase.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  KeywordPrefix:='FPCKeyword_';
+end;
+
+function TSimpleFPCKeywordHelpDatabase.GetNodesForKeyword(
+  const HelpKeyword: string; var ListOfNodes: THelpNodeQueryList;
+  var ErrMsg: string): TShowHelpResult;
+var
+  Path: String;
+  KeyWord: String;
+begin
+  Result:=shrHelpNotFound;
+  if (csDesigning in ComponentState) then exit;
+  if (KeywordPrefix<>'')
+  and (LeftStr(HelpKeyword,length(KeywordPrefix))=KeywordPrefix) then begin
+    // HelpKeyword starts with KeywordPrefix
+    KeyWord:=copy(HelpKeyword,length(KeywordPrefix)+1,length(HelpKeyword));
+    // test: testfcpkeyword
+    if KeyWord='testfcpkeyword' then begin
+      // this help database knows this keyword
+      // => add a node, so that if there are several possibilities the IDE can
+      //    show the user a dialog to choose
+      if FKeywordPrefixNode=nil then
+        FKeywordPrefixNode:=THelpNode.CreateURL(Self,'','');
+      Path:=copy(HelpKeyword,length(KeywordPrefix)+1,length(HelpKeyword));
+      FKeywordPrefixNode.Title:='Pascal keyword '+Path;
+      FKeywordPrefixNode.URL:='file://'+Path;
+      CreateNodeQueryListAndAdd(FKeywordPrefixNode,nil,ListOfNodes,true);
+      Result:=shrSuccess;
+    end;
+  end;
+end;
+
+function TSimpleFPCKeywordHelpDatabase.ShowHelp(Query: THelpQuery; BaseNode,
+  NewNode: THelpNode; QueryItem: THelpQueryItem; var ErrMsg: string
+  ): TShowHelpResult;
+var
+  KeywordQuery: THelpQueryKeyword;
+  KeyWord: String;
+begin
+  Result:=shrHelpNotFound;
+  if not (Query is THelpQueryKeyword) then exit;
+  KeywordQuery:=THelpQueryKeyword(Query);
+  KeyWord:=copy(KeywordQuery.Keyword,length(KeywordPrefix)+1,length(KeywordQuery.Keyword));
+  debugln(['TSimpleFPCKeywordHelpDatabase.ShowHelp Keyword=',Keyword]);
+end;
+
 { TSimpleHTMLControl }
 
 procedure TSimpleHTMLControl.SetProvider(const AValue: TAbstractIDEHTMLProvider);
@@ -830,11 +897,18 @@ procedure TIDEHelpManager.RegisterIDEHelpDatabases;
     HTMLHelp.RegisterItem(DirItem);
   end;
 
+  procedure CreateFPCKeywordsHelpDB;
+  begin
+    FFPCKeywordsHelpDB:=HelpDatabases.CreateHelpDatabase(lihcFCLUnits,
+                                            TSimpleFPCKeywordHelpDatabase,true);
+  end;
+
 begin
   CreateMainIDEHelpDB;
   CreateRTLHelpDB;
   CreateFCLHelpDB;
   CreateFPCMessagesHelpDB;
+  CreateFPCKeywordsHelpDB;
 end;
 
 procedure TIDEHelpManager.RegisterDefaultIDEHelpViewers;
@@ -888,114 +962,12 @@ begin
   FreeThenNil(FMainHelpDBPath);
   FreeThenNil(FRTLHelpDBPath);
   FreeThenNil(FFCLHelpDBPath);
+  FreeThenNil(FFPCKeywordsHelpDB);
   HelpBoss:=nil;
   LazarusHelp:=nil;
   inherited Destroy;
 end;
 
-procedure TIDEHelpManager.UpdateFPCDocsHTMLDirectory;
-
-  function IsFPCDocsHTMDirectory(Directory: string): boolean;
-  var
-    RefFilename: String;
-  begin
-    Result:=false;
-    if Directory='' then exit;
-    RefFilename:=AppendPathDelim(TrimFilename(Directory))
-                                 +'ref'+PathDelim+'ref.kwd';
-    Result:=FileExistsUTF8(RefFilename);
-    //DebugLn(['IsFPCDocsHTMDirectory RefFilename="',RefFilename,'" Result=',Result]);
-  end;
-  
-  function TryDirectory(const Directory: string): boolean;
-  var
-    NewDir: String;
-  begin
-    NewDir:=TrimAndExpandDirectory(Directory);
-    if not IsFPCDocsHTMDirectory(NewDir) then exit(false);
-    HelpOpts.FPCDocsHTMLDirectory:=NewDir;
-    DebugLn(['TryDirectory Changing FPCDocsHTMLDirectory to "',HelpOpts.FPCDocsHTMLDirectory,'"']);
-    SaveHelpOptions;
-    Result:=true;
-  end;
-  
-  function TryDirectoryMask(const Directory: string): boolean;
-  var
-    DirMask: String;
-    CurDir: String;
-    FileInfo: TSearchRec;
-    NewDir: String;
-  begin
-    Result:=false;
-    DirMask:=TrimFilename(Directory);
-    CurDir:=ExtractFilePath(DirMask);
-    if FindFirstUTF8(DirMask,faDirectory,FileInfo)=0 then begin
-      repeat
-        // skip special files
-        if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='') then
-          continue;
-        if ((FileInfo.Attr and faDirectory)>0) then begin
-          NewDir:=CurDir+FileInfo.Name;
-          if TryDirectory(NewDir) then
-            exit(true);
-        end;
-      until FindNextUTF8(FileInfo)<>0;
-    end;
-    FindCloseUTF8(FileInfo);
-  end;
-  
-  function SearchInCommonInstallDir: boolean;
-  var
-    SystemPPU: String;
-    p: LongInt;
-    FPCInstallDir: String;
-    FPCVersion: String;
-    CurUnitName: String;
-  begin
-    Result:=false;
-    { Linux:
-        normally fpc ppu are installed in
-          /somewhere/lib/fpc/$fpcversion/units/$fpctarget/
-        and the docs are installed in
-          /somewhere/share/doc/fpcdocs-$fpcversion/
-      }
-    CurUnitName:='system.ppu';
-    SystemPPU:=CodeToolBoss.DirectoryCachePool.FindCompiledUnitInCompletePath(
-                                                    '',CurUnitName);
-    DebugLn(['SearchInCommonInstallDir SystemPPU=',SystemPPU]);
-    // SystemPPU is now e.g. /usr/lib/fpc/2.0.4/units/i386-linux/rtl/system.ppu
-    if SystemPPU='' then exit;
-    p:=System.Pos(PathDelim+'fpc'+PathDelim,SystemPPU);
-    if p<1 then exit;
-    FPCInstallDir:=copy(SystemPPU,1,p);// FPCInstallDir is now e.g. /usr/lib/
-    FPCVersion:=copy(SystemPPU,p+5,length(SystemPPU));
-    p:=System.Pos(PathDelim,FPCVersion);
-    FPCVersion:=copy(FPCVersion,1,p-1);// FPCVersion is now e.g. 2.0.4
-    DebugLn(['SearchInCommonInstallDir FPCInstallDir="',FPCInstallDir,'" FPCVersion="',FPCVersion,'"']);
-    // try first with the current fpc version
-    if (FPCVersion<>'') then begin
-      if TryDirectory(FPCInstallDir
-                      +SetDirSeparators('../share/doc/fpdocs-'+FPCVersion))
-      then exit;
-      if TryDirectory(FPCInstallDir+SetDirSeparators('doc/fpdocs-'+FPCVersion))
-      then exit;
-    end;
-    // try any fpc version
-    if TryDirectoryMask(FPCInstallDir
-                        +SetDirSeparators('../share/doc/fpdocs-*'))
-    then exit;
-    if TryDirectoryMask(FPCInstallDir+SetDirSeparators('doc/fpdocs-*')) then
-      exit;
-  end;
-  
-begin
-  if IsFPCDocsHTMDirectory(HelpOpts.GetEffectiveFPCDocsHTMLDirectory) then exit;
-  // search the docs at common places
-  if SearchInCommonInstallDir then exit;
-  if TryDirectoryMask('/usr/share/doc/fpdocs-*') then exit;
-  if TryDirectoryMask('/usr/local/share/doc/fpdocs-*') then exit;
-end;
-
 procedure TIDEHelpManager.ConnectMainBarEvents;
 begin
   with MainIDEBar do
@@ -1034,61 +1006,12 @@ end;
 function TIDEHelpManager.ShowHelpForSourcePosition(const Filename: string;
   const CodePos: TPoint; var ErrMsg: string): TShowHelpResult;
   
-  function ShowHelpForFPCKeyWord(const KeyWord: string): TShowHelpResult;
-  var
-    RefFilename: String;
-    i: Integer;
-    List: TStrings;
-    Line: string;
-    FileStartPos: Integer;
-    FileEndPos: LongInt;
-    HTMLFilename: String;
-  begin
-    Result:=shrHelpNotFound;
-    if Keyword='' then exit;
-    UpdateFPCDocsHTMLDirectory;
-    RefFilename:=HelpOpts.GetEffectiveFPCDocsHTMLDirectory;
-    if (RefFilename='') then exit;
-    RefFilename:=AppendPathDelim(RefFilename)+'ref'+PathDelim+'ref.kwd';
-    if not FileExistsUTF8(RefFilename) then begin
-      DebugLn(['ShowHelpForFPCKeyWord file not found RefFilename="',RefFilename,'"']);
-      exit;
-    end;
-    List:=nil;
-    try
-      if LoadStringListFromFile(RefFilename,'FPC keyword list',List)<>mrOk then
-        exit;
-      for i:=0 to List.Count-1 do begin
-        // example: integer=refsu5.html#keyword:integer
-        Line:=List[i];
-        if (length(Line)>length(KeyWord))
-        and (Line[length(KeyWord)+1]='=')
-        and (SysUtils.CompareText(KeyWord,copy(Line,1,length(KeyWord)))=0) then
-        begin
-          FileStartPos:=length(KeyWord)+2;
-          FileEndPos:=FileStartPos;
-          while (FileEndPos<=length(Line)) and (Line[FileEndPos]<>'#') do
-            inc(FileEndPos);
-          HTMLFilename:=copy(Line,FileStartPos,FileEndPos-FileStartPos);
-          HTMLFilename:=HelpOpts.GetEffectiveFPCDocsHTMLDirectory+'ref'
-                        +PathDelim+HTMLFilename;
-          Result:=ShowHelpFileOrError(HTMLFilename,
-                              'FPC help for keyword "'+KeyWord+'"',
-                              'text/html');
-          break;
-        end;
-      end;
-    finally
-      List.Free;
-    end;
-  end;
-  
   function CollectKeyWords(CodeBuffer: TCodeBuffer): TShowHelpResult;
-  // true: help found
   var
     p: Integer;
     IdentStart, IdentEnd: integer;
     KeyWord: String;
+    ErrorMsg: String;
   begin
     Result:=shrHelpNotFound;
     p:=0;
@@ -1097,10 +1020,13 @@ function TIDEHelpManager.ShowHelpForSourcePosition(const Filename: string;
     GetIdentStartEndAtPosition(CodeBuffer.Source,p,IdentStart,IdentEnd);
     if IdentEnd<=IdentStart then exit;
     KeyWord:=copy(CodeBuffer.Source,IdentStart,IdentEnd-IdentStart);
-    Result:=ShowHelpForFPCKeyWord(KeyWord);
+    ErrorMsg:='';
+    Result:=ShowHelpForKeyword('','FPCKeyword_'+Keyword,ErrorMsg);
+    if Result=shrHelpNotFound then exit;
+    HelpManager.ShowError(Result,ErrMsg);
   end;
 
-  procedure CollectDeclarations(CodeBuffer: TCodeBuffer);
+  function CollectDeclarations(CodeBuffer: TCodeBuffer): TShowHelpResult;
   var
     NewList: TPascalHelpContextList;
     PascalHelpContextLists: TList;
@@ -1108,6 +1034,7 @@ function TIDEHelpManager.ShowHelpForSourcePosition(const Filename: string;
     CurCodePos: PCodeXYPosition;
     i: Integer;
   begin
+    Result:=shrHelpNotFound;
     ListOfPCodeXYPosition:=nil;
     PascalHelpContextLists:=nil;
     try
@@ -1159,9 +1086,9 @@ begin
   if mrOk<>LoadCodeBuffer(CodeBuffer,FileName,[lbfCheckIfText],false) then
     exit;
     
-  Result:=CollectKeyWords(CodeBuffer);
+  Result:=CollectDeclarations(CodeBuffer);
   if Result=shrSuccess then exit;
-  CollectDeclarations(CodeBuffer);
+  Result:=CollectKeyWords(CodeBuffer);
 end;
 
 function TIDEHelpManager.ConvertCodePosToPascalHelpContext(
diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi
index 069fc59896..53cbe02511 100644
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@@ -395,12 +395,12 @@
         <UnitName Value="AboutFrm"/>
       </Unit48>
       <Unit49>
-        <Filename Value="helpmanager.pas"/>
+        <Filename Value="idehelpmanager.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="HelpSelectorDialog"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="HelpManager"/>
+        <UnitName Value="IDEHelpManager"/>
       </Unit49>
       <Unit50>
         <Filename Value="../designer/askcompnamedlg.pas"/>
diff --git a/ide/main.pp b/ide/main.pp
index 17808ae503..1fbb1c4499 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -85,7 +85,7 @@ uses
   ProjectResources, Project, ProjectDefs, NewProjectDlg, 
   PublishProjectDlg, ProjectInspector, PackageDefs,
   // help manager
-  IDEContextHelpEdit, IDEHelpIntf, HelpManager, CodeHelp, HelpOptions,
+  IDEContextHelpEdit, IDEHelpIntf, IDEHelpManager, CodeHelp, HelpOptions,
   // designer
   JITForms, ComponentPalette, ComponentList, ComponentReg, FormEditingIntf,
   ObjInspExt, Designer, FormEditor, CustomFormEditor,
diff --git a/lcl/helpintfs.pas b/lcl/helpintfs.pas
index a7275163bc..668b1f9463 100644
--- a/lcl/helpintfs.pas
+++ b/lcl/helpintfs.pas
@@ -235,19 +235,19 @@ function ShowTableOfContents(var ErrMsg: string): TShowHelpResult;
 
 // help by ID
 function ShowHelpOrErrorForContext(HelpDatabaseID: THelpDatabaseID;
-  HelpContext: THelpContext): TShowHelpResult;
+  HelpContext: THelpContext): TShowHelpResult; overload;
 function ShowHelpForContext(HelpDatabaseID: THelpDatabaseID;
-  HelpContext: THelpContext; var ErrMsg: string): TShowHelpResult;
+  HelpContext: THelpContext; var ErrMsg: string): TShowHelpResult; overload;
 function ShowHelpForContext(HelpContext: THelpContext; var ErrMsg: string
-  ): TShowHelpResult;
+  ): TShowHelpResult; overload;
 
-// help by keyword
+// help by keyword (an arbitrary keyword, not a fpc keyword)
 function ShowHelpOrErrorForKeyword(HelpDatabaseID: THelpDatabaseID;
   const HelpKeyword: string): TShowHelpResult;
 function ShowHelpForKeyword(HelpDatabaseID: THelpDatabaseID;
-  const HelpKeyword: string; var ErrMsg: string): TShowHelpResult;
+  const HelpKeyword: string; var ErrMsg: string): TShowHelpResult; overload;
 function ShowHelpForKeyword(const HelpKeyword: string; var ErrMsg: string
-  ): TShowHelpResult;
+  ): TShowHelpResult; overload;
 
 // help for pascal sources
 function ShowHelpForPascalContexts(const Filename: string;
@@ -272,6 +272,7 @@ function ShowHelp(const URL, Title, MimeType: string;
 function ShowHelpOrError(const URL, Title, MimeType: string
   ): TShowHelpResult;
 
+function dbgs(HelpResult: TShowHelpResult): string; overload;
 
 implementation
 
@@ -412,6 +413,23 @@ begin
   HelpManager.ShowError(Result,ErrMsg);
 end;
 
+function dbgs(HelpResult: TShowHelpResult): string;
+const
+  ResultNames: array[TShowHelpResult] of shortstring = (
+    'shrNone',
+    'shrSuccess',
+    'shrCancel',
+    'shrDatabaseNotFound',
+    'shrContextNotFound',
+    'shrViewerNotFound',
+    'shrHelpNotFound',
+    'shrViewerError',
+    'shrSelectorError'
+    );
+begin
+  Result:=ResultNames[HelpResult];
+end;
+
 { THelpQuery }
 
 constructor THelpQuery.Create(const TheHelpDatabaseID: THelpDatabaseID);
diff --git a/lcl/languages/lclstrconsts.ca.po b/lcl/languages/lclstrconsts.ca.po
index 0f93ccf704..304a11f760 100644
--- a/lcl/languages/lclstrconsts.ca.po
+++ b/lcl/languages/lclstrconsts.ca.po
@@ -647,11 +647,15 @@ msgid "%s: Already registered"
 msgstr "Ja enregistrat"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "No trobo ajuda contextual"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Base de dades de l'ajuda no trobada"
 
 #: lclstrconsts.rshelperror
@@ -691,11 +695,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "No s'ha trobat cap ajuda per a la línia %d, columna %d de %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "No hi ha nodes d'ajuda disponibles"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Ajuda no trobada"
 
 #: lclstrconsts.rshelpnotregistered
@@ -715,7 +723,9 @@ msgid "Help Viewer Error"
 msgstr "Error del visor d'ajuda"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Visor d'ajuda no trobat"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.cs.po b/lcl/languages/lclstrconsts.cs.po
index 7a1658d769..30c5305d74 100644
--- a/lcl/languages/lclstrconsts.cs.po
+++ b/lcl/languages/lclstrconsts.cs.po
@@ -645,11 +645,15 @@ msgid "%s: Already registered"
 msgstr "%s: Již zaregistrováno"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Kontext nápovědy nenalezen"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Databáze nápovědy nenalezena"
 
 #: lclstrconsts.rshelperror
@@ -689,11 +693,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Nápověda nenalezena pro řádek %d, sloupce %d pro %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Uzly nápovědy nejsou dostupné"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Nápověda nenalezena"
 
 #: lclstrconsts.rshelpnotregistered
@@ -713,7 +721,9 @@ msgid "Help Viewer Error"
 msgstr "Chyba prohlížeče nápovědy"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Prohlížeč nápovědy nenalezen"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.de.po b/lcl/languages/lclstrconsts.de.po
index bff22e5b88..532c94f191 100644
--- a/lcl/languages/lclstrconsts.de.po
+++ b/lcl/languages/lclstrconsts.de.po
@@ -650,11 +650,15 @@ msgid "%s: Already registered"
 msgstr "%s: Bereits registriert"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Hilfekontext nicht gefunden"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Hilfedatenbank nicht gefunden"
 
 #: lclstrconsts.rshelperror
@@ -694,11 +698,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Keine Hilfe für Zeile %d, Spalte %d von %s gefunden."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Keine Hilfeknoten verfügbar"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Hilfe nicht gefunden"
 
 #: lclstrconsts.rshelpnotregistered
@@ -718,7 +726,9 @@ msgid "Help Viewer Error"
 msgstr "Hilfebetrachterfehler"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Hilfebetrachter nicht gefunden"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.es.po b/lcl/languages/lclstrconsts.es.po
index 5c72f618a0..4d076756ad 100644
--- a/lcl/languages/lclstrconsts.es.po
+++ b/lcl/languages/lclstrconsts.es.po
@@ -645,11 +645,15 @@ msgid "%s: Already registered"
 msgstr "%s: Ya está registrado"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Contexto de ayuda no encontrado"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Base de datos de ayuda no encontrada"
 
 #: lclstrconsts.rshelperror
@@ -689,11 +693,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "No se ha encontrado ayuda para la línea %d, columna %d de %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "No hay nodos de ayuda disponibles"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Ayuda no encontrada"
 
 #: lclstrconsts.rshelpnotregistered
@@ -713,7 +721,9 @@ msgid "Help Viewer Error"
 msgstr "Error en el visor de ayuda"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Visor de ayuda no encontrado"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.fi.po b/lcl/languages/lclstrconsts.fi.po
index 1904eb7be6..967b095e37 100644
--- a/lcl/languages/lclstrconsts.fi.po
+++ b/lcl/languages/lclstrconsts.fi.po
@@ -638,11 +638,11 @@ msgid "%s: Already registered"
 msgstr ""
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr ""
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelperror
@@ -682,11 +682,11 @@ msgid "No help found for line %d, column %d of %s."
 msgstr ""
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+msgid "No help found for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotregistered
@@ -706,7 +706,7 @@ msgid "Help Viewer Error"
 msgstr ""
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr ""
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.fr.po b/lcl/languages/lclstrconsts.fr.po
index c87995c066..8bb4635e9d 100644
--- a/lcl/languages/lclstrconsts.fr.po
+++ b/lcl/languages/lclstrconsts.fr.po
@@ -649,11 +649,15 @@ msgid "%s: Already registered"
 msgstr "%s : Déjà enregistré"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Contexte d'aide non trouvé"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Base de données d'aide non trouvée"
 
 #: lclstrconsts.rshelperror
@@ -693,11 +697,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Aucune aide trouvé pour la ligne %d, colonne %d de %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Aucuns noeuds d'aide disponibles"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Aide non trouvé"
 
 #: lclstrconsts.rshelpnotregistered
@@ -717,7 +725,9 @@ msgid "Help Viewer Error"
 msgstr "Erreur de visionneuse d'aide"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Visionneuse d'aide non trouvée"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.he.po b/lcl/languages/lclstrconsts.he.po
index a6b4052c2c..c73031b6a5 100644
--- a/lcl/languages/lclstrconsts.he.po
+++ b/lcl/languages/lclstrconsts.he.po
@@ -643,11 +643,15 @@ msgid "%s: Already registered"
 msgstr "כבר רשום %s:"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "עזרה תלויית הקשר לא נמצאה"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "בסיס נתוני העזרה לא נמצא"
 
 #: lclstrconsts.rshelperror
@@ -687,11 +691,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "לא נמצאה עזרה לשורה %d, עמודה %d,  של %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "אין צומת עזרה זמינה"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "עזרה לא נמצאה"
 
 #: lclstrconsts.rshelpnotregistered
@@ -711,7 +719,9 @@ msgid "Help Viewer Error"
 msgstr "שגיאת מציג העזרה"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "לא נמצא מציג לעזרה"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.id.po b/lcl/languages/lclstrconsts.id.po
index 27645aa915..edb223e666 100644
--- a/lcl/languages/lclstrconsts.id.po
+++ b/lcl/languages/lclstrconsts.id.po
@@ -648,11 +648,15 @@ msgid "%s: Already registered"
 msgstr "%s: Sudah teregistrasi"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Konteks Bantuan tidak ditemukan"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Database Bantuan tidak ditemukan"
 
 #: lclstrconsts.rshelperror
@@ -692,11 +696,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Tidak ada bantuan ditemukan untuk baris %d, column %d of %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Node bantuan tidak tersedia"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Bantuan tidak ditemukan"
 
 #: lclstrconsts.rshelpnotregistered
@@ -716,7 +724,9 @@ msgid "Help Viewer Error"
 msgstr "Peninjau Bantuan Salah"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Peninjau Bantuian tidak ditemukan"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.it.po b/lcl/languages/lclstrconsts.it.po
index de14f8e1f0..ec883e02b4 100644
--- a/lcl/languages/lclstrconsts.it.po
+++ b/lcl/languages/lclstrconsts.it.po
@@ -650,11 +650,15 @@ msgid "%s: Already registered"
 msgstr "%s: Già registrato"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Pagina del manuale non trovata"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Archivio Help non trovato"
 
 #: lclstrconsts.rshelperror
@@ -694,11 +698,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Nessun aiuto trovato per la linea %d, colonna %d di %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Nessun aiuto disponibile"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Aiuto non trovato"
 
 #: lclstrconsts.rshelpnotregistered
@@ -718,7 +726,9 @@ msgid "Help Viewer Error"
 msgstr "Errore nel visualizzatore dell'Help"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Visualizzatore dell'Help non trovato"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.lt.po b/lcl/languages/lclstrconsts.lt.po
index 485b217f2e..fdace9f210 100644
--- a/lcl/languages/lclstrconsts.lt.po
+++ b/lcl/languages/lclstrconsts.lt.po
@@ -649,11 +649,15 @@ msgid "%s: Already registered"
 msgstr "%s: jau yra registruotas"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Žinyno turinys nerastas"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Žinyno duomenų bazė nerasta"
 
 #: lclstrconsts.rshelperror
@@ -693,11 +697,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Žinyne nėra duomenų eilutei %d, stulpeliui %d šio %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Žinyno mazgų nėra"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Žinynas nerastas"
 
 #: lclstrconsts.rshelpnotregistered
@@ -717,7 +725,9 @@ msgid "Help Viewer Error"
 msgstr "Žinyno žiūryklės klaida"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Žinyno žiūryklė nerasta"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.nl.po b/lcl/languages/lclstrconsts.nl.po
index 4101f44cc0..28675c6258 100644
--- a/lcl/languages/lclstrconsts.nl.po
+++ b/lcl/languages/lclstrconsts.nl.po
@@ -647,11 +647,15 @@ msgid "%s: Already registered"
 msgstr "%s: Al vastgelegd"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Help Context niet gevonden"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Help Database niet gevonden"
 
 #: lclstrconsts.rshelperror
@@ -691,11 +695,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Geen help gevonden voor regel %d, kolom %d van %s. "
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Geen help nodes beschikbaar"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Help niet gevonden"
 
 #: lclstrconsts.rshelpnotregistered
@@ -715,7 +723,9 @@ msgid "Help Viewer Error"
 msgstr "Help Viewer Fout"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Help Viewer niet gevonden"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.no.po b/lcl/languages/lclstrconsts.no.po
index de5ce68527..5a35dead8f 100644
--- a/lcl/languages/lclstrconsts.no.po
+++ b/lcl/languages/lclstrconsts.no.po
@@ -649,11 +649,15 @@ msgid "%s: Already registered"
 msgstr "%s: Allerede registrert"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Hjelp kontekst ikke funnet"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Hjelp-database ikke funnet"
 
 #: lclstrconsts.rshelperror
@@ -693,11 +697,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Ingen hjelp funnet for linje %d, kolonne %d av %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Ingen hjelp-noder tilgjengelig"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Hjelp ikke funnet"
 
 #: lclstrconsts.rshelpnotregistered
@@ -717,7 +725,9 @@ msgid "Help Viewer Error"
 msgstr "Hjelpeviser-feil"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Hjelp-viser ikke funnet"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.pl.po b/lcl/languages/lclstrconsts.pl.po
index be35c1d337..b4d27e59fc 100644
--- a/lcl/languages/lclstrconsts.pl.po
+++ b/lcl/languages/lclstrconsts.pl.po
@@ -651,11 +651,11 @@ msgid "%s: Already registered"
 msgstr ""
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr ""
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelperror
@@ -695,11 +695,13 @@ msgid "No help found for line %d, column %d of %s."
 msgstr ""
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Nie znaleziono pomocy"
 
 #: lclstrconsts.rshelpnotregistered
@@ -719,7 +721,7 @@ msgid "Help Viewer Error"
 msgstr ""
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr ""
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.po b/lcl/languages/lclstrconsts.po
index bff835e92f..93093b3b4a 100644
--- a/lcl/languages/lclstrconsts.po
+++ b/lcl/languages/lclstrconsts.po
@@ -638,11 +638,11 @@ msgid "%s: Already registered"
 msgstr ""
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr ""
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelperror
@@ -682,11 +682,11 @@ msgid "No help found for line %d, column %d of %s."
 msgstr ""
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+msgid "No help found for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotregistered
@@ -706,7 +706,7 @@ msgid "Help Viewer Error"
 msgstr ""
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr ""
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.pt.po b/lcl/languages/lclstrconsts.pt.po
index acdc8a7eb0..1247773e41 100644
--- a/lcl/languages/lclstrconsts.pt.po
+++ b/lcl/languages/lclstrconsts.pt.po
@@ -646,11 +646,15 @@ msgid "%s: Already registered"
 msgstr "%s: já registrado"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Ajuda contextual não encontrada"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Banco de dados de ajuda não encontrado"
 
 #: lclstrconsts.rshelperror
@@ -690,11 +694,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Nenhuma ajuda encontrada para a linha %d, coluna %d de %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Nenhum nó de ajuda disponível"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Ajuda não encontrada"
 
 #: lclstrconsts.rshelpnotregistered
@@ -714,7 +722,9 @@ msgid "Help Viewer Error"
 msgstr "Erro no visualizador de ajuda"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Visualizador de ajuda não encontrado"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.pt_BR.po b/lcl/languages/lclstrconsts.pt_BR.po
index 495a47d5f9..e8f987f067 100644
--- a/lcl/languages/lclstrconsts.pt_BR.po
+++ b/lcl/languages/lclstrconsts.pt_BR.po
@@ -645,11 +645,15 @@ msgid "%s: Already registered"
 msgstr "%s: já registrado"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Ajuda contextual não encontrada"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Banco de dados de ajuda não encontrado"
 
 #: lclstrconsts.rshelperror
@@ -689,11 +693,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Nenhuma ajuda encontrada para a linha %d, coluna %d de %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Nenhum nó de ajuda disponível"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Ajuda não encontrada"
 
 #: lclstrconsts.rshelpnotregistered
@@ -713,7 +721,9 @@ msgid "Help Viewer Error"
 msgstr "Erro no visualizador de ajuda"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Visualizador de ajuda não encontrado"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.ru.po b/lcl/languages/lclstrconsts.ru.po
index d8de75f289..c87cda03ab 100644
--- a/lcl/languages/lclstrconsts.ru.po
+++ b/lcl/languages/lclstrconsts.ru.po
@@ -646,11 +646,15 @@ msgid "%s: Already registered"
 msgstr "%s: уже зарегистрирован"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Контекст справки не найден"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "База данных справки не найдена"
 
 #: lclstrconsts.rshelperror
@@ -690,11 +694,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Не найдено справки для строки %d, столбца %d из %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Доступные узлы справки отсутствуют"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Справка не найдена"
 
 #: lclstrconsts.rshelpnotregistered
@@ -714,7 +722,9 @@ msgid "Help Viewer Error"
 msgstr "Ошибка программы просмотра справки"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Программа просмотра справки не найдена"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.sk.po b/lcl/languages/lclstrconsts.sk.po
index 3405eea58e..f63b1c7d81 100644
--- a/lcl/languages/lclstrconsts.sk.po
+++ b/lcl/languages/lclstrconsts.sk.po
@@ -650,11 +650,15 @@ msgid "%s: Already registered"
 msgstr "%s: Už je registrovaný"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Kontextová pomoc nenájdená"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Databáza·pomoci nenájdená"
 
 #: lclstrconsts.rshelperror
@@ -694,11 +698,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "Nenájdený pomocník pre riadok %d, stĺpec %d %s."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Nie sú dostupné žiadne uzly pomoci"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Pomoc nenájdená"
 
 #: lclstrconsts.rshelpnotregistered
@@ -718,7 +726,9 @@ msgid "Help Viewer Error"
 msgstr "Chyba zobrazovača pomoci"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Zobrazovač pomoci nenájdený"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.tr.po b/lcl/languages/lclstrconsts.tr.po
index d51fef44c9..c5a9fd91c3 100644
--- a/lcl/languages/lclstrconsts.tr.po
+++ b/lcl/languages/lclstrconsts.tr.po
@@ -647,11 +647,15 @@ msgid "%s: Already registered"
 msgstr "%s: Zaten kaydedilmiş"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "Yardım bağlamı bulunamadı"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "Yardım veritabanı bulunamadı"
 
 #: lclstrconsts.rshelperror
@@ -691,11 +695,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "%s'nin satır %d, sütun %d için yardım bulunamadı."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "Kullanılabilir yardım düğümü yok"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "Yardım bulunamadı"
 
 #: lclstrconsts.rshelpnotregistered
@@ -715,7 +723,9 @@ msgid "Help Viewer Error"
 msgstr "Yardım görüntüleyici hatası"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "Yardım görüntüleyici bulunamadı"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.ua.po b/lcl/languages/lclstrconsts.ua.po
index 51c2aeea81..6066ec5842 100644
--- a/lcl/languages/lclstrconsts.ua.po
+++ b/lcl/languages/lclstrconsts.ua.po
@@ -642,11 +642,11 @@ msgid "%s: Already registered"
 msgstr ""
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr ""
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelperror
@@ -686,11 +686,11 @@ msgid "No help found for line %d, column %d of %s."
 msgstr ""
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+msgid "No help found for this topic"
 msgstr ""
 
 #: lclstrconsts.rshelpnotregistered
@@ -710,7 +710,7 @@ msgid "Help Viewer Error"
 msgstr ""
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr ""
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/languages/lclstrconsts.zh_CN.po b/lcl/languages/lclstrconsts.zh_CN.po
index 685159f377..4d73696045 100644
--- a/lcl/languages/lclstrconsts.zh_CN.po
+++ b/lcl/languages/lclstrconsts.zh_CN.po
@@ -648,11 +648,15 @@ msgid "%s: Already registered"
 msgstr "%s: 已经注册"
 
 #: lclstrconsts.rshelpcontextnotfound
-msgid "Help Context not found"
+#, fuzzy
+#| msgid "Help Context not found"
+msgid "A help database was found for this topic, but this topic was not found"
 msgstr "未找到帮助内容"
 
 #: lclstrconsts.rshelpdatabasenotfound
-msgid "Help Database not found"
+#, fuzzy
+#| msgid "Help Database not found"
+msgid "There is no help database installed for this topic"
 msgstr "未找到帮助数据库"
 
 #: lclstrconsts.rshelperror
@@ -692,11 +696,15 @@ msgid "No help found for line %d, column %d of %s."
 msgstr "没有找到 %s 的行 %d, 列 %d 的 %s 的相关帮助."
 
 #: lclstrconsts.rshelpnohelpnodesavailable
-msgid "No help nodes available"
+#, fuzzy
+#| msgid "No help nodes available"
+msgid "No help entries available for this topic"
 msgstr "没有有效的帮助节点"
 
 #: lclstrconsts.rshelpnotfound
-msgid "Help not found"
+#, fuzzy
+#| msgid "Help not found"
+msgid "No help found for this topic"
 msgstr "未找到帮助"
 
 #: lclstrconsts.rshelpnotregistered
@@ -716,7 +724,9 @@ msgid "Help Viewer Error"
 msgstr "帮助查看器错误"
 
 #: lclstrconsts.rshelpviewernotfound
-msgid "Help Viewer not found"
+#, fuzzy
+#| msgid "Help Viewer not found"
+msgid "No viewer was found for this type of help content"
 msgstr "未找到帮助查看器"
 
 #: lclstrconsts.rshighlightcolorcaption
diff --git a/lcl/lclstrconsts.pas b/lcl/lclstrconsts.pas
index 75bc0ec53b..fb6e7feea8 100644
--- a/lcl/lclstrconsts.pas
+++ b/lcl/lclstrconsts.pas
@@ -401,12 +401,12 @@ resourceString
     +'Database %s%s%s.';
   rsHelpHelpContextNotFound = 'Help context %s not found.';
   rsHelpNoHelpFoundForSource = 'No help found for line %d, column %d of %s.';
-  rsHelpNoHelpNodesAvailable = 'No help nodes available';
+  rsHelpNoHelpNodesAvailable = 'No help entries available for this topic';
   rsHelpError = 'Help Error';
-  rsHelpDatabaseNotFound = 'Help Database not found';
-  rsHelpContextNotFound = 'Help Context not found';
-  rsHelpViewerNotFound = 'Help Viewer not found';
-  rsHelpNotFound = 'Help not found';
+  rsHelpDatabaseNotFound = 'There is no help database installed for this topic';
+  rsHelpContextNotFound = 'A help database was found for this topic, but this topic was not found';
+  rsHelpViewerNotFound = 'No viewer was found for this type of help content';
+  rsHelpNotFound = 'No help found for this topic';
   rsHelpViewerError = 'Help Viewer Error';
   rsHelpSelectorError = 'Help Selector Error';
   rsUnknownErrorPleaseReportThisBug = 'Unknown Error, please report this bug';