Merge branch 'mjog/i18n-fixes-redux' into 'mainline'

I18n fixes redux

See merge request GNOME/geary!548

po/POTFILES.in

@@ -47,6 +47,7 @@ src/client/components/components-inspector.vala
 src/client/components/components-placeholder-pane.vala
 src/client/components/components-preferences-window.vala
 src/client/components/components-problem-report-info-bar.vala
+src/client/components/components-reflow-box.c
 src/client/components/components-search-bar.vala
 src/client/components/components-validator.vala
 src/client/components/count-badge.vala
@@ -108,11 +109,9 @@ src/client/plugin/plugin-info-bar.vala
 src/client/plugin/plugin-notification-extension.vala
 src/client/plugin/plugin-plugin-base.vala
 src/client/plugin/plugin-trusted-extension.vala
-src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
 src/client/plugin/desktop-notifications/desktop-notifications.vala
 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
@@ -124,12 +123,10 @@ 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
 src/client/plugin/special-folders/special-folders.vala
 src/client/sidebar/sidebar-branch.vala
 src/client/sidebar/sidebar-common.vala

po/POTFILES.skip

@@ -1,5 +1,9 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
+_build
 build
-src/client/components/components-reflow-box.c
-subprojects/libhandy
+src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
+src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
+src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
+src/client/plugin/special-folders/special-folders.plugin.desktop.in
+subprojects

src/client/application/application-plugin-manager.vala

@@ -12,7 +12,9 @@ public class Application.PluginManager : GLib.Object {
 
 
     // Plugins that will be loaded automatically when the client
-    // application stats up
+    // application stats up and hence hidden in the UI. Note that the
+    // .plugin files for these should be listed in po/POTFILES.skip,
+    // so translators don't need to bother with them.
     private const string[] AUTOLOAD_MODULES = {
         "desktop-notifications",
         "folder-highlight",

src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in

@@ -1,5 +1,3 @@
 [Plugin]
 Module=desktop-notifications
-# Translators: This is an internal plugin so this name does not need
-# to be tanslated
 Name=Desktop Notifications

src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in

@@ -1,5 +1,3 @@
 [Plugin]
 Module=folder-highlight
-# Translators: This is an internal plugin so this name does not need
-# to be tanslated
 Name=Folder Highlight

src/client/plugin/notification-badge/notification-badge.plugin.desktop.in

@@ -1,5 +1,3 @@
 [Plugin]
 Module=notification-badge
-# Translators: This is an internal plugin so this name does not need
-# to be tanslated.
 Name=Notification Badge

src/client/plugin/special-folders/special-folders.plugin.desktop.in

@@ -1,5 +1,3 @@
 [Plugin]
 Module=special-folders
-# Translators: This is an internal plugin so this name does not need
-# to be tanslated.
 Name=Special Folders