From e928117fb2ab149ae862c717d0d1ead3c8791f07 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 14:21:43 -0500 Subject: [PATCH] l10n: Eliminated STRING_UDA_COLLISION --- src/columns/Column.cpp | 2 +- src/l10n/deu-DEU.h | 1 - src/l10n/eng-USA.h | 1 - src/l10n/epo-RUS.h | 1 - src/l10n/esp-ESP.h | 1 - src/l10n/fra-FRA.h | 1 - src/l10n/ita-ITA.h | 1 - src/l10n/jpn-JPN.h | 1 - src/l10n/pol-POL.h | 1 - src/l10n/por-PRT.h | 1 - 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp index 5e822ccdd..f112977c7 100644 --- a/src/columns/Column.cpp +++ b/src/columns/Column.cpp @@ -171,7 +171,7 @@ void Column::uda (std::map & all) for (const auto& uda : udas) { if (all.find (uda) != all.end ()) - throw format (STRING_UDA_COLLISION, uda); + throw format ("The UDA named '{1}' is the same as a core attribute, and is not permitted.", uda); Column* c = Column::uda (uda); if (c) diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 0e89f644b..957974552 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -473,7 +473,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt." #define STRING_INVALID_MOD "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'." #define STRING_ERROR_DETAILS "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 94202c936..b7bde5d3d 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -470,7 +470,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "The UDA named '{1}' is the same as a core attribute, and is not permitted." #define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 8c6fb2e1d..057a89cd8 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -473,7 +473,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "UDA '{1}' kaj enkonstruita atributo havas la saman nomon. Tio estas malpermesita." #define STRING_INVALID_MOD "Atributo '{1}' ne permesas valoron '{2}'." #define STRING_ERROR_DETAILS "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index eb9073bc1..170173f2b 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -485,7 +485,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido." #define STRING_INVALID_MOD "El atributo '{1}' no admite un valor '{2}'." #define STRING_ERROR_DETAILS "El ajuste 'calendar.details.report' debe contener un único nombre de informe." #define STRING_ERROR_NO_FILTER "Los filtros de línea de comando no están soportados por este comando." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 21e1e304f..fc37bdef8 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -495,7 +495,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé." #define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 506a5104b..56fd3711d 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -474,7 +474,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso." #define STRING_INVALID_MOD "L'attributo '{1}' non ammette un valore pari a '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 109838cba..472c438ac 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -475,7 +475,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "The UDA named '{1}' is the same as a core attribute, and is not permitted." #define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index e3ec2bfac..b688dccb6 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -475,7 +475,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona." #define STRING_INVALID_MOD "Atrybut '{1}' nie zezwala na wartość '{2}'." #define STRING_ERROR_DETAILS "Zmienna 'calendar.details.report' musi zawierać nazwę raportu." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 59b9752b7..bc579d2df 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -475,7 +475,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_UDA_COLLISION "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido." #define STRING_INVALID_MOD "O atributo '{1}' não permite o valor '{2}'." #define STRING_ERROR_DETAILS "A definição 'calendar.details.report' pode apenas indicar um nome de relatório." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."