From fdd8b1ca130003cea3d8e335e1824370bcec86cb Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 15 Jan 2018 10:53:48 -0500 Subject: [PATCH] l10n: Eliminated STRING_INVALID_SORT_COL --- 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 - src/sort.cpp | 3 +-- 10 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index f72fc41d2..0f66bf8ca 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -706,7 +706,6 @@ #define STRING_UDA_TYPE "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein." #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_INVALID_SORT_COL "Nach Spalte '{1}' kann nicht sortiert weden." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 93121f3a6..00bd6b2a2 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -704,7 +704,6 @@ #define STRING_UDA_TYPE "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'." #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_INVALID_SORT_COL "The '{1}' column is not a valid sort field." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 7400160c7..a0b1a16e6 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -706,7 +706,6 @@ #define STRING_UDA_TYPE "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'." #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_INVALID_SORT_COL "Kolumno '{1}' ne estas valida kampo por ordigi." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 09ca646b2..190ee9c82 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -718,7 +718,6 @@ #define STRING_UDA_TYPE "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'." #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_INVALID_SORT_COL "La columna '{1}' no es un campo de ordenación válido." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 765602d69..9688400ac 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -708,7 +708,6 @@ #define STRING_UDA_TYPE "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'." #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_INVALID_SORT_COL "The '{1}' column is not a valid sort field." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 03ca6b77d..7bcf8ca48 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -707,7 +707,6 @@ #define STRING_UDA_TYPE "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'." #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_INVALID_SORT_COL "La colonna '{1}' non è un campo di ordinamento valido." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index a4208a6ec..3a63a17a6 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -708,7 +708,6 @@ #define STRING_UDA_TYPE "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'." #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_INVALID_SORT_COL "The '{1}' column is not a valid sort field." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 3a741b76f..a56c86a4e 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -708,7 +708,6 @@ #define STRING_UDA_TYPE "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'." #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_INVALID_SORT_COL "Kolumna '{1}' nie jest poprawnym parametrem sortowania." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 4f8e7f7fa..78703f32f 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -708,7 +708,6 @@ #define STRING_UDA_TYPE "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'." #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_INVALID_SORT_COL "A coluna '{1}' não pode ser ordenada." #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." #define STRING_ERROR_CONFIRM_SIGINT "Interrupted: No changes made." diff --git a/src/sort.cpp b/src/sort.cpp index c673b8306..8dae4a339 100644 --- a/src/sort.cpp +++ b/src/sort.cpp @@ -34,7 +34,6 @@ #include #include #include -#include extern Context context; @@ -273,7 +272,7 @@ static bool sort_compare (int left, int right) } } else - throw format (STRING_INVALID_SORT_COL, field); + throw format ("The '{1}' column is not a valid sort field.", field); } return false;