diff --git a/src/CLI2.cpp b/src/CLI2.cpp index ff7e5bca8..7a59f8154 100644 --- a/src/CLI2.cpp +++ b/src/CLI2.cpp @@ -236,7 +236,7 @@ void CLI2::getOverride (int argc, const char** argv, std::string& home, File& rc if (last_slash != std::string::npos) home = rc.parent (); - context.header (format (STRING_PARSER_ALTERNATE_RC, rc._data)); + context.header (format ("Using alternate .taskrc file {1}", rc._data)); // Keep looping, because if there are multiple rc:file arguments, the last // one should dominate. @@ -263,7 +263,7 @@ void CLI2::getDataLocation (int argc, const char** argv, Path& data) raw.substr (0, 16) == "rc.data.location") { data = Directory (raw.substr (17)); - context.header (format (STRING_PARSER_ALTERNATE_DATA, (std::string) data)); + context.header (format ("Using alternate data.location {1}", (std::string) data)); // Keep looping, because if there are multiple rc:file arguments, the last // one should dominate. @@ -301,7 +301,7 @@ void CLI2::applyOverrides (int argc, const char** argv) context.config.set (name, value); if (context.verbose("override")) - context.footnote (format (STRING_PARSER_OVERRIDE_RC, name, value)); + context.footnote (format ("Configuration override rc.{1}:{2}", name, value)); } } } @@ -855,7 +855,7 @@ void CLI2::aliasExpansion () while (action && counter++ < safetyValveDefault); if (counter >= safetyValveDefault) - context.debug (format (STRING_PARSER_ALIAS_NEST, safetyValveDefault)); + context.debug (format ("Nested alias limit of {1} reached.", safetyValveDefault)); if (changes && context.config.getInteger ("debug.parser") >= 2) @@ -945,7 +945,7 @@ void CLI2::categorizeArgs () ! cmd->accepts_miscellaneous ()) { // No commands were expected --> error. - throw format (STRING_PARSER_UNEXPECTED_ARG, command, a.attribute ("raw")); + throw format ("The '{1}' command does not allow '{2}'.", command, a.attribute ("raw")); } else if (cmd && ! cmd->accepts_filter () && @@ -1367,7 +1367,7 @@ void CLI2::desugarFilterAttributes () #endif } else - throw format (STRING_PARSER_UNKNOWN_ATTMOD, mod); + throw format ("Error: unrecognized attribute modifier '{1}'.", mod); reconstructed.push_back (lhs); reconstructed.push_back (op); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index d299c0ed7..4bc8f4a0b 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "Deutsche Übersetzung" #define STRING_LOCALIZATION_AUTHOR "Ins Deutsche übersetzt von Jens Erat." -// Parser -#define STRING_PARSER_ALIAS_NEST "Maximale Alias-Schachteltiefe von {1} erreicht." -#define STRING_PARSER_OVERRIDE_RC "Konfigurations außer Kraft gesetzt durch: rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Fehler: Nicht erkannter Attribut-Operator '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Verwende alternative .taskrc-Datei {1}" -#define STRING_PARSER_ALTERNATE_DATA "Verwende alternative data.location {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Spaltenname '{1}' nicht erkannt." #define STRING_COLUMN_BAD_FORMAT "Spaltenformat '{1}.{2}' nicht erkannt" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index ee9016593..1642aaecb 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "English localization" #define STRING_LOCALIZATION_AUTHOR "Translated into English by A. Person." -// Parser -#define STRING_PARSER_ALIAS_NEST "Nested alias limit of {1} reached." -#define STRING_PARSER_OVERRIDE_RC "Configuration override rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Error: unrecognized attribute modifier '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Using alternate .taskrc file {1}" -#define STRING_PARSER_ALTERNATE_DATA "Using alternate data.location {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Unrecognized column name '{1}'." #define STRING_COLUMN_BAD_FORMAT "Unrecognized column format '{1}.{2}'" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index e672af313..4dab698e6 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "— Esperanta lokalaĵo" #define STRING_LOCALIZATION_AUTHOR "Tradukita al la Internacia Lingvo per Jeremy John Reeder" -// Parser -#define STRING_PARSER_ALIAS_NEST "Atingis la limon de {1} nest-niveloj de alinomoj." -#define STRING_PARSER_OVERRIDE_RC "Agorda superrego rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Eraro: nekonata atributa modifanto '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Uzanta alterna .taskrc-dosiero {1}" -#define STRING_PARSER_ALTERNATE_DATA "Uzanta alterna data.location {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Nekonata kolumna nomo '{1}'." #define STRING_COLUMN_BAD_FORMAT "Nekonata kolumna formiĝo '{1}.{2}'" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index bfb8502a5..dd6231b8f 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "- localización española" #define STRING_LOCALIZATION_AUTHOR "Traducido al español por Fidel Mato y Jeremy John Reeder." -// Parser -#define STRING_PARSER_ALIAS_NEST "Límite de alias anidados ({1}) alcanzado." -#define STRING_PARSER_OVERRIDE_RC "Sobrescritura de configuración rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Error: modificador de atributo no reconocido '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Usando el archivo .taskrc alternativo {1}" -#define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}" -#define STRING_PARSER_UNEXPECTED_ARG "El comando '{1}' no permite '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Nombre de columna no reconocido '{1}'." #define STRING_COLUMN_BAD_FORMAT "Formato de columna no reconocido '{1}.{2}'" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index ec44d4b97..28cc7f928 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "Traduction française" #define STRING_LOCALIZATION_AUTHOR "Traduit en français par Leowzukw et Jeremy John Reeder." -// Parser -#define STRING_PARSER_ALIAS_NEST "Atteignit la limite d'amboîtage des pseudonymes, {1}." -#define STRING_PARSER_OVERRIDE_RC "Configuration écrasée : rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Erreur : attribut de modification non reconnu '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Utilise un fichier .taskrc alternatif : {1}" -#define STRING_PARSER_ALTERNATE_DATA "Utilise une data.location alternative : {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Nom de colonne non reconnu '{1}'." #define STRING_COLUMN_BAD_FORMAT "Format de colonne non reconnu '{1}.{2}'" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 389512f17..9aa7f0b3f 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "Traduzione in Italiano" #define STRING_LOCALIZATION_AUTHOR "Tradotto in Italiano da Tullio Facchinetti." -// Parser -#define STRING_PARSER_ALIAS_NEST "Nested alias limit of {1} reached." -#define STRING_PARSER_OVERRIDE_RC "Modifica configurazione rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Errore: modificatore di attributo non riconosciuto '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Uso del file .taskrc alternativo {1}" -#define STRING_PARSER_ALTERNATE_DATA "Uso di data.location alternativa {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Nome di colonna '{1}' non riconosciuto." #define STRING_COLUMN_BAD_FORMAT "Formato di colonna '{1}.{2}' non riconosciuto" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 2d61c82b0..ad854db02 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "Japanese localization" #define STRING_LOCALIZATION_AUTHOR "Translated into Japanese by Oota Toshiya." -// Parser -#define STRING_PARSER_ALIAS_NEST "ネストされたエイリアスの制限 {1} に到達した。" -#define STRING_PARSER_OVERRIDE_RC "設定は上書きされた rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "エラー: 不明な属性変更子 '{1}'." -#define STRING_PARSER_ALTERNATE_RC "代替の .taskrc ファイル {1} を使用" -#define STRING_PARSER_ALTERNATE_DATA "代替の data.location {1} を使用" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "認識できないカラム名 '{1}'。" #define STRING_COLUMN_BAD_FORMAT "認識出来ないカラム形式 '{1}.{2}'" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 82dbe89c5..8b04e8ab2 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "Tłumaczenie polskie" #define STRING_LOCALIZATION_AUTHOR "Przetłumaczył na język polski Ł. Panek." -// Parser -#define STRING_PARSER_ALIAS_NEST "Limit {1} zagnieżdżonych aliasów osiągnięty" -#define STRING_PARSER_OVERRIDE_RC "Nadpisanie konfiguracji rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Błąd: nierozpoznany atrybut '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Wczytanie alternatywnego pliku .taskrc {1}" -#define STRING_PARSER_ALTERNATE_DATA "Alternatywne data.location {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Nierozpoznano nazwy kolumny '{1}'." #define STRING_COLUMN_BAD_FORMAT "Nierozpoznano formatu kolumny '{1}.{2}'" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 84db97afe..c6b5fce80 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -36,14 +36,6 @@ #define STRING_LOCALIZATION_DESC "Tradução em Português" #define STRING_LOCALIZATION_AUTHOR "Traduzido para Português por Renato Alves." -// Parser -#define STRING_PARSER_ALIAS_NEST "Limite de 'alias' em cascata atingido: {1}" -#define STRING_PARSER_OVERRIDE_RC "Alteração de configuração rc.{1}:{2}" -#define STRING_PARSER_UNKNOWN_ATTMOD "Erro: modificador de atributo não reconhecido '{1}'." -#define STRING_PARSER_ALTERNATE_RC "Usando o ficheiro .taskrc alternativo {1}" -#define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}" -#define STRING_PARSER_UNEXPECTED_ARG "The '{1}' command does not allow '{2}'." - // columns/Col* #define STRING_COLUMN_BAD_NAME "Nome de coluna '{1}' não reconhecido." #define STRING_COLUMN_BAD_FORMAT "Formato de coluna '{1}.{2}' não reconhecido"