GNOME.org
 

[geary/gnumdk/build] Test build


commit edf10b4c9d47d6e6eaca17bbd0897d59146aeebd
Author: Cédric Bellegarde <cedric bellegarde adishatz org>
Date:   Sun Jul 24 19:45:33 2022 +0200

    Test build

 po/de.po                                           | 106 +++++++--------------
 src/engine/api/geary-endpoint.vala                 |   7 --
 src/engine/imap/api/imap-client-service.vala       |   2 +-
 src/engine/imap/api/imap-session-object.vala       |   9 +-
 src/engine/imap/transport/imap-client-session.vala |   3 +-
 5 files changed, 42 insertions(+), 85 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index 23620c23c..39a65ba48 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,22 +17,21 @@
 # Tim Sabsch <tim sabsch com>, 2019-2020.
 # Viktor Illmer <mail viktor im>, 2021.
 # Philipp Kiemle <philipp kiemle gmail com>, 2021.
-# Jürgen Benvenuti <gastornis posteo org>, 2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2022-07-10 11:17+0000\n"
-"PO-Revision-Date: 2022-07-11 21:38+0200\n"
-"Last-Translator: Jürgen Benvenuti <gastornis posteo org>\n"
+"POT-Creation-Date: 2021-05-31 11:16+0000\n"
+"PO-Revision-Date: 2021-06-02 08:17+0200\n"
+"Last-Translator: Philipp Kiemle <philipp kiemle gmail com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -136,11 +135,11 @@ msgstr "Geary zeigt den Editor für formatierten Text"
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-Mail;IMAP;GMail;Yahoo;Hotmail;Outlook;Post;Email;Brief;"
 
-#: desktop/org.gnome.Geary.desktop.in.in:23
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: desktop/org.gnome.Geary.desktop.in.in:27
+#: desktop/org.gnome.Geary.desktop.in.in:26
 msgid "New Window"
 msgstr "Neues Fenster"
 
@@ -288,18 +287,10 @@ msgid "The last recorded size of the detached composer window."
 msgstr "Die zuletzt gespeicherte Größe des abgekoppelten Verfassen-Fensters."
 
 #: desktop/org.gnome.Geary.gschema.xml:102
-msgid "Allow images for these domains"
-msgstr "Bilder für diese Domänen zulassen"
-
-#: desktop/org.gnome.Geary.gschema.xml:103
-msgid "Images from these domains will be trusted"
-msgstr "Bildern von diesen Domänen wird vertraut"
-
-#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Undo sending email delay"
 msgstr "Verzögerung bis zum E-Mail-Versand"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -307,29 +298,29 @@ msgstr ""
 "Die Anzahl an Sekunden, die gewartet wird, bis eine E-Mail versandt wird. "
 "Deaktiviert bei Werten kleiner oder gleich 0."
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "Brief notification display time"
 msgstr "Anzeigedauer von Kurzbenachrichtigungen"
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:110
 msgid ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
 msgstr "Die Dauer in Sekunden, in der Kurzbenachrichtigungen angezeigt werden."
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:116
 msgid "List of optional plugins"
 msgstr "Liste optionaler Plug-ins"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:117
 msgid "Plugins listed here will be loaded on startup."
 msgstr "Die hier angezeigten Plug-ins werden beim Anwendungsstart geladen."
 
-#: desktop/org.gnome.Geary.gschema.xml:128
+#: desktop/org.gnome.Geary.gschema.xml:122
 msgid "Whether we migrated the old settings"
 msgstr "Alte Einstellungen migrieren"
 
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -832,6 +823,7 @@ msgid "_Replace"
 msgstr "_Ersetzen"
 
 #: src/client/application/application-client.vala:34
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgid "Copyright © 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright © 2016 Software Freedom Conservancy Inc."
 
@@ -987,8 +979,7 @@ msgstr ""
 "Mario Blättermann <mario blaettermann gmail com>\n"
 "Tim Sabsch <tim sabsch com>\n"
 "Viktor Illmer <mail viktor im>\n"
-"Philipp Kiemle <philipp kiemle gmail com>\n"
-"Jürgen Benvenuti <gastornis posteo org>"
+"Philipp Kiemle <philipp kiemle gmail com>"
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
@@ -1459,18 +1450,13 @@ msgstr "Im ge_schlossenen Zustand auf neue E-Mails prüfen"
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary wird weiter ausgeführt, nachdem alle Fenster geschlossen wurden"
 
