[evolution-ews/wip/mcrha/office365] s/Office 365/Microsoft 365/ in user-visible strings and some comments

[Milan Crha <mcrha src gnome org>]

commit 0b5803e5a0e29d920f7632cb34842bbd60bb1518
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jul 15 18:34:16 2020 +0200

    s/Office 365/Microsoft 365/ in user-visible strings and some comments

 src/Office365/addressbook/e-book-backend-o365.c      | 2 +-
 src/Office365/calendar/e-cal-backend-o365.c          | 2 +-
 src/Office365/camel/camel-o365-folder.c              | 2 +-
 src/Office365/camel/camel-o365-provider.c            | 4 ++--
 src/Office365/camel/camel-o365-store.c               | 6 +++---
 src/Office365/camel/camel-o365-transport.c           | 6 +++---
 src/Office365/common/e-o365-connection.c             | 8 ++++----
 src/Office365/evolution/e-mail-config-o365-backend.c | 6 +++---
 8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/Office365/addressbook/e-book-backend-o365.c b/src/Office365/addressbook/e-book-backend-o365.c
index 1b127c13..e55c157a 100644
--- a/src/Office365/addressbook/e-book-backend-o365.c
+++ b/src/Office365/addressbook/e-book-backend-o365.c
@@ -1682,7 +1682,7 @@ ebb_o365_save_contact_sync (EBookMetaBackend *meta_backend,
        g_return_val_if_fail (out_new_extra != NULL, FALSE);
 
        if (GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_IS_LIST))) {
-               g_propagate_error (error, EC_ERROR_EX (E_CLIENT_ERROR_NOT_SUPPORTED, _("Cannot save contact 
list into an Office 365 address book")));
+               g_propagate_error (error, EC_ERROR_EX (E_CLIENT_ERROR_NOT_SUPPORTED, _("Cannot save contact 
list into a Microsoft 365 address book")));
                return FALSE;
        }
 
diff --git a/src/Office365/calendar/e-cal-backend-o365.c b/src/Office365/calendar/e-cal-backend-o365.c
index f130ac37..74442e00 100644
--- a/src/Office365/calendar/e-cal-backend-o365.c
+++ b/src/Office365/calendar/e-cal-backend-o365.c
@@ -335,7 +335,7 @@ ecb_o365_get_backend_property (ECalBackend *cal_backend,
 
                return camel_o365_settings_dup_email (o365_settings);
        } else if (g_str_equal (prop_name, E_CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS)) {
-               /* Office 365 does not support email based alarms */
+               /* Microsoft 365 does not support email based alarms */
                return NULL;
        }
 
diff --git a/src/Office365/camel/camel-o365-folder.c b/src/Office365/camel/camel-o365-folder.c
index 48ea5b94..be7ed661 100644
--- a/src/Office365/camel/camel-o365-folder.c
+++ b/src/Office365/camel/camel-o365-folder.c
@@ -641,7 +641,7 @@ o365_folder_append_message_sync (CamelFolder *folder,
        return success;
 #else
        g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-               _("Cannot add messages into an Office 365 account from another account. Only messages from 
the same account can be moved/copied between the Office 365 folders."));
+               _("Cannot add messages into an Microsoft 365 account from another account. Only messages from 
the same account can be moved/copied between the Microsoft 365 folders."));
        return FALSE;
 #endif
 }
diff --git a/src/Office365/camel/camel-o365-provider.c b/src/Office365/camel/camel-o365-provider.c
index 4d42af0f..72864f05 100644
--- a/src/Office365/camel/camel-o365-provider.c
+++ b/src/Office365/camel/camel-o365-provider.c
@@ -64,9 +64,9 @@ static CamelProviderConfEntry o365_conf_entries[] = {
 
 static CamelProvider o365_provider = {
        "office365",
-       N_("Office 365"),
+       N_("Microsoft 365"),
 
-       N_("For accessing Microsoft Office 365 server"),
+       N_("For accessing Microsoft 365 server"),
 
        "mail",
 
diff --git a/src/Office365/camel/camel-o365-store.c b/src/Office365/camel/camel-o365-store.c
index acae3c8b..05a90005 100644
--- a/src/Office365/camel/camel-o365-store.c
+++ b/src/Office365/camel/camel-o365-store.c
@@ -151,9 +151,9 @@ o365_store_get_name (CamelService *service,
        gchar *name;
 
        if (brief)
-               name = g_strdup (_("Office 365 server"));
+               name = g_strdup (_("Microsoft 365 server"));
        else
-               name = g_strdup (_("Mail receive via Microsoft Office 365"));
+               name = g_strdup (_("Mail receive via Microsoft 365"));
 
        return name;
 }
@@ -541,7 +541,7 @@ o365_store_connect_sync (CamelService *service,
 
                if (success) {
                        camel_session_submit_job (
-                               session, _("Look up Office 365 categories"),
+                               session, _("Look up Microsoft 365 categories"),
                                o365_store_get_categories_cb,
                                g_object_ref (o365_store),
                                g_object_unref);
diff --git a/src/Office365/camel/camel-o365-transport.c b/src/Office365/camel/camel-o365-transport.c
index 5be5359f..61c4f4eb 100644
--- a/src/Office365/camel/camel-o365-transport.c
+++ b/src/Office365/camel/camel-o365-transport.c
@@ -265,9 +265,9 @@ o365_transport_get_name (CamelService *service,
        gchar *name;
 
        if (brief)
-               name = g_strdup (_("Office 365 server"));
+               name = g_strdup (_("Microsoft 365 server"));
        else
-               name = g_strdup (_("Mail delivery via Microsoft Office 365"));
+               name = g_strdup (_("Mail delivery via Microsoft 365"));
 
        return name;
 }
@@ -305,7 +305,7 @@ o365_send_to_sync (CamelTransport *transport,
        } else if (camel_address_length (CAMEL_ADDRESS (use_from)) > 1) {
                g_set_error_literal (
                        error, CAMEL_ERROR, CAMEL_ERROR_GENERIC,
-                       _("Office 365 server cannot send message with multiple From addresses"));
+                       _("Microsoft 365 server cannot send message with multiple From addresses"));
                return FALSE;
 
        } else {
diff --git a/src/Office365/common/e-o365-connection.c b/src/Office365/common/e-o365-connection.c
index 9c9570e1..8fb7d8f6 100644
--- a/src/Office365/common/e-o365-connection.c
+++ b/src/Office365/common/e-o365-connection.c
@@ -1181,14 +1181,14 @@ o365_connection_send_request_sync (EO365Connection *cnc,
                                if (left_minutes > 0) {
                                        camel_operation_push_message (cancellable,
                                                g_dngettext (GETTEXT_PACKAGE,
-                                                       "Office 365 server is busy, waiting to retry (%d:%02d 
minute)",
-                                                       "Office 365 server is busy, waiting to retry (%d:%02d 
minutes)", left_minutes),
+                                                       "Microsoft 365 server is busy, waiting to retry 
(%d:%02d minute)",
+                                                       "Microsoft 365 server is busy, waiting to retry 
(%d:%02d minutes)", left_minutes),
                                                left_minutes, left_seconds);
                                } else {
                                        camel_operation_push_message (cancellable,
                                                g_dngettext (GETTEXT_PACKAGE,
-                                                       "Office 365 server is busy, waiting to retry (%d 
second)",
-                                                       "Office 365 server is busy, waiting to retry (%d 
seconds)", left_seconds),
+                                                       "Microsoft 365 server is busy, waiting to retry (%d 
second)",
+                                                       "Microsoft 365 server is busy, waiting to retry (%d 
seconds)", left_seconds),
                                                left_seconds);
                                }
 
diff --git a/src/Office365/evolution/e-mail-config-o365-backend.c 
b/src/Office365/evolution/e-mail-config-o365-backend.c
index 5045758f..2c627e39 100644
--- a/src/Office365/evolution/e-mail-config-o365-backend.c
+++ b/src/Office365/evolution/e-mail-config-o365-backend.c
@@ -213,7 +213,7 @@ mail_config_o365_backend_insert_widgets (EMailConfigServiceBackend *backend,
        gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
        g_free (markup);
 
-       /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or organization in 
an Office 365 world.
+       /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or organization in 
a Microsoft 365 world.
           You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
        widget = gtk_label_new_with_mnemonic (_("_Tenant:"));
        gtk_widget_set_margin_left (widget, 12);
@@ -238,10 +238,10 @@ mail_config_o365_backend_insert_widgets (EMailConfigServiceBackend *backend,
                G_BINDING_SYNC_CREATE);
 
        mail_config_o365_backend_set_oauth2_tooltip (widget, OFFICE365_TENANT,
-               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in an Office 365 world. Same for 'common', it's a default URL path.
+               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in a Microsoft 365 world. Same for 'common', it's a default URL path.
                   You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
                _("Default tenant is “common“"),
-               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in an Office 365 world.
+               /* Translators: 'Tenant' here means a term used by Microsoft to identify a company or 
organization in a Microsoft 365 world.
                   You probably do not want to translate it. More for example here: 
https://powerbi.microsoft.com/en-us/blog/what-is-a-tenant/ */
                g_strdup_printf (_("Default tenant is “%s”"), OFFICE365_TENANT));