POChecker: do not show translation totals (number of translated/untranslated/fuzzy strings) in 'all languages' mode. It didn't work correctly (these values reflected only last processed language) and there is no much point in knowing these values as a sum for all languages.

git-svn-id: trunk@57691 -

components/pochecker/languages/pocheckerconsts.cs.po

@@ -213,6 +213,10 @@ msgid ""
 "%s\n"
 msgstr ""
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -443,6 +447,10 @@ msgstr ""
 msgid "Total warnings: %d"
 msgstr "Celkem nalezeno varování: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr ""
@@ -467,6 +475,10 @@ msgstr ""
 msgid "Unselect all files"
 msgstr ""
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr ""

components/pochecker/languages/pocheckerconsts.de.po

@@ -211,6 +211,10 @@ msgstr ""
 "Die folgenden nicht mehr existierenden Dateien wurden entfernt aus der Liste:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Ungeklärte Zeichenketten (insgesamt: %s)"
@@ -443,6 +447,10 @@ msgstr "Gesamtanzahl nicht übersetzter Zeichenketten: %s"
 msgid "Total warnings: %d"
 msgstr "Insgesamt %d Warnungen gefunden"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Übersetzte Zeichenketten (insgesamt: %s [%.1f%%])"
@@ -467,6 +475,10 @@ msgstr "Alle abwählen"
 msgid "Unselect all files"
 msgstr "Alle Dateien abwählen"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Nicht übersetzte Zeichenketten (insgesamt: %s)"

components/pochecker/languages/pocheckerconsts.es.po

@@ -211,6 +211,10 @@ msgstr ""
 "Los siguientes ficheros que ya no existen fueron removidos de la lista:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -455,6 +459,10 @@ msgstr ""
 msgid "Total warnings: %d"
 msgstr "Total de avisos encontrados: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr ""
@@ -479,6 +487,10 @@ msgstr "&Deseleccionar Todo"
 msgid "Unselect all files"
 msgstr "Deseleccionar todos los ficheros"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr ""

components/pochecker/languages/pocheckerconsts.fr.po

@@ -211,6 +211,10 @@ msgstr ""
 "Les fichiers suivants inexistants ont été retirés de la liste :\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Chaînes floues (total : %s)"
@@ -443,6 +447,10 @@ msgstr "Total des chaînes non traduites : %s"
 msgid "Total warnings: %d"
 msgstr "Total des avertissements : %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Chaînes traduites (total : %s [%.1f%%])"
@@ -467,6 +475,10 @@ msgstr "Tout &désélectionner"
 msgid "Unselect all files"
 msgstr "Désélectionner tous les fichiers"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Chaînes non traduites (total : %s)"

components/pochecker/languages/pocheckerconsts.hu.po

@@ -211,6 +211,10 @@ msgstr ""
 "A következő nem létező fájlok el lettek távolítva a listából:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Bizonytalan szövegek (összesen: %s)"
@@ -443,6 +447,10 @@ msgstr "Összes lefordítatlan szöveg: %s"
 msgid "Total warnings: %d"
 msgstr "Összes figyelmeztetés: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Lefordított szövegek (összesen: %s [%.1f%%])"
@@ -467,6 +475,10 @@ msgstr "Kijelölések törlése"
 msgid "Unselect all files"
 msgstr "Kijelölés megszüntetése"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Lefordítatlan szövegek (összesen: %s)"

components/pochecker/languages/pocheckerconsts.it.po

@@ -215,6 +215,10 @@ msgstr ""
 "I seguenti file inesistenti sono stati rimossi dalla lista:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -459,6 +463,10 @@ msgstr ""
 msgid "Total warnings: %d"
 msgstr "Totale avvertimenti: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr ""
@@ -483,6 +491,10 @@ msgstr "&Deseleziona tutto"
 msgid "Unselect all files"
 msgstr "Deseleziona"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr ""

components/pochecker/languages/pocheckerconsts.ja.po

@@ -211,6 +211,10 @@ msgid ""
 "%s\n"
 msgstr ""
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -441,6 +445,10 @@ msgstr ""
 msgid "Total warnings: %d"
 msgstr "警告の総数：%d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr ""
@@ -465,6 +473,10 @@ msgstr ""
 msgid "Unselect all files"
 msgstr ""
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr ""

components/pochecker/languages/pocheckerconsts.lt.po

@@ -212,6 +212,10 @@ msgstr ""
 "Iš sąrašo pašalintį šie neegzistuojantys failai:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Neaiškūs vertimai (viso: %s)"
@@ -444,6 +448,10 @@ msgstr "Viso neišversta: %s"
 msgid "Total warnings: %d"
 msgstr "Viso rasta perspėjimų: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Išversta (viso: %s [%.1f%%])"
