Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Remove demandimport
by Yann Leboulanger 09 Dec '16

09 Dec '16

Yann Leboulanger pushed to branch master at gajim / gajim Commits: fc0be965 by Philipp Hörist at 2016-12-09T18:19:39+01:00 Remove demandimport - - - - - deab82aa by Philipp Hörist at 2016-12-09T18:32:35+01:00 Merge branch 'master' into 'master' Master See merge request !1 - - - - - 1 changed file: - src/gajim.py Changes: ===================================== src/gajim.py ===================================== --- a/src/gajim.py +++ b/src/gajim.py @@ -74,14 +74,6 @@ if not HAS_NBXMPP: print('Gajim needs python-nbxmpp >= %s to run. Quiting...' % MIN_NBXMPP_VER) sys.exit() -#from common import demandimport -#demandimport.enable() -#demandimport.ignore += ['GObject._gobject', 'libasyncns', 'i18n', -# 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', -# 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', -# 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'monotonic', -# 'gtkexcepthook', 'libxml2', 'libxml2mod'] - if os.name == 'nt': import locale import gettext View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/acc5baf3537cae1ac8e60ef18e04e2810…

1 0

gajim: fix time.time() call. Fixes #8446
by Gajim 28 Nov '16

28 Nov '16

changeset a970f1150535 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a970f1150535 description: fix time.time() call. Fixes #8446 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 4504e98bd824 -r a970f1150535 src/common/connection.py --- a/src/common/connection.py Mon Nov 28 21:52:40 2016 +0100 +++ b/src/common/connection.py Mon Nov 28 22:23:42 2016 +0100 @@ -1632,7 +1632,7 @@ iq.addChild(name='ping', namespace=nbxmpp.NS_PING) iq.setID(id_) def _on_response(resp): - timePong = time_time() + timePong = time.time() if not nbxmpp.isResultNode(resp): gajim.nec.push_incoming_event(PingErrorEvent(None, conn=self, contact=pingTo)) @@ -1641,7 +1641,7 @@ gajim.nec.push_incoming_event(PingReplyEvent(None, conn=self, contact=pingTo, seconds=timeDiff, control=control)) if pingTo: - timePing = time_time() + timePing = time.time() self.connection.SendAndCallForResponse(iq, _on_response) else: self.connection.SendAndCallForResponse(iq, self._on_xmpp_ping_answer)

1 0

gajim: prevent too long tooltips. Fixes #8465
by Gajim 28 Nov '16

28 Nov '16

changeset 4504e98bd824 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4504e98bd824 description: prevent too long tooltips. Fixes #8465 diffstat: src/htmltextview.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 81a6a0e863df -r 4504e98bd824 src/htmltextview.py --- a/src/htmltextview.py Mon Nov 28 21:09:40 2016 +0100 +++ b/src/htmltextview.py Mon Nov 28 21:52:40 2016 +0100 @@ -913,6 +913,8 @@ return text = getattr(tag, 'title', False) if text: + if len(text) > 50: + text = text[:47] + '...' position = w.get_origin()[1:] self.tooltip.show_tooltip(text, 8, position[1] + y)

1 0

gajim: fix time.time() call. Fixes #8446
by Gajim 28 Nov '16

28 Nov '16

changeset 03333a1fa037 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=03333a1fa037 description: fix time.time() call. Fixes #8446 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r fdb759b05f8b -r 03333a1fa037 src/common/connection.py --- a/src/common/connection.py Mon Nov 28 21:52:40 2016 +0100 +++ b/src/common/connection.py Mon Nov 28 22:23:42 2016 +0100 @@ -1622,7 +1622,7 @@ iq.addChild(name='ping', namespace=nbxmpp.NS_PING) iq.setID(id_) def _on_response(resp): - timePong = time_time() + timePong = time.time() if not nbxmpp.isResultNode(resp): gajim.nec.push_incoming_event(PingErrorEvent(None, conn=self, contact=pingTo)) @@ -1631,7 +1631,7 @@ gajim.nec.push_incoming_event(PingReplyEvent(None, conn=self, contact=pingTo, seconds=timeDiff, control=control)) if pingTo: - timePing = time_time() + timePing = time.time() self.connection.SendAndCallForResponse(iq, _on_response) else: self.connection.SendAndCallForResponse(iq, self._on_xmpp_ping_answer)

1 0

