From d8bd32aee8461617102cb83526b52468cd8d0b4f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 12:55:10 -0500 Subject: [PATCH] l10n: Eliminated STRING_DEPEND_* --- src/dependency.cpp | 8 ++++---- src/l10n/deu-DEU.h | 5 ----- src/l10n/eng-USA.h | 5 ----- src/l10n/epo-RUS.h | 5 ----- src/l10n/esp-ESP.h | 5 ----- src/l10n/fra-FRA.h | 5 ----- src/l10n/ita-ITA.h | 5 ----- src/l10n/jpn-JPN.h | 5 ----- src/l10n/pol-POL.h | 5 ----- src/l10n/por-PRT.h | 5 ----- 10 files changed, 4 insertions(+), 49 deletions(-) diff --git a/src/dependency.cpp b/src/dependency.cpp index 2b2fa4794..55c972981 100644 --- a/src/dependency.cpp +++ b/src/dependency.cpp @@ -32,9 +32,10 @@ #include #include #include -#include #include +#define STRING_DEPEND_BLOCKED "Task {1} is blocked by:" + extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -173,15 +174,14 @@ void dependencyChainOnComplete (Task& task) { if (context.config.getBoolean ("dependency.reminder")) { - std::cout << STRING_DEPEND_BLOCKING - << '\n'; + std::cout << "and is blocking:\n"; for (const auto& b : blocked) std::cout << " " << b.id << ' ' << b.get ("description") << '\n'; } if (!context.config.getBoolean ("dependency.confirmation") || - confirm (STRING_DEPEND_FIX_CHAIN)) + confirm ("Would you like the dependency chain fixed?")) { // Repair the chain - everything in blocked should now depend on // everything in blocking, instead of task.id. diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 64d004b13..14a415689 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -495,11 +495,6 @@ #define STRING_CMD_EDIT_USAGE "Startet einen Editor, um eine Aufgabe direkt zu bearbeiten" #define STRING_CMD_CALC_USAGE "Rechner" -// dependency -#define STRING_DEPEND_BLOCKED "Aufgabe {1} wird blockiert durch:" -#define STRING_DEPEND_BLOCKING "und blockiert:" -#define STRING_DEPEND_FIX_CHAIN "Möchten Sie, dass diese Abhängigkeitskette korrigiert wird?" - // edit #define STRING_EDIT_NO_CHANGES "Keine Änderungen entdeckt." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 460202f0b..2d4e3ecf8 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -492,11 +492,6 @@ #define STRING_CMD_EDIT_USAGE "Launches an editor to modify a task directly" #define STRING_CMD_CALC_USAGE "Calculator" -// dependency -#define STRING_DEPEND_BLOCKED "Task {1} is blocked by:" -#define STRING_DEPEND_BLOCKING "and is blocking:" -#define STRING_DEPEND_FIX_CHAIN "Would you like the dependency chain fixed?" - // edit #define STRING_EDIT_NO_CHANGES "No edits were detected." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index df818961b..c8997dec5 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -495,11 +495,6 @@ #define STRING_CMD_EDIT_USAGE "Lanĉas redaktilo por rekte modifi taskon" #define STRING_CMD_CALC_USAGE "Kalkulilo" -// dependency -#define STRING_DEPEND_BLOCKED "Tasko {1} estas blokata per:" -#define STRING_DEPEND_BLOCKING "kaj ĝi blokas:" -#define STRING_DEPEND_FIX_CHAIN "Ĉu vi volas, ke la dependeca ĉeno repariĝus?" - // edit #define STRING_EDIT_NO_CHANGES "Ne detektis nenian redakton." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 3d52292ff..a3c314469 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -507,11 +507,6 @@ #define STRING_CMD_EDIT_USAGE "Lanza un editor para modificar una tarea directamente" #define STRING_CMD_CALC_USAGE "Calculadora" -// dependency -#define STRING_DEPEND_BLOCKED "La tarea {1} está bloqueada por:" -#define STRING_DEPEND_BLOCKING "y está bloqueando:" -#define STRING_DEPEND_FIX_CHAIN "¿Desea que la cadena de dependencias sea arreglada?" - // edit #define STRING_EDIT_NO_CHANGES "No se detectaron modificaciones." #define STRING_EDIT_FAILED "Edición fallida con código de salida {1}." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 3841cc221..2f2e93c88 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -497,11 +497,6 @@ #define STRING_CMD_EDIT_USAGE "Launches an editor to modify a task directly" #define STRING_CMD_CALC_USAGE "Calculator" -// dependency -#define STRING_DEPEND_BLOCKED "Tâche {1} est bloquée par :" -#define STRING_DEPEND_BLOCKING "et bloque :" -#define STRING_DEPEND_FIX_CHAIN "Would you like the dependency chain fixed?" - // edit #define STRING_EDIT_NO_CHANGES "Aucunes modifications détectées." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 42d27fd8d..8ffdeb2c5 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -496,11 +496,6 @@ #define STRING_CMD_EDIT_USAGE "Esegue un editor per la modifica diretta di un task" #define STRING_CMD_CALC_USAGE "Calculator" -// dependency -#define STRING_DEPEND_BLOCKED "Il task {1} è bloccato da:" -#define STRING_DEPEND_BLOCKING "e sta bloccando:" -#define STRING_DEPEND_FIX_CHAIN "Si desidera riparare la catena delle dipendenze?" - // edit #define STRING_EDIT_NO_CHANGES "Nessuna modifica riscontrata." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 5f3b8fb90..1f802096d 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -497,11 +497,6 @@ #define STRING_CMD_EDIT_USAGE "task を直接変更するためにエディタを起動します" #define STRING_CMD_CALC_USAGE "電卓" -// dependency -#define STRING_DEPEND_BLOCKED "Task {1} is blocked by:" -#define STRING_DEPEND_BLOCKING "and is blocking:" -#define STRING_DEPEND_FIX_CHAIN "Would you like the dependency chain fixed?" - // edit #define STRING_EDIT_NO_CHANGES "No edits were detected." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 92ebb9ef7..443c1befa 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -497,11 +497,6 @@ #define STRING_CMD_EDIT_USAGE "Uruchamia edytor do zmiany zadania" #define STRING_CMD_CALC_USAGE "Kalkulator" -// dependency -#define STRING_DEPEND_BLOCKED "Zadanie {1} jest blokowane przez:" -#define STRING_DEPEND_BLOCKING "oraz blokuje:" -#define STRING_DEPEND_FIX_CHAIN "Czy chcesz naprawić łańcuch zależności?" - // edit #define STRING_EDIT_NO_CHANGES "Nie znaleziono żadnych edycji." #define STRING_EDIT_FAILED "Editing failed with exit code {1}." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index ee244bbec..e581adb9d 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -497,11 +497,6 @@ #define STRING_CMD_EDIT_USAGE "Inicia um editor externo para modificar a tarefa diretamente" #define STRING_CMD_CALC_USAGE "Calculadora" -// dependency -#define STRING_DEPEND_BLOCKED "Tarefa {1} encontra-se bloqueada por:" -#define STRING_DEPEND_BLOCKING "e está a bloquear:" -#define STRING_DEPEND_FIX_CHAIN "Deseja que a cadeia de dependências seja corrigida?" - // edit #define STRING_EDIT_NO_CHANGES "Não foram detetadas alterações." #define STRING_EDIT_FAILED "Editing failed with exit code {1}."