From bf63dde8caded0b8d163aa18cf474dd84de9c30a Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 14:19:24 -0500 Subject: [PATCH] l10n: Eliminated STRING_LOCALIZATION_* --- src/commands/CmdVersion.cpp | 12 ------------ src/l10n/deu-DEU.h | 9 --------- src/l10n/eng-USA.h | 9 --------- src/l10n/epo-RUS.h | 9 --------- src/l10n/esp-ESP.h | 9 --------- src/l10n/fra-FRA.h | 9 --------- src/l10n/ita-ITA.h | 9 --------- src/l10n/jpn-JPN.h | 9 --------- src/l10n/pol-POL.h | 9 --------- src/l10n/por-PRT.h | 9 --------- 10 files changed, 93 deletions(-) diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp index d40647afc..0bc7bd6e1 100644 --- a/src/commands/CmdVersion.cpp +++ b/src/commands/CmdVersion.cpp @@ -102,12 +102,6 @@ int CmdVersion::execute (std::string& output) #else << STRING_CMD_VERSION_UNKNOWN #endif - -#if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA - << ' ' - << STRING_LOCALIZATION_DESC -#endif - << '\n' << "Copyright (C) 2006 - 2018 P. Beckingham, F. Hernandez." << '\n' @@ -117,12 +111,6 @@ int CmdVersion::execute (std::string& output) << link.render () << '\n'; -#if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA - out << STRING_LOCALIZATION_AUTHOR - << '\n' - << '\n'; -#endif - output = out.str (); return 0; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 35203f66f..0e89f644b 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "Deutsche Übersetzung" -#define STRING_LOCALIZATION_AUTHOR "Ins Deutsche übersetzt von Jens Erat." - // 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 d9fd51c59..94202c936 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "English localization" -#define STRING_LOCALIZATION_AUTHOR "Translated into English by A. Person." - // 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 e6d336de7..8c6fb2e1d 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "— Esperanta lokalaĵo" -#define STRING_LOCALIZATION_AUTHOR "Tradukita al la Internacia Lingvo per Jeremy John Reeder" - // 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 c949460ff..eb9073bc1 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "- localización española" -#define STRING_LOCALIZATION_AUTHOR "Traducido al español por Fidel Mato y Jeremy John Reeder." - // 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 79fe64c2a..21e1e304f 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "Traduction française" -#define STRING_LOCALIZATION_AUTHOR "Traduit en français par Leowzukw et Jeremy John Reeder." - // 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 c938f2406..506a5104b 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "Traduzione in Italiano" -#define STRING_LOCALIZATION_AUTHOR "Tradotto in Italiano da Tullio Facchinetti." - // 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 cd29aa2b2..109838cba 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "Japanese localization" -#define STRING_LOCALIZATION_AUTHOR "Translated into Japanese by Oota Toshiya." - // 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 2cd039a67..e3ec2bfac 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "Tłumaczenie polskie" -#define STRING_LOCALIZATION_AUTHOR "Przetłumaczył na język polski Ł. Panek." - // 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 e029ea00b..59b9752b7 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,15 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -// Note that for English, the following two lines are not displayed. For all -// other localizations, these lines will appear in the output of the 'version' -// and 'diagnostics' commands. -// -// DO NOT include a copyright in the translation. -// -#define STRING_LOCALIZATION_DESC "Tradução em Português" -#define STRING_LOCALIZATION_AUTHOR "Traduzido para Português por Renato Alves." - // 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"