Commits June 2008

commits@gajim.org

7 participants
141 discussions

[commit-gajim] r9800 - trunk/src
by steve-e＠gajim.org 13 Jun '08

13 Jun '08

Author: steve-e Date: 2008-06-14 00:54:36 +0200 (Sat, 14 Jun 2008) New Revision: 9800 Modified: trunk/src/roster_window.py Log: Do not instantly recalibrate metacontacts when the last online brother signs out. Fixes #3880. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-13 22:47:41 UTC (rev 9799) +++ trunk/src/roster_window.py 2008-06-13 22:54:36 UTC (rev 9800) @@ -550,7 +550,11 @@ # Check if the current BigBrother has even been before. if parent_type == 'contact': - # There is a new big brother + for data in nearby_family: + # recalibrate after remove to keep highlight + if data['jid'] in gajim.to_be_removed[data['account']]: + return + self._remove_metacontact_family(family, account) brothers = self._add_metacontact_family(family, account) @@ -829,6 +833,10 @@ return if jid in gajim.to_be_removed[account]: gajim.to_be_removed[account].remove(jid) + family = gajim.contacts.get_metacontacts_family(account, jid) + if family: + # Peform delayed recalibration + self._recalibrate_metacontact_family(family, account) self.draw_contact(jid, account) #FIXME: integrate into add_contact()

1 0

[commit-gajim] r9799 - trunk/src
by steve-e＠gajim.org 13 Jun '08

13 Jun '08

Author: steve-e Date: 2008-06-14 00:47:41 +0200 (Sat, 14 Jun 2008) New Revision: 9799 Modified: trunk/src/gtkexcepthook.py Log: Show correct URL in bug buddy. Kudos to vArDo :-) Modified: trunk/src/gtkexcepthook.py =================================================================== --- trunk/src/gtkexcepthook.py 2008-06-13 15:59:04 UTC (rev 9798) +++ trunk/src/gtkexcepthook.py 2008-06-13 22:47:41 UTC (rev 9799) @@ -87,7 +87,7 @@ while not close_clicked: resp = dialog.run() if resp == RESPONSE_REPORT_BUG: - url = 'http://trac.gajim.org/wiki/WikiStart#howto_report_ticket' + url = 'http://trac.gajim.org/wiki/HowToCreateATicket' helpers.launch_browser_mailer('url', url) else: close_clicked = True

1 0

[commit-gajim] r9798 - trunk/src/common/zeroconf
by asterix＠gajim.org 13 Jun '08

13 Jun '08

Author: asterix Date: 2008-06-13 17:59:04 +0200 (Fri, 13 Jun 2008) New Revision: 9798 Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py Log: fix number of parameters to session.receives in zeroconf. Fixes #4015 Modified: trunk/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-06-13 15:41:47 UTC (rev 9797) +++ trunk/src/common/zeroconf/connection_handlers_zeroconf.py 2008-06-13 15:59:04 UTC (rev 9798) @@ -460,7 +460,7 @@ else: # XXX this shouldn't be hardcoded if isinstance(session, ChatControlSession): - session.received(frm, msgtxt, tim, encrypted, subject, msg) + session.received(frm, msgtxt, tim, encrypted, msg) else: session.received(msg) # END messageCB

1 0

[commit-gajim] r9797 - trunk/po
by asterix＠gajim.org 13 Jun '08

13 Jun '08

Author: asterix Date: 2008-06-13 17:41:47 +0200 (Fri, 13 Jun 2008) New Revision: 9797 Modified: trunk/po/de.po trunk/po/ru.po Log: [Fabian Fingerle & Formin Denis] updated german and russian translations Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-06-13 15:34:55 UTC (rev 9796) +++ trunk/po/de.po 2008-06-13 15:41:47 UTC (rev 9797) @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: gajim 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-03 07:50+0200\n" +"POT-Creation-Date: 2008-06-13 17:35+0200\n" "PO-Revision-Date: 2008-03-24 20:40+0100\n" "Last-Translator: Nico Gulden <cilugnedon(a)gmx.de>\n" "Language-Team: German <translators(a)gajim.org>\n" @@ -103,7 +103,7 @@ "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" +"Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n" "SHA1-Fingerprint dieses Zertifikates:\n" #: ../data/glade/account_creation_wizard_window.glade.h:10 @@ -265,7 +265,7 @@ "be disabled" msgstr "" "Aktivieren Sie diese Option, damit Gajim auf Port 5223 verbindet, auf dem " -"veraltete Server SSL-Fähigkeiten haben. Beachten Sie, dass Gajim " +"veraltete Server SSL-Fähigkeiten unterstützen. Beachten Sie, dass Gajim " "standardmäßig TLS-Verschlüsselung benutzt, wenn sie vom Server verwendet " "wird und sie TLS mit dieser Option deaktivieren" @@ -299,27 +299,22 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:20 -#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1083 -#: ../src/common/helpers.py:1095 ../src/notify.py:498 ../src/notify.py:529 +#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1088 +#: ../src/common/helpers.py:1100 ../src/notify.py:498 ../src/notify.py:529 #: ../src/notify.py:541 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) -#. Is this contact in this group ? #. General group cannot be changed #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:21 #: ../data/glade/preferences_window.glade.h:47 #: ../data/glade/zeroconf_properties_window.glade.h:7 -#: ../src/common/contacts.py:323 ../src/dialogs.py:100 ../src/dialogs.py:108 -#: ../src/dialogs.py:162 ../src/roster_window.py:184 -#: ../src/roster_window.py:361 ../src/roster_window.py:638 -#: ../src/roster_window.py:693 ../src/roster_window.py:958 -#: ../src/roster_window.py:1207 ../src/roster_window.py:1382 -#: ../src/roster_window.py:2569 ../src/roster_window.py:4718 -#: ../src/roster_window.py:4848 ../src/roster_window.py:5013 +#: ../src/common/contacts.py:70 ../src/dialogs.py:100 ../src/dialogs.py:108 +#: ../src/dialogs.py:162 ../src/roster_window.py:2499 +#: ../src/roster_window.py:4765 msgid "General" msgstr "Allgemein" @@ -397,8 +392,8 @@ #: ../src/config.py:1924 ../src/config.py:2002 ../src/config.py:2016 #: ../src/config.py:3115 ../src/config.py:3183 ../src/config.py:3609 #: ../src/config.py:3618 ../src/dialogs.py:304 ../src/dialogs.py:306 -#: ../src/roster_window.py:2645 ../src/roster_window.py:2652 -#: ../src/roster_window.py:2659 +#: ../src/roster_window.py:2568 ../src/roster_window.py:2575 +#: ../src/roster_window.py:2582 msgid "None" msgstr "Kein" @@ -582,7 +577,7 @@ msgstr "Konten _zusammenführen" #. Rename -#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:4800 +#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:4717 msgid "Re_name" msgstr "_Umbenennen" @@ -801,7 +796,7 @@ msgstr "Alle Status" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:96 ../src/common/helpers.py:268 +#: ../src/common/commands.py:96 ../src/common/helpers.py:270 msgid "Away" msgstr "Abwesend" @@ -818,7 +813,7 @@ msgstr "habe " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:278 +#: ../src/common/helpers.py:280 msgid "Invisible" msgstr "Unsichtbar" @@ -827,7 +822,7 @@ msgstr "Einen Befehl ausführen" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:251 +#: ../src/common/helpers.py:253 msgid "Not Available" msgstr "Nicht verfügbar" @@ -1034,56 +1029,35 @@ msgstr "_Chat starten" #: ../data/glade/chat_control_popup_menu.glade.h:1 -#, fuzzy -msgid "Authenticate contact" -msgstr "Kontakt automatisch autorisieren" - -#: ../data/glade/chat_control_popup_menu.glade.h:2 -msgid "End OTR " -msgstr "OTR beenden " - -#: ../data/glade/chat_control_popup_menu.glade.h:3 msgid "Invite _Contacts" msgstr "_Kontakte einladen" -#: ../data/glade/chat_control_popup_menu.glade.h:4 -msgid "OTR settings / fingerprint" -msgstr "OTR Einstellungen / Fingerprint" - -#: ../data/glade/chat_control_popup_menu.glade.h:5 -msgid "Off-the-Record Encryption" -msgstr "OTR-Verschlüsselung" - -#: ../data/glade/chat_control_popup_menu.glade.h:6 +#: ../data/glade/chat_control_popup_menu.glade.h:2 #: ../data/glade/gc_occupants_menu.glade.h:3 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4 msgid "Send _File" msgstr "_Datei senden" -#: ../data/glade/chat_control_popup_menu.glade.h:7 -msgid "Start / Refresh OTR" -msgstr "" - -#: ../data/glade/chat_control_popup_menu.glade.h:8 +#: ../data/glade/chat_control_popup_menu.glade.h:3 msgid "Toggle End to End Encryption" msgstr "Punkt-zu-Punkt-Verschlüsselung (ESessions) aktivieren" -#: ../data/glade/chat_control_popup_menu.glade.h:9 +#: ../data/glade/chat_control_popup_menu.glade.h:4 msgid "Toggle Open_PGP Encryption" msgstr "Open_PGP-Verschlüsselung aktivieren" -#: ../data/glade/chat_control_popup_menu.glade.h:10 +#: ../data/glade/chat_control_popup_menu.glade.h:5 #: ../data/glade/gc_occupants_menu.glade.h:4 msgid "_Add to Roster" msgstr "Zur Kont_aktliste hinzufügen" -#: ../data/glade/chat_control_popup_menu.glade.h:11 +#: ../data/glade/chat_control_popup_menu.glade.h:6 #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:7 #: ../data/glade/roster_contact_context_menu.glade.h:16 #: ../data/glade/roster_window.glade.h:20 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5456 +#: ../src/roster_window.py:5368 msgid "_History" msgstr "_Verlauf" @@ -1350,7 +1324,7 @@ msgid "Create new post" msgstr "Neue Nachricht" -#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:293 +#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:295 msgid "From" msgstr "Von" @@ -1560,19 +1534,19 @@ #: ../data/glade/message_window.glade.h:2 msgid "Bookmark this room (Ctrl+B)" -msgstr "" +msgstr "Diesen Raum den Lesenzeichen hinzufügren (STRG-B)" #: ../data/glade/message_window.glade.h:3 msgid "Browse the chat history (Ctrl+H)" -msgstr "" +msgstr "Chatverlauf durchsuchen (STRG-H)" #: ../data/glade/message_window.glade.h:4 msgid "Change the room's subject (Ctrl+T)" -msgstr "" +msgstr "Raumtitel ändern (STRG-H)" #: ../data/glade/message_window.glade.h:5 msgid "Change your nickname (Ctrl+N)" -msgstr "" +msgstr "Spitzname ändern (STRG-N)" #: ../data/glade/message_window.glade.h:6 msgid "Invite contacts to the conversation (Ctrl+G)" @@ -1580,7 +1554,7 @@ #: ../data/glade/message_window.glade.h:7 msgid "Send a file (Ctrl+F)" -msgstr "" +msgstr "Datei senden (STRG-F)" #: ../data/glade/message_window.glade.h:8 msgid "Show a list of emoticons (Alt+M)" @@ -2343,8 +2317,8 @@ #. Remove #: ../data/glade/remove_account_window.glade.h:4 #: ../data/glade/roster_contact_context_menu.glade.h:18 -#: ../src/roster_window.py:4836 ../src/roster_window.py:5274 -#: ../src/roster_window.py:5403 +#: ../src/roster_window.py:4753 ../src/roster_window.py:5186 +#: ../src/roster_window.py:5315 msgid "_Remove" msgstr "_Entfernen" @@ -2366,20 +2340,20 @@ #. Execute Command #: ../data/glade/roster_contact_context_menu.glade.h:5 -#: ../src/roster_window.py:5346 +#: ../src/roster_window.py:5258 msgid "Execute Command..." msgstr "_Befehl ausführen ..." #. Invite to #. Invite to Groupchat #: ../data/glade/roster_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:4755 ../src/roster_window.py:5227 +#: ../src/roster_window.py:4672 ../src/roster_window.py:5139 msgid "In_vite to" msgstr "_Einladen zu" #. Send Custom Status #: ../data/glade/roster_contact_context_menu.glade.h:7 -#: ../src/roster_window.py:4765 ../src/roster_window.py:5312 +#: ../src/roster_window.py:4682 ../src/roster_window.py:5224 msgid "Send Cus_tom Status" msgstr "Benutzerdefinierten Status senden" @@ -2405,8 +2379,8 @@ msgstr "_Erlaube Kontakt, meinen Status zu sehen" #: ../data/glade/roster_contact_context_menu.glade.h:14 -#: ../src/roster_window.py:4827 ../src/roster_window.py:5264 -#: ../src/roster_window.py:5393 +#: ../src/roster_window.py:4744 ../src/roster_window.py:5176 +#: ../src/roster_window.py:5305 msgid "_Block" msgstr "_Blockieren" @@ -2428,8 +2402,8 @@ msgstr "_Abonnement" #: ../data/glade/roster_contact_context_menu.glade.h:21 -#: ../src/roster_window.py:4821 ../src/roster_window.py:5258 -#: ../src/roster_window.py:5390 +#: ../src/roster_window.py:4738 ../src/roster_window.py:5170 +#: ../src/roster_window.py:5302 msgid "_Unblock" msgstr "Entblocken" @@ -2524,7 +2498,7 @@ msgstr "_Kontakt hinzufügen" #. Information -#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5415 +#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5327 msgid "_Information" msgstr "Informationen" @@ -2747,13 +2721,13 @@ #. Edit Groups #: ../data/glade/zeroconf_contact_context_menu.glade.h:3 -#: ../src/roster_window.py:5247 +#: ../src/roster_window.py:5159 msgid "Edit _Groups" msgstr "_Gruppen bearbeiten" #. Rename #: ../data/glade/zeroconf_contact_context_menu.glade.h:8 -#: ../src/roster_window.py:5373 +#: ../src/roster_window.py:5285 msgid "_Rename" msgstr "_Umbenennen" @@ -2970,55 +2944,53 @@ #. Add to roster button #. add_to_roster_menuitem -#: ../src/chat_control.py:1065 ../src/chat_control.py:1855 -#: ../src/common/contacts.py:94 ../src/common/helpers.py:66 -#: ../src/common/helpers.py:280 ../src/conversation_textview.py:724 -#: ../src/dialogs.py:864 ../src/gajim.py:1036 ../src/gajim.py:1037 -#: ../src/gajim.py:1706 ../src/roster_window.py:759 -#: ../src/roster_window.py:770 ../src/roster_window.py:857 -#: ../src/roster_window.py:1417 ../src/roster_window.py:1419 -#: ../src/roster_window.py:1772 ../src/roster_window.py:3026 -#: ../src/roster_window.py:4939 ../src/roster_window.py:5112 +#: ../src/chat_control.py:1068 ../src/chat_control.py:1796 +#: ../src/common/contacts.py:98 ../src/common/helpers.py:68 +#: ../src/common/helpers.py:282 ../src/conversation_textview.py:724 +#: ../src/dialogs.py:864 ../src/gajim.py:1539 ../src/roster_window.py:842 +#: ../src/roster_window.py:1356 ../src/roster_window.py:1358 +#: ../src/roster_window.py:1711 ../src/roster_window.py:4856 +#: ../src/roster_window.py:5024 msgid "Not in Roster" msgstr "Nicht in der Kontaktliste" -#: ../src/chat_control.py:1128 ../src/chat_control.py:1395 +#: ../src/chat_control.py:1131 ../src/chat_control.py:1349 msgid "GPG encryption enabled" msgstr "Verschlüsselung aktiviert" -#: ../src/chat_control.py:1305 +#: ../src/chat_control.py:1259 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s aus Gruppenchat %(room_name)s" -#: ../src/chat_control.py:1386 +#: ../src/chat_control.py:1340 msgid "GPG encryption disabled" msgstr "Verschlüsselung deaktiviert" -#: ../src/chat_control.py:1401 ../src/chat_control.py:1629 +#: ../src/chat_control.py:1355 ../src/chat_control.py:1584 msgid "Session WILL NOT be logged" msgstr "Sitzung wird nicht aufgezeichnet" -#: ../src/chat_control.py:1403 ../src/chat_control.py:1627 +#: ../src/chat_control.py:1357 ../src/chat_control.py:1582 msgid "Session WILL be logged" msgstr "Sitzung wird aufgezeichnet" -#: ../src/chat_control.py:1478 ../src/groupchat_control.py:1524 +#: ../src/chat_control.py:1432 ../src/groupchat_control.py:1526 #, python-format msgid "Commands: %s" msgstr "Befehle: %s" -#: ../src/chat_control.py:1481 ../src/groupchat_control.py:1538 +#: ../src/chat_control.py:1435 ../src/groupchat_control.py:1540 #, python-format msgid "Usage: /%s, clears the text window." msgstr "Bedienung: /%s, leert das Textfenster." -#: ../src/chat_control.py:1484 ../src/groupchat_control.py:1543 +#: ../src/chat_control.py:1438 ../src/groupchat_control.py:1545 #, python-format msgid "Usage: /%s, hide the chat buttons." msgstr "Verwendung: /%s, versteckt die Chatbuttons." -#: ../src/chat_control.py:1487 ../src/groupchat_control.py:1559 +#: ../src/chat_control.py:1441 ../src/groupchat_control.py:1561 #, python-format msgid "" "Usage: /%s <action>, sends action to the current group chat. Use third " @@ -3027,46 +2999,46 @@ "Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Gruppenchat. " "Verwende dritte Person, z.B. /%s explodiert)." -#: ../src/chat_control.py:1491 +#: ../src/chat_control.py:1445 #, python-format msgid "Usage: /%s, sends a ping to the contact" msgstr "Bedienung: /%s, sendet einen Ping zum Kontakt" -#: ../src/chat_control.py:1494 +#: ../src/chat_control.py:1448 #, python-format msgid "Usage: /%s, send the message to the contact" msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt" -#: ../src/chat_control.py:1497 ../src/groupchat_control.py:1582 +#: ../src/chat_control.py:1451 ../src/groupchat_control.py:1584 #, python-format msgid "No help info for /%s" msgstr "Keine Hilfe vorhanden für /%s" -#: ../src/chat_control.py:1616 +#: ../src/chat_control.py:1571 msgid "Session negotiation cancelled" msgstr "Sitzungs-Aushandlung abgebrochen" -#: ../src/chat_control.py:1623 +#: ../src/chat_control.py:1578 msgid "E2E encryption enabled" msgstr "Verschlüsselung aktiviert" -#: ../src/chat_control.py:1633 +#: ../src/chat_control.py:1588 msgid "E2E encryption disabled" msgstr "Verschlüsselung deaktiviert" -#: ../src/chat_control.py:1661 ../src/chat_control.py:1670 -#: ../src/chat_control.py:1677 ../src/chat_control.py:1683 +#: ../src/chat_control.py:1616 ../src/chat_control.py:1623 +#: ../src/chat_control.py:1629 #, fuzzy msgid "The following message was " msgstr "[Die folgende Nachricht wurde verschlüsselt]" #. %s is being replaced in the code with JID -#: ../src/chat_control.py:2057 +#: ../src/chat_control.py:1972 #, python-format msgid "You just received a new message from \"%s\"" msgstr "Sie haben eine neue Nachricht von \"%s\"" -#: ../src/chat_control.py:2058 +#: ../src/chat_control.py:1973 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." @@ -3074,11 +3046,11 @@ "Wenn sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die " "Nachricht verloren." -#: ../src/chat_control.py:2190 ../src/gajim.py:159 +#: ../src/chat_control.py:2105 ../src/gajim.py:170 msgid "Database Error" msgstr "Datenbankfehler" -#: ../src/chat_control.py:2191 ../src/gajim.py:160 +#: ../src/chat_control.py:2106 ../src/gajim.py:171 #, python-format msgid "" "The database file (%s) cannot be read. Try to repare it or remove it (all " @@ -3087,11 +3059,6 @@ "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie diese zu " "reparieren oder zu löschen (dabei werden alle Verläufe verloren gehen)." -#: ../src/chat_control.py:2419 -#, python-format -msgid "Private conversation with %s lost." -msgstr "Private Unterhaltung mit %s unterbrochen." - #: ../src/common/check_paths.py:38 msgid "creating logs database" msgstr "Erstelle Log-Datenbank" @@ -3175,10 +3142,10 @@ msgstr "Wählen Sie den Gruppenchat, den Sie verlassen möchten" #. Make special context menu if group is Groupchats -#: ../src/common/commands.py:199 ../src/common/contacts.py:107 -#: ../src/common/helpers.py:66 ../src/roster_window.py:714 -#: ../src/roster_window.py:1421 ../src/roster_window.py:1423 -#: ../src/roster_window.py:2738 ../src/roster_window.py:4725 +#: ../src/common/commands.py:199 ../src/common/contacts.py:111 +#: ../src/common/helpers.py:68 ../src/roster_window.py:727 +#: ../src/roster_window.py:1360 ../src/roster_window.py:1362 +#: ../src/roster_window.py:2661 ../src/roster_window.py:4642 msgid "Groupchats" msgstr "Gruppenchat" @@ -3237,7 +3204,7 @@ #. sorted alphanum #: ../src/common/config.py:102 ../src/common/config.py:430 #: ../src/common/optparser.py:212 ../src/common/optparser.py:430 -#: ../src/common/optparser.py:464 ../src/gajim.py:3237 +#: ../src/common/optparser.py:464 ../src/gajim.py:3064 msgid "default" msgstr "Standard" @@ -3758,13 +3725,15 @@ #: ../src/common/config.py:252 msgid "Choose interval between 2 checks of idleness." -msgstr "" +msgstr "Wählen Sie einen Zeitabstand zwischen zwei Leerlaufüberprüfungen." #: ../src/common/config.py:253 msgid "" "Change the value to change the size of latex formulas displayed. The higher " "is larger." msgstr "" +"Wert ändern um LaTeX-Anzeigengröße zu ändern. Hoher Wert resultiert in " +"großer Anzeige." #: ../src/common/config.py:264 msgid "" @@ -3811,6 +3780,8 @@ "How many seconds to wait for the answer of keepalive packet before we try to " "reconnect." msgstr "" +"Wartezeit in Sekunden auf Verbindungsprüfantwort vor Versuch Verbindung " +"wieder herzustellen." #. yes, no, ask #: ../src/common/config.py:298 @@ -3825,11 +3796,19 @@ "Wenn aktiviert, wird Gajim Ihre IP und die in der file_transfer_proxies " "Option definierten Proxies für den Datentransfer verwenden." -#: ../src/common/config.py:371 +#: ../src/common/config.py:314 +msgid "Answer to receipt requests" +msgstr "Antwort auf Empfangsbestätigungsanfragen" + +#: ../src/common/config.py:315 +msgid "Sent receipt requests" +msgstr "Empfangsbestätigungsanfragen senden" + +#: ../src/common/config.py:372 msgid "Is OpenPGP enabled for this contact?" msgstr "Ist OpenPGP für diesen Kontakt aktiviert?" -#: ../src/common/config.py:372 ../src/common/config.py:376 +#: ../src/common/config.py:373 ../src/common/config.py:376 msgid "Language for which we want to check misspelled words" msgstr "Sprache für, die nach falsch geschriebenen Wörtern gesucht werden soll" @@ -3973,103 +3952,97 @@ "Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen" #: ../src/common/connection_handlers.py:906 -#: ../src/common/connection_handlers.py:1819 -#: ../src/common/connection_handlers.py:1869 -#: ../src/common/connection_handlers.py:2051 -#: ../src/common/connection_handlers.py:2163 ../src/common/connection.py:1155 -#: ../src/gajim.py:591 +#: ../src/common/connection_handlers.py:1783 +#: ../src/common/connection_handlers.py:1830 +#: ../src/common/connection_handlers.py:2012 +#: ../src/common/connection_handlers.py:2131 ../src/common/connection.py:1148 +#: ../src/gajim.py:394 msgid "Disk Write Error" msgstr "Fehler beim Schreiben auf Festplatte" -#: ../src/common/connection_handlers.py:1704 +#: ../src/common/connection_handlers.py:1899 #, python-format -msgid "" -"%s has ended his/her private conversation with you. You should do the same." -msgstr "" - -#: ../src/common/connection_handlers.py:1938 -#, python-format msgid "Nickname not allowed: %s" msgstr "Spitzname nicht erlaubt: %s" #. we are banned #. group chat does not exist -#: ../src/common/connection_handlers.py:2008 -#: ../src/common/connection_handlers.py:2011 -#: ../src/common/connection_handlers.py:2014 -#: ../src/common/connection_handlers.py:2017 -#: ../src/common/connection_handlers.py:2021 -#: ../src/common/connection_handlers.py:2030 +#: ../src/common/connection_handlers.py:1969 +#: ../src/common/connection_handlers.py:1972 +#: ../src/common/connection_handlers.py:1975 +#: ../src/common/connection_handlers.py:1978 +#: ../src/common/connection_handlers.py:1982 +#: ../src/common/connection_handlers.py:1991 msgid "Unable to join group chat" msgstr "Fehler beim Betreten des Gruppenchats" -#: ../src/common/connection_handlers.py:2009 +#: ../src/common/connection_handlers.py:1970 #, python-format msgid "You are banned from group chat %s." msgstr "Sie sind von Gruppenchat %s gebannt." -#: ../src/common/connection_handlers.py:2012 +#: ../src/common/connection_handlers.py:1973 #, python-format msgid "Group chat %s does not exist." -msgstr "Dieser Gruppenchat existiert nicht." +msgstr "Der Gruppenchat %s existiert nicht." -#: ../src/common/connection_handlers.py:2015 +#: ../src/common/connection_handlers.py:1976 msgid "Group chat creation is restricted." msgstr "Gruppenchaterstellung ist beschränkt." -#: ../src/common/connection_handlers.py:2018 +#: ../src/common/connection_handlers.py:1979 #, python-format msgid "Your registered nickname must be used in group chat %s." -msgstr "Sie müssen Ihren registrierten Spitznamen verwenden" +msgstr "Sie müssen Ihren registrierten Spitznamen im Gruppenchat %s verwenden." -#: ../src/common/connection_handlers.py:2022 +#: ../src/common/connection_handlers.py:1983 #, python-format msgid "You are not in the members list in groupchat %s." -msgstr "Sie sind nicht in der Mitgliedliste" +msgstr "Sie sind nicht in der Mitgliedliste des Gruppenchats %s." -#: ../src/common/connection_handlers.py:2031 +#: ../src/common/connection_handlers.py:1992 #, python-format msgid "" "Your desired nickname in group chat %s is in use or registered by another " "occupant.\n" "Please specify another nickname below:" msgstr "" -"Der gewünschte Benutzername wird bereits verwendet oder ist von einem " -"anderen Benutzer registriert.\n" +"Der gewünschte Benutzername im Gruppenchat %s wird bereits verwendet oder " +"wurde von einem anderen Benutzer registriert.\n" "Bitte geben Sie einen anderen Benutzernamen an:" #. Room has been destroyed. see #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom -#: ../src/common/connection_handlers.py:2062 +#: ../src/common/connection_handlers.py:2023 msgid "Room has been destroyed" msgstr "Raum wurde zerstört" -#: ../src/common/connection_handlers.py:2069 +#: ../src/common/connection_handlers.py:2030 #, python-format msgid "You can join this room instead: %s" msgstr "Sie können stattdessen diesem Raum beitreten: %s" -#: ../src/common/connection_handlers.py:2096 +#: ../src/common/connection_handlers.py:2057 msgid "I would like to add you to my roster." msgstr "Ich würde dich gerne zu meiner Liste hinzufügen." #. BE CAREFUL: no con.updateRosterItem() in a callback -#: ../src/common/connection_handlers.py:2117 +#: ../src/common/connection_handlers.py:2078 #, python-format msgid "we are now subscribed to %s" msgstr "wir haben jetzt %s abonniert" -#: ../src/common/connection_handlers.py:2119 +#: ../src/common/connection_handlers.py:2080 #, python-format msgid "unsubscribe request from %s" msgstr "Anfrage zur Kündigung des Abonnements von %s" -#: ../src/common/connection_handlers.py:2121 +#: ../src/common/connection_handlers.py:2082 #, python-format msgid "we are now unsubscribed from %s" msgstr "%s hat das Abonnement beendet" -#: ../src/common/connection_handlers.py:2262 +#: ../src/common/connection_handlers.py:2230 #, python-format msgid "" "JID %s is not RFC compliant. It will not be added to your roster. Use roster " @@ -4080,15 +4053,15 @@ "um ihn zu entfernen" #. We didn't set a passphrase -#: ../src/common/connection_handlers.py:2287 +#: ../src/common/connection_handlers.py:2255 #: ../src/common/zeroconf/connection_zeroconf.py:172 msgid "OpenPGP passphrase was not given" msgstr "Keine OpenPGP-Passphrase gewählt" #. %s is the account name here -#: ../src/common/connection_handlers.py:2289 +#: ../src/common/connection_handlers.py:2257 #: ../src/common/zeroconf/connection_zeroconf.py:174 -#: ../src/roster_window.py:1830 +#: ../src/roster_window.py:1769 #, python-format msgid "You will be connected to %s without OpenPGP." msgstr "Sie werden ohne OpenPGP mit %s verbunden." @@ -4262,13 +4235,13 @@ msgstr "Verbindung mit Proxy fehlgeschlagen" #: ../src/common/connection.py:590 ../src/common/connection.py:670 -#: ../src/common/connection.py:1279 +#: ../src/common/connection.py:1274 #: ../src/common/zeroconf/connection_zeroconf.py:248 #, python-format msgid "Could not connect to \"%s\"" msgstr "Konnte nicht mit %s verbinden" -#: ../src/common/connection.py:591 ../src/gajim.py:1116 +#: ../src/common/connection.py:591 ../src/gajim.py:941 msgid "Check your connection or try again later." msgstr "" "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal." @@ -4323,14 +4296,14 @@ "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie " "es erneut." -#: ../src/common/connection.py:1058 +#: ../src/common/connection.py:1044 #: ../src/common/zeroconf/connection_zeroconf.py:381 msgid "Neither the remote presence is signed, nor a key was assigned." msgstr "" "Weder die entfernte Präsenz ist signiert, noch wurde ein Schlüssel " "zugewiesen." -#: ../src/common/connection.py:1060 +#: ../src/common/connection.py:1046 #: ../src/common/zeroconf/connection_zeroconf.py:383 #, python-format msgid "The contact's key (%s) does not match the key assigned in Gajim." @@ -4340,11 +4313,11 @@ #. we're not english #. one in locale and one en -#: ../src/common/connection.py:1069 +#: ../src/common/connection.py:1055 msgid "[This message is *encrypted* (See :XEP:`27`]" msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]" -#: ../src/common/connection.py:1146 +#: ../src/common/connection.py:1139 #: ../src/common/zeroconf/connection_zeroconf.py:445 #, python-format msgid "" @@ -4354,35 +4327,32 @@ "Thema: %s\n" "%s" -#: ../src/common/connection.py:1312 +#: ../src/common/connection.py:1307 msgid "Not fetched because of invisible status" msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status" -#: ../src/common/contacts.py:304 ../src/common/contacts.py:319 -#: ../src/common/helpers.py:66 ../src/disco.py:111 ../src/disco.py:112 -#: ../src/disco.py:1320 ../src/gajim.py:913 ../src/roster_window.py:738 -#: ../src/roster_window.py:1367 ../src/roster_window.py:1413 -#: ../src/roster_window.py:1415 ../src/roster_window.py:1559 +#: ../src/common/contacts.py:68 ../src/common/helpers.py:68 +msgid "Observers" +msgstr "Beobachter" + +#: ../src/common/contacts.py:308 ../src/common/helpers.py:68 +#: ../src/disco.py:111 ../src/disco.py:112 ../src/disco.py:1320 +#: ../src/gajim.py:742 ../src/roster_window.py:751 +#: ../src/roster_window.py:1306 ../src/roster_window.py:1352 +#: ../src/roster_window.py:1354 ../src/roster_window.py:1498 msgid "Transports" msgstr "Transports" -#: ../src/common/contacts.py:308 +#: ../src/common/contacts.py:312 msgid "Not in roster" msgstr "Nicht in der Kontaktliste" -#: ../src/common/contacts.py:321 ../src/common/helpers.py:66 -#: ../src/roster_window.py:358 ../src/roster_window.py:635 -#: ../src/roster_window.py:691 ../src/roster_window.py:956 -#: ../src/roster_window.py:1205 ../src/roster_window.py:5011 -msgid "Observers" -msgstr "Beobachter" - #. only say that to non Windows users -#: ../src/common/dbus_support.py:41 +#: ../src/common/dbus_support.py:44 msgid "D-Bus python bindings are missing in this computer" msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus" -#: ../src/common/dbus_support.py:42 +#: ../src/common/dbus_support.py:45 msgid "D-Bus capabilities of Gajim cannot be used" msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden" @@ -4563,765 +4533,765 @@ msgid "Weekend!" msgstr "Wochenende!" -#: ../src/common/helpers.py:137 +#: ../src/common/helpers.py:139 msgid "Invalid character in username." msgstr "Ungültiges Zeichen im Benutzernamen" -#: ../src/common/helpers.py:142 +#: ../src/common/helpers.py:144 msgid "Server address required." msgstr "Server-Adresse wird benötigt." -#: ../src/common/helpers.py:147 +#: ../src/common/helpers.py:149 msgid "Invalid character in hostname." msgstr "Ungültiges Zeichen in Hostname." -#: ../src/common/helpers.py:153 +#: ../src/common/helpers.py:155 msgid "Invalid character in resource." msgstr "Ungültiges Zeichen in Resource." #. GiB means gibibyte -#: ../src/common/helpers.py:193 +#: ../src/common/helpers.py:195 #, python-format msgid "%s GiB" msgstr "%s GiB" #. GB means gigabyte -#: ../src/common/helpers.py:196 +#: ../src/common/helpers.py:198 #, python-format msgid "%s GB" msgstr "%s GB" #. MiB means mibibyte -#: ../src/common/helpers.py:200 +#: ../src/common/helpers.py:202 #, python-format msgid "%s MiB" msgstr "%s MiB" #. MB means megabyte -#: ../src/common/helpers.py:203 +#: ../src/common/helpers.py:205 #, python-format msgid "%s MB" msgstr "%s MB" #. KiB means kibibyte -#: ../src/common/helpers.py:207 +#: ../src/common/helpers.py:209 #, python-format msgid "%s KiB" msgstr "%s KiB" #. KB means kilo bytes -#: ../src/common/helpers.py:210 +#: ../src/common/helpers.py:212 #, python-format msgid "%s KB" msgstr "%s kB" #. B means bytes -#: ../src/common/helpers.py:213 +#: ../src/common/helpers.py:215 #, python-format msgid "%s B" msgstr "%s B" -#: ../src/common/helpers.py:244 +#: ../src/common/helpers.py:246 msgid "_Busy" msgstr "_Beschäftigt" -#: ../src/common/helpers.py:246 +#: ../src/common/helpers.py:248 msgid "Busy" msgstr "Beschäftigt" -#: ../src/common/helpers.py:249 +#: ../src/common/helpers.py:251 msgid "_Not Available" msgstr "_Nicht verfügbar" -#: ../src/common/helpers.py:254 +#: ../src/common/helpers.py:256 msgid "_Free for Chat" msgstr "_Frei zum Chatten" -#: ../src/common/helpers.py:256 +#: ../src/common/helpers.py:258 msgid "Free for Chat" msgstr "Frei zum Chatten" -#: ../src/common/helpers.py:259 +#: ../src/common/helpers.py:261 msgid "_Available" msgstr "_Angemeldet" -#: ../src/common/helpers.py:261 ../src/features_window.py:120 +#: ../src/common/helpers.py:263 ../src/features_window.py:116 msgid "Available" msgstr "Angemeldet" -#: ../src/common/helpers.py:263 +#: ../src/common/helpers.py:265 msgid "Connecting" msgstr "Verbinde" -#: ../src/common/helpers.py:266 +#: ../src/common/helpers.py:268 msgid "A_way" msgstr "Ab_wesend" -#: ../src/common/helpers.py:271 +#: ../src/common/helpers.py:273 msgid "_Offline" msgstr "A_bgemeldet" -#: ../src/common/helpers.py:273 +#: ../src/common/helpers.py:275 msgid "Offline" msgstr "Abgemeldet" -#: ../src/common/helpers.py:276 +#: ../src/common/helpers.py:278 msgid "_Invisible" msgstr "_Unsichtbar" -#: ../src/common/helpers.py:282 +#: ../src/common/helpers.py:284 msgid "?contact has status:Unknown" msgstr "Unbekannt" -#: ../src/common/helpers.py:284 +#: ../src/common/helpers.py:286 msgid "?contact has status:Has errors" msgstr "Hat Fehler" -#: ../src/common/helpers.py:289 +#: ../src/common/helpers.py:291 msgid "?Subscription we already have:None" msgstr "Keine" -#: ../src/common/helpers.py:291 +#: ../src/common/helpers.py:293 msgid "To" msgstr "An" -#: ../src/common/helpers.py:295 +#: ../src/common/helpers.py:297 msgid "Both" msgstr "Beide" -#: ../src/common/helpers.py:303 +#: ../src/common/helpers.py:305 msgid "?Ask (for Subscription):None" msgstr "Keine" -#: ../src/common/helpers.py:305 +#: ../src/common/helpers.py:307 msgid "Subscribe" msgstr "Abonnieren" -#: ../src/common/helpers.py:314 +#: ../src/common/helpers.py:316 msgid "?Group Chat Contact Role:None" msgstr "Keine" -#: ../src/common/helpers.py:317 +#: ../src/common/helpers.py:319 msgid "Moderators" msgstr "Moderatoren" -#: ../src/common/helpers.py:319 +#: ../src/common/helpers.py:321 msgid "Moderator" msgstr "Moderator" -#: ../src/common/helpers.py:322 +#: ../src/common/helpers.py:324 msgid "Participants" msgstr "Teilnehmer" -#: ../src/common/helpers.py:324 +#: ../src/common/helpers.py:326 msgid "Participant" msgstr "Teilnehmer" -#: ../src/common/helpers.py:327 +#: ../src/common/helpers.py:329 msgid "Visitors" msgstr "Besucher" -#: ../src/common/helpers.py:329 +#: ../src/common/helpers.py:331 msgid "Visitor" msgstr "Besucher" -#: ../src/common/helpers.py:335 +#: ../src/common/helpers.py:337 msgid "?Group Chat Contact Affiliation:None" msgstr "?Gruppenchat Kontaktverbindung:Keine" -#: ../src/common/helpers.py:337 +#: ../src/common/helpers.py:339 msgid "Owner" msgstr "Besitzer" -#: ../src/common/helpers.py:339 +#: ../src/common/helpers.py:341 msgid "Administrator" msgstr "Administrator" -#: ../src/common/helpers.py:341 +#: ../src/common/helpers.py:343 msgid "Member" msgstr "Mitglied" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:350 msgid "afraid" msgstr "Besorgt" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:350 msgid "amazed" msgstr "Erstaunt" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:350 msgid "angry" msgstr "Aufgebracht" -#: ../src/common/helpers.py:349 +#: ../src/common/helpers.py:351 msgid "annoyed" msgstr "Verärgert" -#: ../src/common/helpers.py:349 +#: ../src/common/helpers.py:351 msgid "anxious" msgstr "Bemüht" -#: ../src/common/helpers.py:349 +#: ../src/common/helpers.py:351 msgid "aroused" msgstr "Erregt" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:352 msgid "ashamed" msgstr "Beschämt" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:352 msgid "bored" msgstr "Gelangweilt" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:352 msgid "brave" msgstr "Tapfer" -#: ../src/common/helpers.py:351 +#: ../src/common/helpers.py:353 msgid "calm" msgstr "Gelassen" -#: ../src/common/helpers.py:351 +#: ../src/common/helpers.py:353 msgid "cold" msgstr "Kalt" -#: ../src/common/helpers.py:351 +#: ../src/common/helpers.py:353 msgid "confused" msgstr "Verwirrt" -#: ../src/common/helpers.py:352 +#: ../src/common/helpers.py:354 msgid "contented" msgstr "Zufrieden" -#: ../src/common/helpers.py:352 +#: ../src/common/helpers.py:354 msgid "cranky" msgstr "Launisch" -#: ../src/common/helpers.py:352 +#: ../src/common/helpers.py:354 msgid "curious" msgstr "Neugierig" -#: ../src/common/helpers.py:353 +#: ../src/common/helpers.py:355 msgid "depressed" msgstr "Deprimiert" -#: ../src/common/helpers.py:353 +#: ../src/common/helpers.py:355 msgid "disappointed" msgstr "Enttäuscht" -#: ../src/common/helpers.py:354 +#: ../src/common/helpers.py:356 msgid "disgusted" msgstr "Empört" -#: ../src/common/helpers.py:354 +#: ../src/common/helpers.py:356 msgid "distracted" msgstr "Abgelenkt" -#: ../src/common/helpers.py:355 +#: ../src/common/helpers.py:357 msgid "embarrassed" msgstr "Verlegen" -#: ../src/common/helpers.py:355 +#: ../src/common/helpers.py:357 msgid "excited" msgstr "Aufgeregt" -#: ../src/common/helpers.py:356 +#: ../src/common/helpers.py:358 msgid "flirtatious" msgstr "Kokett" -#: ../src/common/helpers.py:356 +#: ../src/common/helpers.py:358 msgid "frustrated" msgstr "Frustriert" -#: ../src/common/helpers.py:357 +#: ../src/common/helpers.py:359 msgid "grumpy" msgstr "Mürrisch" -#: ../src/common/helpers.py:357 +#: ../src/common/helpers.py:359 msgid "guilty" msgstr "Schuldig" -#: ../src/common/helpers.py:357 +#: ../src/common/helpers.py:359 msgid "happy" msgstr "Fröhlich" -#: ../src/common/helpers.py:358 +#: ../src/common/helpers.py:360 msgid "hot" msgstr "Heiß" -#: ../src/common/helpers.py:358 +#: ../src/common/helpers.py:360 msgid "humbled" msgstr "Demütig" -#: ../src/common/helpers.py:358 +#: ../src/common/helpers.py:360 msgid "humiliated" msgstr "Beschämt" -#: ../src/common/helpers.py:359 +#: ../src/common/helpers.py:361 msgid "hungry" msgstr "Hungrig" -#: ../src/common/helpers.py:359 +#: ../src/common/helpers.py:361 msgid "hurt" msgstr "Verletzt" -#: ../src/common/helpers.py:359 +#: ../src/common/helpers.py:361 msgid "impressed" msgstr "Beeindruckt" -#: ../src/common/helpers.py:360 +#: ../src/common/helpers.py:362 msgid "in awe" msgstr "Bewundernd" -#: ../src/common/helpers.py:360 +#: ../src/common/helpers.py:362 msgid "in love" msgstr "Verliebt" -#: ../src/common/helpers.py:360 +#: ../src/common/helpers.py:362 msgid "indignant" msgstr "Entrüstet" -#: ../src/common/helpers.py:361 +#: ../src/common/helpers.py:363 msgid "interested" msgstr "Interessiert" -#: ../src/common/helpers.py:361 +#: ../src/common/helpers.py:363 msgid "intoxicated" msgstr "Betrunken" -#: ../src/common/helpers.py:362 +#: ../src/common/helpers.py:364 msgid "invincible" msgstr "unsichtbar" -#: ../src/common/helpers.py:362 +#: ../src/common/helpers.py:364 msgid "jealous" msgstr "Neidisch" -#: ../src/common/helpers.py:362 +#: ../src/common/helpers.py:364 msgid "lonely" msgstr "Einsam" -#: ../src/common/helpers.py:363 +#: ../src/common/helpers.py:365 msgid "mean" msgstr "Fies" -#: ../src/common/helpers.py:363 +#: ../src/common/helpers.py:365 msgid "moody" msgstr "Launisch" -#: ../src/common/helpers.py:363 +#: ../src/common/helpers.py:365 msgid "nervous" msgstr "Nervös" -#: ../src/common/helpers.py:364 +#: ../src/common/helpers.py:366 msgid "neutral" msgstr "Neutral" -#: ../src/common/helpers.py:364 +#: ../src/common/helpers.py:366 msgid "offended" msgstr "Beleidigt" -#: ../src/common/helpers.py:364 +#: ../src/common/helpers.py:366 msgid "playful" msgstr "Verspielt" -#: ../src/common/helpers.py:365 +#: ../src/common/helpers.py:367 msgid "proud" msgstr "Stolz" -#: ../src/common/helpers.py:365 +#: ../src/common/helpers.py:367 msgid "relieved" msgstr "Erleichtert" -#: ../src/common/helpers.py:365 +#: ../src/common/helpers.py:367 msgid "remorseful" msgstr "Reumütig" -#: ../src/common/helpers.py:366 +#: ../src/common/helpers.py:368 msgid "restless" msgstr "Ruhelos" -#: ../src/common/helpers.py:366 +#: ../src/common/helpers.py:368 msgid "sad" msgstr "Traurig" -#: ../src/common/helpers.py:366 +#: ../src/common/helpers.py:368 msgid "sarcastic" msgstr "Sarkastisch" -#: ../src/common/helpers.py:367 +#: ../src/common/helpers.py:369 msgid "serious" msgstr "Ernst" -#: ../src/common/helpers.py:367 +#: ../src/common/helpers.py:369 msgid "shocked" msgstr "Schockiert" -#: ../src/common/helpers.py:367 +#: ../src/common/helpers.py:369 msgid "shy" msgstr "Schüchtern" -#: ../src/common/helpers.py:368 +#: ../src/common/helpers.py:370 msgid "sick" msgstr "Krank" -#: ../src/common/helpers.py:368 +#: ../src/common/helpers.py:370 msgid "sleepy" msgstr "Schläfrig" -#: ../src/common/helpers.py:368 +#: ../src/common/helpers.py:370 msgid "stressed" msgstr "Gestreßt" -#: ../src/common/helpers.py:369 +#: ../src/common/helpers.py:371 msgid "surprised" msgstr "Überrascht" -#: ../src/common/helpers.py:369 +#: ../src/common/helpers.py:371 msgid "thirsty" msgstr "Durstig" -#: ../src/common/helpers.py:369 +#: ../src/common/helpers.py:371 msgid "worried" msgstr "Besorgt" #. Activities -#: ../src/common/helpers.py:380 +#: ../src/common/helpers.py:382 msgid "working" msgstr "Arbeiten" -#: ../src/common/helpers.py:380 +#: ../src/common/helpers.py:382 msgid "eating" msgstr "Essen" -#: ../src/common/helpers.py:381 +#: ../src/common/helpers.py:383 msgid "excercising" -msgstr "" +msgstr "Üben" -#: ../src/common/helpers.py:381 +#: ../src/common/helpers.py:383 msgid "relaxing" msgstr "Entspannen" -#: ../src/common/helpers.py:381 +#: ../src/common/helpers.py:383 msgid "talking" msgstr "Im Gespräch" -#: ../src/common/helpers.py:382 +#: ../src/common/helpers.py:384 msgid "doing chores" msgstr "Mache den Haushalt" -#: ../src/common/helpers.py:382 +#: ../src/common/helpers.py:384 msgid "inactive" msgstr "Inaktiv" -#: ../src/common/helpers.py:383 +#: ../src/common/helpers.py:385 msgid "traveling" msgstr "Auf Reisen" -#: ../src/common/helpers.py:383 +#: ../src/common/helpers.py:385 msgid "having an appointment" msgstr "Habe einen Termin" -#: ../src/common/helpers.py:384 +#: ../src/common/helpers.py:386 msgid "grooming" msgstr "Putzen" -#: ../src/common/helpers.py:384 +#: ../src/common/helpers.py:386 msgid "drinking" msgstr "In der Kneipe" #. Subactivites -#: ../src/common/helpers.py:386 +#: ../src/common/helpers.py:388 msgid "on the phone" msgstr "Am Telefon" -#: ../src/common/helpers.py:386 +#: ../src/common/helpers.py:388 msgid "gardening" msgstr "Gartenarbeit" -#: ../src/common/helpers.py:387 +#: ../src/common/helpers.py:389 msgid "hiking" msgstr "Wandern" -#: ../src/common/helpers.py:387 +#: ../src/common/helpers.py:389 msgid "on vacation" msgstr "Im Urlaub" -#: ../src/common/helpers.py:387 +#: ../src/common/helpers.py:389 msgid "coding" msgstr "Programmieren" -#: ../src/common/helpers.py:388 +#: ../src/common/helpers.py:390 msgid "walking" msgstr "Spazieren gehen" -#: ../src/common/helpers.py:388 +#: ../src/common/helpers.py:390 msgid "rehearsing" msgstr "Studieren" -#: ../src/common/helpers.py:388 +#: ../src/common/helpers.py:390 msgid "sleeping" msgstr "Schlafen" -#: ../src/common/helpers.py:389 +#: ../src/common/helpers.py:391 msgid "brushing teeth" msgstr "Zähne putzen" -#: ../src/common/helpers.py:389 +#: ../src/common/helpers.py:391 msgid "playing sports" msgstr "Beim Sport" -#: ../src/common/helpers.py:390 +#: ../src/common/helpers.py:392 msgid "skiing" msgstr "Ski fahren" -#: ../src/common/helpers.py:390 +#: ../src/common/helpers.py:392 msgid "having breakfast" msgstr "Frühstücken" -#: ../src/common/helpers.py:391 +#: ../src/common/helpers.py:393 msgid "watching TV" msgstr "Fernsehen" -#: ../src/common/helpers.py:391 +#: ../src/common/helpers.py:393 msgid "doing the dishes" msgstr "Geschirr abspülen" -#: ../src/common/helpers.py:392 +#: ../src/common/helpers.py:394 msgid "at the spa" msgstr "Im Bad" -#: ../src/common/helpers.py:392 +#: ../src/common/helpers.py:394 msgid "cycling" msgstr "Rad fahren" -#: ../src/common/helpers.py:393 +#: ../src/common/helpers.py:395 msgid "hanging out" msgstr "Rumhängen" -#: ../src/common/helpers.py:393 +#: ../src/common/helpers.py:395 msgid "driving" msgstr "Fahren" -#: ../src/common/helpers.py:393 +#: ../src/common/helpers.py:395 msgid "commuting" msgstr "Pendeln" -#: ../src/common/helpers.py:394 +#: ../src/common/helpers.py:396 msgid "cooking" msgstr "Kochen" -#: ../src/common/helpers.py:394 +#: ../src/common/helpers.py:396 msgid "walking the dog" msgstr "Hund ausführen" -#: ../src/common/helpers.py:395 +#: ../src/common/helpers.py:397 msgid "writing" msgstr "Schreiben" -#: ../src/common/helpers.py:395 +#: ../src/common/helpers.py:397 msgid "on a trip" msgstr "Auf Reisen" -#: ../src/common/helpers.py:395 +#: ../src/common/helpers.py:397 msgid "day off" msgstr "Freier Tag" -#: ../src/common/helpers.py:396 +#: ../src/common/helpers.py:398 msgid "having tea" msgstr "Tee" -#: ../src/common/helpers.py:396 +#: ../src/common/helpers.py:398 msgid "on a bus" msgstr "Im Bus" -#: ../src/common/helpers.py:397 +#: ../src/common/helpers.py:399 msgid "having a beer" msgstr "Bier trinken" -#: ../src/common/helpers.py:397 +#: ../src/common/helpers.py:399 msgid "reading" msgstr "Lesen" -#: ../src/common/helpers.py:398 +#: ../src/common/helpers.py:400 msgid "buying groceries" msgstr "Lebensmittel einkaufen" -#: ../src/common/helpers.py:398 +#: ../src/common/helpers.py:400 msgid "shaving" msgstr "Beim Rasieren" -#: ../src/common/helpers.py:399 +#: ../src/common/helpers.py:401 msgid "getting a haircut" msgstr "Beim Frisör" -#: ../src/common/helpers.py:399 +#: ../src/common/helpers.py:401 msgid "gaming" msgstr "Spielen" -#: ../src/common/helpers.py:400 +#: ../src/common/helpers.py:402 msgid "having dinner" msgstr "Abendessen" -#: ../src/common/helpers.py:400 +#: ../src/common/helpers.py:402 msgid "doing maintenance" msgstr "Wartungsarbeiten" -#: ../src/common/helpers.py:401 +#: ../src/common/helpers.py:403 msgid "doing the laundry" msgstr "Wäsche waschen" -#: ../src/common/helpers.py:401 +#: ../src/common/helpers.py:403 msgid "on video phone" msgstr "Bei einem Videotelefonat." -#: ../src/common/helpers.py:402 +#: ../src/common/helpers.py:404 msgid "scheduled holiday" msgstr "Urlaub" -#: ../src/common/helpers.py:402 +#: ../src/common/helpers.py:404 msgid "going out" msgstr "Ausgehen" -#: ../src/common/helpers.py:403 +#: ../src/common/helpers.py:405 msgid "partying" msgstr "Feiern" -#: ../src/common/helpers.py:403 +#: ../src/common/helpers.py:405 msgid "having a snack" msgstr "Beim Imbiss" -#: ../src/common/helpers.py:404 +#: ../src/common/helpers.py:406 msgid "having lunch" msgstr "Mittagessen" -#: ../src/common/helpers.py:404 +#: ../src/common/helpers.py:406 msgid "working out" msgstr "Ausarbeiten" -#: ../src/common/helpers.py:405 +#: ../src/common/helpers.py:407 msgid "cleaning" msgstr "Putzen" -#: ../src/common/helpers.py:405 +#: ../src/common/helpers.py:407 msgid "watching a movie" msgstr "Film schauen" -#: ../src/common/helpers.py:406 +#: ../src/common/helpers.py:408 msgid "sunbathing" msgstr "Sonnenbaden" -#: ../src/common/helpers.py:406 +#: ../src/common/helpers.py:408 msgid "socializing" msgstr "Kontakte knüpfen" -#: ../src/common/helpers.py:407 +#: ../src/common/helpers.py:409 msgid "running an errand" msgstr "Besorgungen machen" -#: ../src/common/helpers.py:407 +#: ../src/common/helpers.py:409 msgid "taking a bath" msgstr "Ein Bad nehmen" -#: ../src/common/helpers.py:408 +#: ../src/common/helpers.py:410 msgid "in real life" msgstr "Im wahren Leben" -#: ../src/common/helpers.py:408 +#: ../src/common/helpers.py:410 msgid "on a plane" msgstr "Im Flugzeug" -#: ../src/common/helpers.py:409 +#: ../src/common/helpers.py:411 msgid "shopping" msgstr "Beim Einkaufen" -#: ../src/common/helpers.py:409 +#: ../src/common/helpers.py:411 msgid "on a train" msgstr "Im Zug" -#: ../src/common/helpers.py:409 +#: ../src/common/helpers.py:411 msgid "running" msgstr "Laufen" -#: ../src/common/helpers.py:410 +#: ../src/common/helpers.py:412 msgid "taking a shower" msgstr "Unter der Dusche" -#: ../src/common/helpers.py:410 +#: ../src/common/helpers.py:412 msgid "jogging" msgstr "Beim Joggen" -#: ../src/common/helpers.py:411 +#: ../src/common/helpers.py:413 msgid "in a meeting" msgstr "In einer Besprechung" -#: ../src/common/helpers.py:411 +#: ../src/common/helpers.py:413 msgid "in a car" msgstr "Im Auto" -#: ../src/common/helpers.py:412 +#: ../src/common/helpers.py:414 msgid "studying" msgstr "Lerne" -#: ../src/common/helpers.py:412 +#: ../src/common/helpers.py:414 msgid "swimming" msgstr "Schwimmen" -#: ../src/common/helpers.py:413 +#: ../src/common/helpers.py:415 msgid "having coffee" msgstr "Kaffee trinken" -#: ../src/common/helpers.py:452 +#: ../src/common/helpers.py:454 msgid "is paying attention to the conversation" msgstr "beobachtet diese Unterhaltung" -#: ../src/common/helpers.py:454 +#: ../src/common/helpers.py:456 msgid "is doing something else" msgstr "tut etwas anderes" -#: ../src/common/helpers.py:456 +#: ../src/common/helpers.py:458 msgid "is composing a message..." msgstr "schreibt im Moment ..." #. paused means he or she was composing but has stopped for a while -#: ../src/common/helpers.py:459 +#: ../src/common/helpers.py:461 msgid "paused composing a message" msgstr "macht gerade eine Schreibpause" -#: ../src/common/helpers.py:461 +#: ../src/common/helpers.py:463 msgid "has closed the chat window or tab" msgstr "hat das Chatfenster oder den Tab geschlossen" -#: ../src/common/helpers.py:1032 ../src/common/helpers.py:1039 +#: ../src/common/helpers.py:1037 ../src/common/helpers.py:1044 #, python-format msgid "%d message pending" msgid_plural "%d messages pending" msgstr[0] "%d Nachricht schwebend" msgstr[1] "%d Nachrichten schwebend" -#: ../src/common/helpers.py:1045 +#: ../src/common/helpers.py:1050 #, python-format msgid " from room %s" msgstr "Von Gruppenchat %s" -#: ../src/common/helpers.py:1048 ../src/common/helpers.py:1067 +#: ../src/common/helpers.py:1053 ../src/common/helpers.py:1072 #, python-format msgid " from user %s" msgstr "Von Benutzer %s" -#: ../src/common/helpers.py:1050 +#: ../src/common/helpers.py:1055 #, python-format msgid " from %s" msgstr "Von %s" -#: ../src/common/helpers.py:1057 ../src/common/helpers.py:1064 +#: ../src/common/helpers.py:1062 ../src/common/helpers.py:1069 #, python-format msgid "%d event pending" msgid_plural "%d events pending" msgstr[0] "%d Ereignis anstehend" msgstr[1] "%d Ereignisse anstehend" -#: ../src/common/helpers.py:1097 +#: ../src/common/helpers.py:1102 #, python-format msgid "Gajim - %s" msgstr "Gajim - %s" @@ -5455,7 +5425,7 @@ #: ../src/config.py:436 msgid "Always use OS/X default applications" -msgstr "" +msgstr "OS/X Standardprogramme immer verwenden" #: ../src/config.py:437 msgid "Custom" @@ -5787,16 +5757,16 @@ msgid "Removing %s account" msgstr "Entferne Konto %s" -#: ../src/config.py:2538 ../src/gajim.py:1484 ../src/roster_window.py:1811 +#: ../src/config.py:2538 ../src/gajim.py:1309 ../src/roster_window.py:1750 msgid "Password Required" msgstr "Passwort benötigt" -#: ../src/config.py:2539 ../src/roster_window.py:1805 +#: ../src/config.py:2539 ../src/roster_window.py:1744 #, python-format msgid "Enter your password for account %s" msgstr "Geben Sie ihr Passwort für %s ein" -#: ../src/config.py:2540 ../src/roster_window.py:1812 +#: ../src/config.py:2540 ../src/roster_window.py:1751 msgid "Save password" msgstr "Passwort speichern" @@ -5877,14 +5847,16 @@ msgid "Please provide a server on which you want to register." msgstr "Bitte geben Sie an, bei dem Sie sich registrieren möchten." -#: ../src/config.py:3153 ../src/gajim.py:2190 +#: ../src/config.py:3153 ../src/gajim.py:2023 msgid "Certificate Already in File" msgstr "Zertifikat schon in der Datei" -#: ../src/config.py:3154 ../src/gajim.py:2191 +#: ../src/config.py:3154 ../src/gajim.py:2024 #, python-format msgid "This certificate is already in file %s, so it's not added again." msgstr "" +"Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in Datei %" +"s befindet." #: ../src/config.py:3222 #, python-format @@ -5895,8 +5867,13 @@ "SSL Error: %s\n" "Do you still want to connect to this server?" msgstr "" +"Sicherheitswartnung\n" +"\n" +"Die Echtheit des SSL-Zertifikates %s könnte ungültig sein.\n" +"SSL-Fehler: %s\n" +"Möchten Sie dennoch zum Server verbinden?" -#: ../src/config.py:3228 ../src/gajim.py:2214 +#: ../src/config.py:3228 ../src/gajim.py:2047 #, python-format msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -6181,7 +6158,7 @@ msgid "Subscription request from %s" msgstr "Abonnement-Anforderung von %s" -#: ../src/dialogs.py:1635 ../src/gajim.py:2761 ../src/roster_window.py:1161 +#: ../src/dialogs.py:1635 ../src/gajim.py:2592 ../src/roster_window.py:1101 #, python-format msgid "You are already in group chat %s" msgstr "Sie sind bereits im Gruppenchat %s" @@ -6199,18 +6176,18 @@ msgid "Invalid Nickname" msgstr "Ungültiger Benutzername" -#: ../src/dialogs.py:1734 ../src/groupchat_control.py:1329 -#: ../src/groupchat_control.py:1601 +#: ../src/dialogs.py:1734 ../src/groupchat_control.py:1331 +#: ../src/groupchat_control.py:1603 msgid "The nickname has not allowed characters." msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen." #: ../src/dialogs.py:1738 ../src/dialogs.py:1744 -#: ../src/groupchat_control.py:1768 +#: ../src/groupchat_control.py:1771 msgid "Invalid group chat Jabber ID" msgstr "Ungültige Jabber-ID für den Gruppenchat" #: ../src/dialogs.py:1739 ../src/dialogs.py:1745 -#: ../src/groupchat_control.py:1769 +#: ../src/groupchat_control.py:1772 msgid "The group chat Jabber ID has not allowed characters." msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen." @@ -6331,32 +6308,32 @@ msgid "New Private Message" msgstr "Neue private Nachricht" -#: ../src/dialogs.py:2032 ../src/gajim.py:1661 ../src/notify.py:469 +#: ../src/dialogs.py:2032 ../src/gajim.py:1493 ../src/notify.py:469 #: ../src/osx/growler.py:13 msgid "New E-mail" msgstr "Neue E-Mail" -#: ../src/dialogs.py:2034 ../src/gajim.py:1726 ../src/notify.py:463 +#: ../src/dialogs.py:2034 ../src/gajim.py:1559 ../src/notify.py:463 #: ../src/osx/growler.py:14 msgid "File Transfer Request" msgstr "Dateitransfer Anfrage" -#: ../src/dialogs.py:2036 ../src/gajim.py:1633 ../src/gajim.py:1693 +#: ../src/dialogs.py:2036 ../src/gajim.py:1458 ../src/gajim.py:1526 #: ../src/notify.py:465 ../src/osx/growler.py:14 msgid "File Transfer Error" msgstr "Dateitransfer-Fehler" -#: ../src/dialogs.py:2038 ../src/gajim.py:1765 ../src/gajim.py:1787 -#: ../src/gajim.py:1804 ../src/notify.py:467 ../src/osx/growler.py:15 +#: ../src/dialogs.py:2038 ../src/gajim.py:1598 ../src/gajim.py:1620 +#: ../src/gajim.py:1637 ../src/notify.py:467 ../src/osx/growler.py:15 msgid "File Transfer Completed" msgstr "Dateitransfer beendet" -#: ../src/dialogs.py:2039 ../src/gajim.py:1768 ../src/notify.py:467 +#: ../src/dialogs.py:2039 ../src/gajim.py:1601 ../src/notify.py:467 #: ../src/osx/growler.py:15 msgid "File Transfer Stopped" msgstr "Dateitransfer gestoppt" -#: ../src/dialogs.py:2041 ../src/gajim.py:1505 ../src/notify.py:471 +#: ../src/dialogs.py:2041 ../src/gajim.py:1330 ../src/notify.py:471 #: ../src/osx/growler.py:16 msgid "Groupchat Invitation" msgstr "Gruppenchat-Einladung" @@ -6833,22 +6810,10 @@ msgstr "Erfordert python-crypto" #: ../src/features_window.py:102 -msgid "Off the Record Encryption" -msgstr "OTR-Verschlüsselung" - -#: ../src/features_window.py:103 -msgid "Encrypting chatmessages in a way that even works through gateways." -msgstr "Verschlüssltes Kommunizieren, welches auch über Transporte möglich ist" - -#: ../src/features_window.py:104 ../src/features_window.py:105 -msgid "Requires pyotr and libotr (see http://trac.gajim.org/wiki/OTR)." -msgstr "Erfordert pyotr und libotr (http://trac.gajim.org/wiki/OTR)." - -#: ../src/features_window.py:106 msgid "RST Generator" msgstr "RST Generator" -#: ../src/features_window.py:107 +#: ../src/features_window.py:103 msgid "" "Generate XHTML output from RST code (see http://docutils.sourceforge.net/" "docs/ref/rst/restructuredtext.html)." @@ -6856,23 +6821,23 @@ "Erzeug aus RST-Code XHTML-Ausgaben (siehe http://docutils.sourceforge.net/" "docs/ref/rst/restructuredtext.html)." -#: ../src/features_window.py:108 ../src/features_window.py:109 +#: ../src/features_window.py:104 ../src/features_window.py:105 msgid "Requires python-docutils." msgstr "Erfordert python-docutils." -#: ../src/features_window.py:110 +#: ../src/features_window.py:106 msgid "libsexy" -msgstr "" +msgstr "libsexy" -#: ../src/features_window.py:111 +#: ../src/features_window.py:107 msgid "Ability to have clickable URLs in chat and groupchat window banners." msgstr "Anklickbare URLs im Chat-Fenster." -#: ../src/features_window.py:112 ../src/features_window.py:113 +#: ../src/features_window.py:108 ../src/features_window.py:109 msgid "Requires python-sexy." msgstr "Erfordert python-sexy." -#: ../src/features_window.py:127 +#: ../src/features_window.py:123 msgid "Feature" msgstr "Fähigkeit" @@ -7065,31 +7030,35 @@ msgid "%s is not a valid loglevel" msgstr "%s ist kein gültiger Loglevel." -#: ../src/gajim.py:145 +#: ../src/gajim.py:153 +msgid "No X11 running and failed to start it! Quitting..." +msgstr "Kein laufender X-Server und Start erfolglos! Breche ab ..." + +#: ../src/gajim.py:156 msgid "Gajim needs X server to run. Quiting..." msgstr "Gajim benötigt einen laufenden X-Server. Breche ab ..." -#: ../src/gajim.py:175 +#: ../src/gajim.py:186 msgid "Gajim needs PyGTK 2.8 or above" msgstr "Gajim benötigt PyGTK 2.6 oder höher" -#: ../src/gajim.py:176 +#: ../src/gajim.py:187 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..." msgstr "Gajim benötigt PyGTK 2.6 oder höher. Breche ab ..." -#: ../src/gajim.py:178 +#: ../src/gajim.py:189 msgid "Gajim needs GTK 2.8 or above" msgstr "Gajim benötigt GTK 2.6 oder höher" -#: ../src/gajim.py:179 +#: ../src/gajim.py:190 msgid "Gajim needs GTK 2.8 or above to run. Quiting..." msgstr "Gajim benötigt GTK 2.6+. Breche ab ..." -#: ../src/gajim.py:184 +#: ../src/gajim.py:195 msgid "GTK+ runtime is missing libglade support" msgstr "GTK+ runtine fehlt libglade-Unterstützung" -#: ../src/gajim.py:186 +#: ../src/gajim.py:197 #, python-format msgid "" "Please remove your current GTK+ runtime and install the latest stable " @@ -7098,22 +7067,22 @@ "Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren " "Sie die aktuelle Version von %s" -#: ../src/gajim.py:188 +#: ../src/gajim.py:199 msgid "" "Please make sure that GTK+ and PyGTK have libglade support in your system." msgstr "" "Bitte stellen Sie sicher, dass GTK+ und PyGTK auf Ihrem System libglade-" "Unterstützung besitzen." -#: ../src/gajim.py:193 +#: ../src/gajim.py:204 msgid "Gajim needs PySQLite2 to run" msgstr "Gajim benötigt PySQLite2 zum Starten" -#: ../src/gajim.py:201 +#: ../src/gajim.py:212 msgid "Gajim needs pywin32 to run" msgstr "Gajim benötigt pywin32 zum Laufen" -#: ../src/gajim.py:202 +#: ../src/gajim.py:213 #, python-format msgid "" "Please make sure that Pywin32 is installed on your system. You can get it at " @@ -7122,36 +7091,12 @@ "Bitte stellen Sie sicher das Pywin32 auf Ihrem System installiert ist. Sie " "können es unter folgender URL herunterladen: %s " -#: ../src/gajim.py:328 -msgid "Generating..." -msgstr "Generiere ..." - -#: ../src/gajim.py:332 -#, python-format -msgid "Generating a private key for %s..." -msgstr "" - -#: ../src/gajim.py:354 -#, python-format -msgid "" -"Generating a private key for %s...\n" -"done." -msgstr "" - -#: ../src/gajim.py:385 -msgid "" -"\n" -"This user has requested an Off-the-Record private conversation. However, you " -"do not have a plugin to support that.\n" -"See http://otr.cypherpunks.ca/ for more information." -msgstr "" - #. set the icon to all newly opened wind -#: ../src/gajim.py:567 +#: ../src/gajim.py:370 msgid "Gajim is already running" msgstr "Gajim läuft bereits" -#: ../src/gajim.py:568 +#: ../src/gajim.py:371 msgid "" "Another instance of Gajim seems to be running\n" "Run anyway?" @@ -7159,45 +7104,45 @@ "Eine andere Instanz von Gajim schein bereits zu laufen\n" "Trotzdem starten?" -#: ../src/gajim.py:697 +#: ../src/gajim.py:503 msgid "Do you accept this request?" msgstr "Akzeptieren Sie diese Anfrage?" -#: ../src/gajim.py:699 +#: ../src/gajim.py:505 #, python-format msgid "Do you accept this request on account %s?" msgstr "Akzeptieren Sie diese Anfrage vom %s Konto?" -#: ../src/gajim.py:702 +#: ../src/gajim.py:508 #, python-format msgid "HTTP (%s) Authorization for %s (id: %s)" msgstr "HTTP (%s) Autorisierung für %s (id: %s)" -#: ../src/gajim.py:750 ../src/notify.py:475 ../src/osx/growler.py:17 +#: ../src/gajim.py:556 ../src/notify.py:475 ../src/osx/growler.py:17 msgid "Connection Failed" msgstr "Verbindung fehlgeschlagen" #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) -#: ../src/gajim.py:1007 ../src/gajim.py:1019 +#: ../src/gajim.py:836 ../src/gajim.py:848 #, python-format msgid "error while sending %s ( %s )" msgstr "Fehler beim Senden von %s ( %s )" -#: ../src/gajim.py:1052 +#: ../src/gajim.py:878 msgid "Authorization accepted" msgstr "Autorisierung akzeptiert" -#: ../src/gajim.py:1053 +#: ../src/gajim.py:879 #, python-format msgid "The contact \"%s\" has authorized you to see his or her status." msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen." -#: ../src/gajim.py:1072 +#: ../src/gajim.py:898 #, python-format msgid "Contact \"%s\" removed subscription from you" msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen" -#: ../src/gajim.py:1073 +#: ../src/gajim.py:899 msgid "" "You will always see him or her as offline.\n" "Do you want to remove him or her from your contact list?" @@ -7205,69 +7150,69 @@ "Du wirst sie oder ihn immer als offline sehen.\n" "Möchtest du sie oder ihn von deiner Kontaktliste entfernen?" -#: ../src/gajim.py:1115 +#: ../src/gajim.py:940 #, python-format msgid "Contact with \"%s\" cannot be established" msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden" -#: ../src/gajim.py:1295 ../src/groupchat_control.py:1068 +#: ../src/gajim.py:1120 ../src/groupchat_control.py:1070 #, python-format msgid "%s is now known as %s" msgstr "%s heißt jetzt %s" -#: ../src/gajim.py:1310 ../src/groupchat_control.py:1217 -#: ../src/roster_window.py:1918 +#: ../src/gajim.py:1135 ../src/groupchat_control.py:1219 +#: ../src/roster_window.py:1848 #, python-format msgid "%s is now %s" msgstr "%s ist jetzt %s" #. Can be a presence (see chg_contact_status in groupchat_control.py) #. Can be a message (see handle_event_gc_config_change in gajim.py) -#: ../src/gajim.py:1432 ../src/groupchat_control.py:1028 +#: ../src/gajim.py:1257 ../src/groupchat_control.py:1030 msgid "Any occupant is allowed to see your full JID" msgstr "Jeder Teilnehmer darf Ihre volle JID sehen" -#: ../src/gajim.py:1435 +#: ../src/gajim.py:1260 msgid "Room now shows unavailable member" msgstr "Raum zeigt jetzt abwesende Teilnehmer" -#: ../src/gajim.py:1437 +#: ../src/gajim.py:1262 msgid "room now does not show unavailable members" msgstr "Raum zeigt jetzt abwesende Teilnehmer nicht an" -#: ../src/gajim.py:1440 +#: ../src/gajim.py:1265 msgid "A non-privacy-related room configuration change has occurred" msgstr "" "Eine nicht Privatsphären-bezogene Raum-Konfigurations-Änderung ist " "aufgetreten" #. Can be a presence (see chg_contact_status in groupchat_control.py) -#: ../src/gajim.py:1443 +#: ../src/gajim.py:1268 msgid "Room logging is now enabled" msgstr "Raum-Mitschnitt ist jetzt aktiviert" -#: ../src/gajim.py:1445 +#: ../src/gajim.py:1270 msgid "Room logging is now disabled" msgstr "Raum-Mitschnitt ist jetzt deaktiviert" -#: ../src/gajim.py:1447 +#: ../src/gajim.py:1272 msgid "Room is now non-anonymous" msgstr "Raum ist jetzt un-anonym" -#: ../src/gajim.py:1450 +#: ../src/gajim.py:1275 msgid "Room is now semi-anonymous" msgstr "Raum ist jetzt semi-anonym" -#: ../src/gajim.py:1453 +#: ../src/gajim.py:1278 msgid "Room is now fully-anonymous" msgstr "Raum ist jetzt voll anonym" -#: ../src/gajim.py:1485 +#: ../src/gajim.py:1310 #, python-format msgid "A Password is required to join the room %s. Please type it." msgstr "Für das Betreten des Gruppenchats-Raumes %s wird ein Passwort benötig." -#: ../src/gajim.py:1519 +#: ../src/gajim.py:1344 msgid "" "You configured Gajim to use GPG agent, but there is no GPG agent running or " "it returned a wrong passphrase.\n" @@ -7275,89 +7220,92 @@ "Du hast Gajim für die Verwendung des GPG-Agenten konfiguriert, aber es läuft " "kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n" -#: ../src/gajim.py:1521 +#: ../src/gajim.py:1346 msgid "You are currently connected without your OpenPGP key." msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden" -#: ../src/gajim.py:1524 +#: ../src/gajim.py:1349 msgid "Your passphrase is incorrect" msgstr "Ihre Passphrase ist falsch" -#: ../src/gajim.py:1541 ../src/secrets.py:44 +#: ../src/gajim.py:1366 ../src/secrets.py:44 msgid "Passphrase Required" msgstr "Passphrase benötigt" -#: ../src/gajim.py:1542 +#: ../src/gajim.py:1367 #, python-format msgid "Enter GPG key passphrase for account %s." msgstr "Geben Sie die GPG-Passphrase für das Konto %s ein." -#: ../src/gajim.py:1554 +#: ../src/gajim.py:1379 msgid "Wrong Passphrase" msgstr "Falsche Passphrase" -#: ../src/gajim.py:1555 +#: ../src/gajim.py:1380 msgid "Please retype your GPG passphrase or press Cancel." msgstr "" "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf " "Abbrechen." -#: ../src/gajim.py:1644 +#: ../src/gajim.py:1469 #, python-format msgid "New mail on %(gmail_mail_address)s" msgstr "Neue E-Mail auf %(gmail_mail_address)s" -#: ../src/gajim.py:1646 +#: ../src/gajim.py:1471 #, python-format msgid "You have %d new mail conversation" msgid_plural "You have %d new mail conversations" msgstr[0] "Sie haben %d ungelesene E-Mail-Nachricht" msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten" -#. FIXME: emulate Gtalk client popups. find out what they parse and how -#. they decide what to show -#. each message has a 'From', 'Subject' and 'Snippet' field -#: ../src/gajim.py:1655 +#: ../src/gajim.py:1485 #, python-format msgid "" "\n" -"From: %(from_address)s" +"\n" +"From: %(from_address)s\n" +"Subject: %(subject)s\n" +"%(snippet)s" msgstr "" "\n" -"Von: %(from_address)s" +"\n" +"Von: %(from_address)s\n" +"Betreff: %(subject)s\n" +"%(snippet)s" -#: ../src/gajim.py:1723 +#: ../src/gajim.py:1556 #, python-format msgid "%s wants to send you a file." msgstr "%s möchte ihnen eine Datei senden." -#: ../src/gajim.py:1788 +#: ../src/gajim.py:1621 #, python-format msgid "You successfully received %(filename)s from %(name)s." msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten." #. ft stopped -#: ../src/gajim.py:1792 +#: ../src/gajim.py:1625 #, python-format msgid "File transfer of %(filename)s from %(name)s stopped." msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt." -#: ../src/gajim.py:1805 +#: ../src/gajim.py:1638 #, python-format msgid "You successfully sent %(filename)s to %(name)s." msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet." #. ft stopped -#: ../src/gajim.py:1809 +#: ../src/gajim.py:1642 #, python-format msgid "File transfer of %(filename)s to %(name)s stopped." msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt." -#: ../src/gajim.py:1936 ../src/gajim.py:1980 +#: ../src/gajim.py:1769 ../src/gajim.py:1813 msgid "Confirm these session options" msgstr "Bestätigen Sie diese Sitzungs-Optionen" -#: ../src/gajim.py:1937 +#: ../src/gajim.py:1770 #, python-format msgid "" "The remote client wants to negotiate an session with these features:\n" @@ -7372,7 +7320,7 @@ "\n" "\t\tSind diese Einstellungen akzeptabel?" -#: ../src/gajim.py:1981 +#: ../src/gajim.py:1814 #, python-format msgid "" "The remote client selected these options:\n" @@ -7387,32 +7335,32 @@ "\n" "Mit der Sitzung fortfahren?" -#: ../src/gajim.py:2100 +#: ../src/gajim.py:1933 msgid "Username Conflict" msgstr "Benutzernamenkonflikt" -#: ../src/gajim.py:2101 +#: ../src/gajim.py:1934 msgid "Please type a new username for your local account" msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein" -#: ../src/gajim.py:2116 ../src/gajim.py:2118 +#: ../src/gajim.py:1949 ../src/gajim.py:1951 msgid "Ping?" msgstr "Ping?" -#: ../src/gajim.py:2124 ../src/gajim.py:2126 +#: ../src/gajim.py:1957 ../src/gajim.py:1959 #, python-format msgid "Pong! (%s s.)" msgstr "Pong! (%s s.)" -#: ../src/gajim.py:2130 ../src/gajim.py:2132 +#: ../src/gajim.py:1963 ../src/gajim.py:1965 msgid "Error." msgstr "Fehler:" -#: ../src/gajim.py:2157 +#: ../src/gajim.py:1990 msgid "Resource Conflict" msgstr "Resourcenkonflikt" -#: ../src/gajim.py:2158 +#: ../src/gajim.py:1991 msgid "" "You are already connected to this account with the same resource. Please " "type a new one" @@ -7420,11 +7368,11 @@ "Sie sind mit diesem Konto bereits mit derselben Ressource verbunden.Bitte " "geben Sie eine neue ein" -#: ../src/gajim.py:2211 +#: ../src/gajim.py:2044 msgid "Error verifying SSL certificate" msgstr "Fehler bei der Überprüfung des SSL-Zertifikats" -#: ../src/gajim.py:2212 +#: ../src/gajim.py:2045 #, python-format msgid "" "There was an error verifying the SSL certificate of your jabber server: %" @@ -7435,15 +7383,15 @@ "Servers auf: %(error)s\n" "Möchtest du dich dennoch zum Server verbinden?" -#: ../src/gajim.py:2217 +#: ../src/gajim.py:2050 msgid "Ignore this error for this certificate." msgstr "Ignoriere den Fehler für dieses Zertifikat." -#: ../src/gajim.py:2232 +#: ../src/gajim.py:2065 msgid "SSL certificate error" msgstr "SSL-Zertifikat-Fehler" -#: ../src/gajim.py:2233 +#: ../src/gajim.py:2066 #, python-format msgid "" "It seems the SSL certificate has changed or your connection is being " @@ -7460,11 +7408,11 @@ "\n" "Möchten Sie noch verbinden und den Fingerprint des Zertifikats aktualisieren?" -#: ../src/gajim.py:2252 +#: ../src/gajim.py:2085 msgid "Insecure connection" msgstr "Unsichere Verbindung" -#: ../src/gajim.py:2253 +#: ../src/gajim.py:2086 msgid "" "You are about to send your password on an insecure connection. Are you sure " "you want to do that?" @@ -7472,26 +7420,26 @@ "Sie sind dabei Ihr Passwort über eine unsichere Verbindung zu senden. Sind " "Sie sicher, dass Sie das wollen?" -#: ../src/gajim.py:2255 ../src/groupchat_control.py:1695 -#: ../src/roster_window.py:3665 +#: ../src/gajim.py:2088 ../src/groupchat_control.py:1698 +#: ../src/roster_window.py:3580 msgid "Do _not ask me again" msgstr "_Nicht noch einmal fragen" -#: ../src/gajim.py:2268 +#: ../src/gajim.py:2101 msgid "PEP node was not removed" msgstr "PEP Knoten wurde nicht entfernt" -#: ../src/gajim.py:2269 +#: ../src/gajim.py:2102 #, python-format msgid "PEP node %s was not removed: %s" msgstr "PEP Knoten %s wurde nicht entfernt: %s" #. theme doesn't exist, disable emoticons -#: ../src/gajim.py:2719 ../src/gajim.py:2740 +#: ../src/gajim.py:2551 ../src/gajim.py:2572 msgid "Emoticons disabled" msgstr "Emoticons deaktiviert" -#: ../src/gajim.py:2720 +#: ../src/gajim.py:2552 msgid "" "Your configured emoticons theme has not been found, so emoticons have been " "disabled." @@ -7499,7 +7447,7 @@ "Das konfigurierte Emoticon-Thema wurde nicht gefunden. Emoticans sind " "deaktiviert." -#: ../src/gajim.py:2741 +#: ../src/gajim.py:2573 msgid "" "Your configured emoticons theme cannot been loaded. You maybe need to update " "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons " @@ -7509,42 +7457,42 @@ "vielleicht das Format der Datei emoticons.py aktualisieren. Gehe auf http://" "trac.gajim.org/wiki/Emoticons für mehr Informationen." -#: ../src/gajim.py:2769 ../src/roster_window.py:1169 -#: ../src/roster_window.py:3215 +#: ../src/gajim.py:2600 ../src/roster_window.py:1109 +#: ../src/roster_window.py:3130 msgid "You cannot join a group chat while you are invisible" msgstr "" "Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind." #. it is good to notify the user #. in case he or she cannot see the output of the console -#: ../src/gajim.py:3031 +#: ../src/gajim.py:2858 msgid "Could not save your settings and preferences" msgstr "Konnte Einstellungen nicht speichern" -#: ../src/gajim.py:3123 +#: ../src/gajim.py:2950 msgid "Bookmark already set" msgstr "Lesezeichen existiert schon" -#: ../src/gajim.py:3124 +#: ../src/gajim.py:2951 #, python-format msgid "Group Chat \"%s\" is already in your bookmarks." msgstr "Der Gruppenchat \"%s\" ist schon in den Lesezeichen." -#: ../src/gajim.py:3137 +#: ../src/gajim.py:2964 msgid "Bookmark has been added successfully" msgstr "Lesezeichen wurde erfolgreich hinzugefügt" -#: ../src/gajim.py:3138 +#: ../src/gajim.py:2965 msgid "You can manage your bookmarks via Actions menu in your roster." msgstr "" "Sie können ihre Lesezeichen über das Aktionen-Menü in der Kontaktliste " "bearbeiten" -#: ../src/gajim.py:3325 +#: ../src/gajim.py:3152 msgid "Network Manager support not available" msgstr "Unterstützung für Network Manager nicht verfügbar" -#: ../src/gajim.py:3438 +#: ../src/gajim.py:3265 msgid "Session Management support not available (missing gnome.ui module)" msgstr "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)" @@ -7975,106 +7923,106 @@ msgid "Continued conversation" msgstr "Bestätigung abbrechen" -#: ../src/groupchat_control.py:956 +#: ../src/groupchat_control.py:958 msgid "Really send file?" msgstr "Datei wirklich senden?" -#: ../src/groupchat_control.py:957 +#: ../src/groupchat_control.py:959 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "" "Wenn Sie eine Datei an %s senden wird er/sie Ihre echte Jabber ID kennen." #. Can be a message (see handle_event_gc_config_change in gajim.py) -#: ../src/groupchat_control.py:1031 +#: ../src/groupchat_control.py:1033 msgid "Room logging is enabled" msgstr "Raum-Mitschnitt ist aktiviert" -#: ../src/groupchat_control.py:1033 +#: ../src/groupchat_control.py:1035 msgid "A new room has been created" msgstr "Ein neuer Raum wurde erstellt" -#: ../src/groupchat_control.py:1036 +#: ../src/groupchat_control.py:1038 msgid "The server has assigned or modified your roomnick" msgstr "Der Server hat Ihren Raum-Nick zugewiesen oder verändert" #. do not print 'kicked by None' -#: ../src/groupchat_control.py:1042 +#: ../src/groupchat_control.py:1044 #, python-format msgid "%(nick)s has been kicked: %(reason)s" -msgstr "%(nick)s wurde rausgeschmissen: %(reason)s" +msgstr "%(nick)s wurde rausgeworfen: %(reason)s" -#: ../src/groupchat_control.py:1046 +#: ../src/groupchat_control.py:1048 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" -msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s" +msgstr "%(nick)s wurde von %(who)s rausgeworfen: %(reason)s" #. do not print 'banned by None' -#: ../src/groupchat_control.py:1053 +#: ../src/groupchat_control.py:1055 #, python-format msgid "%(nick)s has been banned: %(reason)s" msgstr "%(nick)s wurde gebannt: %(reason)s" -#: ../src/groupchat_control.py:1057 +#: ../src/groupchat_control.py:1059 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s" -#: ../src/groupchat_control.py:1066 +#: ../src/groupchat_control.py:1068 #, python-format msgid "You are now known as %s" msgstr "Sie heißen nun %s" -#: ../src/groupchat_control.py:1102 ../src/groupchat_control.py:1106 -#: ../src/groupchat_control.py:1111 +#: ../src/groupchat_control.py:1104 ../src/groupchat_control.py:1108 +#: ../src/groupchat_control.py:1113 #, python-format msgid "%(nick)s has been removed from the room (%(reason)s)" -msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s" +msgstr "%(nick)s wurde aus dem Raum geworfen: %(reason)s" -#: ../src/groupchat_control.py:1103 +#: ../src/groupchat_control.py:1105 msgid "affiliation changed" msgstr "Zugehörigkeit geändert: " -#: ../src/groupchat_control.py:1108 +#: ../src/groupchat_control.py:1110 msgid "room configuration changed to members-only" msgstr "Gruppenchatkonfiguration wurde auf ausschließlich Mitgleider geändert" -#: ../src/groupchat_control.py:1113 +#: ../src/groupchat_control.py:1115 msgid "system shutdown" msgstr "System wird heruntergefahren" -#: ../src/groupchat_control.py:1210 +#: ../src/groupchat_control.py:1212 #, python-format msgid "%s has left" msgstr "%s ist gegangen" -#: ../src/groupchat_control.py:1215 +#: ../src/groupchat_control.py:1217 #, python-format msgid "%s has joined the group chat" msgstr "%s hat den Gruppenchat betreten" #. Invalid Nickname #. invalid char -#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600 +#: ../src/groupchat_control.py:1330 ../src/groupchat_control.py:1602 msgid "Invalid nickname" msgstr "Ungültiger Benutzername" -#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370 -#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471 +#: ../src/groupchat_control.py:1354 ../src/groupchat_control.py:1372 +#: ../src/groupchat_control.py:1456 ../src/groupchat_control.py:1473 #, python-format msgid "Nickname not found: %s" msgstr "Spitzname nicht gefunden: %s" -#: ../src/groupchat_control.py:1386 +#: ../src/groupchat_control.py:1388 msgid "This group chat has no subject" msgstr "Dieser Gruppenchat hat kein Thema" -#: ../src/groupchat_control.py:1397 +#: ../src/groupchat_control.py:1399 #, python-format msgid "Invited %(contact_jid)s to %(room_jid)s." msgstr "%(contact_jid)s in %(room_jid)s eingeladen" -#: ../src/groupchat_control.py:1527 +#: ../src/groupchat_control.py:1529 #, python-format msgid "" "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The " @@ -8087,7 +8035,7 @@ "ein \"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es " "ebenfalls gebannt. Unterstützt KEINE Leerzeichen im Spitznamen." -#: ../src/groupchat_control.py:1534 +#: ../src/groupchat_control.py:1536 #, python-format msgid "" "Usage: /%s <nickname>, opens a private chat window with the specified " @@ -8096,7 +8044,7 @@ "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem " "Inhaber des angegebenen Spitznamens." -#: ../src/groupchat_control.py:1540 +#: ../src/groupchat_control.py:1542 #, python-format msgid "" "Usage: /%s [reason], closes the current window or tab, displaying reason if " @@ -8105,7 +8053,7 @@ "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige " "eines Grundes, falls angegeben." -#: ../src/groupchat_control.py:1546 +#: ../src/groupchat_control.py:1548 #, python-format msgid "" "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally " @@ -8114,7 +8062,7 @@ "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Gruppenchat ein, " "optional mit der Angabe eines Grundes." -#: ../src/groupchat_control.py:1550 +#: ../src/groupchat_control.py:1552 #, python-format msgid "" "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally " @@ -8123,7 +8071,7 @@ "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu " "Raum@Server an, optional mit Spitznamen." -#: ../src/groupchat_control.py:1554 +#: ../src/groupchat_control.py:1556 #, python-format msgid "" "Usage: /%s <nickname> [reason], removes the occupant specified by nickname " @@ -8134,7 +8082,7 @@ "Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen " "im Spitznamen." -#: ../src/groupchat_control.py:1563 +#: ../src/groupchat_control.py:1565 #, python-format msgid "" "Usage: /%s <nickname> [message], opens a private message window and sends " @@ -8144,25 +8092,25 @@ "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen " "Spitznamens." -#: ../src/groupchat_control.py:1568 +#: ../src/groupchat_control.py:1570 #, python-format msgid "Usage: /%s <nickname>, changes your nickname in current group chat." msgstr "" "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat." -#: ../src/groupchat_control.py:1572 +#: ../src/groupchat_control.py:1574 #, python-format msgid "Usage: /%s , display the names of group chat occupants." msgstr "Benutzung: /%s , zeigt die Namen der Gruppenchatbesucher." -#: ../src/groupchat_control.py:1576 +#: ../src/groupchat_control.py:1578 #, python-format msgid "Usage: /%s [topic], displays or updates the current group chat topic." msgstr "" "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-" "Thema." -#: ../src/groupchat_control.py:1579 +#: ../src/groupchat_control.py:1581 #, python-format msgid "" "Usage: /%s <message>, sends a message without looking for other commands." @@ -8170,41 +8118,41 @@ "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu " "beachten." -#: ../src/groupchat_control.py:1689 +#: ../src/groupchat_control.py:1692 #, python-format msgid "Are you sure you want to leave group chat \"%s\"?" msgstr "Möchten Sie den Gruppenchat \"%s\" wirklich verlassen?" -#: ../src/groupchat_control.py:1691 +#: ../src/groupchat_control.py:1694 msgid "" "If you close this window, you will be disconnected from this group chat." msgstr "" "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Gruppenchat " "geschlossen." -#: ../src/groupchat_control.py:1727 +#: ../src/groupchat_control.py:1730 msgid "Changing Subject" msgstr "Thema ändern" -#: ../src/groupchat_control.py:1728 +#: ../src/groupchat_control.py:1731 msgid "Please specify the new subject:" msgstr "Bitte bestimmen Sie ein neues Thema" -#: ../src/groupchat_control.py:1739 +#: ../src/groupchat_control.py:1742 msgid "Changing Nickname" msgstr "Spitzname ändern" -#: ../src/groupchat_control.py:1740 +#: ../src/groupchat_control.py:1743 msgid "Please specify the new nickname you want to use:" msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:" #. Ask for a reason -#: ../src/groupchat_control.py:1755 +#: ../src/groupchat_control.py:1758 #, python-format msgid "Destroying %s" msgstr "Zerstöre %s" -#: ../src/groupchat_control.py:1756 +#: ../src/groupchat_control.py:1759 msgid "" "You are going to definitively destroy this room.\n" "You may specify a reason below:" @@ -8212,22 +8160,22 @@ "Sie werden den Raum endgültig zerstören.\n" "Sie können hier einen Grund angeben:" -#: ../src/groupchat_control.py:1758 +#: ../src/groupchat_control.py:1761 msgid "You may also enter an alternate venue:" msgstr "Sie können auch einen alternativen Raum eintragen:" #. ask for reason -#: ../src/groupchat_control.py:1942 +#: ../src/groupchat_control.py:1945 #, python-format msgid "Kicking %s" msgstr "%s rausschmeißen" -#: ../src/groupchat_control.py:1943 ../src/groupchat_control.py:2247 +#: ../src/groupchat_control.py:1946 ../src/groupchat_control.py:2249 msgid "You may specify a reason below:" msgstr "Sie können eine Begründung angeben:" #. ask for reason -#: ../src/groupchat_control.py:2246 +#: ../src/groupchat_control.py:2248 #, python-format msgid "Banning %s" msgstr "%s verbannen" @@ -8517,18 +8465,18 @@ msgid "Retrieving profile..." msgstr "Empfange Profil ..." -#: ../src/profile_window.py:107 ../src/roster_window.py:2687 +#: ../src/profile_window.py:107 ../src/roster_window.py:2610 msgid "File is empty" msgstr "Datei ist leer" -#: ../src/profile_window.py:110 ../src/roster_window.py:2690 +#: ../src/profile_window.py:110 ../src/roster_window.py:2613 msgid "File does not exist" msgstr "Datei existiert nicht" #. keep identation #. unknown format #: ../src/profile_window.py:124 ../src/profile_window.py:140 -#: ../src/roster_window.py:2692 ../src/roster_window.py:2703 +#: ../src/roster_window.py:2615 ../src/roster_window.py:2626 msgid "Could not load image" msgstr "Konnte Bild nicht laden" @@ -8561,55 +8509,55 @@ "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler " "aufgetreten, versuchen Sie es später nochmals." -#: ../src/roster_window.py:265 ../src/roster_window.py:886 +#: ../src/roster_window.py:264 ../src/roster_window.py:871 msgid "Merged accounts" msgstr "Alle Konten" -#: ../src/roster_window.py:1752 +#: ../src/roster_window.py:1691 msgid "Authorization has been sent" msgstr "Autorisierung wurde erneut gesendet" -#: ../src/roster_window.py:1753 +#: ../src/roster_window.py:1692 #, python-format msgid "Now \"%s\" will know your status." msgstr "\"%s\" kennt jetzt ihren Status." -#: ../src/roster_window.py:1773 +#: ../src/roster_window.py:1712 msgid "Subscription request has been sent" msgstr "Abonnement-Anforderung wurde gesendet" -#: ../src/roster_window.py:1774 +#: ../src/roster_window.py:1713 #, python-format msgid "If \"%s\" accepts this request you will know his or her status." msgstr "Wenn \"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status." -#: ../src/roster_window.py:1786 +#: ../src/roster_window.py:1725 msgid "Authorization has been removed" msgstr "Autorisierung wurde entfernt" -#: ../src/roster_window.py:1787 +#: ../src/roster_window.py:1726 #, python-format msgid "Now \"%s\" will always see you as offline." msgstr "\"%s\" wird Sie nun immer als offline sehen." -#: ../src/roster_window.py:1808 -#, fuzzy +#: ../src/roster_window.py:1747 msgid "" "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started " "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)" msgstr "" -"Gnome Keyring ist installiert, aber nicht korrekt gestartet\t\t\t\t\t\t\t\t" -"(Umgebungsvariablen wahrscheinlich falsch gesetzt)" +"Gnome Keyring ist installiert, aber nicht \t\t\t\t\t\t\tkorrekt gestartet" +"(Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t\tkorrekt gesetzt " +"gesetzt)" -#: ../src/roster_window.py:1829 +#: ../src/roster_window.py:1768 msgid "GPG is not usable" msgstr "GPG ist nicht benutzbar" -#: ../src/roster_window.py:1991 ../src/roster_window.py:3138 +#: ../src/roster_window.py:1922 ../src/roster_window.py:3052 msgid "You are participating in one or more group chats" msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil" -#: ../src/roster_window.py:1992 ../src/roster_window.py:3139 +#: ../src/roster_window.py:1923 ../src/roster_window.py:3053 msgid "" "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" @@ -8617,15 +8565,15 @@ "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen " "Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?" -#: ../src/roster_window.py:2018 +#: ../src/roster_window.py:1949 msgid "desync'ed" msgstr "" -#: ../src/roster_window.py:2141 ../src/roster_window.py:2385 +#: ../src/roster_window.py:2072 ../src/roster_window.py:2315 msgid "You have unread messages" msgstr "Sie haben ungelesene Nachrichten" -#: ../src/roster_window.py:2142 +#: ../src/roster_window.py:2073 msgid "" "Messages will only be available for reading them later if you have history " "enabled and contact is in your roster." @@ -8633,16 +8581,16 @@ "Nachrichten werden nur für das spätere Lesen verfügbar sein, wenn der " "Verlauf aktiviert wurde und der Kontakt sich in der Kontaktliste befindet." -#: ../src/roster_window.py:2386 +#: ../src/roster_window.py:2316 msgid "You must read them before removing this transport." msgstr "Sie müssen sie alle lesen, bevor der Account entfernt wird." -#: ../src/roster_window.py:2389 +#: ../src/roster_window.py:2319 #, python-format msgid "Transport \"%s\" will be removed" msgstr "Transport \"%s\" wird entfernt" -#: ../src/roster_window.py:2390 +#: ../src/roster_window.py:2320 msgid "" "You will no longer be able to send and receive messages from contacts using " "this transport." @@ -8650,11 +8598,11 @@ "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport " "austauschen." -#: ../src/roster_window.py:2393 +#: ../src/roster_window.py:2323 msgid "Transports will be removed" msgstr "Transporte werden entfernt" -#: ../src/roster_window.py:2398 +#: ../src/roster_window.py:2328 #, python-format msgid "" "You will no longer be able to send and receive messages to contacts from " @@ -8664,51 +8612,51 @@ "austauschen: %s" #. it's jid -#: ../src/roster_window.py:2564 +#: ../src/roster_window.py:2494 msgid "Rename Contact" msgstr "Kontakt umbenennen" -#: ../src/roster_window.py:2565 +#: ../src/roster_window.py:2495 #, python-format msgid "Enter a new nickname for contact %s" msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein" -#: ../src/roster_window.py:2572 +#: ../src/roster_window.py:2502 msgid "Rename Group" msgstr "Gruppe umbenennen" -#: ../src/roster_window.py:2573 +#: ../src/roster_window.py:2503 #, python-format msgid "Enter a new name for group %s" msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein" -#: ../src/roster_window.py:2620 +#: ../src/roster_window.py:2550 msgid "Remove Group" msgstr "Gruppe entfernen" -#: ../src/roster_window.py:2621 +#: ../src/roster_window.py:2551 #, python-format msgid "Do you want to remove group %s from the roster?" msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?" -#: ../src/roster_window.py:2622 +#: ../src/roster_window.py:2552 msgid "Remove also all contacts in this group from your roster" msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen" -#: ../src/roster_window.py:2653 +#: ../src/roster_window.py:2576 msgid "Assign OpenPGP Key" msgstr "OpenPGP-Schlüssel Zuweisen" -#: ../src/roster_window.py:2654 +#: ../src/roster_window.py:2577 msgid "Select a key to apply to the contact" msgstr "Weisen Sie dem Kontakt einen Schüssel zu" -#: ../src/roster_window.py:3036 +#: ../src/roster_window.py:2950 #, python-format msgid "Contact \"%s\" will be removed from your roster" msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt" -#: ../src/roster_window.py:3040 +#: ../src/roster_window.py:2954 msgid "" "By removing this contact you also remove authorization resulting in him or " "her always seeing you as offline." @@ -8717,7 +8665,7 @@ "Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen " "wird." -#: ../src/roster_window.py:3045 +#: ../src/roster_window.py:2959 msgid "" "By removing this contact you also by default remove authorization resulting " "in him or her always seeing you as offline." @@ -8726,17 +8674,17 @@ "die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als " "offline sehen wird." -#: ../src/roster_window.py:3048 +#: ../src/roster_window.py:2962 msgid "I want this contact to know my status after removal" msgstr "" "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht" #. several contact to remove at the same time -#: ../src/roster_window.py:3052 +#: ../src/roster_window.py:2966 msgid "Contacts will be removed from your roster" msgstr "Kontakte werden von Ihrer Kontaktliste entfernt" -#: ../src/roster_window.py:3056 +#: ../src/roster_window.py:2970 #, python-format msgid "" "By removing these contacts:%s\n" @@ -8746,22 +8694,22 @@ "entziehen Sie ihnen auch die Berechtigung Ihren Status zu sehen, wodurch die " "Kontakte Sie nur noch als offline sehen werden." -#: ../src/roster_window.py:3094 +#: ../src/roster_window.py:3008 msgid "No account available" msgstr "Kein Konto vorhanden" -#: ../src/roster_window.py:3095 +#: ../src/roster_window.py:3009 msgid "You must create an account before you can chat with other contacts." msgstr "" "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden " "können." -#: ../src/roster_window.py:3582 +#: ../src/roster_window.py:3497 msgid "Metacontacts storage not supported by your server" msgstr "" "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt" -#: ../src/roster_window.py:3584 +#: ../src/roster_window.py:3499 msgid "" "Your server does not support storing metacontacts information. So those " "information will not be saved on next reconnection." @@ -8770,14 +8718,14 @@ "Informationen. Aus diesem Grund werden diese Informationen bei der nächsten " "Neuverbindung nicht gespeichert werden." -#: ../src/roster_window.py:3659 +#: ../src/roster_window.py:3574 msgid "" "You are about to create a metacontact. Are you sure you want to continue?" msgstr "" "Sie sind dabei einen Metakontakt zu erstellen. Wollen Sie wirklich " "fortfahren?" -#: ../src/roster_window.py:3661 +#: ../src/roster_window.py:3576 msgid "" "Metacontacts are a way to regroup several contacts in one line. Generally it " "is used when the same person has several Jabber accounts or transport " @@ -8787,11 +8735,11 @@ "gruppieren. Normalerweise benutzt man Sie, wenn eine Person mehrere Jabber- " "oder Transport-Konten hat." -#: ../src/roster_window.py:3774 +#: ../src/roster_window.py:3689 msgid "Invalid file URI:" msgstr "Ungültige Datei URI:" -#: ../src/roster_window.py:3785 +#: ../src/roster_window.py:3700 #, python-format msgid "Do you want to send this file to %s:" msgid_plural "Do you want to send those files to %s:" @@ -8803,124 +8751,123 @@ #. for chat_with #. for single message #. join gc -#: ../src/roster_window.py:4298 ../src/roster_window.py:4308 -#: ../src/roster_window.py:4317 ../src/systray.py:212 ../src/systray.py:217 -#: ../src/systray.py:223 +#: ../src/roster_window.py:4213 ../src/roster_window.py:4223 +#: ../src/roster_window.py:4232 ../src/systray.py:211 ../src/systray.py:216 +#: ../src/systray.py:222 #, python-format msgid "using account %s" msgstr "mit Konto %s" #. add -#: ../src/roster_window.py:4324 +#: ../src/roster_window.py:4239 #, python-format msgid "to %s account" msgstr "an Konto %s" #. disco -#: ../src/roster_window.py:4329 +#: ../src/roster_window.py:4244 #, python-format msgid "using %s account" msgstr "mit Konto %s" -#: ../src/roster_window.py:4410 +#: ../src/roster_window.py:4325 msgid "_Manage Bookmarks..." msgstr "Lesezeichen _verwalten ..." #. profile, avatar -#: ../src/roster_window.py:4429 +#: ../src/roster_window.py:4344 #, python-format msgid "of account %s" msgstr "von Konto %s" -#: ../src/roster_window.py:4469 +#: ../src/roster_window.py:4384 #, python-format msgid "for account %s" msgstr "für Konto %s" -#: ../src/roster_window.py:4523 ../src/roster_window.py:4637 +#: ../src/roster_window.py:4441 ../src/roster_window.py:4555 msgid "_Change Status Message" msgstr "Ändere _Statusnachricht" -#: ../src/roster_window.py:4554 -#, fuzzy +#: ../src/roster_window.py:4472 msgid "Publish Tune" -msgstr "_Veröffentliche Musiktitel" +msgstr "Musiktitel veröffentlichen" -#: ../src/roster_window.py:4559 +#: ../src/roster_window.py:4477 msgid "Mood" -msgstr "" +msgstr "Stimmung" -#: ../src/roster_window.py:4563 +#: ../src/roster_window.py:4481 msgid "Activity" msgstr "Aktivität" -#: ../src/roster_window.py:4568 +#: ../src/roster_window.py:4486 msgid "Configure Services..." msgstr "Dienste konfigurieren ..." -#: ../src/roster_window.py:4726 +#: ../src/roster_window.py:4643 msgid "_Maximize All" msgstr "Alle _maximieren" #. Send Group Message -#: ../src/roster_window.py:4734 ../src/roster_window.py:5219 +#: ../src/roster_window.py:4651 ../src/roster_window.py:5131 msgid "Send Group M_essage" msgstr "_Sende Nachricht an Gruppe" -#: ../src/roster_window.py:4742 +#: ../src/roster_window.py:4659 msgid "To all users" msgstr "An alle Benutzern" -#: ../src/roster_window.py:4746 +#: ../src/roster_window.py:4663 msgid "To all online users" msgstr "An alle angemeldeten Benutzer" -#: ../src/roster_window.py:5135 +#: ../src/roster_window.py:5047 msgid "I would like to add you to my roster" msgstr "Ich würde dich gerne in meine Liste aufnehmen" #. Manage Transport submenu -#: ../src/roster_window.py:5239 +#: ../src/roster_window.py:5151 msgid "_Manage Contacts" msgstr "Kontakte verwalten" #. Send single message -#: ../src/roster_window.py:5300 +#: ../src/roster_window.py:5212 msgid "Send Single Message" msgstr "Sende _einzelne Nachricht" #. Manage Transport submenu -#: ../src/roster_window.py:5356 +#: ../src/roster_window.py:5268 msgid "_Manage Transport" msgstr "Transports" #. Modify Transport -#: ../src/roster_window.py:5364 +#: ../src/roster_window.py:5276 msgid "_Modify Transport" msgstr "Trans_port ändern" -#: ../src/roster_window.py:5439 +#: ../src/roster_window.py:5351 msgid "_Maximize" msgstr "_Maximieren" -#: ../src/roster_window.py:5446 +#: ../src/roster_window.py:5358 msgid "_Disconnect" msgstr "_Verbindung trennen" -#: ../src/roster_window.py:5523 +#: ../src/roster_window.py:5435 msgid "_New Group Chat" msgstr "Neuer Gruppenchat" #. History manager -#: ../src/roster_window.py:5623 +#: ../src/roster_window.py:5535 msgid "History Manager" msgstr "_Verlaufsmanager" -#: ../src/roster_window.py:5632 +#: ../src/roster_window.py:5544 msgid "_Join New Group Chat" msgstr "_Gruppenchat betreten" -#: ../src/roster_window.py:5840 +#: ../src/roster_window.py:5754 msgid "Change Status Message..." msgstr "Ändere Statusnachricht ..." @@ -8966,11 +8913,11 @@ "Sie müssen eine Passphrase angeben um Ihre gespeicherten Passwörter zu " "verschlüsseln" -#: ../src/systray.py:169 +#: ../src/systray.py:168 msgid "_Change Status Message..." msgstr "Ändere _Statusnachricht ..." -#: ../src/systray.py:254 +#: ../src/systray.py:253 msgid "Hide this menu" msgstr "Versteckt dieses Menü" @@ -9047,7 +8994,6 @@ msgstr "Unbekannte Quelle" #: ../src/tooltips.py:615 -#, fuzzy msgid "Tune:" msgstr "Musiktitel:" @@ -9058,7 +9004,7 @@ "from %(source)s" msgstr "" "\"%(title)s\" von %(artist)s\n" -"von %/source)s" +"von %(source)s" #: ../src/tooltips.py:639 msgid "Download" @@ -9174,6 +9120,48 @@ msgid " resource with priority " msgstr " resource mit Priorität " +#~ msgid "Disk WriteError" +#~ msgstr "Fehler beim Schreiben auf Festplatte" + +#~ msgid "Subject: %s" +#~ msgstr "Thema: %s" + +#, fuzzy +#~ msgid "Authenticate contact" +#~ msgstr "Kontakt automatisch autorisieren" + +#~ msgid "End OTR " +#~ msgstr "OTR beenden " + +#~ msgid "OTR settings / fingerprint" +#~ msgstr "OTR Einstellungen / Fingerprint" + +#~ msgid "Off-the-Record Encryption" +#~ msgstr "OTR-Verschlüsselung" + +#~ msgid "Private conversation with %s lost." +#~ msgstr "Private Unterhaltung mit %s unterbrochen." + +#~ msgid "Off the Record Encryption" +#~ msgstr "OTR-Verschlüsselung" + +#~ msgid "Encrypting chatmessages in a way that even works through gateways." +#~ msgstr "" +#~ "Verschlüssltes Kommunizieren, welches auch über Transporte möglich ist" + +#~ msgid "Requires pyotr and libotr (see http://trac.gajim.org/wiki/OTR)." +#~ msgstr "Erfordert pyotr und libotr (http://trac.gajim.org/wiki/OTR)." + +#~ msgid "Generating..." +#~ msgstr "Generiere ..." + +#~ msgid "" +#~ "\n" +#~ "From: %(from_address)s" +#~ msgstr "" +#~ "\n" +#~ "Von: %(from_address)s" + #~ msgid "Click to see past conversation in this room" #~ msgstr "Klicken, um die früheren Unterhaltungen in diesem Raum zu sehen" @@ -9220,9 +9208,6 @@ #~ msgid "other" #~ msgstr "Sonstiges" -#~ msgid "Subject: %s" -#~ msgstr "Thema: %s" - #~ msgid "Musiktitel:" #~ msgstr "Art:" Modified: trunk/po/ru.po =================================================================== --- trunk/po/ru.po 2008-06-13 15:34:55 UTC (rev 9796) +++ trunk/po/ru.po 2008-06-13 15:41:47 UTC (rev 9797) @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-20 21:00+0200\n" -"PO-Revision-Date: 2008-04-20 21:52+0300\n" +"POT-Creation-Date: 2008-06-13 17:35+0200\n" +"PO-Revision-Date: 2008-06-13 19:18+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Русский <ru(a)li.org>\n" "MIME-Version: 1.0\n" @@ -303,27 +303,22 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:20 -#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1072 -#: ../src/common/helpers.py:1084 ../src/notify.py:500 ../src/notify.py:531 -#: ../src/notify.py:543 +#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1088 +#: ../src/common/helpers.py:1100 ../src/notify.py:498 ../src/notify.py:529 +#: ../src/notify.py:541 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) -#. Is this contact in this group ? #. General group cannot be changed #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/preferences_window.glade.h:50 +#: ../data/glade/preferences_window.glade.h:47 #: ../data/glade/zeroconf_properties_window.glade.h:7 -#: ../src/common/contacts.py:322 ../src/dialogs.py:100 ../src/dialogs.py:108 -#: ../src/dialogs.py:162 ../src/roster_window.py:338 -#: ../src/roster_window.py:577 ../src/roster_window.py:633 -#: ../src/roster_window.py:905 ../src/roster_window.py:1076 -#: ../src/roster_window.py:1192 ../src/roster_window.py:2627 -#: ../src/roster_window.py:4748 ../src/roster_window.py:4875 -#: ../src/roster_window.py:5040 +#: ../src/common/contacts.py:70 ../src/dialogs.py:100 ../src/dialogs.py:108 +#: ../src/dialogs.py:162 ../src/roster_window.py:2499 +#: ../src/roster_window.py:4765 msgid "General" msgstr "Общие" @@ -388,21 +383,21 @@ #: ../data/glade/account_modification_window.glade.h:27 #: ../data/glade/accounts_window.glade.h:36 -#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1588 -#: ../src/config.py:2075 ../src/config.py:3665 +#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1523 +#: ../src/config.py:2017 ../src/config.py:3619 msgid "No key selected" msgstr "Не выбран ключ" #. None means no proxy profile selected #. GPG Key #: ../data/glade/account_modification_window.glade.h:29 -#: ../data/glade/accounts_window.glade.h:38 ../src/config.py:1176 -#: ../src/config.py:1247 ../src/config.py:1496 ../src/config.py:1501 -#: ../src/config.py:1982 ../src/config.py:2060 ../src/config.py:2074 -#: ../src/config.py:3165 ../src/config.py:3233 ../src/config.py:3655 -#: ../src/config.py:3664 ../src/dialogs.py:304 ../src/dialogs.py:306 -#: ../src/roster_window.py:2710 ../src/roster_window.py:2717 -#: ../src/roster_window.py:2724 +#: ../data/glade/accounts_window.glade.h:38 ../src/config.py:1112 +#: ../src/config.py:1183 ../src/config.py:1431 ../src/config.py:1436 +#: ../src/config.py:1924 ../src/config.py:2002 ../src/config.py:2016 +#: ../src/config.py:3115 ../src/config.py:3183 ../src/config.py:3609 +#: ../src/config.py:3618 ../src/dialogs.py:304 ../src/dialogs.py:306 +#: ../src/roster_window.py:2568 ../src/roster_window.py:2575 +#: ../src/roster_window.py:2582 msgid "None" msgstr "Нет" @@ -568,7 +563,7 @@ #: ../data/glade/accounts_window.glade.h:32 #: ../data/glade/zeroconf_information_window.glade.h:4 -#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:607 +#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:643 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -583,7 +578,7 @@ msgstr "_Объединить учетные записи" #. Rename -#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:4827 +#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:4717 msgid "Re_name" msgstr "П_ереименовать" @@ -787,7 +782,7 @@ msgstr "Условия" #: ../data/glade/advanced_notifications_window.glade.h:4 -#: ../data/glade/preferences_window.glade.h:16 +#: ../data/glade/preferences_window.glade.h:15 msgid "Sounds" msgstr "Звуки" @@ -804,7 +799,7 @@ msgstr "Все статусы" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:96 ../src/common/helpers.py:257 +#: ../src/common/commands.py:96 ../src/common/helpers.py:270 msgid "Away" msgstr "Ушел" @@ -821,7 +816,7 @@ msgstr "Есть " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:267 +#: ../src/common/helpers.py:280 msgid "Invisible" msgstr "Невидимка" @@ -830,7 +825,7 @@ msgstr "Выполнить команду" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:240 +#: ../src/common/helpers.py:253 msgid "Not Available" msgstr "Недоступен" @@ -1040,39 +1035,35 @@ msgstr "_Начать беседу" #: ../data/glade/chat_control_popup_menu.glade.h:1 -msgid "Click to see past conversations with this contact" -msgstr "Щелкните для просмотра последних бесед с этим человеком" - -#: ../data/glade/chat_control_popup_menu.glade.h:2 msgid "Invite _Contacts" msgstr "Пригласить _участников" -#: ../data/glade/chat_control_popup_menu.glade.h:3 +#: ../data/glade/chat_control_popup_menu.glade.h:2 #: ../data/glade/gc_occupants_menu.glade.h:3 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4 msgid "Send _File" msgstr "Отправить _файл" -#: ../data/glade/chat_control_popup_menu.glade.h:4 +#: ../data/glade/chat_control_popup_menu.glade.h:3 msgid "Toggle End to End Encryption" msgstr "Включить End to End шифрование" -#: ../data/glade/chat_control_popup_menu.glade.h:5 +#: ../data/glade/chat_control_popup_menu.glade.h:4 msgid "Toggle Open_PGP Encryption" msgstr "Включить Open_PGP шифрование" -#: ../data/glade/chat_control_popup_menu.glade.h:6 +#: ../data/glade/chat_control_popup_menu.glade.h:5 #: ../data/glade/gc_occupants_menu.glade.h:4 msgid "_Add to Roster" msgstr "_Добавить в ростер" -#: ../data/glade/chat_control_popup_menu.glade.h:7 -#: ../data/glade/gc_control_popup_menu.glade.h:7 +#: ../data/glade/chat_control_popup_menu.glade.h:6 +#: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:7 #: ../data/glade/roster_contact_context_menu.glade.h:16 #: ../data/glade/roster_window.glade.h:20 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5476 +#: ../src/roster_window.py:5368 msgid "_History" msgstr "_История" @@ -1275,26 +1266,22 @@ msgstr "Изменить _тему" #: ../data/glade/gc_control_popup_menu.glade.h:3 -msgid "Click to see past conversation in this room" -msgstr "Щелкните для просмотра бесед в этой комнате" - -#: ../data/glade/gc_control_popup_menu.glade.h:4 msgid "Configure _Room..." msgstr "Настроить _комнату" -#: ../data/glade/gc_control_popup_menu.glade.h:5 +#: ../data/glade/gc_control_popup_menu.glade.h:4 msgid "_Bookmark" msgstr "Добавить эту комнату в _закладки" -#: ../data/glade/gc_control_popup_menu.glade.h:6 +#: ../data/glade/gc_control_popup_menu.glade.h:5 msgid "_Destroy Room" msgstr "_Уничтожить комнату" -#: ../data/glade/gc_control_popup_menu.glade.h:8 +#: ../data/glade/gc_control_popup_menu.glade.h:7 msgid "_Manage Room" msgstr "_Управление комнатой" -#: ../data/glade/gc_control_popup_menu.glade.h:9 +#: ../data/glade/gc_control_popup_menu.glade.h:8 msgid "_Minimize on close" msgstr "_Сворачивать при закрытии" @@ -1338,13 +1325,13 @@ msgid "Create new post" msgstr "Создать новое сообщение" -#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:282 +#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:295 msgid "From" msgstr "От" #. holds subject -#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:164 -#: ../src/history_manager.py:195 +#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:165 +#: ../src/history_manager.py:196 msgid "Subject" msgstr "Тема" @@ -1394,24 +1381,23 @@ msgid "_Search Database" msgstr "_Поиск в базе данных" -#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:294 +#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:306 msgid "Conversation History" msgstr "История" #: ../data/glade/history_window.glade.h:2 -#, fuzzy msgid "" "Enter JID or Contact name\n" "Groupchat Histories\n" "All Chat Histories" msgstr "" -"Текущая история\n" +"Введите JID или имя контакта\n" +"История конференций\n" "История всех чатов" #: ../data/glade/history_window.glade.h:5 -#, fuzzy msgid "Search:" -msgstr "Поиск" +msgstr "Поиск:" #: ../data/glade/history_window.glade.h:6 #: ../data/glade/zeroconf_information_window.glade.h:10 @@ -1431,7 +1417,7 @@ msgid "Invitation Received" msgstr "Получено приглашение" -#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1628 +#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1664 msgid "Join Group Chat" msgstr "Войти в комнату" @@ -1547,18 +1533,47 @@ msgstr "_Хост:" #: ../data/glade/message_window.glade.h:1 -msgid "Click to insert an emoticon (Alt+M)" -msgstr "Щелкните, чтобы вставить смайлик (Alt+M)" +msgid "Add this contact to roster (Ctrl+D)" +msgstr "Добавляет контакт в ростер (Ctrl+D)" -#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) +#: ../data/glade/message_window.glade.h:2 +msgid "Bookmark this room (Ctrl+B)" +msgstr "Добавить комнату в закладки (Ctrl+B)" + #: ../data/glade/message_window.glade.h:3 -#: ../data/glade/roster_window.glade.h:13 -#: ../data/glade/subscription_request_window.glade.h:6 -msgid "_Actions" -msgstr "_Действия" +msgid "Browse the chat history (Ctrl+H)" +msgstr "Открыть историю чата (Ctrl+H)" +#: ../data/glade/message_window.glade.h:4 +msgid "Change the room's subject (Ctrl+T)" +msgstr "Изменить тему (Ctrl+T)" + +#: ../data/glade/message_window.glade.h:5 +msgid "Change your nickname (Ctrl+N)" +msgstr "Изменить ник (Ctrl+N)" + +#: ../data/glade/message_window.glade.h:6 +msgid "Invite contacts to the conversation (Ctrl+G)" +msgstr "Пригласить к беседе (Ctrl+G)" + +#: ../data/glade/message_window.glade.h:7 +msgid "Send a file (Ctrl+F)" +msgstr "Отправить файл (Ctrl+F)" + +#: ../data/glade/message_window.glade.h:8 +msgid "Show a list of emoticons (Alt+M)" +msgstr "Показать набор смайлов (Alt+M)" + +#: ../data/glade/message_window.glade.h:9 +msgid "Show a menu of advanced functions (Alt+A)" +msgstr "Показать меню дополнительных функций (Alt+A)" + +#: ../data/glade/message_window.glade.h:10 +msgid "Show the contact's profile (Ctrl+I)" +msgstr "Показать информацию о контакте (Ctrl+I)" + #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) -#: ../data/glade/message_window.glade.h:5 +#: ../data/glade/message_window.glade.h:12 #: ../data/glade/xml_console_window.glade.h:11 #: ../src/filetransfers_window.py:252 msgid "_Send" @@ -1614,38 +1629,30 @@ msgstr "Уведомления" #: ../data/glade/preferences_window.glade.h:14 -msgid "Publish and Subscribe" -msgstr "Отправка и получение" - -#: ../data/glade/preferences_window.glade.h:15 msgid "Roster Appearance" msgstr "Настройки ростера" -#: ../data/glade/preferences_window.glade.h:17 +#: ../data/glade/preferences_window.glade.h:16 msgid "Status Messages" msgstr "Сообщения о статусе" -#: ../data/glade/preferences_window.glade.h:18 +#: ../data/glade/preferences_window.glade.h:17 msgid "Themes" msgstr "Настройки интерфейса" -#: ../data/glade/preferences_window.glade.h:19 +#: ../data/glade/preferences_window.glade.h:18 msgid "Visual Notifications" msgstr "Уведомления" -#: ../data/glade/preferences_window.glade.h:20 ../src/roster_window.py:4593 -msgid "Activity" -msgstr "Активность" - -#: ../data/glade/preferences_window.glade.h:21 +#: ../data/glade/preferences_window.glade.h:19 msgid "Advanced" msgstr "Расширенные" -#: ../data/glade/preferences_window.glade.h:22 +#: ../data/glade/preferences_window.glade.h:20 msgid "Advanced..." msgstr "Расширенные..." -#: ../data/glade/preferences_window.glade.h:23 +#: ../data/glade/preferences_window.glade.h:21 msgid "" "All chat states\n" "Composing only\n" @@ -1655,23 +1662,19 @@ "Только печать\n" "Отключено " -#: ../data/glade/preferences_window.glade.h:26 +#: ../data/glade/preferences_window.glade.h:24 msgid "Allow _OS information to be sent" msgstr "Отсылать информацию об _ОС" -#: ../data/glade/preferences_window.glade.h:27 -msgid "Allow others to see your:" -msgstr "_Позволить ему или ей видеть мой статус" - -#: ../data/glade/preferences_window.glade.h:28 +#: ../data/glade/preferences_window.glade.h:25 msgid "Allow popup/notifications when I'm _away/na/busy/invisible" msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка" -#: ../data/glade/preferences_window.glade.h:29 +#: ../data/glade/preferences_window.glade.h:26 msgid "Ask status message when I:" msgstr "Запрашивать сообщение о статусе, когда я: " -#: ../data/glade/preferences_window.glade.h:30 +#: ../data/glade/preferences_window.glade.h:27 msgid "" "Autodetect on every Gajim startup\n" "Always use GNOME default applications\n" @@ -1685,20 +1688,20 @@ "Всегда использовать приложения XFCE4 по умолчанию\n" "Другое" -#: ../data/glade/preferences_window.glade.h:35 +#: ../data/glade/preferences_window.glade.h:32 msgid "Chat message:" msgstr "Сообщение чата:" -#: ../data/glade/preferences_window.glade.h:36 +#: ../data/glade/preferences_window.glade.h:33 msgid "Check on startup if Gajim is the _default Jabber client" msgstr "" "_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию" -#: ../data/glade/preferences_window.glade.h:37 +#: ../data/glade/preferences_window.glade.h:34 msgid "Configure color and font of the interface" msgstr "Настроить цвет и шрифт интерфейса" -#: ../data/glade/preferences_window.glade.h:38 +#: ../data/glade/preferences_window.glade.h:35 msgid "" "Detached roster with detached chats\n" "Detached roster with single chat\n" @@ -1712,23 +1715,23 @@ "Отдельно ростер и окна чатов сгрупированных по учетной записи\n" "Отдельно ростер и окна чатов сгрупированных по типу" -#: ../data/glade/preferences_window.glade.h:43 +#: ../data/glade/preferences_window.glade.h:40 msgid "Display _extra email details" msgstr "Отображать _дополнительные данные о почте" -#: ../data/glade/preferences_window.glade.h:44 +#: ../data/glade/preferences_window.glade.h:41 msgid "Display a_vatars of contacts in roster" msgstr "Показывать а_ватары для контактов в ростере" -#: ../data/glade/preferences_window.glade.h:45 +#: ../data/glade/preferences_window.glade.h:42 msgid "Display status _messages of contacts in roster" msgstr "Показывать _сообщения о статусе контакта в ростере" -#: ../data/glade/preferences_window.glade.h:46 +#: ../data/glade/preferences_window.glade.h:43 msgid "Emoticons:" msgstr "Смайлики:" -#: ../data/glade/preferences_window.glade.h:47 +#: ../data/glade/preferences_window.glade.h:44 msgid "" "Gajim can send and receive meta-information related to a conversation you " "may have with a contact. Here you can specify which chatstates you want to " @@ -1738,7 +1741,7 @@ "Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне " "чата." -#: ../data/glade/preferences_window.glade.h:48 +#: ../data/glade/preferences_window.glade.h:45 msgid "" "Gajim can send and receive meta-information related to a conversation you " "may have with a contact. Here you can specify which chatstates you want to " @@ -1748,7 +1751,7 @@ "контактом. Здесь вы можете указать, какие состояния чата Gajim будет " "отсылать вашему респонденту." -#: ../data/glade/preferences_window.glade.h:49 +#: ../data/glade/preferences_window.glade.h:46 msgid "" "Gajim will notify you via a popup window in the bottom right of the screen " "about contacts that just signed out" @@ -1756,46 +1759,41 @@ "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в " "правом нижнем углу экрана" -#: ../data/glade/preferences_window.glade.h:51 +#: ../data/glade/preferences_window.glade.h:48 msgid "Hide all buttons in chat windows" msgstr "Скрывает кнопки в окнах чата" -#: ../data/glade/preferences_window.glade.h:52 +#: ../data/glade/preferences_window.glade.h:49 msgid "" -"If checked, Gajim log GPG or E2E encrypted messages. However, when using E2E " -"encryption the remote site has to agree on logging. If the other side has " -"declined logging, your messages will NOT be logged." -msgstr "" - -#: ../data/glade/preferences_window.glade.h:53 -msgid "" "If checked, Gajim will allow others to detect the operation system you are " "using" msgstr "" "Если отмечено, то Gajim будет разрешать определять операционную систему " "которую вы используете" -#: ../data/glade/preferences_window.glade.h:54 +#: ../data/glade/preferences_window.glade.h:50 msgid "" "If checked, Gajim will also include information about the sender of the new " "emails" msgstr "" "Если отмечено, то Gajim будет включать информацию об отправителе новых писем." -#: ../data/glade/preferences_window.glade.h:55 +#: ../data/glade/preferences_window.glade.h:51 msgid "" "If checked, Gajim will change status to Away when the computer is unused." msgstr "" "Если отмечено, то Gajim изменит статус на Away когда компьютер не " "используется." -#: ../data/glade/preferences_window.glade.h:56 +#: ../data/glade/preferences_window.glade.h:52 msgid "" "If checked, Gajim will change status to Not Available when the computer has " "not been used even longer" msgstr "" +"Если отмечено, Gajim будет менять статус на Недоступен если компьютер долго " +"не используется" -#: ../data/glade/preferences_window.glade.h:57 +#: ../data/glade/preferences_window.glade.h:53 msgid "" "If checked, Gajim will display avatars of contacts in roster window and in " "group chats" @@ -1803,7 +1801,7 @@ "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и " "в окнах комнат" -#: ../data/glade/preferences_window.glade.h:58 +#: ../data/glade/preferences_window.glade.h:54 msgid "" "If checked, Gajim will display status messages of contacts under the contact " "name in roster window and in group chats" @@ -1811,14 +1809,14 @@ "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под " "его именем в окне ростера и в окнах комнат" -#: ../data/glade/preferences_window.glade.h:59 +#: ../data/glade/preferences_window.glade.h:55 msgid "" "If checked, Gajim will highlight spelling errors in input fields of chat " "windows. If no language is explicitly set via right click on the input " "field, the default language will be used for this contact or group chat." msgstr "" -#: ../data/glade/preferences_window.glade.h:60 +#: ../data/glade/preferences_window.glade.h:56 msgid "" "If checked, Gajim will ignore incoming events from unauthorized contacts. " "Use with caution, because it blocks all messages from any contact that is " @@ -1828,14 +1826,21 @@ "вас. Используйте с осторожностью, потому что это заблокирует все сообщения " "от контактов не из вашего роcтера." -#: ../data/glade/preferences_window.glade.h:61 +#: ../data/glade/preferences_window.glade.h:57 msgid "" +"If checked, Gajim will keep logs for encrypted messages. Please note that " +"when using E2E encryption the remote party has to agree on logging, else the " +"messages will not be logged." +msgstr "" + +#: ../data/glade/preferences_window.glade.h:58 +msgid "" "If checked, Gajim will show a notification when a new e-mail is received via " "GMail" msgstr "" "Если отмечено, то Gajim будет сообщать о новых письмах полученных в GMail" -#: ../data/glade/preferences_window.glade.h:62 +#: ../data/glade/preferences_window.glade.h:59 msgid "" "If checked, Gajim will sort contacts in roster window and groupchats by " "their status and not by the shown name" @@ -1843,7 +1848,7 @@ "Если отмечено, то Gajim будет сортировать контакты в окне ростера и в окнах " "комнат по статусу,а не по имени." -#: ../data/glade/preferences_window.glade.h:63 +#: ../data/glade/preferences_window.glade.h:60 msgid "" "If checked, Gajim will use protocol-specific status icons. (eg. A contact " "from MSN will have the equivalent msn icon for status online, away, busy, " @@ -1853,13 +1858,13 @@ "(например, контакты из MSN будут иметь соответствующие иконки msn для " "статусов \"в сети\", \"ушёл\", \"занят\" и т.д.)" -#: ../data/glade/preferences_window.glade.h:64 +#: ../data/glade/preferences_window.glade.h:61 msgid "" "If enabled, Gajim will not ask for a status message. The specified default " "message will be used instead." msgstr "" -#: ../data/glade/preferences_window.glade.h:65 +#: ../data/glade/preferences_window.glade.h:62 msgid "" "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent " "animated or static graphical emoticons" @@ -1868,47 +1873,43 @@ "анимированным эквивалентом. Выберите \"Отключены\", чтобы этого не " "происходило." -#: ../data/glade/preferences_window.glade.h:66 +#: ../data/glade/preferences_window.glade.h:63 msgid "Ignore rich content in incoming messages" msgstr "Игнорировать форматирование во входящих сообщениях" -#: ../data/glade/preferences_window.glade.h:67 +#: ../data/glade/preferences_window.glade.h:64 msgid "Log _encrypted chat session" msgstr "Записывать в лог _шифрованные сообщения" -#: ../data/glade/preferences_window.glade.h:68 +#: ../data/glade/preferences_window.glade.h:65 msgid "Ma_nage..." msgstr "_Управление..." -#: ../data/glade/preferences_window.glade.h:69 ../src/roster_window.py:4589 -msgid "Mood" -msgstr "Настроение" - -#: ../data/glade/preferences_window.glade.h:70 +#: ../data/glade/preferences_window.glade.h:66 msgid "Notifications" msgstr "Уведомления" -#: ../data/glade/preferences_window.glade.h:71 +#: ../data/glade/preferences_window.glade.h:67 msgid "Notify me about contacts that sign _in" msgstr "Уведомлять о контактах, которые _вошли: " -#: ../data/glade/preferences_window.glade.h:72 +#: ../data/glade/preferences_window.glade.h:68 msgid "Notify me about contacts that sign _out" msgstr "Уведомлять о контактах, которые _вышли: " -#: ../data/glade/preferences_window.glade.h:73 +#: ../data/glade/preferences_window.glade.h:69 msgid "Notify on new _GMail email" msgstr "Сообщать о новых письмах в _Gmail" -#: ../data/glade/preferences_window.glade.h:74 +#: ../data/glade/preferences_window.glade.h:70 msgid "Personal Events" msgstr "Расширенные статусы" -#: ../data/glade/preferences_window.glade.h:75 +#: ../data/glade/preferences_window.glade.h:71 msgid "Play _sounds" msgstr "Проигрывать _звук" -#: ../data/glade/preferences_window.glade.h:76 +#: ../data/glade/preferences_window.glade.h:72 msgid "" "Pop it up\n" "Notify me about it\n" @@ -1918,23 +1919,19 @@ "Сообщить мне об этом\n" "Показать в ростере" -#: ../data/glade/preferences_window.glade.h:79 +#: ../data/glade/preferences_window.glade.h:75 msgid "Preferences" msgstr "Настройки" -#: ../data/glade/preferences_window.glade.h:80 -msgid "Receive your contact's:" -msgstr "Получать от ваших контактов:" - -#: ../data/glade/preferences_window.glade.h:81 +#: ../data/glade/preferences_window.glade.h:76 msgid "Sign _in" msgstr "В_ошел" -#: ../data/glade/preferences_window.glade.h:82 +#: ../data/glade/preferences_window.glade.h:77 msgid "Sign _out" msgstr "В_ышел" -#: ../data/glade/preferences_window.glade.h:83 +#: ../data/glade/preferences_window.glade.h:78 msgid "" "Some messages may include rich content (formatting, colors etc). If checked, " "Gajim will just display the raw message text." @@ -1942,128 +1939,127 @@ "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). " "Если отмечено, Gajim будет отображать только их текст, без форматирования." -#: ../data/glade/preferences_window.glade.h:84 +#: ../data/glade/preferences_window.glade.h:79 ../src/config.py:382 msgid "Status" msgstr "Статус" -#: ../data/glade/preferences_window.glade.h:85 +#: ../data/glade/preferences_window.glade.h:80 msgid "Status _iconset:" msgstr "Тема статусных _иконок:" -#: ../data/glade/preferences_window.glade.h:86 +#: ../data/glade/preferences_window.glade.h:81 msgid "Style" msgstr "Стиль" -#: ../data/glade/preferences_window.glade.h:87 +#: ../data/glade/preferences_window.glade.h:82 msgid "T_heme:" msgstr "_Тема:" -#: ../data/glade/preferences_window.glade.h:88 +#: ../data/glade/preferences_window.glade.h:83 msgid "" "The auto away status message. If empty, Gajim will not change the current " "status message" msgstr "" +"Автоматическое статусное сообщение(Ушел). Если не указано, Gajim не будет " +"изменять статусное сообщение" -#: ../data/glade/preferences_window.glade.h:89 +#: ../data/glade/preferences_window.glade.h:84 msgid "" "The auto not available status message. If empty, Gajim will not change the " "current status message" msgstr "" +"Автоматическое статусное сообщение(Недоступен). Если не указано, Gajim не " +"будет изменять статусное сообщение" -#: ../data/glade/preferences_window.glade.h:90 -#, fuzzy -msgid "Tune" -msgstr "Слушаю:" - -#: ../data/glade/preferences_window.glade.h:91 +#: ../data/glade/preferences_window.glade.h:85 msgid "Use _transports icons" msgstr "Использовать иконки _транспортов" -#: ../data/glade/preferences_window.glade.h:92 +#: ../data/glade/preferences_window.glade.h:86 msgid "Use system _default" msgstr "Использовать _системный шрифт" -#: ../data/glade/preferences_window.glade.h:93 +#: ../data/glade/preferences_window.glade.h:87 msgid "When new event is received:" msgstr "Когда получено новое сообытие:" -#: ../data/glade/preferences_window.glade.h:94 +#: ../data/glade/preferences_window.glade.h:88 msgid "_Away after:" msgstr "Авто-_отошел после:" -#: ../data/glade/preferences_window.glade.h:95 +#: ../data/glade/preferences_window.glade.h:89 msgid "_Browser:" msgstr "_Браузер:" -#: ../data/glade/preferences_window.glade.h:96 +#: ../data/glade/preferences_window.glade.h:90 msgid "_Display chat state notifications:" msgstr "_Отображать уведомления о состоянии чата:" -#: ../data/glade/preferences_window.glade.h:97 +#: ../data/glade/preferences_window.glade.h:91 msgid "_File manager:" msgstr "_Менеджер файлов:" -#: ../data/glade/preferences_window.glade.h:98 +#: ../data/glade/preferences_window.glade.h:92 msgid "_Highlight misspelled words" msgstr "Выделять _слова с опечатками" -#: ../data/glade/preferences_window.glade.h:99 +#: ../data/glade/preferences_window.glade.h:93 msgid "_Ignore events from contacts not in the roster" msgstr "_Игнорировать события от контактов не из ростера" -#: ../data/glade/preferences_window.glade.h:100 +#: ../data/glade/preferences_window.glade.h:94 msgid "_Incoming message:" msgstr "_Входящее сообщение:" -#: ../data/glade/preferences_window.glade.h:101 +#: ../data/glade/preferences_window.glade.h:95 msgid "_Log status changes of contacts" msgstr "_Записывать в лог изменения статусов контактов" -#: ../data/glade/preferences_window.glade.h:102 +#: ../data/glade/preferences_window.glade.h:96 msgid "_Mail client:" msgstr "_Почтовый клиент:" -#: ../data/glade/preferences_window.glade.h:103 +#: ../data/glade/preferences_window.glade.h:97 msgid "_Make message windows compact" msgstr "_Компактное окно сообщений" -#: ../data/glade/preferences_window.glade.h:104 +#: ../data/glade/preferences_window.glade.h:98 msgid "_Not available after:" msgstr "Авто-_недоступен после:" -#: ../data/glade/preferences_window.glade.h:105 +#: ../data/glade/preferences_window.glade.h:99 msgid "_Open..." msgstr "_Открыть..." -#: ../data/glade/preferences_window.glade.h:106 +#: ../data/glade/preferences_window.glade.h:100 msgid "_Outgoing message:" msgstr "_Исходящее сообщение:" -#: ../data/glade/preferences_window.glade.h:107 +#: ../data/glade/preferences_window.glade.h:101 msgid "_Reset to Default Colors" msgstr "_Вернуться к цветам по умолчанию" -#: ../data/glade/preferences_window.glade.h:108 +#: ../data/glade/preferences_window.glade.h:102 msgid "_Send chat state notifications:" msgstr "_Отправлять уведомления о состоянии чата:" -#: ../data/glade/preferences_window.glade.h:109 +#: ../data/glade/preferences_window.glade.h:103 msgid "_Sort contacts by status" msgstr "_Сортировать контакты по статусу" -#: ../data/glade/preferences_window.glade.h:110 +#: ../data/glade/preferences_window.glade.h:104 msgid "_Status message:" msgstr "_Сообщение о статусе:" -#: ../data/glade/preferences_window.glade.h:111 +#: ../data/glade/preferences_window.glade.h:105 msgid "_URL highlight:" msgstr "_Цвет ссылок:" -#: ../data/glade/preferences_window.glade.h:112 +#: ../data/glade/preferences_window.glade.h:106 msgid "_Window behavior:" msgstr "Поведение _окна:" -#: ../data/glade/preferences_window.glade.h:113 +#: ../data/glade/preferences_window.glade.h:107 msgid "minutes" msgstr "минут" @@ -2107,7 +2103,7 @@ msgid "Order:" msgstr "Номер:" -#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2499 +#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2531 msgid "Privacy List" msgstr "Список доступа" @@ -2251,7 +2247,7 @@ msgstr "Префикс:" #: ../data/glade/profile_window.glade.h:25 -#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308 +#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:305 msgid "Role:" msgstr "Обязанности:" @@ -2313,8 +2309,8 @@ #. Remove #: ../data/glade/remove_account_window.glade.h:4 #: ../data/glade/roster_contact_context_menu.glade.h:18 -#: ../src/roster_window.py:4863 ../src/roster_window.py:5295 -#: ../src/roster_window.py:5423 +#: ../src/roster_window.py:4753 ../src/roster_window.py:5186 +#: ../src/roster_window.py:5315 msgid "_Remove" msgstr "_Удалить" @@ -2336,20 +2332,20 @@ #. Execute Command #: ../data/glade/roster_contact_context_menu.glade.h:5 -#: ../src/roster_window.py:5366 +#: ../src/roster_window.py:5258 msgid "Execute Command..." msgstr "Выполнить команду..." #. Invite to #. Invite to Groupchat #: ../data/glade/roster_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:4784 ../src/roster_window.py:5248 +#: ../src/roster_window.py:4672 ../src/roster_window.py:5139 msgid "In_vite to" msgstr "_Пригласить в" #. Send Custom Status #: ../data/glade/roster_contact_context_menu.glade.h:7 -#: ../src/roster_window.py:4793 ../src/roster_window.py:5333 +#: ../src/roster_window.py:4682 ../src/roster_window.py:5224 msgid "Send Cus_tom Status" msgstr "Установи_ть статус" @@ -2375,8 +2371,8 @@ msgstr "_Позволить ему или ей видеть мой статус" #: ../data/glade/roster_contact_context_menu.glade.h:14 -#: ../src/roster_window.py:4854 ../src/roster_window.py:5285 -#: ../src/roster_window.py:5413 +#: ../src/roster_window.py:4744 ../src/roster_window.py:5176 +#: ../src/roster_window.py:5305 msgid "_Block" msgstr "_Блокировать" @@ -2398,8 +2394,8 @@ msgstr "_Подписка" #: ../data/glade/roster_contact_context_menu.glade.h:21 -#: ../src/roster_window.py:4848 ../src/roster_window.py:5279 -#: ../src/roster_window.py:5410 +#: ../src/roster_window.py:4738 ../src/roster_window.py:5170 +#: ../src/roster_window.py:5302 msgid "_Unblock" msgstr "_Разблокировать" @@ -2443,6 +2439,12 @@ msgid "Show _roster" msgstr "Показать _ростер" +#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) +#: ../data/glade/roster_window.glade.h:13 +#: ../data/glade/subscription_request_window.glade.h:6 +msgid "_Actions" +msgstr "_Действия" + #: ../data/glade/roster_window.glade.h:15 msgid "_Contents" msgstr "_Содержание" @@ -2488,7 +2490,7 @@ msgstr "Добавить _контакт" #. Information -#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5435 +#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5327 msgid "_Information" msgstr "_Информация о контакте" @@ -2710,13 +2712,13 @@ #. Edit Groups #: ../data/glade/zeroconf_contact_context_menu.glade.h:3 -#: ../src/roster_window.py:5268 +#: ../src/roster_window.py:5159 msgid "Edit _Groups" msgstr "Редактировать _группы" #. Rename #: ../data/glade/zeroconf_contact_context_menu.glade.h:8 -#: ../src/roster_window.py:5393 +#: ../src/roster_window.py:5285 msgid "_Rename" msgstr "П_ереименовать" @@ -2821,166 +2823,169 @@ #. #!/bin/sh #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done) #. echo "{_('en'):'en'",$LANG"}" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "English" msgstr "Английский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Belarusian" msgstr "Беларусский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Bulgarian" msgstr "Болгарский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 #, fuzzy msgid "Breton" msgstr "Бриттский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Czech" msgstr "Чешский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "German" msgstr "Немецкий" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Greek" msgstr "Греческий" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "British" msgstr "Британский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Esperanto" msgstr "Эсперанто" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Spanish" msgstr "Испанский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Basque" msgstr "Баскский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "French" msgstr "Французский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Croatian" msgstr "Хорватский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Italian" msgstr "Итальянский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Norwegian (b)" msgstr "Норвежский (букмол)" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Dutch" msgstr "Голландский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Norwegian" msgstr "Норвежский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Polish" msgstr "Польский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Portuguese" msgstr "Португальский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Brazilian Portuguese" msgstr "Португальский (Бразилия)" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Russian" msgstr "Русский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Serbian" msgstr "Сербский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Slovak" msgstr "Словацкий" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Swedish" msgstr "Шведский" -#: ../src/chat_control2.py:60 ../src/chat_control.py:61 +#: ../src/chat_control.py:61 msgid "Chinese (Ch)" msgstr "Китайский" -#: ../src/chat_control2.py:310 ../src/chat_control.py:314 +#: ../src/chat_control.py:319 msgid "Spelling language" msgstr "Язык проверки орфографии" #. we are not connected -#: ../src/chat_control2.py:333 ../src/chat_control2.py:549 -#: ../src/chat_control.py:337 ../src/chat_control.py:560 +#: ../src/chat_control.py:342 ../src/chat_control.py:569 msgid "A connection is not available" msgstr "Подключение недоступно" -#: ../src/chat_control2.py:334 ../src/chat_control2.py:550 -#: ../src/chat_control.py:338 ../src/chat_control.py:561 +#: ../src/chat_control.py:343 ../src/chat_control.py:570 msgid "Your message can not be sent until you are connected." msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь." -#: ../src/chat_control2.py:1176 ../src/chat_control.py:1206 +#. Add to roster button +#. add_to_roster_menuitem +#: ../src/chat_control.py:1068 ../src/chat_control.py:1796 +#: ../src/common/contacts.py:98 ../src/common/helpers.py:68 +#: ../src/common/helpers.py:282 ../src/conversation_textview.py:724 +#: ../src/dialogs.py:864 ../src/gajim.py:1539 ../src/roster_window.py:842 +#: ../src/roster_window.py:1356 ../src/roster_window.py:1358 +#: ../src/roster_window.py:1711 ../src/roster_window.py:4856 +#: ../src/roster_window.py:5024 +msgid "Not in Roster" +msgstr "Не в ростере" + +#: ../src/chat_control.py:1131 ../src/chat_control.py:1349 +msgid "GPG encryption enabled" +msgstr "GPG шифрование включено" + +#: ../src/chat_control.py:1259 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s из комнаты %(room_name)s" -#: ../src/chat_control2.py:1257 -#, fuzzy -msgid "OpenPGP Encryption" -msgstr "Включить Open_PGP шифрование" +#: ../src/chat_control.py:1340 +msgid "GPG encryption disabled" +msgstr "GPG шифрование выключено" -#. we talk about a contact here -#: ../src/chat_control2.py:1271 -#, python-format -msgid "%s has not broadcast an OpenPGP key, nor has one been assigned" -msgstr "" +#: ../src/chat_control.py:1355 ../src/chat_control.py:1584 +msgid "Session WILL NOT be logged" +msgstr "Сессия НЕ БУДЕТ сохранена в истории" -#: ../src/chat_control2.py:1314 ../src/chat_control.py:1367 -#: ../src/groupchat_control.py:1456 -#, python-format -msgid "No such command: /%s (if you want to send this, prefix it with /say)" -msgstr "" -"Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней " -"префикс /say)" +#: ../src/chat_control.py:1357 ../src/chat_control.py:1582 +msgid "Session WILL be logged" +msgstr "Сессия БУДЕТ сохранена в истории" -#: ../src/chat_control2.py:1321 ../src/chat_control.py:1374 -#: ../src/groupchat_control.py:1479 +#: ../src/chat_control.py:1432 ../src/groupchat_control.py:1526 #, python-format msgid "Commands: %s" msgstr "Команды: %s" -#: ../src/chat_control2.py:1324 ../src/chat_control.py:1377 -#: ../src/groupchat_control.py:1493 +#: ../src/chat_control.py:1435 ../src/groupchat_control.py:1540 #, python-format msgid "Usage: /%s, clears the text window." msgstr "Использование: /%s, очищает текстовое окно." -#: ../src/chat_control2.py:1327 ../src/chat_control.py:1380 -#: ../src/groupchat_control.py:1498 +#: ../src/chat_control.py:1438 ../src/groupchat_control.py:1545 #, python-format msgid "Usage: /%s, hide the chat buttons." msgstr "Использование: /%s, скрывает кнопки беседы." -#: ../src/chat_control2.py:1330 ../src/chat_control.py:1383 -#: ../src/groupchat_control.py:1514 +#: ../src/chat_control.py:1441 ../src/groupchat_control.py:1561 #, python-format msgid "" "Usage: /%s <action>, sends action to the current group chat. Use third " @@ -2989,69 +2994,46 @@ "Использование: /%s <действие>, совершает действие в текущей комнате. " "Используйте третье лицо (например, «/%s взрывается».)" -#: ../src/chat_control2.py:1334 ../src/chat_control.py:1387 +#: ../src/chat_control.py:1445 #, python-format msgid "Usage: /%s, sends a ping to the contact" msgstr "Использование: /%s, посылает пинг контакту" -#: ../src/chat_control2.py:1337 ../src/chat_control.py:1390 +#: ../src/chat_control.py:1448 #, python-format msgid "Usage: /%s, send the message to the contact" msgstr "Использование: /%s, посылает сообщение контакту" -#: ../src/chat_control2.py:1340 ../src/chat_control.py:1393 -#: ../src/groupchat_control.py:1537 +#: ../src/chat_control.py:1451 ../src/groupchat_control.py:1584 #, python-format msgid "No help info for /%s" msgstr "Нет подсказки для /%s" -#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504 -#, fuzzy -msgid "Encryption enabled" +#: ../src/chat_control.py:1571 +msgid "Session negotiation cancelled" +msgstr "" + +#: ../src/chat_control.py:1578 +msgid "E2E encryption enabled" msgstr "E2E шифрование включено" -#: ../src/chat_control2.py:1483 ../src/chat_control.py:1304 -#: ../src/chat_control.py:1523 -msgid "Session WILL be logged" -msgstr "Сессия БУДЕТ сохранена в истории" +#: ../src/chat_control.py:1588 +msgid "E2E encryption disabled" +msgstr "E2E шифрование выключено" -#: ../src/chat_control2.py:1485 ../src/chat_control.py:1302 -#: ../src/chat_control.py:1525 -msgid "Session WILL NOT be logged" -msgstr "Сессия НЕ БУДЕТ сохранена в истории" - -#: ../src/chat_control2.py:1492 ../src/chat_control.py:1555 -#: ../src/chat_control.py:1566 -msgid "The following message was NOT encrypted" -msgstr "Последнее сообщение НЕ БЫЛО зашифровано" - -#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509 -#: ../src/chat_control2.py:2155 +#: ../src/chat_control.py:1616 ../src/chat_control.py:1623 +#: ../src/chat_control.py:1629 #, fuzzy -msgid "Encryption disabled" -msgstr "E2E шифрование выключено" +msgid "The following message was " +msgstr "Последнее сообщение зашифровано" -#. add_to_roster_menuitem -#: ../src/chat_control2.py:1672 ../src/chat_control.py:1732 -#: ../src/common/contacts.py:94 ../src/common/helpers.py:55 -#: ../src/common/helpers.py:269 ../src/conversation_textview.py:724 -#: ../src/dialogs.py:828 ../src/gajim.py:951 ../src/gajim.py:952 -#: ../src/gajim.py:1494 ../src/gajim.py:1743 ../src/normal_control.py:483 -#: ../src/roster_window.py:693 ../src/roster_window.py:703 -#: ../src/roster_window.py:791 ../src/roster_window.py:1225 -#: ../src/roster_window.py:1227 ../src/roster_window.py:1603 -#: ../src/roster_window.py:3106 ../src/roster_window.py:4966 -#: ../src/roster_window.py:5134 -msgid "Not in Roster" -msgstr "Не в ростере" - #. %s is being replaced in the code with JID -#: ../src/chat_control2.py:1825 ../src/chat_control.py:1886 +#: ../src/chat_control.py:1972 #, python-format msgid "You just received a new message from \"%s\"" msgstr "Вы получили новое сообщение от \"%s\"" -#: ../src/chat_control2.py:1826 ../src/chat_control.py:1887 +#: ../src/chat_control.py:1973 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." @@ -3059,35 +3041,11 @@ "Если вы закроете эту вкладку и у вас отключена функция ведения истории " "сообщений, то это сообщение будет утеряно." -#: ../src/chat_control.py:1079 ../src/chat_control.py:1296 -msgid "GPG encryption enabled" -msgstr "GPG шифрование включено" - -#: ../src/chat_control.py:1287 -msgid "GPG encryption disabled" -msgstr "GPG шифрование выключено" - -#: ../src/chat_control.py:1512 -msgid "Session negotiation cancelled" -msgstr "" - -#: ../src/chat_control.py:1519 -msgid "E2E encryption enabled" -msgstr "E2E шифрование включено" - -#: ../src/chat_control.py:1529 -msgid "E2E encryption disabled" -msgstr "E2E шифрование выключено" - -#: ../src/chat_control.py:1561 -msgid "The following message was encrypted" -msgstr "Последнее сообщение зашифровано" - -#: ../src/chat_control.py:2019 ../src/gajim.py:158 +#: ../src/chat_control.py:2105 ../src/gajim.py:170 msgid "Database Error" msgstr "Ошибка базы данных" -#: ../src/chat_control.py:2020 ../src/gajim.py:159 +#: ../src/chat_control.py:2106 ../src/gajim.py:171 #, python-format msgid "" "The database file (%s) cannot be read. Try to repare it or remove it (all " @@ -3100,23 +3058,23 @@ msgid "creating logs database" msgstr "создается БД истории" -#: ../src/common/check_paths.py:106 ../src/common/check_paths.py:117 -#: ../src/common/check_paths.py:124 +#: ../src/common/check_paths.py:105 ../src/common/check_paths.py:116 +#: ../src/common/check_paths.py:123 #, python-format msgid "%s is a file but it should be a directory" msgstr "%s должен быть директорией, а не файлом" -#: ../src/common/check_paths.py:107 ../src/common/check_paths.py:118 -#: ../src/common/check_paths.py:125 ../src/common/check_paths.py:133 +#: ../src/common/check_paths.py:106 ../src/common/check_paths.py:117 +#: ../src/common/check_paths.py:124 ../src/common/check_paths.py:132 msgid "Gajim will now exit" msgstr "Закончить работу" -#: ../src/common/check_paths.py:132 +#: ../src/common/check_paths.py:131 #, python-format msgid "%s is a directory but should be a file" msgstr "%s должен быть файлом, а не директорией" -#: ../src/common/check_paths.py:148 +#: ../src/common/check_paths.py:147 #, python-format msgid "creating %s directory" msgstr "создается директория %s" @@ -3179,18 +3137,11 @@ msgid "Choose the groupchats you want to leave" msgstr "Выберите конференции которые вы хотите покинуть" -#. FIXME: stupid hack. -#. When we redraw the group in remove_contact the -#. contact does still exist and so the group is still showing -#. the old numbers. -#. Maybe use timeout to draw groups so that there is enough time -#. to remove the contact instance. #. Make special context menu if group is Groupchats -#: ../src/common/commands.py:199 ../src/common/contacts.py:107 -#: ../src/common/helpers.py:55 ../src/roster_window.py:649 -#: ../src/roster_window.py:670 ../src/roster_window.py:1229 -#: ../src/roster_window.py:1231 ../src/roster_window.py:2805 -#: ../src/roster_window.py:4755 +#: ../src/common/commands.py:199 ../src/common/contacts.py:111 +#: ../src/common/helpers.py:68 ../src/roster_window.py:727 +#: ../src/roster_window.py:1360 ../src/roster_window.py:1362 +#: ../src/roster_window.py:2661 ../src/roster_window.py:4642 msgid "Groupchats" msgstr "Комнаты" @@ -3243,9 +3194,9 @@ "Список (через пробел) строк (учётных записей и групп), которые свёрнуты." #. sorted alphanum -#: ../src/common/config.py:102 ../src/common/config.py:426 -#: ../src/common/optparser.py:210 ../src/common/optparser.py:428 -#: ../src/common/optparser.py:462 ../src/gajim.py:2892 +#: ../src/common/config.py:102 ../src/common/config.py:430 +#: ../src/common/optparser.py:212 ../src/common/optparser.py:430 +#: ../src/common/optparser.py:464 ../src/gajim.py:3064 msgid "default" msgstr "По_умолчанию" @@ -3330,22 +3281,14 @@ msgstr "Символы, которые будут отображаться после ников в чате" #: ../src/common/config.py:154 -msgid "" -"If checked, Gajim can regularly poll a Last.fm account and sends recently " -"played songs through PEP." -msgstr "" -"Если включено, Gajim будет проверять аккаунт на Last.fm и менять ваш PEP " -"статус на имя проигрываемого трека. " - -#: ../src/common/config.py:155 msgid "The username used to identify the Last.fm account." msgstr "Имя пользователя на Last.fm." -#: ../src/common/config.py:159 +#: ../src/common/config.py:158 msgid "Add * and [n] in roster title?" msgstr "Добавлять * и [n] в окно ростера?" -#: ../src/common/config.py:160 +#: ../src/common/config.py:159 msgid "" "How many lines to remember from previous conversation when a chat tab/window " "is reopened." @@ -3353,11 +3296,11 @@ "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются " "вновь." -#: ../src/common/config.py:161 +#: ../src/common/config.py:160 msgid "How many minutes should last lines from previous conversation last." msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы." -#: ../src/common/config.py:162 +#: ../src/common/config.py:161 msgid "" "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ " "Client default behaviour)." @@ -3365,11 +3308,11 @@ "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в " "Mirabilis ICQ)" -#: ../src/common/config.py:164 +#: ../src/common/config.py:163 msgid "How many lines to store for Ctrl+KeyUP." msgstr "Сколько строк хранить для Ctrl+Стрелка вверх" -#: ../src/common/config.py:167 +#: ../src/common/config.py:166 #, python-format msgid "" "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' " @@ -3378,13 +3321,13 @@ "Введите свою ссылку с %s, в которой %s подменяет слово/фразу или " "'WIKTIONARY', что значит: \"использовать wiktionary\"." -#: ../src/common/config.py:170 +#: ../src/common/config.py:169 msgid "If checked, Gajim can be controlled remotely using gajim-remote." msgstr "" "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием " "gajim-remote." -#: ../src/common/config.py:171 +#: ../src/common/config.py:170 msgid "" "If True, listen to D-Bus signals from NetworkManager and change the status " "of accounts (provided they do not have listen_to_network_manager set to " @@ -3397,14 +3340,14 @@ "listen_to_network_manager и они должны синхронизировать свой статус с " "глобальным)" -#: ../src/common/config.py:172 +#: ../src/common/config.py:171 msgid "" "Sent chat state notifications. Can be one of all, composing_only, disabled." msgstr "" "Отсылать уведомления о состоянии беседы. Может быть одним из \"все\", " "\"только печать\", \"отключено\"." -#: ../src/common/config.py:173 +#: ../src/common/config.py:172 msgid "" "Displayed chat state notifications in chat windows. Can be one of all, " "composing_only, disabled." @@ -3412,7 +3355,7 @@ "Отображать состояния беседы в окне беседы. Может быть одним из \"все\", " "\"только написание\", \"отключено\"." -#: ../src/common/config.py:175 +#: ../src/common/config.py:174 msgid "" "When not printing time for every message (print_time==sometimes), print it " "every x minutes." @@ -3420,11 +3363,11 @@ "Есди отключена печать времени для каждого сообщения, то печатать его каждые " "X минут." -#: ../src/common/config.py:176 +#: ../src/common/config.py:175 msgid "Ask before closing a group chat tab/window." msgstr "Спрашивать перед закрытием окна/вкладки комнаты." -#: ../src/common/config.py:177 +#: ../src/common/config.py:176 msgid "" "Always ask before closing group chat tab/window in this space separated list " "of group chat jids." @@ -3432,7 +3375,7 @@ "Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. " "Комнаты в списке разделяются пробелом." -#: ../src/common/config.py:178 +#: ../src/common/config.py:177 msgid "" "Never ask before closing group chat tab/window in this space separated list " "of group chat jids." @@ -3440,7 +3383,7 @@ "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. " "Комнаты в списке разделяются пробелом." -#: ../src/common/config.py:181 +#: ../src/common/config.py:180 msgid "" "Comma separated list of hosts that we send, in addition of local interfaces, " "for File Transfer in case of address translation/port forwarding." @@ -3448,27 +3391,27 @@ "Указвает имя хоста, которое мы отсылаем при передаче файлов, в случае если " "мы за NAT или используется проброс портов." -#: ../src/common/config.py:183 +#: ../src/common/config.py:182 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes." msgstr "IEC стандарт утверждает, что KiB = 1024 байт, KB = 1000 байт" -#: ../src/common/config.py:185 +#: ../src/common/config.py:184 msgid "Notify of events in the system trayicon." msgstr "Уведомлять о событиях в системном лотке." -#: ../src/common/config.py:191 +#: ../src/common/config.py:190 msgid "Show tab when only one conversation?" msgstr "Показывать вкладку при одном чат-окне?" -#: ../src/common/config.py:192 +#: ../src/common/config.py:191 msgid "Show tabbed notebook border in chat windows?" msgstr "Показывать границу вкладки в окне чата?" -#: ../src/common/config.py:193 +#: ../src/common/config.py:192 msgid "Show close button in tab?" msgstr "Показывать кнопку закрытия на вкладке?" -#: ../src/common/config.py:194 +#: ../src/common/config.py:193 msgid "" "When negotiating an encrypted session, should Gajim assume you want your " "messages to be logged?" @@ -3476,7 +3419,7 @@ "Когда устанавливается зашифрованная сессия, дожен ли Gajim предположить, " "что Вы хотите сохранить историю сообщений?" -#: ../src/common/config.py:195 +#: ../src/common/config.py:194 msgid "" "When negotiating an encrypted session, should Gajim prefer to use public " "keys for identification?" @@ -3484,17 +3427,17 @@ "Когда устанавливается зашифрованная сессия, дожен ли Gajim предпочитать " "использовать открытый ключ для идентификации?" -#: ../src/common/config.py:204 +#: ../src/common/config.py:203 msgid "Preview new messages in notification popup?" msgstr "Предпросмотр новых сообщений во всплывающем окне?" -#: ../src/common/config.py:209 +#: ../src/common/config.py:208 msgid "" "A semicolon-separated list of words that will be highlighted in group chats." msgstr "" "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах." -#: ../src/common/config.py:210 +#: ../src/common/config.py:209 msgid "" "If True, quits Gajim when X button of Window Manager is clicked. This " "setting is taken into account only if trayicon is used." @@ -3502,14 +3445,14 @@ "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. " "Эта опция учитывается только если используется иконка для трея." -#: ../src/common/config.py:211 +#: ../src/common/config.py:210 msgid "" "If True, Gajim will check if it's the default jabber client on each startup." msgstr "" "Если True, то Gajim будет проверять при запуске,является ли он jabber-" "клиентом по умолчанию." -#: ../src/common/config.py:212 +#: ../src/common/config.py:211 msgid "" "If True, Gajim will display an icon on each tab containing unread messages. " "Depending on the theme, this icon may be animated." @@ -3517,7 +3460,7 @@ "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные " "сообщения. В зависимости от темы, она может быть анимированной." -#: ../src/common/config.py:213 +#: ../src/common/config.py:212 msgid "" "If True, Gajim will display the status message, if not empty, for every " "contact under the contact name in roster window." @@ -3525,11 +3468,11 @@ "Если True, то Gajim будет отображать сообщение о статусе, если оно не " "пустое, для каждого контакта под именем контакта в окне ростера" -#: ../src/common/config.py:215 +#: ../src/common/config.py:214 msgid "Define the position of the avatar in roster. Can be left or right" msgstr "Определяет позицию аватар в ростере.Может быть left или right" -#: ../src/common/config.py:216 +#: ../src/common/config.py:215 msgid "" "If True, Gajim will ask for avatar each contact that did not have an avatar " "last time or has one cached that is too old." @@ -3537,7 +3480,7 @@ "Если True, то Gajim будет запрашивать аватару для каждого контакта, у " "которого её не было в последний раз или она уже слишком старая." -#: ../src/common/config.py:217 +#: ../src/common/config.py:216 msgid "" "If False, Gajim will no longer print status line in chats when a contact " "changes his or her status and/or his or her status message." @@ -3545,7 +3488,7 @@ "Если отключено, то Gajim больше не будет показывать статусную строку в окне " "беседы, когда контакт меняет его или её статус и/или сообщение о статусе." -#: ../src/common/config.py:218 +#: ../src/common/config.py:217 msgid "" "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no " "longer print status line in groupchats when a member changes his or her " @@ -3560,29 +3503,29 @@ "\"in_and_out\", то Gajim будет выводить сообщение только когда кто-то входит " "или выходит из комнаты." -#: ../src/common/config.py:220 +#: ../src/common/config.py:219 msgid "Background color of contacts when they just signed in." msgstr "Фоновый цвет контакта, который только что вошел." -#: ../src/common/config.py:221 +#: ../src/common/config.py:220 msgid "Background color of contacts when they just signed out." msgstr "Фоновый цвет контакта, который только что вышел." -#: ../src/common/config.py:223 +#: ../src/common/config.py:222 msgid "" "If True, restored messages will use a smaller font than the default one." msgstr "" "Если установлено, то восстановленные сообщения будут иметь меньший шрифт." -#: ../src/common/config.py:224 +#: ../src/common/config.py:223 msgid "Don't show avatar for the transport itself." msgstr "Не показывать аватар для транспорта." -#: ../src/common/config.py:225 +#: ../src/common/config.py:224 msgid "Don't show roster in the system taskbar." msgstr "Не показывать ростер в панели задач." -#: ../src/common/config.py:226 +#: ../src/common/config.py:225 msgid "" "If True and installed GTK+ and PyGTK versions are at least 2.8, make the " "window flash (the default behaviour in most Window Managers) when holding " @@ -3592,7 +3535,7 @@ "(поведение по умолчанию для большинства менеджеров окон) когда присутствуют " "не просмотренные события." -#: ../src/common/config.py:228 +#: ../src/common/config.py:227 msgid "" "Jabberd1.4 does not like sha info when one join a password protected group " "chat. Turn this option to False to stop sending sha info in group chat " @@ -3603,7 +3546,7 @@ "информации для комнат" #. always, never, peracct, pertype should not be translated -#: ../src/common/config.py:231 +#: ../src/common/config.py:230 msgid "" "Controls the window where new messages are placed.\n" "'always' - All messages are sent to a single window.\n" @@ -3623,31 +3566,31 @@ "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск " "Gajim, чтобы изменения вступили в силу." -#: ../src/common/config.py:232 +#: ../src/common/config.py:231 msgid "If False, you will no longer see the avatar in the chat window." msgstr "Если False, вы больше не будете видеть аватары в окне беседы." -#: ../src/common/config.py:233 +#: ../src/common/config.py:232 msgid "If True, pressing the escape key closes a tab/window." msgstr "Если True, то нажатие клавиши Escape будет закрывать вкладку/окно." -#: ../src/common/config.py:234 +#: ../src/common/config.py:233 msgid "Hides the buttons in chat windows." msgstr "Скрывает кнопки в окнах чата." -#: ../src/common/config.py:235 +#: ../src/common/config.py:234 msgid "Hides the banner in a group chat window" msgstr "Скрывает баннер в окне комнаты" -#: ../src/common/config.py:236 +#: ../src/common/config.py:235 msgid "Hides the banner in two persons chat window" msgstr "Скрывает баннер в окне чата" -#: ../src/common/config.py:237 +#: ../src/common/config.py:236 msgid "Hides the group chat occupants list in group chat window." msgstr "Скрывает список посетителей в окне комнаты." -#: ../src/common/config.py:238 +#: ../src/common/config.py:237 msgid "" "In a chat, show the nickname at the beginning of a line only when it's not " "the same person talking than in previous message." @@ -3655,26 +3598,26 @@ "Показывать ник в начале строки в чате только если предыдущее сообщение было " "написано другим участником." -#: ../src/common/config.py:239 +#: ../src/common/config.py:238 msgid "Indentation when using merge consecutive nickname." msgstr "" -#: ../src/common/config.py:240 +#: ../src/common/config.py:239 msgid "Smooth scroll message in conversation window" msgstr "Плавно прокручивать сообщения в окне чата" -#: ../src/common/config.py:241 +#: ../src/common/config.py:240 msgid "List of colors that will be used to color nicknames in group chats." msgstr "" "Список цветов, которые будут использоваться для раскраски ников в комнатах." -#: ../src/common/config.py:242 +#: ../src/common/config.py:241 msgid "Ctrl-Tab go to next composing tab when none is unread." msgstr "" "Использовать Ctrl-Tab чтобы перейти к следующей вкладке с составляемым " "сообщением, когда нет непрочитанных сообщений." -#: ../src/common/config.py:243 +#: ../src/common/config.py:242 msgid "" "Should we show the confirm metacontacts creation dialog or not? Empty string " "means we never show the dialog." @@ -3682,7 +3625,7 @@ "А нам надо показывать диалог подтверждения о создании метаконтакта? Если тут " "пустая строка, то сообщение не будет показываться вообще." -#: ../src/common/config.py:244 +#: ../src/common/config.py:243 msgid "" "If True, you will be able to set a negative priority to your account in " "account modification window. BE CAREFUL, when you are logged in with a " @@ -3693,7 +3636,7 @@ "подключитесь еще раз с отрицательным приоритетом, то вы НЕ получите никаких " "сообщений от сервера." -#: ../src/common/config.py:245 +#: ../src/common/config.py:244 msgid "" "If True, Gajim will use Gnome Keyring (if available) to store account " "passwords." @@ -3701,7 +3644,7 @@ "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для " "хранения паролей учетных записей." -#: ../src/common/config.py:246 +#: ../src/common/config.py:245 msgid "" "If True, Gajim will show number of online and total contacts in account and " "group rows." @@ -3709,7 +3652,7 @@ "Если активно, Gajim будет показывать количество контактов онлайн/всего в " "строках с названием аккаунта и групп." -#: ../src/common/config.py:247 +#: ../src/common/config.py:246 msgid "" "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages " "as if they were of this type" @@ -3717,7 +3660,7 @@ "Может быть пусто, 'chat' или 'normal'. Если не пусто - обрабатывать все " "входящие сообщения так, как будто бы они были этого типа." -#: ../src/common/config.py:248 +#: ../src/common/config.py:247 msgid "" "If True, Gajim will scroll and select the contact who sent you the last " "message, if chat window is not already opened." @@ -3725,7 +3668,7 @@ "Если активно, Gajim прокрутит ростер и выделит контакт, который написал Вам " "сообщение последним, если окно чата еще небыло открыто." -#: ../src/common/config.py:249 +#: ../src/common/config.py:248 msgid "" "If True, Gajim will convert string between $$ and $$ to an image using dvips " "and convert before insterting it in chat window." @@ -3733,17 +3676,17 @@ "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, " "используя dvips и конвертировать до вставки его в чат-окно." -#: ../src/common/config.py:250 +#: ../src/common/config.py:249 msgid "Time of inactivity needed before the change status window closes down." msgstr "Время не активности прежде чем окно изменения статуса закроется." -#: ../src/common/config.py:251 +#: ../src/common/config.py:250 msgid "" "Maximum number of lines that are printed in conversations. Oldest lines are " "cleared." msgstr "Максимальное количество строк в окне.Старые строки будут удалены." -#: ../src/common/config.py:258 +#: ../src/common/config.py:251 msgid "" "If True, notification windows from notification-daemon will be attached to " "systray icon." @@ -3751,57 +3694,63 @@ "Если активно, окно уведомления от notification-daemon будет присоединено к " "системному трею." -#: ../src/common/config.py:259 +#: ../src/common/config.py:252 msgid "Choose interval between 2 checks of idleness." msgstr "" -#: ../src/common/config.py:270 +#: ../src/common/config.py:253 msgid "" +"Change the value to change the size of latex formulas displayed. The higher " +"is larger." +msgstr "" + +#: ../src/common/config.py:264 +msgid "" "Priority will change automatically according to your status. Priorities are " "defined in autopriority_* options." msgstr "" "Приоритет будет изменятся автоматически согласно вашему статусу.Приоритеты " "для статусов задаются в пункте autopriority_* ." -#: ../src/common/config.py:278 +#: ../src/common/config.py:272 #, fuzzy msgid "" "Status used to autoconnect as. Can be online, chat, away, xa, dnd, invisible." msgstr "" "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка" -#: ../src/common/config.py:283 +#: ../src/common/config.py:277 msgid "" "If disabled, don't sign presences with GPG key, even if GPG is configured." msgstr "" -#: ../src/common/config.py:285 +#: ../src/common/config.py:279 msgid "" "Ordered list (space separated) of connection type to try. Can contain tls, " "ssl or plain" msgstr "" -#: ../src/common/config.py:286 +#: ../src/common/config.py:280 msgid "" "Show a warning dialog before sending password on an insecure connection." msgstr "" -#: ../src/common/config.py:288 +#: ../src/common/config.py:282 msgid "Space separated list of ssl errors to ignore." msgstr "" -#: ../src/common/config.py:300 +#: ../src/common/config.py:294 msgid "" "How many seconds to wait for the answer of keepalive packet before we try to " "reconnect." msgstr "" #. yes, no, ask -#: ../src/common/config.py:304 +#: ../src/common/config.py:298 msgid "Jabberd2 workaround" msgstr "Костыль для jabberd2" -#: ../src/common/config.py:308 +#: ../src/common/config.py:302 msgid "" "If checked, Gajim will use your IP and proxies defined in " "file_transfer_proxies option for file transfer." @@ -3809,105 +3758,113 @@ "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в " "параметре file_transfer_proxies для передачи файлов" -#: ../src/common/config.py:368 +#: ../src/common/config.py:314 +msgid "Answer to receipt requests" +msgstr "" + +#: ../src/common/config.py:315 +msgid "Sent receipt requests" +msgstr "" + +#: ../src/common/config.py:372 msgid "Is OpenPGP enabled for this contact?" msgstr "Используется ли для этого контакта OpenPGP" -#: ../src/common/config.py:369 ../src/common/config.py:372 +#: ../src/common/config.py:373 ../src/common/config.py:376 msgid "Language for which we want to check misspelled words" msgstr "Язык, который используется при проверке правописания" -#: ../src/common/config.py:378 +#: ../src/common/config.py:382 msgid "all or space separated status" msgstr "все или статусы, разделенные пробелом" -#: ../src/common/config.py:379 +#: ../src/common/config.py:383 msgid "'yes', 'no', or 'both'" msgstr "\"да\", \"нет\" или \"оба\"" -#: ../src/common/config.py:380 ../src/common/config.py:382 -#: ../src/common/config.py:383 ../src/common/config.py:386 -#: ../src/common/config.py:387 +#: ../src/common/config.py:384 ../src/common/config.py:386 +#: ../src/common/config.py:387 ../src/common/config.py:390 +#: ../src/common/config.py:391 msgid "'yes', 'no' or ''" msgstr "\"да\", \"нет\" или \"\"" -#: ../src/common/config.py:393 +#: ../src/common/config.py:397 msgid "Sleeping" msgstr "Сплю" -#: ../src/common/config.py:394 +#: ../src/common/config.py:398 msgid "Back soon" msgstr "Скоро буду" -#: ../src/common/config.py:394 +#: ../src/common/config.py:398 msgid "Back in some minutes." msgstr "Вернусь через несколько минут" -#: ../src/common/config.py:395 +#: ../src/common/config.py:399 msgid "Eating" msgstr "Ем" -#: ../src/common/config.py:395 +#: ../src/common/config.py:399 msgid "I'm eating, so leave me a message." msgstr "Кушаю, так что оставьте сообщение секретарю." -#: ../src/common/config.py:396 +#: ../src/common/config.py:400 msgid "Movie" msgstr "В кино" -#: ../src/common/config.py:396 +#: ../src/common/config.py:400 msgid "I'm watching a movie." msgstr "Смотрю кино" -#: ../src/common/config.py:397 +#: ../src/common/config.py:401 msgid "Working" msgstr "Работаю" -#: ../src/common/config.py:397 +#: ../src/common/config.py:401 msgid "I'm working." msgstr "Работаю" -#: ../src/common/config.py:398 +#: ../src/common/config.py:402 msgid "Phone" msgstr "Телефон" -#: ../src/common/config.py:398 +#: ../src/common/config.py:402 msgid "I'm on the phone." msgstr "Говорю по телефону" -#: ../src/common/config.py:399 +#: ../src/common/config.py:403 msgid "Out" msgstr "Вышел" -#: ../src/common/config.py:399 +#: ../src/common/config.py:403 msgid "I'm out enjoying life." msgstr "Наслаждаюсь жизнью, чего и вам желаю." -#: ../src/common/config.py:403 +#: ../src/common/config.py:407 msgid "I'm available." msgstr "Я здесь." -#: ../src/common/config.py:404 +#: ../src/common/config.py:408 msgid "I'm free for chat." msgstr "Я готов поболтать." -#: ../src/common/config.py:405 ../src/config.py:1427 +#: ../src/common/config.py:409 ../src/config.py:1363 msgid "Be right back." msgstr "Скоро буду." -#: ../src/common/config.py:406 +#: ../src/common/config.py:410 msgid "I'm not available." msgstr "Меня нет." -#: ../src/common/config.py:407 +#: ../src/common/config.py:411 msgid "Do not disturb." msgstr "Не беспокоить." -#: ../src/common/config.py:408 ../src/common/config.py:409 +#: ../src/common/config.py:412 ../src/common/config.py:413 msgid "Bye!" msgstr "Пока!" -#: ../src/common/config.py:419 +#: ../src/common/config.py:423 msgid "" "Sound to play when a group chat message contains one of the words in " "muc_highlight_words, or when a group chat message contains your nickname." @@ -3916,97 +3873,95 @@ "содержит слово из списка muc_highlight_words, или когда сообщение содержит " "ваш ник." -#: ../src/common/config.py:420 +#: ../src/common/config.py:424 msgid "Sound to play when any MUC message arrives." msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC." -#: ../src/common/config.py:429 ../src/common/optparser.py:224 +#: ../src/common/config.py:433 ../src/common/optparser.py:226 msgid "green" msgstr "зеленый" -#: ../src/common/config.py:433 ../src/common/optparser.py:210 +#: ../src/common/config.py:437 ../src/common/optparser.py:212 msgid "grocery" msgstr "овощной" -#: ../src/common/config.py:437 +#: ../src/common/config.py:441 msgid "human" msgstr "телесный" -#: ../src/common/config.py:441 +#: ../src/common/config.py:445 msgid "marine" msgstr "морской" -#: ../src/common/connection_handlers.py:67 -#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48 +#: ../src/common/connection_handlers.py:69 +#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49 msgid "Unable to load idle module" msgstr "Не могу загрузить модуль \"idle\"" -#: ../src/common/connection_handlers.py:225 -#: ../src/common/zeroconf/connection_handlers_zeroconf.py:242 +#: ../src/common/connection_handlers.py:227 +#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93 msgid "Wrong host" msgstr "Неверный хост" -#: ../src/common/connection_handlers.py:226 +#: ../src/common/connection_handlers.py:228 msgid "Invalid local address? :-O" msgstr "Неправильный локальный адрес? :-O" -#: ../src/common/connection_handlers.py:627 +#: ../src/common/connection_handlers.py:629 #, python-format msgid "Registration information for transport %s has not arrived in time" msgstr "Данные о регистрации для транспорта %s не пришли вовремя." -#: ../src/common/connection_handlers.py:903 -#: ../src/common/connection_handlers.py:1641 -#: ../src/common/connection_handlers.py:1670 -#: ../src/common/connection_handlers.py:1680 -#: ../src/common/connection_handlers.py:1699 -#: ../src/common/connection_handlers.py:1950 -#: ../src/common/connection_handlers.py:2062 ../src/common/connection.py:1136 -#: ../src/gajim.py:378 +#: ../src/common/connection_handlers.py:906 +#: ../src/common/connection_handlers.py:1783 +#: ../src/common/connection_handlers.py:1830 +#: ../src/common/connection_handlers.py:2012 +#: ../src/common/connection_handlers.py:2131 ../src/common/connection.py:1148 +#: ../src/gajim.py:394 msgid "Disk Write Error" msgstr "Ошибка записи на диск" -#: ../src/common/connection_handlers.py:1837 +#: ../src/common/connection_handlers.py:1899 #, python-format msgid "Nickname not allowed: %s" msgstr "Ник недопустим: %s" #. we are banned #. group chat does not exist -#: ../src/common/connection_handlers.py:1907 -#: ../src/common/connection_handlers.py:1910 -#: ../src/common/connection_handlers.py:1913 -#: ../src/common/connection_handlers.py:1916 -#: ../src/common/connection_handlers.py:1920 -#: ../src/common/connection_handlers.py:1929 +#: ../src/common/connection_handlers.py:1969 +#: ../src/common/connection_handlers.py:1972 +#: ../src/common/connection_handlers.py:1975 +#: ../src/common/connection_handlers.py:1978 +#: ../src/common/connection_handlers.py:1982 +#: ../src/common/connection_handlers.py:1991 msgid "Unable to join group chat" msgstr "Не получается войти в комнату" -#: ../src/common/connection_handlers.py:1908 +#: ../src/common/connection_handlers.py:1970 #, python-format msgid "You are banned from group chat %s." msgstr "Вам запрещено входить в комнату %s." -#: ../src/common/connection_handlers.py:1911 +#: ../src/common/connection_handlers.py:1973 #, python-format msgid "Group chat %s does not exist." msgstr "Комнаты %s не существует." -#: ../src/common/connection_handlers.py:1914 +#: ../src/common/connection_handlers.py:1976 msgid "Group chat creation is restricted." msgstr "Создание комнат запрещено." -#: ../src/common/connection_handlers.py:1917 +#: ../src/common/connection_handlers.py:1979 #, python-format msgid "Your registered nickname must be used in group chat %s." msgstr "Необходимо использовать Ваш зарегистрированный ник в комнате %s." -#: ../src/common/connection_handlers.py:1921 +#: ../src/common/connection_handlers.py:1983 #, python-format msgid "You are not in the members list in groupchat %s." msgstr "Вас нет в списке членов комнаты %s." -#: ../src/common/connection_handlers.py:1930 +#: ../src/common/connection_handlers.py:1992 #, python-format msgid "" "Your desired nickname in group chat %s is in use or registered by another " @@ -4019,36 +3974,36 @@ #. Room has been destroyed. see #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom -#: ../src/common/connection_handlers.py:1961 +#: ../src/common/connection_handlers.py:2023 msgid "Room has been destroyed" msgstr "Комната была удалена" -#: ../src/common/connection_handlers.py:1968 +#: ../src/common/connection_handlers.py:2030 #, python-format msgid "You can join this room instead: %s" msgstr "" -#: ../src/common/connection_handlers.py:1995 +#: ../src/common/connection_handlers.py:2057 msgid "I would like to add you to my roster." msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?" #. BE CAREFUL: no con.updateRosterItem() in a callback -#: ../src/common/connection_handlers.py:2016 +#: ../src/common/connection_handlers.py:2078 #, python-format msgid "we are now subscribed to %s" msgstr "теперь мы подписались на %s" -#: ../src/common/connection_handlers.py:2018 +#: ../src/common/connection_handlers.py:2080 #, python-format msgid "unsubscribe request from %s" msgstr "%s хочет отменить подписку" -#: ../src/common/connection_handlers.py:2020 +#: ../src/common/connection_handlers.py:2082 #, python-format msgid "we are now unsubscribed from %s" msgstr "теперь мы отписались от %s" -#: ../src/common/connection_handlers.py:2162 +#: ../src/common/connection_handlers.py:2230 #, python-format msgid "" "JID %s is not RFC compliant. It will not be added to your roster. Use roster " @@ -4059,15 +4014,15 @@ "удалить его" #. We didn't set a passphrase -#: ../src/common/connection_handlers.py:2187 +#: ../src/common/connection_handlers.py:2255 #: ../src/common/zeroconf/connection_zeroconf.py:172 msgid "OpenPGP passphrase was not given" msgstr "Не задана парольная фраза OpenPGP" #. %s is the account name here -#: ../src/common/connection_handlers.py:2189 +#: ../src/common/connection_handlers.py:2257 #: ../src/common/zeroconf/connection_zeroconf.py:174 -#: ../src/roster_window.py:1666 +#: ../src/roster_window.py:1769 #, python-format msgid "You will be connected to %s without OpenPGP." msgstr "Вы будете подключены к %s без использования OpenPGP." @@ -4242,13 +4197,13 @@ msgstr "Соединение с прокси разорвалось" #: ../src/common/connection.py:590 ../src/common/connection.py:670 -#: ../src/common/connection.py:1260 +#: ../src/common/connection.py:1274 #: ../src/common/zeroconf/connection_zeroconf.py:248 #, python-format msgid "Could not connect to \"%s\"" msgstr "Не могу соединиться с \"%s\"" -#: ../src/common/connection.py:591 ../src/gajim.py:1031 +#: ../src/common/connection.py:591 ../src/gajim.py:941 msgid "Check your connection or try again later." msgstr "Проверьте настройки сети или попробуйте еще раз позже." @@ -4301,12 +4256,12 @@ "Список приватности %s не может быть удален.Возможно он используется одним из " "ваших активных ресурсов.Отключите ресурс и попробуйте снова." -#: ../src/common/connection.py:1042 +#: ../src/common/connection.py:1044 #: ../src/common/zeroconf/connection_zeroconf.py:381 msgid "Neither the remote presence is signed, nor a key was assigned." msgstr "" -#: ../src/common/connection.py:1044 +#: ../src/common/connection.py:1046 #: ../src/common/zeroconf/connection_zeroconf.py:383 #, python-format msgid "The contact's key (%s) does not match the key assigned in Gajim." @@ -4314,12 +4269,12 @@ #. we're not english #. one in locale and one en -#: ../src/common/connection.py:1053 +#: ../src/common/connection.py:1055 #, fuzzy msgid "[This message is *encrypted* (See :XEP:`27`]" msgstr "[Это сообщение *зашифровано*, см. :JEP:`27`]" -#: ../src/common/connection.py:1127 +#: ../src/common/connection.py:1139 #: ../src/common/zeroconf/connection_zeroconf.py:445 #, python-format msgid "" @@ -4329,37 +4284,32 @@ "Тема: %s\n" "%s" -#: ../src/common/connection.py:1293 +#: ../src/common/connection.py:1307 msgid "Not fetched because of invisible status" msgstr "Нельзя получить из-за невидимости" -#: ../src/common/contacts.py:303 ../src/common/contacts.py:318 -#: ../src/common/helpers.py:55 ../src/disco.py:111 ../src/disco.py:112 -#: ../src/disco.py:1320 ../src/gajim.py:693 ../src/roster_window.py:333 -#: ../src/roster_window.py:572 ../src/roster_window.py:629 -#: ../src/roster_window.py:678 ../src/roster_window.py:1072 -#: ../src/roster_window.py:1188 ../src/roster_window.py:1221 -#: ../src/roster_window.py:1223 +#: ../src/common/contacts.py:68 ../src/common/helpers.py:68 +msgid "Observers" +msgstr "Наблюдатели" + +#: ../src/common/contacts.py:308 ../src/common/helpers.py:68 +#: ../src/disco.py:111 ../src/disco.py:112 ../src/disco.py:1320 +#: ../src/gajim.py:742 ../src/roster_window.py:751 +#: ../src/roster_window.py:1306 ../src/roster_window.py:1352 +#: ../src/roster_window.py:1354 ../src/roster_window.py:1498 msgid "Transports" msgstr "Транспорты" -#: ../src/common/contacts.py:307 +#: ../src/common/contacts.py:312 msgid "Not in roster" msgstr "Не в ростере" -#: ../src/common/contacts.py:320 ../src/common/helpers.py:55 -#: ../src/roster_window.py:335 ../src/roster_window.py:574 -#: ../src/roster_window.py:631 ../src/roster_window.py:903 -#: ../src/roster_window.py:1074 ../src/roster_window.py:5038 -msgid "Observers" -msgstr "Наблюдатели" - #. only say that to non Windows users -#: ../src/common/dbus_support.py:41 +#: ../src/common/dbus_support.py:44 msgid "D-Bus python bindings are missing in this computer" msgstr "На компьютере не установлена библиотека D-Bus для Python" -#: ../src/common/dbus_support.py:42 +#: ../src/common/dbus_support.py:45 msgid "D-Bus capabilities of Gajim cannot be used" msgstr "Возможности работы Gajim с D-Bus не могут быть использованы" @@ -4539,778 +4489,778 @@ msgid "Weekend!" msgstr "Выходные!" -#: ../src/common/helpers.py:126 +#: ../src/common/helpers.py:139 msgid "Invalid character in username." msgstr "Неверный символ в имени пользователя." -#: ../src/common/helpers.py:131 +#: ../src/common/helpers.py:144 msgid "Server address required." msgstr "Требуется адрес сервера." -#: ../src/common/helpers.py:136 +#: ../src/common/helpers.py:149 msgid "Invalid character in hostname." msgstr "Неверный символ в имени сервера" -#: ../src/common/helpers.py:142 +#: ../src/common/helpers.py:155 msgid "Invalid character in resource." msgstr "Неверный символ в ресурсе" #. GiB means gibibyte -#: ../src/common/helpers.py:182 +#: ../src/common/helpers.py:195 #, python-format msgid "%s GiB" msgstr "%s GiB" #. GB means gigabyte -#: ../src/common/helpers.py:185 +#: ../src/common/helpers.py:198 #, python-format msgid "%s GB" msgstr "%s GB" #. MiB means mibibyte -#: ../src/common/helpers.py:189 +#: ../src/common/helpers.py:202 #, python-format msgid "%s MiB" msgstr "%s MiB" #. MB means megabyte -#: ../src/common/helpers.py:192 +#: ../src/common/helpers.py:205 #, python-format msgid "%s MB" msgstr "%s MB" #. KiB means kibibyte -#: ../src/common/helpers.py:196 +#: ../src/common/helpers.py:209 #, python-format msgid "%s KiB" msgstr "%s KiB" #. KB means kilo bytes -#: ../src/common/helpers.py:199 +#: ../src/common/helpers.py:212 #, python-format msgid "%s KB" msgstr "%s KB" #. B means bytes -#: ../src/common/helpers.py:202 +#: ../src/common/helpers.py:215 #, python-format msgid "%s B" msgstr "%s B" -#: ../src/common/helpers.py:233 +#: ../src/common/helpers.py:246 msgid "_Busy" msgstr "_Занят" -#: ../src/common/helpers.py:235 +#: ../src/common/helpers.py:248 msgid "Busy" msgstr "Занят" -#: ../src/common/helpers.py:238 +#: ../src/common/helpers.py:251 msgid "_Not Available" msgstr "_Недоступен" -#: ../src/common/helpers.py:243 +#: ../src/common/helpers.py:256 msgid "_Free for Chat" msgstr "_Готов поболтать" -#: ../src/common/helpers.py:245 +#: ../src/common/helpers.py:258 msgid "Free for Chat" msgstr "Готов поболтать" -#: ../src/common/helpers.py:248 +#: ../src/common/helpers.py:261 msgid "_Available" msgstr "_Доступен" -#: ../src/common/helpers.py:250 ../src/features_window.py:116 +#: ../src/common/helpers.py:263 ../src/features_window.py:116 msgid "Available" msgstr "Доступен" -#: ../src/common/helpers.py:252 +#: ../src/common/helpers.py:265 msgid "Connecting" msgstr "Соединяюсь" -#: ../src/common/helpers.py:255 +#: ../src/common/helpers.py:268 msgid "A_way" msgstr "_Ушел" -#: ../src/common/helpers.py:260 +#: ../src/common/helpers.py:273 msgid "_Offline" msgstr "_Отключен" -#: ../src/common/helpers.py:262 +#: ../src/common/helpers.py:275 msgid "Offline" msgstr "Отключен" -#: ../src/common/helpers.py:265 +#: ../src/common/helpers.py:278 msgid "_Invisible" msgstr "_Невидимка" -#: ../src/common/helpers.py:271 +#: ../src/common/helpers.py:284 msgid "?contact has status:Unknown" msgstr "Неизвестен" -#: ../src/common/helpers.py:273 +#: ../src/common/helpers.py:286 msgid "?contact has status:Has errors" msgstr "Ошибка" -#: ../src/common/helpers.py:278 +#: ../src/common/helpers.py:291 msgid "?Subscription we already have:None" msgstr "Нет" -#: ../src/common/helpers.py:280 +#: ../src/common/helpers.py:293 msgid "To" msgstr "К" -#: ../src/common/helpers.py:284 +#: ../src/common/helpers.py:297 msgid "Both" msgstr "Оба" -#: ../src/common/helpers.py:292 +#: ../src/common/helpers.py:305 msgid "?Ask (for Subscription):None" msgstr "Нет" -#: ../src/common/helpers.py:294 +#: ../src/common/helpers.py:307 msgid "Subscribe" msgstr "Подписаться" -#: ../src/common/helpers.py:303 +#: ../src/common/helpers.py:316 msgid "?Group Chat Contact Role:None" msgstr "Отсутствует" -#: ../src/common/helpers.py:306 +#: ../src/common/helpers.py:319 msgid "Moderators" msgstr "Модераторы" -#: ../src/common/helpers.py:308 +#: ../src/common/helpers.py:321 msgid "Moderator" msgstr "Модератор" -#: ../src/common/helpers.py:311 +#: ../src/common/helpers.py:324 msgid "Participants" msgstr "Участники" -#: ../src/common/helpers.py:313 +#: ../src/common/helpers.py:326 msgid "Participant" msgstr "Участник" -#: ../src/common/helpers.py:316 +#: ../src/common/helpers.py:329 msgid "Visitors" msgstr "Посетители" -#: ../src/common/helpers.py:318 +#: ../src/common/helpers.py:331 msgid "Visitor" msgstr "Посетитель" -#: ../src/common/helpers.py:324 +#: ../src/common/helpers.py:337 msgid "?Group Chat Contact Affiliation:None" msgstr "Отсутствует" -#: ../src/common/helpers.py:326 +#: ../src/common/helpers.py:339 msgid "Owner" msgstr "Владелец" -#: ../src/common/helpers.py:328 +#: ../src/common/helpers.py:341 msgid "Administrator" msgstr "Администратор" -#: ../src/common/helpers.py:330 +#: ../src/common/helpers.py:343 msgid "Member" msgstr "Участник" -#: ../src/common/helpers.py:337 +#: ../src/common/helpers.py:350 msgid "afraid" msgstr "испуганный" -#: ../src/common/helpers.py:337 +#: ../src/common/helpers.py:350 msgid "amazed" msgstr "изумлённый" -#: ../src/common/helpers.py:337 +#: ../src/common/helpers.py:350 msgid "angry" msgstr "сердитый" -#: ../src/common/helpers.py:338 +#: ../src/common/helpers.py:351 msgid "annoyed" msgstr "раздражённый" -#: ../src/common/helpers.py:338 +#: ../src/common/helpers.py:351 msgid "anxious" msgstr "озабоченный" -#: ../src/common/helpers.py:338 +#: ../src/common/helpers.py:351 msgid "aroused" msgstr "пробуждённый" -#: ../src/common/helpers.py:339 +#: ../src/common/helpers.py:352 msgid "ashamed" msgstr "пристыженный" -#: ../src/common/helpers.py:339 +#: ../src/common/helpers.py:352 msgid "bored" msgstr "скучающий" -#: ../src/common/helpers.py:339 +#: ../src/common/helpers.py:352 msgid "brave" msgstr "храбрый" -#: ../src/common/helpers.py:340 +#: ../src/common/helpers.py:353 msgid "calm" msgstr "невозмутимый" -#: ../src/common/helpers.py:340 +#: ../src/common/helpers.py:353 msgid "cold" msgstr "неприветливый" -#: ../src/common/helpers.py:340 +#: ../src/common/helpers.py:353 msgid "confused" msgstr "смущенный" -#: ../src/common/helpers.py:341 +#: ../src/common/helpers.py:354 msgid "contented" msgstr "довольный" -#: ../src/common/helpers.py:341 +#: ../src/common/helpers.py:354 msgid "cranky" msgstr "раздражённый" -#: ../src/common/helpers.py:341 +#: ../src/common/helpers.py:354 msgid "curious" msgstr "любознательный" -#: ../src/common/helpers.py:342 +#: ../src/common/helpers.py:355 msgid "depressed" msgstr "подавленный" -#: ../src/common/helpers.py:342 +#: ../src/common/helpers.py:355 msgid "disappointed" msgstr "разочарованный" -#: ../src/common/helpers.py:343 +#: ../src/common/helpers.py:356 msgid "disgusted" msgstr "чувствующий_отвращение" -#: ../src/common/helpers.py:343 +#: ../src/common/helpers.py:356 msgid "distracted" msgstr "растерянный" -#: ../src/common/helpers.py:344 +#: ../src/common/helpers.py:357 msgid "embarrassed" msgstr "смущенный" -#: ../src/common/helpers.py:344 +#: ../src/common/helpers.py:357 msgid "excited" msgstr "взволнованный" -#: ../src/common/helpers.py:345 +#: ../src/common/helpers.py:358 msgid "flirtatious" msgstr "кокетливый" -#: ../src/common/helpers.py:345 +#: ../src/common/helpers.py:358 msgid "frustrated" msgstr "расстроенный" -#: ../src/common/helpers.py:346 +#: ../src/common/helpers.py:359 msgid "grumpy" msgstr "сердитый" -#: ../src/common/helpers.py:346 +#: ../src/common/helpers.py:359 msgid "guilty" msgstr "виновный" -#: ../src/common/helpers.py:346 +#: ../src/common/helpers.py:359 msgid "happy" msgstr "счастливый" -#: ../src/common/helpers.py:347 +#: ../src/common/helpers.py:360 msgid "hot" msgstr "страстный" -#: ../src/common/helpers.py:347 +#: ../src/common/helpers.py:360 msgid "humbled" msgstr "униженный" -#: ../src/common/helpers.py:347 +#: ../src/common/helpers.py:360 msgid "humiliated" msgstr "оскорблённый" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:361 msgid "hungry" msgstr "голодный" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:361 msgid "hurt" msgstr "вредный" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:361 msgid "impressed" msgstr "впечатлённый" -#: ../src/common/helpers.py:349 +#: ../src/common/helpers.py:362 #, fuzzy msgid "in awe" msgstr "испуганный" -#: ../src/common/helpers.py:349 +#: ../src/common/helpers.py:362 #, fuzzy msgid "in love" msgstr "влюблённый" -#: ../src/common/helpers.py:349 +#: ../src/common/helpers.py:362 msgid "indignant" msgstr "возмущённый" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:363 msgid "interested" msgstr "заинтересованный" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:363 msgid "intoxicated" msgstr "пьяный" -#: ../src/common/helpers.py:351 +#: ../src/common/helpers.py:364 msgid "invincible" msgstr "непобедимый" -#: ../src/common/helpers.py:351 +#: ../src/common/helpers.py:364 msgid "jealous" msgstr "ревнивый" -#: ../src/common/helpers.py:351 +#: ../src/common/helpers.py:364 msgid "lonely" msgstr "одинокий" -#: ../src/common/helpers.py:352 +#: ../src/common/helpers.py:365 msgid "mean" msgstr "посредственный" -#: ../src/common/helpers.py:352 +#: ../src/common/helpers.py:365 msgid "moody" msgstr "капризный" -#: ../src/common/helpers.py:352 +#: ../src/common/helpers.py:365 msgid "nervous" msgstr "нервоный" -#: ../src/common/helpers.py:353 +#: ../src/common/helpers.py:366 msgid "neutral" msgstr "нейтральный" -#: ../src/common/helpers.py:353 +#: ../src/common/helpers.py:366 msgid "offended" msgstr "обиженный" -#: ../src/common/helpers.py:353 +#: ../src/common/helpers.py:366 msgid "playful" msgstr "игривый" -#: ../src/common/helpers.py:354 +#: ../src/common/helpers.py:367 msgid "proud" msgstr "гордый" -#: ../src/common/helpers.py:354 +#: ../src/common/helpers.py:367 msgid "relieved" msgstr "успокоившийся" -#: ../src/common/helpers.py:354 +#: ../src/common/helpers.py:367 msgid "remorseful" msgstr "раскаявшийся" -#: ../src/common/helpers.py:355 +#: ../src/common/helpers.py:368 msgid "restless" msgstr "неугомонный" -#: ../src/common/helpers.py:355 +#: ../src/common/helpers.py:368 msgid "sad" msgstr "грустный" -#: ../src/common/helpers.py:355 +#: ../src/common/helpers.py:368 msgid "sarcastic" msgstr "язвительный" -#: ../src/common/helpers.py:356 +#: ../src/common/helpers.py:369 msgid "serious" msgstr "серьёзный" -#: ../src/common/helpers.py:356 +#: ../src/common/helpers.py:369 msgid "shocked" msgstr "шокированный" -#: ../src/common/helpers.py:356 +#: ../src/common/helpers.py:369 msgid "shy" msgstr "застенчивый" -#: ../src/common/helpers.py:357 +#: ../src/common/helpers.py:370 msgid "sick" msgstr "больной" -#: ../src/common/helpers.py:357 +#: ../src/common/helpers.py:370 msgid "sleepy" msgstr "сонный" -#: ../src/common/helpers.py:357 +#: ../src/common/helpers.py:370 msgid "stressed" msgstr "напряженный" -#: ../src/common/helpers.py:358 +#: ../src/common/helpers.py:371 msgid "surprised" msgstr "удивлённый" -#: ../src/common/helpers.py:358 +#: ../src/common/helpers.py:371 msgid "thirsty" msgstr "жаждущий" -#: ../src/common/helpers.py:358 +#: ../src/common/helpers.py:371 msgid "worried" msgstr "волнующийся" #. Activities -#: ../src/common/helpers.py:369 +#: ../src/common/helpers.py:382 msgid "working" msgstr "работаю" -#: ../src/common/helpers.py:369 +#: ../src/common/helpers.py:382 msgid "eating" msgstr "кушаю" -#: ../src/common/helpers.py:370 +#: ../src/common/helpers.py:383 msgid "excercising" msgstr "тренировка" -#: ../src/common/helpers.py:370 +#: ../src/common/helpers.py:383 msgid "relaxing" msgstr "расслабляюсь" -#: ../src/common/helpers.py:370 +#: ../src/common/helpers.py:383 msgid "talking" msgstr "разговариваю" -#: ../src/common/helpers.py:371 +#: ../src/common/helpers.py:384 #, fuzzy msgid "doing chores" msgstr "работа_по_хозяйству" -#: ../src/common/helpers.py:371 +#: ../src/common/helpers.py:384 msgid "inactive" msgstr "неактивен" -#: ../src/common/helpers.py:372 +#: ../src/common/helpers.py:385 msgid "traveling" msgstr "путешествую" -#: ../src/common/helpers.py:372 +#: ../src/common/helpers.py:385 #, fuzzy msgid "having an appointment" msgstr "имею назначение " -#: ../src/common/helpers.py:373 +#: ../src/common/helpers.py:386 msgid "grooming" msgstr "свадьба" -#: ../src/common/helpers.py:373 +#: ../src/common/helpers.py:386 msgid "drinking" msgstr "пью" #. Subactivites -#: ../src/common/helpers.py:375 +#: ../src/common/helpers.py:388 #, fuzzy msgid "on the phone" msgstr "говорю_по_телефону" -#: ../src/common/helpers.py:375 +#: ../src/common/helpers.py:388 msgid "gardening" msgstr "работаю_в_саду" -#: ../src/common/helpers.py:376 +#: ../src/common/helpers.py:389 msgid "hiking" msgstr "в_походе" -#: ../src/common/helpers.py:376 +#: ../src/common/helpers.py:389 #, fuzzy msgid "on vacation" msgstr "в_отпуске" -#: ../src/common/helpers.py:376 +#: ../src/common/helpers.py:389 msgid "coding" msgstr "пишу_программу" -#: ../src/common/helpers.py:377 +#: ../src/common/helpers.py:390 msgid "walking" msgstr "гуляю" -#: ../src/common/helpers.py:377 +#: ../src/common/helpers.py:390 #, fuzzy msgid "rehearsing" msgstr "Беларусский" -#: ../src/common/helpers.py:377 +#: ../src/common/helpers.py:390 msgid "sleeping" msgstr "Сплю" -#: ../src/common/helpers.py:378 +#: ../src/common/helpers.py:391 #, fuzzy msgid "brushing teeth" msgstr "чищу_зубы" -#: ../src/common/helpers.py:378 +#: ../src/common/helpers.py:391 #, fuzzy msgid "playing sports" msgstr "спорт" -#: ../src/common/helpers.py:379 +#: ../src/common/helpers.py:392 msgid "skiing" msgstr "катаюсь_на_лыжах" -#: ../src/common/helpers.py:379 +#: ../src/common/helpers.py:392 #, fuzzy msgid "having breakfast" msgstr "завтракаю" -#: ../src/common/helpers.py:380 +#: ../src/common/helpers.py:393 #, fuzzy msgid "watching TV" msgstr "смотрю_тв" -#: ../src/common/helpers.py:380 +#: ../src/common/helpers.py:393 #, fuzzy msgid "doing the dishes" msgstr "приготовление_блюд" -#: ../src/common/helpers.py:381 +#: ../src/common/helpers.py:394 #, fuzzy msgid "at the spa" msgstr "в_spa_салоне" -#: ../src/common/helpers.py:381 +#: ../src/common/helpers.py:394 msgid "cycling" msgstr "на_велосипеде" -#: ../src/common/helpers.py:382 +#: ../src/common/helpers.py:395 #, fuzzy msgid "hanging out" msgstr "тусовка" -#: ../src/common/helpers.py:382 +#: ../src/common/helpers.py:395 msgid "driving" msgstr "двигаюсь" -#: ../src/common/helpers.py:382 +#: ../src/common/helpers.py:395 #, fuzzy msgid "commuting" msgstr "команда" -#: ../src/common/helpers.py:383 +#: ../src/common/helpers.py:396 msgid "cooking" msgstr "готовлю" -#: ../src/common/helpers.py:383 +#: ../src/common/helpers.py:396 #, fuzzy msgid "walking the dog" msgstr "гуляю_с_собакой" -#: ../src/common/helpers.py:384 +#: ../src/common/helpers.py:397 msgid "writing" msgstr "пишу" -#: ../src/common/helpers.py:384 +#: ../src/common/helpers.py:397 #, fuzzy msgid "on a trip" msgstr "в_поездке" -#: ../src/common/helpers.py:384 +#: ../src/common/helpers.py:397 #, fuzzy msgid "day off" msgstr "выходной_день" -#: ../src/common/helpers.py:385 +#: ../src/common/helpers.py:398 #, fuzzy msgid "having tea" msgstr "пью_чай" -#: ../src/common/helpers.py:385 +#: ../src/common/helpers.py:398 #, fuzzy msgid "on a bus" msgstr "в_автобусе" -#: ../src/common/helpers.py:386 +#: ../src/common/helpers.py:399 #, fuzzy msgid "having a beer" msgstr "пью_пиво" -#: ../src/common/helpers.py:386 +#: ../src/common/helpers.py:399 msgid "reading" msgstr "читаю" -#: ../src/common/helpers.py:387 +#: ../src/common/helpers.py:400 #, fuzzy msgid "buying groceries" msgstr "делаю_покупки" -#: ../src/common/helpers.py:387 +#: ../src/common/helpers.py:400 msgid "shaving" msgstr "душ" -#: ../src/common/helpers.py:388 +#: ../src/common/helpers.py:401 #, fuzzy msgid "getting a haircut" msgstr "делаю_прическу" -#: ../src/common/helpers.py:388 +#: ../src/common/helpers.py:401 msgid "gaming" msgstr "играю" -#: ../src/common/helpers.py:389 +#: ../src/common/helpers.py:402 #, fuzzy msgid "having dinner" msgstr "обедаю" -#: ../src/common/helpers.py:389 +#: ../src/common/helpers.py:402 #, fuzzy msgid "doing maintenance" msgstr "обслуживаю" -#: ../src/common/helpers.py:390 +#: ../src/common/helpers.py:403 #, fuzzy msgid "doing the laundry" msgstr "стираю" -#: ../src/common/helpers.py:390 +#: ../src/common/helpers.py:403 #, fuzzy msgid "on video phone" msgstr "Говорю по телефону" -#: ../src/common/helpers.py:391 +#: ../src/common/helpers.py:404 #, fuzzy msgid "scheduled holiday" msgstr "планируется_праздник" -#: ../src/common/helpers.py:391 +#: ../src/common/helpers.py:404 #, fuzzy msgid "going out" msgstr "вышел" -#: ../src/common/helpers.py:392 +#: ../src/common/helpers.py:405 msgid "partying" msgstr "на_вечеринке" -#: ../src/common/helpers.py:392 +#: ../src/common/helpers.py:405 #, fuzzy msgid "having a snack" msgstr "в_закусочной" -#: ../src/common/helpers.py:393 +#: ../src/common/helpers.py:406 #, fuzzy msgid "having lunch" msgstr "ланч" -#: ../src/common/helpers.py:393 +#: ../src/common/helpers.py:406 #, fuzzy msgid "working out" msgstr "Работаю" -#: ../src/common/helpers.py:394 +#: ../src/common/helpers.py:407 msgid "cleaning" msgstr "делаю_уборку" -#: ../src/common/helpers.py:394 +#: ../src/common/helpers.py:407 #, fuzzy msgid "watching a movie" msgstr "смотрю_кино" -#: ../src/common/helpers.py:395 +#: ../src/common/helpers.py:408 msgid "sunbathing" msgstr "загараю" -#: ../src/common/helpers.py:395 +#: ../src/common/helpers.py:408 msgid "socializing" msgstr "общаюсь" -#: ../src/common/helpers.py:396 +#: ../src/common/helpers.py:409 #, fuzzy msgid "running an errand" msgstr "ушёл_по_поручению" -#: ../src/common/helpers.py:396 +#: ../src/common/helpers.py:409 #, fuzzy msgid "taking a bath" msgstr "принимаю_ванну" -#: ../src/common/helpers.py:397 +#: ../src/common/helpers.py:410 #, fuzzy msgid "in real life" msgstr "в_реальной_жизни" -#: ../src/common/helpers.py:397 +#: ../src/common/helpers.py:410 #, fuzzy msgid "on a plane" msgstr "в_самолёте" -#: ../src/common/helpers.py:398 +#: ../src/common/helpers.py:411 msgid "shopping" msgstr "покупки" -#: ../src/common/helpers.py:398 +#: ../src/common/helpers.py:411 #, fuzzy msgid "on a train" msgstr "в_поезде" -#: ../src/common/helpers.py:398 +#: ../src/common/helpers.py:411 msgid "running" msgstr "бегу" -#: ../src/common/helpers.py:399 +#: ../src/common/helpers.py:412 #, fuzzy msgid "taking a shower" msgstr "принимаю_душ" -#: ../src/common/helpers.py:399 +#: ../src/common/helpers.py:412 msgid "jogging" msgstr "пробежка" -#: ../src/common/helpers.py:400 +#: ../src/common/helpers.py:413 #, fuzzy msgid "in a meeting" msgstr "совещание" -#: ../src/common/helpers.py:400 +#: ../src/common/helpers.py:413 #, fuzzy msgid "in a car" msgstr "в_машине" -#: ../src/common/helpers.py:401 +#: ../src/common/helpers.py:414 msgid "studying" msgstr "учусь" -#: ../src/common/helpers.py:401 +#: ../src/common/helpers.py:414 msgid "swimming" msgstr "плаваю" -#: ../src/common/helpers.py:402 +#: ../src/common/helpers.py:415 #, fuzzy msgid "having coffee" msgstr "пью_кофе" -#: ../src/common/helpers.py:441 +#: ../src/common/helpers.py:454 msgid "is paying attention to the conversation" msgstr "читает сообщение" -#: ../src/common/helpers.py:443 +#: ../src/common/helpers.py:456 msgid "is doing something else" msgstr "занят чем-то еще" -#: ../src/common/helpers.py:445 +#: ../src/common/helpers.py:458 msgid "is composing a message..." msgstr "печатает сообщение..." #. paused means he or she was composing but has stopped for a while -#: ../src/common/helpers.py:448 +#: ../src/common/helpers.py:461 msgid "paused composing a message" msgstr "перестал печатать сообщение" -#: ../src/common/helpers.py:450 +#: ../src/common/helpers.py:463 msgid "has closed the chat window or tab" msgstr "закрыл окно чата или вкладку" -#: ../src/common/helpers.py:1021 ../src/common/helpers.py:1028 +#: ../src/common/helpers.py:1037 ../src/common/helpers.py:1044 #, python-format msgid "%d message pending" msgid_plural "%d messages pending" @@ -5318,22 +5268,22 @@ msgstr[1] "%d пропущенных сообщения" msgstr[2] "%d пропущенных сообщений" -#: ../src/common/helpers.py:1034 +#: ../src/common/helpers.py:1050 #, python-format msgid " from room %s" msgstr " в комнате %s" -#: ../src/common/helpers.py:1037 ../src/common/helpers.py:1056 +#: ../src/common/helpers.py:1053 ../src/common/helpers.py:1072 #, python-format msgid " from user %s" msgstr "" -#: ../src/common/helpers.py:1039 +#: ../src/common/helpers.py:1055 #, python-format msgid " from %s" msgstr " от %s" -#: ../src/common/helpers.py:1046 ../src/common/helpers.py:1053 +#: ../src/common/helpers.py:1062 ../src/common/helpers.py:1069 #, python-format msgid "%d event pending" msgid_plural "%d events pending" @@ -5341,7 +5291,7 @@ msgstr[1] "%d события пропущено" msgstr[2] "%d событий пропущено" -#: ../src/common/helpers.py:1086 +#: ../src/common/helpers.py:1102 #, python-format msgid "Gajim - %s" msgstr "Gajim - %s" @@ -5352,15 +5302,15 @@ msgid "error: cannot open %s for reading" msgstr "ошибка: не могу открыть %s для чтения" -#: ../src/common/optparser.py:219 ../src/common/optparser.py:220 +#: ../src/common/optparser.py:221 ../src/common/optparser.py:222 msgid "cyan" msgstr "синий" -#: ../src/common/optparser.py:336 +#: ../src/common/optparser.py:338 msgid "migrating logs database to indices" msgstr "переносим журнал на индексы" -#: ../src/common/passwords.py:88 +#: ../src/common/passwords.py:86 #, python-format msgid "Gajim account %s" msgstr "Учётная запись Gajim %s" @@ -5370,7 +5320,7 @@ "Connection to host could not be established: Timeout while sending data." msgstr "Не удалось соединиться с хостом: истекло время ожидания." -#: ../src/common/zeroconf/connection_handlers_zeroconf.py:242 +#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93 #, python-format msgid "" "The host %s you configured as the ft_add_hosts_to_send advanced option is " @@ -5445,33 +5395,43 @@ msgid "Error while adding service. %s" msgstr "Ошибка при добавлении службы. %s" -#: ../src/config.py:125 ../src/config.py:603 +#: ../src/config.py:124 ../src/config.py:546 msgid "Disabled" msgstr "Отключены" -#: ../src/config.py:322 +#: ../src/config.py:303 msgid "Active" msgstr "Активен" -#: ../src/config.py:330 +#: ../src/config.py:311 msgid "Event" msgstr "Событие" -#: ../src/config.py:455 +#: ../src/config.py:387 +#, fuzzy +msgid "Default Message" +msgstr "Новое сообщение" + +#: ../src/config.py:394 +#, fuzzy +msgid "Enabled" +msgstr "Включить" + +#: ../src/config.py:436 msgid "Always use OS/X default applications" msgstr "Всегда использовать приложения OS/X по умолчанию" -#: ../src/config.py:456 +#: ../src/config.py:437 #, fuzzy msgid "Custom" msgstr "Пользовательские настройки" -#: ../src/config.py:672 ../src/dialogs.py:1142 +#: ../src/config.py:615 ../src/dialogs.py:1177 #, python-format msgid "Dictionary for lang %s not available" msgstr "Нет словаря для языка %s" -#: ../src/config.py:673 +#: ../src/config.py:616 #, python-format msgid "" "You have to install %s dictionary to use spellchecking, or choose another " @@ -5480,108 +5440,108 @@ "Чтобы воспользоваться проверкой правописания, установите словарь для языка %" "s или выберите другой язык, исправив настройку speller_language." -#: ../src/config.py:1038 +#: ../src/config.py:981 msgid "status message title" msgstr "заголовок сообщения сервера" -#: ../src/config.py:1038 +#: ../src/config.py:981 msgid "status message text" msgstr "текст сообщения сервера" -#: ../src/config.py:1075 +#: ../src/config.py:1018 msgid "First Message Received" msgstr "Получено первое сообщение" -#: ../src/config.py:1076 +#: ../src/config.py:1019 #, fuzzy msgid "Next Message Received Focused" msgstr "Получено следующее сообщение" -#: ../src/config.py:1078 +#: ../src/config.py:1021 #, fuzzy msgid "Next Message Received Unfocused" msgstr "Получено следующее сообщение" -#: ../src/config.py:1079 +#: ../src/config.py:1022 msgid "Contact Connected" msgstr "Контакт подключился" -#: ../src/config.py:1080 +#: ../src/config.py:1023 msgid "Contact Disconnected" msgstr "Контакт отключился" -#: ../src/config.py:1081 +#: ../src/config.py:1024 msgid "Message Sent" msgstr "Сообщение отправлено" -#: ../src/config.py:1082 +#: ../src/config.py:1025 msgid "Group Chat Message Highlight" msgstr "Вас упомянули в комнате" -#: ../src/config.py:1083 +#: ../src/config.py:1026 msgid "Group Chat Message Received" msgstr "Получено сообщение в комнате" -#: ../src/config.py:1084 +#: ../src/config.py:1027 msgid "GMail Email Received" msgstr "Получено письмо на Gmail" #. Name column -#: ../src/config.py:1348 ../src/dialogs.py:1760 ../src/dialogs.py:1824 +#: ../src/config.py:1284 ../src/dialogs.py:1790 ../src/dialogs.py:1854 #: ../src/disco.py:742 ../src/disco.py:1534 ../src/disco.py:1780 -#: ../src/history_window.py:92 +#: ../src/history_window.py:90 msgid "Name" msgstr "Имя" -#: ../src/config.py:1431 +#: ../src/config.py:1367 msgid "Relogin now?" msgstr "Переподключиться сейчас?" -#: ../src/config.py:1432 +#: ../src/config.py:1368 msgid "If you want all the changes to apply instantly, you must relogin." msgstr "" "Если вы хотите чтобы изменения были применены немедленно, вы должны " "переподключиться." -#: ../src/config.py:1562 ../src/config.py:1661 +#: ../src/config.py:1497 ../src/config.py:1596 msgid "OpenPGP is not usable in this computer" msgstr "Невозможно использовать OpenPGP" -#: ../src/config.py:1697 ../src/config.py:1738 +#: ../src/config.py:1632 ../src/config.py:1673 msgid "Unread events" msgstr "Непросмотренные события" -#: ../src/config.py:1698 +#: ../src/config.py:1633 msgid "Read all pending events before removing this account." msgstr "Просмотрите все ожидающие события перед удалением учетной записи." -#: ../src/config.py:1724 +#: ../src/config.py:1659 #, python-format msgid "You have opened chat in account %s" msgstr "У вас есть окна чата под учётной записью %s" -#: ../src/config.py:1725 +#: ../src/config.py:1660 msgid "All chat and groupchat windows will be closed. Do you want to continue?" msgstr "Все окна чатов и комнат будут закрыты. Продолжить?" -#: ../src/config.py:1734 +#: ../src/config.py:1669 msgid "You are currently connected to the server" msgstr "Вы сейчас подсоединены к серверу" -#: ../src/config.py:1735 +#: ../src/config.py:1670 msgid "To change the account name, you must be disconnected." msgstr "Для смены имени учетной записи необходимо отключиться." -#: ../src/config.py:1739 +#: ../src/config.py:1674 msgid "To change the account name, you must read all pending events." msgstr "" "Для смены имени учетной записи необходимо просмотреть ожидающие события." -#: ../src/config.py:1745 +#: ../src/config.py:1680 msgid "Account Name Already Used" msgstr "Такое имя учетной записи уже используется" -#: ../src/config.py:1746 +#: ../src/config.py:1681 msgid "" "This name is already used by another of your accounts. Please choose another " "name." @@ -5589,147 +5549,147 @@ "Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите " "другое." -#: ../src/config.py:1750 ../src/config.py:1754 +#: ../src/config.py:1685 ../src/config.py:1689 msgid "Invalid account name" msgstr "Неверное имя учетной записи" -#: ../src/config.py:1751 +#: ../src/config.py:1686 msgid "Account name cannot be empty." msgstr "Имя учетной записи не может быть пустым." -#: ../src/config.py:1755 +#: ../src/config.py:1690 msgid "Account name cannot contain spaces." msgstr "Имя учетной записи не может содержать пробелы." -#: ../src/config.py:1819 +#: ../src/config.py:1761 msgid "Rename Account" msgstr "Переименовать учетную запись" -#: ../src/config.py:1820 +#: ../src/config.py:1762 #, python-format msgid "Enter a new name for account %s" msgstr "Введите новое название для учетной записи %s" -#: ../src/config.py:1838 ../src/config.py:1846 ../src/config.py:1888 -#: ../src/config.py:3103 ../src/dataforms_widget.py:535 +#: ../src/config.py:1780 ../src/config.py:1788 ../src/config.py:1830 +#: ../src/config.py:3053 ../src/dataforms_widget.py:535 msgid "Invalid Jabber ID" msgstr "Неверный Jabber ID" -#: ../src/config.py:1847 +#: ../src/config.py:1789 msgid "A Jabber ID must be in the form \"user@servername\"." msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"." -#: ../src/config.py:2035 ../src/config.py:3175 +#: ../src/config.py:1977 ../src/config.py:3125 msgid "Invalid entry" msgstr "Неверная запись" -#: ../src/config.py:2036 ../src/config.py:3176 +#: ../src/config.py:1978 ../src/config.py:3126 msgid "Custom port must be a port number." msgstr "В качестве номера порта должно выступать число" -#: ../src/config.py:2057 ../src/config.py:3652 +#: ../src/config.py:1999 ../src/config.py:3606 msgid "Failed to get secret keys" msgstr "Не удалось получить секретный ключ" -#: ../src/config.py:2058 ../src/config.py:3653 +#: ../src/config.py:2000 ../src/config.py:3607 msgid "There was a problem retrieving your OpenPGP secret keys." msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP." -#: ../src/config.py:2061 ../src/config.py:3656 +#: ../src/config.py:2003 ../src/config.py:3610 msgid "OpenPGP Key Selection" msgstr "Выбор ключа OpenPGP" -#: ../src/config.py:2062 ../src/config.py:3657 +#: ../src/config.py:2004 ../src/config.py:3611 msgid "Choose your OpenPGP key" msgstr "Выберите свой ключ OpenPGP" -#: ../src/config.py:2102 +#: ../src/config.py:2044 msgid "No such account available" msgstr "Такая учетная запись недоступна" -#: ../src/config.py:2103 +#: ../src/config.py:2045 msgid "You must create your account before editing your personal information." msgstr "" "Перед редактированием личных данных необходимо сначала создать учетную " "запись." -#: ../src/config.py:2110 ../src/dialogs.py:1607 ../src/dialogs.py:1748 -#: ../src/dialogs.py:1928 ../src/disco.py:426 ../src/profile_window.py:318 +#: ../src/config.py:2052 ../src/dialogs.py:1642 ../src/dialogs.py:1778 +#: ../src/dialogs.py:1958 ../src/disco.py:426 ../src/profile_window.py:318 msgid "You are not connected to the server" msgstr "Вы не подключены к серверу" -#: ../src/config.py:2111 +#: ../src/config.py:2053 msgid "Without a connection, you can not edit your personal information." msgstr "" "Чтобы отредактировать личную информацию, нужно подсоединиться к серверу." -#: ../src/config.py:2115 +#: ../src/config.py:2057 msgid "Your server doesn't support Vcard" msgstr "Сервер не поддерживает Vcard" -#: ../src/config.py:2116 +#: ../src/config.py:2058 msgid "Your server can't save your personal information." msgstr "Ваш сервер не может хранить личную информацию." -#: ../src/config.py:2147 +#: ../src/config.py:2089 msgid "Account Local already exists." msgstr "Учётная запись Local уже существует." -#: ../src/config.py:2148 +#: ../src/config.py:2090 msgid "Please rename or remove it before enabling link-local messaging." msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения." -#: ../src/config.py:2327 +#: ../src/config.py:2273 #, python-format msgid "Edit %s" msgstr "Править %s" -#: ../src/config.py:2329 +#: ../src/config.py:2275 #, python-format msgid "Register to %s" msgstr "Зарегистрировать %s" #. list at the beginning -#: ../src/config.py:2365 +#: ../src/config.py:2311 msgid "Ban List" msgstr "Черный список" -#: ../src/config.py:2366 +#: ../src/config.py:2312 msgid "Member List" msgstr "Список участников" -#: ../src/config.py:2367 +#: ../src/config.py:2313 msgid "Owner List" msgstr "Список владельцев" -#: ../src/config.py:2368 +#: ../src/config.py:2314 msgid "Administrator List" msgstr "Список администрираторов" #. Address column #. holds JID (who said this) -#: ../src/config.py:2417 ../src/disco.py:749 ../src/history_manager.py:177 +#: ../src/config.py:2363 ../src/disco.py:749 ../src/history_manager.py:178 msgid "JID" msgstr "JID" -#: ../src/config.py:2425 +#: ../src/config.py:2371 msgid "Reason" msgstr "Причина" -#: ../src/config.py:2430 +#: ../src/config.py:2376 msgid "Nick" msgstr "Ник" -#: ../src/config.py:2434 +#: ../src/config.py:2380 msgid "Role" msgstr "Обязанность" -#: ../src/config.py:2459 +#: ../src/config.py:2405 msgid "Banning..." msgstr "Баню..." #. You can move '\n' before user@domain if that line is TOO BIG -#: ../src/config.py:2461 +#: ../src/config.py:2407 msgid "" "Whom do you want to ban?\n" "\n" @@ -5737,11 +5697,11 @@ "Кого вы хотите забанить?\n" "\n" -#: ../src/config.py:2463 +#: ../src/config.py:2409 msgid "Adding Member..." msgstr "Добавляю участника..." -#: ../src/config.py:2464 +#: ../src/config.py:2410 msgid "" "Whom do you want to make a member?\n" "\n" @@ -5749,11 +5709,11 @@ "Кого вы хотите сделать участником?\n" "\n" -#: ../src/config.py:2466 +#: ../src/config.py:2412 msgid "Adding Owner..." msgstr "Добавляю владельца..." -#: ../src/config.py:2467 +#: ../src/config.py:2413 msgid "" "Whom do you want to make an owner?\n" "\n" @@ -5761,11 +5721,11 @@ "Кого вы хотите сделать владельцем?\n" "\n" -#: ../src/config.py:2469 +#: ../src/config.py:2415 msgid "Adding Administrator..." msgstr "Добавляю администратора..." -#: ../src/config.py:2470 +#: ../src/config.py:2416 msgid "" "Whom do you want to make an administrator?\n" "\n" @@ -5773,7 +5733,7 @@ "Кого вы хотите сделать администратором?\n" "\n" -#: ../src/config.py:2471 +#: ../src/config.py:2417 msgid "" "Can be one of the following:\n" "1. user@domain/resource (only that resource matches).\n" @@ -5789,87 +5749,87 @@ "4. domain (сам домен, т.е. как любое сочетание user@domain,\n" "domain/resource, так и адрес, содержащий этот поддомен)" -#: ../src/config.py:2575 +#: ../src/config.py:2523 #, python-format msgid "Removing %s account" msgstr "Удаление учетной записи %s" -#: ../src/config.py:2590 ../src/gajim.py:1392 ../src/roster_window.py:1646 +#: ../src/config.py:2538 ../src/gajim.py:1309 ../src/roster_window.py:1750 msgid "Password Required" msgstr "Требуется пароль" -#: ../src/config.py:2591 ../src/roster_window.py:1641 +#: ../src/config.py:2539 ../src/roster_window.py:1744 #, python-format msgid "Enter your password for account %s" msgstr "Введите пароль для учетной записи %s" -#: ../src/config.py:2592 ../src/roster_window.py:1647 +#: ../src/config.py:2540 ../src/roster_window.py:1751 msgid "Save password" msgstr "Сохранить пароль" -#: ../src/config.py:2605 +#: ../src/config.py:2553 #, python-format msgid "Account \"%s\" is connected to the server" msgstr "Учетная запись \"%s\" подключена к серверу" -#: ../src/config.py:2606 +#: ../src/config.py:2554 msgid "If you remove it, the connection will be lost." msgstr "Если вы удалите его, произойдет отключение." -#: ../src/config.py:2700 +#: ../src/config.py:2650 #, fuzzy msgid "Default" msgstr "Все" -#: ../src/config.py:2700 +#: ../src/config.py:2650 #, fuzzy msgid "?print_status:All" msgstr "Все" -#: ../src/config.py:2701 +#: ../src/config.py:2651 msgid "Enter and leave only" msgstr "Только приход и уход" -#: ../src/config.py:2702 +#: ../src/config.py:2652 msgid "?print_status:None" msgstr "" -#: ../src/config.py:2771 +#: ../src/config.py:2721 msgid "New Group Chat" msgstr "Новая комната" -#: ../src/config.py:2804 +#: ../src/config.py:2754 msgid "This bookmark has invalid data" msgstr "Эта закладка содержит неверные данные" -#: ../src/config.py:2805 +#: ../src/config.py:2755 msgid "" "Please be sure to fill out server and room fields or remove this bookmark." msgstr "" "Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, " "либо удалите эту закладку." -#: ../src/config.py:3086 +#: ../src/config.py:3036 msgid "Invalid username" msgstr "Неверное имя пользователя" -#: ../src/config.py:3088 +#: ../src/config.py:3038 msgid "You must provide a username to configure this account." msgstr "Для настройки учетной записи необходимо ввести имя пользователя." -#: ../src/config.py:3114 +#: ../src/config.py:3064 msgid "Duplicate Jabber ID" msgstr "Дублирующийся Jabber ID" -#: ../src/config.py:3115 +#: ../src/config.py:3065 msgid "This account is already configured in Gajim." msgstr "Этот контакт уже настроен в Gajim." -#: ../src/config.py:3132 +#: ../src/config.py:3082 msgid "Account has been added successfully" msgstr "Учетная запись успешно добавлена" -#: ../src/config.py:3133 ../src/config.py:3320 +#: ../src/config.py:3083 ../src/config.py:3270 msgid "" "You can set advanced account options by pressing the Advanced button, or " "later by choosing the Accounts menuitem under the Edit menu from the main " @@ -5879,25 +5839,25 @@ " Вы можете дополнительно ее настроить используя \n" "\"Настройка - >Учетные записи\" из главного окна." -#: ../src/config.py:3151 +#: ../src/config.py:3101 msgid "Invalid server" msgstr "Неверный сервер" -#: ../src/config.py:3152 +#: ../src/config.py:3102 msgid "Please provide a server on which you want to register." msgstr "Пожалуйста, укажите сервер на котором Вы хотите зарегистрироваться." -#: ../src/config.py:3203 ../src/gajim.py:2240 +#: ../src/config.py:3153 ../src/gajim.py:2023 #, fuzzy msgid "Certificate Already in File" msgstr "Сертификат аннулирован" -#: ../src/config.py:3204 ../src/gajim.py:2241 +#: ../src/config.py:3154 ../src/gajim.py:2024 #, python-format msgid "This certificate is already in file %s, so it's not added again." msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен." -#: ../src/config.py:3272 +#: ../src/config.py:3222 #, python-format msgid "" "Security Warning\n" @@ -5912,7 +5872,7 @@ "Ошибка SSL: %s\n" "Вы хотите соединиться с этим сервером?" -#: ../src/config.py:3278 ../src/gajim.py:2264 +#: ../src/config.py:3228 ../src/gajim.py:2047 #, python-format msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -5923,19 +5883,19 @@ "Отпечаток SHA1 сертификата:\n" "%s" -#: ../src/config.py:3299 ../src/config.py:3338 +#: ../src/config.py:3249 ../src/config.py:3288 msgid "An error occurred during account creation" msgstr "Произошла ошибка при создании учетной записи" -#: ../src/config.py:3319 +#: ../src/config.py:3269 msgid "Your new account has been created successfully" msgstr "Ваша новая учетная запись успешно создана" -#: ../src/config.py:3422 +#: ../src/config.py:3372 msgid "Account name is in use" msgstr "Такое имя учетной записи уже используется" -#: ../src/config.py:3423 +#: ../src/config.py:3373 msgid "You already have an account using this name." msgstr "У вас уже есть учетная запись с таким именем." @@ -5979,19 +5939,19 @@ msgid "Open as _Link" msgstr "Открыть как _ссылку" -#: ../src/conversation_textview.py:1111 +#: ../src/conversation_textview.py:1104 msgid "Yesterday" msgstr "Вчера" #. the number is >= 2 #. %i is day in year (1-365), %d (1-31) we want %i -#: ../src/conversation_textview.py:1115 +#: ../src/conversation_textview.py:1108 #, python-format msgid "%i days ago" msgstr "%i дней назад" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1149 +#: ../src/conversation_textview.py:1142 #, python-format msgid "Subject: %s\n" msgstr "Тема: %s\n" @@ -6041,120 +6001,119 @@ msgid "Contact name" msgstr "Имя контакта" -#: ../src/dialogs.py:437 -#, fuzzy +#: ../src/dialogs.py:461 msgid "Set Mood" -msgstr "Настроение" +msgstr "Установить настроение" -#: ../src/dialogs.py:477 +#: ../src/dialogs.py:513 #, python-format msgid "%s Status Message" msgstr "Сообщение о статусе %s" -#: ../src/dialogs.py:479 +#: ../src/dialogs.py:515 msgid "Status Message" msgstr "Сообщение о статусе" -#: ../src/dialogs.py:579 +#: ../src/dialogs.py:615 msgid "Save as Preset Status Message" msgstr "Сохранить установленное сообщение о статусе" -#: ../src/dialogs.py:580 +#: ../src/dialogs.py:616 msgid "Please type a name for this status message" msgstr "Введите имя для этого сообщения о статусе" -#: ../src/dialogs.py:591 +#: ../src/dialogs.py:627 msgid "Overwrite Status Message?" msgstr "Изменить сообщение о статусе?" -#: ../src/dialogs.py:592 +#: ../src/dialogs.py:628 msgid "" "This name is already used. Do you want to overwrite this status message?" msgstr "Это имя уже используется. Перезаписать это статусное сообщение?" -#: ../src/dialogs.py:608 +#: ../src/dialogs.py:644 msgid "AIM Address:" msgstr "Адрес AIM:" -#: ../src/dialogs.py:609 +#: ../src/dialogs.py:645 msgid "GG Number:" msgstr "Номер GaduGadu" -#: ../src/dialogs.py:610 +#: ../src/dialogs.py:646 msgid "ICQ Number:" msgstr "Номер ICQ:" -#: ../src/dialogs.py:611 +#: ../src/dialogs.py:647 msgid "MSN Address:" msgstr "Адрес в MSN:" -#: ../src/dialogs.py:612 +#: ../src/dialogs.py:648 msgid "Yahoo! Address:" msgstr "Адрес Yahoo:" -#: ../src/dialogs.py:649 +#: ../src/dialogs.py:685 #, python-format msgid "Please fill in the data of the contact you want to add in account %s" msgstr "" "Пожалуйста, заполните данные о контакте,\n" "который хотите добавить в ростер учетной записи %s" -#: ../src/dialogs.py:651 +#: ../src/dialogs.py:687 msgid "Please fill in the data of the contact you want to add" msgstr "Пожалуйста, заполните данные о контакте, который вы хотите добавить" -#: ../src/dialogs.py:808 ../src/dialogs.py:814 +#: ../src/dialogs.py:844 ../src/dialogs.py:850 msgid "Invalid User ID" msgstr "Неверный ID пользователя" -#: ../src/dialogs.py:815 +#: ../src/dialogs.py:851 msgid "The user ID must not contain a resource." msgstr "ID пользователя не должен содержать ресурс." -#: ../src/dialogs.py:829 +#: ../src/dialogs.py:865 msgid "Contact already in roster" msgstr "Контакт уже в ростере" -#: ../src/dialogs.py:830 +#: ../src/dialogs.py:866 msgid "This contact is already listed in your roster." msgstr "Этот контакт уже содержится в вашем ростере." -#: ../src/dialogs.py:866 +#: ../src/dialogs.py:902 msgid "User ID:" msgstr "ID пользователя:" -#: ../src/dialogs.py:928 +#: ../src/dialogs.py:960 msgid "A GTK+ jabber client" msgstr "Jabber-клиент на GTK+" -#: ../src/dialogs.py:929 +#: ../src/dialogs.py:961 msgid "GTK+ Version:" msgstr "Версия GTK+:" -#: ../src/dialogs.py:930 +#: ../src/dialogs.py:962 msgid "PyGTK Version:" msgstr "Версия PyGTK:" -#: ../src/dialogs.py:944 +#: ../src/dialogs.py:972 msgid "Current Developers:" msgstr "Разработчики:" -#: ../src/dialogs.py:946 +#: ../src/dialogs.py:974 msgid "Past Developers:" msgstr "Разработчики прошлых версий:" -#: ../src/dialogs.py:956 +#: ../src/dialogs.py:980 msgid "THANKS:" msgstr "БЛАГОДАРНОСТИ:" #. remove one english sentence #. and add it manually as translatable -#: ../src/dialogs.py:962 +#: ../src/dialogs.py:986 msgid "Last but not least, we would like to thank all the package maintainers." msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов." #. here you write your name in the form Name FamilyName <someone@somewhere> -#: ../src/dialogs.py:975 +#: ../src/dialogs.py:999 msgid "translator-credits" msgstr "" "Яков Безруков <nebulam51(a)gmail.com>\n" @@ -6162,19 +6121,19 @@ "Олег Стадник <mail(a)lokee.rv.ua>\n" "Денис Фомин <fominde(a)mail.ru>" -#: ../src/dialogs.py:1135 +#: ../src/dialogs.py:1170 #, python-format msgid "Unable to bind to port %s." msgstr "Не могу привязаться к порту %s." -#: ../src/dialogs.py:1136 +#: ../src/dialogs.py:1171 msgid "" "Maybe you have another running instance of Gajim. File Transfer will be " "cancelled." msgstr "" "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена." -#: ../src/dialogs.py:1143 +#: ../src/dialogs.py:1178 #, python-format msgid "" "You have to install %s dictionary to use spellchecking, or choose another " @@ -6185,79 +6144,88 @@ "Чтобы воспользоваться проверкой правописания, установите словарь для языка %" "s или выберите другой язык, исправив настройку speller_language." -#: ../src/dialogs.py:1536 +#: ../src/dialogs.py:1571 #, python-format msgid "Subscription request for account %s from %s" msgstr "Запрос на подписку для учетной записи %s от %s" -#: ../src/dialogs.py:1539 +#: ../src/dialogs.py:1574 #, python-format msgid "Subscription request from %s" msgstr "Запрос на подписку от %s" -#: ../src/dialogs.py:1600 ../src/roster_window.py:1843 +#: ../src/dialogs.py:1635 ../src/gajim.py:2592 ../src/roster_window.py:1101 #, python-format msgid "You are already in group chat %s" msgstr "Вы уже в комнате %s" -#: ../src/dialogs.py:1608 +#: ../src/dialogs.py:1643 msgid "You can not join a group chat unless you are connected." msgstr "Вы не можете зайти в комнату без подключения." -#: ../src/dialogs.py:1626 +#: ../src/dialogs.py:1662 #, python-format msgid "Join Group Chat with account %s" msgstr "Войти в комнату с учетной записи %s" -#: ../src/dialogs.py:1696 ../src/dialogs.py:1702 -#: ../src/groupchat_control.py:1719 +#: ../src/dialogs.py:1733 +msgid "Invalid Nickname" +msgstr "Неверное имя пользователя" + +#: ../src/dialogs.py:1734 ../src/groupchat_control.py:1331 +#: ../src/groupchat_control.py:1603 +msgid "The nickname has not allowed characters." +msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы." + +#: ../src/dialogs.py:1738 ../src/dialogs.py:1744 +#: ../src/groupchat_control.py:1771 msgid "Invalid group chat Jabber ID" msgstr "Неверное имя комнаты" -#: ../src/dialogs.py:1697 ../src/dialogs.py:1703 -#: ../src/groupchat_control.py:1720 +#: ../src/dialogs.py:1739 ../src/dialogs.py:1745 +#: ../src/groupchat_control.py:1772 msgid "The group chat Jabber ID has not allowed characters." msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы." -#: ../src/dialogs.py:1709 +#: ../src/dialogs.py:1751 msgid "This is not a group chat" msgstr "Это не комната" -#: ../src/dialogs.py:1710 +#: ../src/dialogs.py:1752 #, python-format msgid "%s is not the name of a group chat." msgstr "%s не является именем комнаты." -#: ../src/dialogs.py:1749 +#: ../src/dialogs.py:1779 msgid "Without a connection, you can not synchronise your contacts." msgstr "Чтобы объединить контакты, необходимо подсоединиться к серверу." -#: ../src/dialogs.py:1763 +#: ../src/dialogs.py:1793 msgid "Server" msgstr "Сервер" -#: ../src/dialogs.py:1796 +#: ../src/dialogs.py:1826 msgid "This account is not connected to the server" msgstr "Аккаунт не подключен к серверу" -#: ../src/dialogs.py:1797 +#: ../src/dialogs.py:1827 msgid "You cannot synchronize with an account unless it is connected." msgstr "Шифрование OpenPGP отключено" -#: ../src/dialogs.py:1821 +#: ../src/dialogs.py:1851 msgid "Synchronise" msgstr "" -#: ../src/dialogs.py:1879 +#: ../src/dialogs.py:1909 #, python-format msgid "Start Chat with account %s" msgstr "Начать чат с учетной записью %s" -#: ../src/dialogs.py:1881 +#: ../src/dialogs.py:1911 msgid "Start Chat" msgstr "Начать чат" -#: ../src/dialogs.py:1882 +#: ../src/dialogs.py:1912 msgid "" "Fill in the nickname or the Jabber ID of the contact you would like\n" "to send a chat message to:" @@ -6265,262 +6233,260 @@ "Введите ник или ID пользователя, которому вы хотите отправить сообщение:" #. if offline or connecting -#: ../src/dialogs.py:1907 ../src/dialogs.py:2281 ../src/dialogs.py:2422 -#: ../src/normal_control.py:640 +#: ../src/dialogs.py:1937 ../src/dialogs.py:2313 ../src/dialogs.py:2454 msgid "Connection not available" msgstr "Соединение невозможно" -#: ../src/dialogs.py:1908 ../src/dialogs.py:2282 ../src/dialogs.py:2423 -#: ../src/normal_control.py:641 +#: ../src/dialogs.py:1938 ../src/dialogs.py:2314 ../src/dialogs.py:2455 #, python-format msgid "Please make sure you are connected with \"%s\"." msgstr "Пожалуйста, удостоверьтесь, что вы подключены к \"%s\"." -#: ../src/dialogs.py:1917 ../src/dialogs.py:1920 +#: ../src/dialogs.py:1947 ../src/dialogs.py:1950 msgid "Invalid JID" msgstr "Неверный JID" -#: ../src/dialogs.py:1920 +#: ../src/dialogs.py:1950 #, python-format msgid "Unable to parse \"%s\"." msgstr "Не понимаю адреса \"%s\"." -#: ../src/dialogs.py:1929 +#: ../src/dialogs.py:1959 msgid "Without a connection, you can not change your password." msgstr "Чтобы изменить пароль, необходимо подсоединиться к серверу." -#: ../src/dialogs.py:1947 +#: ../src/dialogs.py:1977 msgid "Invalid password" msgstr "Неверный пароль" -#: ../src/dialogs.py:1948 +#: ../src/dialogs.py:1978 msgid "You must enter a password." msgstr "Вы должны ввести пароль." -#: ../src/dialogs.py:1952 +#: ../src/dialogs.py:1982 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: ../src/dialogs.py:1953 +#: ../src/dialogs.py:1983 msgid "The passwords typed in both fields must be identical." msgstr "Пароли, введенные в оба поля, должны быть одинаковы." #. img to display #. default value -#: ../src/dialogs.py:1995 ../src/notify.py:244 ../src/notify.py:458 +#: ../src/dialogs.py:2027 ../src/notify.py:242 ../src/notify.py:456 #: ../src/osx/growler.py:12 msgid "Contact Signed In" msgstr "Контакт подключился" -#: ../src/dialogs.py:1997 ../src/notify.py:252 ../src/notify.py:460 +#: ../src/dialogs.py:2029 ../src/notify.py:250 ../src/notify.py:458 #: ../src/osx/growler.py:12 msgid "Contact Signed Out" msgstr "Контакт отключился" #. chat message -#: ../src/dialogs.py:1999 ../src/notify.py:275 ../src/notify.py:462 +#: ../src/dialogs.py:2031 ../src/notify.py:273 ../src/notify.py:460 #: ../src/osx/growler.py:12 msgid "New Message" msgstr "Новое сообщение" #. single message -#: ../src/dialogs.py:1999 ../src/notify.py:256 ../src/notify.py:462 +#: ../src/dialogs.py:2031 ../src/notify.py:254 ../src/notify.py:460 #: ../src/osx/growler.py:13 msgid "New Single Message" msgstr "Новое одиночное сообщение" #. private message -#: ../src/dialogs.py:2000 ../src/notify.py:263 ../src/notify.py:463 +#: ../src/dialogs.py:2032 ../src/notify.py:261 ../src/notify.py:461 #: ../src/osx/growler.py:13 msgid "New Private Message" msgstr "Новое личное сообщение" -#: ../src/dialogs.py:2000 ../src/gajim.py:1585 ../src/notify.py:471 +#: ../src/dialogs.py:2032 ../src/gajim.py:1493 ../src/notify.py:469 #: ../src/osx/growler.py:13 msgid "New E-mail" msgstr "Новое письмо" -#: ../src/dialogs.py:2002 ../src/gajim.py:1763 ../src/notify.py:465 +#: ../src/dialogs.py:2034 ../src/gajim.py:1559 ../src/notify.py:463 #: ../src/osx/growler.py:14 msgid "File Transfer Request" msgstr "Запрос передачи" -#: ../src/dialogs.py:2004 ../src/gajim.py:1557 ../src/gajim.py:1730 -#: ../src/notify.py:467 ../src/osx/growler.py:14 +#: ../src/dialogs.py:2036 ../src/gajim.py:1458 ../src/gajim.py:1526 +#: ../src/notify.py:465 ../src/osx/growler.py:14 msgid "File Transfer Error" msgstr "Ошибка передачи" -#: ../src/dialogs.py:2006 ../src/gajim.py:1802 ../src/gajim.py:1824 -#: ../src/gajim.py:1841 ../src/notify.py:469 ../src/osx/growler.py:15 +#: ../src/dialogs.py:2038 ../src/gajim.py:1598 ../src/gajim.py:1620 +#: ../src/gajim.py:1637 ../src/notify.py:467 ../src/osx/growler.py:15 msgid "File Transfer Completed" msgstr "Передача файла завершена" -#: ../src/dialogs.py:2007 ../src/gajim.py:1805 ../src/notify.py:469 +#: ../src/dialogs.py:2039 ../src/gajim.py:1601 ../src/notify.py:467 #: ../src/osx/growler.py:15 msgid "File Transfer Stopped" msgstr "Передача остановлена" -#: ../src/dialogs.py:2009 ../src/gajim.py:1413 ../src/notify.py:473 +#: ../src/dialogs.py:2041 ../src/gajim.py:1330 ../src/notify.py:471 #: ../src/osx/growler.py:16 msgid "Groupchat Invitation" msgstr "Приглашение в комнату" -#: ../src/dialogs.py:2011 ../src/notify.py:236 ../src/notify.py:475 +#: ../src/dialogs.py:2043 ../src/notify.py:234 ../src/notify.py:473 #: ../src/osx/growler.py:16 msgid "Contact Changed Status" msgstr "Контакт изменит статус" -#: ../src/dialogs.py:2200 ../src/normal_control.py:241 +#: ../src/dialogs.py:2232 #, python-format msgid "Single Message using account %s" msgstr "Новое сообщение с учетной записи %s" -#: ../src/dialogs.py:2202 ../src/normal_control.py:243 +#: ../src/dialogs.py:2234 #, python-format msgid "Single Message in account %s" msgstr "Новое сообщение для учетной записи %s" -#: ../src/dialogs.py:2204 ../src/normal_control.py:245 +#: ../src/dialogs.py:2236 msgid "Single Message" msgstr "Сообщение" #. prepare UI for Sending -#: ../src/dialogs.py:2207 ../src/normal_control.py:248 +#: ../src/dialogs.py:2239 #, python-format msgid "Send %s" msgstr "Отправить %s" #. prepare UI for Receiving -#: ../src/dialogs.py:2230 ../src/normal_control.py:290 +#: ../src/dialogs.py:2262 #, python-format msgid "Received %s" msgstr "Получено %s" #. prepare UI for Receiving -#: ../src/dialogs.py:2253 ../src/normal_control.py:324 +#: ../src/dialogs.py:2285 #, python-format msgid "Form %s" msgstr "От %s" #. we create a new blank window to send and we preset RE: and to jid -#: ../src/dialogs.py:2323 ../src/normal_control.py:692 +#: ../src/dialogs.py:2355 #, python-format msgid "RE: %s" msgstr "RE: %s" -#: ../src/dialogs.py:2324 ../src/normal_control.py:696 +#: ../src/dialogs.py:2356 #, python-format msgid "%s wrote:\n" msgstr "%s написал:\n" -#: ../src/dialogs.py:2368 +#: ../src/dialogs.py:2400 #, python-format msgid "XML Console for %s" msgstr "Консоль XML для %s" -#: ../src/dialogs.py:2370 +#: ../src/dialogs.py:2402 msgid "XML Console" msgstr "Консоль XML" -#: ../src/dialogs.py:2493 +#: ../src/dialogs.py:2525 #, python-format msgid "Privacy List %s" msgstr "Список доступа %s" -#: ../src/dialogs.py:2497 +#: ../src/dialogs.py:2529 #, python-format msgid "Privacy List for %s" msgstr "Список доступа для %s" -#: ../src/dialogs.py:2553 +#: ../src/dialogs.py:2585 #, python-format msgid "Order: %s, action: %s, type: %s, value: %s" msgstr "Номер: %s, действие: %s, тип: %s, значение: %s" -#: ../src/dialogs.py:2556 +#: ../src/dialogs.py:2588 #, python-format msgid "Order: %s, action: %s" msgstr "Номер: %s, действие: %s" -#: ../src/dialogs.py:2598 +#: ../src/dialogs.py:2630 msgid "Edit a rule" msgstr "Изменить правило" -#: ../src/dialogs.py:2685 +#: ../src/dialogs.py:2717 msgid "Add a rule" msgstr "Добавить правило" -#: ../src/dialogs.py:2781 +#: ../src/dialogs.py:2813 #, python-format msgid "Privacy Lists for %s" msgstr "Списки доступа для %s" -#: ../src/dialogs.py:2783 +#: ../src/dialogs.py:2815 msgid "Privacy Lists" msgstr "Списки доступа" -#: ../src/dialogs.py:2853 +#: ../src/dialogs.py:2885 msgid "Invalid List Name" msgstr "Недопустимое имя списка" -#: ../src/dialogs.py:2854 +#: ../src/dialogs.py:2886 msgid "You must enter a name to create a privacy list." msgstr "Необходимо ввести имя для новой учетной записи." -#: ../src/dialogs.py:2891 +#: ../src/dialogs.py:2923 msgid "$Contact has invited you to join a discussion" msgstr "%(contact_jid)s приглашает вас в комнату %(room_jid)s." -#: ../src/dialogs.py:2893 +#: ../src/dialogs.py:2925 #, python-format msgid "$Contact has invited you to group chat %(room_jid)s" msgstr "$Contact приглашает вас в комнату %(room_jid)s." -#: ../src/dialogs.py:2906 +#: ../src/dialogs.py:2938 #, python-format msgid "Comment: %s" msgstr "Комментарий: %s" -#: ../src/dialogs.py:2972 +#: ../src/dialogs.py:3004 msgid "Choose Sound" msgstr "Выберите звуковой файл" -#: ../src/dialogs.py:2982 ../src/dialogs.py:3033 +#: ../src/dialogs.py:3014 ../src/dialogs.py:3065 msgid "All files" msgstr "Все файлы" -#: ../src/dialogs.py:2987 +#: ../src/dialogs.py:3019 msgid "Wav Sounds" msgstr "В формате Wav" -#: ../src/dialogs.py:3020 +#: ../src/dialogs.py:3052 msgid "Choose Image" msgstr "Выбрать картинку" -#: ../src/dialogs.py:3038 +#: ../src/dialogs.py:3070 msgid "Images" msgstr "Картинки" -#: ../src/dialogs.py:3103 +#: ../src/dialogs.py:3135 #, python-format msgid "When %s becomes:" msgstr "Когда %s происходит:" -#: ../src/dialogs.py:3105 +#: ../src/dialogs.py:3137 #, python-format msgid "Adding Special Notification for %s" msgstr "Добавление специального уведомления для %s" #. # means number -#: ../src/dialogs.py:3176 +#: ../src/dialogs.py:3208 msgid "#" msgstr "№" -#: ../src/dialogs.py:3182 +#: ../src/dialogs.py:3214 msgid "Condition" msgstr "Условие" -#: ../src/dialogs.py:3300 +#: ../src/dialogs.py:3332 msgid "when I am " msgstr "когда я " @@ -6821,7 +6787,7 @@ msgstr "" #: ../src/features_window.py:98 -msgid "End to end encryption" +msgid "End to End Encryption" msgstr "End to end шифрование" #: ../src/features_window.py:99 @@ -6860,9 +6826,8 @@ msgstr "Требует python-sexy." #: ../src/features_window.py:123 -#, fuzzy msgid "Feature" -msgstr "Параметры сервера" +msgstr "Функции" #: ../src/filetransfers_window.py:77 msgid "File" @@ -6889,7 +6854,7 @@ #. You is a reply of who sent a file #. You is a reply of who received a file #: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:184 -#: ../src/history_manager.py:485 +#: ../src/history_manager.py:486 msgid "You" msgstr "Вы" @@ -6899,7 +6864,7 @@ msgstr "Отправитель: %s" #: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:595 -#: ../src/tooltips.py:649 +#: ../src/tooltips.py:646 msgid "Recipient: " msgstr "Получатель:" @@ -6938,7 +6903,7 @@ msgid "Choose File to Send..." msgstr "Выбрать файл для отправки..." -#: ../src/filetransfers_window.py:259 ../src/tooltips.py:689 +#: ../src/filetransfers_window.py:259 ../src/tooltips.py:686 msgid "Description: " msgstr "Описание: " @@ -7032,11 +6997,11 @@ msgid "It is not possible to send empty files" msgstr "Нельзя отсылать пустые файлы" -#: ../src/filetransfers_window.py:591 ../src/tooltips.py:639 +#: ../src/filetransfers_window.py:591 ../src/tooltips.py:636 msgid "Name: " msgstr "Имя: " -#: ../src/filetransfers_window.py:593 ../src/tooltips.py:643 +#: ../src/filetransfers_window.py:593 ../src/tooltips.py:640 msgid "Sender: " msgstr "Отправитель:" @@ -7044,36 +7009,40 @@ msgid "Pause" msgstr "Пауза" -#: ../src/gajim.py:71 +#: ../src/gajim.py:72 #, python-format msgid "%s is not a valid loglevel" msgstr "" -#: ../src/gajim.py:144 +#: ../src/gajim.py:153 +msgid "No X11 running and failed to start it! Quitting..." +msgstr "" + +#: ../src/gajim.py:156 msgid "Gajim needs X server to run. Quiting..." msgstr "Gajim для запуска требуется X-сервер. Выход..." -#: ../src/gajim.py:174 +#: ../src/gajim.py:186 msgid "Gajim needs PyGTK 2.8 or above" msgstr "Gajim требуется PyGTK 2.8 или выше" -#: ../src/gajim.py:175 +#: ../src/gajim.py:187 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..." msgstr "Gajim для запуска требуется PyGTK 2.8 или выше. Выход..." -#: ../src/gajim.py:177 +#: ../src/gajim.py:189 msgid "Gajim needs GTK 2.8 or above" msgstr "Gajim требуется GTK 2.8 или выше" -#: ../src/gajim.py:178 +#: ../src/gajim.py:190 msgid "Gajim needs GTK 2.8 or above to run. Quiting..." msgstr "Gajim для запуска требуется GTK 2.8 или выше. Выход..." -#: ../src/gajim.py:183 +#: ../src/gajim.py:195 msgid "GTK+ runtime is missing libglade support" msgstr "У GTK отсутствует поддержка libglade." -#: ../src/gajim.py:185 +#: ../src/gajim.py:197 #, python-format msgid "" "Please remove your current GTK+ runtime and install the latest stable " @@ -7082,20 +7051,20 @@ "Пожалуйста, удалите вашу текущую версию GTK и установите последнюю " "стабильную версию с %s" -#: ../src/gajim.py:187 +#: ../src/gajim.py:199 msgid "" "Please make sure that GTK+ and PyGTK have libglade support in your system." msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade." -#: ../src/gajim.py:192 +#: ../src/gajim.py:204 msgid "Gajim needs PySQLite2 to run" msgstr "Gajim для запуска требуется PySQLite2" -#: ../src/gajim.py:200 +#: ../src/gajim.py:212 msgid "Gajim needs pywin32 to run" msgstr "Gajim для запуска требуется pywin32" -#: ../src/gajim.py:201 +#: ../src/gajim.py:213 #, python-format msgid "" "Please make sure that Pywin32 is installed on your system. You can get it at " @@ -7105,11 +7074,11 @@ "получить его на сайте: %s" #. set the icon to all newly opened wind -#: ../src/gajim.py:354 +#: ../src/gajim.py:370 msgid "Gajim is already running" msgstr "Gajim уже запущен" -#: ../src/gajim.py:355 +#: ../src/gajim.py:371 msgid "" "Another instance of Gajim seems to be running\n" "Run anyway?" @@ -7117,116 +7086,111 @@ "По-видимому, уже запущен другой экземпляр Gajim\n" "Запустить ещё один?" -#: ../src/gajim.py:477 +#: ../src/gajim.py:503 msgid "Do you accept this request?" msgstr "Вы принимаете этот запрос?" -#: ../src/gajim.py:479 +#: ../src/gajim.py:505 #, python-format msgid "Do you accept this request on account %s?" msgstr "Вы принимаете запрос %s?" -#: ../src/gajim.py:482 +#: ../src/gajim.py:508 #, python-format msgid "HTTP (%s) Authorization for %s (id: %s)" msgstr "HTTP (%s) Авторизация для %s (id: %s)" -#: ../src/gajim.py:529 ../src/notify.py:477 ../src/osx/growler.py:17 +#: ../src/gajim.py:556 ../src/notify.py:475 ../src/osx/growler.py:17 msgid "Connection Failed" msgstr "Соединение разорвалось" -#: ../src/gajim.py:868 +#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) +#: ../src/gajim.py:836 ../src/gajim.py:848 #, python-format -msgid "Subject: %s" -msgstr "Тема: %s" - -#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time)) -#: ../src/gajim.py:921 ../src/gajim.py:934 -#, python-format msgid "error while sending %s ( %s )" msgstr "ошибка при отправке %s ( %s )" -#: ../src/gajim.py:967 +#: ../src/gajim.py:878 msgid "Authorization accepted" msgstr "Авторизация принята" -#: ../src/gajim.py:968 +#: ../src/gajim.py:879 #, python-format msgid "The contact \"%s\" has authorized you to see his or her status." msgstr "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его статус." -#: ../src/gajim.py:987 +#: ../src/gajim.py:898 #, python-format msgid "Contact \"%s\" removed subscription from you" msgstr "Контакт \"%s\" отозвал подписку с вами" -#: ../src/gajim.py:988 +#: ../src/gajim.py:899 msgid "" "You will always see him or her as offline.\n" "Do you want to remove him or her from your contact list?" msgstr "" -#: ../src/gajim.py:1030 +#: ../src/gajim.py:940 #, python-format msgid "Contact with \"%s\" cannot be established" msgstr "Связь с \"%s\" не может быть установлена" -#: ../src/gajim.py:1205 ../src/groupchat_control.py:1016 +#: ../src/gajim.py:1120 ../src/groupchat_control.py:1070 #, python-format msgid "%s is now known as %s" msgstr "%s теперь известен как %s" -#: ../src/gajim.py:1220 ../src/groupchat_control.py:1165 -#: ../src/roster_window.py:1737 +#: ../src/gajim.py:1135 ../src/groupchat_control.py:1219 +#: ../src/roster_window.py:1848 #, fuzzy, python-format msgid "%s is now %s" msgstr "%s %s" #. Can be a presence (see chg_contact_status in groupchat_control.py) #. Can be a message (see handle_event_gc_config_change in gajim.py) -#: ../src/gajim.py:1340 ../src/groupchat_control.py:976 +#: ../src/gajim.py:1257 ../src/groupchat_control.py:1030 msgid "Any occupant is allowed to see your full JID" msgstr "Любой участник может увидеть ваш настоящий JID" -#: ../src/gajim.py:1343 +#: ../src/gajim.py:1260 msgid "Room now shows unavailable member" msgstr "" -#: ../src/gajim.py:1345 +#: ../src/gajim.py:1262 msgid "room now does not show unavailable members" msgstr "" -#: ../src/gajim.py:1348 +#: ../src/gajim.py:1265 msgid "A non-privacy-related room configuration change has occurred" msgstr "" #. Can be a presence (see chg_contact_status in groupchat_control.py) -#: ../src/gajim.py:1351 +#: ../src/gajim.py:1268 msgid "Room logging is now enabled" msgstr "Запись логов конференции включена" -#: ../src/gajim.py:1353 +#: ../src/gajim.py:1270 msgid "Room logging is now disabled" msgstr "Запись логов конференции выключена" -#: ../src/gajim.py:1355 +#: ../src/gajim.py:1272 msgid "Room is now non-anonymous" msgstr "Конференция не анонимна" -#: ../src/gajim.py:1358 +#: ../src/gajim.py:1275 msgid "Room is now semi-anonymous" msgstr "Конференция частично анонимна" -#: ../src/gajim.py:1361 +#: ../src/gajim.py:1278 msgid "Room is now fully-anonymous" msgstr "Конференция полностью анонимна" -#: ../src/gajim.py:1393 +#: ../src/gajim.py:1310 #, python-format msgid "A Password is required to join the room %s. Please type it." msgstr "Чтобы войти в комнату %s, нужен пароль." -#: ../src/gajim.py:1427 +#: ../src/gajim.py:1344 msgid "" "You configured Gajim to use GPG agent, but there is no GPG agent running or " "it returned a wrong passphrase.\n" @@ -7234,38 +7198,38 @@ "Gajim настроен на использование GPG агента,но GPG агент не запущен или он " "возвратил неверный пароль.\n" -#: ../src/gajim.py:1429 +#: ../src/gajim.py:1346 msgid "You are currently connected without your OpenPGP key." msgstr "Вы сейчас соединены без OpenPGP ключа." -#: ../src/gajim.py:1432 +#: ../src/gajim.py:1349 msgid "Your passphrase is incorrect" msgstr "Ваша парольная фраза неверна" -#: ../src/gajim.py:1449 ../src/secrets.py:44 +#: ../src/gajim.py:1366 ../src/secrets.py:44 msgid "Passphrase Required" msgstr "Требуется парольная фраза" -#: ../src/gajim.py:1450 +#: ../src/gajim.py:1367 #, python-format msgid "Enter GPG key passphrase for account %s." msgstr "Введите парольную фразу GPG для учетной записи %s" -#: ../src/gajim.py:1462 +#: ../src/gajim.py:1379 msgid "Wrong Passphrase" msgstr "Неверная парольная фраза" -#: ../src/gajim.py:1463 +#: ../src/gajim.py:1380 msgid "Please retype your GPG passphrase or press Cancel." msgstr "" "Пожалуйста, введите парольную фразу для GPG еще раз или нажмите Отмена." -#: ../src/gajim.py:1568 +#: ../src/gajim.py:1469 #, python-format msgid "New mail on %(gmail_mail_address)s" msgstr "Новое письмо на %(gmail_mail_address)s" -#: ../src/gajim.py:1570 +#: ../src/gajim.py:1471 #, python-format msgid "You have %d new mail conversation" msgid_plural "You have %d new mail conversations" @@ -7273,50 +7237,48 @@ msgstr[1] "У вас есть %d непрочитанных письма" msgstr[2] "У вас есть %d непрочитанных письма" -#. FIXME: emulate Gtalk client popups. find out what they parse and how -#. they decide what to show -#. each message has a 'From', 'Subject' and 'Snippet' field -#: ../src/gajim.py:1579 +#: ../src/gajim.py:1485 #, python-format msgid "" "\n" -"From: %(from_address)s" +"\n" +"From: %(from_address)s\n" +"Subject: %(subject)s\n" +"%(snippet)s" msgstr "" -"\n" -"От: %(from_address)s" -#: ../src/gajim.py:1760 +#: ../src/gajim.py:1556 #, python-format msgid "%s wants to send you a file." msgstr "%s хочет отправить вам файл." -#: ../src/gajim.py:1825 +#: ../src/gajim.py:1621 #, python-format msgid "You successfully received %(filename)s from %(name)s." msgstr "Успешно получен файл %(filename)s от %(name)s." #. ft stopped -#: ../src/gajim.py:1829 +#: ../src/gajim.py:1625 #, python-format msgid "File transfer of %(filename)s from %(name)s stopped." msgstr "Передача файла %(filename)s от %(name)s приостановлена." -#: ../src/gajim.py:1842 +#: ../src/gajim.py:1638 #, python-format msgid "You successfully sent %(filename)s to %(name)s." msgstr "%(name)s успешно получил отправленный вами файл %(filename)s." #. ft stopped -#: ../src/gajim.py:1846 +#: ../src/gajim.py:1642 #, python-format msgid "File transfer of %(filename)s to %(name)s stopped." msgstr "Передача файла %(filename)s к %(name)s приостановлена." -#: ../src/gajim.py:1973 ../src/gajim.py:2017 +#: ../src/gajim.py:1769 ../src/gajim.py:1813 msgid "Confirm these session options" msgstr "" -#: ../src/gajim.py:1974 +#: ../src/gajim.py:1770 #, python-format msgid "" "The remote client wants to negotiate an session with these features:\n" @@ -7326,7 +7288,7 @@ "\t\tAre these options acceptable?" msgstr "" -#: ../src/gajim.py:2018 +#: ../src/gajim.py:1814 #, python-format msgid "" "The remote client selected these options:\n" @@ -7336,33 +7298,33 @@ "Continue with the session?" msgstr "" -#: ../src/gajim.py:2148 +#: ../src/gajim.py:1933 msgid "Username Conflict" msgstr "Такое имя уже есть" -#: ../src/gajim.py:2149 +#: ../src/gajim.py:1934 msgid "Please type a new username for your local account" msgstr "" "Пожалуйста, введите новое имя пользователя для локальной учетной записи" -#: ../src/gajim.py:2166 +#: ../src/gajim.py:1949 ../src/gajim.py:1951 msgid "Ping?" msgstr "" -#: ../src/gajim.py:2175 +#: ../src/gajim.py:1957 ../src/gajim.py:1959 #, python-format msgid "Pong! (%s s.)" msgstr "" -#: ../src/gajim.py:2182 +#: ../src/gajim.py:1963 ../src/gajim.py:1965 msgid "Error." msgstr "" -#: ../src/gajim.py:2207 +#: ../src/gajim.py:1990 msgid "Resource Conflict" msgstr "Такое имя уже есть" -#: ../src/gajim.py:2208 +#: ../src/gajim.py:1991 msgid "" "You are already connected to this account with the same resource. Please " "type a new one" @@ -7370,11 +7332,11 @@ "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите " "другой ресурс" -#: ../src/gajim.py:2261 +#: ../src/gajim.py:2044 msgid "Error verifying SSL certificate" msgstr "Ошибка при проверке SSL сертификата" -#: ../src/gajim.py:2262 +#: ../src/gajim.py:2045 #, python-format msgid "" "There was an error verifying the SSL certificate of your jabber server: %" @@ -7382,15 +7344,15 @@ "Do you still want to connect to this server?" msgstr "" -#: ../src/gajim.py:2267 +#: ../src/gajim.py:2050 msgid "Ignore this error for this certificate." msgstr "" -#: ../src/gajim.py:2282 +#: ../src/gajim.py:2065 msgid "SSL certificate error" msgstr "" -#: ../src/gajim.py:2283 +#: ../src/gajim.py:2066 #, python-format msgid "" "It seems the SSL certificate has changed or your connection is being " @@ -7401,44 +7363,42 @@ "Do you still want to connect and update the fingerprint of the certificate?" msgstr "" -#: ../src/gajim.py:2302 -#, fuzzy +#: ../src/gajim.py:2085 msgid "Insecure connection" -msgstr "Соединение" +msgstr "Небезопасное соединение" -#: ../src/gajim.py:2303 -#, fuzzy +#: ../src/gajim.py:2086 msgid "" "You are about to send your password on an insecure connection. Are you sure " "you want to do that?" -msgstr "Вы хотите создать метаконтакт?" +msgstr "Вы хотите отправить пароль через небезопасное соединение.Вы уверены?" -#: ../src/gajim.py:2305 ../src/groupchat_control.py:1646 -#: ../src/roster_window.py:3716 +#: ../src/gajim.py:2088 ../src/groupchat_control.py:1698 +#: ../src/roster_window.py:3580 msgid "Do _not ask me again" msgstr "Не _переспрашивать" -#: ../src/gajim.py:2318 +#: ../src/gajim.py:2101 msgid "PEP node was not removed" msgstr "" -#: ../src/gajim.py:2319 +#: ../src/gajim.py:2102 #, python-format msgid "PEP node %s was not removed: %s" msgstr "" #. theme doesn't exist, disable emoticons -#: ../src/gajim.py:2599 ../src/gajim.py:2620 +#: ../src/gajim.py:2551 ../src/gajim.py:2572 msgid "Emoticons disabled" msgstr "Смайлики выключены" -#: ../src/gajim.py:2600 +#: ../src/gajim.py:2552 msgid "" "Your configured emoticons theme has not been found, so emoticons have been " "disabled." msgstr "Тема смайликов не найдена,они будут отключены." -#: ../src/gajim.py:2621 +#: ../src/gajim.py:2573 msgid "" "Your configured emoticons theme cannot been loaded. You maybe need to update " "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons " @@ -7447,17 +7407,39 @@ "Смайлики не могут быть загружены.Возможно Вам нужно обновить формат файла " "emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons." +#: ../src/gajim.py:2600 ../src/roster_window.py:1109 +#: ../src/roster_window.py:3130 +msgid "You cannot join a group chat while you are invisible" +msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости." + #. it is good to notify the user #. in case he or she cannot see the output of the console -#: ../src/gajim.py:2722 +#: ../src/gajim.py:2858 msgid "Could not save your settings and preferences" msgstr "Не могу сохранить ваши установки и настройки" -#: ../src/gajim.py:2978 +#: ../src/gajim.py:2950 +msgid "Bookmark already set" +msgstr "Закладка уже установлена" + +#: ../src/gajim.py:2951 +#, python-format +msgid "Group Chat \"%s\" is already in your bookmarks." +msgstr "Комната \"%s\" уже есть в ваших закладках." + +#: ../src/gajim.py:2964 +msgid "Bookmark has been added successfully" +msgstr "Закладка успешно добавлена" + +#: ../src/gajim.py:2965 +msgid "You can manage your bookmarks via Actions menu in your roster." +msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере." + +#: ../src/gajim.py:3152 msgid "Network Manager support not available" msgstr "Network Manager не используется" -#: ../src/gajim.py:3091 +#: ../src/gajim.py:3265 msgid "Session Management support not available (missing gnome.ui module)" msgstr "" "Отсутствует поддержка управления сессиями (отсутствует модуль gnome.ui)" @@ -7760,14 +7742,12 @@ msgstr "Пароль:" #: ../src/gajim-remote.py:268 -#, fuzzy msgid "Check if Gajim is running" -msgstr "Пожалуйста, удостоверьтесь что демон avahi запущен." +msgstr "Проверьте что Gajim запущен" #: ../src/gajim-remote.py:272 ../src/gajim-remote.py:282 -#, fuzzy msgid "Shows or hides the ipython window" -msgstr "Скрывает или показывает окно ростера" +msgstr "Скрывает или показывает окно ipython" #: ../src/gajim-remote.py:306 msgid "Missing argument \"contact_jid\"" @@ -7864,123 +7844,129 @@ msgid "Please first choose another for your current theme." msgstr "Пожалуйста, выберите сначала другую тему." -#: ../src/groupchat_control.py:146 +#: ../src/groupchat_control.py:147 msgid "Sending private message failed" msgstr "Не удалось отправить личное сообщение" #. in second %s code replaces with nickname -#: ../src/groupchat_control.py:148 +#: ../src/groupchat_control.py:149 #, python-format msgid "You are no longer in group chat \"%s\" or \"%s\" has left." msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел." -#: ../src/groupchat_control.py:369 +#: ../src/groupchat_control.py:388 msgid "Insert Nickname" msgstr "Вставить ник" -#: ../src/groupchat_control.py:904 +#: ../src/groupchat_control.py:540 +#, fuzzy +msgid "Conversation with " +msgstr "История" + +#: ../src/groupchat_control.py:542 +#, fuzzy +msgid "Continued conversation" +msgstr "Информация о контакте" + +#: ../src/groupchat_control.py:958 msgid "Really send file?" msgstr "Отправить файл?" -#: ../src/groupchat_control.py:905 +#: ../src/groupchat_control.py:959 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "" #. Can be a message (see handle_event_gc_config_change in gajim.py) -#: ../src/groupchat_control.py:979 +#: ../src/groupchat_control.py:1033 msgid "Room logging is enabled" msgstr "Запись логов конференции включена" -#: ../src/groupchat_control.py:981 +#: ../src/groupchat_control.py:1035 msgid "A new room has been created" msgstr "Новая комната была создана" -#: ../src/groupchat_control.py:984 +#: ../src/groupchat_control.py:1038 msgid "The server has assigned or modified your roomnick" msgstr "" #. do not print 'kicked by None' -#: ../src/groupchat_control.py:990 +#: ../src/groupchat_control.py:1044 #, python-format msgid "%(nick)s has been kicked: %(reason)s" msgstr "%(nick)s выгнали из комнаты: %(reason)s" -#: ../src/groupchat_control.py:994 +#: ../src/groupchat_control.py:1048 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s" #. do not print 'banned by None' -#: ../src/groupchat_control.py:1001 +#: ../src/groupchat_control.py:1055 #, python-format msgid "%(nick)s has been banned: %(reason)s" msgstr "%(nick)s запретили заходить в комнату: %(reason)s" -#: ../src/groupchat_control.py:1005 +#: ../src/groupchat_control.py:1059 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s" -#: ../src/groupchat_control.py:1014 +#: ../src/groupchat_control.py:1068 #, python-format msgid "You are now known as %s" msgstr "Вы теперь известны как %s" -#: ../src/groupchat_control.py:1050 ../src/groupchat_control.py:1054 -#: ../src/groupchat_control.py:1059 +#: ../src/groupchat_control.py:1104 ../src/groupchat_control.py:1108 +#: ../src/groupchat_control.py:1113 #, python-format msgid "%(nick)s has been removed from the room (%(reason)s)" msgstr "%(nick)s выгнали из комнаты (%(reason)s)" -#: ../src/groupchat_control.py:1051 +#: ../src/groupchat_control.py:1105 msgid "affiliation changed" msgstr "" -#: ../src/groupchat_control.py:1056 +#: ../src/groupchat_control.py:1110 msgid "room configuration changed to members-only" msgstr "" -#: ../src/groupchat_control.py:1061 +#: ../src/groupchat_control.py:1115 msgid "system shutdown" msgstr "" -#: ../src/groupchat_control.py:1158 +#: ../src/groupchat_control.py:1212 #, python-format msgid "%s has left" msgstr "%s ушел" -#: ../src/groupchat_control.py:1163 +#: ../src/groupchat_control.py:1217 #, python-format msgid "%s has joined the group chat" msgstr "%s зашёл в комнату" #. Invalid Nickname #. invalid char -#: ../src/groupchat_control.py:1276 ../src/groupchat_control.py:1555 +#: ../src/groupchat_control.py:1330 ../src/groupchat_control.py:1602 msgid "Invalid nickname" msgstr "Неверное имя пользователя" -#: ../src/groupchat_control.py:1277 ../src/groupchat_control.py:1556 -msgid "The nickname has not allowed characters." -msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы." - -#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1318 -#: ../src/groupchat_control.py:1402 ../src/groupchat_control.py:1419 +#: ../src/groupchat_control.py:1354 ../src/groupchat_control.py:1372 +#: ../src/groupchat_control.py:1456 ../src/groupchat_control.py:1473 #, python-format msgid "Nickname not found: %s" msgstr "Ник не обнаружен: %s" -#: ../src/groupchat_control.py:1334 +#: ../src/groupchat_control.py:1388 msgid "This group chat has no subject" msgstr "У этой комнаты нет темы" -#: ../src/groupchat_control.py:1345 +#: ../src/groupchat_control.py:1399 #, python-format msgid "Invited %(contact_jid)s to %(room_jid)s." msgstr "Пригласил %(contact_jid)s в %(room_jid)s." -#: ../src/groupchat_control.py:1482 +#: ../src/groupchat_control.py:1529 #, python-format msgid "" "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The " @@ -7993,7 +7979,7 @@ "данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ " "поддерживает пробелы в никах." -#: ../src/groupchat_control.py:1489 +#: ../src/groupchat_control.py:1536 #, python-format msgid "" "Usage: /%s <nickname>, opens a private chat window with the specified " @@ -8001,7 +7987,7 @@ msgstr "" "Использование: /%s <ник>, открывает окно привата с указанным посетителем." -#: ../src/groupchat_control.py:1495 +#: ../src/groupchat_control.py:1542 #, python-format msgid "" "Usage: /%s [reason], closes the current window or tab, displaying reason if " @@ -8010,7 +7996,7 @@ "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя " "причину, если она указана." -#: ../src/groupchat_control.py:1501 +#: ../src/groupchat_control.py:1548 #, python-format msgid "" "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally " @@ -8019,7 +8005,7 @@ "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с " "возможным указанием причины." -#: ../src/groupchat_control.py:1505 +#: ../src/groupchat_control.py:1552 #, python-format msgid "" "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally " @@ -8028,7 +8014,7 @@ "Использование: /%s <комната>@<сервер>[/ник], предлагает присоединиться к " "комната@сервер, с возможным указанием ника." -#: ../src/groupchat_control.py:1509 +#: ../src/groupchat_control.py:1556 #, python-format msgid "" "Usage: /%s <nickname> [reason], removes the occupant specified by nickname " @@ -8038,7 +8024,7 @@ "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из " "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике." -#: ../src/groupchat_control.py:1518 +#: ../src/groupchat_control.py:1565 #, python-format msgid "" "Usage: /%s <nickname> [message], opens a private message window and sends " @@ -8047,23 +8033,23 @@ "Использование: /%s <ник> [сообщение], открывает окно личной беседы и " "отсылает сообщение посетителю с указанным ником." -#: ../src/groupchat_control.py:1523 +#: ../src/groupchat_control.py:1570 #, python-format msgid "Usage: /%s <nickname>, changes your nickname in current group chat." msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате." -#: ../src/groupchat_control.py:1527 +#: ../src/groupchat_control.py:1574 #, python-format msgid "Usage: /%s , display the names of group chat occupants." msgstr "Использование: /%s, показывает список присутствующих в комнате." -#: ../src/groupchat_control.py:1531 +#: ../src/groupchat_control.py:1578 #, python-format msgid "Usage: /%s [topic], displays or updates the current group chat topic." msgstr "" "Использование: /%s [тема], показывает или изменяет текущую тему комнаты." -#: ../src/groupchat_control.py:1534 +#: ../src/groupchat_control.py:1581 #, python-format msgid "" "Usage: /%s <message>, sends a message without looking for other commands." @@ -8071,40 +8057,40 @@ "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд " "в нем." -#: ../src/groupchat_control.py:1640 +#: ../src/groupchat_control.py:1692 #, python-format msgid "Are you sure you want to leave group chat \"%s\"?" msgstr "Вы точно хотите выйти из комнаты \"%s\"?" -#: ../src/groupchat_control.py:1642 +#: ../src/groupchat_control.py:1694 msgid "" "If you close this window, you will be disconnected from this group chat." msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты." -#: ../src/groupchat_control.py:1678 +#: ../src/groupchat_control.py:1730 msgid "Changing Subject" msgstr "Изменяет тему" -#: ../src/groupchat_control.py:1679 +#: ../src/groupchat_control.py:1731 msgid "Please specify the new subject:" msgstr "Пожалуйста, введите новую тему:" -#: ../src/groupchat_control.py:1690 +#: ../src/groupchat_control.py:1742 msgid "Changing Nickname" msgstr "Изменяет ник" -#: ../src/groupchat_control.py:1691 +#: ../src/groupchat_control.py:1743 msgid "Please specify the new nickname you want to use:" msgstr "Пожалуйста, введите новый ник, который вы хотите использовать:" # смотря где вылазит меседж - нужно присмотреться #. Ask for a reason -#: ../src/groupchat_control.py:1706 +#: ../src/groupchat_control.py:1758 #, python-format msgid "Destroying %s" msgstr "Удаление %s" -#: ../src/groupchat_control.py:1707 +#: ../src/groupchat_control.py:1759 msgid "" "You are going to definitively destroy this room.\n" "You may specify a reason below:" @@ -8112,39 +8098,22 @@ "Вы хотите уничтожить комнату.\n" "Вы можете указать причину:" -#: ../src/groupchat_control.py:1709 +#: ../src/groupchat_control.py:1761 msgid "You may also enter an alternate venue:" msgstr "Альтернативная причина:" -#: ../src/groupchat_control.py:1744 -msgid "Bookmark already set" -msgstr "Закладка уже установлена" - -#: ../src/groupchat_control.py:1745 -#, python-format -msgid "Group Chat \"%s\" is already in your bookmarks." -msgstr "Комната \"%s\" уже есть в ваших закладках." - -#: ../src/groupchat_control.py:1761 -msgid "Bookmark has been added successfully" -msgstr "Закладка успешно добавлена" - -#: ../src/groupchat_control.py:1762 -msgid "You can manage your bookmarks via Actions menu in your roster." -msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере." - #. ask for reason -#: ../src/groupchat_control.py:1920 +#: ../src/groupchat_control.py:1945 #, python-format msgid "Kicking %s" msgstr "Кикнуть %s" -#: ../src/groupchat_control.py:1921 ../src/groupchat_control.py:2220 +#: ../src/groupchat_control.py:1946 ../src/groupchat_control.py:2249 msgid "You may specify a reason below:" msgstr "Вы можете указать причину ниже:" #. ask for reason -#: ../src/groupchat_control.py:2219 +#: ../src/groupchat_control.py:2248 #, python-format msgid "Banning %s" msgstr "Забанить %s" @@ -8219,40 +8188,40 @@ msgid "Save Image as..." msgstr "Сохранить изображение как..." -#: ../src/history_manager.py:90 +#: ../src/history_manager.py:91 msgid "Cannot find history logs database" msgstr "Не могу найти базу данных истории" #. holds jid -#: ../src/history_manager.py:130 +#: ../src/history_manager.py:131 msgid "Contacts" msgstr "Контакты" #. holds time -#: ../src/history_manager.py:143 ../src/history_manager.py:183 -#: ../src/history_window.py:100 +#: ../src/history_manager.py:144 ../src/history_manager.py:184 +#: ../src/history_window.py:98 msgid "Date" msgstr "Дата" #. holds nickname -#: ../src/history_manager.py:149 ../src/history_manager.py:201 +#: ../src/history_manager.py:150 ../src/history_manager.py:202 msgid "Nickname" msgstr "Ник" #. holds message -#: ../src/history_manager.py:157 ../src/history_manager.py:189 -#: ../src/history_window.py:108 +#: ../src/history_manager.py:158 ../src/history_manager.py:190 +#: ../src/history_window.py:106 msgid "Message" msgstr "Сообщение" -#: ../src/history_manager.py:209 +#: ../src/history_manager.py:210 msgid "" "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS " "RUNNING)" msgstr "" "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ ЕСЛИ GAJIM ЗАПУЩЕН)" -#: ../src/history_manager.py:211 +#: ../src/history_manager.py:212 msgid "" "Normally allocated database size will not be freed, it will just become " "reusable. If you really want to reduce database filesize, click YES, else " @@ -8266,54 +8235,54 @@ "\n" "Если вы нажали ДА, пожалуйста подождите..." -#: ../src/history_manager.py:423 +#: ../src/history_manager.py:424 msgid "Exporting History Logs..." msgstr "Экспортирую историю..." -#: ../src/history_manager.py:498 +#: ../src/history_manager.py:499 #, python-format msgid "%(who)s on %(time)s said: %(message)s\n" msgstr "%(who)s в %(time)s сказал: %(message)s\n" -#: ../src/history_manager.py:535 +#: ../src/history_manager.py:536 msgid "Do you really want to delete logs of the selected contact?" msgid_plural "Do you really want to delete logs of the selected contacts?" msgstr[0] "Вы точно хотите удалить логи выделенного контакта?" msgstr[1] "Вы точно хотите удалить логи выделенных контактов?" msgstr[2] "Вы точно хотите удалить логи выделенных контактов?" -#: ../src/history_manager.py:539 ../src/history_manager.py:574 +#: ../src/history_manager.py:540 ../src/history_manager.py:575 msgid "This is an irreversible operation." msgstr "Это необратимая операция" -#: ../src/history_manager.py:571 +#: ../src/history_manager.py:572 msgid "Do you really want to delete the selected message?" msgid_plural "Do you really want to delete the selected messages?" msgstr[0] "Вы точно хотите удалить выделенное сообщение?" msgstr[1] "Вы точно хотите удалить выделенные сообщения?" msgstr[2] "Вы точно хотите удалить выделенные сообщения?" -#: ../src/history_window.py:276 +#: ../src/history_window.py:288 #, python-format msgid "Conversation History with %s" msgstr "История %s" -#: ../src/history_window.py:404 +#: ../src/history_window.py:406 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s теперь %(status)s: %(status_msg)s" -#: ../src/history_window.py:408 ../src/notify.py:231 +#: ../src/history_window.py:410 ../src/notify.py:229 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s теперь %(status)s" -#: ../src/history_window.py:414 +#: ../src/history_window.py:416 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Статус установлен в: %(status)s: %(status_msg)s" -#: ../src/history_window.py:417 +#: ../src/history_window.py:419 #, python-format msgid "Status is now: %(status)s" msgstr "Статус установлен в: %(status)s" @@ -8326,23 +8295,23 @@ msgid "Image is too big" msgstr "Изображение слишком большое" -#: ../src/message_window.py:372 +#: ../src/message_window.py:422 msgid "Chats" msgstr "Чаты" -#: ../src/message_window.py:374 +#: ../src/message_window.py:424 msgid "Group Chats" msgstr "Комнаты" -#: ../src/message_window.py:376 +#: ../src/message_window.py:426 msgid "Private Chats" msgstr "Личные беседы" -#: ../src/message_window.py:382 +#: ../src/message_window.py:432 msgid "Messages" msgstr "Сообщения" -#: ../src/message_window.py:386 +#: ../src/message_window.py:436 #, python-format msgid "%s - %s" msgstr "%s - %s" @@ -8375,42 +8344,42 @@ msgid "Yes, I verified the Short Authentication String" msgstr "" -#: ../src/notify.py:229 +#: ../src/notify.py:227 #, python-format msgid "%(nick)s Changed Status" msgstr "%(nick)s меняет статус" -#: ../src/notify.py:239 +#: ../src/notify.py:237 #, python-format msgid "%(nickname)s Signed In" msgstr "%(nickname)s подключается" -#: ../src/notify.py:247 +#: ../src/notify.py:245 #, python-format msgid "%(nickname)s Signed Out" msgstr "%(nickname)s отключается" -#: ../src/notify.py:259 +#: ../src/notify.py:257 #, python-format msgid "New Single Message from %(nickname)s" msgstr "Новое сообщение от %(nickname)s" -#: ../src/notify.py:267 +#: ../src/notify.py:265 #, python-format msgid "New Private Message from group chat %s" msgstr "Новое личное сообщение из комнаты %s" -#: ../src/notify.py:269 +#: ../src/notify.py:267 #, python-format msgid "%(nickname)s: %(message)s" msgstr "%(nickname)s: %(message)s" -#: ../src/notify.py:272 +#: ../src/notify.py:270 #, python-format msgid "Messaged by %(nickname)s" msgstr "Новое сообщение от %(nickname)s" -#: ../src/notify.py:278 +#: ../src/notify.py:276 #, python-format msgid "New Message from %(nickname)s" msgstr "Новое сообщение от %(nickname)s" @@ -8424,18 +8393,18 @@ msgid "Retrieving profile..." msgstr "Получаю данные..." -#: ../src/profile_window.py:107 ../src/roster_window.py:2752 +#: ../src/profile_window.py:107 ../src/roster_window.py:2610 msgid "File is empty" msgstr "Пустой файл" -#: ../src/profile_window.py:110 ../src/roster_window.py:2755 +#: ../src/profile_window.py:110 ../src/roster_window.py:2613 msgid "File does not exist" msgstr "Файл не существует" #. keep identation #. unknown format #: ../src/profile_window.py:124 ../src/profile_window.py:140 -#: ../src/roster_window.py:2757 ../src/roster_window.py:2768 +#: ../src/roster_window.py:2615 ../src/roster_window.py:2626 msgid "Could not load image" msgstr "Не могу загрузить изображение" @@ -8447,73 +8416,73 @@ msgid "Without a connection you can not publish your contact information." msgstr "Необходимо присоединиться к серверу для обновления личной информации" -#: ../src/profile_window.py:331 +#: ../src/profile_window.py:333 msgid "Sending profile..." msgstr "Отправляю данные..." -#: ../src/profile_window.py:346 +#: ../src/profile_window.py:348 msgid "Information NOT published" msgstr "Информация НЕ опубликована" -#: ../src/profile_window.py:353 +#: ../src/profile_window.py:355 msgid "vCard publication failed" msgstr "Публикация vCard не удалась" -#: ../src/profile_window.py:354 +#: ../src/profile_window.py:356 msgid "" "There was an error while publishing your personal information, try again " "later." msgstr "" "При публикации вашей личной информации произошла ошибка, попробуйте позже." -#: ../src/roster_window.py:248 ../src/roster_window.py:819 +#: ../src/roster_window.py:264 ../src/roster_window.py:871 msgid "Merged accounts" msgstr "Объединенные учетные записи" -#: ../src/roster_window.py:1583 +#: ../src/roster_window.py:1691 msgid "Authorization has been sent" msgstr "Была отправлена авторизация" -#: ../src/roster_window.py:1584 +#: ../src/roster_window.py:1692 #, python-format msgid "Now \"%s\" will know your status." msgstr "Теперь \"%s\" будет знать о вашем статусе." -#: ../src/roster_window.py:1604 +#: ../src/roster_window.py:1712 msgid "Subscription request has been sent" msgstr "Был отправлен запрос на подписку " -#: ../src/roster_window.py:1605 +#: ../src/roster_window.py:1713 #, python-format msgid "If \"%s\" accepts this request you will know his or her status." msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус" -#: ../src/roster_window.py:1617 +#: ../src/roster_window.py:1725 msgid "Authorization has been removed" msgstr "Авторизация была удалена" -#: ../src/roster_window.py:1618 +#: ../src/roster_window.py:1726 #, python-format msgid "Now \"%s\" will always see you as offline." msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне." -#: ../src/roster_window.py:1644 +#: ../src/roster_window.py:1747 msgid "" -"Gnome Keyring is installed but not correctly started\t\t\t\t\t\t\t\t" -"(environment variable probably not correctly set)" +"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started " +"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)" msgstr "" "Gnome Keyring установлен, но некорректно запущен\t\t\t\t\t\t\t\t(возможно " "неверно установлена переменная среды)" -#: ../src/roster_window.py:1665 +#: ../src/roster_window.py:1768 msgid "GPG is not usable" msgstr "GPG использовать невозможно" -#: ../src/roster_window.py:1810 ../src/roster_window.py:3217 +#: ../src/roster_window.py:1922 ../src/roster_window.py:3052 msgid "You are participating in one or more group chats" msgstr "Вы находитесь в одной или более комнатах" -#: ../src/roster_window.py:1811 ../src/roster_window.py:3218 +#: ../src/roster_window.py:1923 ../src/roster_window.py:3053 msgid "" "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" @@ -8521,16 +8490,15 @@ "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно " "хотите стать невидимым?" -#: ../src/roster_window.py:1851 ../src/roster_window.py:3267 -msgid "You cannot join a group chat while you are invisible" -msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости." +#: ../src/roster_window.py:1949 +msgid "desync'ed" +msgstr "не синхронизировано" -#: ../src/roster_window.py:2197 ../src/roster_window.py:2443 +#: ../src/roster_window.py:2072 ../src/roster_window.py:2315 msgid "You have unread messages" msgstr "У вас есть непрочитанные сообщения" -#: ../src/roster_window.py:2198 -#, fuzzy +#: ../src/roster_window.py:2073 msgid "" "Messages will only be available for reading them later if you have history " "enabled and contact is in your roster." @@ -8538,16 +8506,16 @@ "Сообщения будут доступны для чтения позже если у вас активирована опция " "истории." -#: ../src/roster_window.py:2444 +#: ../src/roster_window.py:2316 msgid "You must read them before removing this transport." msgstr "Просмотрите все ожидающие события перед удалением транспорта." -#: ../src/roster_window.py:2447 +#: ../src/roster_window.py:2319 #, python-format msgid "Transport \"%s\" will be removed" msgstr "Транспорт \"%s\" будет удален" -#: ../src/roster_window.py:2448 +#: ../src/roster_window.py:2320 msgid "" "You will no longer be able to send and receive messages from contacts using " "this transport." @@ -8555,12 +8523,12 @@ "У вас теперь не будет возможности приема и отправки сообщения контактам " "через этот транспорт." -#: ../src/roster_window.py:2451 +#: ../src/roster_window.py:2323 msgid "Transports will be removed" msgstr "Транспорты будут удалены" -#: ../src/roster_window.py:2456 -#, fuzzy, python-format +#: ../src/roster_window.py:2328 +#, python-format msgid "" "You will no longer be able to send and receive messages to contacts from " "these transports: %s" @@ -8569,51 +8537,51 @@ "транспорты:%s." #. it's jid -#: ../src/roster_window.py:2622 +#: ../src/roster_window.py:2494 msgid "Rename Contact" msgstr "Переименовать контакт" -#: ../src/roster_window.py:2623 +#: ../src/roster_window.py:2495 #, python-format msgid "Enter a new nickname for contact %s" msgstr "Введите новый ник для контакта %s" -#: ../src/roster_window.py:2630 +#: ../src/roster_window.py:2502 msgid "Rename Group" msgstr "Переименовать группу" -#: ../src/roster_window.py:2631 +#: ../src/roster_window.py:2503 #, python-format msgid "Enter a new name for group %s" msgstr "Введите новое название для группы %s" -#: ../src/roster_window.py:2685 +#: ../src/roster_window.py:2550 msgid "Remove Group" msgstr "Удалить группу" -#: ../src/roster_window.py:2686 +#: ../src/roster_window.py:2551 #, python-format msgid "Do you want to remove group %s from the roster?" msgstr "Вы точно хотите удалить группу %s из ростера?" -#: ../src/roster_window.py:2687 +#: ../src/roster_window.py:2552 msgid "Remove also all contacts in this group from your roster" msgstr "Удалить из ростера все контакты в этой группе" -#: ../src/roster_window.py:2718 +#: ../src/roster_window.py:2576 msgid "Assign OpenPGP Key" msgstr "Назначить OpenPGP ключ" -#: ../src/roster_window.py:2719 +#: ../src/roster_window.py:2577 msgid "Select a key to apply to the contact" msgstr "Выберите ключ, который будет применен к контакту" -#: ../src/roster_window.py:3116 +#: ../src/roster_window.py:2950 #, python-format msgid "Contact \"%s\" will be removed from your roster" msgstr "Контакт \"%s\" будет удален из вашего ростера" -#: ../src/roster_window.py:3120 +#: ../src/roster_window.py:2954 msgid "" "By removing this contact you also remove authorization resulting in him or " "her always seeing you as offline." @@ -8621,7 +8589,7 @@ "Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше " "не сможет видеть ваш статус." -#: ../src/roster_window.py:3125 +#: ../src/roster_window.py:2959 msgid "" "By removing this contact you also by default remove authorization resulting " "in him or her always seeing you as offline." @@ -8629,16 +8597,16 @@ "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть " "его или её всегда в оффлайне." -#: ../src/roster_window.py:3128 +#: ../src/roster_window.py:2962 msgid "I want this contact to know my status after removal" msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления" #. several contact to remove at the same time -#: ../src/roster_window.py:3132 +#: ../src/roster_window.py:2966 msgid "Contacts will be removed from your roster" msgstr "Контакты будут удалены из вашего ростера" -#: ../src/roster_window.py:3136 +#: ../src/roster_window.py:2970 #, python-format msgid "" "By removing these contacts:%s\n" @@ -8648,20 +8616,20 @@ "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в " "оффлайне." -#: ../src/roster_window.py:3174 +#: ../src/roster_window.py:3008 msgid "No account available" msgstr "Нет доступной учетной записи" -#: ../src/roster_window.py:3175 +#: ../src/roster_window.py:3009 msgid "You must create an account before you can chat with other contacts." msgstr "" "Для начала беседы с другими людьми прежде необходимо создать учетную запись." -#: ../src/roster_window.py:3641 +#: ../src/roster_window.py:3497 msgid "Metacontacts storage not supported by your server" msgstr "Сервер не умеет хранить метаконтакты" -#: ../src/roster_window.py:3643 +#: ../src/roster_window.py:3499 msgid "" "Your server does not support storing metacontacts information. So those " "information will not be saved on next reconnection." @@ -8669,12 +8637,12 @@ "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при " "следующем подключении." -#: ../src/roster_window.py:3710 +#: ../src/roster_window.py:3574 msgid "" "You are about to create a metacontact. Are you sure you want to continue?" msgstr "Вы хотите создать метаконтакт?" -#: ../src/roster_window.py:3712 +#: ../src/roster_window.py:3576 msgid "" "Metacontacts are a way to regroup several contacts in one line. Generally it " "is used when the same person has several Jabber accounts or transport " @@ -8684,11 +8652,11 @@ "Обычно это используется когда один и тот же человек имеет несколько " "аккаунтов в Jabber или на транспортах." -#: ../src/roster_window.py:3810 +#: ../src/roster_window.py:3689 msgid "Invalid file URI:" msgstr "Неверный файл:" -#: ../src/roster_window.py:3821 +#: ../src/roster_window.py:3700 #, python-format msgid "Do you want to send this file to %s:" msgid_plural "Do you want to send those files to %s:" @@ -8701,112 +8669,123 @@ #. for chat_with #. for single message #. join gc -#: ../src/roster_window.py:4335 ../src/roster_window.py:4345 -#: ../src/roster_window.py:4354 ../src/systray.py:212 ../src/systray.py:217 -#: ../src/systray.py:223 +#: ../src/roster_window.py:4213 ../src/roster_window.py:4223 +#: ../src/roster_window.py:4232 ../src/systray.py:211 ../src/systray.py:216 +#: ../src/systray.py:222 #, python-format msgid "using account %s" msgstr "используя учетную запись %s" #. add -#: ../src/roster_window.py:4361 +#: ../src/roster_window.py:4239 #, python-format msgid "to %s account" msgstr "для учетной записи %s" #. disco -#: ../src/roster_window.py:4366 +#: ../src/roster_window.py:4244 #, python-format msgid "using %s account" msgstr "учетной записи %s" -#: ../src/roster_window.py:4447 +#: ../src/roster_window.py:4325 msgid "_Manage Bookmarks..." msgstr "Управление _закладками..." #. profile, avatar -#: ../src/roster_window.py:4466 +#: ../src/roster_window.py:4344 #, python-format msgid "of account %s" msgstr "для учетной записи %s" -#: ../src/roster_window.py:4506 +#: ../src/roster_window.py:4384 #, python-format msgid "for account %s" msgstr "для учетной записи %s" -#: ../src/roster_window.py:4560 ../src/roster_window.py:4667 +#: ../src/roster_window.py:4441 ../src/roster_window.py:4555 msgid "_Change Status Message" msgstr "_Изменить сообщение о статусе" -#: ../src/roster_window.py:4598 -#, fuzzy +#: ../src/roster_window.py:4472 +msgid "Publish Tune" +msgstr "" + +#: ../src/roster_window.py:4477 +msgid "Mood" +msgstr "Настроение" + +#: ../src/roster_window.py:4481 +msgid "Activity" +msgstr "Активность" + +#: ../src/roster_window.py:4486 msgid "Configure Services..." -msgstr "Настроить..." +msgstr "Настроить Сервисы..." -#: ../src/roster_window.py:4756 +#: ../src/roster_window.py:4643 msgid "_Maximize All" msgstr "_Развернуть все" #. Send Group Message -#: ../src/roster_window.py:4764 ../src/roster_window.py:5240 +#: ../src/roster_window.py:4651 ../src/roster_window.py:5131 msgid "Send Group M_essage" msgstr "_Отправить сообщение группе" -#: ../src/roster_window.py:4772 +#: ../src/roster_window.py:4659 msgid "To all users" msgstr "Всем пользователям" -#: ../src/roster_window.py:4775 +#: ../src/roster_window.py:4663 msgid "To all online users" msgstr "Всем, кто подключён" -#: ../src/roster_window.py:5157 +#: ../src/roster_window.py:5047 msgid "I would like to add you to my roster" msgstr "Вы не против, если я добавлю Вас к себе в ростер?" #. Manage Transport submenu -#: ../src/roster_window.py:5260 +#: ../src/roster_window.py:5151 msgid "_Manage Contacts" msgstr "_Управление контактами" #. Send single message -#: ../src/roster_window.py:5321 +#: ../src/roster_window.py:5212 msgid "Send Single Message" msgstr "Отправить одиночное сообщение" #. Manage Transport submenu -#: ../src/roster_window.py:5376 +#: ../src/roster_window.py:5268 msgid "_Manage Transport" msgstr "_Управление транспортом" #. Modify Transport -#: ../src/roster_window.py:5384 +#: ../src/roster_window.py:5276 msgid "_Modify Transport" msgstr "_Изменить транспорт" -#: ../src/roster_window.py:5459 +#: ../src/roster_window.py:5351 msgid "_Maximize" msgstr "Развернут_ь" -#: ../src/roster_window.py:5466 +#: ../src/roster_window.py:5358 msgid "_Disconnect" msgstr "_Выйти" -#: ../src/roster_window.py:5543 +#: ../src/roster_window.py:5435 msgid "_New Group Chat" msgstr "В _новую комнату" #. History manager -#: ../src/roster_window.py:5643 +#: ../src/roster_window.py:5535 msgid "History Manager" msgstr "Менеджер истории" -#: ../src/roster_window.py:5652 +#: ../src/roster_window.py:5544 msgid "_Join New Group Chat" msgstr "_Войти в новую комнату" -#: ../src/roster_window.py:5873 +#: ../src/roster_window.py:5754 msgid "Change Status Message..." msgstr "Изменить сообщение о статусе..." @@ -8848,19 +8827,19 @@ msgid "Gajim needs you to create a passphrase to encrypt stored secrets" msgstr "" -#: ../src/systray.py:169 +#: ../src/systray.py:168 msgid "_Change Status Message..." msgstr "_Изменить сообщение о статусе..." -#: ../src/systray.py:254 +#: ../src/systray.py:253 msgid "Hide this menu" msgstr "Скрыть это меню" -#: ../src/tooltips.py:317 ../src/tooltips.py:566 +#: ../src/tooltips.py:317 ../src/tooltips.py:512 msgid "Jabber ID: " msgstr "Jabber ID: " -#: ../src/tooltips.py:320 ../src/tooltips.py:570 +#: ../src/tooltips.py:320 ../src/tooltips.py:516 msgid "Resource: " msgstr "Ресурс: " @@ -8869,122 +8848,122 @@ msgid "%(owner_or_admin_or_member)s of this group chat" msgstr "%(owner_or_admin_or_member)s этой комнаты" -#: ../src/tooltips.py:423 +#: ../src/tooltips.py:422 msgid " [blocked]" msgstr "" -#: ../src/tooltips.py:427 +#: ../src/tooltips.py:426 msgid " [minimized]" msgstr "" -#: ../src/tooltips.py:442 ../src/tooltips.py:686 +#: ../src/tooltips.py:441 ../src/tooltips.py:683 msgid "Status: " msgstr "Статус: " -#: ../src/tooltips.py:476 +#: ../src/tooltips.py:472 #, python-format msgid "Last status: %s" msgstr "Последний статус: %s" -#: ../src/tooltips.py:478 +#: ../src/tooltips.py:474 #, python-format msgid " since %s" msgstr " с %s" -#: ../src/tooltips.py:496 +#: ../src/tooltips.py:492 msgid "Connected" msgstr "Соединение" -#: ../src/tooltips.py:498 +#: ../src/tooltips.py:494 msgid "Disconnected" msgstr "Контакт отключился" -#: ../src/tooltips.py:507 +#. ('both' is the normal sub so we don't show it) +#: ../src/tooltips.py:523 +msgid "Subscription: " +msgstr "Подписка: " + +#: ../src/tooltips.py:533 +msgid "OpenPGP: " +msgstr "OpenPGP: " + +#: ../src/tooltips.py:576 msgid "Mood:" msgstr "Настроение:" -#: ../src/tooltips.py:519 +#: ../src/tooltips.py:586 msgid "Activity:" msgstr "Активность:" -#: ../src/tooltips.py:539 +#: ../src/tooltips.py:604 msgid "Unknown Artist" msgstr "" -#: ../src/tooltips.py:544 +#: ../src/tooltips.py:609 msgid "Unknown Title" msgstr "" -#: ../src/tooltips.py:549 +#: ../src/tooltips.py:614 msgid "Unknown Source" msgstr "" -#: ../src/tooltips.py:550 +#: ../src/tooltips.py:615 msgid "Tune:" msgstr "Слушаю:" -#: ../src/tooltips.py:550 +#: ../src/tooltips.py:615 #, python-format msgid "" "\"%(title)s\" by %(artist)s\n" "from %(source)s" msgstr "" -#. ('both' is the normal sub so we don't show it) -#: ../src/tooltips.py:577 -msgid "Subscription: " -msgstr "Подписка: " - -#: ../src/tooltips.py:587 -msgid "OpenPGP: " -msgstr "OpenPGP: " - -#: ../src/tooltips.py:642 +#: ../src/tooltips.py:639 msgid "Download" msgstr "Загрузить" -#: ../src/tooltips.py:648 +#: ../src/tooltips.py:645 msgid "Upload" msgstr "Upload" -#: ../src/tooltips.py:655 +#: ../src/tooltips.py:652 msgid "Type: " msgstr "Тип: " -#: ../src/tooltips.py:661 +#: ../src/tooltips.py:658 msgid "Transferred: " msgstr "Передано: " -#: ../src/tooltips.py:664 ../src/tooltips.py:685 +#: ../src/tooltips.py:661 ../src/tooltips.py:682 msgid "Not started" msgstr "Не начато" -#: ../src/tooltips.py:668 +#: ../src/tooltips.py:665 msgid "Stopped" msgstr "Остановлено" -#: ../src/tooltips.py:670 ../src/tooltips.py:673 +#: ../src/tooltips.py:667 ../src/tooltips.py:670 msgid "Completed" msgstr "Завершено" -#: ../src/tooltips.py:677 +#: ../src/tooltips.py:674 msgid "?transfer status:Paused" msgstr "Приостановлено" #. stalled is not paused. it is like 'frozen' it stopped alone -#: ../src/tooltips.py:681 +#: ../src/tooltips.py:678 msgid "Stalled" msgstr "Ожидание" -#: ../src/tooltips.py:683 +#: ../src/tooltips.py:680 msgid "Transferring" msgstr "Передается" -#: ../src/tooltips.py:719 +#: ../src/tooltips.py:716 msgid "This service has not yet responded with detailed information" msgstr "Этот сервис еще не сообщил информацию о себе" -#: ../src/tooltips.py:722 +#: ../src/tooltips.py:719 msgid "" "This service could not respond with detailed information.\n" "It is most likely legacy or broken" @@ -8992,25 +8971,25 @@ "Этот сервис не может предоставить информацию о себе . \n" "Похоже что он или неверно настроен или сломан" -#: ../src/vcard.py:246 +#: ../src/vcard.py:243 msgid "?Client:Unknown" msgstr "Неизвестен" -#: ../src/vcard.py:248 +#: ../src/vcard.py:245 msgid "?OS:Unknown" msgstr "Неизвестна" -#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482 +#: ../src/vcard.py:270 ../src/vcard.py:280 ../src/vcard.py:479 #, python-format msgid "since %s" msgstr "с %s" -#: ../src/vcard.py:312 +#: ../src/vcard.py:309 #, fuzzy msgid "Affiliation:" msgstr "Приложения" -#: ../src/vcard.py:320 +#: ../src/vcard.py:317 msgid "" "This contact is interested in your presence information, but you are not " "interested in his/her presence" @@ -9018,7 +8997,7 @@ "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её " "присутствии не интересна" -#: ../src/vcard.py:322 +#: ../src/vcard.py:319 msgid "" "You are interested in the contact's presence information, but he/she is not " "interested in yours" @@ -9026,29 +9005,72 @@ "Вам хочется получать информацию о присутствии контакта, но он или она не " "заинтересована в вашей." -#: ../src/vcard.py:324 +#: ../src/vcard.py:321 msgid "You and the contact are interested in each other's presence information" msgstr "Вы и контакт оба желаете знать о присутствии друг друга" #. None -#: ../src/vcard.py:326 +#: ../src/vcard.py:323 msgid "" "You are not interested in the contact's presence, and neither he/she is " "interested in yours" msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга" -#: ../src/vcard.py:333 +#: ../src/vcard.py:330 msgid "You are waiting contact's answer about your subscription request" msgstr "Вы ожидаете ответа контакта на запрос на подписку" -#: ../src/vcard.py:335 +#: ../src/vcard.py:332 msgid "There is no pending subscription request." msgstr "" -#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507 +#: ../src/vcard.py:337 ../src/vcard.py:374 ../src/vcard.py:504 msgid " resource with priority " msgstr " ресурс с приоритетом " +#~ msgid "Click to see past conversations with this contact" +#~ msgstr "Щелкните для просмотра последних бесед с этим человеком" + +#~ msgid "Click to see past conversation in this room" +#~ msgstr "Щелкните для просмотра бесед в этой комнате" + +#~ msgid "Publish and Subscribe" +#~ msgstr "Отправка и получение" + +#~ msgid "Allow others to see your:" +#~ msgstr "_Позволить ему или ей видеть мой статус" + +#~ msgid "Receive your contact's:" +#~ msgstr "Получать от ваших контактов:" + +#~ msgid "Tune" +#~ msgstr "Слушаю" + +#~ msgid "The following message was NOT encrypted" +#~ msgstr "Последнее сообщение НЕ БЫЛО зашифровано" + +#~ msgid "Subject: %s" +#~ msgstr "Тема: %s" + +#~ msgid "" +#~ "\n" +#~ "From: %(from_address)s" +#~ msgstr "" +#~ "\n" +#~ "От: %(from_address)s" + +#~ msgid "" +#~ "If checked, Gajim can regularly poll a Last.fm account and sends recently " +#~ "played songs through PEP." +#~ msgstr "" +#~ "Если включено, Gajim будет проверять аккаунт на Last.fm и менять ваш PEP " +#~ "статус на имя проигрываемого трека. " + +#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)" +#~ msgstr "" +#~ "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к " +#~ "ней префикс /say)" + #~ msgid "History Viewer" #~ msgstr "Менеджер истории"

1 0

[commit-gajim] r9796 - trunk/src/common
by asterix＠gajim.org 13 Jun '08

13 Jun '08

Author: asterix Date: 2008-06-13 17:34:55 +0200 (Fri, 13 Jun 2008) New Revision: 9796 Modified: trunk/src/common/helpers.py Log: remove Z char (meaning UTC) in received timestamp. fixes #3796 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-06-13 02:18:16 UTC (rev 9795) +++ trunk/src/common/helpers.py 2008-06-13 15:34:55 UTC (rev 9796) @@ -1162,10 +1162,13 @@ Because of various datetime formats are used the following exceptions are handled: - Optional milliseconds appened to the string are removed + - Optional Z (that means UTC) appened to the string are removed - XEP-082 datetime strings have all '-' cahrs removed to meet the above format.''' timestamp = timestamp.split('.')[0] timestamp = timestamp.replace('-', '') + timestamp = timestamp.replace('z', '') + timestamp = timestamp.replace('Z', '') from time import strptime return strptime(timestamp, '%Y%m%dT%H:%M:%S')

1 0

[commit-gajim] r9795 - in trunk/src: . common
by bct＠gajim.org 13 Jun '08

13 Jun '08

Author: bct Date: 2008-06-13 04:18:16 +0200 (Fri, 13 Jun 2008) New Revision: 9795 Modified: trunk/src/common/gajim.py trunk/src/roster_window.py Log: don't make submenus in the Actions menu if we've only got a zeroconf account and a normal account Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-06-12 23:54:46 UTC (rev 9794) +++ trunk/src/common/gajim.py 2008-06-13 02:18:16 UTC (rev 9795) @@ -285,6 +285,10 @@ def account_is_disconnected(account): return not account_is_connected(account) +def zeroconf_is_connected(): + return account_is_connected(ZEROCONF_ACC_NAME) and \ + config.get_per('accounts', ZEROCONF_ACC_NAME, 'is_zeroconf') + def get_number_of_securely_connected_accounts(): '''returns the number of the accounts that are SSL/TLS connected''' num_of_secured = 0 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-06-12 23:54:46 UTC (rev 9794) +++ trunk/src/roster_window.py 2008-06-13 02:18:16 UTC (rev 9795) @@ -4196,14 +4196,13 @@ connected_accounts_with_private_storage = 0 + accounts_list = gajim.contacts.get_accounts() + accounts_list.sort() + + # items that get shown whether an account is zeroconf or not if connected_accounts > 1: # 2 or more accounts? make submenus - add_sub_menu = gtk.Menu() - disco_sub_menu = gtk.Menu() new_chat_sub_menu = gtk.Menu() - single_message_sub_menu = gtk.Menu() - accounts_list = gajim.contacts.get_accounts() - accounts_list.sort() for account in accounts_list: if gajim.connections[account].connected <= 1: # if offline or connecting @@ -4216,49 +4215,28 @@ new_chat_item.connect('activate', self.on_new_chat_menuitem_activate, account) - if gajim.config.get_per('accounts', account, 'is_zeroconf'): - continue - - # single message - single_message_item = gtk.MenuItem(_('using account %s') % account, - False) - single_message_sub_menu.append(single_message_item) - single_message_item.connect('activate', - self.on_send_single_message_menuitem_activate, account) - - # join gc - if gajim.connections[account].private_storage_supported: - connected_accounts_with_private_storage += 1 - gc_item = gtk.MenuItem(_('using account %s') % account, False) - gc_sub_menu.append(gc_item) - gc_menuitem_menu = gtk.Menu() - self.add_bookmarks_list(gc_menuitem_menu, account) - gc_item.set_submenu(gc_menuitem_menu) - - # add - add_item = gtk.MenuItem(_('to %s account') % account, False) - add_sub_menu.append(add_item) - add_item.connect('activate', self.on_add_new_contact, account) - - # disco - disco_item = gtk.MenuItem(_('using %s account') % account, False) - disco_sub_menu.append(disco_item) - disco_item.connect('activate', - self.on_service_disco_menuitem_activate, account) - - add_new_contact_menuitem.set_submenu(add_sub_menu) - add_sub_menu.show_all() - service_disco_menuitem.set_submenu(disco_sub_menu) - disco_sub_menu.show_all() new_chat_menuitem.set_submenu(new_chat_sub_menu) new_chat_sub_menu.show_all() - single_message_menuitem.set_submenu(single_message_sub_menu) - single_message_sub_menu.show_all() - gc_sub_menu.show_all() elif connected_accounts == 1: # user has only one account for account in gajim.connections: if gajim.account_is_connected(account): # THE connected account + # new chat + if not self.new_chat_menuitem_handler_id: + self.new_chat_menuitem_handler_id = new_chat_menuitem.\ + connect('activate', self.on_new_chat_menuitem_activate, + account) + + break + + # menu items that don't apply to zeroconf connections + if connected_accounts == 1 or (connected_accounts == 2 and \ + gajim.zeroconf_is_connected()): + # only one 'real' (non-zeroconf) account is connected, don't need submenus + + for account in accounts_list: + if gajim.account_is_connected(account) and \ + not gajim.config.get_per('accounts', account, 'is_zeroconf'): # gc if gajim.connections[account].private_storage_supported: connected_accounts_with_private_storage += 1 @@ -4274,11 +4252,6 @@ self.service_disco_handler_id = service_disco_menuitem.\ connect('activate', self.on_service_disco_menuitem_activate, account) - # new chat - if not self.new_chat_menuitem_handler_id: - self.new_chat_menuitem_handler_id = new_chat_menuitem.\ - connect('activate', self.on_new_chat_menuitem_activate, - account) # single message if not self.single_message_menuitem_handler_id: @@ -4294,7 +4267,53 @@ self.have_new_chat_accel = True break # No other account connected + else: + # 2 or more 'real' accounts are connected, make submenus + single_message_sub_menu = gtk.Menu() + add_sub_menu = gtk.Menu() + disco_sub_menu = gtk.Menu() + for account in accounts_list: + if gajim.connections[account].connected <= 1 or \ + gajim.config.get_per('accounts', account, 'is_zeroconf'): + # skip account if it's offline or connecting or is zeroconf + continue + + # single message + single_message_item = gtk.MenuItem(_('using account %s') % account, + False) + single_message_sub_menu.append(single_message_item) + single_message_item.connect('activate', + self.on_send_single_message_menuitem_activate, account) + + # join gc + if gajim.connections[account].private_storage_supported: + connected_accounts_with_private_storage += 1 + gc_item = gtk.MenuItem(_('using account %s') % account, False) + gc_sub_menu.append(gc_item) + gc_menuitem_menu = gtk.Menu() + self.add_bookmarks_list(gc_menuitem_menu, account) + gc_item.set_submenu(gc_menuitem_menu) + + # add + add_item = gtk.MenuItem(_('to %s account') % account, False) + add_sub_menu.append(add_item) + add_item.connect('activate', self.on_add_new_contact, account) + + # disco + disco_item = gtk.MenuItem(_('using %s account') % account, False) + disco_sub_menu.append(disco_item) + disco_item.connect('activate', + self.on_service_disco_menuitem_activate, account) + + single_message_menuitem.set_submenu(single_message_sub_menu) + single_message_sub_menu.show_all() + gc_sub_menu.show_all() + add_new_contact_menuitem.set_submenu(add_sub_menu) + add_sub_menu.show_all() + service_disco_menuitem.set_submenu(disco_sub_menu) + disco_sub_menu.show_all() + if connected_accounts == 0: # no connected accounts, make the menuitems insensitive for item in [new_chat_menuitem, join_gc_menuitem,\

1 0

[commit-gajim] r9794 - in branches/bosh_support: src/common/xmpp test
by tomk＠gajim.org 12 Jun '08

12 Jun '08

Author: tomk Date: 2008-06-13 01:54:46 +0200 (Fri, 13 Jun 2008) New Revision: 9794 Added: branches/bosh_support/test/test_client_nb.py Modified: branches/bosh_support/src/common/xmpp/transports_nb.py Log: added test script for NonBlockingClient (test/test_client_nb.py) Modified: branches/bosh_support/src/common/xmpp/transports_nb.py =================================================================== --- branches/bosh_support/src/common/xmpp/transports_nb.py 2008-06-12 19:26:55 UTC (rev 9793) +++ branches/bosh_support/src/common/xmpp/transports_nb.py 2008-06-12 23:54:46 UTC (rev 9794) @@ -40,7 +40,7 @@ # %s/\'\.\.\/data\'/common\.gajim\.DATA_DIR/c # %s/\'%s\/\.gajim\/cacerts\.pem\'\ %\ os\.environ\[\'HOME\'\]/common\.gajim\.MY_CACERTS/c -import common.gajim +# import common.gajim DATA_RECEIVED='DATA RECEIVED' @@ -773,16 +773,16 @@ #tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) - cacerts = os.path.join(common.gajim.DATA_DIR, 'other', 'cacerts.pem') + cacerts = os.path.join('../data', 'other', 'cacerts.pem') try: tcpsock._sslContext.load_verify_locations(cacerts) except: log.warning('Unable to load SSL certificats from file %s' % \ os.path.abspath(cacerts)) # load users certs - if os.path.isfile(common.gajim.MY_CACERTS): + if os.path.isfile('%s/.gajim/cacerts.pem' % os.environ['HOME']): store = tcpsock._sslContext.get_cert_store() - f = open(common.gajim.MY_CACERTS) + f = open('%s/.gajim/cacerts.pem' % os.environ['HOME']) lines = f.readlines() i = 0 begin = -1 @@ -797,11 +797,11 @@ store.add_cert(X509cert) except OpenSSL.crypto.Error, exception_obj: log.warning('Unable to load a certificate from file %s: %s' %\ - (common.gajim.MY_CACERTS, exception_obj.args[0][0][2])) + ('%s/.gajim/cacerts.pem' % os.environ['HOME'], exception_obj.args[0][0][2])) except: log.warning( 'Unknown error while loading certificate from file %s' % \ - common.gajim.MY_CACERTS) + '%s/.gajim/cacerts.pem' % os.environ['HOME']) begin = -1 i += 1 tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sock) Added: branches/bosh_support/test/test_client_nb.py =================================================================== --- branches/bosh_support/test/test_client_nb.py (rev 0) +++ branches/bosh_support/test/test_client_nb.py 2008-06-12 23:54:46 UTC (rev 9794) @@ -0,0 +1,280 @@ +import unittest, threading +from mock import Mock + +import sys, time, os.path + +gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') + +sys.path.append(gajim_root + '/src/common/xmpp') + +import client_nb, idlequeue + +''' +Testing script for NonBlockingClient class (src/common/xmpp/client_nb.py) +It actually connects to a xmpp server so the connection values have to be +changed before running. +''' + +idlequeue_interval = 0.2 +''' +IdleQueue polling interval. 200ms is used in Gajim as default +''' + +xmpp_server_port = ('xmpp.example.org',5222) +''' +2-tuple - (XMPP server hostname, c2s port) +Script will connect to the machine. +''' + +credentials = ['primus', 'l0v3', 'testclient'] +''' +[username, password, passphrase] +Script will autheticate itself with this credentials on above mentioned server. +''' + + +class MockConnectionClass(Mock): + ''' + Class simulating Connection class from src/common/connection.py + + It is derived from Mock in order to avoid defining all methods + from real Connection that are called from NBClient or Dispatcher + ( _event_dispatcher for example) + ''' + + def __init__(self, *args): + self.event = threading.Event() + ''' + is used for waiting on connect, auth and disconnect callbacks + ''' + + self.event.clear() + Mock.__init__(self, *args) + + def on_connect(self, *args): + ''' + Method called on succesful connecting - after receiving <stream:features> + from server (NOT after TLS stream restart). + ''' + + #print 'on_connect - args:' + #for i in args: + # print ' %s' % i + self.connect_failed = False + self.event.set() + + def on_connect_failure(self, *args): + ''' + Method called on failure while connecting - on everything from TCP error + to error during TLS handshake + ''' + + #print 'on_connect failure - args:' + #for i in args: + # print ' %s' % i + self.connect_failed = True + self.event.set() + + def on_auth(self, con, auth): + ''' + Method called after authentication is done regardless on the result. + + :Parameters: + con : NonBlockingClient + reference to authenticated object + auth : string + type of authetication in case of success ('old_auth', 'sasl') or + None in case of auth failure + ''' + + #print 'on_auth - args:' + #print ' con: %s' % con + #print ' auth: %s' % auth + self.auth_connection = con + self.auth = auth + self.event.set() + + def wait(self): + ''' + Waiting until some callback sets the event and clearing the event subsequently. + ''' + + self.event.wait() + self.event.clear() + + + + +class IdleQueueThread(threading.Thread): + ''' + Thread for regular processing of idlequeue. + ''' + def __init__(self): + self.iq = idlequeue.IdleQueue() + self.stop = threading.Event() + ''' + Event used to stopping the thread main loop. + ''' + + self.stop.clear() + threading.Thread.__init__(self) + + def run(self): + while not self.stop.isSet(): + self.iq.process() + time.sleep(idlequeue_interval) + self.iq.process() + + def stop_thread(self): + self.stop.set() + + + + +class TestNonBlockingClient(unittest.TestCase): + ''' + Test Cases class for NonBlockingClient. + ''' + + def setUp(self): + ''' + IdleQueue thread is run and dummy connection is created. + ''' + + self.idlequeue_thread = IdleQueueThread() + self.connection = MockConnectionClass() + + self.client = client_nb.NonBlockingClient( + server=xmpp_server_port[0], + port=xmpp_server_port[1], + on_connect=self.connection.on_connect, + on_connect_failure=self.connection.on_connect_failure, + caller=self.connection + ) + ''' + NonBlockingClient instance with parameters from global variables and with + callbacks from dummy connection. + ''' + + self.client.set_idlequeue(self.idlequeue_thread.iq) + self.idlequeue_thread.start() + + def tearDown(self): + ''' + IdleQueue thread is stopped. + ''' + self.idlequeue_thread.stop_thread() + self.idlequeue_thread.join() + + def open_stream(self, server_port): + ''' + Method opening the XMPP connection. It returns when <stream:features> + is received from server. + + :param server_port: tuple of (hostname, port) for where the client should + connect. + ''' + self.client.connect(server_port) + + print 'waiting for callback from client constructor' + self.connection.wait() + + # if on_connect was called, client has to be connected and vice versa + if self.connection.connect_failed: + self.assert_(not self.client.isConnected()) + else: + self.assert_(self.client.isConnected()) + + def client_auth(self, username, password, resource, sasl): + ''' + Method authenticating connected client with supplied credentials. Returns + when authentication is over. + :param sasl: whether to use sasl (sasl=1) or old (sasl=0) authentication + + :todo: to check and be more specific about when it returns (bind, session..) + ''' + self.client.auth(username, password, resource, sasl, + on_auth=self.connection.on_auth) + + print 'waiting for authentication...' + self.connection.wait() + + def do_disconnect(self): + ''' + Does disconnecting of connected client. Returns when TCP connection is closed. + ''' + self.client.start_disconnect(None, on_disconnect=self.connection.event.set) + + print 'waiting for disconnecting...' + self.connection.wait() + + def test_proper_connect_sasl(self): + ''' + The ideal testcase - client is connected, authenticated with SASL and + then disconnected. + ''' + self.open_stream(xmpp_server_port) + + # if client is not connected, lets raise the AssertionError + self.assert_(self.client.isConnected()) + # (client.disconnect() is already called from NBClient._on_connected_failure + # so there's need to call it in this case + + self.client_auth(credentials[0], credentials[1], credentials[2], sasl=1) + self.assert_(self.connection.con) + self.assert_(self.connection.auth=='sasl') + + self.do_disconnect() + + + def test_proper_connect_oldauth(self): + ''' + The ideal testcase - client is connected, authenticated with old auth and + then disconnected. + ''' + self.open_stream(xmpp_server_port) + self.assert_(self.client.isConnected()) + self.client_auth(credentials[0], credentials[1], credentials[2], sasl=0) + self.assert_(self.connection.con) + self.assert_(self.connection.auth=='old_auth') + self.do_disconnect() + + def test_connect_to_nonexisting_host(self): + ''' + Connect to nonexisting host. DNS request for A records should return nothing. + ''' + self.open_stream(('fdsfsdf.fdsf.fss', 5222)) + self.assert_(not self.client.isConnected()) + + def test_connect_to_wrong_port(self): + ''' + Connect to nonexisting host. DNS request for A records should return some IP + but there shouldn't be XMPP server running on specified port. + ''' + self.open_stream((xmpp_server_port[0], 31337)) + self.assert_(not self.client.isConnected()) + + def test_connect_with_wrong_creds(self): + ''' + Connecting with invalid password. + ''' + self.open_stream(xmpp_server_port) + self.assert_(self.client.isConnected()) + self.client_auth(credentials[0], "wrong pass", credentials[2], sasl=0) + self.assert_(self.connection.auth is None) + self.do_disconnect() + + + + + + +if __name__ == '__main__': + + suite = unittest.TestLoader().loadTestsFromTestCase(TestNonBlockingClient) + unittest.TextTestRunner(verbosity=2).run(suite) + + + + +

1 0

[commit-gajim] r9793 - branches/plugin-system/src
by vardo＠gajim.org 12 Jun '08

12 Jun '08

Author: vardo Date: 2008-06-12 21:26:55 +0200 (Thu, 12 Jun 2008) New Revision: 9793 Added: branches/plugin-system/src/pycallgraph.py Modified: branches/plugin-system/src/gajim.py Log: [Merwok] Commented out 'import pycallgraph' to remove import error. Added pycallgraph.py for those that want to generate callgraphs anyway. Modified: branches/plugin-system/src/gajim.py =================================================================== --- branches/plugin-system/src/gajim.py 2008-06-12 18:26:08 UTC (rev 9792) +++ branches/plugin-system/src/gajim.py 2008-06-12 19:26:55 UTC (rev 9793) @@ -26,7 +26,7 @@ ## import os -import pycallgraph +# import pycallgraph if os.name == 'nt': Added: branches/plugin-system/src/pycallgraph.py =================================================================== --- branches/plugin-system/src/pycallgraph.py (rev 0) +++ branches/plugin-system/src/pycallgraph.py 2008-06-12 19:26:55 UTC (rev 9793) @@ -0,0 +1,412 @@ +""" +pycallgraph + +U{http://pycallgraph.slowchop.com/} + +Copyright Gerald Kaszuba 2007 + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +""" + +__version__ = '0.4.1' +__author__ = 'Gerald Kaszuba' + +import inspect +import sys +import os +import re +import tempfile +import time +from distutils import sysconfig + +# Initialise module variables. +# TODO Move these into settings +trace_filter = None +time_filter = None + + +def colourize_node(calls, total_time): + value = float(total_time * 2 + calls) / 3 + return '%f %f %f' % (value / 2 + .5, value, 0.9) + + +def colourize_edge(calls, total_time): + value = float(total_time * 2 + calls) / 3 + return '%f %f %f' % (value / 2 + .5, value, 0.7) + + +def reset_settings(): + global settings + global graph_attributes + global __version__ + + settings = { + 'node_attributes': { + 'label': r'%(func)s\ncalls: %(hits)i\ntotal time: %(total_time)f', + 'color': '%(col)s', + }, + 'node_colour': colourize_node, + 'edge_colour': colourize_edge, + 'dont_exclude_anything': False, + 'include_stdlib': True, + } + + # TODO: Move this into settings + graph_attributes = { + 'graph': { + 'fontname': 'Verdana', + 'fontsize': 7, + 'fontcolor': '0 0 0.5', + 'label': r'Generated by Python Call Graph v%s\n' \ + r'http://pycallgraph.slowchop.com' % __version__, + }, + 'node': { + 'fontname': 'Verdana', + 'fontsize': 7, + 'color': '.5 0 .9', + 'style': 'filled', + 'shape': 'rect', + }, + } + + +def reset_trace(): + """Resets all collected statistics. This is run automatically by + start_trace(reset=True) and when the module is loaded. + """ + global call_dict + global call_stack + global func_count + global func_count_max + global func_time + global func_time_max + global call_stack_timer + + call_dict = {} + + # current call stack + call_stack = ['__main__'] + + # counters for each function + func_count = {} + func_count_max = 0 + + # accumative time per function + func_time = {} + func_time_max = 0 + + # keeps track of the start time of each call on the stack + call_stack_timer = [] + + +class PyCallGraphException(Exception): + """Exception used for pycallgraph""" + pass + + +class GlobbingFilter(object): + """Filter module names using a set of globs. + + Objects are matched against the exclude list first, then the include list. + Anything that passes through without matching either, is excluded. + """ + + def __init__(self, include=None, exclude=None, max_depth=None, + min_depth=None): + if include is None and exclude is None: + include = ['*'] + exclude = [] + elif include is None: + include = ['*'] + elif exclude is None: + exclude = [] + self.include = include + self.exclude = exclude + self.max_depth = max_depth or 9999 + self.min_depth = min_depth or 0 + + def __call__(self, stack, module_name=None, class_name=None, + func_name=None, full_name=None): + from fnmatch import fnmatch + if len(stack) > self.max_depth: + return False + if len(stack) < self.min_depth: + return False + for pattern in self.exclude: + if fnmatch(full_name, pattern): + return False + for pattern in self.include: + if fnmatch(full_name, pattern): + return True + return False + + +def is_module_stdlib(file_name): + """Returns True if the file_name is in the lib directory.""" + # TODO: Move these calls away from this function so it doesn't have to run + # every time. + lib_path = sysconfig.get_python_lib() + path = os.path.split(lib_path) + if path[1] == 'site-packages': + lib_path = path[0] + return file_name.lower().startswith(lib_path.lower()) + + +def start_trace(reset=True, filter_func=None, time_filter_func=None): + """Begins a trace. Setting reset to True will reset all previously recorded + trace data. filter_func needs to point to a callable function that accepts + the parameters (call_stack, module_name, class_name, func_name, full_name). + Every call will be passed into this function and it is up to the function + to decide if it should be included or not. Returning False means the call + will be filtered out and not included in the call graph. + """ + global trace_filter + global time_filter + if reset: + reset_trace() + + if filter_func: + trace_filter = filter_func + else: + trace_filter = GlobbingFilter(exclude=['pycallgraph.*']) + + if time_filter_func: + time_filter = time_filter_func + else: + time_filter = GlobbingFilter() + + sys.settrace(tracer) + + +def stop_trace(): + """Stops the currently running trace, if any.""" + sys.settrace(None) + + +def tracer(frame, event, arg): + """This is an internal function that is called every time a call is made + during a trace. It keeps track of relationships between calls. + """ + global func_count_max + global func_count + global trace_filter + global time_filter + global call_stack + global func_time + global func_time_max + + if event == 'call': + keep = True + code = frame.f_code + + # Stores all the parts of a human readable name of the current call. + full_name_list = [] + + # Work out the module name + module = inspect.getmodule(code) + if module: + module_name = module.__name__ + module_path = module.__file__ + if not settings['include_stdlib'] \ + and is_module_stdlib(module_path): + keep = False + if module_name == '__main__': + module_name = '' + else: + module_name = '' + if module_name: + full_name_list.append(module_name) + + # Work out the class name. + try: + class_name = frame.f_locals['self'].__class__.__name__ + full_name_list.append(class_name) + except (KeyError, AttributeError): + class_name = '' + + # Work out the current function or method + func_name = code.co_name + if func_name == '?': + func_name = '__main__' + full_name_list.append(func_name) + + # Create a readable representation of the current call + full_name = '.'.join(full_name_list) + + # Load the trace filter, if any. 'keep' determines if we should ignore + # this call + if keep and trace_filter: + keep = trace_filter(call_stack, module_name, class_name, + func_name, full_name) + + # Store the call information + if keep: + + fr = call_stack[-1] + if fr not in call_dict: + call_dict[fr] = {} + if full_name not in call_dict[fr]: + call_dict[fr][full_name] = 0 + call_dict[fr][full_name] += 1 + + if full_name not in func_count: + func_count[full_name] = 0 + func_count[full_name] += 1 + if func_count[full_name] > func_count_max: + func_count_max = func_count[full_name] + + call_stack.append(full_name) + call_stack_timer.append(time.time()) + + else: + call_stack.append('') + call_stack_timer.append(None) + + if event == 'return': + if call_stack: + full_name = call_stack.pop(-1) + t = call_stack_timer.pop(-1) + if t and time_filter(stack=call_stack, full_name=full_name): + if full_name not in func_time: + func_time[full_name] = 0 + call_time = (time.time() - t) + func_time[full_name] += call_time + if func_time[full_name] > func_time_max: + func_time_max = func_time[full_name] + + return tracer + + +def get_dot(stop=True): + """Returns a string containing a DOT file. Setting stop to True will cause + the trace to stop. + """ + global func_time_max + + def frac_calculation(func, count): + global func_count_max + global func_time + global func_time_max + calls_frac = float(count) / func_count_max + try: + total_time = func_time[func] + except KeyError: + total_time = 0 + if func_time_max: + total_time_frac = float(total_time) / func_time_max + else: + total_time_frac = 0 + return calls_frac, total_time_frac, total_time + + if stop: + stop_trace() + ret = ['digraph G {', ] + for comp, comp_attr in graph_attributes.items(): + ret.append('%s [' % comp) + for attr, val in comp_attr.items(): + ret.append('%(attr)s = "%(val)s",' % locals()) + ret.append('];') + for func, hits in func_count.items(): + calls_frac, total_time_frac, total_time = frac_calculation(func, hits) + col = settings['node_colour'](calls_frac, total_time_frac) + attribs = ['%s="%s"' % a for a in settings['node_attributes'].items()] + node_str = '"%s" [%s];' % (func, ','.join(attribs)) + ret.append(node_str % locals()) + for fr_key, fr_val in call_dict.items(): + if fr_key == '': + continue + for to_key, to_val in fr_val.items(): + calls_frac, total_time_frac, totla_time = \ + frac_calculation(to_key, to_val) + col = settings['edge_colour'](calls_frac, total_time_frac) + edge = '[ color = "%s" ]' % col + ret.append('"%s"->"%s" %s' % (fr_key, to_key, edge)) + ret.append('}') + ret = '\n'.join(ret) + return ret + + +def save_dot(filename): + """Generates a DOT file and writes it into filename.""" + open(filename, 'w').write(get_dot()) + + +def make_graph(filename, format=None, tool=None, stop=None): + """This has been changed to make_dot_graph.""" + raise PyCallGraphException( \ + 'make_graph is depricated. Please use make_dot_graph') + + +def make_dot_graph(filename, format='png', tool='dot', stop=True): + """Creates a graph using a Graphviz tool that supports the dot language. It + will output into a file specified by filename with the format specified. + Setting stop to True will stop the current trace. + """ + if stop: + stop_trace() + + # create a temporary file to be used for the dot data + fd, tempname = tempfile.mkstemp() + f = os.fdopen(fd, 'w') + f.write(get_dot()) + f.close() + + # normalize filename + regex_user_expand = re.compile('\A~') + if regex_user_expand.match(filename): + filename = os.path.expanduser(filename) + else: + filename = os.path.expandvars(filename) # expand, just in case + + cmd = '%(tool)s -T%(format)s -o%(filename)s %(tempname)s' % locals() + try: + ret = os.system(cmd) + if ret: + raise PyCallGraphException( \ + 'The command "%(cmd)s" failed with error ' \ + 'code %(ret)i.' % locals()) + finally: + os.unlink(tempname) + + +def simple_memoize(callable_object): + """Simple memoization for functions without keyword arguments. + + This is useful for mapping code objects to module in this context. + inspect.getmodule() requires a number of system calls, which may slow down + the tracing considerably. Caching the mapping from code objects (there is + *one* code object for each function, regardless of how many simultaneous + activations records there are). + + In this context we can ignore keyword arguments, but a generic memoizer + ought to take care of that as well. + """ + + cache = dict() + def wrapper(*rest): + if rest not in cache: + cache[rest] = callable_object(*rest) + return cache[rest] + + return wrapper + + +settings = {} +graph_attributes = {} +reset_settings() +reset_trace() +inspect.getmodule = simple_memoize(inspect.getmodule) + +# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:

1 0

[commit-gajim] r9792 - in branches/plugin-system: data/glade plugins src/plugins
by vardo＠gajim.org 12 Jun '08

12 Jun '08

Author: vardo Date: 2008-06-12 20:26:08 +0200 (Thu, 12 Jun 2008) New Revision: 9792 Modified: branches/plugin-system/data/glade/plugins_window.glade branches/plugin-system/plugins/acronyms_expander.py branches/plugin-system/plugins/length_notifier.py branches/plugin-system/src/plugins/plugin.py Log: Small changes toward handling plug-ins configuration. Modified: branches/plugin-system/data/glade/plugins_window.glade =================================================================== --- branches/plugin-system/data/glade/plugins_window.glade 2008-06-12 15:16:36 UTC (rev 9791) +++ branches/plugin-system/data/glade/plugins_window.glade 2008-06-12 18:26:08 UTC (rev 9792) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - + <glade-interface> <widget class="GtkWindow" id="plugins_window"> <property name="width_request">650</property> @@ -322,6 +322,7 @@ <child> <widget class="GtkHPaned" id="hpaned2"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> <child> <widget class="GtkScrolledWindow" id="scrolledwindow2"> @@ -555,6 +556,9 @@ </child> <child> <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> <property name="label" translatable="yes">Available</property> </widget> <packing> Modified: branches/plugin-system/plugins/acronyms_expander.py =================================================================== --- branches/plugin-system/plugins/acronyms_expander.py 2008-06-12 15:16:36 UTC (rev 9791) +++ branches/plugin-system/plugins/acronyms_expander.py 2008-06-12 18:26:08 UTC (rev 9792) @@ -43,7 +43,7 @@ def __init__(self): super(AcronymsExpanderPlugin, self).__init__() - self.__class__.gui_extension_points = { + self.gui_extension_points = { 'chat_control_base' : (self.connect_with_chat_control_base, self.disconnect_from_chat_control_base) } Modified: branches/plugin-system/plugins/length_notifier.py =================================================================== --- branches/plugin-system/plugins/length_notifier.py 2008-06-12 15:16:36 UTC (rev 9791) +++ branches/plugin-system/plugins/length_notifier.py 2008-06-12 18:26:08 UTC (rev 9792) @@ -43,7 +43,7 @@ def __init__(self): super(LengthNotifierPlugin, self).__init__() - self.__class__.gui_extension_points = { + self.gui_extension_points = { 'chat_control' : (self.connect_with_chat_control, self.disconnect_from_chat_control) } Modified: branches/plugin-system/src/plugins/plugin.py =================================================================== --- branches/plugin-system/src/plugins/plugin.py 2008-06-12 15:16:36 UTC (rev 9791) +++ branches/plugin-system/src/plugins/plugin.py 2008-06-12 18:26:08 UTC (rev 9792) @@ -94,4 +94,29 @@ @log_calls('GajimPlugin') def __init__(self): - pass \ No newline at end of file + self.config = Config() + ''' + Plug-in configuration dictionary. + + Automatically saved and loaded and plug-in (un)load. + + :type: `plugins.plugin.Config` + ''' + + self._load_config() + + @log_calls('GajimPlugin') + def _save_config(self): + pass + + @log_calls('GajimPlugin') + def _load_config(self): + pass + + @log_calls('GajimPlugin') + def __del__(self): + self._save_config() + + +class Config(dict): + pass \ No newline at end of file

1 0

[commit-gajim] r9791 - trunk/src/common
by asterix＠gajim.org 12 Jun '08

12 Jun '08

Author: asterix Date: 2008-06-12 17:16:36 +0200 (Thu, 12 Jun 2008) New Revision: 9791 Modified: trunk/src/common/caps.py Log: remove old comment in caps.py Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-06-12 03:56:47 UTC (rev 9790) +++ trunk/src/common/caps.py 2008-06-12 15:16:36 UTC (rev 9791) @@ -64,11 +64,6 @@ >>> muc in x.features True - # retrieving data (multiple exts case) - >>> caps=('http://gajim.org/caps', '0.9', ('csn', 'ft')) - >>> muc in cc[caps].features - True - ''' def __init__(self, logger=None): ''' Create a cache for entity capabilities. '''

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

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 June 2008