diff --git a/components/pochecker/languages/pocheckerconsts.cs.po b/components/pochecker/languages/pocheckerconsts.cs.po
index 4340aa9717..f5efd05cd2 100644
--- a/components/pochecker/languages/pocheckerconsts.cs.po
+++ b/components/pochecker/languages/pocheckerconsts.cs.po
@@ -213,10 +213,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -269,10 +265,6 @@ msgstr "Nejsou vybrány žádné testy."
 msgid "Note: translation is fuzzy"
 msgstr ""
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Nalezeno %d chyb."
@@ -415,10 +407,6 @@ msgid ""
 "Errors in selected tests: %d\n"
 msgstr ""
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.de.po b/components/pochecker/languages/pocheckerconsts.de.po
index 03b476ccd4..5d6803ae01 100644
--- a/components/pochecker/languages/pocheckerconsts.de.po
+++ b/components/pochecker/languages/pocheckerconsts.de.po
@@ -213,10 +213,6 @@ msgstr ""
 "Die folgenden nicht mehr existierenden Dateien wurden entfernt aus der Liste:\n"
 "%s\n"
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr "Störende Dateien finden"
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -269,10 +265,6 @@ msgstr "Es wurden keine Tests ausgewählt."
 msgid "Note: translation is fuzzy"
 msgstr "Notiz: Übersetzung ist ungeklärt"
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr "Keine störenden .po-Dateien gefunden."
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "%d Fehler gefunden."
@@ -429,10 +421,6 @@ msgstr ""
 "%3d ungeklärt (%3.1f%%)\n"
 "%d Fehler in den gewählten Tests\n"
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr "Folgende %s Master-.po-Datei(en) zur Liste hinzugefügt:"
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr "Folgende %s verwaiste .po-Datei(en) gefunden:"
diff --git a/components/pochecker/languages/pocheckerconsts.es.po b/components/pochecker/languages/pocheckerconsts.es.po
index 06b9302252..4d7fed7263 100644
--- a/components/pochecker/languages/pocheckerconsts.es.po
+++ b/components/pochecker/languages/pocheckerconsts.es.po
@@ -211,10 +211,6 @@ msgstr ""
 "Los siguientes ficheros que ya no existen fueron removidos de la lista:\n"
 "%s\n"
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -267,10 +263,6 @@ msgstr "No existen pruebas seleccionadas."
 msgid "Note: translation is fuzzy"
 msgstr "Nota: la traducción es confusa (fuzzy)"
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Encontrados %d errores."
@@ -427,10 +419,6 @@ msgstr ""
 "%3d Confuso (%3.1f%%)\n"
 "%d Error(es) en el Test Seleccionado\n"
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.fr.po b/components/pochecker/languages/pocheckerconsts.fr.po
index e89780acd4..6d4a63e08b 100644
--- a/components/pochecker/languages/pocheckerconsts.fr.po
+++ b/components/pochecker/languages/pocheckerconsts.fr.po
@@ -213,10 +213,6 @@ msgstr ""
 "Les fichiers suivants inexistants ont été retirés de la liste :\n"
 "%s\n"
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr "Trouver des fichiers gênants"
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -269,10 +265,6 @@ msgstr "Aucun test n'est sélectionné."
 msgid "Note: translation is fuzzy"
 msgstr "Remarque : la traduction est floue"
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr "Aucun fichier .po gênant trouvé."
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "%d erreurs trouvées."
@@ -429,10 +421,6 @@ msgstr ""
 "%3d Floues (%3.1f%%)\n"
 "%d Erreur(s) dans les tests sélectionnés\n"
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr "Le(s) %s fichier(s) .po maître(s) ajouté(s) à la liste :"
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr "Le(s) %s fichier(s) .po orphelin(s) détecté(s) :"
diff --git a/components/pochecker/languages/pocheckerconsts.hu.po b/components/pochecker/languages/pocheckerconsts.hu.po
index 5a72c348ff..0a74410de9 100644
--- a/components/pochecker/languages/pocheckerconsts.hu.po
+++ b/components/pochecker/languages/pocheckerconsts.hu.po
@@ -213,10 +213,6 @@ msgstr ""
 "A következő nem létező fájlok el lettek távolítva a listából:\n"
 "%s\n"
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr "Aggasztó fájlok keresése"
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -269,10 +265,6 @@ msgstr "Egy teszt sincs teszt kiválasztva."
 msgid "Note: translation is fuzzy"
 msgstr "Megjegyzés: a fordítás bizonytalan"
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr "Nincsenek aggasztó .po fájlok"
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "%d hiba."
@@ -429,10 +421,6 @@ msgstr ""
 "%3d bizonytalan (%3.1f%%)\n"
 "%d hiba a kiválasztott tesztekben\n"
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr "A következő %s mester .po fájl hozzá lett adva a listához:"
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr "A következő %s elárvult .po fájl található:"
diff --git a/components/pochecker/languages/pocheckerconsts.it.po b/components/pochecker/languages/pocheckerconsts.it.po
index 9ba5852e11..00b08e8f0f 100644
--- a/components/pochecker/languages/pocheckerconsts.it.po
+++ b/components/pochecker/languages/pocheckerconsts.it.po
@@ -215,10 +215,6 @@ msgstr ""
 "I seguenti file inesistenti sono stati rimossi dalla lista:\n"
 "%s\n"
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -271,10 +267,6 @@ msgstr "Nessuna verifica selezionata"
 msgid "Note: translation is fuzzy"
 msgstr "Nota: la traduzione è incerta"
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Riscontrati %d errori."
@@ -431,10 +423,6 @@ msgstr ""
 "%3d Incerte (%3.1f%%)\n"
 "%d Errori nei test selezionati\n"
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.ja.po b/components/pochecker/languages/pocheckerconsts.ja.po
index ee681f645e..48c1b96bf8 100644
--- a/components/pochecker/languages/pocheckerconsts.ja.po
+++ b/components/pochecker/languages/pocheckerconsts.ja.po
@@ -211,10 +211,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -267,10 +263,6 @@ msgstr "テスト項目が選択されていません。"
 msgid "Note: translation is fuzzy"
 msgstr ""
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "%d 個のエラーが見つかりました。"
@@ -413,10 +405,6 @@ msgid ""
 "Errors in selected tests: %d\n"
 msgstr ""
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.lt.po b/components/pochecker/languages/pocheckerconsts.lt.po
index cf7dde9e66..e5249b2acf 100644
--- a/components/pochecker/languages/pocheckerconsts.lt.po
+++ b/components/pochecker/languages/pocheckerconsts.lt.po
@@ -211,10 +211,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -269,10 +265,6 @@ msgstr "Būtina parinkti bent vieną testavimą."
 msgid "Note: translation is fuzzy"
 msgstr ""
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Rasta klaidų: %d."
@@ -407,10 +399,6 @@ msgid ""
 "Errors in selected tests: %d\n"
 msgstr ""
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.po b/components/pochecker/languages/pocheckerconsts.po
index a552af6dcb..27a41920a6 100644
--- a/components/pochecker/languages/pocheckerconsts.po
+++ b/components/pochecker/languages/pocheckerconsts.po
@@ -192,10 +192,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -248,10 +244,6 @@ msgstr ""
 msgid "Note: translation is fuzzy"
 msgstr ""
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr ""
@@ -384,10 +376,6 @@ msgid ""
 "Errors in selected tests: %d\n"
 msgstr ""
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.pt_BR.po b/components/pochecker/languages/pocheckerconsts.pt_BR.po
index 8137f8b1c9..d27e6f56b9 100644
--- a/components/pochecker/languages/pocheckerconsts.pt_BR.po
+++ b/components/pochecker/languages/pocheckerconsts.pt_BR.po
@@ -210,10 +210,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -266,10 +262,6 @@ msgstr "Nenhum teste selecionado."
 msgid "Note: translation is fuzzy"
 msgstr ""
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Encontrados %d erros."
@@ -406,10 +398,6 @@ msgid ""
 "Errors in selected tests: %d\n"
 msgstr ""
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/languages/pocheckerconsts.ru.po b/components/pochecker/languages/pocheckerconsts.ru.po
index 22cf4dad3f..c498f8811a 100644
--- a/components/pochecker/languages/pocheckerconsts.ru.po
+++ b/components/pochecker/languages/pocheckerconsts.ru.po
@@ -213,10 +213,6 @@ msgstr ""
 "Следующие несуществующие файлы были удалены из списка:\n"
 "%s\n"
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr "Найти проблемные файлы"
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Неточные переводы (всего: %s)"
@@ -269,10 +265,6 @@ msgstr "Не выбрано ни одного теста."
 msgid "Note: translation is fuzzy"
 msgstr "Внимание: перевод неточен"
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr "Проблемных файлов переводов PO не найдено."
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Найдено ошибок: %d"
@@ -417,10 +409,6 @@ msgstr ""
 "Неточных переводов: %d (%.1f%%)\n"
 "Ошибок в выбранных тестах: %d\n"
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr "Нижеприведённые главные файлы переводов PO (%s шт.) добавлены в список:"
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr "Найдены файлы переводов PO (%s шт.) без соответствующих им главных файлов:"
diff --git a/components/pochecker/languages/pocheckerconsts.uk.po b/components/pochecker/languages/pocheckerconsts.uk.po
index 22a019b399..dfe31b167e 100644
--- a/components/pochecker/languages/pocheckerconsts.uk.po
+++ b/components/pochecker/languages/pocheckerconsts.uk.po
@@ -208,10 +208,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sfindtroublesomefiles
-msgid "Find troublesome files"
-msgstr ""
-
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -266,10 +262,6 @@ msgstr "Не вибрано жодного тесту."
 msgid "Note: translation is fuzzy"
 msgstr ""
 
