[evolution-data-server] Bug 774522 - Translator comments are missing in the .pot/.po files



commit 4f210b94b9ca5035e77a788ab08399ddf1d44b14
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Mon Nov 21 11:16:43 2016 +0100

    Bug 774522 - Translator comments are missing in the .pot/.po files

 .../backends/ldap/e-book-backend-ldap.c            |    4 +-
 src/camel/camel-folder.c                           |   18 ++++----
 src/camel/providers/imapx/camel-imapx-store.c      |   10 ++--
 src/camel/providers/local/camel-local-folder.c     |   40 ++++++++++----------
 src/camel/providers/pop3/camel-pop3-store.c        |    2 +-
 5 files changed, 36 insertions(+), 38 deletions(-)
---
diff --git a/src/addressbook/backends/ldap/e-book-backend-ldap.c 
b/src/addressbook/backends/ldap/e-book-backend-ldap.c
index 2940c42..9f49d25 100644
--- a/src/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/src/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -107,9 +107,7 @@ typedef struct LDAPOp LDAPOp;
        (e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, _msg))
 /* Translators: An error message shown to a user when trying to do an
  * operation on the LDAP address book which is not connected to the server */
-#define EDB_ERROR_NOT_CONNECTED() \
-       (e_data_book_create_error ( \
-       E_DATA_BOOK_STATUS_OTHER_ERROR, _("Not connected")))
+#define EDB_ERROR_NOT_CONNECTED() (e_data_book_create_error (E_DATA_BOOK_STATUS_OTHER_ERROR, _("Not 
connected")))
 #define EDB_ERROR_MSG_TYPE(_msg_type) \
        (e_data_book_create_error_fmt ( \
        E_DATA_BOOK_STATUS_INVALID_ARG, \
diff --git a/src/camel/camel-folder.c b/src/camel/camel-folder.c
index 87bb683..e4edc5c 100644
--- a/src/camel/camel-folder.c
+++ b/src/camel/camel-folder.c
@@ -320,11 +320,11 @@ folder_filter (CamelSession *session,
        if (data->junk) {
                gboolean success = TRUE;
 
-               /* Translators: The first '%s' is replaced with an account name and the second '%s'
-                  is replaced with a full path name. The spaces around ':' are intentional, as
-                  the whole '%s : %s' is meant as an absolute identification of the folder. */
                camel_operation_push_message (
                        cancellable, dngettext (GETTEXT_PACKAGE,
+                       /* Translators: The first '%s' is replaced with an account name and the second '%s'
+                          is replaced with a full path name. The spaces around ':' are intentional, as
+                          the whole '%s : %s' is meant as an absolute identification of the folder. */
                        "Learning new spam message in '%s : %s'",
                        "Learning new spam messages in '%s : %s'",
                        data->junk->len),
@@ -363,11 +363,11 @@ folder_filter (CamelSession *session,
        if (data->notjunk) {
                gboolean success = TRUE;
 
-               /* Translators: The first '%s' is replaced with an account name and the second '%s'
-                  is replaced with a full path name. The spaces around ':' are intentional, as
-                  the whole '%s : %s' is meant as an absolute identification of the folder. */
                camel_operation_push_message (
                        cancellable, dngettext (GETTEXT_PACKAGE,
+                       /* Translators: The first '%s' is replaced with an account name and the second '%s'
+                          is replaced with a full path name. The spaces around ':' are intentional, as
+                          the whole '%s : %s' is meant as an absolute identification of the folder. */
                        "Learning new ham message in '%s : %s'",
                        "Learning new ham messages in '%s : %s'",
                        data->notjunk->len),
@@ -414,11 +414,11 @@ folder_filter (CamelSession *session,
                CamelService *service;
                const gchar *store_uid;
 
-               /* Translators: The first '%s' is replaced with an account name and the second '%s'
-                  is replaced with a full path name. The spaces around ':' are intentional, as
-                  the whole '%s : %s' is meant as an absolute identification of the folder. */
                camel_operation_push_message (
                        cancellable, dngettext (GETTEXT_PACKAGE,
+                       /* Translators: The first '%s' is replaced with an account name and the second '%s'
+                          is replaced with a full path name. The spaces around ':' are intentional, as
+                          the whole '%s : %s' is meant as an absolute identification of the folder. */
                        "Filtering new message in '%s : %s'",
                        "Filtering new messages in '%s : %s'",
                        data->recents->len),
diff --git a/src/camel/providers/imapx/camel-imapx-store.c b/src/camel/providers/imapx/camel-imapx-store.c
index a76d7ec..5de344c 100644
--- a/src/camel/providers/imapx/camel-imapx-store.c
+++ b/src/camel/providers/imapx/camel-imapx-store.c
@@ -2501,12 +2501,12 @@ imapx_initial_setup_sync (CamelStore *store,
                          GCancellable *cancellable,
                          GError **error)
 {
-       /* Translators: The strings in "IMAPDefaults" context are folder names as can be presented
-          by the server; There's checked for the localized version of it and for the non-localized
-          version as well. It's always the folder name (eventually path) as provided by the server,
-          when returned in given localization. it can be checked semi-easily in the case of
-          the GMail variants, by changing the GMail interface language in the GMail Preferences. */
        const gchar *draft_names[] = {
+               /* Translators: The strings in "IMAPDefaults" context are folder names as can be presented
+                  by the server; There's checked for the localized version of it and for the non-localized
+                  version as well. It's always the folder name (eventually path) as provided by the server,
+                  when returned in given localization. it can be checked semi-easily in the case of
+                  the GMail variants, by changing the GMail interface language in the GMail Preferences. */
                NC_("IMAPDefaults", "[Gmail]/Drafts"),
                NC_("IMAPDefaults", "Drafts"),
                NC_("IMAPDefaults", "Draft")
diff --git a/src/camel/providers/local/camel-local-folder.c b/src/camel/providers/local/camel-local-folder.c
index e978aa1..6666b3d 100644
--- a/src/camel/providers/local/camel-local-folder.c
+++ b/src/camel/providers/local/camel-local-folder.c
@@ -179,39 +179,39 @@ local_folder_constructed (GObject *object)
        path = g_strdup_printf ("%s/%s", root_path, full_name);
 
        if ((tmp = getenv ("HOME")) && strncmp (tmp, path, strlen (tmp)) == 0)
-               /* Translators: This is used for a folder description,
-                * for folders being under $HOME.  The first %s is replaced
-                * with a relative path under $HOME, the second %s is
-                * replaced with a protocol name, like mbox/maldir/... */
                description = g_strdup_printf (
+                       /* Translators: This is used for a folder description,
+                        * for folders being under $HOME.  The first %s is replaced
+                        * with a relative path under $HOME, the second %s is
+                        * replaced with a protocol name, like mbox/maldir/... */
                        _("~%s (%s)"),
                        path + strlen (tmp),
                        provider->protocol);
        else if ((tmp = "/var/spool/mail") && strncmp (tmp, path, strlen (tmp)) == 0)
-               /* Translators: This is used for a folder description, for
-                * folders being under /var/spool/mail.  The first %s is
-                * replaced with a relative path under /var/spool/mail,
-                * the second %s is replaced with a protocol name, like
-                * mbox/maldir/... */
                description = g_strdup_printf (
+                       /* Translators: This is used for a folder description, for
+                        * folders being under /var/spool/mail.  The first %s is
+                        * replaced with a relative path under /var/spool/mail,
+                        * the second %s is replaced with a protocol name, like
+                        * mbox/maldir/... */
                        _("mailbox: %s (%s)"),
                        path + strlen (tmp),
                        provider->protocol);
        else if ((tmp = "/var/mail") && strncmp (tmp, path, strlen (tmp)) == 0)
-               /* Translators: This is used for a folder description, for
-                * folders being under /var/mail.  The first %s is replaced
-                * with a relative path under /var/mail, the second %s is
-                * replaced with a protocol name, like mbox/maldir/... */
                description = g_strdup_printf (
+                       /* Translators: This is used for a folder description, for
+                        * folders being under /var/mail.  The first %s is replaced
+                        * with a relative path under /var/mail, the second %s is
+                        * replaced with a protocol name, like mbox/maldir/... */
                        _("mailbox: %s (%s)"),
                        path + strlen (tmp),
                        provider->protocol);
        else
-               /* Translators: This is used for a folder description.
-                * The first %s is replaced with a folder's full path,
-                * the second %s is replaced with a protocol name, like
-                * mbox/maldir/... */
                description = g_strdup_printf (
+                       /* Translators: This is used for a folder description.
+                        * The first %s is replaced with a folder's full path,
+                        * the second %s is replaced with a protocol name, like
+                        * mbox/maldir/... */
                        _("%s (%s)"), path,
                        provider->protocol);
 
@@ -729,11 +729,11 @@ set_cannot_get_message_ex (GError **error,
                            const gchar *folder_path,
                            const gchar *detailErr)
 {
-       /* Translators: The first %s is replaced with a message ID,
-        * the second %s is replaced with the folder path,
-        * the third %s is replaced with a detailed error string */
        g_set_error (
                error, CAMEL_ERROR, err_code,
+               /* Translators: The first %s is replaced with a message ID,
+                * the second %s is replaced with the folder path,
+                * the third %s is replaced with a detailed error string */
                _("Cannot get message %s from folder %s\n%s"),
                msgID, folder_path, detailErr);
 }
diff --git a/src/camel/providers/pop3/camel-pop3-store.c b/src/camel/providers/pop3/camel-pop3-store.c
index 7d92847..789b2aa 100644
--- a/src/camel/providers/pop3/camel-pop3-store.c
+++ b/src/camel/providers/pop3/camel-pop3-store.c
@@ -733,10 +733,10 @@ pop3_store_authenticate_sync (CamelService *service,
                while (*d != '\0') {
                        if (!isascii ((gint) * d)) {
 
-                               /* Translators: Do not translate APOP. */
                                g_set_error (
                                        error, CAMEL_SERVICE_ERROR,
                                        CAMEL_SERVICE_ERROR_URL_INVALID,
+                                       /* Translators: Do not translate APOP. */
                                        _("Unable to connect to POP server %s:  "
                                        "Invalid APOP ID received. Impersonation "
                                        "attack suspected. Please contact your admin."),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]