@@ -468,6 +476,10 @@ msgstr "&Nužymėti viską"
 msgid "Unselect all files"
 msgstr "Nužymėti visus failus"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Neišversta (viso: %s)"

components/pochecker/languages/pocheckerconsts.po

@@ -188,6 +188,10 @@ msgid ""
 "%s\n"
 msgstr ""
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -404,6 +408,10 @@ msgstr ""
 msgid "Total warnings: %d"
 msgstr ""
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr ""
@@ -428,6 +436,10 @@ msgstr ""
 msgid "Unselect all files"
 msgstr ""
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr ""

components/pochecker/languages/pocheckerconsts.pt_BR.po

@@ -211,6 +211,10 @@ msgstr ""
 "Os seguintes arquivos inexistentes foram removidos da lista:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Strings incertas (total: %s)"
@@ -443,6 +447,10 @@ msgstr "Total de strings não traduzidas: %s"
 msgid "Total warnings: %d"
 msgstr "Total de avisos encontrados: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Strings traduzidas (total: %s [%.1f%%])"
@@ -467,6 +475,10 @@ msgstr "&Desselecionar Tudo"
 msgid "Unselect all files"
 msgstr "Desselecionar todos arquivos"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Strings não traduzidas (total: %s)"

components/pochecker/languages/pocheckerconsts.ru.po

@@ -205,6 +205,10 @@ msgstr ""
 "Следующие несуществующие файлы были удалены из списка:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr "Неточные переводы"
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Неточные переводы (всего: %s)"
@@ -433,6 +437,10 @@ msgstr "Всего непереведённых строк: %s"
 msgid "Total warnings: %d"
 msgstr "Всего предупреждений: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr "Переведённые строки"
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Переведённые строки (всего: %s [%.1f%%])"
@@ -457,6 +465,10 @@ msgstr "&Снять выбор"
 msgid "Unselect all files"
 msgstr "Снять выбор файлов"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr "Непереведённые строки"
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Непереведённые строки (всего: %s)"

components/pochecker/languages/pocheckerconsts.uk.po

@@ -212,6 +212,10 @@ msgstr ""
 "Такі відсутні файли були вилучені зі списку:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr "Неповні рядки (всього: %s)"
@@ -444,6 +448,10 @@ msgstr "Всього неперекладених рядків: %s"
 msgid "Total warnings: %d"
 msgstr "Знайдено всього попереджень: %d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr "Перекладених рядків (всього: %s [%.1f%%])"
@@ -468,6 +476,10 @@ msgstr "&Зняти вибір"
 msgid "Unselect all files"
 msgstr "Зняти вибір зі всіх файлів"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr "Неперекладені рядки (всього: %s)"

components/pochecker/languages/pocheckerconsts.zh_CN.po

@@ -215,6 +215,10 @@ msgstr ""
 "下面不存在文件被移除从列表:\n"
 "%s\n"
 
+#: pocheckerconsts.sfuzzystrings
+msgid "Fuzzy strings"
+msgstr ""
+
 #: pocheckerconsts.sfuzzystringstotal
 msgid "Fuzzy strings (total: %s)"
 msgstr ""
@@ -459,6 +463,10 @@ msgstr ""
 msgid "Total warnings: %d"
 msgstr "全部警告找到:%d"
 
+#: pocheckerconsts.stranslatedstrings
+msgid "Translated strings"
+msgstr ""
+
 #: pocheckerconsts.stranslatedstringstotal
 msgid "Translated strings (total: %s [%.1f%%])"
 msgstr ""
@@ -483,6 +491,10 @@ msgstr "不选择所有(&U)"
 msgid "Unselect all files"
 msgstr "不选择所有文件"
 
+#: pocheckerconsts.suntranslatedstrings
+msgid "Untranslated strings"
+msgstr ""
+
 #: pocheckerconsts.suntranslatedstringstotal
 msgid "Untranslated strings (total: %s)"
 msgstr ""

components/pochecker/pocheckerconsts.pas

@@ -53,6 +53,9 @@ resourcestring
   sTranslatedStringsTotal = 'Translated strings (total: %s [%.1f%%])';
   sUntranslatedStringsTotal = 'Untranslated strings (total: %s)';
   sFuzzyStringsTotal = 'Fuzzy strings (total: %s)';
+  sTranslatedStrings = 'Translated strings';
+  sUntranslatedStrings = 'Untranslated strings';
+  sFuzzyStrings = 'Fuzzy strings';
   sStatHint = 'Translated: %d (%.1f%%)' + LineEnding +
               'Untranslated: %d (%.1f%%)' + LineEnding +
               'Fuzzy: %d (%.1f%%)' + LineEnding +

components/pochecker/pocheckermain.pp

@@ -336,8 +336,13 @@ begin
 end;
 
 function TPoCheckerForm.GetTestOptions: TPoTestOptions;
+var
+  ALangID: TLangID;
 begin
   Result := [];