-#: pocheckerconsts.snotroublesomepofilesfound
-msgid "No troublesome .po files found."
-msgstr ""
-
 #: pocheckerconsts.snrerrorsfound
 msgid "Found %d errors."
 msgstr "Знайдено %d помилок."
@@ -404,10 +396,6 @@ msgid ""
 "Errors in selected tests: %d\n"
 msgstr ""
 
-#: pocheckerconsts.sthefollowingmasterpofilesaddedtothelist
-msgid "The following %s master .po file(s) added to the list:"
-msgstr ""
-
 #: pocheckerconsts.sthefollowingorphanedpofilesfound
 msgid "The following %s orphaned .po file(s) found:"
 msgstr ""
diff --git a/components/pochecker/pocheckerconsts.pas b/components/pochecker/pocheckerconsts.pas
index 7a79173965..70ac64c035 100644
--- a/components/pochecker/pocheckerconsts.pas
+++ b/components/pochecker/pocheckerconsts.pas
@@ -106,9 +106,6 @@ resourcestring
   sPercUntranslated = '%s: %5.1f%% untranslated strings.';
   sPercFuzzy = '%s: %5.1f%% fuzzy strings.';
 
-  sFindTroublesomeFiles = 'Find troublesome files';
-  sNoTroublesomePoFilesFound = 'No troublesome .po files found.';
-  sTheFollowingMasterPoFileSAddedToTheList = 'The following %s master .po file(s) added to the list:';
   sTheFollowingOrphanedPoFileSFound = 'The following %s orphaned .po file(s) found:';
   sTroublesomeFiles = 'Troublesome files';
 
