diff --git a/components/pochecker/languages/pocheckerconsts.ar.po b/components/pochecker/languages/pocheckerconsts.ar.po
index 2d32efd9c6..252eacf9d3 100644
--- a/components/pochecker/languages/pocheckerconsts.ar.po
+++ b/components/pochecker/languages/pocheckerconsts.ar.po
@@ -1,7 +1,3 @@
- Arabic translation of Free Pascal Lazarus Project.
- Copyright (C) 2012 Lazarus Project
- This file is distributed under the same license as the Lazarus package.
- Khaled Shagrouni <shagrouni@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Free Pascal Lazarus Project.\n"
@@ -187,9 +183,9 @@ msgstr ""
 "  خطأ عند خفظ ملف:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "اختيار كل الإختبارات"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -207,7 +203,3 @@ msgstr "مجموع التحذيرات التي وُجدت: %d"
 msgid "Translation"
 msgstr "الترجمة"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "إزالة اختيار كل الإختبارات"
-
diff --git a/components/pochecker/languages/pocheckerconsts.cs.po b/components/pochecker/languages/pocheckerconsts.cs.po
index b2a61df4d1..cec35ff2b1 100644
--- a/components/pochecker/languages/pocheckerconsts.cs.po
+++ b/components/pochecker/languages/pocheckerconsts.cs.po
@@ -180,9 +180,9 @@ msgstr ""
 "Chyba ukládání souboru:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Vybrat všechny testy"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -200,7 +200,3 @@ msgstr "Celkem nalezeno varování: %d"
 msgid "Translation"
 msgstr "Překlad"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Zruš výběr všech testů"
-
diff --git a/components/pochecker/languages/pocheckerconsts.de.po b/components/pochecker/languages/pocheckerconsts.de.po
index fab55af304..341aab2a2b 100644
--- a/components/pochecker/languages/pocheckerconsts.de.po
+++ b/components/pochecker/languages/pocheckerconsts.de.po
@@ -121,7 +121,7 @@ msgstr ""
 "Gewählter Dateiname\n"
 "%s\n"
 "sieht nicht wie ein geeigneter Name für eine po-file\n"
-" aus"
+" aus\n"
 
 #: pocheckerconsts.snotestselected
 msgid "There are no tests selected."
@@ -171,9 +171,9 @@ msgstr ""
 "Fehler beim Speichern von Datei:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Alle Tests auswählen"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -191,7 +191,3 @@ msgstr "Insgesamt %d Warnungen gefunden"
 msgid "Translation"
 msgstr "Übersetzung"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Alle Tests abwählen"
-
diff --git a/components/pochecker/languages/pocheckerconsts.es.po b/components/pochecker/languages/pocheckerconsts.es.po
index d1f94414b6..6f7665954f 100644
--- a/components/pochecker/languages/pocheckerconsts.es.po
+++ b/components/pochecker/languages/pocheckerconsts.es.po
@@ -179,9 +179,9 @@ msgstr ""
 "Error guardando archivo:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Seleccione todas las pruebas"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -199,7 +199,3 @@ msgstr "Total de avisos encontrados: %d"
 msgid "Translation"
 msgstr "Traducción"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Deseleccionar todas las pruebas"
-
diff --git a/components/pochecker/languages/pocheckerconsts.lt.po b/components/pochecker/languages/pocheckerconsts.lt.po
index 76c9ae1360..3f2c355eee 100644
--- a/components/pochecker/languages/pocheckerconsts.lt.po
+++ b/components/pochecker/languages/pocheckerconsts.lt.po
@@ -1,4 +1,3 @@
- Valdas Jankunas <zmuogs@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,9 +181,9 @@ msgstr ""
 "Rašant į failą įvyko klaida:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Pažymėti visus testavimus"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -202,7 +201,3 @@ msgstr "Viso rasta perspėjimų: %d"
 msgid "Translation"
 msgstr "Vertimas"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Naikinti testavimų žymėjimą"
-
diff --git a/components/pochecker/languages/pocheckerconsts.po b/components/pochecker/languages/pocheckerconsts.po
index a98999923f..25909ddb45 100644
--- a/components/pochecker/languages/pocheckerconsts.po
+++ b/components/pochecker/languages/pocheckerconsts.po
@@ -155,8 +155,8 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
 msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