gajim: prevent too long tooltips. Fixes #8465
by Gajim 28 Nov '16

28 Nov '16

changeset fdb759b05f8b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=fdb759b05f8b description: prevent too long tooltips. Fixes #8465 diffstat: src/htmltextview.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 4b8f90033743 -r fdb759b05f8b src/htmltextview.py --- a/src/htmltextview.py Mon Nov 28 21:08:17 2016 +0100 +++ b/src/htmltextview.py Mon Nov 28 21:52:40 2016 +0100 @@ -871,6 +871,8 @@ return text = getattr(tag, 'title', False) if text: + if len(text) > 50: + text = text[:47] + '...' pointer = self.get_pointer() position = self.window.get_origin() self.tooltip.show_tooltip(text, 8, position[1] + pointer[1])

1 0

gajim: [SaltyBones] Updated German translation
by Gajim 28 Nov '16

28 Nov '16

changeset 81a6a0e863df in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=81a6a0e863df description: [SaltyBones] Updated German translation diffstat: po/de.po | 10130 ++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 5650 insertions(+), 4480 deletions(-) diffs (truncated from 15397 to 300 lines): diff -r 07eb45273e60 -r 81a6a0e863df po/de.po --- a/po/de.po Mon Nov 28 17:33:12 2016 +0100 +++ b/po/de.po Mon Nov 28 21:09:40 2016 +0100 @@ -7,59 +7,171 @@ # Sebastian Schäfer <sarek(a)uliweb.de>, 2007. # Nico Gulden <cilugnedon(a)gmx.de>, 2007, 2008, 2009, 2010. # Niklas Hambüchen <nh2(a)deditus.de>, 2009. +# Dominik George <nik(a)naturalnet.de>, 2014. msgid "" msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 16:01+0200\n" -"PO-Revision-Date: 2010-08-03 22:43+0200\n" -"Last-Translator: Nico Gulden <cilugnedon(a)gmx.de>\n" +"POT-Creation-Date: 2016-11-28 21:09+0100\n" +"PO-Revision-Date: 2016-11-27 12:58+0100\n" +"Last-Translator: Dominik George <nik(a)naturalnet.de>\n" "Language-Team: German <translators(a)gajim.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: Lokalize 0.2\n" - -#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 -msgid "Join _Group Chat..." -msgstr "_Gruppenchat betreten …" +"X-Generator: Poedit 1.8.7.1\n" + +#: ../data/gui/account_context_menu.ui.h:1 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_Status" #: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_Persönliche Ereignisse" + +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/systray_context_menu.ui.h:2 +msgid "_Start Chat..." +msgstr "_Chat starten …" + +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/systray_context_menu.ui.h:3 +msgid "Join _Group Chat" +msgstr "_Chatraum betreten …" + +#: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "Kont_akt hinzufügen …" -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 +#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "_Dienste durchsuchen" -#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." msgstr "B_efehl ausführen …" -#: ../data/gui/account_context_menu.ui.h:5 -msgid "_Modify Account" -msgstr "Konto _bearbeiten" - -#: ../data/gui/account_context_menu.ui.h:6 +#: ../data/gui/account_context_menu.ui.h:8 msgid "_Open Gmail Inbox" msgstr "Google-Mail-Posteingang _öffnen" -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Personal Events" -msgstr "_Persönliche Ereignisse" - -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 -msgid "_Start Chat..." -msgstr "_Chat starten …" - #: ../data/gui/account_context_menu.ui.h:9 #: ../data/gui/zeroconf_context_menu.ui.h:2 -msgid "_Status" -msgstr "_Status" +msgid "_Modify Account..." +msgstr "_Konto bearbeiten …" #: ../data/gui/account_creation_wizard_window.ui.h:1 +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1247 ../src/config.py:1262 ../src/config.py:1267 +#: ../src/config.py:1315 ../src/config.py:1425 ../src/config.py:1755 +#: ../src/config.py:1760 ../src/config.py:2369 ../src/config.py:2451 +#: ../src/config.py:2466 ../src/config.py:3758 ../src/config.py:3835 +#: ../src/dialogs.py:328 ../src/dialogs.py:330 ../src/dialogs.py:538 +#: ../src/dialogs.py:551 ../src/roster_window.py:3087 +#: ../src/roster_window.py:3093 ../src/roster_window.py:3098 +msgid "None" +msgstr "Kein Proxy" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "Gajim: Account Creation Wizard" +msgstr "Assistent zum Einrichten eines neuen Kontos" + +#: ../data/gui/account_creation_wizard_window.ui.h:3 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n" +"verbinden können." + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I already have an account I want to _use" +msgstr "Ich habe bereits ein Konto, das ich ben_utzen möchte" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "I want to _register for a new account" +msgstr "Ich möchte ein neues Konto _erstellen" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please choose one of the options below:" +msgstr "Bitte wählen Sie eine der Optionen aus:" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +msgid "Please fill in the data for your existing account" +msgstr "Bitte tragen Sie die Daten für Ihr bestehendes Konto ein" + +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:7 +msgid "_Jabber ID:" +msgstr "_Jabber-ID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:10 +msgid "Anon_ymous authentication" +msgstr "Anon_yme Authentifizierung" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:8 +#: ../data/gui/manage_bookmarks_window.ui.h:6 +msgid "_Password:" +msgstr "_Passwort:" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:16 +msgid "Save pass_word" +msgstr "Pass_wort speichern" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:17 +msgid "If checked, Gajim will remember the password for this account" +msgstr "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern." + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +msgid "Please select a server" +msgstr "Bitte einen Server wählen" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +#: ../data/gui/manage_bookmarks_window.ui.h:5 +msgid "_Server:" +msgstr "_Server:" + +#: ../data/gui/account_creation_wizard_window.ui.h:16 +msgid "Prox_y:" +msgstr "Prox_y:" + +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Manage..." +msgstr "Verwalten …" + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +msgid "Use custom hostname/port" +msgstr "Benutzerdefinierten Rechnernamen und Port verwenden" + +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "_Hostname:" +msgstr "Rec_hnername:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +msgid "_Port:" +msgstr "_Port:" + +#: ../data/gui/account_creation_wizard_window.ui.h:21 +#: ../data/gui/roster_window.ui.h:8 +msgid "_Advanced" +msgstr "_Erweitert" + +#: ../data/gui/account_creation_wizard_window.ui.h:22 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n" +"SHA1-Fingerprint dieses Zertifikates:\n" + +#: ../data/gui/account_creation_wizard_window.ui.h:25 msgid "" "Connecting to server\n" "\n" @@ -69,351 +181,52 @@ "\n" "Bitte warten …" -#: ../data/gui/account_creation_wizard_window.ui.h:4 -msgid "Please choose one of the options below:" -msgstr "Bitte wählen Sie eine der Optionen aus:" - -#: ../data/gui/account_creation_wizard_window.ui.h:5 -msgid "Please fill in the data for your existing account" -msgstr "Bitte tragen Sie die Daten für Ihr bestehendes Konto ein" - -#: ../data/gui/account_creation_wizard_window.ui.h:6 -msgid "Please select a server" -msgstr "Bitte einen Server wählen" - -#: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "" -"Add this certificate to the list of trusted certificates.\n" -"SHA1 fingerprint of the certificate:\n" -msgstr "" -"Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n" -"SHA1-Fingerprint dieses Zertifikates:\n" - -#: ../data/gui/account_creation_wizard_window.ui.h:10 -msgid "Anon_ymous authentication" -msgstr "Anon_yme Authentifizierung" - -#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Connect when I press Finish" msgstr "Verbinden, sobald ich auf Fertig klicke" -#: ../data/gui/account_creation_wizard_window.ui.h:12 -msgid "Gajim: Account Creation Wizard" -msgstr "Assistent zum Einrichten eines neuen Kontos" - -#: ../data/gui/account_creation_wizard_window.ui.h:13 -msgid "I already have an account I want to _use" -msgstr "Ich habe bereits ein Konto, das ich ben_utzen möchte" - -#: ../data/gui/account_creation_wizard_window.ui.h:14 -msgid "I want to _register for a new account" -msgstr "Ich möchte ein neues Konto _erstellen" - -#: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 -msgid "If checked, Gajim will remember the password for this account" -msgstr "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern." - -#: ../data/gui/account_creation_wizard_window.ui.h:16 -msgid "Manage..." -msgstr "Verwalten …" - -#: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 -#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353 -#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719 -#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3091 -#: ../src/roster_window.py:3097 ../src/roster_window.py:3102 -msgid "None" -msgstr "Kein Proxy" - -#: ../data/gui/account_creation_wizard_window.ui.h:18 -msgid "Prox_y:" -msgstr "Prox_y:" - -#: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 -msgid "Save pass_word" -msgstr "Pass_wort speichern" - -#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/account_creation_wizard_window.ui.h:29 msgid "Set my profile when I connect" msgstr "Mein Profil setzen, wenn ich mich verbinde" -#: ../data/gui/account_creation_wizard_window.ui.h:21 -msgid "Use custom hostname/port" -msgstr "Benutzerdefinierten Rechnernamen und Port verwenden" - -#: ../data/gui/account_creation_wizard_window.ui.h:22 -msgid "" -"You need to have an account in order to connect\n" -"to the Jabber network." -msgstr "" -"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n" -"verbinden können." - -#: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:17 -msgid "_Advanced" -msgstr "_Erweitert" - -#: ../data/gui/account_creation_wizard_window.ui.h:25 +#: ../data/gui/account_creation_wizard_window.ui.h:30 msgid "_Finish" msgstr "_Beenden"

