Commits September 2008

commits@gajim.org

4 participants
83 discussions

[commit-gajim] r10434 - trunk/src
by asterix＠gajim.org 27 Sep '08

27 Sep '08

Author: asterix Date: 2008-09-27 16:20:44 +0200 (Sat, 27 Sep 2008) New Revision: 10434 Modified: trunk/src/groupchat_control.py trunk/src/roster_window.py Log: show free for chat contacts before online contacts in roster when sorting by status. Fixes #4301 Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-09-27 12:52:59 UTC (rev 10433) +++ trunk/src/groupchat_control.py 2008-09-27 14:20:44 UTC (rev 10434) @@ -403,7 +403,7 @@ return 0 if type1 == 'contact' and type2 == 'contact' and \ gajim.config.get('sort_by_show_in_muc'): - cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, + cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4, 'invisible': 5, 'offline': 6, 'error': 7} show1 = cshow[gc_contact1.show] show2 = cshow[gc_contact2.show] Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-27 12:52:59 UTC (rev 10433) +++ trunk/src/roster_window.py 2008-09-27 14:20:44 UTC (rev 10434) @@ -1565,7 +1565,7 @@ # child contact if type1 == 'contact' and type2 == 'contact' and \ gajim.config.get('sort_by_show_in_roster'): - cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, + cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4, 'invisible': 5, 'offline': 6, 'not in roster': 7, 'error': 8} s = self.get_show(lcontact1) if s in cshow:

1 0

[commit-gajim] r10433 - in branches/osx_newbuildsys: data/glade po src src/common src/common/xmpp
by js＠gajim.org 27 Sep '08

27 Sep '08

