From 6f6335f67aa2ff4059c0f2dd06b6fe837efa0d02 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 20 Jan 2018 14:07:07 -0500
Subject: [PATCH] l10n: Eliminated STRING_HELPER_PROJECT_*

---
 src/feedback.cpp   | 8 ++++----
 src/l10n/deu-DEU.h | 6 ------
 src/l10n/eng-USA.h | 6 ------
 src/l10n/epo-RUS.h | 6 ------
 src/l10n/esp-ESP.h | 6 ------
 src/l10n/fra-FRA.h | 6 ------
 src/l10n/ita-ITA.h | 6 ------
 src/l10n/jpn-JPN.h | 6 ------
 src/l10n/pol-POL.h | 6 ------
 src/l10n/por-PRT.h | 6 ------
 10 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/src/feedback.cpp b/src/feedback.cpp
index 4ddc11700..5ed23ae48 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -436,7 +436,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
   if (project != "")
   {
     if (scope)
-      msg << format (STRING_HELPER_PROJECT_CHANGE, project)
+      msg << format ("The project '{1}' has changed.", project)
           << "  ";
 
     // Count pending and done tasks, for this project.
@@ -459,13 +459,13 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
     else
       percentage = (count_done * 100 / (count_done + count_pending));
 
-    msg << format (STRING_HELPER_PROJECT_COMPL, project, percentage)
+    msg << format ("Project '{1}' is {2}% complete", project, percentage)
         << ' ';
 
     if (count_pending == 1 && count_done == 0)
-      msg << format (STRING_HELPER_PROJECT_REM1, count_pending);
+      msg << format ("({1} task remaining).", count_pending);
     else
-      msg << format (STRING_HELPER_PROJECT_REM, count_pending, count_pending + count_done);
+      msg << format ("({1} of {2} tasks remaining).", count_pending, count_pending + count_done);
   }
 
   return msg.str ();
diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h
index 824d2dce9..20fa13270 100644
--- a/src/l10n/deu-DEU.h
+++ b/src/l10n/deu-DEU.h
@@ -526,12 +526,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 #define STRING_FEEDBACK_BACKLOG      "{1} Lokale Änderungen.  Datenabgleich erforderlich."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Zeigt alle Konfigurations-Optionen oder eine Teilmenge davon"
 #define STRING_CMD_SHOW_ARGS         "Sie müssen 'all' oder ein Suchwort angeben."
diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h
index 3f26f14fe..8cf3fd35b 100644
--- a/src/l10n/eng-USA.h
+++ b/src/l10n/eng-USA.h
@@ -523,12 +523,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h
index 49bb1e0df..42cde4f60 100644
--- a/src/l10n/epo-RUS.h
+++ b/src/l10n/epo-RUS.h
@@ -526,12 +526,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 #define STRING_FEEDBACK_BACKLOG      "Estas {1} lokaj ŝanĝoj. Sinkronigo devita."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Montras ĉian agordan variablon, aŭ subaron"
 #define STRING_CMD_SHOW_ARGS         "Oni sole povas specifi 'all' aŭ serĉĉenon."
diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h
index 48dcae8ff..9d9f7fbec 100644
--- a/src/l10n/esp-ESP.h
+++ b/src/l10n/esp-ESP.h
@@ -538,12 +538,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Hay {1} modificaciones locales.  Se require una sincronización."
 #define STRING_FEEDBACK_BACKLOG      "Hay {1} modificaciones locales.  Se require una sincronización."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado."
-#define STRING_HELPER_PROJECT_COMPL  "El proyecto '{1}' está completado en un {2}%"
-#define STRING_HELPER_PROJECT_REM    "({1} de {2} tareas restantes)."
-#define STRING_HELPER_PROJECT_REM1   "({1} tarea restante)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Muestra todas las variables de configuración o un subconjunto"
 #define STRING_CMD_SHOW_ARGS         "Solo puede especificar 'all' o un término de búsqueda."
diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h
index 512e0cdb1..1fce572de 100644
--- a/src/l10n/fra-FRA.h
+++ b/src/l10n/fra-FRA.h
@@ -548,12 +548,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Il y a des {1} changements locaux.  Synchronisation requise."
 #define STRING_FEEDBACK_BACKLOG      "Il y a des {1} changements locaux.  Synchronisation requise."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h
index ea80f032c..134acd5bf 100644
--- a/src/l10n/ita-ITA.h
+++ b/src/l10n/ita-ITA.h
@@ -527,12 +527,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."
-#define STRING_HELPER_PROJECT_COMPL  "Il progetto '{1}' è {2}% completo"
-#define STRING_HELPER_PROJECT_REM    "({1} di {2} task rimanenti)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Mostra i sottoinsiemi di variabili di configurazione"
 #define STRING_CMD_SHOW_ARGS         "Solo 'all' può essere specificata come stringa di ricerca."
diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h
index e23ee98ad..d0b66d7ff 100644
--- a/src/l10n/jpn-JPN.h
+++ b/src/l10n/jpn-JPN.h
@@ -528,12 +528,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "There are {1} local changes.  Sync required."
 #define STRING_FEEDBACK_BACKLOG      "There is {1} local change.  Sync required."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Shows all configuration variables or subset"
 #define STRING_CMD_SHOW_ARGS         "You can only specify 'all' or a search string."
diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h
index 2a389f450..cdd4095fd 100644
--- a/src/l10n/pol-POL.h
+++ b/src/l10n/pol-POL.h
@@ -528,12 +528,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 #define STRING_FEEDBACK_BACKLOG      "Wykryto {1} lokalne zmiany. Wymagana synchronizacja."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Pokazuje wszystkie zmienne konfiguracji lub ich podzbiór"
 #define STRING_CMD_SHOW_ARGS         "Możesz jedynie wybrać wszystkie lub wyszukać na podstawie ciągu."
diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h
index ae9f345b3..cd078c957 100644
--- a/src/l10n/por-PRT.h
+++ b/src/l10n/por-PRT.h
@@ -528,12 +528,6 @@
 #define STRING_FEEDBACK_BACKLOG_N    "Há {1} modificações locais. Necessário sincronizar (sync)."
 #define STRING_FEEDBACK_BACKLOG      "Há {1} modificações locais. Necessário sincronizar (sync)."
 
-// helpers
-#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."
-#define STRING_HELPER_PROJECT_COMPL  "Project '{1}' is {2}% complete"
-#define STRING_HELPER_PROJECT_REM    "({1} of {2} tasks remaining)."
-#define STRING_HELPER_PROJECT_REM1   "({1} task remaining)."
-
 // 'show' command
 #define STRING_CMD_SHOW              "Mostra todas ou um subconjunto das variáveis de configuração"
 #define STRING_CMD_SHOW_ARGS         "Apenas pode específicar 'all' ou uma expressão a procurar."