1 0

gajim: [SaltyBones] Updated German translation
by Gajim 28 Nov '16

28 Nov '16

changeset 4b8f90033743 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4b8f90033743 description: [SaltyBones] Updated German translation diffstat: po/de.po | 3651 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 1919 insertions(+), 1732 deletions(-) diffs (truncated from 8273 to 300 lines): diff -r a7ce6e82a6e6 -r 4b8f90033743 po/de.po --- a/po/de.po Thu Nov 24 22:44:52 2016 +0100 +++ b/po/de.po Mon Nov 28 21:08:17 2016 +0100 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-28 13:07+0100\n" -"PO-Revision-Date: 2010-08-03 22:43+0200\n" +"POT-Creation-Date: 2016-11-28 21:07+0100\n" +"PO-Revision-Date: 2016-11-27 12:58+0100\n" "Last-Translator: Dominik George <nik(a)naturalnet.de>\n" "Language-Team: German <translators(a)gajim.org>\n" "Language: de\n" @@ -21,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Poedit 1.8.7.1\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -186,10 +186,10 @@ #: ../src/config.py:1251 ../src/config.py:1266 ../src/config.py:1271 #: ../src/config.py:1319 ../src/config.py:1422 ../src/config.py:1743 #: ../src/config.py:1748 ../src/config.py:2359 ../src/config.py:2441 -#: ../src/config.py:2456 ../src/config.py:3752 ../src/config.py:3827 +#: ../src/config.py:2456 ../src/config.py:3753 ../src/config.py:3828 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3194 -#: ../src/roster_window.py:3200 ../src/roster_window.py:3205 +#: ../src/dialogs.py:537 ../src/roster_window.py:3212 +#: ../src/roster_window.py:3218 ../src/roster_window.py:3223 msgid "None" msgstr "Kein Proxy" @@ -213,7 +213,7 @@ msgid "Re_name" msgstr "_Umbenennen" -#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4200 +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4201 #: ../src/plugins/gui.py:92 msgid "Active" msgstr "Aktiv" @@ -238,14 +238,13 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1178 -#: ../src/common/helpers.py:1190 ../src/notify.py:316 ../src/notify.py:339 -#: ../src/notify.py:389 ../src/notify.py:405 +#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1197 +#: ../src/common/helpers.py:1209 ../src/notify.py:315 ../src/notify.py:338 +#: ../src/notify.py:388 ../src/notify.py:404 msgid "Gajim" msgstr "Gajim" #: ../data/gui/accounts_window.ui.h:10 -#, fuzzy msgid "Synchronize contacts" msgstr "Kontakte synchronisieren" @@ -302,9 +301,8 @@ msgstr "_Durchsuche" #: ../data/gui/accounts_window.ui.h:26 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Zertifikat abgelehnt" +msgstr "Zertifikat ist _verschlüsselt" #: ../data/gui/accounts_window.ui.h:27 msgid "Client certificate" @@ -336,9 +334,8 @@ msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern" #: ../data/gui/accounts_window.ui.h:33 -#, fuzzy msgid "Synchronize logs with server" -msgstr "Kontakte synchronisieren" +msgstr "Verlauf mit Server synchronisieren" #: ../data/gui/accounts_window.ui.h:34 msgid "Synch_ronize account status with global status" @@ -369,9 +366,9 @@ "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen " -"IP-Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen " -"Dateiübertragung erhöht wird." +"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-" +"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung " +"erhöht wird." #. nick choosen by contact #. FIXME: Ugly workaround. @@ -380,8 +377,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:102 ../src/common/contacts.py:135 -#: ../src/dialogs.py:116 ../src/dialogs.py:128 ../src/roster_window.py:3136 -#: ../src/roster_window.py:4266 ../src/roster_window.py:5914 +#: ../src/dialogs.py:116 ../src/dialogs.py:128 ../src/roster_window.py:3154 +#: ../src/roster_window.py:4289 ../src/roster_window.py:5942 msgid "General" msgstr "Allgemein" @@ -586,7 +583,7 @@ "Sie müssen mit dem Transport verbunden sein, um einen\n" "Kontakt über dieses Protokoll hinzufügen zu können." -#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1376 +#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1395 msgid "I would like to add you to my contact list." msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen." @@ -608,7 +605,6 @@ msgstr "Noch einmal überprüfen" #: ../data/gui/adhoc_commands_window.ui.h:5 -#, fuzzy msgid "Please wait while the command is being sent..." msgstr "Bitte warten Sie, während der Befehl gesendet wird …" @@ -652,9 +648,8 @@ "Kraft treten." #: ../data/gui/advanced_configuration_window.ui.h:5 -#, fuzzy msgid "_Reset to default" -msgstr "Auf Standardfarben zu_rücksetzen" +msgstr "Auf Standard zu_rücksetzen" #: ../data/gui/advanced_menuitem_menu.ui.h:1 msgid "Show _XML Console" @@ -773,7 +768,7 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674 -#: ../src/roster_window.py:5883 ../src/roster_window.py:6017 +#: ../src/roster_window.py:5911 ../src/roster_window.py:6045 msgid "_Unblock" msgstr "_Entblocken" @@ -868,18 +863,16 @@ msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)" #: ../data/gui/chat_control.ui.h:4 -#, fuzzy msgid "View contact information (Ctrl+I)" -msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)" +msgstr "Kontaktinformationen anzeigen (Strg+I)" #: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6 msgid "Browse the chat history (Ctrl+H)" msgstr "Chatverlauf anzeigen (Strg+H)" #: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7 -#, fuzzy msgid "Show advanced functions (Alt+D)" -msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)" +msgstr "Erweiterte Funktionen anzeigen (Alt+D)" #: ../data/gui/chat_control.ui.h:7 msgid "#" @@ -979,8 +972,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5813 -#: ../src/roster_window.py:5984 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5841 +#: ../src/roster_window.py:6012 msgid "In_vite to" msgstr "_Einladen zu" @@ -999,7 +992,7 @@ #. Send Custom Status #: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 -#: ../src/roster_window.py:5824 +#: ../src/roster_window.py:5852 msgid "Send Cus_tom Status" msgstr "Benu_tzerdefinierten Status senden" @@ -1009,18 +1002,17 @@ msgstr "B_efehl ausführen …" #: ../data/gui/contact_context_menu.ui.h:10 -#, fuzzy msgid "M_anage Contact" msgstr "Kontakt _verwalten" #. Rename #: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 -#: ../src/roster_window.py:5864 +#: ../src/roster_window.py:5892 msgid "_Rename..." msgstr "_Umbenennen …" #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:6006 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:6034 msgid "Edit _Groups..." msgstr "_Gruppen bearbeiten …" @@ -1042,23 +1034,20 @@ msgstr "_Abonnement" #: ../data/gui/contact_context_menu.ui.h:17 -#, fuzzy msgid "_Allow contact to see my status" -msgstr "Er_laube diesem Kontakt, meinen Status zu sehen" +msgstr "Diesem Kontakt er_lauben , meinen Status zu sehen" #: ../data/gui/contact_context_menu.ui.h:18 -#, fuzzy msgid "A_sk to see contact status" msgstr "Kontakt darum bitten, seinen Status ein_sehbar zu machen" #: ../data/gui/contact_context_menu.ui.h:19 -#, fuzzy msgid "_Forbid contact to see my status" -msgstr "_Verbiete dem Kontakt, meinen Status zu sehen" +msgstr "Diesem Kontakt _verbieten, meinen Status zu sehen" #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 -#: ../src/roster_window.py:5891 ../src/roster_window.py:6023 +#: ../src/roster_window.py:5919 ../src/roster_window.py:6051 msgid "_Block" msgstr "_Blockieren" @@ -1073,14 +1062,14 @@ #. Remove #. Remove group #: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 -#: ../src/roster_window.py:5901 +#: ../src/roster_window.py:5929 msgid "Remo_ve" msgstr "Ent_fernen" #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6099 +#: ../src/roster_window.py:6127 msgid "_History" msgstr "_Verlauf" @@ -1164,11 +1153,10 @@ msgstr "_Pause" #: ../data/gui/filetransfers.ui.h:12 -#, fuzzy msgid "Cancels the selected file transfer and removes incomplete files" msgstr "" "Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige " -"Datei." +"Datei" #: ../data/gui/filetransfers.ui.h:13 msgid "Cancel file transfer" @@ -1186,7 +1174,7 @@ msgid "_Continue" msgstr "_Fortsetzen" -#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3393 +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3401 #: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "Öffne _Ordner" @@ -1227,11 +1215,11 @@ msgid "Font style:" msgstr "Schriftart:" -#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1041 +#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1047 msgid "Bold" msgstr "Fett" -#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1042 +#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1048 msgid "Italic" msgstr "Kursiv" @@ -1299,7 +1287,7 @@ msgid "_Request Voice" msgstr "Stimme anfo_rdern" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1851 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1850 msgid "_Bookmark" msgstr "Chatraum zu den Lesezeichen _hinzufügen" @@ -1347,7 +1335,7 @@ msgid "_Add to Roster"

