diff --git a/ChangeLog b/ChangeLog index bb2522afe..c5061b6ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,8 @@ (thanks to Onion). - TW-1885 Task Sync does not send TLS SNI headers (thanks to Dan Callahan). +- TW-1903 grammar error -- There are 1 local changes. + (thanks to Eric Hymowitz). - Added 'juhannus' as a synonym for 'midsommarafton' (thanks to Lynoure Braakman). - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY' diff --git a/src/feedback.cpp b/src/feedback.cpp index 2c5cc67e3..4e57b251a 100644 --- a/src/feedback.cpp +++ b/src/feedback.cpp @@ -420,7 +420,8 @@ void feedback_backlog () ++count; if (count) - context.footnote (format (STRING_FEEDBACK_BACKLOG, count)); + context.footnote (format (count > 1 ? STRING_FEEDBACK_BACKLOG_N + : STRING_FEEDBACK_BACKLOG, count)); } } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index d31b1ecb0..dfb61b513 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -742,6 +742,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Aufgabe {1} '{2}' entsperrt." #define STRING_FEEDBACK_EXPIRED "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht." +#define STRING_FEEDBACK_BACKLOG_N "{1} Lokale Änderungen. Datenabgleich erforderlich." #define STRING_FEEDBACK_BACKLOG "{1} Lokale Änderungen. Datenabgleich erforderlich." // helpers diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 6e7db41a8..0ee834d9f 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -740,7 +740,8 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." -#define STRING_FEEDBACK_BACKLOG "There are {1} local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG_N "There are {1} local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG "There is {1} local change. Sync required." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 4a362468f..c6334020d 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -742,6 +742,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Malblokis {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Tasko {1} '{2}' fortempiĝis do estis viŝata." +#define STRING_FEEDBACK_BACKLOG_N "Estas {1} lokaj ŝanĝoj. Sinkronigo devita." #define STRING_FEEDBACK_BACKLOG "Estas {1} lokaj ŝanĝoj. Sinkronigo devita." // helpers diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index d13e2cb9f..dc5efe9b5 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -754,6 +754,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas." #define STRING_FEEDBACK_UNBLOCKED "Desbloqueada {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "La tarea {1} '{2}' caducó y fue eliminada." +#define STRING_FEEDBACK_BACKLOG_N "Hay {1} modificaciones locales. Se require una sincronización." #define STRING_FEEDBACK_BACKLOG "Hay {1} modificaciones locales. Se require una sincronización." // helpers diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 19e794611..577ea0da1 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -744,6 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Tâche {1} '{2}' a expiré et a été supprimée." +#define STRING_FEEDBACK_BACKLOG_N "Il y a des {1} changements locaux. Synchronisation requise." #define STRING_FEEDBACK_BACKLOG "Il y a des {1} changements locaux. Synchronisation requise." // helpers diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index f3febb5fe..5a0081985 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -743,7 +743,8 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Sbloccato {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Il task {1} '{2}' è scaduto ed è stato eliminato" -#define STRING_FEEDBACK_BACKLOG "There are {1} local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG_N "There are {1} local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG "There is {1} local change. Sync required." // helpers #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 87c066869..37df07dc1 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -744,7 +744,8 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." -#define STRING_FEEDBACK_BACKLOG "There are {1} local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG_N "There are {1} local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG "There is {1} local change. Sync required." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index f3f61d924..31ecea0fd 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -744,6 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Odblokowane {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Zadanie {1} '{2}' jest przedawnione i zostało usunięte." +#define STRING_FEEDBACK_BACKLOG_N "Wykryto {1} lokalne zmiany. Wymagana synchronizacja." #define STRING_FEEDBACK_BACKLOG "Wykryto {1} lokalne zmiany. Wymagana synchronizacja." // helpers diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 3127e340e..0f8088983 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -744,6 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Desbloqueada {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Tarefa {1} '{2}' expirou e foi eliminada." +#define STRING_FEEDBACK_BACKLOG_N "Há {1} modificações locais. Necessário sincronizar (sync)." #define STRING_FEEDBACK_BACKLOG "Há {1} modificações locais. Necessário sincronizar (sync)." // helpers