From f2e725b3c958f9c271fe18fb52d1f015fdcf6cbe Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 15 Jan 2018 12:51:56 -0500 Subject: [PATCH] l10n: Eliminated STRING_HOOKS_* --- src/Hooks.cpp | 12 +++++++++++- src/l10n/deu-DEU.h | 12 ------------ src/l10n/eng-USA.h | 12 ------------ src/l10n/epo-RUS.h | 12 ------------ src/l10n/esp-ESP.h | 12 ------------ src/l10n/fra-FRA.h | 12 ------------ src/l10n/ita-ITA.h | 12 ------------ src/l10n/jpn-JPN.h | 12 ------------ src/l10n/pol-POL.h | 12 ------------ src/l10n/por-PRT.h | 12 ------------ 10 files changed, 11 insertions(+), 109 deletions(-) diff --git a/src/Hooks.cpp b/src/Hooks.cpp index 57a14d91b..e1adf364e 100644 --- a/src/Hooks.cpp +++ b/src/Hooks.cpp @@ -46,7 +46,17 @@ #include #include #include -#include + +#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" +#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" +#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" +#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" +#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " +#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " +#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" +#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" +#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" +#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" extern Context context; diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 97cb3c6da..7ba9b558b 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -733,18 +733,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Leerer Datensatz in der Eingabe." #define STRING_RECORD_JUNK_AT_EOL "Unerkannte Zeichen am Ende der Eingabe." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 893c4e13c..e6ad7da5b 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -731,18 +731,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Empty record in input." #define STRING_RECORD_JUNK_AT_EOL "Unrecognized characters at end of line." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 8cb0d8e1d..c4c94a090 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -733,18 +733,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Malplena rikordo en la inigo." #define STRING_RECORD_JUNK_AT_EOL "Nekonataj signoj ĉe vicfino." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 005f20fe3..edf2e8529 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -745,18 +745,6 @@ #define STRING_HELPER_PROJECT_REM "({1} de {2} tareas restantes)." #define STRING_HELPER_PROJECT_REM1 "({1} tarea restante)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: se esperaba 0bjeto JSON '{...}' hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: falta atributo 'description' en objeto JSON hook script: {1}." -#define STRING_HOOK_ERROR_NOUUID "Hook Error: falta atributo 'uuid' en objeto JSON hook script: {1}." -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: error de sintaxis JSON en: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " // |esp-ESP|==|eng-USA| -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: fallo al interpretar JSON: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: se esperaba {1} tarea(s) JSON, se encontraron {2}, hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON debe ser para la misma tarea: {1}, hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON debe ser para la misma tarea: {1} != {2}, hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: se esperaba retro-alimentación desde un hook script que falló: {1}" - // Record #define STRING_RECORD_EMPTY "Registro vacío en la entrada." #define STRING_RECORD_JUNK_AT_EOL "Caracteres no reconocidos al final de línea." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 57850f701..0989165aa 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -735,18 +735,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Empty record in input." #define STRING_RECORD_JUNK_AT_EOL "Unrecognized characters at end of line." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 090884ef0..b907fc45d 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -734,18 +734,6 @@ #define STRING_HELPER_PROJECT_REM "({1} di {2} task rimanenti)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Voce vuota in ingresso." #define STRING_RECORD_JUNK_AT_EOL "Carattere non riconosciuto a fine riga." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 0e6a3f8c5..982c6e3e4 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -735,18 +735,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Empty record in input." #define STRING_RECORD_JUNK_AT_EOL "Unrecognized characters at end of line." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index e1194ff4d..2d2241990 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -735,18 +735,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Pusty wpis na wejściu." #define STRING_RECORD_JUNK_AT_EOL "Nierozpoznawalny znak na koncu lini." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index e417aed57..dd1d097ba 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -735,18 +735,6 @@ #define STRING_HELPER_PROJECT_REM "({1} of {2} tasks remaining)." #define STRING_HELPER_PROJECT_REM1 "({1} task remaining)." -// Hooks -#define STRING_HOOK_ERROR_OBJECT "Hook Error: JSON Object '{...}' expected from hook script: {1}" -#define STRING_HOOK_ERROR_NODESC "Hook Error: JSON Object missing 'description' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_NOUUID "Hook Error: JSON Object missing 'uuid' attribute from hook script: {1}" -#define STRING_HOOK_ERROR_SYNTAX "Hook Error: JSON syntax error in: {1}" -#define STRING_HOOK_ERROR_JSON "Hook Error: JSON " -#define STRING_HOOK_ERROR_NOPARSE "Hook Error: JSON failed to parse: " -#define STRING_HOOK_ERROR_BAD_NUM "Hook Error: Expected {1} JSON task(s), found {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_SAME1 "Hook Error: JSON must be for the same task: {1}, in hook script: {2}" -#define STRING_HOOK_ERROR_SAME2 "Hook Error: JSON must be for the same task: {1} != {2}, in hook script: {3}" -#define STRING_HOOK_ERROR_NOFEEDBACK "Hook Error: Expected feedback from failing hook script: {1}" - // Record #define STRING_RECORD_EMPTY "Registo vazio na entrada fornecida." #define STRING_RECORD_JUNK_AT_EOL "Caracteres desconhecidos no fim da linha."