1 0

gajim: Fixed c&p error
by Gajim 28 Nov '16

28 Nov '16

changeset 07eb45273e60 in /home/hg/repos/gajim author: SaltyBones branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=07eb45273e60 description: Fixed c&p error diffstat: data/gui/chat_control.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 27dc479797a7 -r 07eb45273e60 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Thu Nov 24 22:44:52 2016 +0100 +++ b/data/gui/chat_control.ui Mon Nov 28 17:33:12 2016 +0100 @@ -102,7 +102,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">4 def</property> + <property name="label" translatable="yes">4 ghi</property> <property name="use_markup">True</property> </object> </child>

1 0

gajim: don't crash when we get a wrong feature negotiation form
by Gajim 24 Nov '16

24 Nov '16

changeset b8382e8e3a57 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b8382e8e3a57 description: don't crash when we get a wrong feature negotiation form diffstat: src/common/connection_handlers_events.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 7dad93b4f1c9 -r b8382e8e3a57 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Nov 21 21:46:59 2016 +0000 +++ b/src/common/connection_handlers_events.py Thu Nov 24 22:42:33 2016 +0100 @@ -1276,6 +1276,9 @@ if not form: return + if not form.getField('FORM_TYPE'): + return + if form['FORM_TYPE'] == 'urn:xmpp:ssn': self.session.handle_negotiation(form) else:

1 0

gajim: fix sending zeroconf messages
by Gajim 24 Nov '16

24 Nov '16

changeset 27dc479797a7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=27dc479797a7 description: fix sending zeroconf messages diffstat: src/common/connection_handlers.py | 7 +++++-- src/common/zeroconf/connection_zeroconf.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (37 lines): diff -r b8382e8e3a57 -r 27dc479797a7 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Nov 24 22:42:33 2016 +0100 +++ b/src/common/connection_handlers.py Thu Nov 24 22:44:52 2016 +0100 @@ -882,6 +882,11 @@ # keep track of sessions this connection has with other JIDs self.sessions = {} + # IDs of sent messages (https://trac.gajim.org/ticket/8222) + self.sent_message_ids = [] + + self.received_message_hashes = [] + # We decrypt GPG messages one after the other. Keep queue in mem self.gpg_messages_to_decrypt = [] @@ -1442,8 +1447,6 @@ # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None - # IDs of sent messages (https://trac.gajim.org/ticket/8222) - self.sent_message_ids = [] try: self.sleeper = common.sleepy.Sleepy() diff -r b8382e8e3a57 -r 27dc479797a7 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Thu Nov 24 22:42:33 2016 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Thu Nov 24 22:44:52 2016 +0100 @@ -343,7 +343,8 @@ def on_send_ok(msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, - chatstate=None)) + automatic_message=obj.automatic_message, chatstate=None, + msg_id=msg_id)) if obj.callback: obj.callback(msg_iq, *obj.callback_args)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits