From 540484f92fa5c6e47e3514dc67ad78fe94ca34cc Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 23:21:43 -0500 Subject: [PATCH] l10n: Eliminated some column labels --- src/Filter.cpp | 7 +++---- src/l10n/deu-DEU.h | 3 --- src/l10n/eng-USA.h | 3 --- src/l10n/epo-RUS.h | 3 --- src/l10n/esp-ESP.h | 3 --- src/l10n/fra-FRA.h | 3 --- src/l10n/ita-ITA.h | 3 --- src/l10n/jpn-JPN.h | 3 --- src/l10n/pol-POL.h | 3 --- src/l10n/por-PRT.h | 3 --- 10 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/Filter.cpp b/src/Filter.cpp index 2b36b28ea..211d7defd 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -278,15 +277,15 @@ void Filter::safety () const ! filter) { if (! context.config.getBoolean ("allow.empty.filter")) - throw std::string (STRING_TASK_SAFETY_ALLOW); + throw std::string ("You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."); // If user is willing to be asked, this can be avoided. if (context.config.getBoolean ("confirmation") && - confirm (STRING_TASK_SAFETY_VALVE)) + confirm ("This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?")) return; // Sound the alarm. - throw std::string (STRING_TASK_SAFETY_FAIL); + throw std::string ("Command prevented from running."); } } } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 2b1a3466b..7ebd2b318 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "Keine Aufgaben." #define STRING_FEEDBACK_TASKS_PLURAL "({1} Aufgaben)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 Aufgabe)" -#define STRING_TASK_SAFETY_ALLOW "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt." -#define STRING_TASK_SAFETY_FAIL "Befehl an Ausführung gehindert." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index a87d7ed34..3b9d978f3 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "No tasks." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)" -#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." -#define STRING_TASK_SAFETY_FAIL "Command prevented from running." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 4609a858e..fab45d47e 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "Nenia tasko." #define STRING_FEEDBACK_TASKS_PLURAL "({1} taskoj)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 tasko)" -#define STRING_TASK_SAFETY_ALLOW "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion." -#define STRING_TASK_SAFETY_FAIL "Antaŭmalebligis komandon." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index a00fb7edf..3b6b0c4f1 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "Ninguna tarea." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tareas)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarea)" -#define STRING_TASK_SAFETY_ALLOW "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción." -#define STRING_TASK_SAFETY_FAIL "Se impidió la ejecución del comando." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index a87d7ed34..3b9d978f3 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "No tasks." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tasks)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)" -#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." -#define STRING_TASK_SAFETY_FAIL "Command prevented from running." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 7aebab6bb..0a27d7d11 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "Nessun task." #define STRING_FEEDBACK_TASKS_PLURAL "({1} task)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 task)" -#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." -#define STRING_TASK_SAFETY_FAIL "Prevenuta l'esecuzione del comando." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 412bfe02a..5ab45c26e 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "タスクがない。" #define STRING_FEEDBACK_TASKS_PLURAL "({1} タスク)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 タスク)" -#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." -#define STRING_TASK_SAFETY_FAIL "コマンドの実行は中止された。" -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 374a1efa1..ee2d3a60e 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "Brak zadań." #define STRING_FEEDBACK_TASKS_PLURAL "({1} zadania)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 zadanie)" -#define STRING_TASK_SAFETY_ALLOW "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji." -#define STRING_TASK_SAFETY_FAIL "Niedopuszczono do wykonania polecenia." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 627a1cba5..9a3517a4f 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -31,8 +31,5 @@ #define STRING_FEEDBACK_NO_TASKS "Nenhuma tarefa." #define STRING_FEEDBACK_TASKS_PLURAL "({1} tarefas)" #define STRING_FEEDBACK_TASKS_SINGLE "(1 tarefa)" -#define STRING_TASK_SAFETY_ALLOW "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada." -#define STRING_TASK_SAFETY_FAIL "Execução do comando abortada." -#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #endif