From bc90b9a4e1e7e059a50c39dc75132884bb4f3b17 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 15 Jan 2018 13:43:34 -0500 Subject: [PATCH] l10n: Eliminated STRING_UTIL_CONFIRM_* --- src/l10n/deu-DEU.h | 8 -------- src/l10n/eng-USA.h | 8 -------- src/l10n/epo-RUS.h | 8 -------- src/l10n/esp-ESP.h | 8 -------- src/l10n/fra-FRA.h | 8 -------- src/l10n/ita-ITA.h | 8 -------- src/l10n/jpn-JPN.h | 8 -------- src/l10n/pol-POL.h | 8 -------- src/l10n/por-PRT.h | 8 -------- src/util.cpp | 9 +++++++-- 10 files changed, 7 insertions(+), 74 deletions(-) diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 7f71b4675..5559264fd 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -721,14 +721,6 @@ // View #define STRING_VIEW_TOO_SMALL "Dieser Report hat eine Mindestbreite von {1} und passt nicht in die Bildschirmbreite von {2}." -// util -#define STRING_UTIL_CONFIRM_YES "ja" -#define STRING_UTIL_CONFIRM_YES_U "Ja" -#define STRING_UTIL_CONFIRM_NO "nein" -#define STRING_UTIL_CONFIRM_ALL "alle" -#define STRING_UTIL_CONFIRM_ALL_U "Alle" -#define STRING_UTIL_CONFIRM_QUIT "abbrechen" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index f5e3e61d1..164145997 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -718,14 +718,6 @@ // View #define STRING_VIEW_TOO_SMALL "The report has a minimum width of {1} and does not fit in the available width of {2}." -// util -#define STRING_UTIL_CONFIRM_YES "yes" -#define STRING_UTIL_CONFIRM_YES_U "Yes" -#define STRING_UTIL_CONFIRM_NO "no" -#define STRING_UTIL_CONFIRM_ALL "all" -#define STRING_UTIL_CONFIRM_ALL_U "All" -#define STRING_UTIL_CONFIRM_QUIT "quit" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 70fa7e013..240cb7666 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -721,14 +721,6 @@ // View #define STRING_VIEW_TOO_SMALL "La raporto havas larĝecminimumon {1}, al kio ne konformas la disponebla larĝeco {2}." -// util -#define STRING_UTIL_CONFIRM_YES "jes" -#define STRING_UTIL_CONFIRM_YES_U "Jes" -#define STRING_UTIL_CONFIRM_NO "ne" -#define STRING_UTIL_CONFIRM_ALL "ĉia" -#define STRING_UTIL_CONFIRM_ALL_U "Ĉia" -#define STRING_UTIL_CONFIRM_QUIT "eliru" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index c340c1c3f..69f389300 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -734,14 +734,6 @@ // View #define STRING_VIEW_TOO_SMALL "El informe tiene una anchura mínima de {1} y no cabe en la disponible, que es {2}." -// util -#define STRING_UTIL_CONFIRM_YES "sí" -#define STRING_UTIL_CONFIRM_YES_U "Sí" -#define STRING_UTIL_CONFIRM_NO "no" // |esp-ESP|==|eng-USA| -#define STRING_UTIL_CONFIRM_ALL "todos" -#define STRING_UTIL_CONFIRM_ALL_U "Todos" -#define STRING_UTIL_CONFIRM_QUIT "canc" - // Legacy #define STRING_LEGACY_PRIORITY "Encontrado atributo anticuado. Por favor, cambie '{1}' a '{2}'." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 1c4e1169c..6ab638be1 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -723,14 +723,6 @@ // View #define STRING_VIEW_TOO_SMALL "The report has a minimum width of {1} and does not fit in the available width of {2}." -// util -#define STRING_UTIL_CONFIRM_YES "oui" -#define STRING_UTIL_CONFIRM_YES_U "Oui" -#define STRING_UTIL_CONFIRM_NO "non" -#define STRING_UTIL_CONFIRM_ALL "tous" -#define STRING_UTIL_CONFIRM_ALL_U "Tous" -#define STRING_UTIL_CONFIRM_QUIT "quitter" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index ab50c8317..9a80f12f5 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -722,14 +722,6 @@ // View #define STRING_VIEW_TOO_SMALL "Il report ha larghezza minima di {1} e non entra nella larghezza disponibile di {2}." -// util -#define STRING_UTIL_CONFIRM_YES "si" -#define STRING_UTIL_CONFIRM_YES_U "Si" -#define STRING_UTIL_CONFIRM_NO "no" -#define STRING_UTIL_CONFIRM_ALL "tutti" -#define STRING_UTIL_CONFIRM_ALL_U "Tutti" -#define STRING_UTIL_CONFIRM_QUIT "esci" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 7f5062b8b..8d4ddb591 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -723,14 +723,6 @@ // View #define STRING_VIEW_TOO_SMALL "The report has a minimum width of {1} and does not fit in the available width of {2}." -// util -#define STRING_UTIL_CONFIRM_YES "yes" -#define STRING_UTIL_CONFIRM_YES_U "Yes" -#define STRING_UTIL_CONFIRM_NO "no" -#define STRING_UTIL_CONFIRM_ALL "all" -#define STRING_UTIL_CONFIRM_ALL_U "All" -#define STRING_UTIL_CONFIRM_QUIT "quit" - // Legacy #define STRING_LEGACY_PRIORITY "古い属性が見つかった。'{1}' を '{2}' に変更してください。" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 84fe51551..4df09a577 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -723,14 +723,6 @@ // View #define STRING_VIEW_TOO_SMALL "Raport ma minimalną szerokość {1} i nie mieści się w dostępnej przestrzeni {2}." -// util -#define STRING_UTIL_CONFIRM_YES "tak" -#define STRING_UTIL_CONFIRM_YES_U "Tak" -#define STRING_UTIL_CONFIRM_NO "nie" -#define STRING_UTIL_CONFIRM_ALL "wszystko" -#define STRING_UTIL_CONFIRM_ALL_U "Wszystko" -#define STRING_UTIL_CONFIRM_QUIT "wyjście" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index ad38a44cc..eb5d22dcc 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -723,14 +723,6 @@ // View #define STRING_VIEW_TOO_SMALL "O relatório tem uma largura mínima de {1} e não cabe na largura disponível {2}." -// util -#define STRING_UTIL_CONFIRM_YES "sim" -#define STRING_UTIL_CONFIRM_YES_U "Sim" -#define STRING_UTIL_CONFIRM_NO "não" -#define STRING_UTIL_CONFIRM_ALL "todas" -#define STRING_UTIL_CONFIRM_ALL_U "Todas" -#define STRING_UTIL_CONFIRM_QUIT "Sair" - // Legacy #define STRING_LEGACY_PRIORITY "Legacy attribute found. Please change '{1}' to '{2}'." diff --git a/src/util.cpp b/src/util.cpp index a5ff2e19f..b5aa15873 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -50,12 +50,17 @@ #include #include #include - #include #include #include #include -#include + +#define STRING_UTIL_CONFIRM_YES "yes" +#define STRING_UTIL_CONFIRM_YES_U "Yes" +#define STRING_UTIL_CONFIRM_NO "no" +#define STRING_UTIL_CONFIRM_ALL "all" +#define STRING_UTIL_CONFIRM_ALL_U "All" +#define STRING_UTIL_CONFIRM_QUIT "quit" extern Context context;