@@ -175,7 +175,3 @@ msgstr ""
 msgid "Translation"
 msgstr ""
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr ""
-
diff --git a/components/pochecker/languages/pocheckerconsts.pt_BR.po b/components/pochecker/languages/pocheckerconsts.pt_BR.po
index 319d9f429e..c13e361385 100644
--- a/components/pochecker/languages/pocheckerconsts.pt_BR.po
+++ b/components/pochecker/languages/pocheckerconsts.pt_BR.po
@@ -170,9 +170,9 @@ msgstr ""
 "Erro ao salvar arquivo:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Selecionar todos os testes"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -190,7 +190,3 @@ msgstr "Total de avisos encontrados: %d"
 msgid "Translation"
 msgstr "Tradução"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Desmarcar todos os testes"
-
diff --git a/components/pochecker/languages/pocheckerconsts.ru.po b/components/pochecker/languages/pocheckerconsts.ru.po
index c3015bdcbf..a586354da7 100644
--- a/components/pochecker/languages/pocheckerconsts.ru.po
+++ b/components/pochecker/languages/pocheckerconsts.ru.po
@@ -178,9 +178,9 @@ msgstr ""
 "Ошибка сохранения файла:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Выбрать все тесты"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr "Выбрать базовые тесты"
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -198,7 +198,3 @@ msgstr "Всего найдено предупреждений: %d"
 msgid "Translation"
 msgstr "Перевод"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Отменить выбор всех тестов"
-
diff --git a/components/pochecker/languages/pocheckerconsts.uk.po b/components/pochecker/languages/pocheckerconsts.uk.po
index fbf570a301..57781cdcc9 100644
--- a/components/pochecker/languages/pocheckerconsts.uk.po
+++ b/components/pochecker/languages/pocheckerconsts.uk.po
@@ -1,4 +1,3 @@
- Igor Paliychuk <mansonigor@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "PO-Revision-Date: 2012-04-23 11:40+0300\n"
@@ -179,9 +178,9 @@ msgstr ""
 "Помилка збереження файлу:\n"
 "%s\n"
 
-#: pocheckerconsts.sselectalltests
-msgid "Select all tests"
-msgstr "Вибрати всі тести"
+#: pocheckerconsts.sselectbasictests
+msgid "Select basic tests"
+msgstr ""
 
 #: pocheckerconsts.sselecttesttypes
 msgid "Select test types"
@@ -199,7 +198,3 @@ msgstr "Знайдено всього попереджень: %d"
 msgid "Translation"
 msgstr "Переклад"
 
-#: pocheckerconsts.sunselectalltests
-msgid "Unselect all tests"
-msgstr "Зняти вибір з всіх тестів"
-
diff --git a/components/pochecker/pocheckerconsts.pas b/components/pochecker/pocheckerconsts.pas
index a74a945f16..98910452fc 100644
--- a/components/pochecker/pocheckerconsts.pas
+++ b/components/pochecker/pocheckerconsts.pas
@@ -7,8 +7,7 @@ interface
 resourcestring
   //Main form
   rsPoChecker = 'PO File Checker';
-  sSelectAllTests = 'Select all tests';
-  sUnSelectAllTests = 'Unselect all tests';
+  sSelectBasicTests = 'Select basic tests';
   sGUIPoFileCheckingTool = 'GUI Po-file checking tool';
   sSelectTestTypes = 'Select test types';
   sOpenAPoFile = '&Open a po-file';
diff --git a/components/pochecker/pocheckermain.pp b/components/pochecker/pocheckermain.pp
index f85566ac7c..1830b78448 100644
--- a/components/pochecker/pocheckermain.pp
+++ b/components/pochecker/pocheckermain.pp
@@ -155,13 +155,8 @@ var
   i: Integer;
 begin
   cb := Sender as TCheckBox;
-  // Caption text : select all / unselect all
-  if cb.Checked then
-    cb.Caption := sUnSelectAllTests
-  else
-    cb.Caption := sSelectAllTests;
   // Set / reset all CheckListBox items.
-  for i := 0 to TestListBox.Count - 1 do
+  for i := 0 to TestListBox.Count - 2 do
     TestListBox.Checked[i] := cb.Checked;
 end;
 
@@ -195,7 +190,7 @@ begin
       else
         TestListBox.Items.Add(PoTestOptionNames[Opt]);
     end;
-  SelectAllCheckBox.Caption := sSelectAllTests;
+  SelectAllCheckBox.Caption := sSelectBasicTests;
 end;
 
 function TPoCheckerForm.GetOptionsFromListBox: TPoTestOptions;