Author: js Date: 2008-09-27 14:52:59 +0200 (Sat, 27 Sep 2008) New Revision: 10433 Modified: branches/osx_newbuildsys/data/glade/preferences_window.glade branches/osx_newbuildsys/po/fr.po branches/osx_newbuildsys/po/pl.po branches/osx_newbuildsys/src/adhoc_commands.py branches/osx_newbuildsys/src/chat_control.py branches/osx_newbuildsys/src/common/caps.py branches/osx_newbuildsys/src/common/commands.py branches/osx_newbuildsys/src/common/config.py branches/osx_newbuildsys/src/common/connection.py branches/osx_newbuildsys/src/common/connection_handlers.py branches/osx_newbuildsys/src/common/pep.py branches/osx_newbuildsys/src/common/proxy65_manager.py branches/osx_newbuildsys/src/common/stanza_session.py branches/osx_newbuildsys/src/common/xmpp/protocol.py branches/osx_newbuildsys/src/config.py branches/osx_newbuildsys/src/disco.py branches/osx_newbuildsys/src/groupchat_control.py branches/osx_newbuildsys/src/message_window.py branches/osx_newbuildsys/src/notify.py branches/osx_newbuildsys/src/roster_window.py Log: Merge with trunk r10432. Modified: branches/osx_newbuildsys/data/glade/preferences_window.glade =================================================================== --- branches/osx_newbuildsys/data/glade/preferences_window.glade 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/data/glade/preferences_window.glade 2008-09-27 12:52:59 UTC (rev 10433) @@ -124,19 +124,49 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="sort_by_show_checkbutton"> + <widget class="GtkHBox" id="hbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will sort contacts in roster window and groupchats by their status and not by the shown name</property> - <property name="label" translatable="yes">_Sort contacts by status</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_checkbutton_toggled"/> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="label" translatable="yes">Sort contacts by status</property> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">in _roster</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">in _group chats</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> </widget> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">5</property> </packing> </child> @@ -220,7 +250,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> - <property name="label" translatable="yes">Ignore rich content in incoming messages</property> + <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -259,7 +289,8 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">1</property> - <property name="label" translatable="yes">Emoticons:</property> + <property name="label" translatable="yes">_Emoticons:</property> + <property name="use_underline">True</property> </widget> </child> </widget> Modified: branches/osx_newbuildsys/po/fr.po =================================================================== --- branches/osx_newbuildsys/po/fr.po 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/po/fr.po 2008-09-27 12:52:59 UTC (rev 10433) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-10 06:55+0200\n" +"POT-Creation-Date: 2008-09-15 21:41+0200\n" "PO-Revision-Date: 2008-08-31 03:53+0100\n" "Last-Translator: Le Coz Florent <louizatakk(a)gmail.com>\n" "Language-Team: \n" @@ -378,8 +378,8 @@ #: ../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:1551 -#: ../src/config.py:2051 +#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1550 +#: ../src/config.py:2050 msgid "No key selected" msgstr "Pas de clé sélectionnée" @@ -387,9 +387,9 @@ #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:38 #: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140 -#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464 -#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050 -#: ../src/config.py:3153 ../src/config.py:3221 ../src/dialogs.py:293 +#: ../src/config.py:1211 ../src/config.py:1458 ../src/config.py:1463 +#: ../src/config.py:1958 ../src/config.py:2036 ../src/config.py:2049 +#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2725 #: ../src/roster_window.py:2731 ../src/roster_window.py:2736 msgid "None" @@ -1052,7 +1052,7 @@ #: ../data/glade/roster_contact_context_menu.glade.h:17 #: ../data/glade/roster_window.glade.h:20 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5783 +#: ../src/roster_window.py:5786 msgid "_History" msgstr "_Historique" @@ -1437,8 +1437,8 @@ msgid "Room:" msgstr "Salon de discussion :" -#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1184 -#: ../src/disco.py:1605 +#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197 +#: ../src/disco.py:1618 msgid "_Join" msgstr "Re_joindre" @@ -1865,7 +1865,7 @@ "when using E2E encryption the remote party has to agree on logging, else the " "messages will not be logged." msgstr "" -"Si cette case est cochée, Gajim archivera les conversations cryptées. " +"Si cette case est cochée, Gajim archivera les conversations chiffrées. " "Veuillez noter qu'en utilisant une encryption E2E, l'utilisateur distant " "doit l'accepter, sinon les messages ne seront pas archivés." @@ -1917,7 +1917,7 @@ #: ../data/glade/preferences_window.glade.h:70 msgid "Log _encrypted chat session" -msgstr "Archiver les conversations _cryptées" +msgstr "Archiver les conversations _chiffrées" #: ../data/glade/preferences_window.glade.h:71 msgid "Ma_ke message windows compact" @@ -2350,7 +2350,7 @@ #. Remove group #. Remove #: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5127 -#: ../src/roster_window.py:5601 ../src/roster_window.py:5730 +#: ../src/roster_window.py:5604 ../src/roster_window.py:5733 msgid "_Remove" msgstr "_Supprimer" @@ -2372,14 +2372,14 @@ #. Execute Command #: ../data/glade/roster_contact_context_menu.glade.h:5 -#: ../src/roster_window.py:5673 +#: ../src/roster_window.py:5676 msgid "Execute Command..." msgstr "Exécuter une commande..." #. Invite to #. Invite to Groupchat #: ../data/glade/roster_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5045 ../src/roster_window.py:5554 +#: ../src/roster_window.py:5045 ../src/roster_window.py:5557 msgid "In_vite to" msgstr "In_viter à" @@ -2390,7 +2390,7 @@ #. Send Custom Status #: ../data/glade/roster_contact_context_menu.glade.h:8 -#: ../src/roster_window.py:5055 ../src/roster_window.py:5639 +#: ../src/roster_window.py:5055 ../src/roster_window.py:5642 msgid "Send Cus_tom Status" msgstr "Envoyer un Statut Personnalisé" @@ -2416,8 +2416,8 @@ msgstr "L'autoriser à voir mon état" #: ../data/glade/roster_contact_context_menu.glade.h:15 -#: ../src/roster_window.py:5118 ../src/roster_window.py:5591 -#: ../src/roster_window.py:5720 +#: ../src/roster_window.py:5118 ../src/roster_window.py:5594 +#: ../src/roster_window.py:5723 msgid "_Block" msgstr "_Bloquer" @@ -2443,8 +2443,8 @@ msgstr "_Autorisation" #: ../data/glade/roster_contact_context_menu.glade.h:22 -#: ../src/roster_window.py:5112 ../src/roster_window.py:5585 -#: ../src/roster_window.py:5717 +#: ../src/roster_window.py:5112 ../src/roster_window.py:5588 +#: ../src/roster_window.py:5720 msgid "_Unblock" msgstr "_Débloquer" @@ -2502,7 +2502,7 @@ msgid "_Contents" msgstr "_Sommaire" -#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1338 +#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351 msgid "_Edit" msgstr "É_dition" @@ -2543,11 +2543,11 @@ msgstr "_Ajouter un contact" #. Information -#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5742 +#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5745 msgid "_Information" msgstr "Information" -#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1196 +#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209 msgid "_Search" msgstr "_Rechercher" @@ -2766,13 +2766,13 @@ #. Edit Groups #: ../data/glade/zeroconf_contact_context_menu.glade.h:3 -#: ../src/roster_window.py:5574 +#: ../src/roster_window.py:5577 msgid "Edit _Groups" msgstr "Éditer les _groupes" #. Rename #: ../data/glade/zeroconf_contact_context_menu.glade.h:8 -#: ../src/roster_window.py:5700 +#: ../src/roster_window.py:5703 msgid "_Rename" msgstr "_Renommer" @@ -2995,7 +2995,7 @@ #. Add to roster #. add_to_roster_menuitem -#: ../src/chat_control.py:1169 ../src/chat_control.py:2031 +#: ../src/chat_control.py:1169 ../src/chat_control.py:2030 #: ../src/common/contacts.py:113 ../src/common/helpers.py:75 #: ../src/common/helpers.py:299 ../src/conversation_textview.py:844 #: ../src/dialogs.py:895 ../src/gajim.py:1626 ../src/roster_window.py:925 @@ -3045,11 +3045,11 @@ msgid "GPG encryption disabled" msgstr "Chiffrement GPG désactivé" -#: ../src/chat_control.py:1550 ../src/chat_control.py:1805 +#: ../src/chat_control.py:1550 msgid "Session WILL be logged" msgstr "La session SERA archivée" -#: ../src/chat_control.py:1552 ../src/chat_control.py:1807 +#: ../src/chat_control.py:1552 msgid "Session WILL NOT be logged" msgstr "La session ne sera PAS archivée" @@ -3139,34 +3139,45 @@ msgstr "Négociation annulée" #: ../src/chat_control.py:1801 -msgid "E2E encryption enabled" -msgstr "Chiffrement E2E activé" +#, fuzzy +msgid "This session is encrypted" +msgstr "[Ce message est chiffré]" -#: ../src/chat_control.py:1812 +#: ../src/chat_control.py:1804 +#, fuzzy +msgid " and WILL be logged" +msgstr "La session SERA archivée" + +#: ../src/chat_control.py:1806 +#, fuzzy +msgid " and WILL NOT be logged" +msgstr "La session ne sera PAS archivée" + +#: ../src/chat_control.py:1811 msgid "" "Remote contact's identity not verified. Click the shield button for more " "details." msgstr "" -#: ../src/chat_control.py:1814 +#: ../src/chat_control.py:1813 msgid "E2E encryption disabled" msgstr "Chiffrement E2E désactivé" -#: ../src/chat_control.py:1843 ../src/chat_control.py:1856 +#: ../src/chat_control.py:1842 ../src/chat_control.py:1855 msgid "The following message was NOT encrypted" msgstr "Le message suivant n'a PAS été chiffré" -#: ../src/chat_control.py:1849 +#: ../src/chat_control.py:1848 msgid "The following message was encrypted" msgstr "Le message suivant n'a été chiffré" #. %s is being replaced in the code with JID -#: ../src/chat_control.py:2210 +#: ../src/chat_control.py:2209 #, python-format msgid "You just received a new message from \"%s\"" msgstr "Vous venez de recevoir un nouveau message de \"%s\"" -#: ../src/chat_control.py:2211 +#: ../src/chat_control.py:2210 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." @@ -3174,11 +3185,11 @@ "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce " "message sera perdu." -#: ../src/chat_control.py:2362 ../src/gajim.py:170 +#: ../src/chat_control.py:2361 ../src/gajim.py:170 msgid "Database Error" msgstr "Erreur de base de données" -#: ../src/chat_control.py:2363 ../src/gajim.py:171 +#: ../src/chat_control.py:2362 ../src/gajim.py:171 #, python-format msgid "" "The database file (%s) cannot be read. Try to repair it or remove it (all " @@ -3187,7 +3198,7 @@ "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou " "supprimez le (toutes les archives seront perdues)." -#: ../src/chat_control.py:2595 +#: ../src/chat_control.py:2594 #, python-format msgid "%(name)s is now %(status)s" msgstr "%(name)s est maintenant %(status)s" @@ -3561,7 +3572,7 @@ "When negotiating an encrypted session, should Gajim assume you want your " "messages to be logged?" msgstr "" -"Durant la négociation d'une session cryptée, Gajim doit-il partir du " +"Durant la négociation d'une session chiffrée, Gajim doit-il partir du " "principe que vous voulez archiver vos conversations ?" #: ../src/common/config.py:204 @@ -3912,7 +3923,7 @@ #: ../src/common/config.py:295 msgid "Should Gajim automatically start an encrypted session when possible?" msgstr "" -"Gajim doit-il commencer automatiquement une discussion cryptée quand cela " +"Gajim doit-il commencer automatiquement une discussion chiffrée quand cela " "est possible ?" #: ../src/common/config.py:296 @@ -3978,7 +3989,7 @@ "Should Gajim automatically start an encrypted session with this contact when " "possible?" msgstr "" -"Gajim doit-il commencer automatiquement une discussion cryptée avec ce " +"Gajim doit-il commencer automatiquement une discussion chiffrée avec ce " "contact quand cela est possible ?" #: ../src/common/config.py:391 ../src/common/config.py:394 @@ -4059,7 +4070,7 @@ msgid "I'm free for chat." msgstr "Disponible pour discuter" -#: ../src/common/config.py:427 ../src/config.py:1391 +#: ../src/common/config.py:427 ../src/config.py:1390 msgid "Be right back." msgstr "Revient de suite." @@ -4247,7 +4258,7 @@ #: ../src/common/connection.py:70 msgid "Unable to decrypt certificate's signature" -msgstr "Impossible de décrypter la signature du certificat" +msgstr "Impossible de déchiffrer la signature du certificat" #: ../src/common/connection.py:71 msgid "Unable to decrypt CRL's signature" @@ -4514,8 +4525,8 @@ msgstr "Observateurs" #: ../src/common/contacts.py:96 ../src/common/contacts.py:347 -#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117 -#: ../src/disco.py:1335 ../src/gajim.py:792 ../src/roster_window.py:827 +#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118 +#: ../src/disco.py:1348 ../src/gajim.py:792 ../src/roster_window.py:827 #: ../src/roster_window.py:1454 ../src/roster_window.py:1521 #: ../src/roster_window.py:1523 ../src/roster_window.py:1666 msgid "Transports" @@ -5674,207 +5685,207 @@ #. Name column #: ../src/config.py:1312 ../src/dialogs.py:1815 ../src/dialogs.py:1879 -#: ../src/disco.py:755 ../src/disco.py:1549 ../src/disco.py:1796 +#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809 #: ../src/history_window.py:86 msgid "Name" msgstr "Nom" -#: ../src/config.py:1400 +#: ../src/config.py:1398 msgid "Relogin now?" msgstr "Reconnecter maintenant ?" -#: ../src/config.py:1401 +#: ../src/config.py:1399 msgid "If you want all the changes to apply instantly, you must relogin." msgstr "" "Si vous voulez que vos changements soit appliqués immédiatement, vous devez " "vous reconnecter." -#: ../src/config.py:1525 ../src/config.py:1624 +#: ../src/config.py:1524 ../src/config.py:1623 msgid "OpenPGP is not usable in this computer" msgstr "OpenPGP n'est pas utilisable sur cet ordinateur" -#: ../src/config.py:1660 ../src/config.py:1703 +#: ../src/config.py:1659 ../src/config.py:1702 msgid "Unread events" msgstr "Événements non lus" -#: ../src/config.py:1661 +#: ../src/config.py:1660 msgid "Read all pending events before removing this account." msgstr "Lisez tous les événements avant de supprimer ce compte." -#: ../src/config.py:1687 +#: ../src/config.py:1686 #, python-format msgid "You have opened chat in account %s" msgstr "Vous avez une conversation ouverte dans le compte %s" -#: ../src/config.py:1688 +#: ../src/config.py:1687 msgid "All chat and groupchat windows will be closed. Do you want to continue?" msgstr "" "Toutes les fenêtres de conversation et de salons de discussion seront " "fermées. Voulez-vous continuer ?" -#: ../src/config.py:1699 +#: ../src/config.py:1698 msgid "You are currently connected to the server" msgstr "Vous êtes actuellement connecté au serveur" -#: ../src/config.py:1700 +#: ../src/config.py:1699 msgid "To change the account name, you must be disconnected." msgstr "Pour changer le nom du compte, vous devez être déconnecté." -#: ../src/config.py:1704 +#: ../src/config.py:1703 msgid "To change the account name, you must read all pending events." msgstr "Pour changer le nom du compte, vous devez lire tous ses événements." -#: ../src/config.py:1710 +#: ../src/config.py:1709 msgid "Account Name Already Used" msgstr "Nom de Compte déjà utilisé" -#: ../src/config.py:1711 +#: ../src/config.py:1710 msgid "" "This name is already used by another of your accounts. Please choose another " "name." msgstr "" "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom." -#: ../src/config.py:1715 ../src/config.py:1719 +#: ../src/config.py:1714 ../src/config.py:1718 msgid "Invalid account name" msgstr "Nom de compte invalide" -#: ../src/config.py:1716 +#: ../src/config.py:1715 msgid "Account name cannot be empty." msgstr "Le nom du compte ne peut pas être vide." -#: ../src/config.py:1720 +#: ../src/config.py:1719 msgid "Account name cannot contain spaces." msgstr "Le nom du compte ne peut pas contenir d'espaces." -#: ../src/config.py:1794 +#: ../src/config.py:1793 msgid "Rename Account" msgstr "Renommer le compte" -#: ../src/config.py:1795 +#: ../src/config.py:1794 #, python-format msgid "Enter a new name for account %s" msgstr "Entrez un nouveau nom pour le compte %s" -#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864 -#: ../src/config.py:3091 ../src/dataforms_widget.py:536 +#: ../src/config.py:1812 ../src/config.py:1820 ../src/config.py:1863 +#: ../src/config.py:3090 ../src/dataforms_widget.py:536 msgid "Invalid Jabber ID" msgstr "Identifiant Jabber invalide" -#: ../src/config.py:1822 +#: ../src/config.py:1821 msgid "A Jabber ID must be in the form \"user@servername\"." msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"." -#: ../src/config.py:2012 ../src/config.py:3163 +#: ../src/config.py:2011 ../src/config.py:3162 msgid "Invalid entry" msgstr "Entrée invalide" -#: ../src/config.py:2013 ../src/config.py:3164 +#: ../src/config.py:2012 ../src/config.py:3163 msgid "Custom port must be a port number." msgstr "Le port personnalisé doit être un numéro de port" -#: ../src/config.py:2034 +#: ../src/config.py:2033 msgid "Failed to get secret keys" msgstr "Erreur en récupérant les clés secrètes" -#: ../src/config.py:2035 +#: ../src/config.py:2034 msgid "There was a problem retrieving your OpenPGP secret keys." msgstr "" "Il y a eu un problème durant la récupération de vos clés OpenPGP secrètes." -#: ../src/config.py:2070 +#: ../src/config.py:2069 msgid "OpenPGP Key Selection" msgstr "Sélection d'une clé OpenPGP" -#: ../src/config.py:2071 +#: ../src/config.py:2070 msgid "Choose your OpenPGP key" msgstr "Choisissez votre clé OpenPGP" -#: ../src/config.py:2082 +#: ../src/config.py:2081 msgid "No such account available" msgstr "Compte non disponible" -#: ../src/config.py:2083 +#: ../src/config.py:2082 msgid "You must create your account before editing your personal information." msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations." -#: ../src/config.py:2090 ../src/dialogs.py:1667 ../src/dialogs.py:1803 -#: ../src/dialogs.py:1983 ../src/disco.py:438 ../src/profile_window.py:320 +#: ../src/config.py:2089 ../src/dialogs.py:1667 ../src/dialogs.py:1803 +#: ../src/dialogs.py:1983 ../src/disco.py:439 ../src/profile_window.py:320 msgid "You are not connected to the server" msgstr "Vous n'êtes pas connecté au serveur" -#: ../src/config.py:2091 +#: ../src/config.py:2090 msgid "Without a connection, you can not edit your personal information." msgstr "Vous devez être connecté pour éditer vos informations." -#: ../src/config.py:2095 +#: ../src/config.py:2094 msgid "Your server doesn't support Vcard" msgstr "Votre serveur ne supporte pas les Vcard" -#: ../src/config.py:2096 +#: ../src/config.py:2095 msgid "Your server can't save your personal information." msgstr "Votre serveur ne peut enregistrer d'informations personnelles." -#: ../src/config.py:2127 +#: ../src/config.py:2126 msgid "Account Local already exists." msgstr "Ce compte existe déjà localement." -#: ../src/config.py:2128 +#: ../src/config.py:2127 msgid "Please rename or remove it before enabling link-local messaging." msgstr "" "Veuillez le renommer et l'enlever avant d'activer la messagerie link-local." -#: ../src/config.py:2311 +#: ../src/config.py:2310 #, python-format msgid "Edit %s" msgstr "_Éditer %s" -#: ../src/config.py:2313 +#: ../src/config.py:2312 #, python-format msgid "Register to %s" msgstr "S'enregistrer à %s" #. list at the beginning -#: ../src/config.py:2349 +#: ../src/config.py:2348 msgid "Ban List" msgstr "Liste des bannis" -#: ../src/config.py:2350 +#: ../src/config.py:2349 msgid "Member List" msgstr "Liste des membres" -#: ../src/config.py:2351 +#: ../src/config.py:2350 msgid "Owner List" msgstr "Liste des propriétaires" -#: ../src/config.py:2352 +#: ../src/config.py:2351 msgid "Administrator List" msgstr "Liste des administrateurs" #. Address column #. holds JID (who said this) -#: ../src/config.py:2401 ../src/disco.py:762 ../src/history_manager.py:184 +#: ../src/config.py:2400 ../src/disco.py:775 ../src/history_manager.py:184 msgid "JID" msgstr "Identifiant Jabber" -#: ../src/config.py:2409 +#: ../src/config.py:2408 msgid "Reason" msgstr "Raison" -#: ../src/config.py:2414 +#: ../src/config.py:2413 msgid "Nick" msgstr "Pseudonyme" -#: ../src/config.py:2418 +#: ../src/config.py:2417 msgid "Role" msgstr "Rôle" -#: ../src/config.py:2443 +#: ../src/config.py:2442 msgid "Banning..." msgstr "Bannissement de ..." #. You can move '\n' before user@domain if that line is TOO BIG -#: ../src/config.py:2445 +#: ../src/config.py:2444 msgid "" "Whom do you want to ban?\n" "\n" @@ -5882,11 +5893,11 @@ "Qui voulez-vous bannir ?\n" "\n" -#: ../src/config.py:2447 +#: ../src/config.py:2446 msgid "Adding Member..." msgstr "Ajout d'un Membre ..." -#: ../src/config.py:2448 +#: ../src/config.py:2447 msgid "" "Whom do you want to make a member?\n" "\n" @@ -5894,11 +5905,11 @@ "De qui voulez-vous faire un membre ?\n" "\n" -#: ../src/config.py:2450 +#: ../src/config.py:2449 msgid "Adding Owner..." msgstr "Ajout d'un Propriétaire ..." -#: ../src/config.py:2451 +#: ../src/config.py:2450 msgid "" "Whom do you want to make an owner?\n" "\n" @@ -5906,11 +5917,11 @@ "De qui voulez-vous faire un possesseur ?\n" "\n" -#: ../src/config.py:2453 +#: ../src/config.py:2452 msgid "Adding Administrator..." msgstr "Ajout d'un Administrateur ..." -#: ../src/config.py:2454 +#: ../src/config.py:2453 msgid "" "Whom do you want to make an administrator?\n" "\n" @@ -5918,7 +5929,7 @@ "De qui voulez-vous faire un administrateur ?\n" "\n" -#: ../src/config.py:2455 +#: ../src/config.py:2454 msgid "" "Can be one of the following:\n" "1. user@domain/resource (only that resource matches).\n" @@ -5935,84 +5946,84 @@ "pseudo@domaine,\n" "domaine/ressource, ou les adresses comprenant un sous-domaine)." -#: ../src/config.py:2558 +#: ../src/config.py:2557 #, python-format msgid "Removing %s account" msgstr "Supprimer le compte %s" -#: ../src/config.py:2580 ../src/gajim.py:1414 ../src/roster_window.py:1931 +#: ../src/config.py:2579 ../src/gajim.py:1414 ../src/roster_window.py:1931 msgid "Password Required" msgstr "Mot de passe requis" -#: ../src/config.py:2581 ../src/roster_window.py:1905 +#: ../src/config.py:2580 ../src/roster_window.py:1905 #, python-format msgid "Enter your password for account %s" msgstr "Entrez votre mot de passe pour le compte %s" -#: ../src/config.py:2582 ../src/roster_window.py:1932 +#: ../src/config.py:2581 ../src/roster_window.py:1932 msgid "Save password" msgstr "Enregistrer le mot de passe" -#: ../src/config.py:2591 +#: ../src/config.py:2590 #, python-format msgid "Account \"%s\" is connected to the server" msgstr "Le compte \"%s\" est connecté au serveur" -#: ../src/config.py:2592 +#: ../src/config.py:2591 msgid "If you remove it, the connection will be lost." msgstr "Si vous l'enlevez, la connection sera perdue." -#: ../src/config.py:2688 +#: ../src/config.py:2687 msgid "Default" msgstr "Par défaut" -#: ../src/config.py:2688 +#: ../src/config.py:2687 msgid "?print_status:All" msgstr "?print_status:Tout" -#: ../src/config.py:2689 +#: ../src/config.py:2688 msgid "Enter and leave only" msgstr "Entrées et sorties seulement" -#: ../src/config.py:2690 +#: ../src/config.py:2689 msgid "?print_status:None" msgstr "Aucun" -#: ../src/config.py:2759 +#: ../src/config.py:2758 msgid "New Group Chat" msgstr "Créer un salon de discussion" -#: ../src/config.py:2792 +#: ../src/config.py:2791 msgid "This bookmark has invalid data" msgstr "Ce marque-page contient des données invalides" -#: ../src/config.py:2793 +#: ../src/config.py:2792 msgid "" "Please be sure to fill out server and room fields or remove this bookmark." msgstr "" "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page" -#: ../src/config.py:3074 +#: ../src/config.py:3073 msgid "Invalid username" msgstr "Nom d'utilisateur non valide" -#: ../src/config.py:3076 +#: ../src/config.py:3075 msgid "You must provide a username to configure this account." msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte." -#: ../src/config.py:3102 +#: ../src/config.py:3101 msgid "Duplicate Jabber ID" msgstr "Identifiant Jabber dupliqué" -#: ../src/config.py:3103 +#: ../src/config.py:3102 msgid "This account is already configured in Gajim." msgstr "Ce compte est déjà configuré dans Gajim." -#: ../src/config.py:3120 +#: ../src/config.py:3119 msgid "Account has been added successfully" msgstr "Compte ajouté avec succès" -#: ../src/config.py:3121 ../src/config.py:3308 +#: ../src/config.py:3120 ../src/config.py:3309 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 " @@ -6022,24 +6033,24 @@ "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la " "fenêtre principale." -#: ../src/config.py:3139 +#: ../src/config.py:3138 msgid "Invalid server" msgstr "Serveur invalide" -#: ../src/config.py:3140 +#: ../src/config.py:3139 msgid "Please provide a server on which you want to register." msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer." -#: ../src/config.py:3191 ../src/gajim.py:1990 +#: ../src/config.py:3190 ../src/gajim.py:1990 msgid "Certificate Already in File" msgstr "Certificat déjà dans un Fichier" -#: ../src/config.py:3192 ../src/gajim.py:1991 +#: ../src/config.py:3191 ../src/gajim.py:1991 #, python-format msgid "This certificate is already in file %s, so it's not added again." msgstr "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté." -#: ../src/config.py:3260 +#: ../src/config.py:3259 #, python-format msgid "" "Security Warning\n" @@ -6054,7 +6065,7 @@ "Erreur SSL %(error)s\n" "Voulez vous toujours vous connecter au serveur ?" -#: ../src/config.py:3266 ../src/gajim.py:2014 +#: ../src/config.py:3265 ../src/gajim.py:2014 #, python-format msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -6065,19 +6076,19 @@ "Empreinte digitale SHA1 du certificat :\n" "%s" -#: ../src/config.py:3287 ../src/config.py:3326 +#: ../src/config.py:3288 ../src/config.py:3327 msgid "An error occurred during account creation" msgstr "Une erreur est survenue lors de la création du compte" -#: ../src/config.py:3307 +#: ../src/config.py:3308 msgid "Your new account has been created successfully" msgstr "Votre nouveau compte a été créé avec succès" -#: ../src/config.py:3410 +#: ../src/config.py:3411 msgid "Account name is in use" msgstr "Le nom du compte est utilisé" -#: ../src/config.py:3411 +#: ../src/config.py:3412 msgid "You already have an account using this name." msgstr "Vous avez déjà un compte avec ce nom." @@ -6695,7 +6706,7 @@ "\n" "This session's Short Authentication String is %(sas)s." msgstr "" -"Votre conversation avec %(jid)s est cryptée.\n" +"Votre conversation avec %(jid)s est chiffrée.\n" "\n" "La Short Authentication String (SAS) de cette session est %(sas)s." @@ -6703,15 +6714,15 @@ msgid "You have already verified this contact's identity." msgstr "Vous avez déjà vérifié l'identité de ce contact." -#: ../src/dialogs.py:3830 +#: ../src/dialogs.py:3831 msgid "Contact's identity verified" msgstr "" -#: ../src/dialogs.py:3832 +#: ../src/dialogs.py:3839 msgid "Verify again..." msgstr "" -#: ../src/dialogs.py:3837 +#: ../src/dialogs.py:3844 #, fuzzy msgid "" "To be certain that only the expected person can read your messages or " @@ -6721,20 +6732,20 @@ "Afin d'être certain que seule la personne prévue puisse lire vos messages et " "vous en envoyer, vous devez vérifier leur identité." -#: ../src/dialogs.py:3839 +#: ../src/dialogs.py:3847 msgid "Contact's identity NOT verified" msgstr "" -#: ../src/dialogs.py:3840 +#: ../src/dialogs.py:3854 #, fuzzy msgid "Verify..." msgstr "Vérifier" -#: ../src/dialogs.py:3852 +#: ../src/dialogs.py:3866 msgid "Have you verified the contact's identity?" msgstr "Avez-vous vérifié l'identité du contact ?" -#: ../src/dialogs.py:3853 +#: ../src/dialogs.py:3867 #, fuzzy, python-format msgid "" "To prevent talking to an unknown person, you should speak to %(jid)s " @@ -6749,37 +6760,37 @@ "\n" "La Short Authentication String de cette session est : %(sas)s." -#: ../src/dialogs.py:3854 +#: ../src/dialogs.py:3868 msgid "Did you talk to the remote contact and verify the SAS?" msgstr "Avec vous parlé au contact et vérifié la SAS ?" -#: ../src/disco.py:115 +#: ../src/disco.py:116 msgid "Others" msgstr "Autres" #. conference is a category for listing mostly groupchats in service discovery -#: ../src/disco.py:119 +#: ../src/disco.py:120 msgid "Conference" msgstr "Conférences" -#: ../src/disco.py:439 +#: ../src/disco.py:440 msgid "Without a connection, you can not browse available services" msgstr "Vous devez être connecté pour parcourir les services disponibles" -#: ../src/disco.py:513 +#: ../src/disco.py:514 #, python-format msgid "Service Discovery using account %s" msgstr "Gestion des Services du compte %s" -#: ../src/disco.py:515 +#: ../src/disco.py:516 msgid "Service Discovery" msgstr "Gestion des Services" -#: ../src/disco.py:655 +#: ../src/disco.py:656 msgid "The service could not be found" msgstr "Le service n'a pu être trouvé" -#: ../src/disco.py:656 +#: ../src/disco.py:657 msgid "" "There is no service at the address you entered, or it is not responding. " "Check the address and try again." @@ -6787,73 +6798,78 @@ "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. " "Veuillez vérifier l'adresse et réessayer." -#: ../src/disco.py:660 ../src/disco.py:942 +#: ../src/disco.py:661 ../src/disco.py:955 msgid "The service is not browsable" msgstr "Le service ne peut pas être parcouru" -#: ../src/disco.py:661 +#: ../src/disco.py:662 msgid "This type of service does not contain any items to browse." msgstr "Ce type de service ne contient pas d'élément à parcourir." -#: ../src/disco.py:741 +#: ../src/disco.py:699 ../src/disco.py:709 +#, fuzzy +msgid "Invalid Server Name" +msgstr "Serveur invalide" + +#: ../src/disco.py:754 #, python-format msgid "Browsing %(address)s using account %(account)s" msgstr "Parcourt %(address)s en utilisant le compte %(account)s" -#: ../src/disco.py:781 +#: ../src/disco.py:794 msgid "_Browse" msgstr "_Parcourir" -#: ../src/disco.py:943 +#: ../src/disco.py:956 msgid "This service does not contain any items to browse." msgstr "Ce service ne contient aucun élément à parcourir." -#: ../src/disco.py:1166 +#: ../src/disco.py:1179 msgid "_Execute Command" msgstr "_Exécuter une commande" -#: ../src/disco.py:1176 ../src/disco.py:1340 +#: ../src/disco.py:1189 ../src/disco.py:1353 msgid "Re_gister" msgstr "_Souscrire" -#: ../src/disco.py:1377 +#: ../src/disco.py:1390 #, python-format msgid "Scanning %(current)d / %(total)d.." msgstr "Scanne %(current)d / %(total)d.." #. Users column -#: ../src/disco.py:1559 +#: ../src/disco.py:1572 msgid "Users" msgstr "Utilisateurs" # ccount). Description column #. Description column -#: ../src/disco.py:1567 +#: ../src/disco.py:1580 msgid "Description" msgstr "Description" #. Id column -#: ../src/disco.py:1575 +#: ../src/disco.py:1588 msgid "Id" msgstr "Id" -#: ../src/disco.py:1805 +#: ../src/disco.py:1818 msgid "Subscribed" msgstr "Inscrit" -#: ../src/disco.py:1813 +#: ../src/disco.py:1826 msgid "Node" msgstr "Nœud" -#: ../src/disco.py:1870 +#: ../src/disco.py:1883 msgid "New post" msgstr "Nouvel article" -#: ../src/disco.py:1876 +#: ../src/disco.py:1889 msgid "_Subscribe" msgstr "_Ajouter" -#: ../src/disco.py:1882 +#: ../src/disco.py:1895 msgid "_Unsubscribe" msgstr "_Désinscrire" @@ -7586,12 +7602,12 @@ "Unable to decrypt message from %s\n" "It may have been tampered with." msgstr "" -"Impossible de décrypter le message de %s\n" +"Impossible de déchiffrer le message de %s\n" "Il a peut-être été manipulé." #: ../src/gajim.py:1825 msgid "Unable to decrypt message" -msgstr "Impossible de décrypter le message" +msgstr "Impossible de déchiffrer le message" #: ../src/gajim.py:1895 msgid "Username Conflict" @@ -7677,7 +7693,7 @@ "sure you want to do that?" msgstr "" "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-" -"cryptée. Êtes vous sûr de vouloir le faire ?" +"chiffrée. Êtes vous sûr de vouloir le faire ?" #: ../src/gajim.py:2058 ../src/gajim.py:2088 msgid "Yes, I really want to connect insecurely" @@ -9079,7 +9095,7 @@ msgstr "Tout _maximiser" #. Send Group Message -#: ../src/roster_window.py:5024 ../src/roster_window.py:5546 +#: ../src/roster_window.py:5024 ../src/roster_window.py:5549 msgid "Send Group M_essage" msgstr "_Envoyer un message de groupe" @@ -9096,47 +9112,47 @@ msgstr "Je souhaiterais vous ajouter à ma liste de contacts" #. Manage Transport submenu -#: ../src/roster_window.py:5566 +#: ../src/roster_window.py:5569 msgid "_Manage Contacts" msgstr "_Gérer les Contacts" #. Send single message -#: ../src/roster_window.py:5627 +#: ../src/roster_window.py:5630 msgid "Send Single Message" msgstr "Envoyer un message Simple" #. Manage Transport submenu -#: ../src/roster_window.py:5683 +#: ../src/roster_window.py:5686 msgid "_Manage Transport" msgstr "_Gérer les Passerelles" #. Modify Transport -#: ../src/roster_window.py:5691 +#: ../src/roster_window.py:5694 msgid "_Modify Transport" msgstr "_Modifier la Passerelle" -#: ../src/roster_window.py:5766 +#: ../src/roster_window.py:5769 msgid "_Maximize" msgstr "_Maximiser" -#: ../src/roster_window.py:5773 +#: ../src/roster_window.py:5776 msgid "_Disconnect" msgstr "_Déconnecter" -#: ../src/roster_window.py:5853 +#: ../src/roster_window.py:5856 msgid "_New Group Chat" msgstr "_Nouveau Salon de Discussion" #. History manager -#: ../src/roster_window.py:5966 +#: ../src/roster_window.py:5969 msgid "History Manager" msgstr "Gestionnaire d'historique" -#: ../src/roster_window.py:5975 +#: ../src/roster_window.py:5978 msgid "_Join New Group Chat" msgstr "_Joindre un salon de discussion" -#: ../src/roster_window.py:6185 +#: ../src/roster_window.py:6188 msgid "Change Status Message..." msgstr "Changer le message d'état..." @@ -9379,6 +9395,9 @@ msgid " resource with priority " msgstr " ressource avec la priorité " +#~ msgid "E2E encryption enabled" +#~ msgstr "Chiffrement E2E activé" + #~ msgid "General:" #~ msgstr "Général :" @@ -9484,7 +9503,7 @@ #~ "\n" #~ "Would you like to continue with the encrypted session?" #~ msgstr "" -#~ "Vous avez commencé une session encryptée avec %s, mais il ne peut être " +#~ "Vous avez commencé une session chiffrée avec %s, mais il ne peut être " #~ "garanti que vous êtes en train de discuter avec la personne que vous " #~ "croyez.\n" #~ "\n" @@ -9508,7 +9527,7 @@ #~ "When negotiating an encrypted session, should Gajim prefer to use public " #~ "keys for identification?" #~ msgstr "" -#~ "Durant la négociation d'une session cryptée, Gajim doit-il utiliser de " +#~ "Durant la négociation d'une session chiffrée, Gajim doit-il utiliser de " #~ "préférence une clef publique pour l'identification ?" #~ msgid "" @@ -9532,7 +9551,7 @@ #~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets" #~ msgstr "" -#~ "Gajim a besoin que vous créiez un mot de passe afin de crypter les " +#~ "Gajim a besoin que vous créiez un mot de passe afin de chiffrer les " #~ "secrets stockés" #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)" Modified: branches/osx_newbuildsys/po/pl.po =================================================================== --- branches/osx_newbuildsys/po/pl.po 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/po/pl.po 2008-09-27 12:52:59 UTC (rev 10433) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-28 12:02+0200\n" +"POT-Creation-Date: 2008-09-19 08:18+0200\n" "PO-Revision-Date: 2006-11-08 09:01+0100\n" "Last-Translator: Maciej Chojnacki <maciej.chojnacki(a)gmail.com>\n" "Language-Team: Polish <translation-team-pl(a)lists.sourceforge.net>\n" @@ -292,8 +292,8 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:20 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1030 -#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1040 +#: ../src/common/helpers.py:1052 ../src/notify.py:502 ../src/notify.py:533 #: ../src/notify.py:545 msgid "Gajim" msgstr "Gajim" @@ -306,8 +306,8 @@ #: ../data/glade/preferences_window.glade.h:50 #: ../data/glade/zeroconf_properties_window.glade.h:7 #: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111 -#: ../src/dialogs.py:165 ../src/roster_window.py:2645 -#: ../src/roster_window.py:5125 +#: ../src/dialogs.py:165 ../src/roster_window.py:2657 +#: ../src/roster_window.py:5140 msgid "General" msgstr "Ogólne" @@ -371,8 +371,8 @@ #: ../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:1551 -#: ../src/config.py:2051 +#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1550 +#: ../src/config.py:2050 msgid "No key selected" msgstr "Nie wybrano żadnego klucza" @@ -380,11 +380,11 @@ #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:38 #: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140 -#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464 -#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050 -#: ../src/config.py:3153 ../src/config.py:3221 ../src/dialogs.py:293 -#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2713 -#: ../src/roster_window.py:2719 ../src/roster_window.py:2724 +#: ../src/config.py:1211 ../src/config.py:1458 ../src/config.py:1463 +#: ../src/config.py:1958 ../src/config.py:2036 ../src/config.py:2049 +#: ../src/config.py:3152 ../src/config.py:3220 ../src/dialogs.py:293 +#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2726 +#: ../src/roster_window.py:2732 ../src/roster_window.py:2737 msgid "None" msgstr "Żaden" @@ -469,7 +469,6 @@ #: ../data/glade/account_modification_window.glade.h:43 #: ../data/glade/accounts_window.glade.h:51 -#: ../data/glade/synchronise_contacts_dialog.glade.h:2 #: ../data/glade/synchronise_select_account_dialog.glade.h:2 msgid "Synchronise contacts" msgstr "Synchronizuj kontakty" @@ -564,7 +563,7 @@ msgstr "_Połącz konta" #. Rename -#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5076 +#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5091 msgid "Re_name" msgstr "_Zmień nazwę" @@ -783,7 +782,7 @@ msgstr "Dowolny status" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:102 ../src/common/helpers.py:277 +#: ../src/common/commands.py:102 ../src/common/helpers.py:287 msgid "Away" msgstr "Zaraz wracam" @@ -800,7 +799,7 @@ msgstr "rozmawiam " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:287 +#: ../src/common/helpers.py:297 msgid "Invisible" msgstr "Niewidoczny" @@ -809,7 +808,7 @@ msgstr "Wykonaj komendę" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:260 +#: ../src/common/helpers.py:270 msgid "Not Available" msgstr "Nieobecny" @@ -988,7 +987,7 @@ msgstr "Dołącz do _pokoju" #: ../data/glade/chat_context_menu.glade.h:2 -#: ../data/glade/roster_contact_context_menu.glade.h:12 +#: ../data/glade/roster_contact_context_menu.glade.h:13 msgid "_Add to Roster..." msgstr "Dod_aj do listy kontaktów..." @@ -1040,10 +1039,10 @@ #: ../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_contact_context_menu.glade.h:17 #: ../data/glade/roster_window.glade.h:20 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5756 +#: ../src/roster_window.py:5787 msgid "_History" msgstr "_Historia" @@ -1316,7 +1315,7 @@ msgid "Create new post" msgstr "Utwórz nowy wpis" -#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302 +#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:312 msgid "From" msgstr "Od" @@ -1395,7 +1394,7 @@ msgid "_Log conversation history" msgstr "_Zapisuj historię rozmowy" -#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1690 +#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1689 msgid "Join Group Chat" msgstr "Dołącz do pokoju" @@ -1422,8 +1421,8 @@ msgid "Room:" msgstr "Pokój:" -#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182 -#: ../src/disco.py:1603 +#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197 +#: ../src/disco.py:1618 msgid "_Join" msgstr "_Dołącz" @@ -1517,19 +1516,19 @@ #: ../data/glade/message_window.glade.h:2 msgid "Bookmark this room (Ctrl+B)" -msgstr "" +msgstr "Dodaj pokój do zakładek (Ctrl+B)" #: ../data/glade/message_window.glade.h:3 msgid "Browse the chat history (Ctrl+H)" -msgstr "" +msgstr "Historia wiadomości (Ctrl+H)" #: ../data/glade/message_window.glade.h:4 msgid "Change the room's subject (Ctrl+T)" -msgstr "" +msgstr "Zmień temat pokoju (Ctrl+T)" #: ../data/glade/message_window.glade.h:5 msgid "Change your nickname (Ctrl+N)" -msgstr "" +msgstr "Zmień swoją nazwę (Ctrl+N)" #: ../data/glade/message_window.glade.h:6 msgid "Invite contacts to the conversation (Ctrl+G)" @@ -1697,9 +1696,8 @@ "Oddzielne okno rostera, rozmowy grupowane według typu" #: ../data/glade/preferences_window.glade.h:40 -#, fuzzy msgid "Display _activity of contacts in roster" -msgstr "Wyświetlaj awatary kontaktów z listy" +msgstr "Wyświetlaj aktywność kontaktów z listy" #: ../data/glade/preferences_window.glade.h:41 msgid "Display _extra email details" @@ -1804,12 +1802,11 @@ "jego nazwą na liście kontaktów" #: ../data/glade/preferences_window.glade.h:58 -#, fuzzy msgid "" "If checked, Gajim will display the activity of contacts in the roster window" msgstr "" -"Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy " -"kontaktów (roster oraz okno czatu)" +"Zaznaczenie tej opcji spowoduje wyświetlanie aktywności kontaktów z listy " +"kontaktów" #: ../data/glade/preferences_window.glade.h:59 msgid "" @@ -2132,7 +2129,7 @@ msgid "Order:" msgstr "Kolejność:" -#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2559 +#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2558 msgid "Privacy List" msgstr "Lista prywatności" @@ -2336,10 +2333,8 @@ #. Remove group #. Remove -#: ../data/glade/remove_account_window.glade.h:4 -#: ../data/glade/roster_contact_context_menu.glade.h:19 -#: ../src/roster_window.py:5113 ../src/roster_window.py:5574 -#: ../src/roster_window.py:5703 +#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5128 +#: ../src/roster_window.py:5605 ../src/roster_window.py:5734 msgid "_Remove" msgstr "_Usuń" @@ -2361,59 +2356,64 @@ #. Execute Command #: ../data/glade/roster_contact_context_menu.glade.h:5 -#: ../src/roster_window.py:5646 +#: ../src/roster_window.py:5677 msgid "Execute Command..." msgstr "Wykonaj komendę..." #. Invite to #. Invite to Groupchat #: ../data/glade/roster_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5031 ../src/roster_window.py:5527 +#: ../src/roster_window.py:5046 ../src/roster_window.py:5558 msgid "In_vite to" msgstr "_Zaproś do" +#: ../data/glade/roster_contact_context_menu.glade.h:7 +#, fuzzy +msgid "Remo_ve" +msgstr "_Usuń" + #. Send Custom Status -#: ../data/glade/roster_contact_context_menu.glade.h:7 -#: ../src/roster_window.py:5041 ../src/roster_window.py:5612 +#: ../data/glade/roster_contact_context_menu.glade.h:8 +#: ../src/roster_window.py:5056 ../src/roster_window.py:5643 msgid "Send Cus_tom Status" msgstr "Wyślij odrębny status" -#: ../data/glade/roster_contact_context_menu.glade.h:8 +#: ../data/glade/roster_contact_context_menu.glade.h:9 msgid "Send Single _Message..." msgstr "Wyślij _wiadomość..." -#: ../data/glade/roster_contact_context_menu.glade.h:9 +#: ../data/glade/roster_contact_context_menu.glade.h:10 msgid "Send _File..." msgstr "Wyślij _plik..." -#: ../data/glade/roster_contact_context_menu.glade.h:10 +#: ../data/glade/roster_contact_context_menu.glade.h:11 msgid "Set Custom _Avatar..." msgstr "Ustaw własny _avatar..." -#: ../data/glade/roster_contact_context_menu.glade.h:11 +#: ../data/glade/roster_contact_context_menu.glade.h:12 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5 msgid "Start _Chat" msgstr "Rozpocznij _rozmowę" -#: ../data/glade/roster_contact_context_menu.glade.h:13 +#: ../data/glade/roster_contact_context_menu.glade.h:14 msgid "_Allow him/her to see my status" msgstr "_Pozwól mu/jej widzieć swój status" -#: ../data/glade/roster_contact_context_menu.glade.h:14 -#: ../src/roster_window.py:5104 ../src/roster_window.py:5564 -#: ../src/roster_window.py:5693 +#: ../data/glade/roster_contact_context_menu.glade.h:15 +#: ../src/roster_window.py:5119 ../src/roster_window.py:5595 +#: ../src/roster_window.py:5724 msgid "_Block" msgstr "_Zablokuj" -#: ../data/glade/roster_contact_context_menu.glade.h:15 +#: ../data/glade/roster_contact_context_menu.glade.h:16 msgid "_Forbid him/her to see my status" msgstr "_Zabroń mu/jej widzieć twój status" -#: ../data/glade/roster_contact_context_menu.glade.h:17 +#: ../data/glade/roster_contact_context_menu.glade.h:18 msgid "_Ignore" -msgstr "" +msgstr "Ignoruj" -#: ../data/glade/roster_contact_context_menu.glade.h:18 +#: ../data/glade/roster_contact_context_menu.glade.h:19 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7 msgid "_Manage Contact" msgstr "_Modyfikuj dane kontaktu" @@ -2427,8 +2427,8 @@ msgstr "_Autoryzacja" #: ../data/glade/roster_contact_context_menu.glade.h:22 -#: ../src/roster_window.py:5098 ../src/roster_window.py:5558 -#: ../src/roster_window.py:5690 +#: ../src/roster_window.py:5113 ../src/roster_window.py:5589 +#: ../src/roster_window.py:5721 msgid "_Unblock" msgstr "_Cofnij blokadę" @@ -2486,7 +2486,7 @@ msgid "_Contents" msgstr "_Zawartość" -#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336 +#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351 msgid "_Edit" msgstr "_Edycja" @@ -2527,11 +2527,11 @@ msgstr "Dodaj _kontakt" #. Information -#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5715 +#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5746 msgid "_Information" msgstr "Informacje o kontakcie" -#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194 +#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209 msgid "_Search" msgstr "_Szukaj" @@ -2619,10 +2619,6 @@ msgid "_Deny" msgstr "O_dmów" -#: ../data/glade/synchronise_contacts_dialog.glade.h:1 -msgid "Select the account with which to synchronise" -msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty" - #: ../data/glade/synchronise_select_account_dialog.glade.h:1 msgid "Select the account with which you want to synchronise" msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty" @@ -2750,13 +2746,13 @@ #. Edit Groups #: ../data/glade/zeroconf_contact_context_menu.glade.h:3 -#: ../src/roster_window.py:5547 +#: ../src/roster_window.py:5578 msgid "Edit _Groups" msgstr "Modyfikuj _grupy" #. Rename #: ../data/glade/zeroconf_contact_context_menu.glade.h:8 -#: ../src/roster_window.py:5673 +#: ../src/roster_window.py:5704 msgid "_Rename" msgstr "_Zmień nazwę" @@ -2971,35 +2967,36 @@ msgid "Your message can not be sent until you are connected." msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony." -#: ../src/chat_control.py:1142 ../src/chat_control.py:1529 +#: ../src/chat_control.py:1147 ../src/chat_control.py:1535 msgid "GPG encryption enabled" msgstr "Szyfrowanie GPG włączone" #. Add to roster #. add_to_roster_menuitem -#: ../src/chat_control.py:1164 ../src/chat_control.py:2010 +#: ../src/chat_control.py:1169 ../src/chat_control.py:2030 #: ../src/common/contacts.py:113 ../src/common/helpers.py:75 -#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843 -#: ../src/dialogs.py:896 ../src/gajim.py:1623 ../src/roster_window.py:926 -#: ../src/roster_window.py:1527 ../src/roster_window.py:1529 -#: ../src/roster_window.py:1869 ../src/roster_window.py:5218 -#: ../src/roster_window.py:5396 +#: ../src/common/helpers.py:299 ../src/conversation_textview.py:844 +#: ../src/dialogs.py:895 ../src/gajim.py:1626 ../src/roster_window.py:925 +#: ../src/roster_window.py:1525 ../src/roster_window.py:1527 +#: ../src/roster_window.py:1869 ../src/roster_window.py:3095 +#: ../src/roster_window.py:3119 ../src/roster_window.py:5240 +#: ../src/roster_window.py:5424 msgid "Not in Roster" msgstr "spoza listy kontaktów" -#: ../src/chat_control.py:1293 ../src/tooltips.py:629 +#: ../src/chat_control.py:1298 ../src/tooltips.py:629 msgid "Unknown Artist" msgstr "Nieznany wykonawca" -#: ../src/chat_control.py:1295 ../src/tooltips.py:634 +#: ../src/chat_control.py:1300 ../src/tooltips.py:634 msgid "Unknown Title" msgstr "Nieznany tytuł" -#: ../src/chat_control.py:1297 ../src/tooltips.py:639 +#: ../src/chat_control.py:1302 ../src/tooltips.py:639 msgid "Unknown Source" msgstr "Nieznany album" -#: ../src/chat_control.py:1301 ../src/tooltips.py:641 +#: ../src/chat_control.py:1306 ../src/tooltips.py:641 #, fuzzy, python-format msgid "" "\"%(title)s\" by %(artist)s\n" @@ -3008,90 +3005,88 @@ "\"%(title)s\" w wykonaniu %(artist)s\n" "z %(source)s" -#: ../src/chat_control.py:1306 +#: ../src/chat_control.py:1311 #, fuzzy, python-format msgid "" "%(title)s by %(artist)s\n" "from %(source)s" msgstr "\"%(title)s\" w wykonaniu %(artist)s" -#: ../src/chat_control.py:1430 +#: ../src/chat_control.py:1435 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s z pokoju %(room_name)s" -#: ../src/chat_control.py:1519 +#: ../src/chat_control.py:1525 msgid "GPG encryption disabled" msgstr "Szyfrowanie GPG wyłączone" -#: ../src/chat_control.py:1537 ../src/chat_control.py:1794 +#: ../src/chat_control.py:1550 +msgid "Session WILL be logged" +msgstr "Sesja BĘDZIE logowana" + +#: ../src/chat_control.py:1552 msgid "Session WILL NOT be logged" msgstr "Sesja NIE BĘDZIE logowana" -#: ../src/chat_control.py:1539 ../src/chat_control.py:1792 -msgid "Session WILL be logged" -msgstr "Sesja BĘDZIE logowana" - #. encryption %s active -#: ../src/chat_control.py:1557 +#: ../src/chat_control.py:1570 msgid "is" msgstr "jest" -#: ../src/chat_control.py:1557 +#: ../src/chat_control.py:1570 msgid "is NOT" msgstr "NIE jest" #. chat session %s be logged -#: ../src/chat_control.py:1559 +#: ../src/chat_control.py:1572 msgid "will" -msgstr "" +msgstr "będzie" -#: ../src/chat_control.py:1559 +#: ../src/chat_control.py:1572 msgid "will NOT" -msgstr "" +msgstr "NIE będzie" #. About encrypted chat session -#: ../src/chat_control.py:1563 -#, fuzzy +#: ../src/chat_control.py:1576 msgid "and authenticated" -msgstr "Używaj autoryzacji" +msgstr "oraz autoryzowana" #. About encrypted chat session -#: ../src/chat_control.py:1567 -#, fuzzy +#: ../src/chat_control.py:1580 msgid "and NOT authenticated" -msgstr "Używaj autoryzacji" +msgstr "oraz NIE autoryzowana" #. status will become 'is' or 'is not', authentificaed will become #. 'and authentificated' or 'and not authentificated', logged will become #. 'will' or 'will not' -#: ../src/chat_control.py:1573 +#: ../src/chat_control.py:1586 #, python-format msgid "" "%(type)s encryption %(status)s active %(authenticated)s.\n" "Your chat session %(logged)s be logged." msgstr "" -#: ../src/chat_control.py:1619 +#: ../src/chat_control.py:1632 msgid "Command not supported for zeroconf account." msgstr "" -#: ../src/chat_control.py:1630 ../src/groupchat_control.py:1524 +#: ../src/chat_control.py:1643 ../src/groupchat_control.py:1575 #, python-format msgid "Commands: %s" msgstr "Polecenia: %s" -#: ../src/chat_control.py:1633 ../src/groupchat_control.py:1538 +#: ../src/chat_control.py:1646 ../src/groupchat_control.py:1589 #, python-format msgid "Usage: /%s, clears the text window." msgstr "Użycie: /%s czyście okno tekstowe." -#: ../src/chat_control.py:1636 ../src/groupchat_control.py:1543 +#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1594 #, python-format msgid "Usage: /%s, hide the chat buttons." msgstr "Użycie: /%s ukrywa przyciski czatu." -#: ../src/chat_control.py:1639 ../src/groupchat_control.py:1559 +#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1610 #, fuzzy, python-format msgid "" "Usage: /%(command)s <action>, sends action to the current group chat. Use " @@ -3100,30 +3095,41 @@ "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w " "trzeciej osobie (np. /%s eksploduje.)" -#: ../src/chat_control.py:1644 +#: ../src/chat_control.py:1657 #, python-format msgid "Usage: /%s, sends a ping to the contact" msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu" -#: ../src/chat_control.py:1647 +#: ../src/chat_control.py:1660 #, python-format msgid "Usage: /%s, send the message to the contact" msgstr "Użycie: /%s wysyła wiadomość do kontaktu" -#: ../src/chat_control.py:1650 ../src/groupchat_control.py:1582 +#: ../src/chat_control.py:1663 ../src/groupchat_control.py:1633 #, python-format msgid "No help info for /%s" msgstr "Brak informacji o pomocy dla /%s" -#: ../src/chat_control.py:1781 +#: ../src/chat_control.py:1794 msgid "Session negotiation cancelled" msgstr "Negocjowanie sesji zostało przerwane" -#: ../src/chat_control.py:1788 -msgid "E2E encryption enabled" -msgstr "Szyfrowanie E2E włączone" +#: ../src/chat_control.py:1801 +#, fuzzy +msgid "This session is encrypted" +msgstr "[Ta wiadomość jest zaszyfrowana]" -#: ../src/chat_control.py:1799 +#: ../src/chat_control.py:1804 +#, fuzzy +msgid " and WILL be logged" +msgstr "Sesja BĘDZIE logowana" + +#: ../src/chat_control.py:1806 +#, fuzzy +msgid " and WILL NOT be logged" +msgstr "Sesja NIE BĘDZIE logowana" + +#: ../src/chat_control.py:1811 msgid "" "Remote contact's identity not verified. Click the shield button for more " "details." @@ -3131,25 +3137,25 @@ "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk " "tarczy po więcej szczegółów." -#: ../src/chat_control.py:1801 +#: ../src/chat_control.py:1813 msgid "E2E encryption disabled" msgstr "Szyfrowanie E2E wyłączone" -#: ../src/chat_control.py:1830 ../src/chat_control.py:1841 +#: ../src/chat_control.py:1842 ../src/chat_control.py:1855 msgid "The following message was NOT encrypted" -msgstr "Ta wiadomość NIE została jest zaszyfrowana" +msgstr "Ta wiadomość NIE została zaszyfrowana" -#: ../src/chat_control.py:1836 +#: ../src/chat_control.py:1848 msgid "The following message was encrypted" msgstr "Ta wiadomość została zaszyfrowana" #. %s is being replaced in the code with JID -#: ../src/chat_control.py:2189 +#: ../src/chat_control.py:2209 #, python-format msgid "You just received a new message from \"%s\"" msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\"" -#: ../src/chat_control.py:2190 +#: ../src/chat_control.py:2210 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." @@ -3157,18 +3163,18 @@ "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to " "utracisz tę wiadomość." -#: ../src/chat_control.py:2341 ../src/gajim.py:170 +#: ../src/chat_control.py:2361 ../src/gajim.py:170 msgid "Database Error" msgstr "Błąd bazy danych" -#: ../src/chat_control.py:2342 ../src/gajim.py:171 +#: ../src/chat_control.py:2362 ../src/gajim.py:171 #, python-format msgid "" "The database file (%s) cannot be read. Try to repair it or remove it (all " "history will be lost)." msgstr "" -#: ../src/chat_control.py:2574 +#: ../src/chat_control.py:2594 #, fuzzy, python-format msgid "%(name)s is now %(status)s" msgstr "%(nick)s ma teraz status %(status)s" @@ -3258,8 +3264,8 @@ #. Make special context menu if group is Groupchats #: ../src/common/commands.py:205 ../src/common/contacts.py:94 #: ../src/common/contacts.py:126 ../src/common/helpers.py:75 -#: ../src/roster_window.py:794 ../src/roster_window.py:1531 -#: ../src/roster_window.py:1533 ../src/roster_window.py:5001 +#: ../src/roster_window.py:793 ../src/roster_window.py:1529 +#: ../src/roster_window.py:1531 ../src/roster_window.py:5016 msgid "Groupchats" msgstr "Pokoje" @@ -3315,7 +3321,7 @@ #. sorted alphanum #: ../src/common/config.py:112 ../src/common/config.py:448 #: ../src/common/optparser.py:220 ../src/common/optparser.py:438 -#: ../src/common/optparser.py:472 ../src/gajim.py:3091 +#: ../src/common/optparser.py:472 ../src/gajim.py:3092 msgid "default" msgstr "domyślny" @@ -4032,7 +4038,7 @@ msgid "I'm free for chat." msgstr "Chętny do rozmowy." -#: ../src/common/config.py:427 ../src/config.py:1391 +#: ../src/common/config.py:427 ../src/config.py:1390 msgid "Be right back." msgstr "Zaraz wracam." @@ -4082,121 +4088,110 @@ msgid "Unable to load idle module" msgstr "Nie można załadować modułu idle" -#: ../src/common/connection_handlers.py:229 +#: ../src/common/connection_handlers.py:233 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:93 msgid "Wrong host" msgstr "Błędna nazwa hosta" -#: ../src/common/connection_handlers.py:230 +#: ../src/common/connection_handlers.py:234 msgid "Invalid local address? :-O" msgstr "Niepoprawny adres lokalny? :-O" -#: ../src/common/connection_handlers.py:631 +#: ../src/common/connection_handlers.py:639 #, python-format msgid "Registration information for transport %s has not arrived in time" msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas" -#: ../src/common/connection_handlers.py:917 -#: ../src/common/connection_handlers.py:1814 -#: ../src/common/connection_handlers.py:1861 -#: ../src/common/connection_handlers.py:2044 -#: ../src/common/connection_handlers.py:2163 ../src/common/connection.py:1203 +#: ../src/common/connection_handlers.py:926 +#: ../src/common/connection_handlers.py:1836 +#: ../src/common/connection_handlers.py:1876 +#: ../src/common/connection_handlers.py:2052 +#: ../src/common/connection_handlers.py:2171 ../src/common/connection.py:1211 #: ../src/gajim.py:392 msgid "Disk Write Error" msgstr "Błąd zapisu na dysk" -#: ../src/common/connection_handlers.py:1120 ../src/common/connection.py:840 +#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850 msgid "Invisibility not supported" msgstr "Niewidoczność nie jest obsługiwana" -#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:841 +#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:851 #, python-format msgid "Account %s doesn't support invisibility." msgstr "Konto %s nie obsługuje niewidoczności." -#: ../src/common/connection_handlers.py:1930 +#: ../src/common/connection_handlers.py:1945 #, python-format msgid "Nickname not allowed: %s" msgstr "Pseudonim jest niedozwolony: %s" #. we are banned #. group chat does not exist -#: ../src/common/connection_handlers.py:2001 -#: ../src/common/connection_handlers.py:2004 -#: ../src/common/connection_handlers.py:2007 -#: ../src/common/connection_handlers.py:2010 +#. user may close the window before we are here #: ../src/common/connection_handlers.py:2014 +#: ../src/common/connection_handlers.py:2017 +#: ../src/common/connection_handlers.py:2020 #: ../src/common/connection_handlers.py:2023 +#: ../src/common/connection_handlers.py:2027 ../src/gajim.py:546 msgid "Unable to join group chat" msgstr "Nie można dołączyć do pokoju" -#: ../src/common/connection_handlers.py:2002 +#: ../src/common/connection_handlers.py:2015 #, python-format msgid "You are banned from group chat %s." msgstr "Zostałeś zabanowany w pokoju %s." -#: ../src/common/connection_handlers.py:2005 +#: ../src/common/connection_handlers.py:2018 #, python-format msgid "Group chat %s does not exist." msgstr "Pokój %s nie istnieje." -#: ../src/common/connection_handlers.py:2008 +#: ../src/common/connection_handlers.py:2021 msgid "Group chat creation is restricted." msgstr "Tworzenie pokoi jest ograniczone." -#: ../src/common/connection_handlers.py:2011 +#: ../src/common/connection_handlers.py:2024 #, python-format msgid "Your registered nickname must be used in group chat %s." msgstr "Twój pseudonim musi być używany w pokoju %s." -#: ../src/common/connection_handlers.py:2015 +#: ../src/common/connection_handlers.py:2028 #, python-format msgid "You are not in the members list in groupchat %s." msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s." -#: ../src/common/connection_handlers.py:2024 -#, 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 "" -"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś " -"innego w pokoju %s.\n" -"Podaj inny pseudonim:" - #. Room has been destroyed. see #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom -#: ../src/common/connection_handlers.py:2055 +#: ../src/common/connection_handlers.py:2063 msgid "Room has been destroyed" msgstr "Pokój został usunięty" -#: ../src/common/connection_handlers.py:2062 +#: ../src/common/connection_handlers.py:2070 #, python-format msgid "You can join this room instead: %s" msgstr "W zamian możesz dołączyć do pokoju %s" -#: ../src/common/connection_handlers.py:2089 +#: ../src/common/connection_handlers.py:2097 msgid "I would like to add you to my roster." msgstr "Chciałbym dodać Cię do listy kontaktów." #. BE CAREFUL: no con.updateRosterItem() in a callback -#: ../src/common/connection_handlers.py:2110 +#: ../src/common/connection_handlers.py:2118 #, python-format msgid "we are now subscribed to %s" msgstr "Zapisaliśmy się do %s" -#: ../src/common/connection_handlers.py:2112 +#: ../src/common/connection_handlers.py:2120 #, python-format msgid "unsubscribe request from %s" msgstr "Prośba o cofnięcie autoryzacji od %s" -#: ../src/common/connection_handlers.py:2114 +#: ../src/common/connection_handlers.py:2122 #, python-format msgid "we are now unsubscribed from %s" msgstr "Wypisaliśmy się z %s" -#: ../src/common/connection_handlers.py:2278 +#: ../src/common/connection_handlers.py:2290 #, python-format msgid "" "JID %s is not RFC compliant. It will not be added to your roster. Use roster " @@ -4207,13 +4202,13 @@ "jabberstudio.org/ aby go usunąć" #. We didn't set a passphrase -#: ../src/common/connection_handlers.py:2303 +#: ../src/common/connection_handlers.py:2315 #: ../src/common/zeroconf/connection_zeroconf.py:172 msgid "OpenPGP passphrase was not given" msgstr "Nie podano klucza OpenPGP" #. %s is the account name here -#: ../src/common/connection_handlers.py:2305 +#: ../src/common/connection_handlers.py:2317 #: ../src/common/zeroconf/connection_zeroconf.py:174 #: ../src/roster_window.py:1920 ../src/roster_window.py:1940 #, python-format @@ -4388,23 +4383,33 @@ msgid "Connection to proxy failed" msgstr "Połączenie z proxy nie powiodło się" -#: ../src/common/connection.py:612 ../src/common/connection.py:703 -#: ../src/common/connection.py:1332 +#: ../src/common/connection.py:612 ../src/common/connection.py:713 +#: ../src/common/connection.py:1340 #: ../src/common/zeroconf/connection_zeroconf.py:248 #, python-format msgid "Could not connect to \"%s\"" msgstr "Nie można połączyć się z \"%s\"" -#: ../src/common/connection.py:613 ../src/gajim.py:1040 +#: ../src/common/connection.py:613 ../src/gajim.py:1042 msgid "Check your connection or try again later." msgstr "Sprawdź swoje połączenie lub spróbuj później." -#: ../src/common/connection.py:660 +#: ../src/common/connection.py:645 ../src/common/connection.py:693 +#, fuzzy, python-format +msgid "Could not connect to account %s" +msgstr "Nie można połączyć się z \"%s\"" + +#: ../src/common/connection.py:646 ../src/common/connection.py:694 +#, fuzzy, python-format +msgid "Connection with account %s has been lost. Retry connecting." +msgstr "Połączenie z kontem \"%s\"zostało zerwane." + +#: ../src/common/connection.py:668 #, python-format msgid "The authenticity of the %s certificate could be invalid." msgstr "Nie można potwierdzić autentyczności certyfikatu %s." -#: ../src/common/connection.py:663 +#: ../src/common/connection.py:671 #, python-format msgid "" "\n" @@ -4413,7 +4418,7 @@ "\n" "Błąd SSL: %s" -#: ../src/common/connection.py:665 +#: ../src/common/connection.py:673 #, python-format msgid "" "\n" @@ -4422,24 +4427,24 @@ "\n" "Nieznany błąd SSL: %d" -#: ../src/common/connection.py:704 +#: ../src/common/connection.py:714 msgid "Check your connection or try again later" msgstr "Sprawdź swoje połączenie lub spróbuj później" -#: ../src/common/connection.py:729 +#: ../src/common/connection.py:739 #, python-format msgid "Authentication failed with \"%s\"" msgstr "Autoryzacja z \"%s\" nie powiodła się" -#: ../src/common/connection.py:731 +#: ../src/common/connection.py:741 msgid "Please check your login and password for correctness." msgstr "Spawdź czy twój login i hasło są poprawne." -#: ../src/common/connection.py:792 +#: ../src/common/connection.py:802 msgid "Error while removing privacy list" msgstr "Błąd usuwaniu listy prywatności" -#: ../src/common/connection.py:793 +#: ../src/common/connection.py:803 #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " @@ -4448,14 +4453,14 @@ "Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w " "jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie." -#: ../src/common/connection.py:1084 +#: ../src/common/connection.py:1094 #: ../src/common/zeroconf/connection_zeroconf.py:381 msgid "Neither the remote presence is signed, nor a key was assigned." msgstr "" "Komunikat o statusie obecności nie jest podpisany, nie przypisano mu też " "klucza." -#: ../src/common/connection.py:1086 +#: ../src/common/connection.py:1096 #: ../src/common/zeroconf/connection_zeroconf.py:383 #, python-format msgid "The contact's key (%s) does not match the key assigned in Gajim." @@ -4463,11 +4468,11 @@ #. we're not english #. one in locale and one en -#: ../src/common/connection.py:1095 +#: ../src/common/connection.py:1105 msgid "[This message is *encrypted* (See :XEP:`27`]" msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']" -#: ../src/common/connection.py:1193 +#: ../src/common/connection.py:1201 #: ../src/common/zeroconf/connection_zeroconf.py:445 #, fuzzy, python-format msgid "" @@ -4477,7 +4482,7 @@ "Temat: %s\n" "%s" -#: ../src/common/connection.py:1365 +#: ../src/common/connection.py:1373 msgid "Not fetched because of invisible status" msgstr "Nie wysłano z powodu statusu 'niewidoczny'" @@ -4486,10 +4491,10 @@ msgstr "Obserwatorzy" #: ../src/common/contacts.py:96 ../src/common/contacts.py:347 -#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117 -#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828 -#: ../src/roster_window.py:1456 ../src/roster_window.py:1523 -#: ../src/roster_window.py:1525 ../src/roster_window.py:1668 +#: ../src/common/helpers.py:75 ../src/disco.py:117 ../src/disco.py:118 +#: ../src/disco.py:1348 ../src/gajim.py:792 ../src/roster_window.py:827 +#: ../src/roster_window.py:1454 ../src/roster_window.py:1521 +#: ../src/roster_window.py:1523 ../src/roster_window.py:1666 msgid "Transports" msgstr "Transporty" @@ -4684,206 +4689,206 @@ msgid "Weekend!" msgstr "Weekend!" -#: ../src/common/helpers.py:146 +#: ../src/common/helpers.py:156 msgid "Invalid character in username." msgstr "Niepoprawna litera w nazwie użytkownika." -#: ../src/common/helpers.py:151 +#: ../src/common/helpers.py:161 msgid "Server address required." msgstr "Wymagany adres serwera." -#: ../src/common/helpers.py:156 +#: ../src/common/helpers.py:166 msgid "Invalid character in hostname." msgstr "Niepoprawna litera w nazwie hosta." -#: ../src/common/helpers.py:162 +#: ../src/common/helpers.py:172 msgid "Invalid character in resource." msgstr "Niepoprawna litera w zasobach." #. GiB means gibibyte -#: ../src/common/helpers.py:202 +#: ../src/common/helpers.py:212 #, python-format msgid "%s GiB" msgstr "%s GiB" #. GB means gigabyte -#: ../src/common/helpers.py:205 +#: ../src/common/helpers.py:215 #, python-format msgid "%s GB" msgstr "%s GB" #. MiB means mibibyte -#: ../src/common/helpers.py:209 +#: ../src/common/helpers.py:219 #, python-format msgid "%s MiB" msgstr "%s MiB" #. MB means megabyte -#: ../src/common/helpers.py:212 +#: ../src/common/helpers.py:222 #, python-format msgid "%s MB" msgstr "%s MB" #. KiB means kibibyte -#: ../src/common/helpers.py:216 +#: ../src/common/helpers.py:226 #, python-format msgid "%s KiB" msgstr "%s KiB" #. KB means kilo bytes -#: ../src/common/helpers.py:219 +#: ../src/common/helpers.py:229 #, python-format msgid "%s KB" msgstr "%s KB" #. B means bytes -#: ../src/common/helpers.py:222 +#: ../src/common/helpers.py:232 #, python-format msgid "%s B" msgstr "%s B" -#: ../src/common/helpers.py:253 +#: ../src/common/helpers.py:263 msgid "_Busy" msgstr "_Zajęty" -#: ../src/common/helpers.py:255 +#: ../src/common/helpers.py:265 msgid "Busy" msgstr "Zajęty" -#: ../src/common/helpers.py:258 +#: ../src/common/helpers.py:268 msgid "_Not Available" msgstr "Nie_obecny" -#: ../src/common/helpers.py:263 +#: ../src/common/helpers.py:273 msgid "_Free for Chat" msgstr "_Chętny do rozmowy" -#: ../src/common/helpers.py:265 +#: ../src/common/helpers.py:275 msgid "Free for Chat" msgstr "Chętny do rozmowy" -#: ../src/common/helpers.py:268 +#: ../src/common/helpers.py:278 msgid "_Available" msgstr "_Dostępny" -#: ../src/common/helpers.py:270 ../src/features_window.py:121 +#: ../src/common/helpers.py:280 ../src/features_window.py:121 msgid "Available" msgstr "Dostępny" -#: ../src/common/helpers.py:272 +#: ../src/common/helpers.py:282 msgid "Connecting" msgstr "Łączę się" -#: ../src/common/helpers.py:275 +#: ../src/common/helpers.py:285 msgid "A_way" msgstr "Zaraz _wracam" -#: ../src/common/helpers.py:280 +#: ../src/common/helpers.py:290 msgid "_Offline" msgstr "R_ozłączony" -#: ../src/common/helpers.py:282 +#: ../src/common/helpers.py:292 msgid "Offline" msgstr "Rozłączony" -#: ../src/common/helpers.py:285 +#: ../src/common/helpers.py:295 msgid "_Invisible" msgstr "N_iewidoczny" -#: ../src/common/helpers.py:291 +#: ../src/common/helpers.py:301 msgid "?contact has status:Unknown" msgstr "?contact ma status: Nieznany" -#: ../src/common/helpers.py:293 +#: ../src/common/helpers.py:303 msgid "?contact has status:Has errors" msgstr "?contact ma status: Wystąpiły błędy" -#: ../src/common/helpers.py:298 +#: ../src/common/helpers.py:308 msgid "?Subscription we already have:None" msgstr "?Posiadane autoryzacje: Brak" -#: ../src/common/helpers.py:300 +#: ../src/common/helpers.py:310 msgid "To" msgstr "Do" -#: ../src/common/helpers.py:304 +#: ../src/common/helpers.py:314 msgid "Both" msgstr "Obustronna" -#: ../src/common/helpers.py:312 +#: ../src/common/helpers.py:322 msgid "?Ask (for Subscription):None" msgstr "?Poproś (o autoryzację): Brak" -#: ../src/common/helpers.py:314 +#: ../src/common/helpers.py:324 msgid "Subscribe" msgstr "Autoryzuj" -#: ../src/common/helpers.py:323 +#: ../src/common/helpers.py:333 msgid "?Group Chat Contact Role:None" msgstr "?Funkcja kontaktu w pokoju: Brak" -#: ../src/common/helpers.py:326 +#: ../src/common/helpers.py:336 msgid "Moderators" msgstr "Moderatorzy" -#: ../src/common/helpers.py:328 +#: ../src/common/helpers.py:338 msgid "Moderator" msgstr "Moderator" -#: ../src/common/helpers.py:331 +#: ../src/common/helpers.py:341 msgid "Participants" msgstr "Uczestnicy" -#: ../src/common/helpers.py:333 +#: ../src/common/helpers.py:343 msgid "Participant" msgstr "Uczestnik" -#: ../src/common/helpers.py:336 +#: ../src/common/helpers.py:346 msgid "Visitors" msgstr "Goście" -#: ../src/common/helpers.py:338 +#: ../src/common/helpers.py:348 msgid "Visitor" msgstr "Gość" -#: ../src/common/helpers.py:344 +#: ../src/common/helpers.py:354 msgid "?Group Chat Contact Affiliation:None" msgstr "?Powiązanie kontaktu z czata: brak" -#: ../src/common/helpers.py:346 +#: ../src/common/helpers.py:356 msgid "Owner" msgstr "Właściciel" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:358 msgid "Administrator" msgstr "Administrator" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:360 msgid "Member" msgstr "Uczestnik" -#: ../src/common/helpers.py:388 +#: ../src/common/helpers.py:398 msgid "is paying attention to the conversation" msgstr "jest skupiony na rozmowie" -#: ../src/common/helpers.py:390 +#: ../src/common/helpers.py:400 msgid "is doing something else" msgstr "robi coś innego" -#: ../src/common/helpers.py:392 +#: ../src/common/helpers.py:402 msgid "is composing a message..." msgstr "pisze wiadomość..." #. paused means he or she was composing but has stopped for a while -#: ../src/common/helpers.py:395 +#: ../src/common/helpers.py:405 msgid "paused composing a message" msgstr "przerwał pisanie wiadomości" -#: ../src/common/helpers.py:397 +#: ../src/common/helpers.py:407 msgid "has closed the chat window or tab" msgstr "zamknął okno lub kartę rozmowy" -#: ../src/common/helpers.py:979 ../src/common/helpers.py:986 +#: ../src/common/helpers.py:989 ../src/common/helpers.py:996 #, python-format msgid "%d message pending" msgid_plural "%d messages pending" @@ -4891,22 +4896,22 @@ msgstr[1] "%d oczekujące wiadomości" msgstr[2] "%d oczekujących wiadomości" -#: ../src/common/helpers.py:992 +#: ../src/common/helpers.py:1002 #, python-format msgid " from room %s" msgstr " z pokoju %s" -#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014 +#: ../src/common/helpers.py:1005 ../src/common/helpers.py:1024 #, python-format msgid " from user %s" msgstr " od użytkownika %s" -#: ../src/common/helpers.py:997 +#: ../src/common/helpers.py:1007 #, python-format msgid " from %s" msgstr " od %s" -#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011 +#: ../src/common/helpers.py:1014 ../src/common/helpers.py:1021 #, python-format msgid "%d event pending" msgid_plural "%d events pending" @@ -4914,7 +4919,7 @@ msgstr[1] "%d oczekujące wiadomości" msgstr[2] "%d oczekujących wiadomości" -#: ../src/common/helpers.py:1044 +#: ../src/common/helpers.py:1054 #, python-format msgid "Gajim - %s" msgstr "Gajim - %s" @@ -5523,11 +5528,13 @@ "anulowane." #. we're not english -#: ../src/common/stanza_session.py:282 +#: ../src/common/stanza_session.py:274 msgid "" "[This is part of an encrypted session. If you see this message, something " "went wrong.]" msgstr "" +"[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, " +"oznacza to, że coś poszło źle.]" #: ../src/common/zeroconf/client_zeroconf.py:408 msgid "" @@ -5641,7 +5648,7 @@ msgid "Custom" msgstr "Własne" -#: ../src/config.py:643 ../src/dialogs.py:1192 +#: ../src/config.py:643 ../src/dialogs.py:1191 #, python-format msgid "Dictionary for lang %s not available" msgstr "Brak słownika dla tego języka (%s)" @@ -5700,208 +5707,208 @@ msgstr "Nowa poczta na koncie Gmail" #. Name column -#: ../src/config.py:1312 ../src/dialogs.py:1816 ../src/dialogs.py:1880 -#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793 +#: ../src/config.py:1312 ../src/dialogs.py:1815 ../src/dialogs.py:1879 +#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809 #: ../src/history_window.py:86 msgid "Name" msgstr "Nazwa" -#: ../src/config.py:1400 +#: ../src/config.py:1398 msgid "Relogin now?" msgstr "Czy zalogować się ponownie?" -#: ../src/config.py:1401 +#: ../src/config.py:1399 msgid "If you want all the changes to apply instantly, you must relogin." msgstr "" "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz " "zalogować się ponownie." -#: ../src/config.py:1525 ../src/config.py:1624 +#: ../src/config.py:1524 ../src/config.py:1623 msgid "OpenPGP is not usable in this computer" msgstr "Nie można używać OpenPGP na tym komputerze" -#: ../src/config.py:1660 ../src/config.py:1703 +#: ../src/config.py:1659 ../src/config.py:1702 msgid "Unread events" msgstr "Nieprzeczytane wiadomości" -#: ../src/config.py:1661 +#: ../src/config.py:1660 msgid "Read all pending events before removing this account." msgstr "" "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta." -#: ../src/config.py:1687 +#: ../src/config.py:1686 #, python-format msgid "You have opened chat in account %s" msgstr "Masz otwarte okno rozmowy na koncie %s" -#: ../src/config.py:1688 +#: ../src/config.py:1687 msgid "All chat and groupchat windows will be closed. Do you want to continue?" msgstr "" "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?" -#: ../src/config.py:1699 +#: ../src/config.py:1698 msgid "You are currently connected to the server" msgstr "Jesteś połączony z serwerem" -#: ../src/config.py:1700 +#: ../src/config.py:1699 msgid "To change the account name, you must be disconnected." msgstr "Aby zmienić nazwę konta, musisz być rozłączony." -#: ../src/config.py:1704 +#: ../src/config.py:1703 msgid "To change the account name, you must read all pending events." msgstr "" "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości." -#: ../src/config.py:1710 +#: ../src/config.py:1709 msgid "Account Name Already Used" msgstr "Konto o takiej nazwie już istnieje" -#: ../src/config.py:1711 +#: ../src/config.py:1710 msgid "" "This name is already used by another of your accounts. Please choose another " "name." msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną." -#: ../src/config.py:1715 ../src/config.py:1719 +#: ../src/config.py:1714 ../src/config.py:1718 msgid "Invalid account name" msgstr "Niepoprawna nazwa konta" -#: ../src/config.py:1716 +#: ../src/config.py:1715 msgid "Account name cannot be empty." msgstr "Nazwa konta nie może być pusta." -#: ../src/config.py:1720 +#: ../src/config.py:1719 msgid "Account name cannot contain spaces." msgstr "Nazwa konta nie może zawierać spacji." -#: ../src/config.py:1794 +#: ../src/config.py:1793 msgid "Rename Account" msgstr "Zmień nazwę konta" -#: ../src/config.py:1795 +#: ../src/config.py:1794 #, python-format msgid "Enter a new name for account %s" msgstr "Wpisz nową nazwę dla kontaktu %s." -#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864 -#: ../src/config.py:3091 ../src/dataforms_widget.py:536 +#: ../src/config.py:1812 ../src/config.py:1820 ../src/config.py:1863 +#: ../src/config.py:3090 ../src/dataforms_widget.py:536 msgid "Invalid Jabber ID" msgstr "Niepoprawny Jabber ID" -#: ../src/config.py:1822 +#: ../src/config.py:1821 msgid "A Jabber ID must be in the form \"user@servername\"." msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"." -#: ../src/config.py:2012 ../src/config.py:3163 +#: ../src/config.py:2011 ../src/config.py:3162 msgid "Invalid entry" msgstr "Niepoprawny wpis" -#: ../src/config.py:2013 ../src/config.py:3164 +#: ../src/config.py:2012 ../src/config.py:3163 msgid "Custom port must be a port number." msgstr "Wybrany port musi być numerem portu." -#: ../src/config.py:2034 +#: ../src/config.py:2033 msgid "Failed to get secret keys" msgstr "Pobieranie kluczy prywatnych nie powiodło się" -#: ../src/config.py:2035 +#: ../src/config.py:2034 msgid "There was a problem retrieving your OpenPGP secret keys." msgstr "" "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP." -#: ../src/config.py:2070 +#: ../src/config.py:2069 msgid "OpenPGP Key Selection" msgstr "Wybór klucza OpenPGP" -#: ../src/config.py:2071 +#: ../src/config.py:2070 msgid "Choose your OpenPGP key" msgstr "Wybierz klucz OpenPGP" -#: ../src/config.py:2082 +#: ../src/config.py:2081 msgid "No such account available" msgstr "Takie konto nie jest dostępne" -#: ../src/config.py:2083 +#: ../src/config.py:2082 msgid "You must create your account before editing your personal information." msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie." -#: ../src/config.py:2090 ../src/dialogs.py:1668 ../src/dialogs.py:1804 -#: ../src/dialogs.py:1984 ../src/disco.py:438 ../src/profile_window.py:320 +#: ../src/config.py:2089 ../src/dialogs.py:1667 ../src/dialogs.py:1803 +#: ../src/dialogs.py:1983 ../src/disco.py:439 ../src/profile_window.py:320 msgid "You are not connected to the server" msgstr "Nie jesteś połączony z serwerem" -#: ../src/config.py:2091 +#: ../src/config.py:2090 msgid "Without a connection, you can not edit your personal information." msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie." -#: ../src/config.py:2095 +#: ../src/config.py:2094 msgid "Your server doesn't support Vcard" msgstr "Twój serwer nie akceptuje Vcard" -#: ../src/config.py:2096 +#: ../src/config.py:2095 msgid "Your server can't save your personal information." msgstr "Twój serwer nie potrafi zapisać informacji osobistych." -#: ../src/config.py:2127 +#: ../src/config.py:2126 msgid "Account Local already exists." msgstr "Konto o takiej nazwie już istnieje." -#: ../src/config.py:2128 +#: ../src/config.py:2127 msgid "Please rename or remove it before enabling link-local messaging." msgstr "" "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local." -#: ../src/config.py:2311 +#: ../src/config.py:2310 #, python-format msgid "Edit %s" msgstr "Modyfikuj %s" -#: ../src/config.py:2313 +#: ../src/config.py:2312 #, python-format msgid "Register to %s" msgstr "Zarejestruj na %s" #. list at the beginning -#: ../src/config.py:2349 +#: ../src/config.py:2348 msgid "Ban List" msgstr "Lista kontaktów zablokowanych" -#: ../src/config.py:2350 +#: ../src/config.py:2349 msgid "Member List" msgstr "_Lista uczestników" -#: ../src/config.py:2351 +#: ../src/config.py:2350 msgid "Owner List" msgstr "_Lista właścicieli" -#: ../src/config.py:2352 +#: ../src/config.py:2351 msgid "Administrator List" msgstr "_Administratorzy" #. Address column #. holds JID (who said this) -#: ../src/config.py:2401 ../src/disco.py:762 ../src/history_manager.py:184 +#: ../src/config.py:2400 ../src/disco.py:775 ../src/history_manager.py:184 msgid "JID" msgstr "JID" -#: ../src/config.py:2409 +#: ../src/config.py:2408 msgid "Reason" msgstr "Powód" -#: ../src/config.py:2414 +#: ../src/config.py:2413 msgid "Nick" msgstr "Nick" -#: ../src/config.py:2418 +#: ../src/config.py:2417 msgid "Role" msgstr "Funkcja:" -#: ../src/config.py:2443 +#: ../src/config.py:2442 msgid "Banning..." msgstr "Blokuję użytkownika..." #. You can move '\n' before user@domain if that line is TOO BIG -#: ../src/config.py:2445 +#: ../src/config.py:2444 msgid "" "Whom do you want to ban?\n" "\n" @@ -5909,11 +5916,11 @@ "Którego użytkownika chcesz zablokować?\n" "\n" -#: ../src/config.py:2447 +#: ../src/config.py:2446 msgid "Adding Member..." msgstr "Dodaję członka..." -#: ../src/config.py:2448 +#: ../src/config.py:2447 msgid "" "Whom do you want to make a member?\n" "\n" @@ -5921,11 +5928,11 @@ "Status którego użytkownika chcesz zmienić?\n" "\n" -#: ../src/config.py:2450 +#: ../src/config.py:2449 msgid "Adding Owner..." msgstr "Dodaję właściciela..." -#: ../src/config.py:2451 +#: ../src/config.py:2450 msgid "" "Whom do you want to make an owner?\n" "\n" @@ -5933,11 +5940,11 @@ "Którego użytkownika chcesz uczynić właścicielem pokoju?\n" "\n" -#: ../src/config.py:2453 +#: ../src/config.py:2452 msgid "Adding Administrator..." msgstr "Dodaję administratora..." -#: ../src/config.py:2454 +#: ../src/config.py:2453 msgid "" "Whom do you want to make an administrator?\n" "\n" @@ -5945,7 +5952,7 @@ "Którego użytkownika chcesz uczynić administratorem?\n" "\n" -#: ../src/config.py:2455 +#: ../src/config.py:2454 msgid "" "Can be one of the following:\n" "1. user@domain/resource (only that resource matches).\n" @@ -5961,83 +5968,83 @@ "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n" "domena/zasób lub adresu zawierającego subdomenę)." -#: ../src/config.py:2558 +#: ../src/config.py:2557 #, python-format msgid "Removing %s account" msgstr "Usuwanie konta %s" -#: ../src/config.py:2580 ../src/gajim.py:1412 ../src/roster_window.py:1932 +#: ../src/config.py:2579 ../src/gajim.py:1414 ../src/roster_window.py:1932 msgid "Password Required" msgstr "Wymagane hasło" -#: ../src/config.py:2581 ../src/roster_window.py:1906 +#: ../src/config.py:2580 ../src/roster_window.py:1906 #, python-format msgid "Enter your password for account %s" msgstr "Wpisz hasło dla konta %s" -#: ../src/config.py:2582 ../src/roster_window.py:1933 +#: ../src/config.py:2581 ../src/roster_window.py:1933 msgid "Save password" msgstr "Zapisz hasło" -#: ../src/config.py:2591 +#: ../src/config.py:2590 #, python-format msgid "Account \"%s\" is connected to the server" msgstr "Konto \"%s\" jest połączone z serwerem." -#: ../src/config.py:2592 +#: ../src/config.py:2591 msgid "If you remove it, the connection will be lost." msgstr "Jeśli to usuniesz, połączenie zostanie zerwane." -#: ../src/config.py:2688 +#: ../src/config.py:2687 msgid "Default" msgstr "Domyślny" -#: ../src/config.py:2688 +#: ../src/config.py:2687 msgid "?print_status:All" msgstr "?print_status:Wszystkie" -#: ../src/config.py:2689 +#: ../src/config.py:2688 msgid "Enter and leave only" msgstr "Jedynie wejdź i wyjdź" -#: ../src/config.py:2690 +#: ../src/config.py:2689 msgid "?print_status:None" msgstr "?print_status:Żaden" -#: ../src/config.py:2759 +#: ../src/config.py:2758 msgid "New Group Chat" msgstr "Nowa rozmowa grupowa" -#: ../src/config.py:2792 +#: ../src/config.py:2791 msgid "This bookmark has invalid data" msgstr "Ta zakładka zawiera niepoprawne dane" -#: ../src/config.py:2793 +#: ../src/config.py:2792 msgid "" "Please be sure to fill out server and room fields or remove this bookmark." msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę." -#: ../src/config.py:3074 +#: ../src/config.py:3073 msgid "Invalid username" msgstr "Niepoprawna nazwa użytkownika" -#: ../src/config.py:3076 +#: ../src/config.py:3075 msgid "You must provide a username to configure this account." msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto." -#: ../src/config.py:3102 +#: ../src/config.py:3101 msgid "Duplicate Jabber ID" msgstr "Taki Jabber ID już istnieje!" -#: ../src/config.py:3103 +#: ../src/config.py:3102 msgid "This account is already configured in Gajim." msgstr "Konto o takiej nazwie jest już skonfigurowane." -#: ../src/config.py:3120 +#: ../src/config.py:3119 msgid "Account has been added successfully" msgstr "Konto zostało pomyślnie dodane" -#: ../src/config.py:3121 ../src/config.py:3308 +#: ../src/config.py:3120 ../src/config.py:3309 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 " @@ -6046,26 +6053,26 @@ "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub " "później wybierając pozycję Konta z menu Edycja w głównym oknie programu." -#: ../src/config.py:3139 +#: ../src/config.py:3138 msgid "Invalid server" msgstr "Niepoprawna nazwa serwera" -#: ../src/config.py:3140 +#: ../src/config.py:3139 msgid "Please provide a server on which you want to register." msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować." -#: ../src/config.py:3191 ../src/gajim.py:1987 +#: ../src/config.py:3190 ../src/gajim.py:1990 msgid "Certificate Already in File" msgstr "Certyfikat znajduje się już w pliku" -#: ../src/config.py:3192 ../src/gajim.py:1988 +#: ../src/config.py:3191 ../src/gajim.py:1991 #, python-format msgid "This certificate is already in file %s, so it's not added again." msgstr "" "Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie " "dodany." -#: ../src/config.py:3260 +#: ../src/config.py:3259 #, fuzzy, python-format msgid "" "Security Warning\n" @@ -6080,7 +6087,7 @@ "Błąd SSL: %s\n" "Czy nadal chcesz się połączyć z tym serwerem?" -#: ../src/config.py:3266 ../src/gajim.py:2011 +#: ../src/config.py:3265 ../src/gajim.py:2014 #, python-format msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -6091,30 +6098,30 @@ "Odcisk klucza SHA1 certyfikatu:\n" "%s" -#: ../src/config.py:3287 ../src/config.py:3326 +#: ../src/config.py:3288 ../src/config.py:3327 msgid "An error occurred during account creation" msgstr "Wystąpił błąd w trakcie tworzenia konta" -#: ../src/config.py:3307 +#: ../src/config.py:3308 msgid "Your new account has been created successfully" msgstr "Twoje konto zostało założone" -#: ../src/config.py:3410 +#: ../src/config.py:3411 msgid "Account name is in use" msgstr "Nazwa konta jest już zajęta" -#: ../src/config.py:3411 +#: ../src/config.py:3412 msgid "You already have an account using this name." msgstr "Masz już konto o takiej nazwie." -#: ../src/conversation_textview.py:547 +#: ../src/conversation_textview.py:548 msgid "" "This icon indicates that this message has not yet\n" "been received by the remote end. If this icon stays\n" "for a long time, it's likely the message got lost." msgstr "" -#: ../src/conversation_textview.py:566 +#: ../src/conversation_textview.py:567 #, fuzzy msgid "" "Text below this line is what has been said since the\n" @@ -6123,51 +6130,51 @@ "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od " "momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę" -#: ../src/conversation_textview.py:676 +#: ../src/conversation_textview.py:677 #, python-format msgid "_Actions for \"%s\"" msgstr "_Działania dla wyrażenia \"%s\"" -#: ../src/conversation_textview.py:688 +#: ../src/conversation_textview.py:689 msgid "Read _Wikipedia Article" msgstr "Przeczytaj artykuł w _Wikipedii" -#: ../src/conversation_textview.py:693 +#: ../src/conversation_textview.py:694 msgid "Look it up in _Dictionary" msgstr "Szukaj w _słowniku" -#: ../src/conversation_textview.py:710 +#: ../src/conversation_textview.py:711 #, python-format msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY" msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY" #. we must have %s in the url -#: ../src/conversation_textview.py:723 +#: ../src/conversation_textview.py:724 #, python-format msgid "Web Search URL is missing an \"%s\"" msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\"" -#: ../src/conversation_textview.py:726 +#: ../src/conversation_textview.py:727 msgid "Web _Search for it" msgstr "Szukaj w _Internecie" -#: ../src/conversation_textview.py:732 +#: ../src/conversation_textview.py:733 msgid "Open as _Link" msgstr "Otwórz jako _odnośnik" -#: ../src/conversation_textview.py:1221 +#: ../src/conversation_textview.py:1222 msgid "Yesterday" msgstr "Wczoraj" #. the number is >= 2 #. %i is day in year (1-365), %d (1-31) we want %i -#: ../src/conversation_textview.py:1225 +#: ../src/conversation_textview.py:1226 #, python-format msgid "%i days ago" msgstr "%i dni temu" #. if we have subject, show it too! -#: ../src/conversation_textview.py:1259 +#: ../src/conversation_textview.py:1260 #, python-format msgid "Subject: %s\n" msgstr "Temat: %s\n" @@ -6266,78 +6273,78 @@ msgid "Yahoo! Address:" msgstr "Adres _Yahoo:" -#: ../src/dialogs.py:712 +#: ../src/dialogs.py:711 #, python-format msgid "Please fill in the data of the contact you want to add in account %s" msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s" -#: ../src/dialogs.py:714 +#: ../src/dialogs.py:713 msgid "Please fill in the data of the contact you want to add" msgstr "Wypełnij informacje o kontakcie, który chcesz dodać" -#: ../src/dialogs.py:871 ../src/dialogs.py:877 ../src/dialogs.py:882 +#: ../src/dialogs.py:870 ../src/dialogs.py:876 ../src/dialogs.py:881 msgid "Invalid User ID" msgstr "Niepoprawny identyfikator użytkownika" -#: ../src/dialogs.py:878 +#: ../src/dialogs.py:877 msgid "The user ID must not contain a resource." msgstr "ID użytkownika nie może zawierać zasobu." -#: ../src/dialogs.py:883 +#: ../src/dialogs.py:882 #, fuzzy msgid "You cannot add yourself to your roster." msgstr "Chciałbym dodać Cię do listy kontaktów." -#: ../src/dialogs.py:897 +#: ../src/dialogs.py:896 msgid "Contact already in roster" msgstr "Kontakt jest już na liście kontaktów" -#: ../src/dialogs.py:898 +#: ../src/dialogs.py:897 msgid "This contact is already listed in your roster." msgstr "Ten kontakt znajduje się już na twojej liście kontaktów." -#: ../src/dialogs.py:934 +#: ../src/dialogs.py:933 msgid "User ID:" msgstr "ID uzytkownika:" -#: ../src/dialogs.py:992 +#: ../src/dialogs.py:991 msgid "A GTK+ jabber client" msgstr "Klient jabbera w GTK+." -#: ../src/dialogs.py:993 +#: ../src/dialogs.py:992 msgid "GTK+ Version:" msgstr "Wersja GTK+:" -#: ../src/dialogs.py:994 +#: ../src/dialogs.py:993 msgid "PyGTK Version:" msgstr "Wersja PyGTK:" -#: ../src/dialogs.py:1004 +#: ../src/dialogs.py:1003 msgid "Current Developers:" msgstr "Bieżący deweloperzy:" -#: ../src/dialogs.py:1006 +#: ../src/dialogs.py:1005 msgid "Past Developers:" msgstr "Poprzedni deweloperzy:" -#: ../src/dialogs.py:1012 +#: ../src/dialogs.py:1011 msgid "THANKS:" msgstr "Podziękowania:" #. remove one english sentence #. and add it manually as translatable -#: ../src/dialogs.py:1018 +#: ../src/dialogs.py:1017 msgid "Last but not least, we would like to thank all the package maintainers." msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów." #. here you write your name in the form Name FamilyName <someone@somewhere> -#: ../src/dialogs.py:1031 +#: ../src/dialogs.py:1030 msgid "translator-credits" msgstr "" "Tłumaczenie na język polski: Witold Kieraś\n" "Maciej Chojnacki <maciej(a)chojnacki.name>" -#: ../src/dialogs.py:1193 +#: ../src/dialogs.py:1192 #, python-format msgid "" "You have to install %s dictionary to use spellchecking, or choose another " @@ -6349,89 +6356,89 @@ "inny język korzystać z opcji speller_langugage.\n" "Do tego czasu podświetlanie błędnie wpisanych słów nie będzie działało" -#: ../src/dialogs.py:1597 +#: ../src/dialogs.py:1596 #, fuzzy, python-format msgid "Subscription request for account %(account)s from %(jid)s" msgstr "Prośba o autoryzację dla konta %s od %s" -#: ../src/dialogs.py:1600 +#: ../src/dialogs.py:1599 #, python-format msgid "Subscription request from %s" msgstr "Prośba o autoryzację od %s" -#: ../src/dialogs.py:1661 ../src/gajim.py:2593 +#: ../src/dialogs.py:1660 ../src/gajim.py:2594 #, python-format msgid "You are already in group chat %s" msgstr "Już jesteś w pokoju %s" -#: ../src/dialogs.py:1669 +#: ../src/dialogs.py:1668 msgid "You can not join a group chat unless you are connected." msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony." -#: ../src/dialogs.py:1688 +#: ../src/dialogs.py:1687 #, python-format msgid "Join Group Chat with account %s" msgstr "Dołącz do pokoju z konta %s" -#: ../src/dialogs.py:1759 +#: ../src/dialogs.py:1758 msgid "Invalid Nickname" msgstr "Niepoprawny pseudonim" -#: ../src/dialogs.py:1760 ../src/groupchat_control.py:1329 -#: ../src/groupchat_control.py:1601 +#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1380 +#: ../src/groupchat_control.py:1656 msgid "The nickname has not allowed characters." msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki." -#: ../src/dialogs.py:1764 ../src/dialogs.py:1770 -#: ../src/groupchat_control.py:1766 +#: ../src/dialogs.py:1763 ../src/dialogs.py:1769 +#: ../src/groupchat_control.py:1824 msgid "Invalid group chat Jabber ID" msgstr "Niepoprawny Jabber ID" -#: ../src/dialogs.py:1765 ../src/dialogs.py:1771 -#: ../src/groupchat_control.py:1767 +#: ../src/dialogs.py:1764 ../src/dialogs.py:1770 +#: ../src/groupchat_control.py:1825 msgid "The group chat Jabber ID has not allowed characters." msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki." -#: ../src/dialogs.py:1777 +#: ../src/dialogs.py:1776 msgid "This is not a group chat" msgstr "To nie jest czat" -#: ../src/dialogs.py:1778 +#: ../src/dialogs.py:1777 #, python-format msgid "%s is not the name of a group chat." msgstr "%s nie jest nazwą czatu." -#: ../src/dialogs.py:1805 +#: ../src/dialogs.py:1804 msgid "Without a connection, you can not synchronise your contacts." msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu." -#: ../src/dialogs.py:1819 +#: ../src/dialogs.py:1818 msgid "Server" msgstr "Serwer" -#: ../src/dialogs.py:1852 +#: ../src/dialogs.py:1851 msgid "This account is not connected to the server" msgstr "To konto nie jest połączone z serwerem" -#: ../src/dialogs.py:1853 +#: ../src/dialogs.py:1852 msgid "You cannot synchronize with an account unless it is connected." msgstr "" "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone." -#: ../src/dialogs.py:1877 +#: ../src/dialogs.py:1876 msgid "Synchronise" msgstr "Synchronizuj" -#: ../src/dialogs.py:1935 +#: ../src/dialogs.py:1934 #, python-format msgid "Start Chat with account %s" msgstr "Rozpocznij rozmowę z konta %s" -#: ../src/dialogs.py:1937 +#: ../src/dialogs.py:1936 msgid "Start Chat" msgstr "Rozpocznij rozmowę" -#: ../src/dialogs.py:1938 +#: ../src/dialogs.py:1937 msgid "" "Fill in the nickname or the Jabber ID of the contact you would like\n" "to send a chat message to:" @@ -6440,342 +6447,352 @@ "wysłać wiadomość:" #. if offline or connecting -#: ../src/dialogs.py:1963 ../src/dialogs.py:2338 ../src/dialogs.py:2481 +#: ../src/dialogs.py:1962 ../src/dialogs.py:2337 ../src/dialogs.py:2480 msgid "Connection not available" msgstr "Połączenie jest niedostępne" -#: ../src/dialogs.py:1964 ../src/dialogs.py:2339 ../src/dialogs.py:2482 +#: ../src/dialogs.py:1963 ../src/dialogs.py:2338 ../src/dialogs.py:2481 #, python-format msgid "Please make sure you are connected with \"%s\"." msgstr "Sprawdź, czy jesteś połączony z \"%s\"." -#: ../src/dialogs.py:1973 ../src/dialogs.py:1976 +#: ../src/dialogs.py:1972 ../src/dialogs.py:1975 msgid "Invalid JID" msgstr "Niepoprawny JID" -#: ../src/dialogs.py:1976 +#: ../src/dialogs.py:1975 #, python-format msgid "Unable to parse \"%s\"." msgstr "Nie można sparsować \"%s\"." -#: ../src/dialogs.py:1985 +#: ../src/dialogs.py:1984 msgid "Without a connection, you can not change your password." msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony." -#: ../src/dialogs.py:2004 +#: ../src/dialogs.py:2003 msgid "Invalid password" msgstr "Niepoprawne hasło" -#: ../src/dialogs.py:2004 +#: ../src/dialogs.py:2003 msgid "You must enter a password." msgstr "Musisz wpisać hasło." -#: ../src/dialogs.py:2008 +#: ../src/dialogs.py:2007 msgid "Passwords do not match" msgstr "Hasła nie zgadzają się" -#: ../src/dialogs.py:2009 +#: ../src/dialogs.py:2008 msgid "The passwords typed in both fields must be identical." msgstr "Hasła wpisane w obydwu polach muszą być identyczne." #. img to display #. default value -#: ../src/dialogs.py:2048 ../src/notify.py:246 ../src/notify.py:460 +#: ../src/dialogs.py:2047 ../src/notify.py:246 ../src/notify.py:460 #: ../src/osx/growler.py:12 msgid "Contact Signed In" msgstr "Kontakt połączył się" -#: ../src/dialogs.py:2050 ../src/notify.py:254 ../src/notify.py:462 +#: ../src/dialogs.py:2049 ../src/notify.py:254 ../src/notify.py:462 #: ../src/osx/growler.py:12 msgid "Contact Signed Out" msgstr "Kontakt rozłączył się" #. chat message -#: ../src/dialogs.py:2052 ../src/notify.py:277 ../src/notify.py:464 +#: ../src/dialogs.py:2051 ../src/notify.py:277 ../src/notify.py:464 #: ../src/osx/growler.py:12 msgid "New Message" msgstr "Nowa wiadomość" #. single message -#: ../src/dialogs.py:2052 ../src/notify.py:258 ../src/notify.py:464 +#: ../src/dialogs.py:2051 ../src/notify.py:258 ../src/notify.py:464 #: ../src/osx/growler.py:13 msgid "New Single Message" msgstr "Nowa wiadomość" #. private message -#: ../src/dialogs.py:2053 ../src/notify.py:265 ../src/notify.py:465 +#: ../src/dialogs.py:2052 ../src/notify.py:265 ../src/notify.py:465 #: ../src/osx/growler.py:13 msgid "New Private Message" msgstr "Wyślij prywatną wiadomość" -#: ../src/dialogs.py:2053 ../src/gajim.py:1577 ../src/notify.py:473 +#: ../src/dialogs.py:2052 ../src/gajim.py:1580 ../src/notify.py:473 #: ../src/osx/growler.py:13 msgid "New E-mail" msgstr "Nowy adres e-mail" -#: ../src/dialogs.py:2055 ../src/gajim.py:1643 ../src/notify.py:467 +#: ../src/dialogs.py:2054 ../src/gajim.py:1646 ../src/notify.py:467 #: ../src/osx/growler.py:14 msgid "File Transfer Request" msgstr "Pytanie o przysłanie pliku" -#: ../src/dialogs.py:2057 ../src/gajim.py:1542 ../src/gajim.py:1610 +#: ../src/dialogs.py:2056 ../src/gajim.py:1545 ../src/gajim.py:1613 #: ../src/notify.py:469 ../src/osx/growler.py:14 msgid "File Transfer Error" msgstr "Błąd przesyłania pliku" -#: ../src/dialogs.py:2059 ../src/gajim.py:1685 ../src/gajim.py:1707 -#: ../src/gajim.py:1724 ../src/notify.py:471 ../src/osx/growler.py:15 +#: ../src/dialogs.py:2058 ../src/gajim.py:1688 ../src/gajim.py:1710 +#: ../src/gajim.py:1727 ../src/notify.py:471 ../src/osx/growler.py:15 msgid "File Transfer Completed" msgstr "Zakończono przesyłanie pliku" -#: ../src/dialogs.py:2060 ../src/gajim.py:1688 ../src/notify.py:471 +#: ../src/dialogs.py:2059 ../src/gajim.py:1691 ../src/notify.py:471 #: ../src/osx/growler.py:15 msgid "File Transfer Stopped" msgstr "Przesyłanie pliku zatrzymane" -#: ../src/dialogs.py:2062 ../src/gajim.py:1433 ../src/notify.py:475 +#: ../src/dialogs.py:2061 ../src/gajim.py:1435 ../src/notify.py:475 #: ../src/osx/growler.py:16 msgid "Groupchat Invitation" msgstr "Zaproszenie na czat" -#: ../src/dialogs.py:2064 ../src/notify.py:238 ../src/notify.py:477 +#: ../src/dialogs.py:2063 ../src/notify.py:238 ../src/notify.py:477 #: ../src/osx/growler.py:16 msgid "Contact Changed Status" msgstr "Kontakt zmienił status" -#: ../src/dialogs.py:2257 +#: ../src/dialogs.py:2256 #, python-format msgid "Single Message using account %s" msgstr "Wiadomość z konta %s" -#: ../src/dialogs.py:2259 +#: ../src/dialogs.py:2258 #, python-format msgid "Single Message in account %s" msgstr "Wiadomość z konta %s" -#: ../src/dialogs.py:2261 +#: ../src/dialogs.py:2260 msgid "Single Message" msgstr "Pojedyncza wiadomość" #. prepare UI for Sending -#: ../src/dialogs.py:2264 +#: ../src/dialogs.py:2263 #, python-format msgid "Send %s" msgstr "Wyślij %s" #. prepare UI for Receiving -#: ../src/dialogs.py:2287 +#: ../src/dialogs.py:2286 #, python-format msgid "Received %s" msgstr "Odebrane %s" #. prepare UI for Receiving -#: ../src/dialogs.py:2310 +#: ../src/dialogs.py:2309 #, python-format msgid "Form %s" msgstr "Od %s" #. we create a new blank window to send and we preset RE: and to jid -#: ../src/dialogs.py:2382 +#: ../src/dialogs.py:2381 #, python-format msgid "RE: %s" msgstr "RE: %s" -#: ../src/dialogs.py:2383 +#: ../src/dialogs.py:2382 #, python-format msgid "%s wrote:\n" msgstr "%s napisał:\n" -#: ../src/dialogs.py:2427 +#: ../src/dialogs.py:2426 #, python-format msgid "XML Console for %s" msgstr "Kosola XML dla %s" -#: ../src/dialogs.py:2429 +#: ../src/dialogs.py:2428 msgid "XML Console" msgstr "Konsola XML" -#: ../src/dialogs.py:2553 +#: ../src/dialogs.py:2552 #, python-format msgid "Privacy List %s" msgstr "Lista prywatności %s" -#: ../src/dialogs.py:2557 +#: ../src/dialogs.py:2556 #, python-format msgid "Privacy List for %s" msgstr "Lista prywatności dla %s" -#: ../src/dialogs.py:2613 +#: ../src/dialogs.py:2612 #, fuzzy, python-format msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s" msgstr "Kolejność: %s, akcja: %s, typ: %s, wartość: %s" -#: ../src/dialogs.py:2618 +#: ../src/dialogs.py:2617 #, fuzzy, python-format msgid "Order: %(order)s, action: %(action)s" msgstr "Kolejność: %s, akcja: %s" -#: ../src/dialogs.py:2660 +#: ../src/dialogs.py:2659 msgid "Edit a rule" msgstr "Edytuj regułę" -#: ../src/dialogs.py:2747 +#: ../src/dialogs.py:2746 msgid "Add a rule" msgstr "Dodaj regułę" -#: ../src/dialogs.py:2843 +#: ../src/dialogs.py:2842 #, python-format msgid "Privacy Lists for %s" msgstr "Listy prywatności dla %s" -#: ../src/dialogs.py:2845 +#: ../src/dialogs.py:2844 msgid "Privacy Lists" msgstr "Listy prywatności" -#: ../src/dialogs.py:2915 +#: ../src/dialogs.py:2914 msgid "Invalid List Name" msgstr "Niepoprawna nazwa listy" -#: ../src/dialogs.py:2916 +#: ../src/dialogs.py:2915 msgid "You must enter a name to create a privacy list." msgstr "Musisz podać nazwę nowej listy prywatności." -#: ../src/dialogs.py:2949 +#: ../src/dialogs.py:2948 msgid "You are invited to a groupchat" msgstr "Jestes zaproszony do rozmowy grupowej" -#: ../src/dialogs.py:2952 +#: ../src/dialogs.py:2951 msgid "$Contact has invited you to join a discussion" msgstr "$Contact zaprasza cię do rozmowy" -#: ../src/dialogs.py:2954 +#: ../src/dialogs.py:2953 #, python-format msgid "$Contact has invited you to group chat %(room_jid)s" msgstr "$Contact zaprasza cię do pokoju %(room_jid)s" -#: ../src/dialogs.py:2962 +#: ../src/dialogs.py:2961 #, python-format msgid "Comment: %s" msgstr "Komentarz: %s" -#: ../src/dialogs.py:2964 +#: ../src/dialogs.py:2963 msgid "Do you want to accept the invitation?" msgstr "Czy chcesz zaakceptować zaproszenie?" -#: ../src/dialogs.py:3019 +#: ../src/dialogs.py:3018 msgid "Choose Sound" msgstr "Wybierz dźwięk" -#: ../src/dialogs.py:3029 ../src/dialogs.py:3080 +#: ../src/dialogs.py:3028 ../src/dialogs.py:3079 msgid "All files" msgstr "Wszystkie pliki" -#: ../src/dialogs.py:3034 +#: ../src/dialogs.py:3033 msgid "Wav Sounds" msgstr "Dźwięki w Wav" -#: ../src/dialogs.py:3067 +#: ../src/dialogs.py:3066 msgid "Choose Image" msgstr "Wybierz obrazek" -#: ../src/dialogs.py:3085 +#: ../src/dialogs.py:3084 msgid "Images" msgstr "Obrazki" -#: ../src/dialogs.py:3150 +#: ../src/dialogs.py:3149 #, python-format msgid "When %s becomes:" msgstr "Gdy %s ma status:" -#: ../src/dialogs.py:3152 +#: ../src/dialogs.py:3151 #, python-format msgid "Adding Special Notification for %s" msgstr "Dodaję specjalne powiadomienia dla %s" #. # means number -#: ../src/dialogs.py:3223 +#: ../src/dialogs.py:3222 msgid "#" msgstr "Nr" -#: ../src/dialogs.py:3229 +#: ../src/dialogs.py:3228 msgid "Condition" msgstr "Warunek" -#: ../src/dialogs.py:3347 +#: ../src/dialogs.py:3346 msgid "when I am " msgstr "kiedy mam " #: ../src/dialogs.py:3821 #, python-format msgid "" -"Your chat session with %(jid)s is encrypted.\n" +"Your chat session with %(jid)s is encrypted.\n" "\n" -"This session's Short Authentication String is %(sas)s." +"This session's Short Authentication String is %(sas)s." msgstr "" #: ../src/dialogs.py:3825 msgid "You have already verified this contact's identity." -msgstr "" +msgstr "Już zweryfikowałeś tożsamość tego kontaktu." -#: ../src/dialogs.py:3830 +#: ../src/dialogs.py:3831 msgid "Contact's identity verified" +msgstr "Tożsamość rozmówcy zweryfikowana" + +#: ../src/dialogs.py:3839 +msgid "Verify again..." msgstr "" -#: ../src/dialogs.py:3834 +#: ../src/dialogs.py:3844 msgid "" -"To be certain that only the expected person can read your messages or send " -"you messages, you need to verify their identity." +"To be certain that only the expected person can read your messages or " +"send you messages, you need to verify their identity by clicking the button " +"below." msgstr "" -#: ../src/dialogs.py:3836 +#: ../src/dialogs.py:3847 msgid "Contact's identity NOT verified" -msgstr "" +msgstr "Tożsamość rozmówcy NIE zweryfikowana" -#: ../src/dialogs.py:3848 -msgid "Have you verified the remote contact's identity?" +#: ../src/dialogs.py:3854 +msgid "Verify..." msgstr "" -#: ../src/dialogs.py:3849 +#: ../src/dialogs.py:3866 +#, fuzzy +msgid "Have you verified the contact's identity?" +msgstr "Czy zweryfikowałeś(aś) tożsamość zdalnego rozmówcy?" + +#: ../src/dialogs.py:3867 #, python-format msgid "" -"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly " -"(in person or on the phone) and verify that they see the same Short " +"To prevent talking to an unknown person, you should speak to %(jid)s " +"directly (in person or on the phone) and verify that they see the same Short " "Authentication String (SAS) as you.\n" "\n" "This session's Short Authentication String is %(sas)s." msgstr "" -#: ../src/dialogs.py:3850 +#: ../src/dialogs.py:3868 msgid "Did you talk to the remote contact and verify the SAS?" -msgstr "" +msgstr "Czy rozmawiałeś(aś) ze zdalnym rozmówcą i zweryfikowałeś(aś) SAS?" -#: ../src/disco.py:115 +#: ../src/disco.py:116 msgid "Others" msgstr "Inni" #. conference is a category for listing mostly groupchats in service discovery -#: ../src/disco.py:119 +#: ../src/disco.py:120 msgid "Conference" msgstr "Konferencja" -#: ../src/disco.py:439 +#: ../src/disco.py:440 msgid "Without a connection, you can not browse available services" msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony" -#: ../src/disco.py:513 +#: ../src/disco.py:514 #, python-format msgid "Service Discovery using account %s" msgstr "Przeglądanie usług przy użyciu konta %s" -#: ../src/disco.py:515 +#: ../src/disco.py:516 msgid "Service Discovery" msgstr "Przeglądanie usług" -#: ../src/disco.py:655 +#: ../src/disco.py:656 msgid "The service could not be found" msgstr "Nie można odnaleźć usługi" -#: ../src/disco.py:656 +#: ../src/disco.py:657 msgid "" "There is no service at the address you entered, or it is not responding. " "Check the address and try again." @@ -6783,72 +6800,77 @@ "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź " "adres i spróbuj ponownie." -#: ../src/disco.py:660 ../src/disco.py:942 +#: ../src/disco.py:661 ../src/disco.py:955 msgid "The service is not browsable" msgstr "Tej usługi nie można przeglądać" -#: ../src/disco.py:661 +#: ../src/disco.py:662 msgid "This type of service does not contain any items to browse." msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać." -#: ../src/disco.py:741 +#: ../src/disco.py:699 ../src/disco.py:709 +#, fuzzy +msgid "Invalid Server Name" +msgstr "Niepoprawna nazwa serwera" + +#: ../src/disco.py:754 #, fuzzy, python-format msgid "Browsing %(address)s using account %(account)s" msgstr "Przeglądanie %s przy użyciu konta %s" -#: ../src/disco.py:781 +#: ../src/disco.py:794 msgid "_Browse" msgstr "Prze_glądaj" -#: ../src/disco.py:943 +#: ../src/disco.py:956 msgid "This service does not contain any items to browse." msgstr "Usługa nie zawiera elementów, które można przeglądać." -#: ../src/disco.py:1164 +#: ../src/disco.py:1179 msgid "_Execute Command" msgstr "_Wykonaj komendę" -#: ../src/disco.py:1174 ../src/disco.py:1338 +#: ../src/disco.py:1189 ../src/disco.py:1353 msgid "Re_gister" msgstr "Za_rejestruj" -#: ../src/disco.py:1375 +#: ../src/disco.py:1390 #, fuzzy, python-format msgid "Scanning %(current)d / %(total)d.." msgstr "Skanowanie %d / %d.." #. Users column -#: ../src/disco.py:1557 +#: ../src/disco.py:1572 msgid "Users" msgstr "Użytkownicy" #. Description column -#: ../src/disco.py:1565 +#: ../src/disco.py:1580 msgid "Description" msgstr "Opis" #. Id column -#: ../src/disco.py:1573 +#: ../src/disco.py:1588 msgid "Id" msgstr "Id" -#: ../src/disco.py:1802 +#: ../src/disco.py:1818 msgid "Subscribed" msgstr "Zasubskrybowano" -#: ../src/disco.py:1810 +#: ../src/disco.py:1826 msgid "Node" msgstr "Węzeł" -#: ../src/disco.py:1867 +#: ../src/disco.py:1883 msgid "New post" msgstr "Nowy wpis" -#: ../src/disco.py:1873 +#: ../src/disco.py:1889 msgid "_Subscribe" msgstr "_Autoryzuj" -#: ../src/disco.py:1879 +#: ../src/disco.py:1895 msgid "_Unsubscribe" msgstr "_Cofnij autoryzację" @@ -6890,9 +6912,8 @@ msgstr "gajim-remote" #: ../src/features_window.py:60 -#, fuzzy msgid "A script to control Gajim via commandline." -msgstr "Skrypt pozwalający na sterowanie Gajimem z linii komend." +msgstr "Skrypt pozwalający na sterowanie Gajimem z linii poleceń." #: ../src/features_window.py:61 msgid "Requires python-dbus." @@ -7369,50 +7390,61 @@ msgstr "" "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj." -#: ../src/gajim.py:560 +#: ../src/gajim.py:547 +#, 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 "" +"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś " +"innego w pokoju %s.\n" +"Podaj inny pseudonim:" + +#: ../src/gajim.py:561 msgid "Do you accept this request?" msgstr "Czy akceptujesz tę prośbę?" -#: ../src/gajim.py:562 +#: ../src/gajim.py:563 #, python-format msgid "Do you accept this request on account %s?" msgstr "Czy akceptujesz tę prośbę na koncie %s?" -#: ../src/gajim.py:565 +#: ../src/gajim.py:566 #, fuzzy, python-format msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)" msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)" -#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17 +#: ../src/gajim.py:614 ../src/notify.py:479 ../src/osx/growler.py:17 msgid "Connection Failed" msgstr "Połączenie nie powiodło się" -#: ../src/gajim.py:919 ../src/gajim.py:923 +#: ../src/gajim.py:920 ../src/gajim.py:924 #, fuzzy, python-format msgid "Error %(code)s: %(msg)s" msgstr "%(nickname)s: %(message)s" #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) -#: ../src/gajim.py:933 ../src/gajim.py:946 +#: ../src/gajim.py:934 ../src/gajim.py:947 #, fuzzy, python-format msgid "error while sending %(message)s ( %(error)s )" msgstr "błąd przy wysyłaniu %s ( %s )" -#: ../src/gajim.py:977 +#: ../src/gajim.py:979 msgid "Authorization accepted" msgstr "Autoryzacja przyjęta" -#: ../src/gajim.py:978 +#: ../src/gajim.py:980 #, python-format msgid "The contact \"%s\" has authorized you to see his or her status." msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status." -#: ../src/gajim.py:997 +#: ../src/gajim.py:999 #, python-format msgid "Contact \"%s\" removed subscription from you" msgstr "Kontakt \"%s\" cofnął Ci autoryzację" -#: ../src/gajim.py:998 +#: ../src/gajim.py:1000 msgid "" "You will always see him or her as offline.\n" "Do you want to remove him or her from your contact list?" @@ -7420,72 +7452,72 @@ "Zawsze będziesz widział ten kontakt jako rozłączony.\n" "Czy chcesz go usunąć z listy kontaktów?" -#: ../src/gajim.py:1039 +#: ../src/gajim.py:1041 #, python-format msgid "Contact with \"%s\" cannot be established" msgstr "Nie można ustanowić połączenia z \"%s\"" -#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066 +#: ../src/gajim.py:1220 ../src/groupchat_control.py:1092 #, fuzzy, python-format msgid "%(nick)s is now known as %(new_nick)s" msgstr "%s występuje teraz jako %s" -#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216 +#: ../src/gajim.py:1235 ../src/groupchat_control.py:1266 #: ../src/history_window.py:410 ../src/notify.py:233 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s ma teraz status %(status)s" -#: ../src/gajim.py:1296 +#: ../src/gajim.py:1298 #, python-format msgid "%(jid)s has set the subject to %(subject)s" msgstr "" #. 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:1360 ../src/groupchat_control.py:1026 +#: ../src/gajim.py:1362 ../src/groupchat_control.py:1052 msgid "Any occupant is allowed to see your full JID" msgstr "Każdy uczestnik może zobaczyć twój pełny JID" -#: ../src/gajim.py:1363 +#: ../src/gajim.py:1365 msgid "Room now shows unavailable member" msgstr "Lista zawiera teraz niedostępnych uczestników" -#: ../src/gajim.py:1365 +#: ../src/gajim.py:1367 msgid "room now does not show unavailable members" msgstr "lista nie zawiera teraz niedostępnych użytkowników" -#: ../src/gajim.py:1368 +#: ../src/gajim.py:1370 msgid "A non-privacy-related room configuration change has occurred" msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)" #. Can be a presence (see chg_contact_status in groupchat_control.py) -#: ../src/gajim.py:1371 +#: ../src/gajim.py:1373 msgid "Room logging is now enabled" msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone" -#: ../src/gajim.py:1373 +#: ../src/gajim.py:1375 msgid "Room logging is now disabled" msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone" -#: ../src/gajim.py:1375 +#: ../src/gajim.py:1377 msgid "Room is now non-anonymous" msgstr "Pokój nie jest już anonimowy" -#: ../src/gajim.py:1378 +#: ../src/gajim.py:1380 msgid "Room is now semi-anonymous" msgstr "Pokój jest teraz quasi-anonimowy" -#: ../src/gajim.py:1381 +#: ../src/gajim.py:1383 msgid "Room is now fully-anonymous" msgstr "Pokój jest teraz w pełni anonimowy" -#: ../src/gajim.py:1413 +#: ../src/gajim.py:1415 #, python-format msgid "A Password is required to join the room %s. Please type it." msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać" -#: ../src/gajim.py:1447 +#: ../src/gajim.py:1449 msgid "" "You configured Gajim to use GPG agent, but there is no GPG agent running or " "it returned a wrong passphrase.\n" @@ -7493,20 +7525,20 @@ "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony " "lub zwraca błędne hasło.\n" -#: ../src/gajim.py:1449 +#: ../src/gajim.py:1451 msgid "You are currently connected without your OpenPGP key." msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP." -#: ../src/gajim.py:1452 +#: ../src/gajim.py:1454 msgid "Your passphrase is incorrect" msgstr "Twoje hasło jest niepoprawne" -#: ../src/gajim.py:1553 +#: ../src/gajim.py:1556 #, python-format msgid "New mail on %(gmail_mail_address)s" msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s" -#: ../src/gajim.py:1555 +#: ../src/gajim.py:1558 #, python-format msgid "You have %d new mail conversation" msgid_plural "You have %d new mail conversations" @@ -7514,7 +7546,7 @@ msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe" msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe" -#: ../src/gajim.py:1569 +#: ../src/gajim.py:1572 #, python-format msgid "" "\n" @@ -7524,70 +7556,70 @@ "%(snippet)s" msgstr "" -#: ../src/gajim.py:1640 +#: ../src/gajim.py:1643 #, python-format msgid "%s wants to send you a file." msgstr "%s chce przesłać ci plik." -#: ../src/gajim.py:1708 +#: ../src/gajim.py:1711 #, python-format msgid "You successfully received %(filename)s from %(name)s." msgstr "Otrzymałeś plik %(filename)s od %(name)s." #. ft stopped -#: ../src/gajim.py:1712 +#: ../src/gajim.py:1715 #, python-format msgid "File transfer of %(filename)s from %(name)s stopped." msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane." -#: ../src/gajim.py:1725 +#: ../src/gajim.py:1728 #, python-format msgid "You successfully sent %(filename)s to %(name)s." msgstr "Przesłałeś plik %(filename)s do %(name)s." #. ft stopped -#: ../src/gajim.py:1729 +#: ../src/gajim.py:1732 #, python-format msgid "File transfer of %(filename)s to %(name)s stopped." msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane." -#: ../src/gajim.py:1815 +#: ../src/gajim.py:1818 #, python-format msgid "" "Unable to decrypt message from %s\n" "It may have been tampered with." msgstr "" -#: ../src/gajim.py:1822 +#: ../src/gajim.py:1825 msgid "Unable to decrypt message" msgstr "Nie można odszyfrować wiadomości" -#: ../src/gajim.py:1892 +#: ../src/gajim.py:1895 msgid "Username Conflict" msgstr "Konflikt nazw użytkownika" -#: ../src/gajim.py:1893 +#: ../src/gajim.py:1896 msgid "Please type a new username for your local account" msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego" -#: ../src/gajim.py:1905 +#: ../src/gajim.py:1908 msgid "Ping?" msgstr "Ping?" -#: ../src/gajim.py:1918 +#: ../src/gajim.py:1921 #, python-format msgid "Pong! (%s s.)" msgstr "Pong! (%s s.)" -#: ../src/gajim.py:1929 +#: ../src/gajim.py:1932 msgid "Error." msgstr "Błąd." -#: ../src/gajim.py:1954 +#: ../src/gajim.py:1957 msgid "Resource Conflict" msgstr "Konflikt zasobów" -#: ../src/gajim.py:1955 +#: ../src/gajim.py:1958 msgid "" "You are already connected to this account with the same resource. Please " "type a new one" @@ -7595,11 +7627,11 @@ "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę " "podać nowy zasób" -#: ../src/gajim.py:2008 +#: ../src/gajim.py:2011 msgid "Error verifying SSL certificate" msgstr "Błąd podczas weryfikacji certyfikatu SSL" -#: ../src/gajim.py:2009 +#: ../src/gajim.py:2012 #, python-format msgid "" "There was an error verifying the SSL certificate of your jabber server: %" @@ -7607,15 +7639,15 @@ "Do you still want to connect to this server?" msgstr "" -#: ../src/gajim.py:2014 +#: ../src/gajim.py:2017 msgid "Ignore this error for this certificate." msgstr "Ignoruj komunikat o tym błędzie." -#: ../src/gajim.py:2029 +#: ../src/gajim.py:2032 msgid "SSL certificate error" msgstr "Błąd certyfikatu SSL" -#: ../src/gajim.py:2030 +#: ../src/gajim.py:2033 #, fuzzy, python-format msgid "" "It seems the SSL certificate has changed or your connection is being " @@ -7631,11 +7663,11 @@ "\n" "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?" -#: ../src/gajim.py:2052 ../src/gajim.py:2082 +#: ../src/gajim.py:2055 ../src/gajim.py:2085 msgid "Insecure connection" msgstr "Niezabezpieczone połączenie" -#: ../src/gajim.py:2053 +#: ../src/gajim.py:2056 msgid "" "You are about to send your password on an unencrypted connection. Are you " "sure you want to do that?" @@ -7643,16 +7675,16 @@ "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś " "pewien?" -#: ../src/gajim.py:2055 ../src/gajim.py:2085 +#: ../src/gajim.py:2058 ../src/gajim.py:2088 msgid "Yes, I really want to connect insecurely" msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym" -#: ../src/gajim.py:2056 ../src/gajim.py:2086 ../src/groupchat_control.py:1707 -#: ../src/roster_window.py:3762 +#: ../src/gajim.py:2059 ../src/gajim.py:2089 ../src/groupchat_control.py:1765 +#: ../src/roster_window.py:3778 msgid "Do _not ask me again" msgstr "_Nie pytaj mnie o to ponownie" -#: ../src/gajim.py:2083 +#: ../src/gajim.py:2086 msgid "" "You are about to send your password on an insecure connection. You should " "install PyOpenSSL to prevent that. Are you sure you want to do that?" @@ -7660,65 +7692,65 @@ "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. " "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?" -#: ../src/gajim.py:2100 +#: ../src/gajim.py:2103 msgid "PEP node was not removed" msgstr "Węzeł PEP nie został usunięty" -#: ../src/gajim.py:2101 +#: ../src/gajim.py:2104 #, fuzzy, python-format msgid "PEP node %(node)s was not removed: %(message)s" msgstr "Węzeł PEP %s nie został usunięty: %s" #. theme doesn't exist, disable emoticons -#: ../src/gajim.py:2551 ../src/gajim.py:2572 +#: ../src/gajim.py:2552 ../src/gajim.py:2573 msgid "Emoticons disabled" msgstr "Emotoikony wyłączone" -#: ../src/gajim.py:2552 +#: ../src/gajim.py:2553 msgid "" "Your configured emoticons theme has not been found, so emoticons have been " "disabled." msgstr "" -#: ../src/gajim.py:2573 +#: ../src/gajim.py:2574 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 " "for more details." msgstr "" -#: ../src/gajim.py:2599 ../src/roster_window.py:3290 +#: ../src/gajim.py:2600 ../src/roster_window.py:3308 msgid "You cannot join a group chat while you are invisible" msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny" #. it is good to notify the user #. in case he or she cannot see the output of the console -#: ../src/gajim.py:2880 +#: ../src/gajim.py:2881 msgid "Could not save your settings and preferences" msgstr "Nie można zapisać twoich ustawień i opcji" -#: ../src/gajim.py:2977 +#: ../src/gajim.py:2978 msgid "Bookmark already set" msgstr "Zakładka została już dodana" -#: ../src/gajim.py:2978 +#: ../src/gajim.py:2979 #, python-format msgid "Group Chat \"%s\" is already in your bookmarks." msgstr "Pokój \"%s\" jest już w Twoich zakładkach." -#: ../src/gajim.py:2991 +#: ../src/gajim.py:2992 msgid "Bookmark has been added successfully" msgstr "Zakładka została dodana" -#: ../src/gajim.py:2992 +#: ../src/gajim.py:2993 msgid "You can manage your bookmarks via Actions menu in your roster." msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów." -#: ../src/gajim.py:3181 +#: ../src/gajim.py:3182 msgid "Network Manager support not available" msgstr "Brak wsparcia dla Network Managera" -#: ../src/gajim.py:3305 +#: ../src/gajim.py:3306 msgid "Session Management support not available (missing gnome.ui module)" msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui" @@ -8049,16 +8081,16 @@ msgid "Check if Gajim is running" msgstr "Proszę sprawdzić czy Gajim jest uruchomiony." -#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290 +#: ../src/gajim-remote.py:280 #, fuzzy msgid "Shows or hides the ipython window" msgstr "Pokazuje lub ukrywa okno listy kontaktów" -#: ../src/gajim-remote.py:314 +#: ../src/gajim-remote.py:307 msgid "Missing argument \"contact_jid\"" msgstr "Brak argumentu \"contact_jid\"" -#: ../src/gajim-remote.py:333 +#: ../src/gajim-remote.py:326 #, python-format msgid "" "'%s' is not in your roster.\n" @@ -8067,31 +8099,31 @@ "'%s' nie znajduje się na twojej liście kontaktów.\n" "Podaj konto, na które ma zostać wysłana ta wiadomość." -#: ../src/gajim-remote.py:336 +#: ../src/gajim-remote.py:329 msgid "You have no active account" msgstr "Żadne z twoich kont nie jest aktywne" -#: ../src/gajim-remote.py:389 +#: ../src/gajim-remote.py:382 msgid "It seems Gajim is not running. So you can't use gajim-remote." msgstr "Gajim nie jest uruchomiony, nie możesz więc użyć gajim-remote." -#: ../src/gajim-remote.py:418 +#: ../src/gajim-remote.py:411 #, python-format msgid "" "Usage: %(basename)s %(command)s %(arguments)s \n" "\t %(help)s" msgstr "" -#: ../src/gajim-remote.py:422 +#: ../src/gajim-remote.py:415 msgid "Arguments:" msgstr "Argumenty:" -#: ../src/gajim-remote.py:426 +#: ../src/gajim-remote.py:419 #, python-format msgid "%s not found" msgstr "Nie znaleziono %s" -#: ../src/gajim-remote.py:430 +#: ../src/gajim-remote.py:423 #, python-format msgid "" "Usage: %s command [arguments]\n" @@ -8100,7 +8132,7 @@ "Użycie: polecenie %s [argument]\n" "Gdzie polecenie to jedna z następujący fraz:\n" -#: ../src/gajim-remote.py:503 +#: ../src/gajim-remote.py:496 #, fuzzy, python-format msgid "" "Too many arguments. \n" @@ -8109,7 +8141,7 @@ "Za dużo argumentów. \n" "Wpisz \"%s help %s\" aby uzyskać więcej informacji" -#: ../src/gajim-remote.py:508 +#: ../src/gajim-remote.py:501 #, fuzzy, python-format msgid "" "Argument \"%(arg)s\" is not specified. \n" @@ -8118,7 +8150,7 @@ "Argument \"%s\" nie jest określony. \n" "Wpisz \"%s help %s\" aby uzyskać więcej informacji" -#: ../src/gajim-remote.py:527 +#: ../src/gajim-remote.py:520 msgid "Wrong uri" msgstr "Błędny adres URI" @@ -8157,118 +8189,138 @@ msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left." msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" opuścił go." -#: ../src/groupchat_control.py:383 +#: ../src/groupchat_control.py:384 msgid "Insert Nickname" msgstr "Wstaw pseudonim" -#: ../src/groupchat_control.py:535 +#: ../src/groupchat_control.py:536 msgid "Conversation with " msgstr "Rozmowa z" -#: ../src/groupchat_control.py:537 +#: ../src/groupchat_control.py:538 msgid "Continued conversation" msgstr "Kontynuacja rozmowy" -#: ../src/groupchat_control.py:954 +#: ../src/groupchat_control.py:955 msgid "Really send file?" msgstr "Na pewno wysłać ten plik?" -#: ../src/groupchat_control.py:955 +#: ../src/groupchat_control.py:956 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "Jeżeli wyślesz plik do %s, pozna on/ona twój pełny JID." #. Can be a message (see handle_event_gc_config_change in gajim.py) -#: ../src/groupchat_control.py:1029 +#: ../src/groupchat_control.py:1055 msgid "Room logging is enabled" msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone" -#: ../src/groupchat_control.py:1031 +#: ../src/groupchat_control.py:1057 msgid "A new room has been created" msgstr "Został utworzony nowy pokój" -#: ../src/groupchat_control.py:1034 +#: ../src/groupchat_control.py:1060 msgid "The server has assigned or modified your roomnick" msgstr "" "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju" #. do not print 'kicked by None' -#: ../src/groupchat_control.py:1040 +#: ../src/groupchat_control.py:1066 #, python-format msgid "%(nick)s has been kicked: %(reason)s" msgstr "%(nick)s został wyrzucony: %(reason)s" -#: ../src/groupchat_control.py:1044 +#: ../src/groupchat_control.py:1070 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s" #. do not print 'banned by None' -#: ../src/groupchat_control.py:1051 +#: ../src/groupchat_control.py:1077 #, python-format msgid "%(nick)s has been banned: %(reason)s" msgstr "%(nick)s został zabanowany: %(reason)s" -#: ../src/groupchat_control.py:1055 +#: ../src/groupchat_control.py:1081 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s" -#: ../src/groupchat_control.py:1064 +#: ../src/groupchat_control.py:1090 #, python-format msgid "You are now known as %s" msgstr "Występujesz teraz jako %s" -#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105 -#: ../src/groupchat_control.py:1110 +#: ../src/groupchat_control.py:1128 ../src/groupchat_control.py:1132 +#: ../src/groupchat_control.py:1137 #, python-format msgid "%(nick)s has been removed from the room (%(reason)s)" msgstr "%(nick)s został wyrzucony z pokoju: %(reason)s" -#: ../src/groupchat_control.py:1102 +#: ../src/groupchat_control.py:1129 msgid "affiliation changed" msgstr "afiliacja została zmieniona " -#: ../src/groupchat_control.py:1107 +#: ../src/groupchat_control.py:1134 msgid "room configuration changed to members-only" msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'" -#: ../src/groupchat_control.py:1112 +#: ../src/groupchat_control.py:1139 msgid "system shutdown" msgstr "zamknięcie systemu" -#: ../src/groupchat_control.py:1209 +#: ../src/groupchat_control.py:1207 #, python-format +msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s" +msgstr "" + +#: ../src/groupchat_control.py:1211 +#, python-format +msgid "** Affiliation of %(nick)s has been set to %(affiliation)s" +msgstr "" + +#: ../src/groupchat_control.py:1226 +#, fuzzy, python-format +msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s" +msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s" + +#: ../src/groupchat_control.py:1230 +#, fuzzy, python-format +msgid "** Role of %(nick)s has been set to %(role)s" +msgstr "%(nick)s został wyrzucony: %(reason)s" + +#: ../src/groupchat_control.py:1259 +#, python-format msgid "%s has left" msgstr "%s wychodzi" -#: ../src/groupchat_control.py:1214 +#: ../src/groupchat_control.py:1264 #, python-format msgid "%s has joined the group chat" msgstr "%s dołączył do pokoju" #. Invalid Nickname #. invalid char -#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600 +#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1655 msgid "Invalid nickname" msgstr "Niepoprawny pseudonim" -#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370 -#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471 +#: ../src/groupchat_control.py:1403 ../src/groupchat_control.py:1421 +#: ../src/groupchat_control.py:1505 ../src/groupchat_control.py:1522 #, python-format msgid "Nickname not found: %s" msgstr "Pseudonim nie został odnaleziony: %s" -#: ../src/groupchat_control.py:1386 +#: ../src/groupchat_control.py:1437 msgid "This group chat has no subject" msgstr "Ten pokój nie ma tematu" -#: ../src/groupchat_control.py:1397 +#: ../src/groupchat_control.py:1448 #, python-format msgid "Invited %(contact_jid)s to %(room_jid)s." msgstr "%(contact_jid)s zaproszony do %(room_jid)s." -#: ../src/groupchat_control.py:1527 +#: ../src/groupchat_control.py:1578 #, python-format msgid "" "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The " @@ -8280,14 +8332,14 @@ "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w " "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie." -#: ../src/groupchat_control.py:1534 +#: ../src/groupchat_control.py:1585 #, python-format msgid "" "Usage: /%s <nickname>, opens a private chat window with the specified " "occupant." msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą." -#: ../src/groupchat_control.py:1540 +#: ../src/groupchat_control.py:1591 #, python-format msgid "" "Usage: /%s [reason], closes the current window or tab, displaying reason if " @@ -8296,7 +8348,7 @@ "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli " "został podany." -#: ../src/groupchat_control.py:1546 +#: ../src/groupchat_control.py:1597 #, python-format msgid "" "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally " @@ -8305,7 +8357,7 @@ "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie " "wyświetlając powód." -#: ../src/groupchat_control.py:1550 +#: ../src/groupchat_control.py:1601 #, python-format msgid "" "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally " @@ -8314,7 +8366,7 @@ "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do " "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu." -#: ../src/groupchat_control.py:1554 +#: ../src/groupchat_control.py:1605 #, python-format msgid "" "Usage: /%s <nickname> [reason], removes the occupant specified by nickname " @@ -8324,7 +8376,7 @@ "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z " "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie." -#: ../src/groupchat_control.py:1563 +#: ../src/groupchat_control.py:1614 #, python-format msgid "" "Usage: /%s <nickname> [message], opens a private message window and sends " @@ -8333,61 +8385,61 @@ "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i " "wysyła ją do osoby o takim pseudonimie." -#: ../src/groupchat_control.py:1568 +#: ../src/groupchat_control.py:1619 #, python-format msgid "Usage: /%s <nickname>, changes your nickname in current group chat." msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju." -#: ../src/groupchat_control.py:1572 +#: ../src/groupchat_control.py:1623 #, python-format msgid "Usage: /%s , display the names of group chat occupants." msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju." -#: ../src/groupchat_control.py:1576 +#: ../src/groupchat_control.py:1627 #, python-format msgid "Usage: /%s [topic], displays or updates the current group chat topic." msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju." -#: ../src/groupchat_control.py:1579 +#: ../src/groupchat_control.py:1630 #, python-format msgid "" "Usage: /%s <message>, sends a message without looking for other commands." msgstr "" "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń." -#: ../src/groupchat_control.py:1701 +#: ../src/groupchat_control.py:1759 #, python-format msgid "Are you sure you want to leave group chat \"%s\"?" msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?" -#: ../src/groupchat_control.py:1703 +#: ../src/groupchat_control.py:1761 msgid "" "If you close this window, you will be disconnected from this group chat." msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane." -#: ../src/groupchat_control.py:1740 +#: ../src/groupchat_control.py:1798 msgid "Changing Subject" msgstr "Zmiana tematu" -#: ../src/groupchat_control.py:1741 +#: ../src/groupchat_control.py:1799 msgid "Please specify the new subject:" msgstr "Wpisz nowy temat:" -#: ../src/groupchat_control.py:1745 +#: ../src/groupchat_control.py:1803 msgid "Changing Nickname" msgstr "Zmiana pseudonimu" -#: ../src/groupchat_control.py:1746 +#: ../src/groupchat_control.py:1804 msgid "Please specify the new nickname you want to use:" msgstr "Wpisz nowy pseudonim, którego chcesz używać:" #. Ask for a reason -#: ../src/groupchat_control.py:1773 +#: ../src/groupchat_control.py:1831 #, python-format msgid "Destroying %s" msgstr "Usuwam pokój %s" -#: ../src/groupchat_control.py:1774 +#: ../src/groupchat_control.py:1832 msgid "" "You are going to definitively destroy this room.\n" "You may specify a reason below:" @@ -8395,22 +8447,22 @@ "Zamierzasz całkowicie usunąć ten pokój. \n" "Poniżej możesz podać powód swojej decyzji:" -#: ../src/groupchat_control.py:1776 +#: ../src/groupchat_control.py:1834 msgid "You may also enter an alternate venue:" msgstr "Możesz również podać alternatywne miejsce spotkań:" #. ask for reason -#: ../src/groupchat_control.py:1950 +#: ../src/groupchat_control.py:2008 #, python-format msgid "Kicking %s" msgstr "Wyrzuć %s" -#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248 +#: ../src/groupchat_control.py:2009 ../src/groupchat_control.py:2312 msgid "You may specify a reason below:" msgstr "Podaj przyczynę:" #. ask for reason -#: ../src/groupchat_control.py:2247 +#: ../src/groupchat_control.py:2311 #, python-format msgid "Banning %s" msgstr "Zabanuj %s" @@ -8589,19 +8641,19 @@ msgid "Image is too big" msgstr "Obraz jest za duży" -#: ../src/message_window.py:440 +#: ../src/message_window.py:446 msgid "Chats" msgstr "Rozmowy" -#: ../src/message_window.py:442 +#: ../src/message_window.py:448 msgid "Group Chats" msgstr "Czaty" -#: ../src/message_window.py:444 +#: ../src/message_window.py:450 msgid "Private Chats" msgstr "Rozmowy prywatne" -#: ../src/message_window.py:450 +#: ../src/message_window.py:456 msgid "Messages" msgstr "Wiadomości" @@ -8661,18 +8713,18 @@ msgid "Retrieving profile..." msgstr "Pobieranie profilu..." -#: ../src/profile_window.py:109 ../src/roster_window.py:2758 +#: ../src/profile_window.py:109 ../src/roster_window.py:2771 msgid "File is empty" msgstr "Plik jest pusty" -#: ../src/profile_window.py:112 ../src/roster_window.py:2761 +#: ../src/profile_window.py:112 ../src/roster_window.py:2774 msgid "File does not exist" msgstr "Plik nie istnieje." #. keep identation #. unknown format #: ../src/profile_window.py:126 ../src/profile_window.py:142 -#: ../src/roster_window.py:2763 ../src/roster_window.py:2774 +#: ../src/roster_window.py:2776 ../src/roster_window.py:2787 msgid "Could not load image" msgstr "Nie można załadować obrazka." @@ -8704,7 +8756,7 @@ "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie " "później." -#: ../src/roster_window.py:290 ../src/roster_window.py:955 +#: ../src/roster_window.py:290 ../src/roster_window.py:954 msgid "Merged accounts" msgstr "Połączone konta" @@ -8749,11 +8801,11 @@ msgid "GPG is not usable" msgstr "GPG nie nadaje się do użycia" -#: ../src/roster_window.py:2095 ../src/roster_window.py:3233 +#: ../src/roster_window.py:2107 ../src/roster_window.py:3251 msgid "You are participating in one or more group chats" msgstr "Znajdujesz się w jednym lub kilku pokojach" -#: ../src/roster_window.py:2096 ../src/roster_window.py:3234 +#: ../src/roster_window.py:2108 ../src/roster_window.py:3252 msgid "" "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" @@ -8761,15 +8813,15 @@ "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na " "pewno chcesz stać się niewidoczny?" -#: ../src/roster_window.py:2122 +#: ../src/roster_window.py:2134 msgid "desync'ed" msgstr "rozsynchronizowany" -#: ../src/roster_window.py:2256 ../src/roster_window.py:2493 +#: ../src/roster_window.py:2268 ../src/roster_window.py:2505 msgid "You have unread messages" msgstr "Masz nieprzeczytane wiadomości" -#: ../src/roster_window.py:2257 +#: ../src/roster_window.py:2269 msgid "" "Messages will only be available for reading them later if you have history " "enabled and contact is in your roster." @@ -8777,16 +8829,16 @@ "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz " "włączoną obsługę historii." -#: ../src/roster_window.py:2494 +#: ../src/roster_window.py:2506 msgid "You must read them before removing this transport." msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu." -#: ../src/roster_window.py:2497 +#: ../src/roster_window.py:2509 #, python-format msgid "Transport \"%s\" will be removed" msgstr "Transport \"%s\" zostanie usunięty" -#: ../src/roster_window.py:2498 +#: ../src/roster_window.py:2510 msgid "" "You will no longer be able to send and receive messages from contacts using " "this transport." @@ -8794,11 +8846,11 @@ "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą " "tego transportu." -#: ../src/roster_window.py:2501 +#: ../src/roster_window.py:2513 msgid "Transports will be removed" msgstr "Transporty zostaną usunięte" -#: ../src/roster_window.py:2506 +#: ../src/roster_window.py:2518 #, python-format msgid "" "You will no longer be able to send and receive messages to contacts from " @@ -8808,51 +8860,52 @@ "następujących transportów: %s" #. it's jid -#: ../src/roster_window.py:2640 +#: ../src/roster_window.py:2652 msgid "Rename Contact" msgstr "Zmień nazwę dla kontaktu" -#: ../src/roster_window.py:2641 +#: ../src/roster_window.py:2653 #, python-format msgid "Enter a new nickname for contact %s" msgstr "Wpisz nazwę dla kontaktu %s." -#: ../src/roster_window.py:2648 +#: ../src/roster_window.py:2660 msgid "Rename Group" msgstr "Zmień nazwę grupy" -#: ../src/roster_window.py:2649 +#: ../src/roster_window.py:2661 #, python-format msgid "Enter a new name for group %s" msgstr "Wpisz nową nazwę dla grupy %s." -#: ../src/roster_window.py:2697 +#: ../src/roster_window.py:2717 msgid "Remove Group" msgstr "Usuń grupę" -#: ../src/roster_window.py:2698 +#: ../src/roster_window.py:2718 #, python-format msgid "Do you want to remove group %s from the roster?" msgstr "Czy chcesz usunąć z rostera grupę %s?" -#: ../src/roster_window.py:2699 -msgid "Remove also all contacts in this group from your roster" +#: ../src/roster_window.py:2719 +#, fuzzy +msgid "Also remove all contacts in this group from your roster" msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy" -#: ../src/roster_window.py:2745 +#: ../src/roster_window.py:2758 msgid "Assign OpenPGP Key" msgstr "Przypisz klucz OpenPGP" -#: ../src/roster_window.py:2746 +#: ../src/roster_window.py:2759 msgid "Select a key to apply to the contact" msgstr "Wybierz klucz, który chcesz przypisać kontaktowi" -#: ../src/roster_window.py:3098 +#: ../src/roster_window.py:3112 #, python-format msgid "Contact \"%s\" will be removed from your roster" msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów" -#: ../src/roster_window.py:3102 +#: ../src/roster_window.py:3116 msgid "" "By removing this contact you also remove authorization resulting in him or " "her always seeing you as offline." @@ -8860,7 +8913,13 @@ "Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt " "będzie zawsze widział Cię jako rozłączonego." -#: ../src/roster_window.py:3107 +#. Contact is not in roster +#: ../src/roster_window.py:3121 +#, fuzzy +msgid "Do you want to continue?" +msgstr "Czy chcesz zaakceptować zaproszenie?" + +#: ../src/roster_window.py:3125 msgid "" "By removing this contact you also by default remove authorization resulting " "in him or her always seeing you as offline." @@ -8868,16 +8927,16 @@ "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt " "będzie zawsze widział Cię jako rozłączonego." -#: ../src/roster_window.py:3110 +#: ../src/roster_window.py:3128 msgid "I want this contact to know my status after removal" msgstr "Chcę żeby po usunięciu ten kontakt znał mój status" #. several contact to remove at the same time -#: ../src/roster_window.py:3114 +#: ../src/roster_window.py:3132 msgid "Contacts will be removed from your roster" msgstr "Kontakty zostaną usunięte z twojej listy kontaktów" -#: ../src/roster_window.py:3118 +#: ../src/roster_window.py:3136 #, python-format msgid "" "By removing these contacts:%s\n" @@ -8887,19 +8946,19 @@ "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny " "jako rozłączony." -#: ../src/roster_window.py:3157 +#: ../src/roster_window.py:3175 msgid "No account available" msgstr "Żadne konto nie jest dostępne" -#: ../src/roster_window.py:3158 +#: ../src/roster_window.py:3176 msgid "You must create an account before you can chat with other contacts." msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera." -#: ../src/roster_window.py:3676 +#: ../src/roster_window.py:3692 msgid "Metacontacts storage not supported by your server" msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów" -#: ../src/roster_window.py:3678 +#: ../src/roster_window.py:3694 msgid "" "Your server does not support storing metacontacts information. So those " "information will not be saved on next reconnection." @@ -8907,12 +8966,12 @@ "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie " "zostanie przywrócona podczas następnego połączenia." -#: ../src/roster_window.py:3756 +#: ../src/roster_window.py:3772 msgid "" "You are about to create a metacontact. Are you sure you want to continue?" msgstr "Chcesz utworzyć metakontakt. Kontynuować?" -#: ../src/roster_window.py:3758 +#: ../src/roster_window.py:3774 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 " @@ -8922,11 +8981,11 @@ "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont " "Jabbera lub zarejestrowana jest w kilku transportach." -#: ../src/roster_window.py:3871 +#: ../src/roster_window.py:3887 msgid "Invalid file URI:" msgstr "Niepoprawny adres pliku:" -#: ../src/roster_window.py:3882 +#: ../src/roster_window.py:3898 #, fuzzy, python-format msgid "Do you want to send this file to %s:" msgid_plural "Do you want to send these files to %s:" @@ -8939,123 +8998,123 @@ #. for chat_with #. for single message #. join gc -#: ../src/roster_window.py:4554 ../src/roster_window.py:4625 -#: ../src/roster_window.py:4634 ../src/systray.py:219 ../src/systray.py:224 +#: ../src/roster_window.py:4569 ../src/roster_window.py:4640 +#: ../src/roster_window.py:4649 ../src/systray.py:219 ../src/systray.py:224 #: ../src/systray.py:230 #, python-format msgid "using account %s" msgstr "używając konta %s" #. add -#: ../src/roster_window.py:4641 +#: ../src/roster_window.py:4656 #, python-format msgid "to %s account" msgstr "do konta %s" #. disco -#: ../src/roster_window.py:4646 +#: ../src/roster_window.py:4661 #, python-format msgid "using %s account" msgstr "używając konta %s" -#: ../src/roster_window.py:4683 +#: ../src/roster_window.py:4698 ../src/systray.py:257 msgid "_Manage Bookmarks..." msgstr "_Zarządzaj zakładkami..." #. profile, avatar -#: ../src/roster_window.py:4703 +#: ../src/roster_window.py:4718 #, python-format msgid "of account %s" msgstr "dla konta %s" -#: ../src/roster_window.py:4743 +#: ../src/roster_window.py:4758 #, python-format msgid "for account %s" msgstr "dla konta %s" -#: ../src/roster_window.py:4805 ../src/roster_window.py:4914 +#: ../src/roster_window.py:4820 ../src/roster_window.py:4929 msgid "_Change Status Message" msgstr "_Zmień opis statusu" -#: ../src/roster_window.py:4832 +#: ../src/roster_window.py:4847 msgid "Publish Tune" msgstr "_Publikuj Utwór" -#: ../src/roster_window.py:4839 +#: ../src/roster_window.py:4854 msgid "Mood" msgstr "Nastrój" -#: ../src/roster_window.py:4843 +#: ../src/roster_window.py:4858 msgid "Activity" msgstr "Aktywność" -#: ../src/roster_window.py:4848 +#: ../src/roster_window.py:4863 msgid "Configure Services..." msgstr "Konfiguruj Usługi..." -#: ../src/roster_window.py:5002 +#: ../src/roster_window.py:5017 msgid "_Maximize All" msgstr "_Maksymalizuj wszystkie" #. Send Group Message -#: ../src/roster_window.py:5010 ../src/roster_window.py:5519 +#: ../src/roster_window.py:5025 ../src/roster_window.py:5550 msgid "Send Group M_essage" msgstr "_Wyślij wiadomość grupową" -#: ../src/roster_window.py:5018 +#: ../src/roster_window.py:5033 msgid "To all users" msgstr "Do wszystkich użytkowników" -#: ../src/roster_window.py:5022 +#: ../src/roster_window.py:5037 msgid "To all online users" msgstr "Do wszystkich połączonych użytkowników" -#: ../src/roster_window.py:5419 +#: ../src/roster_window.py:5447 msgid "I would like to add you to my roster" msgstr "Chciałbym dodać Cię do listy kontaktów" #. Manage Transport submenu -#: ../src/roster_window.py:5539 +#: ../src/roster_window.py:5570 msgid "_Manage Contacts" msgstr "_Zarządzaj kontaktami" #. Send single message -#: ../src/roster_window.py:5600 +#: ../src/roster_window.py:5631 msgid "Send Single Message" msgstr "Wyślij wiadomość" #. Manage Transport submenu -#: ../src/roster_window.py:5656 +#: ../src/roster_window.py:5687 msgid "_Manage Transport" msgstr "_Zarządzaj transportami" #. Modify Transport -#: ../src/roster_window.py:5664 +#: ../src/roster_window.py:5695 msgid "_Modify Transport" msgstr "_Modyfikuj transport" -#: ../src/roster_window.py:5739 +#: ../src/roster_window.py:5770 msgid "_Maximize" msgstr "_Maksymalizuj" -#: ../src/roster_window.py:5746 +#: ../src/roster_window.py:5777 msgid "_Disconnect" msgstr "_Rozłącz" -#: ../src/roster_window.py:5826 +#: ../src/roster_window.py:5857 msgid "_New Group Chat" msgstr "_Nowa rozmowa grupowa" #. History manager -#: ../src/roster_window.py:5939 +#: ../src/roster_window.py:5970 msgid "History Manager" msgstr "Historia rozmów" -#: ../src/roster_window.py:5948 +#: ../src/roster_window.py:5979 msgid "_Join New Group Chat" msgstr "_Dołącz do pokoju" -#: ../src/roster_window.py:6158 +#: ../src/roster_window.py:6189 msgid "Change Status Message..." msgstr "Zmień opis statusu..." @@ -9081,18 +9140,18 @@ msgid "Subject: %s" msgstr "Temat: %s" -#: ../src/session.py:392 ../src/session.py:430 +#: ../src/session.py:391 ../src/session.py:423 msgid "Confirm these session options" msgstr "Potwierdź opcje sesji" -#: ../src/session.py:393 -#, python-format +#: ../src/session.py:392 +#, fuzzy, python-format msgid "" "The remote client wants to negotiate an session with these features:\n" "\n" -"\t\t%s\n" +"\t%s\n" "\n" -"\t\tAre these options acceptable?" +"\tAre these options acceptable?" msgstr "" "Zdalny klient chce przeprowadzić negocjację sesji z poniższymi " "ustawieniami:\n" @@ -9101,7 +9160,7 @@ "\n" "\t\tCzy akceptujesz te ustawienia?" -#: ../src/session.py:431 +#: ../src/session.py:424 #, python-format msgid "" "The remote client selected these options:\n" @@ -9120,7 +9179,7 @@ msgid "_Change Status Message..." msgstr "_Zmień opis statusu..." -#: ../src/systray.py:261 +#: ../src/systray.py:270 msgid "Hide this menu" msgstr "Ukryj to menu" @@ -9300,6 +9359,12 @@ msgid " resource with priority " msgstr " zasób o wysokim priorytecie " +#~ msgid "Select the account with which to synchronise" +#~ msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty" + +#~ msgid "E2E encryption enabled" +#~ msgstr "Szyfrowanie E2E włączone" + #~ msgid "General:" #~ msgstr "Ogólne" Modified: branches/osx_newbuildsys/src/adhoc_commands.py =================================================================== --- branches/osx_newbuildsys/src/adhoc_commands.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/adhoc_commands.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -444,7 +444,7 @@ # handling xml stanzas def request_command_list(self): '''Request the command list. Change stage on delivery.''' - query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), xmlns=xmpp.NS_DISCO_ITEMS) + query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), queryNS=xmpp.NS_DISCO_ITEMS) query.setQuerynode(xmpp.NS_COMMANDS) def callback(response): Modified: branches/osx_newbuildsys/src/chat_control.py =================================================================== --- branches/osx_newbuildsys/src/chat_control.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/chat_control.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -2185,6 +2185,14 @@ # Clean events gajim.events.remove_events(self.account, self.get_full_jid(), types = ['printed_' + self.type_id, self.type_id]) + # Remove contact instance if contact has been removed + key = (self.contact.jid, self.account) + roster = gajim.interface.roster + if key in roster.contacts_to_be_removed.keys(): + backend = roster.contacts_to_be_removed[key]['backend'] + del roster.contacts_to_be_removed[key] + roster.remove_contact(self.contact.jid, self.account, force=True, + backend=backend) # remove all register handlers on widgets, created by self.xml # to prevent circular references among objects for i in self.handlers.keys(): Modified: branches/osx_newbuildsys/src/common/caps.py =================================================================== --- branches/osx_newbuildsys/src/common/caps.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/caps.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -193,8 +193,7 @@ con.discoverInfo(jid, '%s#%s' % (node, hash)) def is_supported(self, contact, feature): - # No resource -> can't have any caps - if not contact or not contact.resource: + if not contact: return False # Unfortunately, if all resources are offline, the contact Modified: branches/osx_newbuildsys/src/common/commands.py =================================================================== --- branches/osx_newbuildsys/src/common/commands.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/commands.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -158,7 +158,8 @@ import message_control rooms = [] for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC): + message_control.TYPE_GC) + gajim.interface.minimized_controls[account].\ + values(): acct = gc_control.account # check if account is the good one if acct != account: @@ -224,8 +225,7 @@ try: gc = form['groupchats'].values - except: # KeyError if there's no presence-type field in form or - # AttributeError if that field is of wrong type + except: # KeyError if there's no groupchats in form self.badRequest(request) return False account = self.connection.name @@ -233,8 +233,14 @@ for room_jid in gc: gc_control = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) + if not gc_control: + gc_control = gajim.interface.minimized_controls[account]\ + [room_jid] + gc_control.shutdown() + gajim.interface.roster.remove_groupchat(room_jid, account) + continue gc_control.parent_win.remove_tab(gc_control, None, force = True) - except: # KeyError if there's no presence-type field in form or + except: # KeyError if there's no such room opened self.badRequest(request) return False response, cmd = self.buildResponse(request, status = 'completed') @@ -266,7 +272,7 @@ for event in events[jid]: self.connection.send_message(j, event.parameters[0], '', type=event.type_, subject=event.parameters[1], - resource=resource, forward_from=jid) + resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') Modified: branches/osx_newbuildsys/src/common/config.py =================================================================== --- branches/osx_newbuildsys/src/common/config.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/config.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -111,7 +111,8 @@ 'collapsed_rows': [ opt_str, '', _('List (space separated) of rows (accounts and groups) that are collapsed.'), True ], 'roster_theme': [ opt_str, _('default'), '', True ], 'mergeaccounts': [ opt_bool, False, '', True ], - 'sort_by_show': [ opt_bool, True, '', True ], + 'sort_by_show_in_roster': [ opt_bool, True, '', True ], + 'sort_by_show_in_muc': [ opt_bool, False, '', True ], 'enable_zeroconf': [opt_bool, False, _('Enable link-local/zeroconf messaging')], 'use_speller': [ opt_bool, False, ], 'ignore_incoming_xhtml': [ opt_bool, False, ], Modified: branches/osx_newbuildsys/src/common/connection.py =================================================================== --- branches/osx_newbuildsys/src/common/connection.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/connection.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -1073,7 +1073,8 @@ def send_message(self, jid, msg, keyID, type='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None, - user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, original_message=None): + user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, + original_message=None, delayed=None): if not self.connection: return 1 if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): @@ -1174,6 +1175,14 @@ addresses.addChild('address', attrs = {'type': 'ofrom', 'jid': forward_from}) + # XEP-0203 + if delayed: + our_jid = gajim.get_jid_from_account(self.name) + '/' + \ + self.server_resource + timestamp = time.strftime('%Y-%m-%dT%TZ', time.gmtime(delayed)) + msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2, + attrs={'from': our_jid, 'stamp': timestamp}) + # XEP-0184 if msgtxt and gajim.config.get_per('accounts', self.name, 'request_receipt') and gajim.capscache.is_supported(contact, Modified: branches/osx_newbuildsys/src/common/connection_handlers.py =================================================================== --- branches/osx_newbuildsys/src/common/connection_handlers.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/connection_handlers.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -1956,6 +1956,12 @@ user_nick = '' contact_nickname = None transport_auto_auth = False + # XEP-0203 + delay_tag = prs.getTag('delay', namespace=common.xmpp.NS_DELAY2) + if delay_tag: + tim = prs.getTimestamp2() + tim = helpers.datetime_tuple(tim) + timestamp = localtime(timegm(tim)) xtags = prs.getTags('x') for x in xtags: namespace = x.getNamespace() @@ -1968,7 +1974,7 @@ elif namespace == common.xmpp.NS_VCARD_UPDATE: avatar_sha = x.getTagData('photo') contact_nickname = x.getTagData('nickname') - elif namespace == common.xmpp.NS_DELAY: + elif namespace == common.xmpp.NS_DELAY and not timestamp: # XEP-0091 tim = prs.getTimestamp() tim = helpers.datetime_tuple(tim) Modified: branches/osx_newbuildsys/src/common/pep.py =================================================================== --- branches/osx_newbuildsys/src/common/pep.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/pep.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -100,7 +100,7 @@ 'having_appointment': {'category': _('Having an Appointment')}, 'inactive': {'category': _('Inactive'), 'day_off': _('Day Off'), - 'hanging_out': _('Hanging out'), + 'hanging_out': _('Hanging Out'), 'on_vacation': _('On Vacation'), 'scheduled_holiday': _('Scheduled Holiday'), 'sleeping': _('Sleeping')}, Modified: branches/osx_newbuildsys/src/common/proxy65_manager.py =================================================================== --- branches/osx_newbuildsys/src/common/proxy65_manager.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/proxy65_manager.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -105,6 +105,9 @@ self.port = int(port) self.jid = unicode(jid) self.state = S_RESOLVED + #FIXME: re-enable proxy testing + self.state = S_FINISHED + return self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, self.sid, self.sender_jid, self._on_receiver_success, self._on_connect_failure) Modified: branches/osx_newbuildsys/src/common/stanza_session.py =================================================================== --- branches/osx_newbuildsys/src/common/stanza_session.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/stanza_session.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -73,23 +73,26 @@ def remove_events(self, types): any_removed = False - for event in gajim.events.get_events(self.conn.name, self.jid, types=types): - # the event wasn't in this session - if (event.type_ == 'chat' and event.parameters[8] != self) or \ - (event.type_ == 'printed_chat' and event.parameters[0].session != self): - continue + for j in (self.jid, self.jid.getStripped()): + for event in gajim.events.get_events(self.conn.name, j, types=types): + # the event wasn't in this session + if (event.type_ == 'chat' and event.parameters[8] != self) or \ + (event.type_ == 'printed_chat' and event.parameters[0].session != \ + self): + continue - # events.remove_events returns True when there were no events - # for some reason - r = gajim.events.remove_events(self.conn.name, self.jid, event) + # events.remove_events returns True when there were no events + # for some reason + r = gajim.events.remove_events(self.conn.name, j, event) - if not r: - any_removed = True + if not r: + any_removed = True return any_removed def generate_thread_id(self): - return "".join([random.choice(string.ascii_letters) for x in xrange(0,32)]) + return ''.join([random.choice(string.ascii_letters) for x in xrange(0, + 32)]) def send(self, msg): if self.thread_id: @@ -101,7 +104,7 @@ if isinstance(msg, xmpp.Message): self.last_send = time.time() - def reject_negotiation(self, body = None): + def reject_negotiation(self, body=None): msg = xmpp.Message() feature = msg.NT.feature feature.setNamespace(xmpp.NS_FEATURE) @@ -120,7 +123,8 @@ self.cancelled_negotiation() def cancelled_negotiation(self): - '''A negotiation has been cancelled, so reset this session to its default state.''' + '''A negotiation has been cancelled, so reset this session to its default + state.''' if self.control: self.control.on_cancel_session_negotiation() @@ -185,8 +189,8 @@ # handle_session_negotiation method. class EncryptedStanzaSession(StanzaSession): - def __init__(self, conn, jid, thread_id, type = 'chat'): - StanzaSession.__init__(self, conn, jid, thread_id, type = 'chat') + def __init__(self, conn, jid, thread_id, type='chat'): + StanzaSession.__init__(self, conn, jid, thread_id, type='chat') self.xes = {} self.es = {} @@ -286,13 +290,13 @@ def generate_initiator_keys(self, k): return (self.hmac(k, 'Initiator Cipher Key'), - self.hmac(k, 'Initiator MAC Key'), - self.hmac(k, 'Initiator SIGMA Key') ) + self.hmac(k, 'Initiator MAC Key'), + self.hmac(k, 'Initiator SIGMA Key')) def generate_responder_keys(self, k): return (self.hmac(k, 'Responder Cipher Key'), - self.hmac(k, 'Responder MAC Key'), - self.hmac(k, 'Responder SIGMA Key') ) + self.hmac(k, 'Responder MAC Key'), + self.hmac(k, 'Responder SIGMA Key')) def compress(self, plaintext): if self.compression is None: @@ -348,13 +352,13 @@ def logging_preference(self): if gajim.config.get('log_encrypted_sessions'): - return ["may", "mustnot"] + return ['may', 'mustnot'] else: - return ["mustnot", "may"] + return ['mustnot', 'may'] def get_shared_secret(self, e, y, p): if (not 1 < e < (p - 1)): - raise exceptions.NegotiationError, "invalid DH value" + raise exceptions.NegotiationError, 'invalid DH value' return crypto.sha256(crypto.encode_mpi(crypto.powmod(e, y, p))) @@ -401,7 +405,7 @@ enc_sig = parsed.getTag(name='SignatureValue', namespace=XmlDsig).getData() - signature = (crypto.decode_mpi(base64.b64decode(enc_sig)),) + signature = (crypto.decode_mpi(base64.b64decode(enc_sig)), ) else: mac_o = self.decrypt(id_o) pubkey_o = '' @@ -434,23 +438,28 @@ pubkey = secrets.secrets().my_pubkey(self.conn.name) fields = (pubkey.n, pubkey.e) - cb_fields = map(lambda f: base64.b64encode(crypto.encode_mpi(f)), fields) + cb_fields = map(lambda f: base64.b64encode(crypto.encode_mpi(f)), + fields) - pubkey_s = '<RSAKeyValue xmlns="http://www.w3.org/2000/09/xmldsig#"><Modulus>%s</Modulus><Exponent>%s</Exponent></RSAKeyValue>' % tuple(cb_fields) + pubkey_s = '<RSAKeyValue xmlns="http://www.w3.org/2000/09/xmldsig#"' + '><Modulus>%s</Modulus><Exponent>%s</Exponent></RSAKeyValue>' % \ + tuple(cb_fields) else: pubkey_s = '' form_s2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) old_c_s = self.c_s - content = self.n_o + self.n_s + crypto.encode_mpi(dh_i) + pubkey_s + self.form_s + form_s2 + content = self.n_o + self.n_s + crypto.encode_mpi(dh_i) + pubkey_s + \ + self.form_s + form_s2 mac_s = self.hmac(self.ks_s, content) if self.negotiated['send_pubkey']: signature = self.sign(mac_s) - sign_s = '<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">%s</SignatureValue>' % base64.b64encode(signature) + sign_s = '<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">' + '%s</SignatureValue>' % base64.b64encode(signature) if self.negotiated['send_pubkey'] == 'hash': b64ed = base64.b64encode(self.hash(pubkey_s)) @@ -471,8 +480,8 @@ # XXX save retained secret? self.check_identity(lambda : ()) - return (xmpp.DataField(name='identity', value=base64.b64encode(id_s)), \ - xmpp.DataField(name='mac', value=base64.b64encode(m_s))) + return (xmpp.DataField(name='identity', value=base64.b64encode(id_s)), + xmpp.DataField(name='mac', value=base64.b64encode(m_s))) def negotiate_e2e(self, sigmai): self.negotiated = {} @@ -483,41 +492,58 @@ x = xmpp.DataForm(typ='form') - x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn', typ='hidden')) - x.addChild(node=xmpp.DataField(name='accept', value='1', typ='boolean', required=True)) + x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn', + typ='hidden')) + x.addChild(node=xmpp.DataField(name='accept', value='1', typ='boolean', + required=True)) # this field is incorrectly called 'otr' in XEPs 0116 and 0217 - x.addChild(node=xmpp.DataField(name='logging', typ='list-single', options=self.logging_preference(), required=True)) + x.addChild(node=xmpp.DataField(name='logging', typ='list-single', + options=self.logging_preference(), required=True)) # unsupported options: 'disabled', 'enabled' - x.addChild(node=xmpp.DataField(name='disclosure', typ='list-single', options=['never'], required=True)) - x.addChild(node=xmpp.DataField(name='security', typ='list-single', options=['e2e'], required=True)) - x.addChild(node=xmpp.DataField(name='crypt_algs', value='aes128-ctr', typ='hidden')) - x.addChild(node=xmpp.DataField(name='hash_algs', value='sha256', typ='hidden')) - x.addChild(node=xmpp.DataField(name='compress', value='none', typ='hidden')) + x.addChild(node=xmpp.DataField(name='disclosure', typ='list-single', + options=['never'], required=True)) + x.addChild(node=xmpp.DataField(name='security', typ='list-single', + options=['e2e'], required=True)) + x.addChild(node=xmpp.DataField(name='crypt_algs', value='aes128-ctr', + typ='hidden')) + x.addChild(node=xmpp.DataField(name='hash_algs', value='sha256', + typ='hidden')) + x.addChild(node=xmpp.DataField(name='compress', value='none', + typ='hidden')) # unsupported options: 'iq', 'presence' - x.addChild(node=xmpp.DataField(name='stanzas', typ='list-multi', options=['message'])) + x.addChild(node=xmpp.DataField(name='stanzas', typ='list-multi', + options=['message'])) - x.addChild(node=xmpp.DataField(name='init_pubkey', options=['none', 'key', 'hash'], typ='list-single')) + x.addChild(node=xmpp.DataField(name='init_pubkey', options=['none', 'key', + 'hash'], typ='list-single')) # XXX store key, use hash - x.addChild(node=xmpp.DataField(name='resp_pubkey', options=['none', 'key'], typ='list-single')) + x.addChild(node=xmpp.DataField(name='resp_pubkey', options=['none', + 'key'], typ='list-single')) x.addChild(node=xmpp.DataField(name='ver', value='1.0', typ='hidden')) - x.addChild(node=xmpp.DataField(name='rekey_freq', value='4294967295', typ='hidden')) + x.addChild(node=xmpp.DataField(name='rekey_freq', value='4294967295', + typ='hidden')) - x.addChild(node=xmpp.DataField(name='sas_algs', value='sas28x5', typ='hidden')) - x.addChild(node=xmpp.DataField(name='sign_algs', value='http://www.w3.org/2000/09/xmldsig#rsa-sha256', typ='hidden')) + x.addChild(node=xmpp.DataField(name='sas_algs', value='sas28x5', + typ='hidden')) + x.addChild(node=xmpp.DataField(name='sign_algs', + value='http://www.w3.org/2000/09/xmldsig#rsa-sha256', typ='hidden')) self.n_s = crypto.generate_nonce() - x.addChild(node=xmpp.DataField(name='my_nonce', value=base64.b64encode(self.n_s), typ='hidden')) + x.addChild(node=xmpp.DataField(name='my_nonce', + value=base64.b64encode(self.n_s), typ='hidden')) - modp_options = [ int(g) for g in gajim.config.get('esession_modp').split(',') ] + modp_options = [ int(g) for g in gajim.config.get('esession_modp').split( + ',') ] - x.addChild(node=xmpp.DataField(name='modp', typ='list-single', options=map(lambda x: [ None, x ], modp_options))) + x.addChild(node=xmpp.DataField(name='modp', typ='list-single', + options=map(lambda x: [ None, x ], modp_options))) x.addChild(node=self.make_dhfield(modp_options, sigmai)) self.sigmai = sigmai @@ -536,16 +562,10 @@ not_acceptable = [] ask_user = {} - fixed = { 'disclosure': 'never', - 'security': 'e2e', - 'crypt_algs': 'aes128-ctr', - 'hash_algs': 'sha256', - 'compress': 'none', - 'stanzas': 'message', - 'init_pubkey': 'none', - 'resp_pubkey': 'none', - 'ver': '1.0', - 'sas_algs': 'sas28x5' } + fixed = { 'disclosure': 'never', 'security': 'e2e', + 'crypt_algs': 'aes128-ctr', 'hash_algs': 'sha256', 'compress': 'none', + 'stanzas': 'message', 'init_pubkey': 'none', 'resp_pubkey': 'none', + 'ver': '1.0', 'sas_algs': 'sas28x5' } self.encryptable_stanzas = ['message'] @@ -554,7 +574,8 @@ self.hash_alg = SHA256 self.compression = None - for name, field in map(lambda name: (name, form.getField(name)), form.asDict().keys()): + for name, field in map(lambda name: (name, form.getField(name)), + form.asDict().keys()): options = map(lambda x: x[1], field.getOptions()) values = field.getValues() @@ -598,7 +619,8 @@ if (XmlDsig + 'rsa-sha256') in options: negotiated['sign_algs'] = XmlDsig + 'rsa-sha256' else: - # XXX some things are handled elsewhere, some things are not-implemented + # XXX some things are handled elsewhere, some things are + # not-implemented pass return (negotiated, not_acceptable, ask_user) @@ -632,28 +654,31 @@ self.n_o = base64.b64decode(form['my_nonce']) dhhashes = form.getField('dhhashes').getValues() - self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode("utf8")) + self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode( + 'utf8')) bytes = int(self.n / 8) self.n_s = crypto.generate_nonce() - self.c_o = crypto.decode_mpi(crypto.random_bytes(bytes)) # n-bit random number + # n-bit random number + self.c_o = crypto.decode_mpi(crypto.random_bytes(bytes)) self.c_s = self.c_o ^ (2 ** (self.n - 1)) self.y = crypto.srand(2 ** (2 * self.n - 1), p - 1) self.d = crypto.powmod(g, self.y, p) - to_add = { 'my_nonce': self.n_s, - 'dhkeys': crypto.encode_mpi(self.d), - 'counter': crypto.encode_mpi(self.c_o), - 'nonce': self.n_o } + to_add = {'my_nonce': self.n_s, + 'dhkeys': crypto.encode_mpi(self.d), + 'counter': crypto.encode_mpi(self.c_o), + 'nonce': self.n_o} for name in to_add: b64ed = base64.b64encode(to_add[name]) x.addChild(node=xmpp.DataField(name=name, value=b64ed)) - self.form_o = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) + self.form_o = ''.join(map(lambda el: xmpp.c14n.c14n(el), + form.getChildren())) self.form_s = ''.join(map(lambda el: xmpp.c14n.c14n(el), x.getChildren())) self.status = 'responded-e2e' @@ -687,14 +712,15 @@ else: negotiated['logging'] = self.logging_preference()[0] - for r,a in (('recv_pubkey', 'resp_pubkey'), ('send_pubkey', 'init_pubkey')): + for r,a in (('recv_pubkey', 'resp_pubkey'), ('send_pubkey', + 'init_pubkey')): negotiated[r] = None if a in form.asDict() and form[a] in ('key', 'hash'): negotiated[r] = form[a] if 'sign_algs' in form.asDict(): - if form['sign_algs'] in (XmlDsig + 'rsa-sha256',): + if form['sign_algs'] in (XmlDsig + 'rsa-sha256', ): negotiated['sign_algs'] = form['sign_algs'] else: not_acceptable.append(form['sign_algs']) @@ -731,9 +757,11 @@ self.k = self.get_shared_secret(self.d, x, p) - result.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) + result.addChild(node=xmpp.DataField(name='FORM_TYPE', + value='urn:xmpp:ssn')) result.addChild(node=xmpp.DataField(name='accept', value='1')) - result.addChild(node=xmpp.DataField(name='nonce', value=base64.b64encode(self.n_o))) + result.addChild(node=xmpp.DataField(name='nonce', + value=base64.b64encode(self.n_o))) self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(self.k) @@ -741,7 +769,8 @@ self.kc_o, self.km_o, self.ks_o = self.generate_responder_keys(self.k) self.verify_identity(form, self.d, True, 'b') else: - srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped()) + srses = secrets.secrets().retained_secrets(self.conn.name, + self.jid.getStripped()) rshashes = [self.hmac(self.n_s, rs) for (rs,v) in srses] if not rshashes: @@ -751,11 +780,14 @@ rshashes = [base64.b64encode(rshash) for rshash in rshashes] result.addChild(node=xmpp.DataField(name='rshashes', value=rshashes)) - result.addChild(node=xmpp.DataField(name='dhkeys', value=base64.b64encode(crypto.encode_mpi(e)))) + result.addChild(node=xmpp.DataField(name='dhkeys', + value=base64.b64encode(crypto.encode_mpi(e)))) - self.form_o = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) + self.form_o = ''.join(map(lambda el: xmpp.c14n.c14n(el), + form.getChildren())) - # MUST securely destroy K unless it will be used later to generate the final shared secret + # MUST securely destroy K unless it will be used later to generate the + # final shared secret for datafield in self.make_identity(result, e): result.addChild(node=datafield) @@ -779,7 +811,8 @@ x = xmpp.DataForm(typ='result') for field in ('nonce', 'dhkeys', 'rshashes', 'identity', 'mac'): - assert field in form.asDict(), "alice's form didn't have a %s field" % field + assert field in form.asDict(), "alice's form didn't have a %s field" \ + % field # 4.5.1 generating provisory session keys e = crypto.decode_mpi(base64.b64decode(form['dhkeys'])) @@ -800,8 +833,10 @@ srs = '' - srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped()) - rshashes = [base64.b64decode(rshash) for rshash in form.getField('rshashes').getValues()] + srses = secrets.secrets().retained_secrets(self.conn.name, + self.jid.getStripped()) + rshashes = [base64.b64decode(rshash) for rshash in form.getField( + 'rshashes').getValues()] for (secret, verified) in srses: if self.hmac(self.n_o, secret) in rshashes: @@ -824,8 +859,10 @@ srshash = crypto.random_bytes(32) x.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) - x.addChild(node=xmpp.DataField(name='nonce', value=base64.b64encode(self.n_o))) - x.addChild(node=xmpp.DataField(name='srshash', value=base64.b64encode(srshash))) + x.addChild(node=xmpp.DataField(name='nonce', value=base64.b64encode( + self.n_o))) + x.addChild(node=xmpp.DataField(name='srshash', value=base64.b64encode( + srshash))) for datafield in self.make_identity(x, self.d): x.addChild(node=datafield) @@ -847,7 +884,8 @@ def final_steps_alice(self, form): srs = '' - srses = secrets.secrets().retained_secrets(self.conn.name, self.jid.getStripped()) + srses = secrets.secrets().retained_secrets(self.conn.name, + self.jid.getStripped()) srshash = base64.b64decode(form['srshash']) @@ -869,7 +907,8 @@ # 4.6.2 Verifying Bob's Identity self.verify_identity(form, self.d, False, 'b') - # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. + # Note: If Alice discovers an error then she SHOULD ignore any encrypted + # content she received in the stanza. if self.negotiated['logging'] == 'mustnot': self.loggable = False @@ -881,7 +920,9 @@ self.control.print_esession_details() def do_retained_secret(self, k, old_srs): - '''calculate the new retained secret. determine if the user needs to check the remote party's identity. set up callbacks for when the identity has been verified.''' + '''calculate the new retained secret. determine if the user needs to check + the remote party's identity. set up callbacks for when the identity has + been verified.''' new_srs = self.hmac(k, 'New Retained Secret') self.srs = new_srs @@ -899,16 +940,19 @@ self.verified_identity = True else: # had a secret, but it wasn't verified. - secrets.secrets().replace_srs(account, bjid, old_srs, new_srs, False) + secrets.secrets().replace_srs(account, bjid, old_srs, new_srs, + False) else: # we don't even have an SRS secrets.secrets().save_new_srs(account, bjid, new_srs, False) def _verified_srs_cb(self): - secrets.secrets().replace_srs(self.conn.name, self.jid.getStripped(), self.srs, self.srs, True) + secrets.secrets().replace_srs(self.conn.name, self.jid.getStripped(), + self.srs, self.srs, True) def _unverified_srs_cb(self): - secrets.secrets().replace_srs(self.conn.name, self.jid.getStripped(), self.srs, self.srs, False) + secrets.secrets().replace_srs(self.conn.name, self.jid.getStripped(), + self.srs, self.srs, False) def make_dhfield(self, modp_options, sigmai): dhs = [] Modified: branches/osx_newbuildsys/src/common/xmpp/protocol.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/protocol.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/common/xmpp/protocol.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -43,6 +43,7 @@ NS_CONFERENCE ='jabber:x:conference' NS_DATA ='jabber:x:data' # XEP-0004 NS_DELAY ='jabber:x:delay' +NS_DELAY2 ='urn:xmpp:delay' NS_DIALBACK ='jabber:server:dialback' NS_DISCO ='http://jabber.org/protocol/disco' NS_DISCO_INFO =NS_DISCO+'#info' @@ -322,10 +323,15 @@ if self['from']: self.setFrom(self['from']) if node and type(self)==type(node) and self.__class__==node.__class__ and self.attrs.has_key('id'): del self.attrs['id'] self.timestamp=None - for x in self.getTags('x',namespace=NS_DELAY): + for d in self.getTags('delay',namespace=NS_DELAY2): try: - if x.getAttr('stamp')<self.getTimestamp(): self.setTimestamp(x.getAttr('stamp')) + if d.getAttr('stamp')<self.getTimestamp2(): self.setTimestamp(d.getAttr('stamp')) except: pass + if not self.timestamp: + for x in self.getTags('x',namespace=NS_DELAY): + try: + if x.getAttr('stamp')<self.getTimestamp(): self.setTimestamp(x.getAttr('stamp')) + except: pass if timestamp is not None: self.setTimestamp(timestamp) # To auto-timestamp stanza just pass timestamp='' def getTo(self): """ Return value of the 'to' attribute. """ @@ -339,6 +345,10 @@ """ Return the timestamp in the 'yyyymmddThhmmss' format. """ if self.timestamp: return self.timestamp return time.strftime('%Y%m%dT%H:%M:%S', time.gmtime()) + def getTimestamp2(self): + """ Return the timestamp in the 'yyyymmddThhmmss' format. """ + if self.timestamp: return self.timestamp + return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) def getID(self): """ Return the value of the 'id' attribute. """ return self.getAttr('id') @@ -502,10 +512,14 @@ def _muc_getItemAttr(self,tag,attr): for xtag in self.getTags('x'): + if xtag.getNamespace() not in (NS_MUC_USER, NS_MUC_ADMIN): + continue for child in xtag.getTags(tag): return child.getAttr(attr) def _muc_getSubTagDataAttr(self,tag,attr): for xtag in self.getTags('x'): + if xtag.getNamespace() not in (NS_MUC_USER, NS_MUC_ADMIN): + continue for child in xtag.getTags('item'): for cchild in child.getTags(tag): return cchild.getData(),cchild.getAttr(attr) @@ -777,4 +791,4 @@ """ Simple dictionary interface for setting datafields values by their names.""" return self.setField(name).setValue(val) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: Modified: branches/osx_newbuildsys/src/config.py =================================================================== --- branches/osx_newbuildsys/src/config.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/config.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -124,8 +124,10 @@ set_active(st) # Sort contacts by show - st = gajim.config.get('sort_by_show') - self.xml.get_widget('sort_by_show_checkbutton').set_active(st) + st = gajim.config.get('sort_by_show_in_roster') + self.xml.get_widget('sort_by_show_in_roster_checkbutton').set_active(st) + st = gajim.config.get('sort_by_show_in_muc') + self.xml.get_widget('sort_by_show_in_muc_checkbutton').set_active(st) # emoticons emoticons_combobox = self.xml.get_widget('emoticons_combobox') @@ -529,10 +531,20 @@ w.set_sensitive(widget.get_active()) gajim.interface.save_config() - def on_sort_by_show_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sort_by_show') + def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') gajim.interface.roster.setup_and_draw_roster() + def on_sort_by_show_in_muc_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') + # Redraw connected groupchats + for account in gajim.connections: + if gajim.connections[account].connected: + for gc_control in gajim.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC) + \ + gajim.interface.minimized_controls[account].values(): + gc_control.draw_roster() + def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') gajim.interface.roster.setup_and_draw_roster() @@ -540,9 +552,9 @@ for account in gajim.connections: if gajim.connections[account].connected: for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - gajim.interface.minimized_controls[account].values(): - gc_control.draw_roster() + message_control.TYPE_GC) + \ + gajim.interface.minimized_controls[account].values(): + gc_control.draw_roster() def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') @@ -563,10 +575,6 @@ self.on_checkbutton_toggled(widget, 'show_tunes_in_roster') gajim.interface.roster.setup_and_draw_roster() - def on_sort_by_show_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sort_by_show') - gajim.interface.roster.setup_and_draw_roster() - def on_emoticons_combobox_changed(self, widget): active = widget.get_active() model = widget.get_model() @@ -1361,10 +1369,10 @@ iter = model.append() model.set(iter, 0, account) - def resend(self): - show = gajim.SHOW_LIST[gajim.connections[self.current_account].connected] - status = gajim.connections[self.current_account].status - gajim.connections[self.current_account].change_status(show, status) + def resend(self, account): + show = gajim.SHOW_LIST[gajim.connections[account].connected] + status = gajim.connections[account].status + gajim.connections[account].change_status(show, status) def check_resend_relog(self): if self.need_relogin and self.current_account == gajim.ZEROCONF_ACC_NAME: @@ -1382,26 +1390,25 @@ gajim.interface.roster.send_status(account, show_before, status_before) - def relog(): + def relog(account): self.dialog.destroy() - show_before = gajim.SHOW_LIST[gajim.connections[ - self.current_account].connected] - status_before = gajim.connections[self.current_account].status - gajim.interface.roster.send_status(self.current_account, 'offline', + show_before = gajim.SHOW_LIST[gajim.connections[account].connected] + status_before = gajim.connections[account].status + gajim.interface.roster.send_status(account, 'offline', _('Be right back.')) - gobject.timeout_add(500, login, self.current_account, show_before, - status_before) + gobject.timeout_add(500, login, account, show_before, status_before) - def on_yes(checked): - relog() - def on_no(): + def on_yes(checked, account): + relog(account) + def on_no(account): if self.resend_presence: - self.resend() + self.resend(account) self.dialog = dialogs.YesNoDialog(_('Relogin now?'), _('If you want all the changes to apply instantly, ' - 'you must relogin.'), on_response_yes=on_yes, on_response_no=on_no) + 'you must relogin.'), on_response_yes=(on_yes, + self.current_account), on_response_no=(on_no, self.current_account)) elif self.resend_presence: - self.resend() + self.resend(self.current_account) self.need_relogin = False self.resend_presence = False Modified: branches/osx_newbuildsys/src/disco.py =================================================================== --- branches/osx_newbuildsys/src/disco.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/disco.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -61,6 +61,7 @@ from common import gajim from common import xmpp from common.exceptions import GajimGeneralException +from common import helpers # Dictionary mapping category, type pairs to browser class, image pairs. # This is a function, so we can call it after the classes are declared. @@ -692,10 +693,22 @@ if self.address_comboboxentry.get_active() != -1: # user selected one of the entries so do auto-visit jid = self.address_comboboxentry.child.get_text().decode('utf-8') + try: + jid = helpers.parse_jid(jid) + except helpers.InvalidFormat, s: + pritext = _('Invalid Server Name') + dialogs.ErrorDialog(pritext, str(s)) + return self.travel(jid, '') def on_go_button_clicked(self, widget): jid = self.address_comboboxentry.child.get_text().decode('utf-8') + try: + jid = helpers.parse_jid(jid) + except helpers.InvalidFormat, s: + pritext = _('Invalid Server Name') + dialogs.ErrorDialog(pritext, str(s)) + return if jid == self.jid: # jid has not changed return if jid in self.latest_addresses: Modified: branches/osx_newbuildsys/src/groupchat_control.py =================================================================== --- branches/osx_newbuildsys/src/groupchat_control.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/groupchat_control.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -320,7 +320,8 @@ self.handlers[id] = self.list_treeview #status_image, shown_nick, type, nickname, avatar store = gtk.TreeStore(gtk.Image, str, str, str, gtk.gdk.Pixbuf) - store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING) + store.set_sort_func(C_NICK, self.tree_compare_iters) + store.set_sort_column_id(C_NICK, gtk.SORT_ASCENDING) self.list_treeview.set_model(store) # columns @@ -374,6 +375,51 @@ self.conv_textview.tv.grab_focus() self.widget.show_all() + def tree_compare_iters(self, model, iter1, iter2): + '''Compare two iters to sort them''' + type1 = model[iter1][C_TYPE] + type2 = model[iter2][C_TYPE] + if not type1 or not type2: + return 0 + nick1 = model[iter1][C_NICK] + nick2 = model[iter2][C_NICK] + if not nick1 or not nick2: + return 0 + nick1 = nick1.decode('utf-8') + nick2 = nick2.decode('utf-8') + if type1 == 'role': + if nick1 < nick2: + return -1 + return 1 + if type1 == 'contact': + gc_contact1 = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick1) + if not gc_contact1: + return 0 + if type2 == 'contact': + gc_contact2 = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick2) + if not gc_contact2: + return 0 + if type1 == 'contact' and type2 == 'contact' and \ + gajim.config.get('sort_by_show_in_muc'): + cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, + 'invisible': 5, 'offline': 6, 'error': 7} + show1 = cshow[gc_contact1.show] + show2 = cshow[gc_contact2.show] + if show1 < show2: + return -1 + elif show1 > show2: + return 1 + # We compare names + name1 = gc_contact1.get_shown_name() + name2 = gc_contact2.get_shown_name() + if name1.lower() < name2.lower(): + return -1 + if name2.lower() < name1.lower(): + return 1 + return 0 + def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend Clear and the ability to insert a nick''' Modified: branches/osx_newbuildsys/src/message_window.py =================================================================== --- branches/osx_newbuildsys/src/message_window.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/message_window.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -514,8 +514,6 @@ close(ctrl) def on_no(ctrl): - if not force: - return close(ctrl) def on_minimize(ctrl): @@ -526,7 +524,10 @@ close(ctrl) # Shutdown the MessageControl - ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) + if force: + close(ctrl) + else: + ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) def check_tabs(self): if self.get_num_controls() == 0: Modified: branches/osx_newbuildsys/src/notify.py =================================================================== --- branches/osx_newbuildsys/src/notify.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/notify.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -57,7 +57,7 @@ except: USER_HAS_GROWL = False -def get_show_in_roster(event, account, contact, session = None): +def get_show_in_roster(event, account, contact, session=None): '''Return True if this event must be shown in roster, else False''' if event == 'gc_message_received': return True @@ -134,7 +134,7 @@ num += 1 notif = gajim.config.get_per('notifications', str(num)) -def notify(event, jid, account, parameters, advanced_notif_num = None): +def notify(event, jid, account, parameters, advanced_notif_num=None): '''Check what type of notifications we want, depending on basic and the advanced configuration of notifications and do these notifications; advanced_notif_num holds the number of the first (top most) advanced @@ -236,7 +236,7 @@ if status_message: text = text + " : " + status_message popup(_('Contact Changed Status'), jid, account, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) elif event == 'contact_connected': title = _('%(nickname)s Signed In') % \ {'nickname': gajim.get_name_from_jid(account, jid)} @@ -244,7 +244,7 @@ if status_message: text = status_message popup(_('Contact Signed In'), jid, account, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) elif event == 'contact_disconnected': title = _('%(nickname)s Signed Out') % \ {'nickname': gajim.get_name_from_jid(account, jid)} @@ -252,7 +252,7 @@ if status_message: text = status_message popup(_('Contact Signed Out'), jid, account, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) elif event == 'new_message': if message_type == 'normal': # single message event_type = _('New Single Message') @@ -282,7 +282,7 @@ text = message path = gtkgui_helpers.get_path_to_generic_or_avatar(img) popup(event_type, jid, account, message_type, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) if do_sound: snd_file = None @@ -316,8 +316,8 @@ except: pass -def popup(event_type, jid, account, msg_type = '', path_to_image = None, - title = None, text = None): +def popup(event_type, jid, account, msg_type='', path_to_image=None, + title=None, text=None): '''Notifies a user of an event. It first tries to a valid implementation of the Desktop Notification Specification. If that fails, then we fall back to the older style PopupNotificationWindow method.''' @@ -413,7 +413,7 @@ if diff > 10: self.received.remove(rec) - def on_closed(self, id, reason = None): + def on_closed(self, id, reason=None): if self.pending.has_key(id): del self.pending[id] @@ -437,8 +437,8 @@ class DesktopNotification: '''A DesktopNotification that interfaces with D-Bus via the Desktop Notification specification''' - def __init__(self, event_type, jid, account, msg_type = '', - path_to_image = None, title = None, text = None): + def __init__(self, event_type, jid, account, msg_type='', + path_to_image=None, title=None, text=None): self.path_to_image = path_to_image self.event_type = event_type self.title = title @@ -570,7 +570,9 @@ gajim.interface.handle_event(self.account, self.jid, self.msg_type) - def version_reply_handler(self, name, vendor, version, spec_version = None): + def version_reply_handler(self, name, vendor, version, spec_version=None): + if spec_version: + version = spec_version version_list = version.split('.') self.version = [] while len(version_list): Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2008-09-26 17:41:07 UTC (rev 10432) +++ branches/osx_newbuildsys/src/roster_window.py 2008-09-27 12:52:59 UTC (rev 10433) @@ -732,18 +732,23 @@ ''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - - iters = self._get_contact_iter(jid, account, contact, self.model) - if not iters: + if not contact: return - if not force and self.contact_has_pending_roster_events(contact, account): - # Contact has pending events + if not force and (self.contact_has_pending_roster_events(contact, + account) or gajim.interface.msg_win_mgr.get_control(jid, account)): + # Contact has pending events or window + #TODO: or single message windows? Bur they are not listed for the + # moment key = (jid, account) if not key in self.contacts_to_be_removed: self.contacts_to_be_removed[key] = {'backend': backend} - return False - else: + # if more pending event, don't remove from roster + if self.contact_has_pending_roster_events(contact, account): + return False + + iters = self._get_contact_iter(jid, account, contact, self.model) + if iters: # no more pending events # Remove contact from roster directly family = gajim.contacts.get_metacontacts_family(account, jid) @@ -753,28 +758,30 @@ else: self._remove_entity(contact, account) - if backend: - # Remove contact before redrawing, otherwise the old - # numbers will still be show - gajim.contacts.remove_jid(account, jid, remove_meta=True) - if family: - # reshow the rest of the family - brothers = self._add_metacontact_family(family, account) - for c, acc in brothers: - self.draw_contact(c.jid, acc) - self.draw_mood(c.jid, acc) - self.draw_activity(c.jid, acc) - self.draw_tune(c.jid, acc) - self.draw_avatar(c.jid, acc) + if backend and (not gajim.interface.msg_win_mgr.get_control(jid, account)\ + or force): + # If a window is still opened: don't remove contact instance + # Remove contact before redrawing, otherwise the old + # numbers will still be show + gajim.contacts.remove_jid(account, jid, remove_meta=True) + if iters and family: + # reshow the rest of the family + brothers = self._add_metacontact_family(family, account) + for c, acc in brothers: + self.draw_contact(c.jid, acc) + self.draw_mood(c.jid, acc) + self.draw_activity(c.jid, acc) + self.draw_tune(c.jid, acc) + self.draw_avatar(c.jid, acc) + if iters: # Draw all groups of the contact for group in contact.get_shown_groups(): self.draw_group(group, account) self.draw_account(account) - return True + return True - def add_groupchat(self, jid, account, status=''): '''Add groupchat to roster and draw it. Return the added contact instance. @@ -1554,10 +1561,10 @@ if not contact2: return 0 name2 = contact2.get_shown_name() - # We first compare by show if sort_by_show is True or if it's a child - # contact + # We first compare by show if sort_by_show_in_roster is True or if it's a + # child contact if type1 == 'contact' and type2 == 'contact' and \ - gajim.config.get('sort_by_show'): + gajim.config.get('sort_by_show_in_roster'): cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, 'invisible': 5, 'offline': 6, 'not in roster': 7, 'error': 8} s = self.get_show(lcontact1) @@ -1749,7 +1756,8 @@ continue pep.user_send_tune(account, artist, title, source) gajim.connections[account].music_track_info = music_track_info - elif gajim.connections[account].pep_supported: + elif account in gajim.connections and \ + gajim.connections[account].pep_supported: if gajim.connections[account].music_track_info != music_track_info: pep.user_send_tune(account, artist, title, source) gajim.connections[account].music_track_info = music_track_info @@ -5523,11 +5531,14 @@ list_ = [] # list of (jid, account) tuples one_account_offline = False is_blocked = True + privacy_rules_supported = True for titer in iters: jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') if gajim.connections[account].connected < 2: one_account_offline = True + if not gajim.connections[account].privacy_rules_supported: + privacy_rules_supported = False contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if jid not in gajim.connections[account].blocked_contacts: @@ -5581,7 +5592,7 @@ manage_contacts_submenu.append(item) # Block - if is_blocked and gajim.connections[account].privacy_rules_supported: + if is_blocked and privacy_rules_supported: unblock_menuitem = gtk.ImageMenuItem(_('_Unblock')) icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) unblock_menuitem.set_image(icon) @@ -5594,7 +5605,7 @@ block_menuitem.connect('activate', self.on_block, list_) manage_contacts_submenu.append(block_menuitem) - if not gajim.connections[account].privacy_rules_supported: + if not privacy_rules_supported: block_menuitem.set_sensitive(False) # Remove