-#. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:171
-msgid "_Always load images"
-msgstr "_Bilder immer anzeigen"
-
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:189
+#: src/client/components/components-preferences-window.vala:178
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:252
+#: src/client/components/components-preferences-window.vala:234
 msgid "Plugins"
 msgstr "Plug-ins"
 
@@ -1932,14 +1918,14 @@ msgstr "Datum:"
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: src/client/conversation-viewer/conversation-message.vala:131
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Diese E-Mail-Adresse könnte gefälscht sein"
 
 #. Translators: Label text displayed when there are too
 #. many email addresses to be shown by default in an
 #. email's header, but they are all being shown anyway.
-#: src/client/conversation-viewer/conversation-message.vala:237
+#: src/client/conversation-viewer/conversation-message.vala:234
 msgid "Show less"
 msgstr "Weniger anzeigen"
 
@@ -1947,7 +1933,7 @@ msgstr "Weniger anzeigen"
 #. too many email addresses to be shown by default in
 #. an email's header. The string substitution is the
 #. number of extra email to be shown.
-#: src/client/conversation-viewer/conversation-message.vala:263
+#: src/client/conversation-viewer/conversation-message.vala:260
 #, c-format
 msgid "%d more…"
 msgid_plural "%d more…"
@@ -1958,53 +1944,52 @@ msgstr[1] "%d weitere …"
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:550
+#: src/client/conversation-viewer/conversation-message.vala:533
 msgid "No sender"
 msgstr "Kein Absender"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:1032
+#: src/client/conversation-viewer/conversation-message.vala:1011
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:1154
+#: src/client/conversation-viewer/conversation-message.vala:1133
 msgid "Image"
 msgstr "Bild"
 
-#: src/client/conversation-viewer/conversation-message.vala:1363
-#: src/client/conversation-viewer/conversation-message.vala:1369
+#: src/client/conversation-viewer/conversation-message.vala:1341
+#: src/client/conversation-viewer/conversation-message.vala:1347
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
 # habe aus fuer remote aus "entfernt" "extern gemacht, da entfernt auch ein Synonym fuer geloescht, also von 
der Nachricht entfernte Bilder sein kann.
 #. Translators: Info bar status message
-#: src/client/conversation-viewer/conversation-message.vala:1422
-#: src/client/conversation-viewer/conversation-message.vala:1442
+#: src/client/conversation-viewer/conversation-message.vala:1396
 msgid "Remote images not shown"
 msgstr "Externe Bilder werden nicht angezeigt"
 
 # Das ist eine Aufforderung an den Nutzer, im Sinne eines Tipps.
 # Siehe https://i.imgur.com/8ioIrG4.png
 #. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1424
+#: src/client/conversation-viewer/conversation-message.vala:1398
 msgid "Only show remote images from senders you trust."
 msgstr ""
 "Lassen Sie externe Bilder nur von Absendern anzeigen, denen Sie vertrauen."
 
-#. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1444
-msgid "This message can't be trusted."
-msgstr "Dieser Nachricht kann nicht vertraut werden."
-
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1448
+#: src/client/conversation-viewer/conversation-message.vala:1402
 msgid "Show"
 msgstr "Anzeigen"
 
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1406
+msgid "Always show from sender"
+msgstr "Von diesem Absender immer anzeigen"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:84
@@ -2847,18 +2832,18 @@ msgstr "Gelöschte Objekte"
 msgid "Archive | Archives"
 msgstr "Archiv | Archive | Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:572
+#: src/engine/rfc822/rfc822-message.vala:551
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "MIME-Type für »%s« konnte nicht ermittelt werden."
 
-#: src/engine/rfc822/rfc822-message.vala:583
+#: src/engine/rfc822/rfc822-message.vala:562
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 "Content-Type für MIME-Type »%s« auf »%s« konnte nicht ermittelt werden."
 
-#: src/engine/rfc822/rfc822-message.vala:1036
+#: src/engine/rfc822/rfc822-message.vala:1015
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
@@ -3411,22 +3396,6 @@ msgstr "_Bild speichern unter …"
 msgid "_Select All"
 msgstr "Alles _auswählen"
 
-#: ui/conversation-message-menus.ui:50
-msgid "Show images"
-msgstr "Bilder anzeigen"
-
-#: ui/conversation-message-menus.ui:52
-msgid "For this message"
-msgstr "Für diese Nachricht"
-
-#: ui/conversation-message-menus.ui:56
-msgid "For this sender"
-msgstr "Für diesen Absender"
-
-#: ui/conversation-message-menus.ui:60
-msgid "For this domain"
-msgstr "Für diese Domäne"
-
 #: ui/conversation-message.ui:54
 msgid "From <email>"
 msgstr "Von <email>"