diff --git a/components/pochecker/pocheckermain.lfm b/components/pochecker/pocheckermain.lfm
index 8fd21faa75..585bf078a0 100644
--- a/components/pochecker/pocheckermain.lfm
+++ b/components/pochecker/pocheckermain.lfm
@@ -13,7 +13,7 @@ object PoCheckerForm: TPoCheckerForm
   OnDestroy = FormDestroy
   OnShow = FormShow
   ShowInTaskBar = stAlways
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   Visible = True
   object TestListBox: TCheckListBox
     AnchorSideLeft.Control = SelectTestLabel
@@ -21,7 +21,7 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideTop.Side = asrBottom
     Left = 201
     Height = 118
-    Top = 27
+    Top = 29
     Width = 436
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Top = 6
@@ -34,7 +34,7 @@ object PoCheckerForm: TPoCheckerForm
       'sCheckForDuplicateUntranslatedValues'
       'sCheckStatistics'
     )
-    ItemHeight = 19
+    ItemHeight = 17
     TabOrder = 3
     Data = {
       06000000000000000000
@@ -44,9 +44,9 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideLeft.Control = OpenBtn
     AnchorSideLeft.Side = asrBottom
     Left = 201
-    Height = 13
+    Height = 15
     Top = 8
-    Width = 82
+    Width = 93
     BorderSpacing.Left = 9
     Caption = 'Select test types'
     Font.Style = [fsBold]
@@ -61,7 +61,7 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideBottom.Control = ScanDirBtn
     Left = 8
     Height = 50
-    Top = 27
+    Top = 29
     Width = 184
     BorderSpacing.Bottom = 10
     Caption = '&Open a po-file'
@@ -111,7 +111,7 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideRight.Side = asrBottom
     Left = 8
     Height = 50
-    Top = 147
+    Top = 149
     Width = 184
     BorderSpacing.Top = 5
     Caption = '&Run Selected Tests'
@@ -122,9 +122,9 @@ object PoCheckerForm: TPoCheckerForm
   end
   object NoErrLabel: TLabel
     Left = 8
-    Height = 23
-    Top = 453
-    Width = 145
+    Height = 25
+    Top = 451
+    Width = 146
     Anchors = [akLeft, akBottom]
     Caption = 'No errors found'
     Font.Color = clGreen
@@ -139,8 +139,8 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideTop.Side = asrBottom
     Left = 201
     Height = 25
-    Top = 151
-    Width = 99
+    Top = 153
+    Width = 117
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Select Basic Tests'
@@ -152,10 +152,10 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideLeft.Control = SelectBasicTestsBtn
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = SelectBasicTestsBtn
-    Left = 304
+    Left = 322
     Height = 25
-    Top = 151
-    Width = 85
+    Top = 153
+    Width = 104
     AutoSize = True
     BorderSpacing.Left = 4
     Caption = 'Select All Tests'
@@ -167,10 +167,10 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideLeft.Control = SelectAllTestsBtn
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = SelectAllTestsBtn
-    Left = 393
+    Left = 430
     Height = 25
-    Top = 151
-    Width = 97
+    Top = 153
+    Width = 118
     AutoSize = True
     BorderSpacing.Left = 4
     Caption = 'Unselect All Tests'
@@ -183,17 +183,17 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideTop.Control = SelectBasicTestsBtn
     AnchorSideTop.Side = asrBottom
     Left = 201
-    Height = 22
-    Top = 182
-    Width = 147
+    Height = 19
+    Top = 184
+    Width = 152
     BorderSpacing.Top = 6
     Caption = 'sIgnoreFuzzyTranslations'
     TabOrder = 7
   end
   object StatusBar: TStatusBar
     Left = 0
-    Height = 17
-    Top = 496
+    Height = 23
+    Top = 490
     Width = 644
     Panels = <>
   end
@@ -206,7 +206,7 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideBottom.Control = RunBtn
     Left = 8
     Height = 50
-    Top = 87
+    Top = 89
     Width = 184
     BorderSpacing.Top = 5
     BorderSpacing.Bottom = 10
@@ -257,8 +257,8 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = NoErrLabel
     Left = 8
-    Height = 186
-    Top = 209
+    Height = 185
+    Top = 208
     Width = 629
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Top = 5
@@ -272,7 +272,6 @@ object PoCheckerForm: TPoCheckerForm
     Sorted = True
     Style = lbOwnerDrawFixed
     TabOrder = 8
-    TopIndex = -1
   end
   object LangFilter: TComboBox
     AnchorSideLeft.Control = MasterPoListBox
@@ -280,12 +279,12 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideRight.Control = TestListBox
     AnchorSideRight.Side = asrBottom
     Left = 8
-    Height = 25
-    Top = 399
+    Height = 23
+    Top = 400
     Width = 629
     Anchors = [akLeft, akRight]
     BorderSpacing.Top = 5
-    ItemHeight = 0
+    ItemHeight = 15
     ItemIndex = 0
     Items.Strings = (
       'All languages'
@@ -325,8 +324,8 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideBottom.Control = NoErrLabel
     Left = 8
     Height = 25
-    Top = 428
-    Width = 37
+    Top = 426
+    Width = 53
     Anchors = [akLeft, akBottom]
     AutoSize = True
     BorderSpacing.Top = 10
@@ -338,10 +337,10 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideLeft.Control = SelectAllMasterFilesBtn
     AnchorSideLeft.Side = asrBottom
     AnchorSideBottom.Control = NoErrLabel
-    Left = 136
+    Left = 167
     Height = 25
-    Top = 428
-    Width = 93
+    Top = 426
+    Width = 110
     Anchors = [akLeft, akBottom]
     AutoSize = True
     BorderSpacing.Left = 5
@@ -354,10 +353,10 @@ object PoCheckerForm: TPoCheckerForm
     AnchorSideLeft.Control = ClearMasterFilesBtn
     AnchorSideLeft.Side = asrBottom
     AnchorSideBottom.Control = NoErrLabel
-    Left = 50
+    Left = 66
     Height = 25
-    Top = 428
-    Width = 81
+    Top = 426
+    Width = 96
     Anchors = [akLeft, akBottom]
     AutoSize = True
     BorderSpacing.Left = 5
@@ -365,17 +364,6 @@ object PoCheckerForm: TPoCheckerForm
     OnClick = SelectAllMasterFilesBtnClick
     TabOrder = 11
   end
-  object FindTroublesomeFilesBtn: TButton
-    Left = 514
-    Height = 25
-    Top = 428
-    Width = 121
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    Caption = 'Find troublesome files'
-    OnClick = FindTroublesomeFilesBtnClick
-    TabOrder = 14
-  end
   object OpenDialog: TOpenDialog
     Filter = 'po-files (*.po)|*.po|all files|*'
     Options = [ofFileMustExist, ofEnableSizing, ofViewDetail]
diff --git a/components/pochecker/pocheckermain.pp b/components/pochecker/pocheckermain.pp
index 9095db5c31..c60c96f145 100644
--- a/components/pochecker/pocheckermain.pp
+++ b/components/pochecker/pocheckermain.pp
@@ -38,7 +38,6 @@ type
   { TPoCheckerForm }
 
   TPoCheckerForm = class(TForm)
-    FindTroublesomeFilesBtn: TButton;
     SelectAllMasterFilesBtn: TButton;
     SelectDirectoryDialog: TSelectDirectoryDialog;
     UnselectAllMasterFilesBtn: TButton;
@@ -54,7 +53,6 @@ type
     procedure MasterPoListBoxDrawItem(Control: TWinControl; Index: Integer;
       ARect: TRect; State: TOwnerDrawState);
     procedure MasterPoListBoxSelectionChange(Sender: TObject; User: boolean);
-    procedure FindTroublesomeFilesBtnClick(Sender: TObject);
     procedure ScanDirBtnClick(Sender: TObject);
     procedure SelectAllMasterFilesBtnClick(Sender: TObject);
     procedure UnselectAllMasterFilesBtnClick(Sender: TObject);
@@ -256,7 +254,6 @@ begin
   LangFilter.Top := ATop + 5;
 end;
 
-
 procedure TPoCheckerForm.ClearMasterFilesBtnClick(Sender: TObject);
 begin
   MasterPoListBox.Clear;
@@ -301,63 +298,6 @@ begin
   SelectAllMasterFilesBtn.Enabled := (MasterPoListBox.Items.Count > 0);
 end;
 
-procedure TPoCheckerForm.FindTroublesomeFilesBtnClick(Sender: TObject);
-var
-  SL,FL,OL:TStringList;
-  S, Mn: String;
-  I: Integer;
-  Cur: TCursor;
-begin
-  Cur := Screen.Cursor;
-  Screen.Cursor := crHourGlass;
-  try
-    StatusBar.SimpleText := sScanningInProgress;
-    FL := TStringList.Create;
-    OL := TStringList.Create;
-    SL := FindAllFiles(SelectDirectoryDialog.FileName, '*.po',True);
-    for I := 0 to SL.Count - 1 do // we must check master .po files in a separate round first
-    begin
-      S := SL[I];
-      if IsMasterPOName(S) and (MasterPoListBox.Items.IndexOf(S) = -1)
-      then
-      begin
-          AddToMasterPoList(S);
-          FL.Add(S);
-      end;
-    end;
-    for I := 0 to SL.Count - 1 do
-    begin
-      S := SL[I];
-      if not IsMasterPOName(S)
-      then
-      begin
-        Mn:=ExtractMasterNameFromChildName(S);
-        if (Mn <> '') and (MasterPoListBox.Items.IndexOf(Mn) = -1)
-        then
-          OL.Add(S);
-      end;
-    end;
-    if(OL.Count = 0) and (FL.Count = 0)
-    then
-      S := sNoTroublesomePoFilesFound
-    else
-    begin
-      S:='';
-      if (FL.Count > 0) then S :=  Format(sTheFollowingMasterPoFileSAddedToTheList, [IntToStr(FL.Count)]) + LineEnding + FL.Text;
-      if S <> '' then S := S + LineEnding + LineEnding;
-      if (OL.Count > 0) then S := S + Format(sTheFollowingOrphanedPoFileSFound, [IntToStr(OL.Count)]) + LineEnding + OL.Text;
-    end;
-    MemoDlg(sTroublesomeFiles, S);
-    UpdateGUI(MasterPoListBox.SelCount > 0);
-  finally
-    StatusBar.SimpleText := '';
-    FL.Free;
-    OL.Free;
-    SL.Free;
-  end;
-  Screen.Cursor := Cur;
-end;
-
 procedure TPoCheckerForm.ScanDirBtnClick(Sender: TObject);
 begin
   if SelectDirectoryDialog.Execute then
@@ -474,32 +414,43 @@ end;
 
 procedure TPoCheckerForm.ScanDirectory(ADir: String);
 var
-  SL, ML: TStringList;
+  SL, ML, OL: TStringList;
   i: Integer;
-  S: String;
+  S, Mn: String;
   Cur: TCursor;
 begin
   Cur := Screen.Cursor;
   Screen.Cursor := crHourGlass;
   StatusBar.SimpleText := sScanningInProgress;
   try
-    SL := FindAllFiles(ADir, '*.po',True);
-    try
-      ML := TStringList.Create;
-      for i := 0 to SL.Count - 1 do
-      begin
-        S := SL[i];
-        //debugln('TPoCheckerForm.ScanDirectory: S = "',ExtractFilename(S),'"');
-        if IsMasterPoName(S) then
-          ML.Add(S);
-      end;
-      if (ML.Count > 0) then AddToMasterPoList(ML);
-      UpdateGUI(MasterPoListBox.SelCount > 0);
-    finally
-      SL.Free;
-      ML.Free;
+    ML := TStringList.Create;
+    OL := TStringList.Create;
+    SL := FindAllFiles(ADir, '*.po', True);
+    for i := 0 to SL.Count - 1 do // we must check master .po files in a separate round first
+    begin
+      S := SL[i];
+      if IsMasterPoName(S) then
+        ML.Add(S);
     end;
+    if ML.Count > 0 then
+      AddToMasterPoList(ML);
+    for i := 0 to SL.Count - 1 do
+    begin
+      S := SL[i];
+      if not IsMasterPoName(S) then
+      begin
+        Mn := ExtractMasterNameFromChildName(S);
+        if (Mn <> '') and (MasterPoListBox.Items.IndexOf(Mn) = -1) then
+          OL.Add(S);
+      end;
+    end;
+    if OL.Count > 0 then
+      MemoDlg(sTroublesomeFiles, Format(sTheFollowingOrphanedPoFileSFound, [IntToStr(OL.Count)]) + LineEnding + OL.Text);
+    UpdateGUI(MasterPoListBox.SelCount > 0);
   finally
+    ML.Free;
+    OL.Free;
+    SL.Free;
     StatusBar.SimpleText := '';
     Screen.Cursor := Cur;
   end;
@@ -680,7 +631,6 @@ begin
   end;
   ClearMasterFilesBtn.Enabled := (MasterPoListBox.Items.Count > 0);
   SelectAllMasterFilesBtn.Enabled := (MasterPoListBox.Items.Count > 0);
-  FindTroublesomeFilesBtn.Enabled := (SelectDirectoryDialog.FileName <> '');
 end;
 
 function TPoCheckerForm.GetSelectedMasterFiles: TStringList;
@@ -1005,7 +955,6 @@ begin
   SelectAllTestsBtn.Caption := sSelectAllTests;
   SelectBasicTestsBtn.Caption := sSelectBasicTests;
   UnselectAllTestsBtn.Caption := sUnselectAllTests;
-  FindTroublesomeFilesBtn.Caption:= sFindTroublesomeFiles;
 end;