From 0c1c7c11b14b019be8061301c525e2dbad8f9c24 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Tue, 18 Aug 2020 17:24:11 +1000 Subject: [PATCH 1/4] Application.MainWindow: Fix info bar typo --- src/client/application/application-main-window.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala index 8e6705ab..e8428459 100644 --- a/src/client/application/application-main-window.vala +++ b/src/client/application/application-main-window.vala @@ -564,7 +564,7 @@ public class Application.MainWindow : // Translators: An info bar status label _("Security problem"), // Translators: An info bar description label - _("An account has reported an untrusted server..") + _("An account has reported an untrusted server.") ); // Translators: An info bar button label var cert_retry = new Gtk.Button.with_label(_("Check")); From 8a5ea12069acbb8399cc172247469f30f8033a97 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Tue, 18 Aug 2020 18:08:05 +1000 Subject: [PATCH 2/4] Composer.Widget: Avoid confusing xgettext with a verbatim string --- src/client/composer/composer-widget.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala index a420e5d0..176c60df 100644 --- a/src/client/composer/composer-widget.vala +++ b/src/client/composer/composer-widget.vala @@ -846,7 +846,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface { if (message.has_html_body()) { body = message.get_html_body(null); body_complete = body.contains( - """id="%s"""".printf(WebView.BODY_HTML_ID) + "id=\"%s\"".printf(WebView.BODY_HTML_ID) ); } else { body = message.get_plain_body(true, null); From 193aaa2281d383f3460bd61afa8ef7c9c35bb118 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Tue, 18 Aug 2020 18:09:26 +1000 Subject: [PATCH 3/4] po/POTFILES.in: Add missing plugin source files --- po/POTFILES.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index acc160a3..60434fb5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -114,10 +114,19 @@ src/client/plugin/email-templates/email-templates.plugin.desktop.in src/client/plugin/email-templates/email-templates.vala src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in src/client/plugin/folder-highlight/folder-highlight.vala +src/client/plugin/mail-merge/mail-merge-csv.vala +src/client/plugin/mail-merge/mail-merge-folder.vala +src/client/plugin/mail-merge/mail-merge-processor.vala +src/client/plugin/mail-merge/mail-merge-test-processor.vala +src/client/plugin/mail-merge/mail-merge-test-reader.vala +src/client/plugin/mail-merge/mail-merge-test.vala +src/client/plugin/mail-merge/mail-merge.plugin.desktop.in +src/client/plugin/mail-merge/mail-merge.vala src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in src/client/plugin/messaging-menu/messaging-menu.vala src/client/plugin/notification-badge/notification-badge.plugin.desktop.in src/client/plugin/notification-badge/notification-badge.vala +src/client/plugin/notification-badge/unity-launcher-entry.vala src/client/plugin/sent-sound/sent-sound.plugin.desktop.in src/client/plugin/sent-sound/sent-sound.vala src/client/plugin/special-folders/special-folders.plugin.desktop.in From 462edf7eb8f07014f5f160f49e9e217812f3c05e Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Tue, 18 Aug 2020 18:10:39 +1000 Subject: [PATCH 4/4] src/client/plugins: Reduce translations needed for internal plugins Remove `Description` key from internal plugin desktop files and leave a note about not bothering to translate `Name`, since they will ever be seen. --- .../desktop-notifications.plugin.desktop.in | 3 ++- .../plugin/folder-highlight/folder-highlight.plugin.desktop.in | 3 ++- .../notification-badge/notification-badge.plugin.desktop.in | 3 ++- .../plugin/special-folders/special-folders.plugin.desktop.in | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in index 2019963a..4681890b 100644 --- a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in +++ b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in @@ -1,4 +1,5 @@ [Plugin] Module=desktop-notifications +# Translators: This is an internal plugin so this name does not need +# to be tanslated Name=Desktop Notifications -Description=Displays desktop notifications when new email is delivered diff --git a/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in b/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in index f0ca9f97..5cd8bb37 100644 --- a/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in +++ b/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in @@ -1,4 +1,5 @@ [Plugin] Module=folder-highlight +# Translators: This is an internal plugin so this name does not need +# to be tanslated Name=Folder Highlight -Description=Highlights folders that have newly delivered mail diff --git a/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in b/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in index 55330121..c3b6e89d 100644 --- a/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in +++ b/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in @@ -1,4 +1,5 @@ [Plugin] Module=notification-badge +# Translators: This is an internal plugin so this name does not need +# to be tanslated. Name=Notification Badge -Description=Displays a dock badge showing the number of new messages diff --git a/src/client/plugin/special-folders/special-folders.plugin.desktop.in b/src/client/plugin/special-folders/special-folders.plugin.desktop.in index 4e5e4ff4..901dc045 100644 --- a/src/client/plugin/special-folders/special-folders.plugin.desktop.in +++ b/src/client/plugin/special-folders/special-folders.plugin.desktop.in @@ -1,3 +1,5 @@ [Plugin] Module=special-folders +# Translators: This is an internal plugin so this name does not need +# to be tanslated. Name=Special Folders