diff --git a/src/CLI2.cpp b/src/CLI2.cpp index d8f383e0d..a4070c340 100644 --- a/src/CLI2.cpp +++ b/src/CLI2.cpp @@ -649,7 +649,7 @@ void CLI2::prepareFilter () } if (combined.size ()) - context.footnote (std::string (STRING_COLUMN_LABEL_FILTER) + ": " + combined); + context.footnote (std::string ("Filter: ") + combined); } } diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp index 4fe07ab4c..87b0de63b 100644 --- a/src/commands/CmdCommands.cpp +++ b/src/commands/CmdCommands.cpp @@ -33,7 +33,6 @@ #include #include #include -#include extern Context context; @@ -58,15 +57,15 @@ int CmdCommands::execute (std::string& output) { Table view; view.width (context.getWidth ()); - view.add (STRING_COLUMN_LABEL_COMMAND); - view.add (STRING_COLUMN_LABEL_CATEGORY); - view.add (STRING_COLUMN_LABEL_RO, false); - view.add (STRING_COLUMN_LABEL_SHOWS_ID, false); - view.add (STRING_COLUMN_LABEL_GC, false); - view.add (STRING_COLUMN_LABEL_CONTEXT, false); - view.add (STRING_COLUMN_LABEL_FILTER, false); - view.add (STRING_COLUMN_LABEL_MODS, false); - view.add (STRING_COLUMN_LABEL_MISC, false); + view.add ("Command"); + view.add ("Category"); + view.add ("R/W", false); + view.add ("ID", false); + view.add ("GC", false); + view.add ("Context", false); + view.add ("Filter", false); + view.add ("Mods", false); + view.add ("Misc", false); view.add ("Description"); view.leftMargin (context.config.getInteger ("indent.report")); view.extraPadding (context.config.getInteger ("row.padding")); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 2e3019b97..3206db46f 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Spalten" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Erledigt" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Anzahl" #define STRING_COLUMN_LABEL_DATE "Datum" #define STRING_COLUMN_LABEL_DEFAULT "Standard" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Ende" #define STRING_COLUMN_LABEL_ENTERED "Erfasst" #define STRING_COLUMN_LABEL_EXAMPLES "Beispiele" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Beschreibung" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Geändert" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Verwaiste UDA" #define STRING_COLUMN_LABEL_PROJECT "Projekt" #define STRING_COLUMN_LABEL_RECUR "Wiederh." #define STRING_COLUMN_LABEL_RECUR_L "Wiederholung" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Geplant" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" #define STRING_COLUMN_LABEL_STAT_C "E" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index f2728072c..ae7873fd1 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Columns" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Completed" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Count" #define STRING_COLUMN_LABEL_DATE "Date" #define STRING_COLUMN_LABEL_DEFAULT "Default" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "End" #define STRING_COLUMN_LABEL_ENTERED "Entered" #define STRING_COLUMN_LABEL_EXAMPLES "Example" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Modified" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" #define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" #define STRING_COLUMN_LABEL_RECUR_L "Recurrence" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Scheduled" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Start" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 86518874e..dcec7e651 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Kolumnoj" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Finita" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Nombro" #define STRING_COLUMN_LABEL_DATE "Dato" #define STRING_COLUMN_LABEL_DEFAULT "Defaŭlto" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Fino" #define STRING_COLUMN_LABEL_ENTERED "Kreita" #define STRING_COLUMN_LABEL_EXAMPLES "Ekzemplo" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Rubriko" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Modifo" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Nomo" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Orfa UDA" #define STRING_COLUMN_LABEL_PROJECT "Projekto" #define STRING_COLUMN_LABEL_RECUR "Reokazas" #define STRING_COLUMN_LABEL_RECUR_L "Reokazas ĉiu" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Fiksa" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Eko" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Stato" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index e38e607a4..9cb8ef36d 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Categoría" #define STRING_COLUMN_LABEL_COLUMN "Columnas" -#define STRING_COLUMN_LABEL_COMMAND "Comando" #define STRING_COLUMN_LABEL_COMPLETE "Completada" -#define STRING_COLUMN_LABEL_CONTEXT "Contexto" #define STRING_COLUMN_LABEL_COUNT "Recuento" #define STRING_COLUMN_LABEL_DATE "Fecha" #define STRING_COLUMN_LABEL_DEFAULT "Defecto" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Fin" #define STRING_COLUMN_LABEL_ENTERED "Entrada" #define STRING_COLUMN_LABEL_EXAMPLES "Ejemplo" -#define STRING_COLUMN_LABEL_FILTER "Filtro" -#define STRING_COLUMN_LABEL_GC "GC" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_LABEL "Etiqueta" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_MOD "Modificada" #define STRING_COLUMN_LABEL_MODIFY "Modificable" -#define STRING_COLUMN_LABEL_MODS "Mods" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_NAME "Nombre" #define STRING_COLUMN_LABEL_NOMODIFY "Solo lectura" #define STRING_COLUMN_LABEL_ORPHAN "UDA huérfano" #define STRING_COLUMN_LABEL_PROJECT "Proyecto" #define STRING_COLUMN_LABEL_RECUR "Recur" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_RECUR_L "Recurrencia" -#define STRING_COLUMN_LABEL_RO "R/W" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Programada" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" // |esp-ESP|==|eng-USA| #define STRING_COLUMN_LABEL_START "Comienzo" #define STRING_COLUMN_LABEL_STAT "Est" #define STRING_COLUMN_LABEL_STATUS "Estatus" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 67b7b672b..03807e608 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Colonnes" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Complétée" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Temps restant" #define STRING_COLUMN_LABEL_DATE "Date" #define STRING_COLUMN_LABEL_DEFAULT "Défaut" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Fin" #define STRING_COLUMN_LABEL_ENTERED "Entrée" #define STRING_COLUMN_LABEL_EXAMPLES "Exemple" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Étiq" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Modifiée" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Nom" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "ADU orphelins" #define STRING_COLUMN_LABEL_PROJECT "Projet" #define STRING_COLUMN_LABEL_RECUR "Récur" #define STRING_COLUMN_LABEL_RECUR_L "Récurrence" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Planifiée" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Début" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Statut" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 6e084134e..b44912089 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Colonna" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Completato" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Conteggio" #define STRING_COLUMN_LABEL_DATE "Data" #define STRING_COLUMN_LABEL_DEFAULT "Predefinito" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Fine" #define STRING_COLUMN_LABEL_ENTERED "Inserito" #define STRING_COLUMN_LABEL_EXAMPLES "Esempio" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Etichetta" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Modificato" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "UDA Orfano" #define STRING_COLUMN_LABEL_PROJECT "Progetto" #define STRING_COLUMN_LABEL_RECUR "Period" #define STRING_COLUMN_LABEL_RECUR_L "Periodico" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Fissato" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Inizio" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Stato" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 8b8fe629a..17505f503 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Columns" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Completed" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Count" #define STRING_COLUMN_LABEL_DATE "Date" #define STRING_COLUMN_LABEL_DEFAULT "Default" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "End" #define STRING_COLUMN_LABEL_ENTERED "Entered" #define STRING_COLUMN_LABEL_EXAMPLES "Example" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Label" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Modified" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Name" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Orphan UDA" #define STRING_COLUMN_LABEL_PROJECT "Project" #define STRING_COLUMN_LABEL_RECUR "Recur" #define STRING_COLUMN_LABEL_RECUR_L "Recurrence" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Scheduled" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Start" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 49875adaa..b0805549d 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Kolumny" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Ukończone" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Ile" #define STRING_COLUMN_LABEL_DATE "Data" #define STRING_COLUMN_LABEL_DEFAULT "Domyślne" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Koniec" #define STRING_COLUMN_LABEL_ENTERED "Dodane" #define STRING_COLUMN_LABEL_EXAMPLES "Przykłady" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Etykieta" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Zmienione" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Nazwa" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "Osierocone UDA" #define STRING_COLUMN_LABEL_PROJECT "Projekt" #define STRING_COLUMN_LABEL_RECUR "Period" #define STRING_COLUMN_LABEL_RECUR_L "Periodyczny" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Zaplanowane" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Start" #define STRING_COLUMN_LABEL_STAT "St" #define STRING_COLUMN_LABEL_STATUS "Status" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 6068ee6c6..976bfddfb 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,11 +27,8 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_COLUMN "Colunas" -#define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_COMPLETE "Concluída" -#define STRING_COLUMN_LABEL_CONTEXT "Context" #define STRING_COLUMN_LABEL_COUNT "Contagem" #define STRING_COLUMN_LABEL_DATE "Data" #define STRING_COLUMN_LABEL_DEFAULT "Por omissão" @@ -39,24 +36,18 @@ #define STRING_COLUMN_LABEL_END "Fim" #define STRING_COLUMN_LABEL_ENTERED "Criada" #define STRING_COLUMN_LABEL_EXAMPLES "Exemplo" -#define STRING_COLUMN_LABEL_FILTER "Filter" -#define STRING_COLUMN_LABEL_GC "GC" #define STRING_COLUMN_LABEL_LABEL "Rótulo" #define STRING_COLUMN_LABEL_LAST "Last instance" -#define STRING_COLUMN_LABEL_MISC "Misc" #define STRING_COLUMN_LABEL_MOD "Modificada" #define STRING_COLUMN_LABEL_MODIFY "Modifiable" -#define STRING_COLUMN_LABEL_MODS "Mods" #define STRING_COLUMN_LABEL_NAME "Nome" #define STRING_COLUMN_LABEL_NOMODIFY "Read Only" #define STRING_COLUMN_LABEL_ORPHAN "UDA Orfão" #define STRING_COLUMN_LABEL_PROJECT "Projeto" #define STRING_COLUMN_LABEL_RECUR "Period" #define STRING_COLUMN_LABEL_RECUR_L "Periodicidade" -#define STRING_COLUMN_LABEL_RO "R/W" #define STRING_COLUMN_LABEL_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_SCHED "Agendado" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID" #define STRING_COLUMN_LABEL_START "Início" #define STRING_COLUMN_LABEL_STAT "Es" #define STRING_COLUMN_LABEL_STATUS "Estado"