diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e10ecf5e..cf6bd01cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,11 +134,11 @@ else (LANGUAGE) set (PACKAGE_LANGUAGE 1) endif (LANGUAGE) -set (LANGUAGE_EN_US 1) -set (LANGUAGE_ES_ES 2) -set (LANGUAGE_DE_DE 3) -set (LANGUAGE_FR_FR 4) -set (LANGUAGE_IT_IT 5) +set (LANGUAGE_ENG_USA 1) +set (LANGUAGE_ESP_ESP 2) +set (LANGUAGE_DEU_DEU 3) +set (LANGUAGE_FRA_FRA 4) +set (LANGUAGE_ITA_ITA 5) set (LANGUAGE_POR_PRT 6) message ("-- Configuring cmake.h") diff --git a/INSTALL b/INSTALL index 7cb906de9..a8d914f78 100644 --- a/INSTALL +++ b/INSTALL @@ -90,8 +90,11 @@ To make use of a translation, specify a language number, as found in cmake.h: Currently the defined languages are: - en-US 1 - es-ES 2 + eng_USA 1 + esp_ESP 2 + fra_FRA 4 + ita_ITA 5 + por_PRT 6 Uninstallation diff --git a/cmake.h.in b/cmake.h.in index fb0a5d74c..7bd25a6b5 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -16,12 +16,12 @@ #define TASK_RCDIR "${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}" /* Localization */ -#define PACKAGE_LANGUAGE ${PACKAGE_LANGUAGE} -#define LANGUAGE_EN_US ${LANGUAGE_EN_US} -#define LANGUAGE_ES_ES ${LANGUAGE_ES_ES} -#define LANGUAGE_FR_FR ${LANGUAGE_FR_FR} -#define LANGUAGE_DE_DE ${LANGUAGE_DE_DE} -#define LANGUAGE_IT_IT ${LANGUAGE_IT_IT} +#define PACKAGE_LANGUAGE ${PACKAGE_LANGUAGE} +#define LANGUAGE_ENG_USA ${LANGUAGE_ENG_USA} +#define LANGUAGE_ESP_ESP ${LANGUAGE_ESP_ESP} +#define LANGUAGE_FRA_FRA ${LANGUAGE_FRA_FRA} +#define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU} +#define LANGUAGE_ITA_ITA ${LANGUAGE_ITA_ITA} #define LANGUAGE_POR_PRT ${LANGUAGE_POR_PRT} /* git information */ diff --git a/scripts/utils/l10n b/scripts/utils/l10n index 197b86e2a..f65faf7ce 100755 --- a/scripts/utils/l10n +++ b/scripts/utils/l10n @@ -34,7 +34,7 @@ import argparse import re import fnmatch -REFERENCE = 'en-US.h' +REFERENCE = 'eng-USA.h' def find_localizations(source, single=''): '''Finds all [a-z][a-z]-[A-Z][A-Z].h files in the source tree.''' @@ -42,8 +42,6 @@ def find_localizations(source, single=''): for path, dirs, files in os.walk(source, topdown=True, onerror=None, followlinks=False): matches = map(lambda x: os.path.join(path, x), fnmatch.filter(files, '[a-z][a-z][a-z]-[A-Z][A-Z][A-Z].h')) - matches.extend(map(lambda x: os.path.join(path, x), - fnmatch.filter(files, '[a-z][a-z]-[A-Z][A-Z].h'))) if single: # Accept both cases - if user specified es-ES.h or only es-ES diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp index b98a0af22..7acaeda23 100644 --- a/src/commands/CmdVersion.cpp +++ b/src/commands/CmdVersion.cpp @@ -97,7 +97,7 @@ int CmdVersion::execute (std::string& output) << STRING_CMD_VERSION_UNKNOWN #endif -#if PACKAGE_LANGUAGE != LANGUAGE_EN_US +#if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA << " " << STRING_LOCALIZATION_DESC #endif @@ -111,7 +111,7 @@ int CmdVersion::execute (std::string& output) << link.render () << "\n"; -#if PACKAGE_LANGUAGE != LANGUAGE_EN_US +#if PACKAGE_LANGUAGE != LANGUAGE_ENG_USA out << STRING_LOCALIZATION_AUTHOR << "\n" << "\n"; diff --git a/src/en-US.h b/src/eng-USA.h similarity index 99% rename from src/en-US.h rename to src/eng-USA.h index 2f28c8128..20dc8b467 100644 --- a/src/en-US.h +++ b/src/eng-USA.h @@ -55,10 +55,10 @@ //////////////////////////////////////////////////////////////////////////////// // // Translators: -// 1. Copy this file (en-US.h) to a new file with the target locale as the +// 1. Copy this file (eng-USA.h) to a new file with the target locale as the // file name. Using German as an example, do this: // -// cp en-US.h de-DE.h +// cp eng-USA.h deu-DEU.h // // 2. Modify all the strings below. // i.e. change "Unknown error." to "Unbekannter Fehler.". @@ -66,17 +66,17 @@ // 3. Add your new translation to the task.git/src/i18n.h file, if necessary, // by inserting: // -// #elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE -// #include +// #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU +// #include // // 4. Add your new language to task.git/CMakeLists.txt, making sure that // number is unique: // -// set (LANGUAGE_DE_DE 4) +// set (LANGUAGE_DEU_DEU 3) // // 5. Add your new language to task.git/cmake.h.in: // -// #define LANGUAGE_DE_DE ${LANGUAGE_DE_DE} +// #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU} // // 6. Build your localized Taskwarrior with these commands: // diff --git a/src/es-ES.h b/src/esp-ESP.h similarity index 95% rename from src/es-ES.h rename to src/esp-ESP.h index 60faaaf74..786d4648e 100644 --- a/src/es-ES.h +++ b/src/esp-ESP.h @@ -55,10 +55,10 @@ //////////////////////////////////////////////////////////////////////////////// // // Translators: -// 1. Copy this file (en-US.h) to a new file with the target locale as the +// 1. Copy this file (eng-USA.h) to a new file with the target locale as the // file name. Using German as an example, do this: // -// cp en-US.h de-DE.h +// cp eng-USA.h de-DE.h // // 2. Modify all the strings below. // i.e. change "Unknown error." to "Unbekannter Fehler.". @@ -66,17 +66,17 @@ // 3. Add your new translation to the task.git/src/i18n.h file, if necessary, // by inserting: // -// #elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE +// #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU // #include // // 4. Add your new language to task.git/CMakeLists.txt, making sure that // number is unique: // -// set (LANGUAGE_DE_DE 4) +// set (LANGUAGE_DEU_DEU 3) // // 5. Add your new language to task.git/cmake.h.in: // -// #define LANGUAGE_DE_DE ${LANGUAGE_DE_DE} +// #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU} // // 6. Build your localized Taskwarrior with these commands: // @@ -126,7 +126,7 @@ #define STRING_COLUMN_BAD_FORMAT "Formato de columna no reconocido '{1}.{2}'" #define STRING_COLUMN_LABEL_TASKS "Tareas" #define STRING_COLUMN_LABEL_DEP "Depende" -#define STRING_COLUMN_LABEL_DEP_S "Dep" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_DEP_S "Dep" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_DESC "Descripción" #define STRING_COLUMN_LABEL_DUE "Vencimiento" #define STRING_COLUMN_LABEL_END "Fin" @@ -136,18 +136,18 @@ #define STRING_COLUMN_LABEL_MOD "Modificada" #define STRING_COLUMN_LABEL_ADDED "Añadida" #define STRING_COLUMN_LABEL_AGE "Edad" -#define STRING_COLUMN_LABEL_ID "ID" // |es-ES|==|en-US| -#define STRING_COLUMN_LABEL_PRI "Pri" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_ID "ID" // |esp-ESP|==|eng-USA| +#define STRING_COLUMN_LABEL_PRI "Pri" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_PRIORITY "Prioridad" #define STRING_COLUMN_LABEL_PROJECT "Proyecto" #define STRING_COLUMN_LABEL_UNTIL "Hasta" #define STRING_COLUMN_LABEL_WAIT "Espera" #define STRING_COLUMN_LABEL_WAITING "Esperando hasta" -#define STRING_COLUMN_LABEL_RECUR "Recur" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_RECUR "Recur" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_RECUR_L "Recurrencia" #define STRING_COLUMN_LABEL_START "Comienzo" #define STRING_COLUMN_LABEL_STARTED "Comenzada" -#define STRING_COLUMN_LABEL_ACTIVE "A" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_ACTIVE "A" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_STATUS "Estatus" #define STRING_COLUMN_LABEL_STAT "Est" #define STRING_COLUMN_LABEL_STAT_PE "Pendientes" @@ -156,14 +156,14 @@ #define STRING_COLUMN_LABEL_STAT_WA "Esperando" // Mejor Periódica, pero STRING_COLUMN_LABEL_STAT_P es Pendiente #define STRING_COLUMN_LABEL_STAT_RE "Recurrentes" -#define STRING_COLUMN_LABEL_STAT_P "P" // |es-ES|==|en-US| -#define STRING_COLUMN_LABEL_STAT_C "C" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_STAT_P "P" // |esp-ESP|==|eng-USA| +#define STRING_COLUMN_LABEL_STAT_C "C" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_STAT_D "S" #define STRING_COLUMN_LABEL_STAT_W "E" -#define STRING_COLUMN_LABEL_STAT_R "R" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_STAT_R "R" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_TAGS "Marcas" #define STRING_COLUMN_LABEL_TAG "Marca" -#define STRING_COLUMN_LABEL_UUID "UUID" // |es-ES|==|en-US| +#define STRING_COLUMN_LABEL_UUID "UUID" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_URGENCY "Urgencia" #define STRING_COLUMN_LABEL_NAME "Nombre" #define STRING_COLUMN_LABEL_VALUE "Valor" @@ -203,7 +203,7 @@ #define STRING_CMD_VERSION_DOCS "La documentación de taskwarrior se puede consultar usando 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync' y 'man task-faq' o en http://taskwarrior.org" #define STRING_CMD_VERSION_BUILT "{1} {2} construido para " #define STRING_CMD_VERSION_UNKNOWN "desconocido" -#define STRING_CMD_VERSION_COPY "Copyright (C) 2006 - 2014 P. Beckingham, F. Hernandez." // |es-ES|==|en-US| +#define STRING_CMD_VERSION_COPY "Copyright (C) 2006 - 2014 P. Beckingham, F. Hernandez." // |esp-ESP|==|eng-USA| #define STRING_CMD_LOGO_USAGE "Muestra el logo de Taskwarrior" #define STRING_CMD_LOGO_COLOR_REQ "El comando logo requiere que el soporte de color esté habilitado." #define STRING_CMD_EXEC_USAGE "Ejecuta comandos y scripts externos" @@ -238,7 +238,7 @@ #define STRING_CMD_STATS_USAGE "Muestra estadísticas de la base de datos de tareas" #define STRING_CMD_STATS_CATEGORY "Categoría" #define STRING_CMD_STATS_DATA "Datos" -#define STRING_CMD_STATS_TOTAL "Total" // |es-ES|==|en-US| +#define STRING_CMD_STATS_TOTAL "Total" // |esp-ESP|==|eng-USA| #define STRING_CMD_STATS_ANNOTATIONS "Anotaciones" #define STRING_CMD_STATS_UNIQUE_TAGS "Marcas únicas" #define STRING_CMD_STATS_PROJECTS "Proyectos" @@ -300,10 +300,10 @@ #define STRING_CMD_PROJECTS_USAGE "Muestra todos los nombres de proyecto en uso" #define STRING_CMD_PROJECTS_USAGE_2 "Muestra una lista de todos los nombres (solamente) de proyecto en uso" #define STRING_CMD_PROJECTS_NO "No hay proyectos." -#define STRING_CMD_PROJECTS_PRI_N "Pri:None" // |es-ES|==|en-US| -#define STRING_CMD_PROJECTS_PRI_H "Pri:H" // |es-ES|==|en-US| -#define STRING_CMD_PROJECTS_PRI_M "Pri:M" // |es-ES|==|en-US| -#define STRING_CMD_PROJECTS_PRI_L "Pri:L" // |es-ES|==|en-US| +#define STRING_CMD_PROJECTS_PRI_N "Pri:None" // |esp-ESP|==|eng-USA| +#define STRING_CMD_PROJECTS_PRI_H "Pri:H" // |esp-ESP|==|eng-USA| +#define STRING_CMD_PROJECTS_PRI_M "Pri:M" // |esp-ESP|==|eng-USA| +#define STRING_CMD_PROJECTS_PRI_L "Pri:L" // |esp-ESP|==|eng-USA| #define STRING_CMD_PROJECTS_NONE "(ninguno)" #define STRING_CMD_PROJECTS_SUMMARY "{1} proyecto" #define STRING_CMD_PROJECTS_SUMMARY2 "{1} proyectos" @@ -434,7 +434,7 @@ #define STRING_CMD_SYNC_INIT "Por favor, confirme que desea subir todas sus tareas pendientes al Servidor Task" #define STRING_CMD_SYNC_NO_INIT "Taskwarrior no procederá a la inicialización de la sincronización por primera vez." #define STRING_CMD_SYNC_RELOCATE0 "La cuenta del servidor ha sido reubicada. Por favor, actualice su configuración utilizando:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" // |es-ES|==|en-US| +#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" // |esp-ESP|==|eng-USA| #define STRING_CMD_SYNC_BAD_CA "Certificado CA no encontrado." #define STRING_CMD_SYNC_CONNECT "No se pudo conectar a {1} {2}" #define STRING_CMD_SYNC_HANDSHAKE "Handshake fallido. {1}" @@ -447,7 +447,7 @@ #define STRING_CMD_DIAG_CAPS "Capacidades" #define STRING_CMD_DIAG_FEATURES "Características Constructivas" #define STRING_CMD_DIAG_BUILT "Construido" -#define STRING_CMD_DIAG_COMMIT "Commit" // |es-ES|==|en-US| +#define STRING_CMD_DIAG_COMMIT "Commit" // |esp-ESP|==|eng-USA| #define STRING_CMD_DIAG_FOUND "(encontrado)" #define STRING_CMD_DIAG_MISSING "(no encontrado)" #define STRING_CMD_DIAG_ENABLED "Habilitado" @@ -480,7 +480,7 @@ #define STRING_CMD_COLOR_USAGE "Todos los colores, una muestra, o una leyenda" #define STRING_CMD_COLOR_HERE "Aquí están los colores en uso actualmente:" -#define STRING_CMD_COLOR_COLOR "Color" // |es-ES|==|en-US| +#define STRING_CMD_COLOR_COLOR "Color" // |esp-ESP|==|eng-USA| #define STRING_CMD_COLOR_DEFINITION "Definición" #define STRING_CMD_COLOR_EXPLANATION "Use este comando para ver como los colores son mostrados por su terminal." #define STRING_CMD_COLOR_16 "Uso de 16-colores (soporta subrayado, negrita, fondo brillante):" @@ -513,7 +513,7 @@ #define STRING_CMD_BURN_USAGE_M "Muestra un diagrama burndown, por meses" #define STRING_CMD_BURN_USAGE_W "Muestra un diagrama burndown, por semanas" #define STRING_CMD_BURN_USAGE_D "Muestra un diagrama burndown, por días" -#define STRING_CMD_BURN_TITLE "Burndown" // |es-ES|==|en-US| +#define STRING_CMD_BURN_TITLE "Burndown" // |esp-ESP|==|eng-USA| #define STRING_CMD_BURN_TOO_SMALL "Ventana de terminal demasiado pequeña para dibujar una gráfica." #define STRING_CMD_BURN_DAILY "Diario" #define STRING_CMD_BURN_WEEKLY "Semanal" @@ -573,16 +573,16 @@ #define STRING_DATE_DECEMBER_LONG "diciembre" #define STRING_DATE_JANUARY_SHORT "ene" -#define STRING_DATE_FEBRUARY_SHORT "feb" // |es-ES|==|en-US| -#define STRING_DATE_MARCH_SHORT "mar" // |es-ES|==|en-US| +#define STRING_DATE_FEBRUARY_SHORT "feb" // |esp-ESP|==|eng-USA| +#define STRING_DATE_MARCH_SHORT "mar" // |esp-ESP|==|eng-USA| #define STRING_DATE_APRIL_SHORT "abr" -#define STRING_DATE_MAY_SHORT "may" // |es-ES|==|en-US| -#define STRING_DATE_JUNE_SHORT "jun" // |es-ES|==|en-US| -#define STRING_DATE_JULY_SHORT "jul" // |es-ES|==|en-US| +#define STRING_DATE_MAY_SHORT "may" // |esp-ESP|==|eng-USA| +#define STRING_DATE_JUNE_SHORT "jun" // |esp-ESP|==|eng-USA| +#define STRING_DATE_JULY_SHORT "jul" // |esp-ESP|==|eng-USA| #define STRING_DATE_AUGUST_SHORT "ago" -#define STRING_DATE_SEPTEMBER_SHORT "sep" // |es-ES|==|en-US| -#define STRING_DATE_OCTOBER_SHORT "oct" // |es-ES|==|en-US| -#define STRING_DATE_NOVEMBER_SHORT "nov" // |es-ES|==|en-US| +#define STRING_DATE_SEPTEMBER_SHORT "sep" // |esp-ESP|==|eng-USA| +#define STRING_DATE_OCTOBER_SHORT "oct" // |esp-ESP|==|eng-USA| +#define STRING_DATE_NOVEMBER_SHORT "nov" // |esp-ESP|==|eng-USA| #define STRING_DATE_DECEMBER_SHORT "dic" #define STRING_DATE_SUNDAY_LONG "domingo" @@ -687,11 +687,11 @@ // Maintain the same spacing. #define STRING_EDIT_TABLE_HEADER_1 "Nombre Detalles modificables" -#define STRING_EDIT_TABLE_HEADER_2 "----------------- ----------------------------------------------------" // |es-ES|==|en-US| +#define STRING_EDIT_TABLE_HEADER_2 "----------------- ----------------------------------------------------" // |esp-ESP|==|eng-USA| // Errors // TODO Move each of these to appropriate section. -#define STRING_ERROR_PREFIX "Error: " // |es-ES|==|en-US| +#define STRING_ERROR_PREFIX "Error: " // |esp-ESP|==|eng-USA| #define STRING_UNKNOWN_ERROR "Error desconocido." #define STRING_TRIVIAL_INPUT "Debe especificar un comando o una tarea a modificar." #define STRING_ASSUME_INFO "No especificó un comando - asumido 'information'." @@ -954,17 +954,17 @@ */ // util -#define STRING_UTIL_CONFIRM_YN " (yes/no) " // |es-ES|==|en-US| -#define STRING_UTIL_CONFIRM_YES "yes" // |es-ES|==|en-US| -#define STRING_UTIL_CONFIRM_YES_U "Yes" // |es-ES|==|en-US| -#define STRING_UTIL_CONFIRM_NO "no" // |es-ES|==|en-US| -#define STRING_UTIL_CONFIRM_ALL "all" // |es-ES|==|en-US| -#define STRING_UTIL_CONFIRM_ALL_U "All" // |es-ES|==|en-US| -#define STRING_UTIL_CONFIRM_QUIT "quit" // |es-ES|==|en-US| -#define STRING_UTIL_GIBIBYTES "GiB" // |es-ES|==|en-US| -#define STRING_UTIL_MEBIBYTES "MiB" // |es-ES|==|en-US| -#define STRING_UTIL_KIBIBYTES "KiB" // |es-ES|==|en-US| -#define STRING_UTIL_BYTES "B" // |es-ES|==|en-US| +#define STRING_UTIL_CONFIRM_YN " (yes/no) " // |esp-ESP|==|eng-USA| +#define STRING_UTIL_CONFIRM_YES "yes" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_CONFIRM_YES_U "Yes" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_CONFIRM_NO "no" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_CONFIRM_ALL "all" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_CONFIRM_ALL_U "All" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_CONFIRM_QUIT "quit" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_GIBIBYTES "GiB" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_MEBIBYTES "MiB" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_KIBIBYTES "KiB" // |esp-ESP|==|eng-USA| +#define STRING_UTIL_BYTES "B" // |esp-ESP|==|eng-USA| // shell #define STRING_SHELL_USAGE \ diff --git a/src/fr-FR.h b/src/fra-FRA.h similarity index 99% rename from src/fr-FR.h rename to src/fra-FRA.h index 4409d7020..9c537a311 100644 --- a/src/fr-FR.h +++ b/src/fra-FRA.h @@ -55,10 +55,10 @@ //////////////////////////////////////////////////////////////////////////////// // // Translators: -// 1. Copy this file (en-US.h) to a new file with the target locale as the +// 1. Copy this file (eng-USA.h) to a new file with the target locale as the // file name. Using German as an example, do this: // -// cp en-US.h de-DE.h +// cp eng-USA.h de-DE.h // // 2. Modify all the strings below. // i.e. change "Unknown error." to "Unbekannter Fehler.". @@ -66,17 +66,17 @@ // 3. Add your new translation to the task.git/src/i18n.h file, if necessary, // by inserting: // -// #elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE +// #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU // #include // // 4. Add your new language to task.git/CMakeLists.txt, making sure that // number is unique: // -// set (LANGUAGE_DE_DE 4) +// set (LANGUAGE_DEU_DEU 3) // // 5. Add your new language to task.git/cmake.h.in: // -// #define LANGUAGE_DE_DE ${LANGUAGE_DE_DE} +// #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU} // // 6. Build your localized Taskwarrior with these commands: // diff --git a/src/i18n.h b/src/i18n.h index 0f9baa307..70c7f3119 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -42,16 +42,16 @@ // Translators: // Add more, as appropriate. -#if PACKAGE_LANGUAGE == LANGUAGE_EN_US -#include -#elif PACKAGE_LANGUAGE == LANGUAGE_ES_ES -#include -#elif PACKAGE_LANGUAGE == LANGUAGE_FR_FR -#include -#elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE -#include -#elif PACKAGE_LANGUAGE == LANGUAGE_IT_IT -#include +#if PACKAGE_LANGUAGE == LANGUAGE_ENG_USA +#include +#elif PACKAGE_LANGUAGE == LANGUAGE_ESP_ESP +#include +#elif PACKAGE_LANGUAGE == LANGUAGE_FRA_FRA +#include +#elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU +#include +#elif PACKAGE_LANGUAGE == LANGUAGE_ITA_ITA +#include #elif PACKAGE_LANGUAGE == LANGUAGE_POR_PRT #include #endif diff --git a/src/it-IT.h b/src/ita-ITA.h similarity index 99% rename from src/it-IT.h rename to src/ita-ITA.h index 4582ec888..6052732a3 100644 --- a/src/it-IT.h +++ b/src/ita-ITA.h @@ -55,10 +55,10 @@ //////////////////////////////////////////////////////////////////////////////// // // Translators: -// 1. Copy this file (en-US.h) to a new file with the target locale as the +// 1. Copy this file (eng-USA.h) to a new file with the target locale as the // file name. Using German as an example, do this: // -// cp en-US.h de-DE.h +// cp eng-USA.h de-DE.h // // 2. Modify all the strings below. // i.e. change "Unknown error." to "Unbekannter Fehler.". @@ -66,17 +66,17 @@ // 3. Add your new translation to the task.git/src/i18n.h file, if necessary, // by inserting: // -// #elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE +// #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU // #include // // 4. Add your new language to task.git/CMakeLists.txt, making sure that // number is unique: // -// set (LANGUAGE_DE_DE 3) +// set (LANGUAGE_DEU_DEU 3) // // 5. Add your new language to task.git/cmake.h.in: // -// #define LANGUAGE_DE_DE ${LANGUAGE_DE_DE} +// #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU} // // 6. Build your localized Taskwarrior with these commands: // diff --git a/src/por-PRT.h b/src/por-PRT.h index 8b3c4aeb9..357a0dede 100644 --- a/src/por-PRT.h +++ b/src/por-PRT.h @@ -55,10 +55,10 @@ //////////////////////////////////////////////////////////////////////////////// // // Translators: -// 1. Copy this file (en-US.h) to a new file with the target locale as the +// 1. Copy this file (eng-USA.h) to a new file with the target locale as the // file name. Using German as an example, do this: // -// cp en-US.h de-DE.h +// cp eng-USA.h de-DE.h // // 2. Modify all the strings below. // i.e. change "Unknown error." to "Unbekannter Fehler.". @@ -66,17 +66,17 @@ // 3. Add your new translation to the task.git/src/i18n.h file, if necessary, // by inserting: // -// #elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE +// #elif PACKAGE_LANGUAGE == LANGUAGE_DEU_DEU // #include // // 4. Add your new language to task.git/CMakeLists.txt, making sure that // number is unique: // -// set (LANGUAGE_DE_DE 4) +// set (LANGUAGE_DEU_DEU 3) // // 5. Add your new language to task.git/cmake.h.in: // -// #define LANGUAGE_DE_DE ${LANGUAGE_DE_DE} +// #define LANGUAGE_DEU_DEU ${LANGUAGE_DEU_DEU} // // 6. Build your localized Taskwarrior with these commands: // @@ -125,7 +125,7 @@ #define STRING_COLUMN_BAD_FORMAT "Formato de coluna '{1}.{2}' não reconhecido" #define STRING_COLUMN_LABEL_TASKS "Tarefas" #define STRING_COLUMN_LABEL_DEP "Depende" -#define STRING_COLUMN_LABEL_DEP_S "Dep" // |por-PRT|==|en-US| +#define STRING_COLUMN_LABEL_DEP_S "Dep" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_DESC "Descrição" #define STRING_COLUMN_LABEL_DUE "Vence" #define STRING_COLUMN_LABEL_END "Fim" @@ -135,8 +135,8 @@ #define STRING_COLUMN_LABEL_MOD "Modificada" #define STRING_COLUMN_LABEL_ADDED "Adicionada" #define STRING_COLUMN_LABEL_AGE "Idade" -#define STRING_COLUMN_LABEL_ID "ID" // |por-PRT|==|en-US| -#define STRING_COLUMN_LABEL_PRI "Pri" // |por-PRT|==|en-US| +#define STRING_COLUMN_LABEL_ID "ID" // |por-PRT|==|eng-USA| +#define STRING_COLUMN_LABEL_PRI "Pri" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_PRIORITY "Prioridade" #define STRING_COLUMN_LABEL_PROJECT "Projeto" #define STRING_COLUMN_LABEL_UNTIL "Até" @@ -146,7 +146,7 @@ #define STRING_COLUMN_LABEL_RECUR_L "Periodicidade" #define STRING_COLUMN_LABEL_START "Início" #define STRING_COLUMN_LABEL_STARTED "Iniciada" -#define STRING_COLUMN_LABEL_ACTIVE "A" // |por-PRT|==|en-US| +#define STRING_COLUMN_LABEL_ACTIVE "A" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_STATUS "Estado" #define STRING_COLUMN_LABEL_STAT "Es" #define STRING_COLUMN_LABEL_STAT_PE "Pendentes" @@ -155,14 +155,14 @@ #define STRING_COLUMN_LABEL_STAT_WA "Adiadas" // Seria preferivel "Periódicas" mas faz conflito na primeira letra com "Pendentes" #define STRING_COLUMN_LABEL_STAT_RE "Recorrentes" -#define STRING_COLUMN_LABEL_STAT_P "P" // |por-PRT|==|en-US| -#define STRING_COLUMN_LABEL_STAT_C "C" // |por-PRT|==|en-US| +#define STRING_COLUMN_LABEL_STAT_P "P" // |por-PRT|==|eng-USA| +#define STRING_COLUMN_LABEL_STAT_C "C" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_STAT_D "E" #define STRING_COLUMN_LABEL_STAT_W "A" -#define STRING_COLUMN_LABEL_STAT_R "R" // |por-PRT|==|en-US| +#define STRING_COLUMN_LABEL_STAT_R "R" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_TAGS "Marcas" #define STRING_COLUMN_LABEL_TAG "Marca" -#define STRING_COLUMN_LABEL_UUID "UUID" // |por-PRT|==|en-US| +#define STRING_COLUMN_LABEL_UUID "UUID" // |por-PRT|==|eng-USA| #define STRING_COLUMN_LABEL_URGENCY "Urgência" #define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_VALUE "Valor" @@ -201,7 +201,7 @@ #define STRING_CMD_VERSION_DOCS "A documentação do taskwarrior pode ser encontrada usando os comandos 'man task', 'man taskrc', 'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' ou em http://taskwarrior.org" #define STRING_CMD_VERSION_BUILT "{1} {2} construido para " #define STRING_CMD_VERSION_UNKNOWN "desconhecido" -#define STRING_CMD_VERSION_COPY "Copyright (C) 2006 - 2014 P. Beckingham, F. Hernandez." // |por-PRT|==|en-US| +#define STRING_CMD_VERSION_COPY "Copyright (C) 2006 - 2014 P. Beckingham, F. Hernandez." // |por-PRT|==|eng-USA| #define STRING_CMD_LOGO_USAGE "Exibe o logotipo do Taskwarrior" #define STRING_CMD_LOGO_COLOR_REQ "O comando logo requer que o suporte de cor seja ativado." #define STRING_CMD_EXEC_USAGE "Executa comandos e scripts externos" @@ -235,7 +235,7 @@ #define STRING_CMD_STATS_USAGE "Exibe estatísticas da base de dados de tarefas" #define STRING_CMD_STATS_CATEGORY "Categoria" #define STRING_CMD_STATS_DATA "Dados" -#define STRING_CMD_STATS_TOTAL "Total" // |por-PRT|==|en-US| +#define STRING_CMD_STATS_TOTAL "Total" // |por-PRT|==|eng-USA| #define STRING_CMD_STATS_ANNOTATIONS "Anotações" #define STRING_CMD_STATS_UNIQUE_TAGS "Marcas Únicas" #define STRING_CMD_STATS_PROJECTS "Projetos" @@ -294,7 +294,7 @@ #define STRING_CMD_PROJECTS_NO "Sem projetos." #define STRING_CMD_PROJECTS_PRI_N "Pri:Nenhuma" #define STRING_CMD_PROJECTS_PRI_H "Pri:A" -#define STRING_CMD_PROJECTS_PRI_M "Pri:M" // |por-PRT|==|en-US| +#define STRING_CMD_PROJECTS_PRI_M "Pri:M" // |por-PRT|==|eng-USA| #define STRING_CMD_PROJECTS_PRI_L "Pri:B" #define STRING_CMD_PROJECTS_NONE "(nenhum)" #define STRING_CMD_PROJECTS_SUMMARY "{1} projeto" @@ -424,7 +424,7 @@ #define STRING_CMD_SYNC_INIT "Por favor confirme que deseja enviar todas as tarefas pendentes para o Taskserver" #define STRING_CMD_SYNC_NO_INIT "O Taskwarrior não irá executar a sincronização completa de primeira vez." #define STRING_CMD_SYNC_RELOCATE0 "A sua conta no servidor foi relocalizada. Por favor ajuste a configuração usando:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" // |por-PRT|==|en-US| +#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" // |por-PRT|==|eng-USA| #define STRING_CMD_SYNC_BAD_CA "Certificado CA não encontrado." #define STRING_CMD_SYNC_CONNECT "Não foi possível connectar a {1} {2}" #define STRING_CMD_SYNC_HANDSHAKE "'Handshake' falhou. {1}" @@ -437,7 +437,7 @@ #define STRING_CMD_DIAG_CAPS "Capacidades" #define STRING_CMD_DIAG_FEATURES "Características da versão" #define STRING_CMD_DIAG_BUILT "Criado" -#define STRING_CMD_DIAG_COMMIT "Commit" // |por-PRT|==|en-US| +#define STRING_CMD_DIAG_COMMIT "Commit" // |por-PRT|==|eng-USA| #define STRING_CMD_DIAG_FOUND "(presente)" #define STRING_CMD_DIAG_MISSING "(em falta)" #define STRING_CMD_DIAG_ENABLED "Ativado" @@ -500,7 +500,7 @@ #define STRING_CMD_BURN_USAGE_M "Mostra um gráfico de burndown, por mês" #define STRING_CMD_BURN_USAGE_W "Mostra um gráfico de burndown, por semana" #define STRING_CMD_BURN_USAGE_D "Mostra um gráfico de burndown, por dia" -#define STRING_CMD_BURN_TITLE "Burndown" // |por-PRT|==|en-US| +#define STRING_CMD_BURN_TITLE "Burndown" // |por-PRT|==|eng-USA| #define STRING_CMD_BURN_TOO_SMALL "Janela do terminal demasiado pequena para desenhar o gráfico." #define STRING_CMD_BURN_DAILY "Diário" #define STRING_CMD_BURN_WEEKLY "Semanal" @@ -559,17 +559,17 @@ #define STRING_DATE_NOVEMBER_LONG "novembro" #define STRING_DATE_DECEMBER_LONG "dezembro" -#define STRING_DATE_JANUARY_SHORT "jan" // |por-PRT|==|en-US| +#define STRING_DATE_JANUARY_SHORT "jan" // |por-PRT|==|eng-USA| #define STRING_DATE_FEBRUARY_SHORT "fev" -#define STRING_DATE_MARCH_SHORT "mar" // |por-PRT|==|en-US| +#define STRING_DATE_MARCH_SHORT "mar" // |por-PRT|==|eng-USA| #define STRING_DATE_APRIL_SHORT "abr" #define STRING_DATE_MAY_SHORT "mai" -#define STRING_DATE_JUNE_SHORT "jun" // |por-PRT|==|en-US| -#define STRING_DATE_JULY_SHORT "jul" // |por-PRT|==|en-US| +#define STRING_DATE_JUNE_SHORT "jun" // |por-PRT|==|eng-USA| +#define STRING_DATE_JULY_SHORT "jul" // |por-PRT|==|eng-USA| #define STRING_DATE_AUGUST_SHORT "ago" #define STRING_DATE_SEPTEMBER_SHORT "set" #define STRING_DATE_OCTOBER_SHORT "out" -#define STRING_DATE_NOVEMBER_SHORT "nov" // |por-PRT|==|en-US| +#define STRING_DATE_NOVEMBER_SHORT "nov" // |por-PRT|==|eng-USA| #define STRING_DATE_DECEMBER_SHORT "dez" #define STRING_DATE_SUNDAY_LONG "domingo" @@ -674,7 +674,7 @@ // Maintain the same spacing. #define STRING_EDIT_TABLE_HEADER_1 "Nome Detalhes editáveis" -#define STRING_EDIT_TABLE_HEADER_2 "----------------- ----------------------------------------------------" // |por-PRT|==|en-US| +#define STRING_EDIT_TABLE_HEADER_2 "----------------- ----------------------------------------------------" // |por-PRT|==|eng-USA| // Errors // TODO Move each of these to appropriate section. @@ -931,10 +931,10 @@ #define STRING_UTIL_CONFIRM_ALL "todas" #define STRING_UTIL_CONFIRM_ALL_U "Todas" #define STRING_UTIL_CONFIRM_QUIT "Sair" -#define STRING_UTIL_GIBIBYTES "GiB" // |por-PRT|==|en-US| -#define STRING_UTIL_MEBIBYTES "MiB" // |por-PRT|==|en-US| -#define STRING_UTIL_KIBIBYTES "KiB" // |por-PRT|==|en-US| -#define STRING_UTIL_BYTES "B" // |por-PRT|==|en-US| +#define STRING_UTIL_GIBIBYTES "GiB" // |por-PRT|==|eng-USA| +#define STRING_UTIL_MEBIBYTES "MiB" // |por-PRT|==|eng-USA| +#define STRING_UTIL_KIBIBYTES "KiB" // |por-PRT|==|eng-USA| +#define STRING_UTIL_BYTES "B" // |por-PRT|==|eng-USA| // shell #define STRING_SHELL_USAGE \