1 0

[commit-gajim] r10432 - in trunk/src: . common
by asterix＠gajim.org 26 Sep '08

26 Sep '08

Author: asterix Date: 2008-09-26 19:41:07 +0200 (Fri, 26 Sep 2008) New Revision: 10432 Modified: trunk/src/common/commands.py trunk/src/message_window.py Log: fix listing and leaving groupchats from adhoc commands. Fixes #4344 Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-09-26 15:22:16 UTC (rev 10431) +++ trunk/src/common/commands.py 2008-09-26 17:41:07 UTC (rev 10432) @@ -158,7 +158,8 @@ import message_control rooms = [] for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC): + message_control.TYPE_GC) + gajim.interface.minimized_controls[account].\ + values(): acct = gc_control.account # check if account is the good one if acct != account: @@ -224,8 +225,7 @@ try: gc = form['groupchats'].values - except: # KeyError if there's no presence-type field in form or - # AttributeError if that field is of wrong type + except: # KeyError if there's no groupchats in form self.badRequest(request) return False account = self.connection.name @@ -233,8 +233,14 @@ for room_jid in gc: gc_control = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) + if not gc_control: + gc_control = gajim.interface.minimized_controls[account]\ + [room_jid] + gc_control.shutdown() + gajim.interface.roster.remove_groupchat(room_jid, account) + continue gc_control.parent_win.remove_tab(gc_control, None, force = True) - except: # KeyError if there's no presence-type field in form or + except: # KeyError if there's no such room opened self.badRequest(request) return False response, cmd = self.buildResponse(request, status = 'completed') Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-09-26 15:22:16 UTC (rev 10431) +++ trunk/src/message_window.py 2008-09-26 17:41:07 UTC (rev 10432) @@ -514,8 +514,6 @@ close(ctrl) def on_no(ctrl): - if not force: - return close(ctrl) def on_minimize(ctrl): @@ -526,7 +524,10 @@ close(ctrl) # Shutdown the MessageControl - ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) + if force: + close(ctrl) + else: + ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) def check_tabs(self): if self.get_num_controls() == 0:

1 0

[commit-gajim] r10431 - in trunk: data/glade src src/common
by asterix＠gajim.org 26 Sep '08

26 Sep '08

Author: asterix Date: 2008-09-26 17:22:16 +0200 (Fri, 26 Sep 2008) New Revision: 10431 Modified: trunk/data/glade/preferences_window.glade trunk/src/common/config.py trunk/src/config.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: ability to sort by status in roster and in muc separatly. Fixes #3823 Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2008-09-26 13:03:25 UTC (rev 10430) +++ trunk/data/glade/preferences_window.glade 2008-09-26 15:22:16 UTC (rev 10431) @@ -124,19 +124,49 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="sort_by_show_checkbutton"> + <widget class="GtkHBox" id="hbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will sort contacts in roster window and groupchats by their status and not by the shown name</property> - <property name="label" translatable="yes">_Sort contacts by status</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_checkbutton_toggled"/> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="label" translatable="yes">Sort contacts by status</property> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">in _roster</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">in _group chats</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> </widget> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">5</property> </packing> </child> @@ -220,7 +250,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> - <property name="label" translatable="yes">Ignore rich content in incoming messages</property> + <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> @@ -259,7 +289,8 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">1</property> - <property name="label" translatable="yes">Emoticons:</property> + <property name="label" translatable="yes">_Emoticons:</property> + <property name="use_underline">True</property> </widget> </child> </widget> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-09-26 13:03:25 UTC (rev 10430) +++ trunk/src/common/config.py 2008-09-26 15:22:16 UTC (rev 10431) @@ -111,7 +111,8 @@ 'collapsed_rows': [ opt_str, '', _('List (space separated) of rows (accounts and groups) that are collapsed.'), True ], 'roster_theme': [ opt_str, _('default'), '', True ], 'mergeaccounts': [ opt_bool, False, '', True ], - 'sort_by_show': [ opt_bool, True, '', True ], + 'sort_by_show_in_roster': [ opt_bool, True, '', True ], + 'sort_by_show_in_muc': [ opt_bool, False, '', True ], 'enable_zeroconf': [opt_bool, False, _('Enable link-local/zeroconf messaging')], 'use_speller': [ opt_bool, False, ], 'ignore_incoming_xhtml': [ opt_bool, False, ], Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-09-26 13:03:25 UTC (rev 10430) +++ trunk/src/config.py 2008-09-26 15:22:16 UTC (rev 10431) @@ -124,8 +124,10 @@ set_active(st) # Sort contacts by show - st = gajim.config.get('sort_by_show') - self.xml.get_widget('sort_by_show_checkbutton').set_active(st) + st = gajim.config.get('sort_by_show_in_roster') + self.xml.get_widget('sort_by_show_in_roster_checkbutton').set_active(st) + st = gajim.config.get('sort_by_show_in_muc') + self.xml.get_widget('sort_by_show_in_muc_checkbutton').set_active(st) # emoticons emoticons_combobox = self.xml.get_widget('emoticons_combobox') @@ -529,9 +531,12 @@ w.set_sensitive(widget.get_active()) gajim.interface.save_config() - def on_sort_by_show_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sort_by_show') + def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') gajim.interface.roster.setup_and_draw_roster() + + def on_sort_by_show_in_muc_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') # Redraw connected groupchats for account in gajim.connections: if gajim.connections[account].connected: Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-09-26 13:03:25 UTC (rev 10430) +++ trunk/src/groupchat_control.py 2008-09-26 15:22:16 UTC (rev 10431) @@ -402,7 +402,7 @@ if not gc_contact2: return 0 if type1 == 'contact' and type2 == 'contact' and \ - gajim.config.get('sort_by_show'): + gajim.config.get('sort_by_show_in_muc'): cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, 'invisible': 5, 'offline': 6, 'error': 7} show1 = cshow[gc_contact1.show] Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-26 13:03:25 UTC (rev 10430) +++ trunk/src/roster_window.py 2008-09-26 15:22:16 UTC (rev 10431) @@ -1561,10 +1561,10 @@ if not contact2: return 0 name2 = contact2.get_shown_name() - # We first compare by show if sort_by_show is True or if it's a child - # contact + # We first compare by show if sort_by_show_in_roster is True or if it's a + # child contact if type1 == 'contact' and type2 == 'contact' and \ - gajim.config.get('sort_by_show'): + gajim.config.get('sort_by_show_in_roster'): cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, 'invisible': 5, 'offline': 6, 'not in roster': 7, 'error': 8} s = self.get_show(lcontact1)

