l10n: Eliminated STRING_TDB2_*

This commit is contained in:
Paul Beckingham 2018-01-20 12:18:29 -05:00
parent 29f3df9810
commit 67e20058b2
10 changed files with 20 additions and 210 deletions

View file

@ -36,13 +36,14 @@
#include <Context.h>
#include <Color.h>
#include <Datetime.h>
#include <i18n.h>
#include <Table.h>
#include <shared.h>
#include <format.h>
#include <main.h>
#include <util.h>
#define STRING_TDB2_REVERTED "Modified task reverted."
extern Context context;
bool TDB2::debug_mode = false;
@ -62,8 +63,7 @@ TF2::TF2 ()
TF2::~TF2 ()
{
if (_dirty && TDB2::debug_mode)
std::cout << format (STRING_TDB2_DIRTY_EXIT, std::string (_file))
<< '\n';
std::cout << format ("Exiting with unwritten changes to {1}\n", std::string (_file));
}
////////////////////////////////////////////////////////////////////////////////
@ -369,7 +369,7 @@ void TF2::load_gc (Task& task)
context.tdb2.pending._dirty = true;
if (context.verbose ("unwait"))
context.footnote (format (STRING_TDB2_UNWAIT, task.get ("description")));
context.footnote (format ("Un-waiting task '{1}'", task.get ("description")));
}
context.tdb2.pending._tasks.push_back (task);
@ -424,7 +424,7 @@ void TF2::load_tasks (bool from_gc /* = false */)
catch (const std::string& e)
{
throw e + format (STRING_TDB2_PARSE_ERROR, _file._data, line_number);
throw e + format (" in {1} at line {2}", _file._data, line_number);
}
context.time_load_us += timer.total_us ();
@ -640,7 +640,7 @@ void TDB2::add (Task& task, bool add_to_backlog /* = true */)
// If the tasks are loaded, then verify that this uuid is not already in
// the file.
if (!verifyUniqueUUID (uuid))
throw format (STRING_TDB2_UUID_NOT_UNIQUE, uuid);
throw format ("Cannot add task because the uuid '{1}' is not unique.", uuid);
// Only locally-added tasks trigger hooks. This means that tasks introduced
// via 'sync' do not trigger hooks.
@ -804,7 +804,7 @@ void TDB2::revert ()
// Display diff and confirm.
show_diff (current, prior, when);
if (! context.config.getBoolean ("confirmation") ||
confirm (STRING_TDB2_UNDO_CONFIRM))
confirm ("The undo command is not reversible. Are you sure you want to revert to the previous state?"))
{
// There are six kinds of change possible. Determine which one, and act
// accordingly.
@ -859,7 +859,7 @@ void TDB2::revert ()
File::write (backlog._file._data, b);
}
else
std::cout << STRING_CMD_CONFIG_NO_CHANGE << '\n';
std::cout << "No changes made.\n";
}
////////////////////////////////////////////////////////////////////////////////
@ -871,7 +871,7 @@ void TDB2::revert_undo (
std::string& prior)
{
if (u.size () < 3)
throw std::string (STRING_TDB2_NO_UNDO);
throw std::string ("There are no recorded transactions to undo.");
// pop last tx
u.pop_back (); // separator.
@ -898,7 +898,7 @@ void TDB2::revert_undo (
if (uuidAtt != std::string::npos)
uuid = current.substr (uuidAtt + 6, 36); // "uuid:"<uuid>" --> <uuid>
else
throw std::string (STRING_TDB2_MISSING_UUID);
throw std::string ("Cannot locate UUID in task to undo.");
}
////////////////////////////////////////////////////////////////////////////////
@ -925,7 +925,7 @@ void TDB2::revert_pending (
else
{
p.erase (task);
std::cout << STRING_TDB2_REMOVED << '\n';
std::cout << "Task removed.\n";
}
break;
@ -976,7 +976,7 @@ void TDB2::revert_completed (
context.debug ("TDB::revert_completed - task removed");
}
std::cout << STRING_TDB2_UNDO_COMPLETE << '\n';
std::cout << "Undo complete.\n";
break;
}
}
@ -1019,7 +1019,7 @@ void TDB2::revert_backlog (
}
if (!found)
throw std::string (STRING_TDB2_UNDO_SYNCED);
throw std::string ("Cannot undo change because the task was already synced. Modify the task instead.");
}
////////////////////////////////////////////////////////////////////////////////
@ -1037,7 +1037,7 @@ void TDB2::show_diff (
if (context.config.get ("undo.style") == "side")
{
std::cout << '\n'
<< format (STRING_TDB2_LAST_MOD, lastChange.toString ())
<< format ("The last modification was made {1}", lastChange.toString ())
<< '\n';
// Attributes are all there is, so figure the different attribute names
@ -1046,8 +1046,8 @@ void TDB2::show_diff (
view.width (context.getWidth ());
view.intraPadding (2);
view.add ("");
view.add (STRING_TDB2_UNDO_PRIOR);
view.add (STRING_TDB2_UNDO_CURRENT);
view.add ("Prior Values");
view.add ("Current Values");
setHeaderUnderline (view);
Task after (current);
@ -1145,12 +1145,12 @@ void TDB2::show_diff (
view.add ("");
int row = view.addRow ();
view.set (row, 0, STRING_TDB2_DIFF_PREV, color_red);
view.set (row, 1, STRING_TDB2_DIFF_PREV_DESC, color_red);
view.set (row, 0, "--- previous state", color_red);
view.set (row, 1, "Undo will restore this state", color_red);
row = view.addRow ();
view.set (row, 0, STRING_TDB2_DIFF_CURR, color_green); // Note trailing space.
view.set (row, 1, format (STRING_TDB2_DIFF_CURR_DESC,
view.set (row, 0, "+++ current state ", color_green);
view.set (row, 1, format ("Change made {1}",
lastChange.toString (context.config.get ("dateformat"))),
color_green);

View file

@ -694,25 +694,4 @@
#define STRING_TASK_SAFETY_ALLOW "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt."
#define STRING_TASK_INVALID_COL_TYPE "Nicht erkannter Typ '{1}' für Spalte '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " in {1} in Zeile {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Kann Aufgabe nicht hinzufügen, weil UUID '{1}' nicht eindeutig ist."
#define STRING_TDB2_MISSING "Fehlendes {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "Keine rückgängig zu machenden Transaktionen."
#define STRING_TDB2_LAST_MOD "Die letzte Änderung wurde {1} durchgeführt"
#define STRING_TDB2_UNDO_PRIOR "Vorherige Werte"
#define STRING_TDB2_UNDO_CURRENT "Aktuelle Werte"
#define STRING_TDB2_DIFF_PREV "--- Vorheriger Zustand" // Same length
#define STRING_TDB2_DIFF_PREV_DESC "undo wird folgenden Zustand wiederherstellen" // ||
#define STRING_TDB2_DIFF_CURR "+++ Aktueller Zustand " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Change made {1}"
#define STRING_TDB2_UNDO_CONFIRM "Der undo-Befehl ist nicht rückgängig zu machen. Wollen Sie wirklich zum vorherigen Zustand zurückkehren?"
#define STRING_TDB2_MISSING_UUID "Kann UUID der rückgängig zu machenden Aufgabe nicht finden."
#define STRING_TDB2_REVERTED "Veränderte Aufgabe wiederhergestellt."
#define STRING_TDB2_REMOVED "Aufgabe entfernt."
#define STRING_TDB2_UNDO_COMPLETE "Rückgängig machen abgeschlossen."
#define STRING_TDB2_UNDO_SYNCED "Kann Änderung nicht rückgängig machen, weil die Aufgabe bereits abgeglichen wurde. Aufgabe stattdessen löschen."
#define STRING_TDB2_DIRTY_EXIT "Beende mit ungeschriebenen Änderungen auf {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -691,25 +691,4 @@
#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " in {1} at line {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Cannot add task because the uuid '{1}' is not unique."
#define STRING_TDB2_MISSING "Missing {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "There are no recorded transactions to undo."
#define STRING_TDB2_LAST_MOD "The last modification was made {1}"
#define STRING_TDB2_UNDO_PRIOR "Prior Values"
#define STRING_TDB2_UNDO_CURRENT "Current Values"
#define STRING_TDB2_DIFF_PREV "--- previous state" // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Undo will restore this state" // ||
#define STRING_TDB2_DIFF_CURR "+++ current state " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Change made {1}"
#define STRING_TDB2_UNDO_CONFIRM "The undo command is not reversible. Are you sure you want to revert to the previous state?"
#define STRING_TDB2_MISSING_UUID "Cannot locate UUID in task to undo."
#define STRING_TDB2_REVERTED "Modified task reverted."
#define STRING_TDB2_REMOVED "Task removed."
#define STRING_TDB2_UNDO_COMPLETE "Undo complete."
#define STRING_TDB2_UNDO_SYNCED "Cannot undo change because the task was already synced. Modify the task instead."
#define STRING_TDB2_DIRTY_EXIT "Exiting with unwritten changes to {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -694,25 +694,4 @@
#define STRING_TASK_SAFETY_ALLOW "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion."
#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " en {1} ĉe vico {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Ne povis krei la taskon ĉar UUID-identigilo '{}' ne estas unika."
#define STRING_TDB2_MISSING "Mankanta {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "Ne estas nenia registrita ago por malfari."
#define STRING_TDB2_LAST_MOD "Laste modifis ĝin je {1}"
#define STRING_TDB2_UNDO_PRIOR "Antaŭaj Valoroj"
#define STRING_TDB2_UNDO_CURRENT "Aktualaj Valoroj"
#define STRING_TDB2_DIFF_PREV "--- antaŭa stato " // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Malfarado restaŭros tiun staton" // ||
#define STRING_TDB2_DIFF_CURR "+++ aktuala stato" // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Ŝanĝis tion je {1}"
#define STRING_TDB2_UNDO_CONFIRM "Komando 'undo' ne estas inversigebla. Ĉu vi estas certa, ke vi volas reveni al la antaŭa stato?"
#define STRING_TDB2_MISSING_UUID "Ne povis loki UUID-identigilon en tasko, do ne povos malfari."
#define STRING_TDB2_REVERTED "Revenis taskon al la antaŭa stato."
#define STRING_TDB2_REMOVED "Elprenis taskon."
#define STRING_TDB2_UNDO_COMPLETE "Malfaris komplete."
#define STRING_TDB2_UNDO_SYNCED "Ne povos malfari ŝanĝon ĉar la tasko estis jam sinkronigita. Modifu anstataŭe la taskon."
#define STRING_TDB2_DIRTY_EXIT "Eliranta kun neskribitajn ŝanĝojn al {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -706,26 +706,4 @@
#define STRING_TASK_SAFETY_ALLOW "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción."
#define STRING_TASK_INVALID_COL_TYPE "Tipo de columna no reconocido '{1}' para la columna '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " en {1} en la línea {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "No se puede añadir la tarea porque el uuid '{1}' no es único."
#define STRING_TDB2_MISSING "Falta {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "No hay transacciones registradas para deshacer."
#define STRING_TDB2_LAST_MOD "La última modificación fue hecha {1}"
#define STRING_TDB2_UNDO_PRIOR "Valores Previos"
#define STRING_TDB2_UNDO_CURRENT "Valores Actuales"
#define STRING_TDB2_DIFF_PREV "--- estado previo " // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Deshacer restaurará este estado"// ||
#define STRING_TDB2_DIFF_CURR "+++ estado actual " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Cambio hecho {1}"
#define STRING_TDB2_UNDO_CONFIRM "El comando undo es irreversible. ¿Está seguro de querer revertir al estado anterior?"
#define STRING_TDB2_MISSING_UUID "No se pudo localizar el UUID en la tarea a deshacer."
#define STRING_TDB2_REVERTED "Tarea modificada revertida."
#define STRING_TDB2_REMOVED "Tarea eliminada."
#define STRING_TDB2_UNDO_COMPLETE "Deshacer completado."
#define STRING_TDB2_UNDO_SYNCED "No se puede deshacer el cambio porque la tarea ya ha sido sincronizada. Como alternativa, modifique la tarea."
#define STRING_TDB2_DIRTY_EXIT "Saliendo con cambios sin escribir a {1}"
#define STRING_TDB2_UNWAIT "Tarea no en espera '{1}'"
#endif

View file

@ -696,25 +696,4 @@
#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " in {1} at line {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Cannot add task because the uuid '{1}' is not unique."
#define STRING_TDB2_MISSING "Missing {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "Il n'y a aucune action enregistrée à défaire."
#define STRING_TDB2_LAST_MOD "The last modification was made {1}"
#define STRING_TDB2_UNDO_PRIOR "Valeurs précédantes"
#define STRING_TDB2_UNDO_CURRENT "Valeurs actuelles"
#define STRING_TDB2_DIFF_PREV "--- previous state" // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Undo will restore this state" // ||
#define STRING_TDB2_DIFF_CURR "+++ current state " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Change made {1}"
#define STRING_TDB2_UNDO_CONFIRM "The undo command is not reversible. Are you sure you want to revert to the previous state?"
#define STRING_TDB2_MISSING_UUID "Cannot locate UUID in task to undo."
#define STRING_TDB2_REVERTED "Modified task reverted."
#define STRING_TDB2_REMOVED "Tâche retirée."
#define STRING_TDB2_UNDO_COMPLETE "Annulation terminée."
#define STRING_TDB2_UNDO_SYNCED "Impossible d'annuler les changements car la tâche a déjà été synchronysée. Modifiez plutôt la tâche."
#define STRING_TDB2_DIRTY_EXIT "Exiting with unwritten changes to {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -695,25 +695,4 @@
#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " in {1} alla linea {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Impossibile aggiungere il task in quanto l'uuid '{1}' non è unico."
#define STRING_TDB2_MISSING "Mancante {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "Nessuna transazione memorizzata da ripristinare."
#define STRING_TDB2_LAST_MOD "L'ultima modifica è stat effettuata {1}"
#define STRING_TDB2_UNDO_PRIOR "Valori precedenti"
#define STRING_TDB2_UNDO_CURRENT "Valori correnti"
#define STRING_TDB2_DIFF_PREV "--- stato precedente" // Same length
#define STRING_TDB2_DIFF_PREV_DESC "L'undo ripristinerà questo stato" // ||
#define STRING_TDB2_DIFF_CURR "+++ stato corrente " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Modifiche effettuate {1}"
#define STRING_TDB2_UNDO_CONFIRM "Il comando undo non è reversibile. Sicuro di voler ripristinare lo stato precedente?"
#define STRING_TDB2_MISSING_UUID "Impossibile individuare l'UUID nel task da ripristinare."
#define STRING_TDB2_REVERTED "Modifiche al task ripristinate."
#define STRING_TDB2_REMOVED "Task rimosso."
#define STRING_TDB2_UNDO_COMPLETE "Undo completato."
#define STRING_TDB2_UNDO_SYNCED "Cannot undo change because the task was already synced. Modify the task instead."
#define STRING_TDB2_DIRTY_EXIT "Exiting with unwritten changes to {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -696,25 +696,4 @@
#define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken."
#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " in {1} at line {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Cannot add task because the uuid '{1}' is not unique."
#define STRING_TDB2_MISSING "Missing {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "There are no recorded transactions to undo."
#define STRING_TDB2_LAST_MOD "The last modification was made {1}"
#define STRING_TDB2_UNDO_PRIOR "Prior Values"
#define STRING_TDB2_UNDO_CURRENT "Current Values"
#define STRING_TDB2_DIFF_PREV "--- previous state" // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Undo will restore this state" // ||
#define STRING_TDB2_DIFF_CURR "+++ current state " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Change made {1}"
#define STRING_TDB2_UNDO_CONFIRM "The undo command is not reversible. Are you sure you want to revert to the previous state?"
#define STRING_TDB2_MISSING_UUID "Cannot locate UUID in task to undo."
#define STRING_TDB2_REVERTED "Modified task reverted."
#define STRING_TDB2_REMOVED "Task removed."
#define STRING_TDB2_UNDO_COMPLETE "Undo complete."
#define STRING_TDB2_UNDO_SYNCED "Cannot undo change because the task was already synced. Modify the task instead."
#define STRING_TDB2_DIRTY_EXIT "Exiting with unwritten changes to {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -696,25 +696,4 @@
#define STRING_TASK_SAFETY_ALLOW "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji."
#define STRING_TASK_INVALID_COL_TYPE "Nierozpoznany typ kolumny '{1}' dla kolumny '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " w {1} w lini {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Nie można dodać zadania ponieważ uuid '{1}' nie jest unikalny."
#define STRING_TDB2_MISSING "Brakuje {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "Nie ma żadnych zapisanych transakcji do cofnięcia."
#define STRING_TDB2_LAST_MOD "Ostatnia dokonana modyfikcaja {1}"
#define STRING_TDB2_UNDO_PRIOR "Prior Wartości"
#define STRING_TDB2_UNDO_CURRENT "Aktualne Wartości"
#define STRING_TDB2_DIFF_PREV "--- poprzedni stan" // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Cofnij przywróci ten stan" // ||
#define STRING_TDB2_DIFF_CURR "+++ aktualny stan " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Zmiana w {1}"
#define STRING_TDB2_UNDO_CONFIRM "Polecenie cofnij jest nieodwracalne. Czy jesteś pewien że chcesz przywrócić poprzedni stan?"
#define STRING_TDB2_MISSING_UUID "Nie można zlokalizować UUID w zadaniu do cofnięcia."
#define STRING_TDB2_REVERTED "Zrewerotowano zmienione zadania."
#define STRING_TDB2_REMOVED "Zadanie usunięte."
#define STRING_TDB2_UNDO_COMPLETE "Operacja cofnięcia zakończona."
#define STRING_TDB2_UNDO_SYNCED "Nie można cofnąć zmian ponieważ zadanie zostało zsynchronizowane. Zmodyfikuj zadanie."
#define STRING_TDB2_DIRTY_EXIT "Zamykanie z niezapisanymi zmianami w {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif

View file

@ -696,25 +696,4 @@
#define STRING_TASK_SAFETY_ALLOW "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada."
#define STRING_TASK_INVALID_COL_TYPE "Unrecognized column type '{1}' for column '{2}'"
// TDB2
#define STRING_TDB2_PARSE_ERROR " em {1} na linha {2}"
#define STRING_TDB2_UUID_NOT_UNIQUE "Não é possível adicionar a tarefa porque o 'uuid' '{1}' não é único."
#define STRING_TDB2_MISSING "Em falta {1} \"{2}\""
#define STRING_TDB2_NO_UNDO "Não existem alterações que possam ser revertidas."
#define STRING_TDB2_LAST_MOD "A última modificação foi feita {1}"
#define STRING_TDB2_UNDO_PRIOR "Valores anteriores"
#define STRING_TDB2_UNDO_CURRENT "Valores atuais"
#define STRING_TDB2_DIFF_PREV "--- estado prévio " // Same length
#define STRING_TDB2_DIFF_PREV_DESC "Reverter restaurará este estado"// ||
#define STRING_TDB2_DIFF_CURR "+++ estado atual " // Same length
#define STRING_TDB2_DIFF_CURR_DESC "Alteração efetuada {1}"
#define STRING_TDB2_UNDO_CONFIRM "O comando 'undo' não é reversível. Tem a certeza que deseja reverter para o estado anterior?"
#define STRING_TDB2_MISSING_UUID "Não foi possível localizar o UUID na tarefa a reverter."
#define STRING_TDB2_REVERTED "Tarefa modificada revertida."
#define STRING_TDB2_REMOVED "Tarefa removida."
#define STRING_TDB2_UNDO_COMPLETE "Reversão concluída."
#define STRING_TDB2_UNDO_SYNCED "Não é possível reverter a alteração porque a tarefa já foi syncronizada. Em vez disso modifique a tarefa."
#define STRING_TDB2_DIRTY_EXIT "Saindo com modificações por gravar de {1}"
#define STRING_TDB2_UNWAIT "Un-waiting task '{1}'"
#endif