+  ALangID := LangFilterIndexToLangID(LangFilter.ItemIndex);
+  if ALangID = lang_all then
+    Include(Result,ptoFindAllChildren);
 end;
 
 procedure TPoCheckerForm.SetTestTypeCheckBoxes(TestTypes: TPoTestTypes);
@@ -552,20 +557,25 @@ begin
       SL.Add(Format(sTotalErrorsNonFuzzy, [ErrorCount, NonFuzzyErrorCount]))
     else
       SL.Add(Format(sTotalErrors, [ErrorCount]));
-    SL.Add(Format(sTotalUntranslatedStrings, [IntToStr(TotalUntranslatedCount)]));
-    SL.Add(Format(sTotalFuzzyStrings, [IntToStr(TotalFuzzyCount)]));
-    SL.Add('');
-    SL.Add(Format(sTotalTranslatedStrings, [IntToStr(TotalTranslatedCount), TotalPercTranslated]));
 
-    StatL.Add(Format(sTotalUntranslatedStrings, [IntToStr(TotalUntranslatedCount)]));
+    if not (ptoFindAllChildren in TestOptions) then
-    StatL.Add(Format(sTotalFuzzyStrings, [IntToStr(TotalFuzzyCount)]));
+    begin
-    StatL.Add('');
+      SL.Add(Format(sTotalUntranslatedStrings, [IntToStr(TotalUntranslatedCount)]));
-    StatL.Add(Format(sTotalTranslatedStrings, [IntToStr(TotalTranslatedCount), TotalPercTranslated]));
+      SL.Add(Format(sTotalFuzzyStrings, [IntToStr(TotalFuzzyCount)]));
+      SL.Add('');
+      SL.Add(Format(sTotalTranslatedStrings, [IntToStr(TotalTranslatedCount), TotalPercTranslated]));
+
+      StatL.Add(Format(sTotalUntranslatedStrings, [IntToStr(TotalUntranslatedCount)]));
+      StatL.Add(Format(sTotalFuzzyStrings, [IntToStr(TotalFuzzyCount)]));
+      StatL.Add('');
+      StatL.Add(Format(sTotalTranslatedStrings, [IntToStr(TotalTranslatedCount), TotalPercTranslated]));
+    end;
 
     DupL.Add(Format(sTotalWarnings, [WarningCount]));
 
     ResultDlg := TResultDlgForm.Create(nil);
     try
+      ResultDlg.FTestOptions := TestOptions;
       ResultDlg.FTotalTranslated := TotalTranslatedCount;
       ResultDlg.FTotalUntranslated := TotalUntranslatedCount;
       ResultDlg.FTotalFuzzy := TotalFuzzyCount;

components/pochecker/resultdlg.pp

@@ -55,6 +55,7 @@ type
     FTotalUntranslated: Integer;
     FTotalFuzzy: Integer;
     FTotalPercTranslated: Double;
+    FTestOptions: TPoTestOptions;
     property Log: TStringList read FLog write FLog;
     property StatLog: TStringList read FStatLog write FStatLog;
     property DupLog: TStringList read FDupLog write FDupLog;
@@ -151,13 +152,21 @@ begin
     GraphStatForm.PoFamilyStats := Self.PoFamilyStats;
     GraphStatForm.Settings := Self.Settings;
 
-    GraphStatForm.TranslatedLabel.Caption := Format(sTranslatedStringsTotal, [
+    if not (ptoFindAllChildren in FTestOptions) then
-      IntToStr(FTotalTranslated), FTotalPercTranslated]);
+    begin
-    GraphStatForm.UnTranslatedLabel.Caption := Format(sUntranslatedStringsTotal
+      GraphStatForm.TranslatedLabel.Caption := Format(sTranslatedStringsTotal, [
-      , [IntToStr(FTotalUntranslated)]);
+        IntToStr(FTotalTranslated), FTotalPercTranslated]);
-    GraphStatForm.FuzzyLabel.Caption := Format(sFuzzyStringsTotal, [IntToStr(
+      GraphStatForm.UnTranslatedLabel.Caption := Format(sUntranslatedStringsTotal
-      FTotalFuzzy)]);
+        , [IntToStr(FTotalUntranslated)]);
-
+      GraphStatForm.FuzzyLabel.Caption := Format(sFuzzyStringsTotal, [IntToStr(
+        FTotalFuzzy)]);
+    end
+    else
+    begin
+      GraphStatForm.TranslatedLabel.Caption := sTranslatedStrings;
+      GraphStatForm.UnTranslatedLabel.Caption := sUntranslatedStrings;
+      GraphStatForm.FuzzyLabel.Caption := sFuzzyStrings;
+    end;
     mr := GraphStatForm.ShowModal;
     if mr = mrOpenEditorFile then ModalResult := mr; // To inform pocheckermain
   finally