1 0

[commit-gajim] r10430 - trunk/src
by asterix＠gajim.org 26 Sep '08

26 Sep '08

Author: asterix Date: 2008-09-26 15:03:25 +0200 (Fri, 26 Sep 2008) New Revision: 10430 Modified: trunk/src/adhoc_commands.py Log: fix command requesting XML Modified: trunk/src/adhoc_commands.py =================================================================== --- trunk/src/adhoc_commands.py 2008-09-26 11:11:38 UTC (rev 10429) +++ trunk/src/adhoc_commands.py 2008-09-26 13:03:25 UTC (rev 10430) @@ -444,7 +444,7 @@ # handling xml stanzas def request_command_list(self): '''Request the command list. Change stage on delivery.''' - query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), xmlns=xmpp.NS_DISCO_ITEMS) + query = xmpp.Iq(typ='get', to=xmpp.JID(self.jid), queryNS=xmpp.NS_DISCO_ITEMS) query.setQuerynode(xmpp.NS_COMMANDS) def callback(response):

1 0

[commit-gajim] r10429 - in trunk/src/common: . xmpp
by asterix＠gajim.org 26 Sep '08

26 Sep '08

Author: asterix Date: 2008-09-26 13:11:38 +0200 (Fri, 26 Sep 2008) New Revision: 10429 Modified: trunk/src/common/commands.py trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/common/xmpp/protocol.py Log: handle XEP-0203 (Delayed Delivery) and use it when forwarding unread messages via adhoc commands. Fixes #4347 Modified: trunk/src/common/commands.py =================================================================== --- trunk/src/common/commands.py 2008-09-23 14:39:04 UTC (rev 10428) +++ trunk/src/common/commands.py 2008-09-26 11:11:38 UTC (rev 10429) @@ -266,7 +266,7 @@ for event in events[jid]: self.connection.send_message(j, event.parameters[0], '', type=event.type_, subject=event.parameters[1], - resource=resource, forward_from=jid) + resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-09-23 14:39:04 UTC (rev 10428) +++ trunk/src/common/connection.py 2008-09-26 11:11:38 UTC (rev 10429) @@ -1073,7 +1073,8 @@ def send_message(self, jid, msg, keyID, type='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None, - user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, original_message=None): + user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, + original_message=None, delayed=None): if not self.connection: return 1 if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): @@ -1174,6 +1175,14 @@ addresses.addChild('address', attrs = {'type': 'ofrom', 'jid': forward_from}) + # XEP-0203 + if delayed: + our_jid = gajim.get_jid_from_account(self.name) + '/' + \ + self.server_resource + timestamp = time.strftime('%Y-%m-%dT%TZ', time.gmtime(delayed)) + msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2, + attrs={'from': our_jid, 'stamp': timestamp}) + # XEP-0184 if msgtxt and gajim.config.get_per('accounts', self.name, 'request_receipt') and gajim.capscache.is_supported(contact, Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-09-23 14:39:04 UTC (rev 10428) +++ trunk/src/common/connection_handlers.py 2008-09-26 11:11:38 UTC (rev 10429) @@ -1956,6 +1956,12 @@ user_nick = '' contact_nickname = None transport_auto_auth = False + # XEP-0203 + delay_tag = prs.getTag('delay', namespace=common.xmpp.NS_DELAY2) + if delay_tag: + tim = prs.getTimestamp2() + tim = helpers.datetime_tuple(tim) + timestamp = localtime(timegm(tim)) xtags = prs.getTags('x') for x in xtags: namespace = x.getNamespace() @@ -1968,7 +1974,7 @@ elif namespace == common.xmpp.NS_VCARD_UPDATE: avatar_sha = x.getTagData('photo') contact_nickname = x.getTagData('nickname') - elif namespace == common.xmpp.NS_DELAY: + elif namespace == common.xmpp.NS_DELAY and not timestamp: # XEP-0091 tim = prs.getTimestamp() tim = helpers.datetime_tuple(tim) Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-09-23 14:39:04 UTC (rev 10428) +++ trunk/src/common/xmpp/protocol.py 2008-09-26 11:11:38 UTC (rev 10429) @@ -43,6 +43,7 @@ NS_CONFERENCE ='jabber:x:conference' NS_DATA ='jabber:x:data' # XEP-0004 NS_DELAY ='jabber:x:delay' +NS_DELAY2 ='urn:xmpp:delay' NS_DIALBACK ='jabber:server:dialback' NS_DISCO ='http://jabber.org/protocol/disco' NS_DISCO_INFO =NS_DISCO+'#info' @@ -322,10 +323,15 @@ if self['from']: self.setFrom(self['from']) if node and type(self)==type(node) and self.__class__==node.__class__ and self.attrs.has_key('id'): del self.attrs['id'] self.timestamp=None - for x in self.getTags('x',namespace=NS_DELAY): + for d in self.getTags('delay',namespace=NS_DELAY2): try: - if x.getAttr('stamp')<self.getTimestamp(): self.setTimestamp(x.getAttr('stamp')) + if d.getAttr('stamp')<self.getTimestamp2(): self.setTimestamp(d.getAttr('stamp')) except: pass + if not self.timestamp: + for x in self.getTags('x',namespace=NS_DELAY): + try: + if x.getAttr('stamp')<self.getTimestamp(): self.setTimestamp(x.getAttr('stamp')) + except: pass if timestamp is not None: self.setTimestamp(timestamp) # To auto-timestamp stanza just pass timestamp='' def getTo(self): """ Return value of the 'to' attribute. """ @@ -339,6 +345,10 @@ """ Return the timestamp in the 'yyyymmddThhmmss' format. """ if self.timestamp: return self.timestamp return time.strftime('%Y%m%dT%H:%M:%S', time.gmtime()) + def getTimestamp2(self): + """ Return the timestamp in the 'yyyymmddThhmmss' format. """ + if self.timestamp: return self.timestamp + return time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) def getID(self): """ Return the value of the 'id' attribute. """ return self.getAttr('id')