@@ -3800,9 +3769,6 @@ msgstr "_Passwort speichern"
 msgid "_Authenticate"
 msgstr "_Legitimieren"
 
-#~ msgid "Always show from sender"
-#~ msgstr "Von diesem Absender immer anzeigen"
-
 #~ msgid "Position of folder list pane"
 #~ msgstr "Position der Ordnerliste"
 
diff --git a/src/engine/api/geary-endpoint.vala b/src/engine/api/geary-endpoint.vala
index f986ed613..0e706e50f 100644
--- a/src/engine/api/geary-endpoint.vala
+++ b/src/engine/api/geary-endpoint.vala
@@ -66,11 +66,6 @@ public class Geary.Endpoint : BaseObject {
     /** Transport security method to use when connecting. */
     public TlsNegotiationMethod tls_method { get; private set; }
 
-    /** Transport security certificate validation requirements. */
-    public TlsCertificateFlags tls_validation_flags {
-        get; set; default = TlsCertificateFlags.VALIDATE_ALL;
-    }
-
     /**
      * When set, TLS has reported certificate issues.
      *
@@ -172,7 +167,6 @@ public class Geary.Endpoint : BaseObject {
 
         if (this.tls_method == TlsNegotiationMethod.TRANSPORT) {
             socket_client.set_tls(true);
-            socket_client.set_tls_validation_flags(tls_validation_flags);
             socket_client.event.connect(on_socket_client_event);
         }
 
@@ -185,7 +179,6 @@ public class Geary.Endpoint : BaseObject {
         // Setting this on Ubuntu 18.04 breaks some TLS
         // connections. See issue #217.
         // tls_cx.server_identity = this.remote;
-        tls_cx.validation_flags = this.tls_validation_flags;
         if (Endpoint.default_tls_database != null) {
             tls_cx.set_database(Endpoint.default_tls_database);
         }
diff --git a/src/engine/imap/api/imap-client-service.vala b/src/engine/imap/api/imap-client-service.vala
index fe534b498..da3598f38 100644
--- a/src/engine/imap/api/imap-client-service.vala
+++ b/src/engine/imap/api/imap-client-service.vala
@@ -558,7 +558,7 @@ public class Geary.Imap.ClientService : Geary.ClientService {
         var session = source as ClientSession;
         if (session != null &&
             session.protocol_state == NOT_CONNECTED &&
-            session.disconnected != ClientSession.DisconnectReason.NULL) {
+            session.disconnected != null) {
             debug(
                 "Session disconnected: %s: %s",
                 session.to_string(),
diff --git a/src/engine/imap/api/imap-session-object.vala b/src/engine/imap/api/imap-session-object.vala
index 24fbf5e67..80695fcaf 100644
--- a/src/engine/imap/api/imap-session-object.vala
+++ b/src/engine/imap/api/imap-session-object.vala
@@ -109,11 +109,10 @@ public abstract class Geary.Imap.SessionObject : BaseObject, Logging.Source {
             // Disconnect reason will null when the session is being
             // logged out but the logout command has not yet been
             // completed.
-            var reason =
-                this.session.disconnected ==
-                    ClientSession.DisconnectReason.NULL ?
-                ClientSession.DisconnectReason.LOCAL_CLOSE :
-                this.session.disconnected;
+            var reason = (
+                this.session.disconnected ??
+                ClientSession.DisconnectReason.LOCAL_CLOSE
+            );
             close();
             disconnected(reason);
         }
diff --git a/src/engine/imap/transport/imap-client-session.vala 
b/src/engine/imap/transport/imap-client-session.vala
index 31aa16afc..9f1eb94e8 100644
--- a/src/engine/imap/transport/imap-client-session.vala
+++ b/src/engine/imap/transport/imap-client-session.vala
@@ -108,7 +108,6 @@ public class Geary.Imap.ClientSession : BaseObject, Logging.Source {
     }
 
     public enum DisconnectReason {
-        NULL,
         LOCAL_CLOSE,
         LOCAL_ERROR,
         REMOTE_CLOSE,
@@ -278,7 +277,7 @@ public class Geary.Imap.ClientSession : BaseObject, Logging.Source {
     }
 
     /** Specifies the reason the session was disconnected, if any. */
-    public DisconnectReason disconnected { get; private set; default = NULL; }
+    public DisconnectReason? disconnected { get; private set; default = null; }
 
     /**
      * Set of IMAP extensions reported as being supported by the server.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]