From f67706c28ea882236d97ad9f126a5c2235d3584f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 27 May 2011 23:59:09 -0400 Subject: [PATCH] L10N - Added '#define L10N' marker to all source files that are localized. --- cmake.h.in | 1 + commit.h.in | 1 + src/API.h | 1 + src/Arguments.h | 1 + src/Att.h | 1 + src/Cmd.h | 1 + src/Color.h | 1 + src/Config.h | 1 + src/Context.h | 1 + src/DOM.h | 1 + src/Date.h | 1 + src/Directory.h | 3 ++- src/Duration.h | 1 + src/File.h | 1 + src/Filter.h | 1 + src/Hooks.h | 1 + src/JSON.h | 1 + src/Location.h | 1 + src/Nibbler.h | 1 + src/Path.h | 1 + src/Permission.h | 1 + src/Record.h | 1 + src/Sequence.h | 1 + src/Subst.h | 1 + src/TDB.h | 1 + src/TDB2.h | 1 + src/Task.h | 1 + src/Taskmod.h | 1 + src/Timer.h | 1 + src/Transport.h | 1 + src/TransportCurl.h | 1 + src/TransportRSYNC.h | 1 + src/TransportSSH.h | 1 + src/Uri.h | 1 + src/Variant.h | 1 + src/ViewTask.h | 1 + src/ViewText.h | 1 + src/columns/ColDate.h | 1 + src/columns/ColDepends.h | 1 + src/columns/ColDescription.h | 1 + src/columns/ColDue.h | 1 + src/columns/ColEnd.h | 1 + src/columns/ColEntry.h | 1 + src/columns/ColID.h | 1 + src/columns/ColPriority.h | 1 + src/columns/ColProject.h | 1 + src/columns/ColRecur.h | 1 + src/columns/ColStart.h | 1 + src/columns/ColStatus.h | 1 + src/columns/ColString.h | 1 + src/columns/ColTags.h | 1 + src/columns/ColUUID.h | 1 + src/columns/ColUntil.h | 1 + src/columns/ColUrgency.h | 1 + src/columns/ColWait.h | 1 + src/columns/Column.h | 1 + src/commands/CmdCustom.h | 1 + src/commands/CmdExec.h | 1 + src/commands/CmdHelp.h | 1 + src/commands/CmdInstall.h | 1 + src/commands/CmdLogo.h | 1 + src/commands/CmdShow.cpp | 6 +++-- src/commands/CmdShow.h | 1 + src/commands/CmdTags.h | 1 + src/commands/CmdTip.h | 1 + src/commands/CmdVersion.h | 1 + src/commands/Command.h | 1 + src/en-US.h | 47 ++++++++++++++++++++++++++++++++---- src/i18n.h | 1 + src/main.h | 1 + src/rules.cpp | 2 ++ src/rx.cpp | 2 ++ src/rx.h | 1 + src/text.h | 1 + src/utf8.h | 1 + src/util.h | 2 ++ 76 files changed, 124 insertions(+), 8 deletions(-) diff --git a/cmake.h.in b/cmake.h.in index 5d340a5c1..82468bedd 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -1,4 +1,5 @@ /* cmake.h.in. Creates auto.h during a cmake run */ +#define L10N // Localization complete. /* Package information */ #define PACKAGE "${PACKAGE}" diff --git a/commit.h.in b/commit.h.in index 3a6fe82de..6ac5dc804 100644 --- a/commit.h.in +++ b/commit.h.in @@ -1,4 +1,5 @@ /* commit.h.in. Creates commit.h during a cmake run */ +#define L10N // Localization complete. /* git information */ #define COMMIT "${COMMIT}" diff --git a/src/API.h b/src/API.h index 6d870490d..ef43209f4 100644 --- a/src/API.h +++ b/src/API.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_API #define INCLUDED_API +#define L10N // Localization complete. #include "../cmake.h" #ifdef HAVE_LIBLUA diff --git a/src/Arguments.h b/src/Arguments.h index 8f643759a..ad44d7c8e 100644 --- a/src/Arguments.h +++ b/src/Arguments.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_ARGUMENTS #define INCLUDED_ARGUMENTS +#define L10N // Localization complete. #include #include diff --git a/src/Att.h b/src/Att.h index 74bed7f81..e005e684b 100644 --- a/src/Att.h +++ b/src/Att.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_ATT #define INCLUDED_ATT +#define L10N // Localization complete. #include #include diff --git a/src/Cmd.h b/src/Cmd.h index e2701f806..d4ea9e3c5 100644 --- a/src/Cmd.h +++ b/src/Cmd.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMD #define INCLUDED_CMD +#define L10N // Localization complete. #include #include diff --git a/src/Color.h b/src/Color.h index d046e5884..2422f58cf 100644 --- a/src/Color.h +++ b/src/Color.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLOR #define INCLUDED_COLOR +#define L10N // Localization complete. #include diff --git a/src/Config.h b/src/Config.h index d42928eae..33b9d39cd 100644 --- a/src/Config.h +++ b/src/Config.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CONFIG #define INCLUDED_CONFIG +#define L10N // Localization complete. #include #include diff --git a/src/Context.h b/src/Context.h index a0b9179b8..0db731da3 100644 --- a/src/Context.h +++ b/src/Context.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CONTEXT #define INCLUDED_CONTEXT +#define L10N // Localization complete. #include #include diff --git a/src/DOM.h b/src/DOM.h index 394142946..a7c1d98ad 100644 --- a/src/DOM.h +++ b/src/DOM.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_DOM #define INCLUDED_DOM +#define L10N // Localization complete. #include #include diff --git a/src/Date.h b/src/Date.h index 6bca65f48..48d902b0a 100644 --- a/src/Date.h +++ b/src/Date.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_DATE #define INCLUDED_DATE +#define L10N // Localization complete. #include #include diff --git a/src/Directory.h b/src/Directory.h index 3e512f235..7ff70e812 100644 --- a/src/Directory.h +++ b/src/Directory.h @@ -26,8 +26,9 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_DIRECTORY #define INCLUDED_DIRECTORY +#define L10N // Localization complete. -#include "File.h" +#include class Directory : public File { diff --git a/src/Duration.h b/src/Duration.h index f84be45f7..0897fecf9 100644 --- a/src/Duration.h +++ b/src/Duration.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_DURATION #define INCLUDED_DURATION +#define L10N // Localization complete. #include #include diff --git a/src/File.h b/src/File.h index a7083b0f4..6bcaef9ee 100644 --- a/src/File.h +++ b/src/File.h @@ -27,6 +27,7 @@ #ifndef INCLUDED_FILE #define INCLUDED_FILE +#define L10N // Localization complete. #include #include diff --git a/src/Filter.h b/src/Filter.h index 82e602500..09ce95d9c 100644 --- a/src/Filter.h +++ b/src/Filter.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_FILTER #define INCLUDED_FILTER +#define L10N // Localization complete. #include #include "Att.h" diff --git a/src/Hooks.h b/src/Hooks.h index e1e5c7725..1c1a5c917 100644 --- a/src/Hooks.h +++ b/src/Hooks.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_HOOKS #define INCLUDED_HOOKS +#define L10N // Localization complete. #include #include diff --git a/src/JSON.h b/src/JSON.h index e23366efb..749a6d594 100644 --- a/src/JSON.h +++ b/src/JSON.h @@ -27,6 +27,7 @@ #ifndef INCLUDED_JSON #define INCLUDED_JSON +#define L10N // Localization complete. #include #include diff --git a/src/Location.h b/src/Location.h index a55fa4a5a..225696c12 100644 --- a/src/Location.h +++ b/src/Location.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_LOCATION #define INCLUDED_LOCATION +#define L10N // Localization complete. #include #include diff --git a/src/Nibbler.h b/src/Nibbler.h index e7d379238..2a1439383 100644 --- a/src/Nibbler.h +++ b/src/Nibbler.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_NIBBLER #define INCLUDED_NIBBLER +#define L10N // Localization complete. #include diff --git a/src/Path.h b/src/Path.h index 41ee1a292..8f9859467 100644 --- a/src/Path.h +++ b/src/Path.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_PATH #define INCLUDED_PATH +#define L10N // Localization complete. #include #include diff --git a/src/Permission.h b/src/Permission.h index 426879368..9083e5c70 100644 --- a/src/Permission.h +++ b/src/Permission.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_PERMISSION #define INCLUDED_PERMISSION +#define L10N // Localization complete. #include #include "Task.h" diff --git a/src/Record.h b/src/Record.h index cf7568f6f..38961273e 100644 --- a/src/Record.h +++ b/src/Record.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_RECORD #define INCLUDED_RECORD +#define L10N // Localization complete. #include #include diff --git a/src/Sequence.h b/src/Sequence.h index 6cc3d3c89..57ccb0f9c 100644 --- a/src/Sequence.h +++ b/src/Sequence.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_SEQUENCE #define INCLUDED_SEQUENCE +#define L10N // Localization complete. #include #include diff --git a/src/Subst.h b/src/Subst.h index 7d2790009..32c4fc0b3 100644 --- a/src/Subst.h +++ b/src/Subst.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_SUBST #define INCLUDED_SUBST +#define L10N // Localization complete. #include #include "Att.h" diff --git a/src/TDB.h b/src/TDB.h index 19ae5b7f9..c9a87baa9 100644 --- a/src/TDB.h +++ b/src/TDB.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TDB #define INCLUDED_TDB +#define L10N // Localization complete. #include #include diff --git a/src/TDB2.h b/src/TDB2.h index 22b596367..e942a784d 100644 --- a/src/TDB2.h +++ b/src/TDB2.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TDB2 #define INCLUDED_TDB2 +#define L10N // Localization complete. #include #include diff --git a/src/Task.h b/src/Task.h index 57ade3974..a195fae61 100644 --- a/src/Task.h +++ b/src/Task.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TASK #define INCLUDED_TASK +#define L10N // Localization complete. #include #include "Record.h" diff --git a/src/Taskmod.h b/src/Taskmod.h index 5c459465f..480a6545d 100644 --- a/src/Taskmod.h +++ b/src/Taskmod.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TASKMOD #define INCLUDED_TASKMOD +#define L10N // Localization complete. #include #include diff --git a/src/Timer.h b/src/Timer.h index 98c90df55..8f0badbfa 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TIMER #define INCLUDED_TIMER +#define L10N // Localization complete. #include #include diff --git a/src/Transport.h b/src/Transport.h index 6b51dfe36..e128df01d 100644 --- a/src/Transport.h +++ b/src/Transport.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TRANSPORT #define INCLUDED_TRANSPORT +#define L10N // Localization complete. #include #include diff --git a/src/TransportCurl.h b/src/TransportCurl.h index 6ead988de..1cae40fe7 100644 --- a/src/TransportCurl.h +++ b/src/TransportCurl.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TRANSPORTCURL #define INCLUDED_TRANSPORTCURL +#define L10N // Localization complete. #include #include diff --git a/src/TransportRSYNC.h b/src/TransportRSYNC.h index 3c0b26aa4..34995e671 100644 --- a/src/TransportRSYNC.h +++ b/src/TransportRSYNC.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TRANSPORTRSYNC #define INCLUDED_TRANSPORTRSYNC +#define L10N // Localization complete. #include #include diff --git a/src/TransportSSH.h b/src/TransportSSH.h index 1907de309..e0ad63da7 100644 --- a/src/TransportSSH.h +++ b/src/TransportSSH.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TRANSPORTSSH #define INCLUDED_TRANSPORTSSH +#define L10N // Localization complete. #include #include diff --git a/src/Uri.h b/src/Uri.h index fb874bce2..85febe45d 100644 --- a/src/Uri.h +++ b/src/Uri.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_URI #define INCLUDED_URI +#define L10N // Localization complete. #include #include diff --git a/src/Variant.h b/src/Variant.h index 2167a9f1e..88b51c7c1 100644 --- a/src/Variant.h +++ b/src/Variant.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_VARIANT #define INCLUDED_VARIANT +#define L10N // Localization complete. #include #include diff --git a/src/ViewTask.h b/src/ViewTask.h index 7a75f5d16..e6debf2da 100644 --- a/src/ViewTask.h +++ b/src/ViewTask.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_VIEWTASK #define INCLUDED_VIEWTASK +#define L10N // Localization complete. #include #include diff --git a/src/ViewText.h b/src/ViewText.h index a3d9675d7..af032ca03 100644 --- a/src/ViewText.h +++ b/src/ViewText.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_VIEWTEXT #define INCLUDED_VIEWTEXT +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColDate.h b/src/columns/ColDate.h index 3a21dafcc..7a943d3ca 100644 --- a/src/columns/ColDate.h +++ b/src/columns/ColDate.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLDATE #define INCLUDED_COLDATE +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColDepends.h b/src/columns/ColDepends.h index 450ae8511..d70a3389a 100644 --- a/src/columns/ColDepends.h +++ b/src/columns/ColDepends.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLDEPENDS #define INCLUDED_COLDEPENDS +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColDescription.h b/src/columns/ColDescription.h index d51aa8b3e..c6c5f5795 100644 --- a/src/columns/ColDescription.h +++ b/src/columns/ColDescription.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLDESCRIPTION #define INCLUDED_COLDESCRIPTION +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColDue.h b/src/columns/ColDue.h index cf1bad015..508d2db45 100644 --- a/src/columns/ColDue.h +++ b/src/columns/ColDue.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLDUE #define INCLUDED_COLDUE +#define L10N // Localization complete. #include diff --git a/src/columns/ColEnd.h b/src/columns/ColEnd.h index 47c18797b..c360b2a51 100644 --- a/src/columns/ColEnd.h +++ b/src/columns/ColEnd.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLEND #define INCLUDED_COLEND +#define L10N // Localization complete. #include diff --git a/src/columns/ColEntry.h b/src/columns/ColEntry.h index ad1972f8a..1f3382822 100644 --- a/src/columns/ColEntry.h +++ b/src/columns/ColEntry.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLENTRY #define INCLUDED_COLENTRY +#define L10N // Localization complete. #include diff --git a/src/columns/ColID.h b/src/columns/ColID.h index 159cb8c28..ab42eb920 100644 --- a/src/columns/ColID.h +++ b/src/columns/ColID.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLID #define INCLUDED_COLID +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColPriority.h b/src/columns/ColPriority.h index c827eb7a5..f5ecfd1bd 100644 --- a/src/columns/ColPriority.h +++ b/src/columns/ColPriority.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLPRIORITY #define INCLUDED_COLPRIORITY +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColProject.h b/src/columns/ColProject.h index c6b34c226..fb08fbb81 100644 --- a/src/columns/ColProject.h +++ b/src/columns/ColProject.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLPROJECT #define INCLUDED_COLPROJECT +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h index 6ef3187c7..7f3c7fd70 100644 --- a/src/columns/ColRecur.h +++ b/src/columns/ColRecur.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLRECUR #define INCLUDED_COLRECUR +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColStart.h b/src/columns/ColStart.h index 6f133fb7d..9e59a111a 100644 --- a/src/columns/ColStart.h +++ b/src/columns/ColStart.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLSTART #define INCLUDED_COLSTART +#define L10N // Localization complete. #include diff --git a/src/columns/ColStatus.h b/src/columns/ColStatus.h index 965afb5e8..cc2368870 100644 --- a/src/columns/ColStatus.h +++ b/src/columns/ColStatus.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLSTATUS #define INCLUDED_COLSTATUS +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColString.h b/src/columns/ColString.h index 14ce9d710..4fb17bbe1 100644 --- a/src/columns/ColString.h +++ b/src/columns/ColString.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLSTRING #define INCLUDED_COLSTRING +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColTags.h b/src/columns/ColTags.h index 206852cae..9b83ab976 100644 --- a/src/columns/ColTags.h +++ b/src/columns/ColTags.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLTAGS #define INCLUDED_COLTAGS +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColUUID.h b/src/columns/ColUUID.h index c272a6955..2d6934f25 100644 --- a/src/columns/ColUUID.h +++ b/src/columns/ColUUID.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLUUID #define INCLUDED_COLUUID +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColUntil.h b/src/columns/ColUntil.h index cd355a56c..fcb06c062 100644 --- a/src/columns/ColUntil.h +++ b/src/columns/ColUntil.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLUNTIL #define INCLUDED_COLUNTIL +#define L10N // Localization complete. #include diff --git a/src/columns/ColUrgency.h b/src/columns/ColUrgency.h index 33b784c3c..dc0702ac3 100644 --- a/src/columns/ColUrgency.h +++ b/src/columns/ColUrgency.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLURGENCY #define INCLUDED_COLURGENCY +#define L10N // Localization complete. #include #include diff --git a/src/columns/ColWait.h b/src/columns/ColWait.h index 8d88ec20e..93510b6fe 100644 --- a/src/columns/ColWait.h +++ b/src/columns/ColWait.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLWAIT #define INCLUDED_COLWAIT +#define L10N // Localization complete. #include diff --git a/src/columns/Column.h b/src/columns/Column.h index 8eea53808..692a6f48c 100644 --- a/src/columns/Column.h +++ b/src/columns/Column.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COLUMN #define INCLUDED_COLUMN +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdCustom.h b/src/commands/CmdCustom.h index 887bf5dfb..84dd9978e 100644 --- a/src/commands/CmdCustom.h +++ b/src/commands/CmdCustom.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDCUSTOM #define INCLUDED_CMDCUSTOM +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdExec.h b/src/commands/CmdExec.h index 441aedf80..f9161abcb 100644 --- a/src/commands/CmdExec.h +++ b/src/commands/CmdExec.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDEXEC #define INCLUDED_CMDEXEC +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdHelp.h b/src/commands/CmdHelp.h index 7f2b3b514..67d503b15 100644 --- a/src/commands/CmdHelp.h +++ b/src/commands/CmdHelp.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDHELP #define INCLUDED_CMDHELP +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdInstall.h b/src/commands/CmdInstall.h index 7454e4326..c7718735c 100644 --- a/src/commands/CmdInstall.h +++ b/src/commands/CmdInstall.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDINSTALL #define INCLUDED_CMDINSTALL +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdLogo.h b/src/commands/CmdLogo.h index c5c5c4b02..33bfbbaa4 100644 --- a/src/commands/CmdLogo.h +++ b/src/commands/CmdLogo.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDLOGO #define INCLUDED_CMDLOGO +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp index d249c6314..1a72b24eb 100644 --- a/src/commands/CmdShow.cpp +++ b/src/commands/CmdShow.cpp @@ -34,6 +34,8 @@ #include #include +#define L10N // Localization complete. + extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -147,8 +149,8 @@ int CmdShow::execute (const std::string& command_line, std::string& output) // Create output view. ViewText view; view.width (width); - view.add (Column::factory ("string", "Config variable")); - view.add (Column::factory ("string", "Value")); + view.add (Column::factory ("string", STRING_CMD_SHOW_CONF_VAR)); + view.add (Column::factory ("string", STRING_CMD_SHOW_CONF_VALUE)); Color error ("bold white on red"); Color warning ("black on yellow"); diff --git a/src/commands/CmdShow.h b/src/commands/CmdShow.h index fcaa65eea..cfe037330 100644 --- a/src/commands/CmdShow.h +++ b/src/commands/CmdShow.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDSHOW #define INCLUDED_CMDSHOW +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdTags.h b/src/commands/CmdTags.h index fdb169d75..e7b7fe276 100644 --- a/src/commands/CmdTags.h +++ b/src/commands/CmdTags.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDTAGS #define INCLUDED_CMDTAGS +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdTip.h b/src/commands/CmdTip.h index 82bab29f6..df34e19ca 100644 --- a/src/commands/CmdTip.h +++ b/src/commands/CmdTip.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDTIP #define INCLUDED_CMDTIP +#define L10N // Localization complete. #include #include diff --git a/src/commands/CmdVersion.h b/src/commands/CmdVersion.h index 9f2079741..99523b17a 100644 --- a/src/commands/CmdVersion.h +++ b/src/commands/CmdVersion.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_CMDVERSION #define INCLUDED_CMDVERSION +#define L10N // Localization complete. #include #include diff --git a/src/commands/Command.h b/src/commands/Command.h index 9065b62f5..13f0b92d9 100644 --- a/src/commands/Command.h +++ b/src/commands/Command.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_COMMAND #define INCLUDED_COMMAND +#define L10N // Localization complete. #include #include diff --git a/src/en-US.h b/src/en-US.h index 21088f9f3..304fba3f0 100644 --- a/src/en-US.h +++ b/src/en-US.h @@ -41,15 +41,50 @@ // // Rules: // - Localized strings should contain leading or trailing white space, -// including \n -// - +// including \n, thus allowing the code to compose strings. +// - Retain the tense of the original string. +// - Retain the same verbosiy of the original string. // //////////////////////////////////////////////////////////////////////////////// -#ifndef INCLUDED_EN_US -#define INCLUDED_EN_US +//////////////////////////////////////////////////////////////////////////////// +// +// Translators: +// 1. Copy this file (en-US.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 +// +// 2. Modify all the strings below. +// i.e. change "Unknown error." to "Unbekannter Fehler.". +// +// 3. Add your new translation to the task.git/src/i18n.h file by changing: +// +// #if PACKAGE_LANGUAGE == LANGUAGE_EN_US +// #include +// #endif +// +// to: +// +// #if PACKAGE_LANGUAGE == LANGUAGE_EN_US +// #include +// #elif PACKAGE_LANGUAGE == LANGUAGE_DE_DE +// #include +// #endif +// +// 4. Build your localized Taskwarrior with these commands: +// +// cd task.git +// cmake -D PACKAGE_LANGUAGE=LANGUAGE_DE_DE . +// make +// +// 5. Submit your translation to support@taskwarrior.org, for inclusion in +// next release. +// +//////////////////////////////////////////////////////////////////////////////// -// To localize, clone and rename this file, then change all the defines below. +#ifndef INCLUDED_STRINGS +#define INCLUDED_STRINGS // Errors #define STRING_UNKNOWN_ERROR "Unknown error." @@ -70,6 +105,8 @@ #define STRING_CMD_SHOW_CONFIG_ERROR "Configuration error: {1} contains an unrecognized value '{2}'." #define STRING_CMD_SHOW_NO_LOCATION "Configuration error: data.location not specified in .taskrc file." #define STRING_CMD_SHOW_LOC_EXIST "Configuration error: data.location contains a directory name that doesn't exist, or is unreadable." +#define STRING_CMD_SHOW_CONF_VAR "Config Variable" +#define STRING_CMD_SHOW_CONF_VALUE "Value" // DOM #define STRING_DOM_UNKNOWN "" diff --git a/src/i18n.h b/src/i18n.h index 19d708fbf..da18dfdf6 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -38,6 +38,7 @@ #ifndef INCLUDED_I18N #define INCLUDED_I18N +#define L10N // Localization complete. #include "../cmake.h" diff --git a/src/main.h b/src/main.h index f4b15a953..1ec87a858 100644 --- a/src/main.h +++ b/src/main.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_MAIN #define INCLUDED_MAIN +#define L10N // Localization complete. #define FEATURE_NEW_ID 1 // Echoes back new id. //#define FEATURE_REGEX 1 // Enables regexes for attribute modifiers, diff --git a/src/rules.cpp b/src/rules.cpp index 96ad06ca6..baafc24dd 100644 --- a/src/rules.cpp +++ b/src/rules.cpp @@ -32,6 +32,8 @@ #include "util.h" #include "main.h" +#define L10N // Localization complete. + extern Context context; static std::map gsColor; diff --git a/src/rx.cpp b/src/rx.cpp index a39d8b8c2..c2efab4c4 100644 --- a/src/rx.cpp +++ b/src/rx.cpp @@ -29,6 +29,8 @@ #include #include "rx.h" +#define L10N // Localization complete. + //#define _POSIX_C_SOURCE 1 #define MAX_MATCHES 8 diff --git a/src/rx.h b/src/rx.h index c518f4aea..7b0095d49 100644 --- a/src/rx.h +++ b/src/rx.h @@ -27,6 +27,7 @@ #ifndef INCLUDED_RX #define INCLuDED_RX +#define L10N // Localization complete. #include #include diff --git a/src/text.h b/src/text.h index 144226bc4..e34e00370 100644 --- a/src/text.h +++ b/src/text.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_TEXT #define INCLUDED_TEXT +#define L10N // Localization complete. #include #include diff --git a/src/utf8.h b/src/utf8.h index c76b08210..de606c654 100644 --- a/src/utf8.h +++ b/src/utf8.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_UTF8 #define INCLUDED_UTF8 +#define L10N // Localization complete. #include diff --git a/src/util.h b/src/util.h index 0f61f4885..efddad296 100644 --- a/src/util.h +++ b/src/util.h @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// #ifndef INCLUDED_UTIL #define INCLUDED_UTIL +#define L10N // Localization complete. #include #include @@ -42,6 +43,7 @@ #define max(a,b) ((a) > (b) ? (a) : (b)) #endif +// TODO Obsolete. #define foreach(i, c) \ for (typeof (c) *foreach_p = & (c); \ foreach_p; \