1 0

[commit-gajim] r10428 - trunk/src
by asterix＠gajim.org 23 Sep '08

23 Sep '08

Author: asterix Date: 2008-09-23 16:39:04 +0200 (Tue, 23 Sep 2008) New Revision: 10428 Modified: trunk/src/config.py trunk/src/groupchat_control.py Log: sort group chats by status if option is checked. Fixes #3823 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-09-23 12:43:59 UTC (rev 10427) +++ trunk/src/config.py 2008-09-23 14:39:04 UTC (rev 10428) @@ -532,6 +532,13 @@ def on_sort_by_show_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show') gajim.interface.roster.setup_and_draw_roster() + # Redraw connected groupchats + for account in gajim.connections: + if gajim.connections[account].connected: + for gc_control in gajim.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC) + \ + gajim.interface.minimized_controls[account].values(): + gc_control.draw_roster() def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') @@ -540,9 +547,9 @@ for account in gajim.connections: if gajim.connections[account].connected: for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - gajim.interface.minimized_controls[account].values(): - gc_control.draw_roster() + message_control.TYPE_GC) + \ + gajim.interface.minimized_controls[account].values(): + gc_control.draw_roster() def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') @@ -563,10 +570,6 @@ self.on_checkbutton_toggled(widget, 'show_tunes_in_roster') gajim.interface.roster.setup_and_draw_roster() - def on_sort_by_show_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'sort_by_show') - gajim.interface.roster.setup_and_draw_roster() - def on_emoticons_combobox_changed(self, widget): active = widget.get_active() model = widget.get_model() Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-09-23 12:43:59 UTC (rev 10427) +++ trunk/src/groupchat_control.py 2008-09-23 14:39:04 UTC (rev 10428) @@ -320,7 +320,8 @@ self.handlers[id] = self.list_treeview #status_image, shown_nick, type, nickname, avatar store = gtk.TreeStore(gtk.Image, str, str, str, gtk.gdk.Pixbuf) - store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING) + store.set_sort_func(C_NICK, self.tree_compare_iters) + store.set_sort_column_id(C_NICK, gtk.SORT_ASCENDING) self.list_treeview.set_model(store) # columns @@ -374,6 +375,51 @@ self.conv_textview.tv.grab_focus() self.widget.show_all() + def tree_compare_iters(self, model, iter1, iter2): + '''Compare two iters to sort them''' + type1 = model[iter1][C_TYPE] + type2 = model[iter2][C_TYPE] + if not type1 or not type2: + return 0 + nick1 = model[iter1][C_NICK] + nick2 = model[iter2][C_NICK] + if not nick1 or not nick2: + return 0 + nick1 = nick1.decode('utf-8') + nick2 = nick2.decode('utf-8') + if type1 == 'role': + if nick1 < nick2: + return -1 + return 1 + if type1 == 'contact': + gc_contact1 = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick1) + if not gc_contact1: + return 0 + if type2 == 'contact': + gc_contact2 = gajim.contacts.get_gc_contact(self.account, self.room_jid, + nick2) + if not gc_contact2: + return 0 + if type1 == 'contact' and type2 == 'contact' and \ + gajim.config.get('sort_by_show'): + cshow = {'online':0, 'chat': 1, 'away': 2, 'xa': 3, 'dnd': 4, + 'invisible': 5, 'offline': 6, 'error': 7} + show1 = cshow[gc_contact1.show] + show2 = cshow[gc_contact2.show] + if show1 < show2: + return -1 + elif show1 > show2: + return 1 + # We compare names + name1 = gc_contact1.get_shown_name() + name2 = gc_contact2.get_shown_name() + if name1.lower() < name2.lower(): + return -1 + if name2.lower() < name1.lower(): + return 1 + return 0 + def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend Clear and the ability to insert a nick'''

