diff --git a/src/commands/CmdSync.cpp b/src/commands/CmdSync.cpp index dea0e120c..19a8ad6f2 100644 --- a/src/commands/CmdSync.cpp +++ b/src/commands/CmdSync.cpp @@ -35,7 +35,6 @@ #include #include #include -#include extern Context context; @@ -44,7 +43,7 @@ CmdSync::CmdSync () { _keyword = "synchronize"; _usage = "task synchronize [initialize]"; - _description = STRING_CMD_SYNC_USAGE; + _description = "Synchronizes data with the Taskserver"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -74,10 +73,10 @@ int CmdSync::execute (std::string& output) if (closeEnough ("initialize", word, 4)) { if (!context.config.getBoolean ("confirmation") || - confirm (STRING_CMD_SYNC_INIT)) + confirm ("Please confirm that you wish to upload all your tasks to the Taskserver")) first_time_init = true; else - throw std::string (STRING_CMD_SYNC_NO_INIT); + throw std::string ("Taskwarrior will not proceed with first-time sync initialization."); } } @@ -85,23 +84,23 @@ int CmdSync::execute (std::string& output) std::string connection = context.config.get ("taskd.server"); if (connection == "" || connection.rfind (':') == std::string::npos) - throw std::string (STRING_CMD_SYNC_NO_SERVER); + throw std::string ("Taskserver is not configured."); // Obtain credentials. std::string credentials_string = context.config.get ("taskd.credentials"); if (credentials_string == "") - throw std::string (STRING_CMD_SYNC_BAD_CRED); + throw std::string ("Taskserver credentials malformed."); auto credentials = split (credentials_string, '/'); if (credentials.size () != 3) - throw std::string (STRING_CMD_SYNC_BAD_CRED); + throw std::string ("Taskserver credentials malformed."); // This was a Boolean value in 2.3.0, and is a tri-state since 2.4.0. std::string trust_value = context.config.get ("taskd.trust"); if (trust_value != "strict" && trust_value != "ignore hostname" && trust_value != "allow all") - throw std::string (STRING_CMD_SYNC_TRUST_OBS); + throw std::string ("The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'."); enum TLSClient::trust_level trust = TLSClient::strict; if (trust_value == "allow all") @@ -112,18 +111,18 @@ int CmdSync::execute (std::string& output) // CA must exist, if provided. File ca (context.config.get ("taskd.ca")); if (ca._data != "" && ! ca.exists ()) - throw std::string (STRING_CMD_SYNC_BAD_CA); + throw std::string ("CA certificate not found."); if (trust == TLSClient::allow_all && ca._data != "") - throw std::string (STRING_CMD_SYNC_TRUST_CA); + throw std::string ("You should either provide a CA certificate or override verification, but not both."); File certificate (context.config.get ("taskd.certificate")); if (! certificate.exists ()) - throw std::string (STRING_CMD_SYNC_BAD_CERT); + throw std::string ("Taskserver certificate missing."); File key (context.config.get ("taskd.key")); if (! key.exists ()) - throw std::string (STRING_CMD_SYNC_BAD_KEY); + throw std::string ("Taskserver key missing."); // If this is a first-time initialization, send pending.data and // completed.data, but not backlog.data. @@ -171,7 +170,7 @@ int CmdSync::execute (std::string& output) request.setPayload (payload); if (context.verbose ("sync")) - out << format (STRING_CMD_SYNC_PROGRESS, connection) + out << format ("Syncing with {1}", connection) << '\n'; // Ignore harmful signals. @@ -223,7 +222,7 @@ int CmdSync::execute (std::string& output) if (context.verbose ("sync")) out << " " << colorChanged.colorize ( - format (STRING_CMD_SYNC_MOD, + format ("modify {1} '{2}'", uuid, from_server.get ("description"))) << '\n'; @@ -234,7 +233,7 @@ int CmdSync::execute (std::string& output) if (context.verbose ("sync")) out << " " << colorAdded.colorize ( - format (STRING_CMD_SYNC_ADD, + format (" add {1} '{2}'", uuid, from_server.get ("description"))) << '\n'; @@ -263,38 +262,38 @@ int CmdSync::execute (std::string& output) // Present a clear status message. if (upload_count == 0 && download_count == 0) // Note: should not happen - expect code 201 instead. - context.footnote (STRING_CMD_SYNC_SUCCESS0); + context.footnote ("Sync successful."); else if (upload_count == 0 && download_count > 0) - context.footnote (format (STRING_CMD_SYNC_SUCCESS2, download_count)); + context.footnote (format ("Sync successful. {1} changes downloaded.", download_count)); else if (upload_count > 0 && download_count == 0) - context.footnote (format (STRING_CMD_SYNC_SUCCESS1, upload_count)); + context.footnote (format ("Sync successful. {1} changes uploaded.", upload_count)); else if (upload_count > 0 && download_count > 0) - context.footnote (format (STRING_CMD_SYNC_SUCCESS3, upload_count, download_count)); + context.footnote (format ("Sync successful. {1} changes uploaded, {2} changes downloaded.", upload_count, download_count)); } status = 0; } else if (code == "201") { - context.footnote (STRING_CMD_SYNC_SUCCESS_NOP); + context.footnote ("Sync successful. No changes."); status = 0; } else if (code == "301") { std::string new_server = response.get ("info"); context.config.set ("taskd.server", new_server); - context.error (STRING_CMD_SYNC_RELOCATE0); - context.error (" " + format (STRING_CMD_SYNC_RELOCATE1, new_server)); + context.error ("The server account has been relocated. Please update your configuration using:"); + context.error (" " + format ("task config taskd.server {1}", new_server)); status = 2; } else if (code == "430") { - context.error (STRING_CMD_SYNC_FAIL_ACCOUNT); + context.error ("Sync failed. Either your credentials are incorrect, or your account doesn't exist on the Taskserver."); status = 2; } else { - context.error (format (STRING_CMD_SYNC_FAIL_ERROR, + context.error (format ("Sync failed. The Taskserver returned error: {1} {2}", code, response.get ("status"))); status = 2; @@ -320,7 +319,7 @@ int CmdSync::execute (std::string& output) // - No signal/cable else { - context.error (STRING_CMD_SYNC_FAIL_CONNECT); + context.error ("Sync failed. Could not connect to the Taskserver."); status = 1; } @@ -338,7 +337,7 @@ int CmdSync::execute (std::string& output) #else // Without GnuTLS found at compile time, there is no working sync command. - throw std::string (STRING_CMD_SYNC_NO_TLS); + throw std::string ("Taskwarrior was built without GnuTLS support. Sync is not available."); #endif return status; } @@ -358,7 +357,7 @@ bool CmdSync::send ( // IPv6 addresses. auto colon = to.rfind (':'); if (colon == std::string::npos) - throw format (STRING_CMD_SYNC_BAD_SERVER, to); + throw format ("Sync failed. Malformed configuration setting '{1}'", to); std::string server = to.substr (0, colon); std::string port = to.substr (colon + 1); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index ea1ab3592..eec5f184c 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -291,31 +291,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Kommentar fehlt Beschreibung: {1}" #define STRING_TASK_NO_ENTRY "Kommentar fehlt Erfassungsdatum: {1}" -#define STRING_CMD_SYNC_USAGE "Gleicht Daten mit dem Task-Server ab" -#define STRING_CMD_SYNC_NO_SERVER "Task-Server nicht konfiguriert." -#define STRING_CMD_SYNC_BAD_CRED "Task-Server-Zugangsdaten in falschem Format." -#define STRING_CMD_SYNC_BAD_CERT "Task-Server-Zertifikat fehlt." -#define STRING_CMD_SYNC_BAD_KEY "Task-Server-Schlüssel fehlt." -#define STRING_CMD_SYNC_ADD "hinzugefügt {1} '{2}'" -#define STRING_CMD_SYNC_MOD " verändert {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Datenabgleich mit {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Datenabgleich erfolgreich." -#define STRING_CMD_SYNC_SUCCESS1 "Datenabgleich erfolgreich. {1} Änderung(en) gesendet." -#define STRING_CMD_SYNC_SUCCESS2 "Datenabgleich erfolgreich. {1} Änderung(en) empfangen." -#define STRING_CMD_SYNC_SUCCESS3 "Datenabgleich erfolgreich. {1} Änderung(en) gesendet, {2} Änderung(en) empfangen." -#define STRING_CMD_SYNC_SUCCESS_NOP "Datenabgleich erfolgreich. Keine Änderungen." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Datenabgleich fehlgeschlagen. Zugangsdaten falsch oder Konto auf Task-Server nicht aktiviert." -#define STRING_CMD_SYNC_FAIL_ERROR "Datenabgleich fehlgeschlagen. Der Task-Server hat einen Fehler zurückgeliefert: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Datenabgleich fehlgeschlagen. Konnte nicht mit dem Task-Server verbinden." -#define STRING_CMD_SYNC_BAD_SERVER "Datenabgleich fehlgeschlagen. Fehlerhafte Konfiguration '{1}'" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior wurde ohne GnuTLS-Unterstützung gebaut. Datenabgleich ist nicht verfügbar." -#define STRING_CMD_SYNC_INIT "Alle offenen Aufgaben an den Task-Server senden?" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior wird nicht mit dem erstmaligen Datenabgleich fortfahren." -#define STRING_CMD_SYNC_RELOCATE0 "Das Server-Konto wurde verschoben. Bitte Konfiguration folgendermaßen ändern:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "CA-Zertifikat nicht gefunden." -#define STRING_CMD_SYNC_TRUST_CA "Entweder ein CA-Zertifikat bereitstellen oder Prüfung deaktivieren, nicht jedoch beides." -#define STRING_CMD_SYNC_TRUST_OBS "Erlaubte Werte der 'taskd.trust'-Option sind nur noch 'strict', 'ignore hostname' und 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Erzeugt eine Liste aller Befehle zur Auto-Vervollständigung" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index da749c159..ed9e7070b 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -288,31 +288,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Annotation is missing a description: {1}" #define STRING_TASK_NO_ENTRY "Annotation is missing an entry date: {1}" -#define STRING_CMD_SYNC_USAGE "Synchronizes data with the Taskserver" -#define STRING_CMD_SYNC_NO_SERVER "Taskserver is not configured." -#define STRING_CMD_SYNC_BAD_CRED "Taskserver credentials malformed." -#define STRING_CMD_SYNC_BAD_CERT "Taskserver certificate missing." -#define STRING_CMD_SYNC_BAD_KEY "Taskserver key missing." -#define STRING_CMD_SYNC_ADD " add {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modify {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Syncing with {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Sync successful." -#define STRING_CMD_SYNC_SUCCESS1 "Sync successful. {1} changes uploaded." -#define STRING_CMD_SYNC_SUCCESS2 "Sync successful. {1} changes downloaded." -#define STRING_CMD_SYNC_SUCCESS3 "Sync successful. {1} changes uploaded, {2} changes downloaded." -#define STRING_CMD_SYNC_SUCCESS_NOP "Sync successful. No changes." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sync failed. Either your credentials are incorrect, or your account doesn't exist on the Taskserver." -#define STRING_CMD_SYNC_FAIL_ERROR "Sync failed. The Taskserver returned error: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Sync failed. Could not connect to the Taskserver." -#define STRING_CMD_SYNC_BAD_SERVER "Sync failed. Malformed configuration setting '{1}'" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior was built without GnuTLS support. Sync is not available." -#define STRING_CMD_SYNC_INIT "Please confirm that you wish to upload all your tasks to the Taskserver" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior will not proceed with first-time sync initialization." -#define STRING_CMD_SYNC_RELOCATE0 "The server account has been relocated. Please update your configuration using:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "CA certificate not found." -#define STRING_CMD_SYNC_TRUST_CA "You should either provide a CA certificate or override verification, but not both." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Generates a list of all commands, for autocompletion purposes" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 739bfaced..29879b47b 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -291,31 +291,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Komento havas mankon de priskribo: {1}" #define STRING_TASK_NO_ENTRY "Komento havas mankon de enskrib-dato: {1}" -#define STRING_CMD_SYNC_USAGE "Sinkronigas datumojn kun la Taskserver" -#define STRING_CMD_SYNC_NO_SERVER "Taskserver ne estas agordita." -#define STRING_CMD_SYNC_BAD_CRED "Taskserver-akreditaĵoj malbone formataj." -#define STRING_CMD_SYNC_BAD_CERT "Taskserver-atestilo mankas." -#define STRING_CMD_SYNC_BAD_KEY "Taskserver-ĉifrigilo mankas." -#define STRING_CMD_SYNC_ADD " add {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modify {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Sinkroniganta kun {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Sukcesis sinkronigi." -#define STRING_CMD_SYNC_SUCCESS1 "Sukcesis sinkronigi. Alŝutis {1} ŝanĝojn." -#define STRING_CMD_SYNC_SUCCESS2 "Sukcesis sinkronigi. Elŝutis {1} ŝanĝojn." -#define STRING_CMD_SYNC_SUCCESS3 "Sukcesis sinkronigi. Alŝutis {1} ŝanĝojn, elŝutis {2}." -#define STRING_CMD_SYNC_SUCCESS_NOP "Sukcesis sinkronigi. Ne ŝanĝis nenion." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Malsukcesis sinkronigi. Aŭ viaj akreditaĵoj estas malkorekta, aŭ via Taskserver-konto ne estas ebligata." -#define STRING_CMD_SYNC_FAIL_ERROR "Malsukcesis sinkronigi. La Taskserver redonis eraron: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Malsukcesis sinkronigi. Ne povis konekti al la Taskserver." -#define STRING_CMD_SYNC_BAD_SERVER "Malsukcesis sinkronigi. Agordo '{1}' ne rekonata" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior estis kompilata sen GnuTLS-subteno. Sinkronigado ne estas disponebla." -#define STRING_CMD_SYNC_INIT "Bonvolu konfirmi, ke vi volas alŝuti ĉian pendantan taskon al la Taskserver" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior ne procedos inicialigi sinkronigadon." -#define STRING_CMD_SYNC_RELOCATE0 "La servila konto transloĝiĝis. Bonvolu aktualigi via agordo kun:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "CA certificate not found." -#define STRING_CMD_SYNC_TRUST_CA "You should either provide a CA certificate or override verification, but not both." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Generates a list of all commands, for autocompletion purposes" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index f745d18c1..6383c4dc9 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -300,32 +300,6 @@ #define STRING_TASK_NO_DESC "La anotación carece de descripción: {1}" #define STRING_TASK_NO_ENTRY "La anotación carece de fecha de entrada: {1}" -#define STRING_CMD_SYNC_USAGE "Sincroniza datos con el Servidor Task" -#define STRING_CMD_SYNC_NO_SERVER "El Servidor Task no está configurado." -#define STRING_CMD_SYNC_BAD_CRED "Credenciales del Servidor Task incorrectas." -#define STRING_CMD_SYNC_BAD_CERT "Certificado del Servidor Task no encontrado." -#define STRING_CMD_SYNC_BAD_KEY "Clave del Servidor Task no encontrada." -#define STRING_CMD_SYNC_ADD " añade {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modifica {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Sincronizando con {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Sincronización correcta." -#define STRING_CMD_SYNC_SUCCESS1 "Sincronización correcta. {1} cambios enviados." -#define STRING_CMD_SYNC_SUCCESS2 "Sincronización correcta. {1} cambios recibidos." -#define STRING_CMD_SYNC_SUCCESS3 "Sincronización correcta. {1} cambios enviados, {2} cambios recibidos." -#define STRING_CMD_SYNC_SUCCESS_NOP "Sincronización correcta. No hay cambios" -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sincronización fallida. O bien sus credenciales son incorrectas, o su cuenta en el servidor Task no existe." -#define STRING_CMD_SYNC_FAIL_ERROR "Sincronización fallida. El Servidor Task devolvió error: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Sincronización fallida. No se pudo conectar con el Servidor Task." -#define STRING_CMD_SYNC_BAD_SERVER "Sincronización fallida. Ajuste de configuración '{1}' incorrecto" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior fue construido sin soporte GnuTLS. Sincronización no disponible." -#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}" // |esp-ESP|==|eng-USA| -#define STRING_CMD_SYNC_BAD_CA "Certificado CA no encontrado." -#define STRING_CMD_SYNC_TRUST_CA "Debe proveer un certificado CA o la verificación de sobrescritura, pero no ambos." -#define STRING_CMD_SYNC_TRUST_OBS "Los ajustes de 'taskd.trust' ahora solo pueden contener uno de los valores 'strict', 'ignore hostname' o 'allow all'." - #define STRING_CMD_COMMANDS_USAGE "Genera una lista de todos los comandos, con detalles de comportamiento" #define STRING_CMD_HCOMMANDS_USAGE "Genera una lista de todos los comandos, con fines de auto-completado" #define STRING_CMD_ZSHCOMMANDS_USAGE "Genera una lista de todos los comandos, con fines de auto-completado zsh" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 6b3719010..3e880161a 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -293,31 +293,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Annotation is missing a description: {1}" #define STRING_TASK_NO_ENTRY "Annotation is missing an entry date: {1}" -#define STRING_CMD_SYNC_USAGE "Synchronizes data with the Taskserver" -#define STRING_CMD_SYNC_NO_SERVER "Taskserver is not configured." -#define STRING_CMD_SYNC_BAD_CRED "Taskserver credentials malformed." -#define STRING_CMD_SYNC_BAD_CERT "Taskserver certificate missing." -#define STRING_CMD_SYNC_BAD_KEY "Taskserver key missing." -#define STRING_CMD_SYNC_ADD " add {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modify {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Syncing with {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Sync successful." -#define STRING_CMD_SYNC_SUCCESS1 "Sync successful. {1} changes uploaded." -#define STRING_CMD_SYNC_SUCCESS2 "Sync successful. {1} changes downloaded." -#define STRING_CMD_SYNC_SUCCESS3 "Sync successful. {1} changes uploaded, {2} changes downloaded." -#define STRING_CMD_SYNC_SUCCESS_NOP "Sync successful. No changes." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sync failed. Either your credentials are incorrect, or your account doesn't exist on the Taskserver." -#define STRING_CMD_SYNC_FAIL_ERROR "La synchrniqation a échouée. Taskserver a renvoyé l'erreur: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Sync failed. Could not connect to the Taskserver." -#define STRING_CMD_SYNC_BAD_SERVER "Sync failed. Malformed configuration setting '{1}'" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior was built without GnuTLS support. Sync is not available." -#define STRING_CMD_SYNC_INIT "Please confirm that you wish to upload all your tasks to the Taskserver" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior will not proceed with first-time sync initialization." -#define STRING_CMD_SYNC_RELOCATE0 "The server account has been relocated. Please update your configuration using:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "CA certificate not found." -#define STRING_CMD_SYNC_TRUST_CA "You should either provide a CA certificate or override verification, but not both." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Generates a list of all commands, for autocompletion purposes" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 41cb977cb..4490ba59b 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -292,31 +292,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Annotazione senza descrizione: {1}" #define STRING_TASK_NO_ENTRY "Annotazione senza data di immissione: {1}" -#define STRING_CMD_SYNC_USAGE "Sincronizza i dati con il Taskserver" -#define STRING_CMD_SYNC_NO_SERVER "Taskserver non configurato." -#define STRING_CMD_SYNC_BAD_CRED "Credenziali del Taskserver malformate." -#define STRING_CMD_SYNC_BAD_CERT "Taskserver certificate missing." -#define STRING_CMD_SYNC_BAD_KEY "Taskserver key missing." -#define STRING_CMD_SYNC_ADD " aggiunto {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modificato {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Sincronizzazione con {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Sincronizzazione effettuata." -#define STRING_CMD_SYNC_SUCCESS1 "Sincronizzazione effettuata. {1} modifiche caricate." -#define STRING_CMD_SYNC_SUCCESS2 "Sincronizzazione effettuata. {1} modifiche scaricate." -#define STRING_CMD_SYNC_SUCCESS3 "Sincronizzazione effettuata. {1} modifiche caricate, {2} modifiche scaricate." -#define STRING_CMD_SYNC_SUCCESS_NOP "Sincronizzazione effettuata. Nessuna modifica." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sincronizzazione fallita. Credenziali non corrette o Taskserver non abilitato." -#define STRING_CMD_SYNC_FAIL_ERROR "Sincronizzazione fallita. Il Taskserver ha ritornato l'errore: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Sincronizzazione fallita. Impossibile connettersi al Taskserver." -#define STRING_CMD_SYNC_BAD_SERVER "Sincronizzazione fallita. Impostazione di configurazione '{1}' malformata" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior was built without GnuTLS support. Sync is not available." -#define STRING_CMD_SYNC_INIT "Please confirm that you wish to upload all your tasks to the Taskserver" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior will not proceed with first-time sync initialization." -#define STRING_CMD_SYNC_RELOCATE0 "The server account has been relocated. Please update your configuration using:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "CA certificate not found." -#define STRING_CMD_SYNC_TRUST_CA "You should either provide a CA certificate or override verification, but not both." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Genera la lista di tutti i comandi, per autocompletamento" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index f473b01a9..daa88266f 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -293,31 +293,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Annotation is missing a description: {1}" #define STRING_TASK_NO_ENTRY "Annotation is missing an entry date: {1}" -#define STRING_CMD_SYNC_USAGE "Taskserver とデータを同期" -#define STRING_CMD_SYNC_NO_SERVER "Taskserver が構成されていません。" -#define STRING_CMD_SYNC_BAD_CRED "Taskserver credentials malformed." -#define STRING_CMD_SYNC_BAD_CERT "Taskserver certificate missing." -#define STRING_CMD_SYNC_BAD_KEY "Taskserver key がありません。" -#define STRING_CMD_SYNC_ADD " add {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modify {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "{1} と同期中" -#define STRING_CMD_SYNC_SUCCESS0 "同期成功。" -#define STRING_CMD_SYNC_SUCCESS1 "同期成功。 {1} 件の変更がアップロードされました。" -#define STRING_CMD_SYNC_SUCCESS2 "同期成功。 {1} 件の変更がダウンロードされました。" -#define STRING_CMD_SYNC_SUCCESS3 "同期成功。 {1} の変更がアップロードされ、{2} 件の本坑がダウンロードされました。" -#define STRING_CMD_SYNC_SUCCESS_NOP "同期成功。変更はありません。" -#define STRING_CMD_SYNC_FAIL_ACCOUNT "同期失敗。 認証情報が不正か Taskserver のアカウントが有効になっていません。" -#define STRING_CMD_SYNC_FAIL_ERROR "同期失敗。 Taskserver がエラー: {1} {2} を返した" -#define STRING_CMD_SYNC_FAIL_CONNECT "同期失敗。 Taskserverに接続できない。" -#define STRING_CMD_SYNC_BAD_SERVER "同期失敗。 不正な形式の設定 '{1}'" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior はGnuTLSサポートなしで構成されています。同期は無効です。" -#define STRING_CMD_SYNC_INIT "Please confirm that you wish to upload all your tasks to the Taskserver" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior will not proceed with first-time sync initialization." -#define STRING_CMD_SYNC_RELOCATE0 "The server account has been relocated. Please update your configuration using:" -#define STRING_CMD_SYNC_RELOCATE1 "task config taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "CA certificate が見つからない。" -#define STRING_CMD_SYNC_TRUST_CA "You should either provide a CA certificate or override verification, but not both." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Generates a list of all commands, for autocompletion purposes" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 9afe56b12..3daf0e698 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -293,31 +293,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Komentarz nie posiada treści: {1}" #define STRING_TASK_NO_ENTRY "Komentarz nie posiada daty utworzenia: {1}" -#define STRING_CMD_SYNC_USAGE "Synchronizuje dane z serwerem zadań" -#define STRING_CMD_SYNC_NO_SERVER "Serwer zadań jest nieskonfigurowany." -#define STRING_CMD_SYNC_BAD_CRED "Zaburzone uwierzytelnianie dla serwera zadań." -#define STRING_CMD_SYNC_BAD_CERT "Nieznaleziony certyfikat serwera zadań." -#define STRING_CMD_SYNC_BAD_KEY "Nieznaleziony klucz serwera zadań." -#define STRING_CMD_SYNC_ADD " dodaj {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modyfikuj {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "Synchronizacja z {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Synchronizacja udana" -#define STRING_CMD_SYNC_SUCCESS1 "Synchronizacja udana. {1} wysłanych zmian." -#define STRING_CMD_SYNC_SUCCESS2 "Synchronizacja udana. {1} ściągniętych zmian." -#define STRING_CMD_SYNC_SUCCESS3 "Synchronizacja udana. {1} wysłanych zmian, {2} ściągniętych zmian." -#define STRING_CMD_SYNC_SUCCESS_NOP "Synchronizacja udana. Żadnych zmian." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Synchronizacja nieudana. Nieudane uwierzytelnianie lub nie aktywne konto na serwerze zadań." -#define STRING_CMD_SYNC_FAIL_ERROR "Synchronizacja nieudana. Serwer zadań zwrócił błąd: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Synchronizacja nieudana. Nie można połączyć się z serwerem zadań." -#define STRING_CMD_SYNC_BAD_SERVER "Synchronizacja nieudana. Uszkodzone ustawienia konfiguracji '{1}'" -#define STRING_CMD_SYNC_NO_TLS "Taskwarrior zbudowany bez wsparcia dla GnuTLS. Synchronizacja niedostępna." -#define STRING_CMD_SYNC_INIT "Proszę potwierdzić zamiar wysłania na serwer zadań wszystkich twoich oczekujących zadań" -#define STRING_CMD_SYNC_NO_INIT "Taskwarrior nie wykona inicjalizacji dla pierwszej synchronizacji" -#define STRING_CMD_SYNC_RELOCATE0 "Konto na serwerze zostało przeniesione. Proszę uaktualnij swoją konfigurację używając:" -#define STRING_CMD_SYNC_RELOCATE1 "konfiguracji taskd.server {1}" -#define STRING_CMD_SYNC_BAD_CA "Certyfikat CA nie znaleziony." -#define STRING_CMD_SYNC_TRUST_CA "Powinieneś udostępnić certyfikat CA lub nadpisać weryfikację. Wybierz jedną z opcji." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Generuje listę wszystkich poleceń dla funkcji autouzupełniania" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 2353761a0..8bdbd65d5 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -293,31 +293,6 @@ #define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_TASK_NO_DESC "Descrição da anotação em falta: {1}" #define STRING_TASK_NO_ENTRY "Data de entrada da anotação em falta: {1}" -#define STRING_CMD_SYNC_USAGE "Sincroniza dados com o Taskserver" -#define STRING_CMD_SYNC_NO_SERVER "Taskserver não está configurado." -#define STRING_CMD_SYNC_BAD_CRED "Credenciais para o Taskserver incorretas." -#define STRING_CMD_SYNC_BAD_CERT "Certificado do Taskserver em falta." -#define STRING_CMD_SYNC_BAD_KEY "Chave do Taskserver em falta." -#define STRING_CMD_SYNC_ADD " adiciona {1} '{2}'" -#define STRING_CMD_SYNC_MOD "modifica {1} '{2}'" -#define STRING_CMD_SYNC_PROGRESS "A sincronizar com {1}" -#define STRING_CMD_SYNC_SUCCESS0 "Sincronizado com sucesso." -#define STRING_CMD_SYNC_SUCCESS1 "Sincronizado com sucesso. {1} alterações enviadas." -#define STRING_CMD_SYNC_SUCCESS2 "Sincronizado com sucesso. {1} alterações recebidas." -#define STRING_CMD_SYNC_SUCCESS3 "Sincronizado com sucesso. {1} alterações enviadas, {2} alterações recebidas." -#define STRING_CMD_SYNC_SUCCESS_NOP "Sincronizado com sucesso. Sem alterações." -#define STRING_CMD_SYNC_FAIL_ACCOUNT "Sincronização falhou. As suas credenciais estão incorretas ou a sua conta não existe no Taskserver." -#define STRING_CMD_SYNC_FAIL_ERROR "Sincronização falhou. O Taskserver devolveu o seguinte erro: {1} {2}" -#define STRING_CMD_SYNC_FAIL_CONNECT "Sincronização falhou. Não foi possível contactar ao Taskserver." -#define STRING_CMD_SYNC_BAD_SERVER "Sincronização falhou. Erro no parametro de configuração '{1}'" -#define STRING_CMD_SYNC_NO_TLS "O Taskwarrior foi compilado sem suporte de GnuTLS. A função de sincronização não está disponível." -#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|==|eng-USA| -#define STRING_CMD_SYNC_BAD_CA "Certificado CA não encontrado." -#define STRING_CMD_SYNC_TRUST_CA "Deve fornecer um certificado CA ou desactivar a verificação, mas não ambos." -#define STRING_CMD_SYNC_TRUST_OBS "The 'taskd.trust' settings may now only contain a value of 'strict', 'ignore hostname' or 'allow all'." #define STRING_CMD_COMMANDS_USAGE "Generates a list of all commands, with behavior details" #define STRING_CMD_HCOMMANDS_USAGE "Gera uma lista com todos os comandos, para fins de terminação automática"