1 0

[commit-gajim] r10427 - trunk/src/common
by asterix＠gajim.org 23 Sep '08

23 Sep '08

Author: asterix Date: 2008-09-23 14:43:59 +0200 (Tue, 23 Sep 2008) New Revision: 10427 Modified: trunk/src/common/proxy65_manager.py Log: disable proxy resolution. See #4299. Modified: trunk/src/common/proxy65_manager.py =================================================================== --- trunk/src/common/proxy65_manager.py 2008-09-22 09:35:19 UTC (rev 10426) +++ trunk/src/common/proxy65_manager.py 2008-09-23 12:43:59 UTC (rev 10427) @@ -105,6 +105,9 @@ self.port = int(port) self.jid = unicode(jid) self.state = S_RESOLVED + #FIXME: re-enable proxy testing + self.state = S_FINISHED + return self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, self.sid, self.sender_jid, self._on_receiver_success, self._on_connect_failure)

1 0

[commit-gajim] r10426 - trunk/src/common
by asterix＠gajim.org 22 Sep '08

22 Sep '08

Author: asterix Date: 2008-09-22 11:35:19 +0200 (Mon, 22 Sep 2008) New Revision: 10426 Modified: trunk/src/common/caps.py Log: allow all features if a contact has no resource until we fall back to disco query. Fixes #4327 Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-09-22 09:10:18 UTC (rev 10425) +++ trunk/src/common/caps.py 2008-09-22 09:35:19 UTC (rev 10426) @@ -193,8 +193,7 @@ con.discoverInfo(jid, '%s#%s' % (node, hash)) def is_supported(self, contact, feature): - # No resource -> can't have any caps - if not contact or not contact.resource: + if not contact: return False # Unfortunately, if all resources are offline, the contact

1 0

[commit-gajim] r10425 - trunk/src
by asterix＠gajim.org 22 Sep '08

22 Sep '08

Author: asterix Date: 2008-09-22 11:10:18 +0200 (Mon, 22 Sep 2008) New Revision: 10425 Modified: trunk/src/notify.py Log: coding standards Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-09-22 09:04:16 UTC (rev 10424) +++ trunk/src/notify.py 2008-09-22 09:10:18 UTC (rev 10425) @@ -57,7 +57,7 @@ except: USER_HAS_GROWL = False -def get_show_in_roster(event, account, contact, session = None): +def get_show_in_roster(event, account, contact, session=None): '''Return True if this event must be shown in roster, else False''' if event == 'gc_message_received': return True @@ -134,7 +134,7 @@ num += 1 notif = gajim.config.get_per('notifications', str(num)) -def notify(event, jid, account, parameters, advanced_notif_num = None): +def notify(event, jid, account, parameters, advanced_notif_num=None): '''Check what type of notifications we want, depending on basic and the advanced configuration of notifications and do these notifications; advanced_notif_num holds the number of the first (top most) advanced @@ -236,7 +236,7 @@ if status_message: text = text + " : " + status_message popup(_('Contact Changed Status'), jid, account, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) elif event == 'contact_connected': title = _('%(nickname)s Signed In') % \ {'nickname': gajim.get_name_from_jid(account, jid)} @@ -244,7 +244,7 @@ if status_message: text = status_message popup(_('Contact Signed In'), jid, account, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) elif event == 'contact_disconnected': title = _('%(nickname)s Signed Out') % \ {'nickname': gajim.get_name_from_jid(account, jid)} @@ -252,7 +252,7 @@ if status_message: text = status_message popup(_('Contact Signed Out'), jid, account, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) elif event == 'new_message': if message_type == 'normal': # single message event_type = _('New Single Message') @@ -282,7 +282,7 @@ text = message path = gtkgui_helpers.get_path_to_generic_or_avatar(img) popup(event_type, jid, account, message_type, - path_to_image = path, title = title, text = text) + path_to_image=path, title=title, text=text) if do_sound: snd_file = None @@ -316,8 +316,8 @@ except: pass -def popup(event_type, jid, account, msg_type = '', path_to_image = None, - title = None, text = None): +def popup(event_type, jid, account, msg_type='', path_to_image=None, + title=None, text=None): '''Notifies a user of an event. It first tries to a valid implementation of the Desktop Notification Specification. If that fails, then we fall back to the older style PopupNotificationWindow method.''' @@ -413,7 +413,7 @@ if diff > 10: self.received.remove(rec) - def on_closed(self, id, reason = None): + def on_closed(self, id, reason=None): if self.pending.has_key(id): del self.pending[id] @@ -437,8 +437,8 @@ class DesktopNotification: '''A DesktopNotification that interfaces with D-Bus via the Desktop Notification specification''' - def __init__(self, event_type, jid, account, msg_type = '', - path_to_image = None, title = None, text = None): + def __init__(self, event_type, jid, account, msg_type='', + path_to_image=None, title=None, text=None): self.path_to_image = path_to_image self.event_type = event_type self.title = title

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2008