Author: js Date: 2008-09-13 10:35:26 +0200 (Sat, 13 Sep 2008) New Revision: 10412

Added: branches/osx_newbuildsys/data/pixmaps/upload.png Modified: branches/osx_newbuildsys/data/glade/chat_to_muc_window.glade branches/osx_newbuildsys/data/glade/esession_info_window.glade branches/osx_newbuildsys/data/glade/message_window.glade branches/osx_newbuildsys/data/moods/default/thoughtful.png branches/osx_newbuildsys/gajim.nsi branches/osx_newbuildsys/po/cs.po branches/osx_newbuildsys/po/da.po branches/osx_newbuildsys/po/de.po branches/osx_newbuildsys/po/en_GB.po branches/osx_newbuildsys/po/fr.po branches/osx_newbuildsys/po/it.po branches/osx_newbuildsys/po/pl.po branches/osx_newbuildsys/po/pt_BR.po branches/osx_newbuildsys/po/ru.po branches/osx_newbuildsys/po/sk.po branches/osx_newbuildsys/po/sr.po branches/osx_newbuildsys/po/sr@Latn.po branches/osx_newbuildsys/src/chat_control.py branches/osx_newbuildsys/src/common/connection.py branches/osx_newbuildsys/src/common/connection_handlers.py branches/osx_newbuildsys/src/common/idle_c/idle.c branches/osx_newbuildsys/src/common/logger.py branches/osx_newbuildsys/src/config.py branches/osx_newbuildsys/src/dialogs.py branches/osx_newbuildsys/src/gajim-remote.py branches/osx_newbuildsys/src/gajim.py branches/osx_newbuildsys/src/groupchat_control.py branches/osx_newbuildsys/src/roster_window.py branches/osx_newbuildsys/src/systray.py Log: Merged with trunk r10411.

Modified: branches/osx_newbuildsys/data/glade/chat_to_muc_window.glade =================================================================== --- branches/osx_newbuildsys/data/glade/chat_to_muc_window.glade 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/data/glade/chat_to_muc_window.glade 2008-09-13 08:35:26 UTC (rev 10412) @@ -5,7 +5,7 @@ <widget class="GtkWindow" id="chat_to_muc_window"> <property name="visible">True</property> <property name="border_width">5</property> - <property name="title" translatable="yes">Invite Friends !</property> + <property name="title" translatable="yes">Invite Friends!</property> <signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/> <signal name="destroy" handler="on_chat_to_muc_window_destroy"/> <child>

Modified: branches/osx_newbuildsys/data/glade/esession_info_window.glade =================================================================== --- branches/osx_newbuildsys/data/glade/esession_info_window.glade 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/data/glade/esession_info_window.glade 2008-09-13 08:35:26 UTC (rev 10412) @@ -27,42 +27,41 @@ <property name="homogeneous">False</property> <property name="spacing">2</property>

- <child> - <widget class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">4</property> - <child> - <widget class="GtkVBox" id="vbox2"> + <widget class="GtkHBox" id="title-hbox"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property>

<child> - <widget class="GtkImage" id="security_image"> - <property name="width_request">32</property> - <property name="height_request">32</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> + <widget class="GtkImage" id="security_image"> + <property name="width_request">32</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="expand">False</property> + </packing> </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> + <child> + <widget class="GtkLabel" id="verification_status_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + </widget> + </child> + </widget> </child> + <child>

+ <widget class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">4</property> + <child> <widget class="GtkLabel" id="info_display"> <property name="visible">True</property>

Modified: branches/osx_newbuildsys/data/glade/message_window.glade =================================================================== --- branches/osx_newbuildsys/data/glade/message_window.glade 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/data/glade/message_window.glade 2008-09-13 08:35:26 UTC (rev 10412) @@ -276,7 +276,6 @@ <widget class="GtkImage" id="image3"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-save</property> <property name="icon_size">1</property> </widget> </child>

Modified: branches/osx_newbuildsys/data/moods/default/thoughtful.png =================================================================== (Binary files differ)

Added: branches/osx_newbuildsys/data/pixmaps/upload.png =================================================================== (Binary files differ)

Property changes on: branches/osx_newbuildsys/data/pixmaps/upload.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

Modified: branches/osx_newbuildsys/gajim.nsi =================================================================== --- branches/osx_newbuildsys/gajim.nsi 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/gajim.nsi 2008-09-13 08:35:26 UTC (rev 10412) @@ -127,7 +127,6 @@ File "bin_hashlib.pyd" File "bin_socket.pyd" File "bin_sqlite3.pyd" - File "bin_sqlite.pyd" File "bin_ssl.pyd" File "bin_win32sysloader.pyd" File "bin\AES.pyd"

Modified: branches/osx_newbuildsys/po/cs.po =================================================================== --- branches/osx_newbuildsys/po/cs.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/cs.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1058,8 +1058,8 @@ msgstr "_Pozvat do"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Pozvat Přátele !" +msgid "Invite Friends!" +msgstr "Pozvat Přátele!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server"

Modified: branches/osx_newbuildsys/po/da.po =================================================================== --- branches/osx_newbuildsys/po/da.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/da.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1051,8 +1051,8 @@ msgstr "In_viter"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Inviter Venner !" +msgid "Invite Friends!" +msgstr "Inviter Venner!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server"

Modified: branches/osx_newbuildsys/po/de.po =================================================================== --- branches/osx_newbuildsys/po/de.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/de.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1059,8 +1059,8 @@ msgstr "_Einladen zu"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Freunde einladen !" +msgid "Invite Friends!" +msgstr "Freunde einladen!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server"

Modified: branches/osx_newbuildsys/po/en_GB.po =================================================================== --- branches/osx_newbuildsys/po/en_GB.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/en_GB.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1044,8 +1044,8 @@ msgstr "In_vite"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Invite Friends !" +msgid "Invite Friends!" +msgstr "Invite Friends!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server"

Modified: branches/osx_newbuildsys/po/fr.po =================================================================== --- branches/osx_newbuildsys/po/fr.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/fr.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-31 11:02+0200\n" +"POT-Creation-Date: 2008-09-10 06:55+0200\n" "PO-Revision-Date: 2008-08-31 03:53+0100\n" "Last-Translator: Le Coz Florent louizatakk@gmail.com\n" "Language-Team: \n" @@ -312,8 +312,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:2657 -#: ../src/roster_window.py:5137 +#: ../src/dialogs.py:165 ../src/roster_window.py:2656 +#: ../src/roster_window.py:5139 msgid "General" msgstr "Général"

@@ -573,7 +573,7 @@ msgstr "_Regrouper les comptes"

#. Rename -#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5088 +#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5090 msgid "Re_name" msgstr "Re_nommer"

@@ -997,7 +997,7 @@ msgstr "Rejoindre un _salon de discussion"

#: ../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 "_Ajouter à la liste de contacts..."

@@ -1049,10 +1049,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:5768 +#: ../src/roster_window.py:5783 msgid "_History" msgstr "_Historique"

@@ -1061,7 +1061,7 @@ msgstr "In_viter"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" +msgid "Invite Friends!" msgstr "Inviter des Amis !"

#: ../data/glade/chat_to_muc_window.glade.h:3 @@ -1410,7 +1410,7 @@ msgid "_Log conversation history" msgstr "_Historique de conversation"

-#: ../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 "Rejoindre un salon de discussion"

@@ -2145,7 +2145,7 @@ msgid "Order:" msgstr "Ordre :"

-#: ../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 "Liste privée"

@@ -2349,10 +2349,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:5125 ../src/roster_window.py:5586 -#: ../src/roster_window.py:5715 +#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5127 +#: ../src/roster_window.py:5601 ../src/roster_window.py:5730 msgid "_Remove" msgstr "_Supprimer"

@@ -2374,59 +2372,64 @@

#. Execute Command #: ../data/glade/roster_contact_context_menu.glade.h:5 -#: ../src/roster_window.py:5658 +#: ../src/roster_window.py:5673 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:5043 ../src/roster_window.py:5539 +#: ../src/roster_window.py:5045 ../src/roster_window.py:5554 msgid "In_vite to" msgstr "In_viter à"

+#: ../data/glade/roster_contact_context_menu.glade.h:7 +#, fuzzy +msgid "Remo_ve" +msgstr "_Supprimer" + #. Send Custom Status -#: ../data/glade/roster_contact_context_menu.glade.h:7 -#: ../src/roster_window.py:5053 ../src/roster_window.py:5624 +#: ../data/glade/roster_contact_context_menu.glade.h:8 +#: ../src/roster_window.py:5055 ../src/roster_window.py:5639 msgid "Send Cus_tom Status" msgstr "Envoyer un Statut Personnalisé"

-#: ../data/glade/roster_contact_context_menu.glade.h:8 +#: ../data/glade/roster_contact_context_menu.glade.h:9 msgid "Send Single _Message..." msgstr "Envoyer un _message simple..."

-#: ../data/glade/roster_contact_context_menu.glade.h:9 +#: ../data/glade/roster_contact_context_menu.glade.h:10 msgid "Send _File..." msgstr "Envoyer un _fichier..."

-#: ../data/glade/roster_contact_context_menu.glade.h:10 +#: ../data/glade/roster_contact_context_menu.glade.h:11 msgid "Set Custom _Avatar..." msgstr "Définir un _Avatar personnalisé..."

-#: ../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 "Commencer une _discussion"

-#: ../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 "L'autoriser à voir mon état"

-#: ../data/glade/roster_contact_context_menu.glade.h:14 -#: ../src/roster_window.py:5116 ../src/roster_window.py:5576 -#: ../src/roster_window.py:5705 +#: ../data/glade/roster_contact_context_menu.glade.h:15 +#: ../src/roster_window.py:5118 ../src/roster_window.py:5591 +#: ../src/roster_window.py:5720 msgid "_Block" msgstr "_Bloquer"

-#: ../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 "Interdire de voir mon état"

-#: ../data/glade/roster_contact_context_menu.glade.h:17 +#: ../data/glade/roster_contact_context_menu.glade.h:18 msgid "_Ignore" msgstr "_Ignorer"

-#: ../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 "_Gérer le Contact" @@ -2440,8 +2443,8 @@ msgstr "_Autorisation"

#: ../data/glade/roster_contact_context_menu.glade.h:22 -#: ../src/roster_window.py:5110 ../src/roster_window.py:5570 -#: ../src/roster_window.py:5702 +#: ../src/roster_window.py:5112 ../src/roster_window.py:5585 +#: ../src/roster_window.py:5717 msgid "_Unblock" msgstr "_Débloquer"

@@ -2493,7 +2496,7 @@ #: ../data/glade/roster_window.glade.h:13 #: ../data/glade/subscription_request_window.glade.h:6 msgid "_Actions" -msgstr "_Actions" +msgstr "Ac_tions"

#: ../data/glade/roster_window.glade.h:15 msgid "_Contents" @@ -2540,7 +2543,7 @@ msgstr "_Ajouter un contact"

#. Information -#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5727 +#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5742 msgid "_Information" msgstr "Information"

@@ -2763,13 +2766,13 @@

#. Edit Groups #: ../data/glade/zeroconf_contact_context_menu.glade.h:3 -#: ../src/roster_window.py:5559 +#: ../src/roster_window.py:5574 msgid "Edit _Groups" msgstr "Éditer les _groupes"

#. Rename #: ../data/glade/zeroconf_contact_context_menu.glade.h:8 -#: ../src/roster_window.py:5685 +#: ../src/roster_window.py:5700 msgid "_Rename" msgstr "_Renommer"

@@ -2986,35 +2989,36 @@ msgid "Your message can not be sent until you are connected." msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."

-#: ../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 "Chiffrement GPG activé"

#. 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:2031 #: ../src/common/contacts.py:113 ../src/common/helpers.py:75 #: ../src/common/helpers.py:299 ../src/conversation_textview.py:844 -#: ../src/dialogs.py:896 ../src/gajim.py:1624 ../src/roster_window.py:927 -#: ../src/roster_window.py:1536 ../src/roster_window.py:1538 -#: ../src/roster_window.py:1878 ../src/roster_window.py:5230 -#: ../src/roster_window.py:5408 +#: ../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:1868 ../src/roster_window.py:3094 +#: ../src/roster_window.py:3118 ../src/roster_window.py:5239 +#: ../src/roster_window.py:5423 msgid "Not in Roster" msgstr "Absent de la liste"

-#: ../src/chat_control.py:1293 ../src/tooltips.py:629 +#: ../src/chat_control.py:1298 ../src/tooltips.py:629 msgid "Unknown Artist" msgstr "Artiste Inconnu"

-#: ../src/chat_control.py:1295 ../src/tooltips.py:634 +#: ../src/chat_control.py:1300 ../src/tooltips.py:634 msgid "Unknown Title" msgstr "Titre Iconnu"

-#: ../src/chat_control.py:1297 ../src/tooltips.py:639 +#: ../src/chat_control.py:1302 ../src/tooltips.py:639 msgid "Unknown Source" msgstr "Source Inconnue"

-#: ../src/chat_control.py:1301 ../src/tooltips.py:641 +#: ../src/chat_control.py:1306 ../src/tooltips.py:641 #, python-format msgid "" "<b>"%(title)s"</b> by <i>%(artist)s</i>\n" @@ -3023,7 +3027,7 @@ "<b>« %(title)s »</b> par <i>%(artist)s</i>\n" "de <i>%(source)s</i>"

-#: ../src/chat_control.py:1306 +#: ../src/chat_control.py:1311 #, python-format msgid "" "%(title)s by %(artist)s\n" @@ -3032,81 +3036,81 @@ "%(title)s par %(artist)s\n" "de %(source)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 du salon de discussion %(room_name)s"

-#: ../src/chat_control.py:1519 +#: ../src/chat_control.py:1525 msgid "GPG encryption disabled" msgstr "Chiffrement GPG désactivé"

-#: ../src/chat_control.py:1537 ../src/chat_control.py:1794 +#: ../src/chat_control.py:1550 ../src/chat_control.py:1805 +msgid "Session WILL be logged" +msgstr "La session SERA archivée" + +#: ../src/chat_control.py:1552 ../src/chat_control.py:1807 msgid "Session WILL NOT be logged" msgstr "La session ne sera PAS archivée"

-#: ../src/chat_control.py:1539 ../src/chat_control.py:1792 -msgid "Session WILL be logged" -msgstr "La session SERA archivée" - #. encryption %s active -#: ../src/chat_control.py:1557 +#: ../src/chat_control.py:1570 msgid "is" msgstr "est"

-#: ../src/chat_control.py:1557 +#: ../src/chat_control.py:1570 msgid "is NOT" msgstr "N'est PAS"

#. chat session %s be logged -#: ../src/chat_control.py:1559 +#: ../src/chat_control.py:1572 msgid "will" msgstr "sera"

-#: ../src/chat_control.py:1559 +#: ../src/chat_control.py:1572 msgid "will NOT" msgstr "NE sera PAS"

#. About encrypted chat session -#: ../src/chat_control.py:1563 +#: ../src/chat_control.py:1576 msgid "and authenticated" msgstr "et authentifiée"

#. About encrypted chat session -#: ../src/chat_control.py:1567 +#: ../src/chat_control.py:1580 msgid "and NOT authenticated" msgstr "et NON authentifiée"

#. 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:1553 +#: ../src/chat_control.py:1643 ../src/groupchat_control.py:1575 #, python-format msgid "Commands: %s" msgstr "Commandes : %s"

-#: ../src/chat_control.py:1633 ../src/groupchat_control.py:1567 +#: ../src/chat_control.py:1646 ../src/groupchat_control.py:1589 #, python-format msgid "Usage: /%s, clears the text window." msgstr "Usage : /%s, nettoie la fenêtre."

-#: ../src/chat_control.py:1636 ../src/groupchat_control.py:1572 +#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1594 #, python-format msgid "Usage: /%s, hide the chat buttons." msgstr "Usage: /%s, cache les boutons de discussion."

-#: ../src/chat_control.py:1639 ../src/groupchat_control.py:1588 +#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1610 #, python-format msgid "" "Usage: /%(command)s <action>, sends action to the current group chat. Use " @@ -3115,54 +3119,54 @@ "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. " "Utilise la troisième personne. (ex : /%(command)s explose.)"

-#: ../src/chat_control.py:1644 +#: ../src/chat_control.py:1657 #, python-format msgid "Usage: /%s, sends a ping to the contact" msgstr "Utilisation : /%s, envoie un ping au contact"

-#: ../src/chat_control.py:1647 +#: ../src/chat_control.py:1660 #, python-format msgid "Usage: /%s, send the message to the contact" msgstr "Usage: /%s, envoie le message au contact"

-#: ../src/chat_control.py:1650 ../src/groupchat_control.py:1611 +#: ../src/chat_control.py:1663 ../src/groupchat_control.py:1633 #, python-format msgid "No help info for /%s" msgstr "Pas d'aide disponible pour /%s"

-#: ../src/chat_control.py:1781 +#: ../src/chat_control.py:1794 msgid "Session negotiation cancelled" msgstr "Négociation annulée"

-#: ../src/chat_control.py:1788 +#: ../src/chat_control.py:1801 msgid "E2E encryption enabled" msgstr "Chiffrement E2E activé"

-#: ../src/chat_control.py:1799 +#: ../src/chat_control.py:1812 msgid "" "Remote contact's identity not verified. Click the shield button for more " "details." msgstr ""

-#: ../src/chat_control.py:1801 +#: ../src/chat_control.py:1814 msgid "E2E encryption disabled" msgstr "Chiffrement E2E désactivé"

-#: ../src/chat_control.py:1830 ../src/chat_control.py:1841 +#: ../src/chat_control.py:1843 ../src/chat_control.py:1856 msgid "The following message was NOT encrypted" msgstr "Le message suivant n'a PAS été chiffré"

-#: ../src/chat_control.py:1836 +#: ../src/chat_control.py:1849 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:2189 +#: ../src/chat_control.py:2210 #, 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:2190 +#: ../src/chat_control.py:2211 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." @@ -3170,11 +3174,11 @@ "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce " "message sera perdu."

-#: ../src/chat_control.py:2341 ../src/gajim.py:170 +#: ../src/chat_control.py:2362 ../src/gajim.py:170 msgid "Database Error" msgstr "Erreur de base de données"

-#: ../src/chat_control.py:2342 ../src/gajim.py:171 +#: ../src/chat_control.py:2363 ../src/gajim.py:171 #, python-format msgid "" "The database file (%s) cannot be read. Try to repair it or remove it (all " @@ -3183,7 +3187,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:2574 +#: ../src/chat_control.py:2595 #, python-format msgid "%(name)s is now %(status)s" msgstr "%(name)s est maintenant %(status)s" @@ -3273,8 +3277,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:795 ../src/roster_window.py:1540 -#: ../src/roster_window.py:1542 ../src/roster_window.py:5013 +#: ../src/roster_window.py:793 ../src/roster_window.py:1529 +#: ../src/roster_window.py:1531 ../src/roster_window.py:5015 msgid "Groupchats" msgstr "Salons de discussion"

@@ -3330,7 +3334,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:3090 +#: ../src/common/optparser.py:472 ../src/gajim.py:3095 msgid "default" msgstr "Par défaut"

@@ -4121,24 +4125,24 @@ "temps"

#: ../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:1201 +#: ../src/common/connection_handlers.py:1842 +#: ../src/common/connection_handlers.py:1882 +#: ../src/common/connection_handlers.py:2058 +#: ../src/common/connection_handlers.py:2177 ../src/common/connection.py:1211 #: ../src/gajim.py:392 msgid "Disk Write Error" msgstr "Erreur d'Écriture du disque"

-#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:840 +#: ../src/common/connection_handlers.py:1133 ../src/common/connection.py:850 msgid "Invisibility not supported" msgstr "Invisibilité non-supportée"

-#: ../src/common/connection_handlers.py:1134 ../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 "Le compte %s ne supporte pas l'invisibilité."

-#: ../src/common/connection_handlers.py:1945 +#: ../src/common/connection_handlers.py:1951 #, python-format msgid "Nickname not allowed: %s" msgstr "Surnom invalide : %s" @@ -4146,70 +4150,70 @@ #. we are banned #. group chat does not exist #. 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 +#: ../src/common/connection_handlers.py:2026 +#: ../src/common/connection_handlers.py:2029 +#: ../src/common/connection_handlers.py:2033 ../src/gajim.py:546 msgid "Unable to join group chat" msgstr "Impossible de rejoindre le salon"

-#: ../src/common/connection_handlers.py:2015 +#: ../src/common/connection_handlers.py:2021 #, python-format msgid "You are banned from group chat %s." msgstr "Vous êtes banni du salon %s."

-#: ../src/common/connection_handlers.py:2018 +#: ../src/common/connection_handlers.py:2024 #, python-format msgid "Group chat %s does not exist." msgstr "Le salon %s n'existe pas."

-#: ../src/common/connection_handlers.py:2021 +#: ../src/common/connection_handlers.py:2027 msgid "Group chat creation is restricted." msgstr "La création de salon est réservée aux administrateurs."

-#: ../src/common/connection_handlers.py:2024 +#: ../src/common/connection_handlers.py:2030 #, python-format msgid "Your registered nickname must be used in group chat %s." msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon %s."

-#: ../src/common/connection_handlers.py:2028 +#: ../src/common/connection_handlers.py:2034 #, python-format msgid "You are not in the members list in groupchat %s." msgstr "Vous n'êtes pas dans la liste des membres du salon %s."

#. Room has been destroyed. see #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom -#: ../src/common/connection_handlers.py:2063 +#: ../src/common/connection_handlers.py:2069 msgid "Room has been destroyed" msgstr "Le salon de discussion a été détruit"

-#: ../src/common/connection_handlers.py:2070 +#: ../src/common/connection_handlers.py:2076 #, python-format msgid "You can join this room instead: %s" msgstr "Vous pouvez rejoindre le salon %s à la place"

-#: ../src/common/connection_handlers.py:2097 +#: ../src/common/connection_handlers.py:2103 msgid "I would like to add you to my roster." msgstr "Je souhaiterais vous ajouter à ma liste de contacts."

#. BE CAREFUL: no con.updateRosterItem() in a callback -#: ../src/common/connection_handlers.py:2118 +#: ../src/common/connection_handlers.py:2124 #, python-format msgid "we are now subscribed to %s" msgstr "nous sommes maintenant inscrits chez %s"

-#: ../src/common/connection_handlers.py:2120 +#: ../src/common/connection_handlers.py:2126 #, python-format msgid "unsubscribe request from %s" msgstr "Requête de désinscription de la part de %s"

-#: ../src/common/connection_handlers.py:2122 +#: ../src/common/connection_handlers.py:2128 #, python-format msgid "we are now unsubscribed from %s" msgstr "nous ne sommes plus dans la liste de %s"

-#: ../src/common/connection_handlers.py:2290 +#: ../src/common/connection_handlers.py:2296 #, python-format msgid "" "JID %s is not RFC compliant. It will not be added to your roster. Use roster " @@ -4220,15 +4224,15 @@ "tel que http://jru.jabberstudio.org pour le supprimer"

#. We didn't set a passphrase -#: ../src/common/connection_handlers.py:2315 +#: ../src/common/connection_handlers.py:2321 #: ../src/common/zeroconf/connection_zeroconf.py:172 msgid "OpenPGP passphrase was not given" msgstr "Mot de passe OpenPGP non renseigné"

#. %s is the account name here -#: ../src/common/connection_handlers.py:2317 +#: ../src/common/connection_handlers.py:2323 #: ../src/common/zeroconf/connection_zeroconf.py:174 -#: ../src/roster_window.py:1929 ../src/roster_window.py:1949 +#: ../src/roster_window.py:1919 ../src/roster_window.py:1939 #, python-format msgid "You will be connected to %s without OpenPGP." msgstr "Vous serez connecté à %s sans OpenPGP." @@ -4403,23 +4407,33 @@ msgid "Connection to proxy failed" msgstr "La connexion au proxy a échoué"

-#: ../src/common/connection.py:612 ../src/common/connection.py:703 -#: ../src/common/connection.py:1330 +#: ../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 "Impossible de se connecter à "%s""

-#: ../src/common/connection.py:613 ../src/gajim.py:1041 +#: ../src/common/connection.py:613 ../src/gajim.py:1042 msgid "Check your connection or try again later." msgstr "Vérifiez votre connexion ou réessayez plus tard."

-#: ../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 "Impossible de se connecter à "%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 "La connexion du compte "%s" a été perdue" + +#: ../src/common/connection.py:668 #, python-format msgid "The authenticity of the %s certificate could be invalid." msgstr "L'authentification du certificat %s peut être invalide."

-#: ../src/common/connection.py:663 +#: ../src/common/connection.py:671 #, python-format msgid "" "\n" @@ -4428,7 +4442,7 @@ "\n" "Erreur SSL : <b>%s</b>"

-#: ../src/common/connection.py:665 +#: ../src/common/connection.py:673 #, python-format msgid "" "\n" @@ -4437,24 +4451,24 @@ "\n" "Erreur SSL inconnue : %d"

-#: ../src/common/connection.py:704 +#: ../src/common/connection.py:714 msgid "Check your connection or try again later" msgstr "Vérifiez votre connexion ou réessayer plus tard"

-#: ../src/common/connection.py:729 +#: ../src/common/connection.py:739 #, python-format msgid "Authentication failed with "%s"" msgstr "Echec de l'authentification avec "%s""

-#: ../src/common/connection.py:731 +#: ../src/common/connection.py:741 msgid "Please check your login and password for correctness." msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."

-#: ../src/common/connection.py:792 +#: ../src/common/connection.py:802 msgid "Error while removing privacy list" msgstr "Une erreur s'est produite pendant la suppression de la liste privée"

-#: ../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 " @@ -4463,12 +4477,12 @@ "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une " "des ressources connectées. Désactivez la et réessayez."

-#: ../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 "Le présence distante n'est pas signée et aucune clef n'a été assignée."

-#: ../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." @@ -4477,11 +4491,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 "[Ce message est *chiffré* (Voir : XEP:`27`]"

-#: ../src/common/connection.py:1191 +#: ../src/common/connection.py:1201 #: ../src/common/zeroconf/connection_zeroconf.py:445 #, python-format msgid "" @@ -4491,7 +4505,7 @@ "Sujet : %(subject)s\n" "%(message)s"

-#: ../src/common/connection.py:1363 +#: ../src/common/connection.py:1373 msgid "Not fetched because of invisible status" msgstr "Non récupéré à cause du statut invisible"

@@ -4501,9 +4515,9 @@

#: ../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:829 -#: ../src/roster_window.py:1465 ../src/roster_window.py:1532 -#: ../src/roster_window.py:1534 ../src/roster_window.py:1677 +#: ../src/disco.py:1335 ../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 "Passerelles"

@@ -5600,7 +5614,7 @@ msgid "Custom" msgstr "Personnalisé"

-#: ../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 "Le dictionnaire pour la langue %s est indisponible" @@ -5659,7 +5673,7 @@ msgstr "Courriel Gmail reçu"

#. Name column -#: ../src/config.py:1312 ../src/dialogs.py:1816 ../src/dialogs.py:1880 +#: ../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/history_window.py:86 msgid "Name" @@ -5784,8 +5798,8 @@ 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:1668 ../src/dialogs.py:1804 -#: ../src/dialogs.py:1984 ../src/disco.py:438 ../src/profile_window.py:320 +#: ../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 msgid "You are not connected to the server" msgstr "Vous n'êtes pas connecté au serveur"

@@ -5926,16 +5940,16 @@ msgid "Removing %s account" msgstr "Supprimer le compte %s"

-#: ../src/config.py:2580 ../src/gajim.py:1413 ../src/roster_window.py:1941 +#: ../src/config.py:2580 ../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:1915 +#: ../src/config.py:2581 ../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:1942 +#: ../src/config.py:2582 ../src/roster_window.py:1932 msgid "Save password" msgstr "Enregistrer le mot de passe"

@@ -6016,11 +6030,11 @@ 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:1988 +#: ../src/config.py:3191 ../src/gajim.py:1990 msgid "Certificate Already in File" msgstr "Certificat déjà dans un Fichier"

-#: ../src/config.py:3192 ../src/gajim.py:1989 +#: ../src/config.py:3192 ../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é." @@ -6040,7 +6054,7 @@ "Erreur SSL  %(error)s\n" "Voulez vous toujours vous connecter au serveur ?"

-#: ../src/config.py:3266 ../src/gajim.py:2012 +#: ../src/config.py:3266 ../src/gajim.py:2014 #, python-format msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -6228,79 +6242,79 @@ msgid "Yahoo! Address:" msgstr "Adresse 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 "Remplissez les informations sur le contact à ajouter au compte %s"

-#: ../src/dialogs.py:714 +#: ../src/dialogs.py:713 msgid "Please fill in the data of the contact you want to add" msgstr "Remplissez les informations sur le contact à ajouter"

-#: ../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 "Identifiant utilisateur non valide"

-#: ../src/dialogs.py:878 +#: ../src/dialogs.py:877 msgid "The user ID must not contain a resource." msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."

-#: ../src/dialogs.py:883 +#: ../src/dialogs.py:882 #, fuzzy msgid "You cannot add yourself to your roster." msgstr "Je souhaiterais vous ajouter à ma liste de contacts."

-#: ../src/dialogs.py:897 +#: ../src/dialogs.py:896 msgid "Contact already in roster" msgstr "Contact déjà dans la liste"

-#: ../src/dialogs.py:898 +#: ../src/dialogs.py:897 msgid "This contact is already listed in your roster." msgstr "Le contact est déjà dans votre liste."

-#: ../src/dialogs.py:934 +#: ../src/dialogs.py:933 msgid "User ID:" msgstr "Identifiant :"

-#: ../src/dialogs.py:992 +#: ../src/dialogs.py:991 msgid "A GTK+ jabber client" msgstr "Un client Jabber en GTK+"

-#: ../src/dialogs.py:993 +#: ../src/dialogs.py:992 msgid "GTK+ Version:" msgstr "Version de GTK+ :"

-#: ../src/dialogs.py:994 +#: ../src/dialogs.py:993 msgid "PyGTK Version:" msgstr "Version de PyGTK :"

-#: ../src/dialogs.py:1004 +#: ../src/dialogs.py:1003 msgid "Current Developers:" msgstr "Développeurs actuels :"

-#: ../src/dialogs.py:1006 +#: ../src/dialogs.py:1005 msgid "Past Developers:" msgstr "Anciens développeurs :"

-#: ../src/dialogs.py:1012 +#: ../src/dialogs.py:1011 msgid "THANKS:" msgstr "MERCI :"

#. 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 "Pour finir, nous voulons remercier tous les mainteneurs de paquet."

#. here you write your name in the form Name FamilyName someone@somewhere -#: ../src/dialogs.py:1031 +#: ../src/dialogs.py:1030 msgid "translator-credits" msgstr "" "Yann Le Boulanger asterix@lagaule.org\n" "Jonathan Ernst jonathan@ernstfamily.ch\n" "Florent Le Coz louizatakk@gmail.com"

-#: ../src/dialogs.py:1193 +#: ../src/dialogs.py:1192 #, python-format msgid "" "You have to install %s dictionary to use spellchecking, or choose another " @@ -6313,93 +6327,93 @@ "\n" "Le soulignement des fautes d'orthographe ne sera pas utilisé"

-#: ../src/dialogs.py:1597 +#: ../src/dialogs.py:1596 #, python-format msgid "Subscription request for account %(account)s from %(jid)s" msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"

-#: ../src/dialogs.py:1600 +#: ../src/dialogs.py:1599 #, python-format msgid "Subscription request from %s" msgstr "Requête d'inscription de la part de %s"

-#: ../src/dialogs.py:1661 ../src/gajim.py:2592 +#: ../src/dialogs.py:1660 ../src/gajim.py:2594 #, python-format msgid "You are already in group chat %s" msgstr "Vous êtes déjà dans le salon %s"

-#: ../src/dialogs.py:1669 +#: ../src/dialogs.py:1668 msgid "You can not join a group chat unless you are connected." msgstr "" "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas " "connecté."

-#: ../src/dialogs.py:1688 +#: ../src/dialogs.py:1687 #, python-format msgid "Join Group Chat with account %s" msgstr "Rejoindre un salon de discussion en tant que %s"

-#: ../src/dialogs.py:1759 +#: ../src/dialogs.py:1758 msgid "Invalid Nickname" msgstr "Nom d'utilisateur invalide"

-#: ../src/dialogs.py:1760 ../src/groupchat_control.py:1358 -#: ../src/groupchat_control.py:1634 +#: ../src/dialogs.py:1759 ../src/groupchat_control.py:1380 +#: ../src/groupchat_control.py:1656 msgid "The nickname has not allowed characters." msgstr "Le pseudonyme contient des caractères non autorisés."

-#: ../src/dialogs.py:1764 ../src/dialogs.py:1770 -#: ../src/groupchat_control.py:1802 +#: ../src/dialogs.py:1763 ../src/dialogs.py:1769 +#: ../src/groupchat_control.py:1824 msgid "Invalid group chat Jabber ID" msgstr "Identifiant Jabber de salon invalide"

-#: ../src/dialogs.py:1765 ../src/dialogs.py:1771 -#: ../src/groupchat_control.py:1803 +#: ../src/dialogs.py:1764 ../src/dialogs.py:1770 +#: ../src/groupchat_control.py:1825 msgid "The group chat Jabber ID has not allowed characters." msgstr "" "L'identifiant jabber du salon de discussion contient des caractères " "interdits."

-#: ../src/dialogs.py:1777 +#: ../src/dialogs.py:1776 msgid "This is not a group chat" msgstr "Ceci n'est pas une conversation multi-utilisateurs"

-#: ../src/dialogs.py:1778 +#: ../src/dialogs.py:1777 #, python-format msgid "%s is not the name of a group chat." msgstr "%s n'est pas un nom de salon de discussion valide"

-#: ../src/dialogs.py:1805 +#: ../src/dialogs.py:1804 msgid "Without a connection, you can not synchronise your contacts." msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."

-#: ../src/dialogs.py:1819 +#: ../src/dialogs.py:1818 msgid "Server" msgstr "Serveur"

-#: ../src/dialogs.py:1852 +#: ../src/dialogs.py:1851 msgid "This account is not connected to the server" msgstr "Ce compte est connecté au serveur"

-#: ../src/dialogs.py:1853 +#: ../src/dialogs.py:1852 msgid "You cannot synchronize with an account unless it is connected." msgstr "" "Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."

-#: ../src/dialogs.py:1877 +#: ../src/dialogs.py:1876 msgid "Synchronise" msgstr "Synchroniser"

-#: ../src/dialogs.py:1935 +#: ../src/dialogs.py:1934 #, python-format msgid "Start Chat with account %s" msgstr "Commencer une discussion avec le compte %s"

-#: ../src/dialogs.py:1937 +#: ../src/dialogs.py:1936 msgid "Start Chat" msgstr "Commencer une discussion"

-#: ../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:" @@ -6408,276 +6422,276 @@ "envoyer un message :"

#. 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 "Connexion non disponible"

-#: ../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 "Vérifiez que vous êtes connecté avec "%s"."

-#: ../src/dialogs.py:1973 ../src/dialogs.py:1976 +#: ../src/dialogs.py:1972 ../src/dialogs.py:1975 msgid "Invalid JID" msgstr "Identifiant Jabber invalide"

-#: ../src/dialogs.py:1976 +#: ../src/dialogs.py:1975 #, python-format msgid "Unable to parse "%s"." msgstr "Impossible d'interpréter "%s"."

-#: ../src/dialogs.py:1985 +#: ../src/dialogs.py:1984 msgid "Without a connection, you can not change your password." msgstr "Vous devez être connecté pour changer votre mot de passe."

-#: ../src/dialogs.py:2004 +#: ../src/dialogs.py:2003 msgid "Invalid password" msgstr "Mot de passe invalide"

-#: ../src/dialogs.py:2004 +#: ../src/dialogs.py:2003 msgid "You must enter a password." msgstr "Vous devez entrer un mot de passe."

-#: ../src/dialogs.py:2008 +#: ../src/dialogs.py:2007 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas"

-#: ../src/dialogs.py:2009 +#: ../src/dialogs.py:2008 msgid "The passwords typed in both fields must be identical." msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."

#. 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 "Contact connecté"

-#: ../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 "Contact déconnecté"

#. 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 "Nouveau message"

#. 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 "Nouveau message simple"

#. 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 "Nouveau message privé"

-#: ../src/dialogs.py:2053 ../src/gajim.py:1578 ../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 "Nouveau courrier électronique"

-#: ../src/dialogs.py:2055 ../src/gajim.py:1644 ../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 "Requête de transfert de fichier"

-#: ../src/dialogs.py:2057 ../src/gajim.py:1543 ../src/gajim.py:1611 +#: ../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 "Erreur de Transfert de fichier"

-#: ../src/dialogs.py:2059 ../src/gajim.py:1686 ../src/gajim.py:1708 -#: ../src/gajim.py:1725 ../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 "Transfert de fichier terminé"

-#: ../src/dialogs.py:2060 ../src/gajim.py:1689 ../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 "Transfert de fichier interrompu"

-#: ../src/dialogs.py:2062 ../src/gajim.py:1434 ../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 "Invitation à un salon"

-#: ../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 "Le contact a changé d'état"

-#: ../src/dialogs.py:2257 +#: ../src/dialogs.py:2256 #, python-format msgid "Single Message using account %s" msgstr "Message simple en tant que %s"

-#: ../src/dialogs.py:2259 +#: ../src/dialogs.py:2258 #, python-format msgid "Single Message in account %s" msgstr "Message simple dans le compte %s"

-#: ../src/dialogs.py:2261 +#: ../src/dialogs.py:2260 msgid "Single Message" msgstr "Message simple"

#. prepare UI for Sending -#: ../src/dialogs.py:2264 +#: ../src/dialogs.py:2263 #, python-format msgid "Send %s" msgstr "Envoyer %s"

#. prepare UI for Receiving -#: ../src/dialogs.py:2287 +#: ../src/dialogs.py:2286 #, python-format msgid "Received %s" msgstr "%s Reçu"

#. prepare UI for Receiving -#: ../src/dialogs.py:2310 +#: ../src/dialogs.py:2309 #, python-format msgid "Form %s" msgstr "De %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 a écrit :\n"

-#: ../src/dialogs.py:2427 +#: ../src/dialogs.py:2426 #, python-format msgid "XML Console for %s" msgstr "Console XML pour %s"

-#: ../src/dialogs.py:2429 +#: ../src/dialogs.py:2428 msgid "XML Console" msgstr "Console XML"

-#: ../src/dialogs.py:2553 +#: ../src/dialogs.py:2552 #, python-format msgid "Privacy List <b><i>%s</i></b>" msgstr "Liste privée <b><i>%s</i></b>"

-#: ../src/dialogs.py:2557 +#: ../src/dialogs.py:2556 #, python-format msgid "Privacy List for %s" msgstr "Liste privée pour %s"

-#: ../src/dialogs.py:2613 +#: ../src/dialogs.py:2612 #, python-format msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s" msgstr "" "Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"

-#: ../src/dialogs.py:2618 +#: ../src/dialogs.py:2617 #, python-format msgid "Order: %(order)s, action: %(action)s" msgstr "Ordre : %(order)s, action: %(action)s"

-#: ../src/dialogs.py:2660 +#: ../src/dialogs.py:2659 msgid "<b>Edit a rule</b>" msgstr "<b>Modifier une règle</b>"

-#: ../src/dialogs.py:2747 +#: ../src/dialogs.py:2746 msgid "<b>Add a rule</b>" msgstr "<b>Ajouter une règle</b>"

-#: ../src/dialogs.py:2843 +#: ../src/dialogs.py:2842 #, python-format msgid "Privacy Lists for %s" msgstr "Listes privées pour %s"

-#: ../src/dialogs.py:2845 +#: ../src/dialogs.py:2844 msgid "Privacy Lists" msgstr "Listes privées"

-#: ../src/dialogs.py:2915 +#: ../src/dialogs.py:2914 msgid "Invalid List Name" msgstr "Nom de liste invalide"

-#: ../src/dialogs.py:2916 +#: ../src/dialogs.py:2915 msgid "You must enter a name to create a privacy list." msgstr "Vous devez entrer un nom pour créer une liste privée."

-#: ../src/dialogs.py:2949 +#: ../src/dialogs.py:2948 msgid "You are invited to a groupchat" msgstr "Vous êtes invité(e) dans un groupe de discussion"

-#: ../src/dialogs.py:2952 +#: ../src/dialogs.py:2951 msgid "$Contact has invited you to join a discussion" msgstr "$Contact vous a invité dans un salon de discussion"

-#: ../src/dialogs.py:2954 +#: ../src/dialogs.py:2953 #, python-format msgid "$Contact has invited you to group chat %(room_jid)s" msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s"

-#: ../src/dialogs.py:2962 +#: ../src/dialogs.py:2961 #, python-format msgid "Comment: %s" msgstr "Commentaire : %s"

-#: ../src/dialogs.py:2964 +#: ../src/dialogs.py:2963 msgid "Do you want to accept the invitation?" msgstr "Voulez-vous accepter l'invitation ?"

-#: ../src/dialogs.py:3019 +#: ../src/dialogs.py:3018 msgid "Choose Sound" msgstr "Choisissez un son"

-#: ../src/dialogs.py:3029 ../src/dialogs.py:3080 +#: ../src/dialogs.py:3028 ../src/dialogs.py:3079 msgid "All files" msgstr "Tous les fichiers"

-#: ../src/dialogs.py:3034 +#: ../src/dialogs.py:3033 msgid "Wav Sounds" msgstr "Sons wav"

-#: ../src/dialogs.py:3067 +#: ../src/dialogs.py:3066 msgid "Choose Image" msgstr "Choisissez une Image"

-#: ../src/dialogs.py:3085 +#: ../src/dialogs.py:3084 msgid "Images" msgstr "Images"

-#: ../src/dialogs.py:3150 +#: ../src/dialogs.py:3149 #, python-format msgid "When %s becomes:" msgstr "Quand %s devient :"

-#: ../src/dialogs.py:3152 +#: ../src/dialogs.py:3151 #, python-format msgid "Adding Special Notification for %s" msgstr "Ajout de notifications spéciales pour %s"

#. # means number -#: ../src/dialogs.py:3223 +#: ../src/dialogs.py:3222 msgid "#" msgstr "#"

-#: ../src/dialogs.py:3229 +#: ../src/dialogs.py:3228 msgid "Condition" msgstr "Condition"

-#: ../src/dialogs.py:3347 +#: ../src/dialogs.py:3346 msgid "when I am " msgstr "quand je suis "

-#: ../src/dialogs.py:3822 -#, python-format +#: ../src/dialogs.py:3821 +#, fuzzy, python-format msgid "" -"Your chat session with %(jid)s is encrypted.\n" +"Your chat session with <b>%(jid)s</b> is encrypted.\n" "\n" "This session's Short Authentication String is <b>%(sas)s</b>." msgstr "" @@ -6685,45 +6699,46 @@ "\n" "La Short Authentication String (SAS) de cette session est <b>%(sas)s</b>."

-#: ../src/dialogs.py:3826 +#: ../src/dialogs.py:3825 msgid "You have already verified this contact's identity." msgstr "Vous avez déjà vérifié l'identité de ce contact."

-#: ../src/dialogs.py:3831 +#: ../src/dialogs.py:3830 msgid "Contact's identity verified" msgstr ""

-#: ../src/dialogs.py:3833 -msgid "Verify again" +#: ../src/dialogs.py:3832 +msgid "Verify again..." msgstr ""

-#: ../src/dialogs.py:3838 +#: ../src/dialogs.py:3837 #, fuzzy msgid "" "To be certain that <b>only</b> the expected person can read your messages or " "send you messages, you need to verify their identity by clicking the button " -"above." +"below." msgstr "" "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:3840 +#: ../src/dialogs.py:3839 msgid "Contact's identity NOT verified" msgstr ""

-#: ../src/dialogs.py:3841 -msgid "Verify" +#: ../src/dialogs.py:3840 +#, fuzzy +msgid "Verify..." msgstr "Vérifier"

-#: ../src/dialogs.py:3853 +#: ../src/dialogs.py:3852 msgid "Have you verified the contact's identity?" msgstr "Avez-vous vérifié l'identité du contact ?"

-#: ../src/dialogs.py:3854 -#, python-format +#: ../src/dialogs.py:3853 +#, fuzzy, 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 <b>%(jid)s</b> " +"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 <b>%(sas)s</b>." @@ -6734,7 +6749,7 @@ "\n" "La Short Authentication String de cette session est : <b>%(sas)s</b>."

-#: ../src/dialogs.py:3855 +#: ../src/dialogs.py:3854 msgid "Did you talk to the remote contact and verify the SAS?" msgstr "Avec vous parlé au contact et vérifié la SAS ?"

@@ -7404,21 +7419,21 @@ msgid "error while sending %(message)s ( %(error)s )" msgstr "erreur en envoyant %(message)s ( %(error)s )"

-#: ../src/gajim.py:978 +#: ../src/gajim.py:979 msgid "Authorization accepted" msgstr "Autorisation acceptée"

-#: ../src/gajim.py:979 +#: ../src/gajim.py:980 #, python-format msgid "The contact "%s" has authorized you to see his or her status." msgstr "Le contact "%s" vous a autorisé à voir son état."

-#: ../src/gajim.py:998 +#: ../src/gajim.py:999 #, python-format msgid "Contact "%s" removed subscription from you" msgstr "Le contact "%s" a cessé de vous souscrire à sa présence"

-#: ../src/gajim.py:999 +#: ../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?" @@ -7426,75 +7441,75 @@ "Vous le/la verrez toujours hors-ligne.\n" "Voulez vous le/la supprimer de votre liste de contacts ?"

-#: ../src/gajim.py:1040 +#: ../src/gajim.py:1041 #, python-format msgid "Contact with "%s" cannot be established" msgstr "Le contact avec "%s" ne peut être établi"

-#: ../src/gajim.py:1219 ../src/groupchat_control.py:1076 +#: ../src/gajim.py:1220 ../src/groupchat_control.py:1092 #, python-format msgid "%(nick)s is now known as %(new_nick)s" msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"

-#: ../src/gajim.py:1234 ../src/groupchat_control.py:1245 +#: ../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 est maintenant %(status)s"

-#: ../src/gajim.py:1297 +#: ../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:1361 ../src/groupchat_control.py:1036 +#: ../src/gajim.py:1362 ../src/groupchat_control.py:1052 msgid "Any occupant is allowed to see your full JID" msgstr "" "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"

-#: ../src/gajim.py:1364 +#: ../src/gajim.py:1365 msgid "Room now shows unavailable member" msgstr "Le salon affiche dorénavant les membres non-disponibles"

-#: ../src/gajim.py:1366 +#: ../src/gajim.py:1367 msgid "room now does not show unavailable members" msgstr "Le salon n'affiche plus les membres non-disponibles"

-#: ../src/gajim.py:1369 +#: ../src/gajim.py:1370 msgid "A non-privacy-related room configuration change has occurred" msgstr "" "Un changement de la configuration du salon relatif à la vie-privée a eu lieu"

#. Can be a presence (see chg_contact_status in groupchat_control.py) -#: ../src/gajim.py:1372 +#: ../src/gajim.py:1373 msgid "Room logging is now enabled" msgstr "L'enregistrement des conversations du salon est maintenant activé"

-#: ../src/gajim.py:1374 +#: ../src/gajim.py:1375 msgid "Room logging is now disabled" msgstr "L'enregistrement des conversations du salon est maintenant désactivé"

-#: ../src/gajim.py:1376 +#: ../src/gajim.py:1377 msgid "Room is now non-anonymous" msgstr "Le salon n'est plus anonyme"

-#: ../src/gajim.py:1379 +#: ../src/gajim.py:1380 msgid "Room is now semi-anonymous" msgstr "Le salon est maintenant sami-anonyme"

-#: ../src/gajim.py:1382 +#: ../src/gajim.py:1383 msgid "Room is now fully-anonymous" msgstr "Le salon est maintenant totalement anonyme"

-#: ../src/gajim.py:1414 +#: ../src/gajim.py:1415 #, python-format msgid "A Password is required to join the room %s. Please type it." msgstr "" "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."

-#: ../src/gajim.py:1448 +#: ../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" @@ -7502,27 +7517,27 @@ "Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent " "GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"

-#: ../src/gajim.py:1450 +#: ../src/gajim.py:1451 msgid "You are currently connected without your OpenPGP key." msgstr "Vous êtes actuellement connecté sans clé OpenPGP."

-#: ../src/gajim.py:1453 +#: ../src/gajim.py:1454 msgid "Your passphrase is incorrect" msgstr "Votre mot de passe est incorrect"

-#: ../src/gajim.py:1554 +#: ../src/gajim.py:1556 #, python-format msgid "New mail on %(gmail_mail_address)s" msgstr "Nouveau courriel sur %(gmail_mail_address)s"

-#: ../src/gajim.py:1556 +#: ../src/gajim.py:1558 #, python-format msgid "You have %d new mail conversation" msgid_plural "You have %d new mail conversations" msgstr[0] "Vous avez %d nouveau courrier électronique" msgstr[1] "Vous avez %d nouveaux courriers électroniques"

-#: ../src/gajim.py:1570 +#: ../src/gajim.py:1572 #, python-format msgid "" "\n" @@ -7537,35 +7552,35 @@ "Sujet : %(subject)s\n" "%(snippet)s"

-#: ../src/gajim.py:1641 +#: ../src/gajim.py:1643 #, python-format msgid "%s wants to send you a file." msgstr "%s souhaite vous envoyer un fichier."

-#: ../src/gajim.py:1709 +#: ../src/gajim.py:1711 #, python-format msgid "You successfully received %(filename)s from %(name)s." msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."

#. ft stopped -#: ../src/gajim.py:1713 +#: ../src/gajim.py:1715 #, python-format msgid "File transfer of %(filename)s from %(name)s stopped." msgstr "" "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."

-#: ../src/gajim.py:1726 +#: ../src/gajim.py:1728 #, python-format msgid "You successfully sent %(filename)s to %(name)s." msgstr "Vous avez bien envoyé %(filename)s à %(name)s."

#. ft stopped -#: ../src/gajim.py:1730 +#: ../src/gajim.py:1732 #, python-format msgid "File transfer of %(filename)s to %(name)s stopped." msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."

-#: ../src/gajim.py:1816 +#: ../src/gajim.py:1818 #, python-format msgid "" "Unable to decrypt message from %s\n" @@ -7574,36 +7589,36 @@ "Impossible de décrypter le message de %s\n" "Il a peut-être été manipulé."

-#: ../src/gajim.py:1823 +#: ../src/gajim.py:1825 msgid "Unable to decrypt message" msgstr "Impossible de décrypter le message"

-#: ../src/gajim.py:1893 +#: ../src/gajim.py:1895 msgid "Username Conflict" msgstr "Conflit de nom d'utilisateur"

-#: ../src/gajim.py:1894 +#: ../src/gajim.py:1896 msgid "Please type a new username for your local account" msgstr "Veuillez entrer un nouveau surnom pour votre compte local"

-#: ../src/gajim.py:1906 +#: ../src/gajim.py:1908 msgid "Ping?" msgstr "Ping ?"

-#: ../src/gajim.py:1919 +#: ../src/gajim.py:1921 #, python-format msgid "Pong! (%s s.)" msgstr "Pong ! (%s s.)"

-#: ../src/gajim.py:1930 +#: ../src/gajim.py:1932 msgid "Error." msgstr "Erreur."

-#: ../src/gajim.py:1955 +#: ../src/gajim.py:1957 msgid "Resource Conflict" msgstr "Conflit de ressource"

-#: ../src/gajim.py:1956 +#: ../src/gajim.py:1958 msgid "" "You are already connected to this account with the same resource. Please " "type a new one" @@ -7611,11 +7626,11 @@ "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en " "entrer une nouvelle"

-#: ../src/gajim.py:2009 +#: ../src/gajim.py:2011 msgid "Error verifying SSL certificate" msgstr "Erreur durant la vérification du certificat SSL"

-#: ../src/gajim.py:2010 +#: ../src/gajim.py:2012 #, python-format msgid "" "There was an error verifying the SSL certificate of your jabber server: %" @@ -7626,15 +7641,15 @@ "serveur Jabber : %(error)s\n" "Voulez-vous toujours vous connecter à ce serveur ?"

-#: ../src/gajim.py:2015 +#: ../src/gajim.py:2017 msgid "Ignore this error for this certificate." msgstr "Ignorer cette erreur pour ce certificat."

-#: ../src/gajim.py:2030 +#: ../src/gajim.py:2032 msgid "SSL certificate error" msgstr "Erreur de certificat SSL"

-#: ../src/gajim.py:2031 +#: ../src/gajim.py:2033 #, python-format msgid "" "It seems the SSL certificate has changed or your connection is being " @@ -7652,11 +7667,11 @@ "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du " "certificat ?"

-#: ../src/gajim.py:2053 ../src/gajim.py:2083 +#: ../src/gajim.py:2055 ../src/gajim.py:2085 msgid "Insecure connection" msgstr "Connexion non-sécurisée"

-#: ../src/gajim.py:2054 +#: ../src/gajim.py:2056 msgid "" "You are about to send your password on an unencrypted connection. Are you " "sure you want to do that?" @@ -7664,16 +7679,16 @@ "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 ?"

-#: ../src/gajim.py:2056 ../src/gajim.py:2086 +#: ../src/gajim.py:2058 ../src/gajim.py:2088 msgid "Yes, I really want to connect insecurely" msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"

-#: ../src/gajim.py:2057 ../src/gajim.py:2087 ../src/groupchat_control.py:1743 -#: ../src/roster_window.py:3774 +#: ../src/gajim.py:2059 ../src/gajim.py:2089 ../src/groupchat_control.py:1765 +#: ../src/roster_window.py:3777 msgid "Do _not ask me again" msgstr "_Ne plus me poser la question"

-#: ../src/gajim.py:2084 +#: ../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?" @@ -7682,21 +7697,21 @@ "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous " "sûr de vouloir le faire ?"

-#: ../src/gajim.py:2101 +#: ../src/gajim.py:2103 msgid "PEP node was not removed" msgstr "Le nœud PEP n'a pas été supprimé"

-#: ../src/gajim.py:2102 +#: ../src/gajim.py:2104 #, python-format msgid "PEP node %(node)s was not removed: %(message)s" msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"

#. theme doesn't exist, disable emoticons -#: ../src/gajim.py:2550 ../src/gajim.py:2571 +#: ../src/gajim.py:2552 ../src/gajim.py:2573 msgid "Emoticons disabled" msgstr "Émoticônes désactivées"

-#: ../src/gajim.py:2551 +#: ../src/gajim.py:2553 msgid "" "Your configured emoticons theme has not been found, so emoticons have been " "disabled." @@ -7704,7 +7719,7 @@ "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc " "désactivées."

-#: ../src/gajim.py:2572 +#: ../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 " @@ -7714,7 +7729,7 @@ "mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/" "wiki/Emoticons pour plus de détails."

-#: ../src/gajim.py:2598 ../src/roster_window.py:3302 +#: ../src/gajim.py:2600 ../src/roster_window.py:3307 msgid "You cannot join a group chat while you are invisible" msgstr "" "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes " @@ -7722,34 +7737,34 @@

#. it is good to notify the user #. in case he or she cannot see the output of the console -#: ../src/gajim.py:2879 +#: ../src/gajim.py:2884 msgid "Could not save your settings and preferences" msgstr "Impossible d'enregistrer vos informations de configuration"

-#: ../src/gajim.py:2976 +#: ../src/gajim.py:2981 msgid "Bookmark already set" msgstr "Marque-page déjà spécifié"

-#: ../src/gajim.py:2977 +#: ../src/gajim.py:2982 #, python-format msgid "Group Chat "%s" is already in your bookmarks." msgstr "Le salon "%s" est déjà dans vos marque-pages."

-#: ../src/gajim.py:2990 +#: ../src/gajim.py:2995 msgid "Bookmark has been added successfully" msgstr "Marque-page ajouté avec succès"

-#: ../src/gajim.py:2991 +#: ../src/gajim.py:2996 msgid "You can manage your bookmarks via Actions menu in your roster." msgstr "" "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de " "contacts."

-#: ../src/gajim.py:3180 +#: ../src/gajim.py:3185 msgid "Network Manager support not available" msgstr "Network Manager n'est pas disponible"

-#: ../src/gajim.py:3304 +#: ../src/gajim.py:3310 msgid "Session Management support not available (missing gnome.ui module)" msgstr "" "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)" @@ -8079,15 +8094,15 @@ msgid "Check if Gajim is running" msgstr "Vérifie si Gajim est lancé"

-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290 +#: ../src/gajim-remote.py:280 msgid "Shows or hides the ipython window" msgstr "Montre ou cache la fenêtre ipython"

-#: ../src/gajim-remote.py:314 +#: ../src/gajim-remote.py:307 msgid "Missing argument "contact_jid"" msgstr "Argument manquant "jid_contact""

-#: ../src/gajim-remote.py:333 +#: ../src/gajim-remote.py:326 #, python-format msgid "" "'%s' is not in your roster.\n" @@ -8096,33 +8111,33 @@ "'%s' n'est pas dans votre liste de contact.\n" "Précisez le compte pour envoyer le message."

-#: ../src/gajim-remote.py:336 +#: ../src/gajim-remote.py:329 msgid "You have no active account" msgstr "Vous n'avez aucun compte actif"

-#: ../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 "" "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser " "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 "Arguments :"

-#: ../src/gajim-remote.py:426 +#: ../src/gajim-remote.py:419 #, python-format msgid "%s not found" msgstr "%s non trouvé"

-#: ../src/gajim-remote.py:430 +#: ../src/gajim-remote.py:423 #, python-format msgid "" "Usage: %s command [arguments]\n" @@ -8131,7 +8146,7 @@ "Utilisation : %s commande [arguments]\n" "commande est l'une de :\n"

-#: ../src/gajim-remote.py:503 +#: ../src/gajim-remote.py:496 #, python-format msgid "" "Too many arguments. \n" @@ -8140,7 +8155,7 @@ "Trop d'arguments.\n" "Tappez "%(basename)s help %(command)s" pour plus d'informations"

-#: ../src/gajim-remote.py:508 +#: ../src/gajim-remote.py:501 #, python-format msgid "" "Argument "%(arg)s" is not specified. \n" @@ -8149,7 +8164,7 @@ "L'argument "%(arg)s" n'est pas précisé.\n" "Tapez "%(basename)s help %(command)s" pour plus d'informations"

-#: ../src/gajim-remote.py:527 +#: ../src/gajim-remote.py:520 msgid "Wrong uri" msgstr "Mauvaise adresse (URI)"

@@ -8214,116 +8229,116 @@ "identifiant Jabber."

#. Can be a message (see handle_event_gc_config_change in gajim.py) -#: ../src/groupchat_control.py:1039 +#: ../src/groupchat_control.py:1055 msgid "Room logging is enabled" msgstr "L'enregistrement des conversations du salon est activé"

-#: ../src/groupchat_control.py:1041 +#: ../src/groupchat_control.py:1057 msgid "A new room has been created" msgstr "Un nouveau salon a été créé"

-#: ../src/groupchat_control.py:1044 +#: ../src/groupchat_control.py:1060 msgid "The server has assigned or modified your roomnick" msgstr "Le serveur à défini ou midifié votre Surnom de salon"

#. do not print 'kicked by None' -#: ../src/groupchat_control.py:1050 +#: ../src/groupchat_control.py:1066 #, python-format msgid "%(nick)s has been kicked: %(reason)s" msgstr "%(nick)s a été éjecté : %(reason)s"

-#: ../src/groupchat_control.py:1054 +#: ../src/groupchat_control.py:1070 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"

#. do not print 'banned by None' -#: ../src/groupchat_control.py:1061 +#: ../src/groupchat_control.py:1077 #, python-format msgid "%(nick)s has been banned: %(reason)s" msgstr "%(nick)s a été banni : %(reason)s"

-#: ../src/groupchat_control.py:1065 +#: ../src/groupchat_control.py:1081 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" msgstr "%(nick)s a été banni par %(who)s : %(reason)s"

-#: ../src/groupchat_control.py:1074 +#: ../src/groupchat_control.py:1090 #, python-format msgid "You are now known as %s" msgstr "Vous êtes désormais connu sous le nom de %s"

-#: ../src/groupchat_control.py:1111 ../src/groupchat_control.py:1115 -#: ../src/groupchat_control.py:1120 +#: ../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 a été éjecté du salon (%(reason)s)"

-#: ../src/groupchat_control.py:1112 +#: ../src/groupchat_control.py:1129 msgid "affiliation changed" msgstr "Changement d'affiliation"

-#: ../src/groupchat_control.py:1117 +#: ../src/groupchat_control.py:1134 msgid "room configuration changed to members-only" msgstr "La configuration du salon a changé pour « membres seulement »"

-#: ../src/groupchat_control.py:1122 +#: ../src/groupchat_control.py:1139 msgid "system shutdown" msgstr "Extinction du système"

-#: ../src/groupchat_control.py:1188 +#: ../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:1192 +#: ../src/groupchat_control.py:1211 #, python-format msgid "** Affiliation of %(nick)s has been set to %(affiliation)s" msgstr ""

-#: ../src/groupchat_control.py:1205 +#: ../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 a été éjecté par %(who)s : %(reason)s"

-#: ../src/groupchat_control.py:1209 +#: ../src/groupchat_control.py:1230 #, fuzzy, python-format msgid "** Role of %(nick)s has been set to %(role)s" msgstr "%(nick)s a été éjecté : %(reason)s"

-#: ../src/groupchat_control.py:1238 +#: ../src/groupchat_control.py:1259 #, python-format msgid "%s has left" msgstr "%s est parti"

-#: ../src/groupchat_control.py:1243 +#: ../src/groupchat_control.py:1264 #, python-format msgid "%s has joined the group chat" msgstr "%s a rejoint le salon de discussion"

#. Invalid Nickname #. invalid char -#: ../src/groupchat_control.py:1357 ../src/groupchat_control.py:1633 +#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1655 msgid "Invalid nickname" msgstr "Nom d'utilisateur invalide"

-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1399 -#: ../src/groupchat_control.py:1483 ../src/groupchat_control.py:1500 +#: ../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 "Surnom introuvable : %s"

-#: ../src/groupchat_control.py:1415 +#: ../src/groupchat_control.py:1437 msgid "This group chat has no subject" msgstr "Ce salon de discussion n'a pas de sujet"

-#: ../src/groupchat_control.py:1426 +#: ../src/groupchat_control.py:1448 #, python-format msgid "Invited %(contact_jid)s to %(room_jid)s." msgstr "" "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."

-#: ../src/groupchat_control.py:1556 +#: ../src/groupchat_control.py:1578 #, python-format msgid "" "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The " @@ -8336,7 +8351,7 @@ "pas de "@". Si l'identifiant Jabber est actuellement dans le salon il sera " "également éjecté. Ne supporte pas les espaces dans le surnom."

-#: ../src/groupchat_control.py:1563 +#: ../src/groupchat_control.py:1585 #, python-format msgid "" "Usage: /%s <nickname>, opens a private chat window with the specified " @@ -8345,7 +8360,7 @@ "Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec " "l'occupant(e) spécifié(e)."

-#: ../src/groupchat_control.py:1569 +#: ../src/groupchat_control.py:1591 #, python-format msgid "" "Usage: /%s [reason], closes the current window or tab, displaying reason if " @@ -8354,7 +8369,7 @@ "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en " "affichant la raison si spécifiée."

-#: ../src/groupchat_control.py:1575 +#: ../src/groupchat_control.py:1597 #, python-format msgid "" "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally " @@ -8363,7 +8378,7 @@ "Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant Jabber " "dans le salon actuel, la raison est optionnelle."

-#: ../src/groupchat_control.py:1579 +#: ../src/groupchat_control.py:1601 #, python-format msgid "" "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally " @@ -8372,7 +8387,7 @@ "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre " "salon@serveur en option on peut spécifier le surnom utilisé."

-#: ../src/groupchat_control.py:1583 +#: ../src/groupchat_control.py:1605 #, python-format msgid "" "Usage: /%s <nickname> [reason], removes the occupant specified by nickname " @@ -8383,7 +8398,7 @@ "spécifié du salon et affiche en option la raison. Le surnom ne doit pas " "contenir d'espaces !"

-#: ../src/groupchat_control.py:1592 +#: ../src/groupchat_control.py:1614 #, python-format msgid "" "Usage: /%s <nickname> [message], opens a private message window and sends " @@ -8392,23 +8407,23 @@ "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et " "envoie le message à l'occupant(e) spécifié(e) par le surnom."

-#: ../src/groupchat_control.py:1597 +#: ../src/groupchat_control.py:1619 #, python-format msgid "Usage: /%s <nickname>, changes your nickname in current group chat." msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."

-#: ../src/groupchat_control.py:1601 +#: ../src/groupchat_control.py:1623 #, python-format msgid "Usage: /%s , display the names of group chat occupants." msgstr "Utilisation : /%s , affiche les noms des occupants du salon."

-#: ../src/groupchat_control.py:1605 +#: ../src/groupchat_control.py:1627 #, python-format msgid "Usage: /%s [topic], displays or updates the current group chat topic." msgstr "" "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."

-#: ../src/groupchat_control.py:1608 +#: ../src/groupchat_control.py:1630 #, python-format msgid "" "Usage: /%s <message>, sends a message without looking for other commands." @@ -8416,39 +8431,39 @@ "Utilisation : /%s <message>, envoie un message sans chercher d'autres " "commandes."

-#: ../src/groupchat_control.py:1737 +#: ../src/groupchat_control.py:1759 #, python-format msgid "Are you sure you want to leave group chat "%s"?" msgstr "Êtes-vous sûr de vouloir quitter le salon "%s" ?"

-#: ../src/groupchat_control.py:1739 +#: ../src/groupchat_control.py:1761 msgid "" "If you close this window, you will be disconnected from this group chat." msgstr "Si vous fermez cette fenêtre, vous serez déconnecté(e) de ce salon."

-#: ../src/groupchat_control.py:1776 +#: ../src/groupchat_control.py:1798 msgid "Changing Subject" msgstr "Changement de Sujet"

-#: ../src/groupchat_control.py:1777 +#: ../src/groupchat_control.py:1799 msgid "Please specify the new subject:" msgstr "Saisissez le nouveau sujet :"

-#: ../src/groupchat_control.py:1781 +#: ../src/groupchat_control.py:1803 msgid "Changing Nickname" msgstr "Changement de Surnom"

-#: ../src/groupchat_control.py:1782 +#: ../src/groupchat_control.py:1804 msgid "Please specify the new nickname you want to use:" msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"

#. Ask for a reason -#: ../src/groupchat_control.py:1809 +#: ../src/groupchat_control.py:1831 #, python-format msgid "Destroying %s" msgstr "Destruction de %s"

-#: ../src/groupchat_control.py:1810 +#: ../src/groupchat_control.py:1832 msgid "" "You are going to definitively destroy this room.\n" "You may specify a reason below:" @@ -8456,22 +8471,22 @@ "Vous êtes sur le point de supprimer définitivement ce salon.\n" "Vous pouvez spécifier une raison ci-dessous :"

-#: ../src/groupchat_control.py:1812 +#: ../src/groupchat_control.py:1834 msgid "You may also enter an alternate venue:" msgstr "Vous pouvez également entrer une juridiction alternative :"

#. ask for reason -#: ../src/groupchat_control.py:1986 +#: ../src/groupchat_control.py:2008 #, python-format msgid "Kicking %s" msgstr "Exclusion de %s"

-#: ../src/groupchat_control.py:1987 ../src/groupchat_control.py:2284 +#: ../src/groupchat_control.py:2009 ../src/groupchat_control.py:2312 msgid "You may specify a reason below:" msgstr "Vous pouvez saisir une raison ci-dessous :"

#. ask for reason -#: ../src/groupchat_control.py:2283 +#: ../src/groupchat_control.py:2311 #, python-format msgid "Banning %s" msgstr "Bannissement de %s" @@ -8647,19 +8662,19 @@ msgid "Image is too big" msgstr "L'image est trop grande"

-#: ../src/message_window.py:446 +#: ../src/message_window.py:448 msgid "Chats" msgstr "Discussions"

-#: ../src/message_window.py:448 +#: ../src/message_window.py:450 msgid "Group Chats" msgstr "Salons de discussion"

-#: ../src/message_window.py:450 +#: ../src/message_window.py:452 msgid "Private Chats" msgstr "Conversations privées"

-#: ../src/message_window.py:456 +#: ../src/message_window.py:458 msgid "Messages" msgstr "Messages"

@@ -8762,38 +8777,38 @@ "Une erreur s'est produite lors de la publication de vos informations " "personnelles, veuillez réessayer plus tard."

-#: ../src/roster_window.py:291 ../src/roster_window.py:956 +#: ../src/roster_window.py:290 ../src/roster_window.py:954 msgid "Merged accounts" msgstr "Comptes regroupés"

-#: ../src/roster_window.py:1858 +#: ../src/roster_window.py:1848 msgid "Authorization has been sent" msgstr "L'Autorisation a été envoyée"

-#: ../src/roster_window.py:1859 +#: ../src/roster_window.py:1849 #, python-format msgid "Now "%s" will know your status." msgstr "Désormais "%s" connaîtra votre état."

-#: ../src/roster_window.py:1879 +#: ../src/roster_window.py:1869 msgid "Subscription request has been sent" msgstr "La requête d'inscription a été envoyée"

-#: ../src/roster_window.py:1880 +#: ../src/roster_window.py:1870 #, python-format msgid "If "%s" accepts this request you will know his or her status." msgstr "Si "%s" accepte cette requête, vous connaîtrez son état."

-#: ../src/roster_window.py:1892 +#: ../src/roster_window.py:1882 msgid "Authorization has been removed" msgstr "L'Autorisation a été supprimée"

-#: ../src/roster_window.py:1893 +#: ../src/roster_window.py:1883 #, python-format msgid "Now "%s" will always see you as offline." msgstr "Dorénavant, "%s" vous verra toujours déconnecté(e)."

-#: ../src/roster_window.py:1918 +#: ../src/roster_window.py:1908 msgid "" "Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started " "(environment variable probably not \t\t\t\t\t\t\tcorrectly set)" @@ -8801,15 +8816,15 @@ "Gnome Keyring est installé mais pas \t\t\t\t\t\t\tcorrectement démarré " "(variable d'environnement probablement \t\t\t\t\t\t\tmal configurée)"

-#: ../src/roster_window.py:1928 ../src/roster_window.py:1948 +#: ../src/roster_window.py:1918 ../src/roster_window.py:1938 msgid "GPG is not usable" msgstr "GPG n'est pas utilisable"

-#: ../src/roster_window.py:2107 ../src/roster_window.py:3245 +#: ../src/roster_window.py:2106 ../src/roster_window.py:3250 msgid "You are participating in one or more group chats" msgstr "Vous participez à un ou plusieurs salons"

-#: ../src/roster_window.py:2108 ../src/roster_window.py:3246 +#: ../src/roster_window.py:2107 ../src/roster_window.py:3251 msgid "" "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" @@ -8817,15 +8832,15 @@ "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-" "vous sûr de vouloir être invisible ?"

-#: ../src/roster_window.py:2134 +#: ../src/roster_window.py:2133 msgid "desync'ed" msgstr "désynchronisé"

-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505 +#: ../src/roster_window.py:2267 ../src/roster_window.py:2504 msgid "You have unread messages" msgstr "Vous avez des messages non lus"

-#: ../src/roster_window.py:2269 +#: ../src/roster_window.py:2268 msgid "" "Messages will only be available for reading them later if you have history " "enabled and contact is in your roster." @@ -8833,16 +8848,16 @@ "Les messages seront disponibles pour une lecture ultérieure si l'archivage " "de l'historique est actif et si le contact est dans votre liste."

-#: ../src/roster_window.py:2506 +#: ../src/roster_window.py:2505 msgid "You must read them before removing this transport." msgstr "Vous devez les lire avant de supprimer ce compte."

-#: ../src/roster_window.py:2509 +#: ../src/roster_window.py:2508 #, python-format msgid "Transport "%s" will be removed" msgstr "La passerelle "%s" sera enlevée"

-#: ../src/roster_window.py:2510 +#: ../src/roster_window.py:2509 msgid "" "You will no longer be able to send and receive messages from contacts using " "this transport." @@ -8850,11 +8865,11 @@ "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette " "passerelle."

-#: ../src/roster_window.py:2513 +#: ../src/roster_window.py:2512 msgid "Transports will be removed" msgstr "Les passerelles seront enlevées"

-#: ../src/roster_window.py:2518 +#: ../src/roster_window.py:2517 #, python-format msgid "" "You will no longer be able to send and receive messages to contacts from " @@ -8864,35 +8879,36 @@ "passerelles : %s"

#. it's jid -#: ../src/roster_window.py:2652 +#: ../src/roster_window.py:2651 msgid "Rename Contact" msgstr "Renommer le contact"

-#: ../src/roster_window.py:2653 +#: ../src/roster_window.py:2652 #, python-format msgid "Enter a new nickname for contact %s" msgstr "Entrez un nouveau surnom pour le contact %s."

-#: ../src/roster_window.py:2660 +#: ../src/roster_window.py:2659 msgid "Rename Group" msgstr "_Renommer le Groupe"

-#: ../src/roster_window.py:2661 +#: ../src/roster_window.py:2660 #, python-format msgid "Enter a new name for group %s" msgstr "Entrez un nouveau nom pour le groupe %s."

-#: ../src/roster_window.py:2709 +#: ../src/roster_window.py:2716 msgid "Remove Group" msgstr "_Supprimer le Groupe"

-#: ../src/roster_window.py:2710 +#: ../src/roster_window.py:2717 #, python-format msgid "Do you want to remove group %s from the roster?" msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"

-#: ../src/roster_window.py:2711 -msgid "Remove also all contacts in this group from your roster" +#: ../src/roster_window.py:2718 +#, fuzzy +msgid "Also remove all contacts in this group from your roster" msgstr "Supprimer tous les contacts de ce groupe de votre liste de contacts"

#: ../src/roster_window.py:2757 @@ -8903,12 +8919,12 @@ msgid "Select a key to apply to the contact" msgstr "Choisissez la clé correspondant au contact"

-#: ../src/roster_window.py:3110 +#: ../src/roster_window.py:3111 #, python-format msgid "Contact "%s" will be removed from your roster" msgstr "Le contact "%s" sera enlevé de la liste de contacts"

-#: ../src/roster_window.py:3114 +#: ../src/roster_window.py:3115 msgid "" "By removing this contact you also remove authorization resulting in him or " "her always seeing you as offline." @@ -8916,7 +8932,13 @@ "En supprimant ce contact, vous enlevez aussi son autorisation. Il/Elle vous " "verra donc toujours déconnecté(e)."

-#: ../src/roster_window.py:3119 +#. Contact is not in roster +#: ../src/roster_window.py:3120 +#, fuzzy +msgid "Do you want to continue?" +msgstr "Voulez-vous accepter l'invitation ?" + +#: ../src/roster_window.py:3124 msgid "" "By removing this contact you also by default remove authorization resulting " "in him or her always seeing you as offline." @@ -8924,16 +8946,16 @@ "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle " "vous verra donc toujours déconnecté(e)."

-#: ../src/roster_window.py:3122 +#: ../src/roster_window.py:3127 msgid "I want this contact to know my status after removal" msgstr "Autoriser ce contact à connaître mon état après la suppression"

#. several contact to remove at the same time -#: ../src/roster_window.py:3126 +#: ../src/roster_window.py:3131 msgid "Contacts will be removed from your roster" msgstr "Les contacts seront enlevés de la liste de contacts"

-#: ../src/roster_window.py:3130 +#: ../src/roster_window.py:3135 #, python-format msgid "" "By removing these contacts:%s\n" @@ -8943,20 +8965,20 @@ "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc " "toujours déconnecté(e)."

-#: ../src/roster_window.py:3169 +#: ../src/roster_window.py:3174 msgid "No account available" msgstr "Aucun compte disponible"

-#: ../src/roster_window.py:3170 +#: ../src/roster_window.py:3175 msgid "You must create an account before you can chat with other contacts." msgstr "" "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."

-#: ../src/roster_window.py:3688 +#: ../src/roster_window.py:3691 msgid "Metacontacts storage not supported by your server" msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"

-#: ../src/roster_window.py:3690 +#: ../src/roster_window.py:3693 msgid "" "Your server does not support storing metacontacts information. So those " "information will not be saved on next reconnection." @@ -8965,14 +8987,14 @@ "métacontacts. Par conséquent, ces informations ne seront pas enregistrées " "lors de la prochaine connexion."

-#: ../src/roster_window.py:3768 +#: ../src/roster_window.py:3771 msgid "" "You are about to create a metacontact. Are you sure you want to continue?" msgstr "" "Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir " "continuer ?"

-#: ../src/roster_window.py:3770 +#: ../src/roster_window.py:3773 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 " @@ -8982,11 +9004,11 @@ "Généralement, cela est utile lorsqu'une même personne possède plusieurs " "comptes Jabber ou des comptes de transport."

-#: ../src/roster_window.py:3883 +#: ../src/roster_window.py:3886 msgid "Invalid file URI:" msgstr "Url de fichier invalide :"

-#: ../src/roster_window.py:3894 +#: ../src/roster_window.py:3897 #, python-format msgid "Do you want to send this file to %s:" msgid_plural "Do you want to send these files to %s:" @@ -8998,123 +9020,123 @@ #. for chat_with #. for single message #. join gc -#: ../src/roster_window.py:4566 ../src/roster_window.py:4637 -#: ../src/roster_window.py:4646 ../src/systray.py:219 ../src/systray.py:224 +#: ../src/roster_window.py:4568 ../src/roster_window.py:4639 +#: ../src/roster_window.py:4648 ../src/systray.py:219 ../src/systray.py:224 #: ../src/systray.py:230 #, python-format msgid "using account %s" msgstr "du compte %s"

#. add -#: ../src/roster_window.py:4653 +#: ../src/roster_window.py:4655 #, python-format msgid "to %s account" msgstr "au compte %s"

#. disco -#: ../src/roster_window.py:4658 +#: ../src/roster_window.py:4660 #, python-format msgid "using %s account" msgstr "pour le compte %s"

-#: ../src/roster_window.py:4695 +#: ../src/roster_window.py:4697 ../src/systray.py:257 msgid "_Manage Bookmarks..." msgstr "Gérer les marque-pages..."

#. profile, avatar -#: ../src/roster_window.py:4715 +#: ../src/roster_window.py:4717 #, python-format msgid "of account %s" msgstr "du compte %s"

-#: ../src/roster_window.py:4755 +#: ../src/roster_window.py:4757 #, python-format msgid "for account %s" msgstr "pour le compte %s"

-#: ../src/roster_window.py:4817 ../src/roster_window.py:4926 +#: ../src/roster_window.py:4819 ../src/roster_window.py:4928 msgid "_Change Status Message" msgstr "_Changer le message d'état"

-#: ../src/roster_window.py:4844 +#: ../src/roster_window.py:4846 msgid "Publish Tune" msgstr "Publier ce que j'écoute"

-#: ../src/roster_window.py:4851 +#: ../src/roster_window.py:4853 msgid "Mood" msgstr "Humeur"

-#: ../src/roster_window.py:4855 +#: ../src/roster_window.py:4857 msgid "Activity" msgstr "Activité"

-#: ../src/roster_window.py:4860 +#: ../src/roster_window.py:4862 msgid "Configure Services..." msgstr "Configurer les Services..."

-#: ../src/roster_window.py:5014 +#: ../src/roster_window.py:5016 msgid "_Maximize All" msgstr "Tout _maximiser"

#. Send Group Message -#: ../src/roster_window.py:5022 ../src/roster_window.py:5531 +#: ../src/roster_window.py:5024 ../src/roster_window.py:5546 msgid "Send Group M_essage" msgstr "_Envoyer un message de groupe"

-#: ../src/roster_window.py:5030 +#: ../src/roster_window.py:5032 msgid "To all users" msgstr "À tous les utilisateurs"

-#: ../src/roster_window.py:5034 +#: ../src/roster_window.py:5036 msgid "To all online users" msgstr "À tous les utilisateurs connectés"

-#: ../src/roster_window.py:5431 +#: ../src/roster_window.py:5446 msgid "I would like to add you to my roster" msgstr "Je souhaiterais vous ajouter à ma liste de contacts"

#. Manage Transport submenu -#: ../src/roster_window.py:5551 +#: ../src/roster_window.py:5566 msgid "_Manage Contacts" msgstr "_Gérer les Contacts"

#. Send single message -#: ../src/roster_window.py:5612 +#: ../src/roster_window.py:5627 msgid "Send Single Message" msgstr "Envoyer un message Simple"

#. Manage Transport submenu -#: ../src/roster_window.py:5668 +#: ../src/roster_window.py:5683 msgid "_Manage Transport" msgstr "_Gérer les Passerelles"

#. Modify Transport -#: ../src/roster_window.py:5676 +#: ../src/roster_window.py:5691 msgid "_Modify Transport" msgstr "_Modifier la Passerelle"

-#: ../src/roster_window.py:5751 +#: ../src/roster_window.py:5766 msgid "_Maximize" msgstr "_Maximiser"

-#: ../src/roster_window.py:5758 +#: ../src/roster_window.py:5773 msgid "_Disconnect" msgstr "_Déconnecter"

-#: ../src/roster_window.py:5838 +#: ../src/roster_window.py:5853 msgid "_New Group Chat" msgstr "_Nouveau Salon de Discussion"

#. History manager -#: ../src/roster_window.py:5951 +#: ../src/roster_window.py:5966 msgid "History Manager" msgstr "Gestionnaire d'historique"

-#: ../src/roster_window.py:5960 +#: ../src/roster_window.py:5975 msgid "_Join New Group Chat" msgstr "_Joindre un salon de discussion"

-#: ../src/roster_window.py:6170 +#: ../src/roster_window.py:6185 msgid "Change Status Message..." msgstr "Changer le message d'état..."

@@ -9140,18 +9162,18 @@ msgid "Subject: %s" msgstr "Sujet : %s"

-#: ../src/session.py:392 ../src/session.py:430 +#: ../src/session.py:391 ../src/session.py:423 msgid "Confirm these session options" msgstr "Confirmer ces options de session"

-#: ../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 "" "Le client distant veut négocier une session avec ces fonctionnalités :\n" "\n" @@ -9159,7 +9181,7 @@ "\n" "\t\tCes options sont-elles acceptables ?"

-#: ../src/session.py:431 +#: ../src/session.py:424 #, python-format msgid "" "The remote client selected these options:\n" @@ -9178,7 +9200,7 @@ msgid "_Change Status Message..." msgstr "_Changer le message d'état..."

-#: ../src/systray.py:261 +#: ../src/systray.py:270 msgid "Hide this menu" msgstr "Cacher ce menu"

Modified: branches/osx_newbuildsys/po/it.po =================================================================== --- branches/osx_newbuildsys/po/it.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/it.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -7437,7 +7437,7 @@ #~ msgid "In_vite" #~ msgstr "In_vita"

-#~ msgid "Invite Friends !" +#~ msgid "Invite Friends!" #~ msgstr "Invita amici!"

#~ msgid "MUC server"

Modified: branches/osx_newbuildsys/po/pl.po =================================================================== --- branches/osx_newbuildsys/po/pl.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/pl.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1052,7 +1052,7 @@ msgstr "_Zaproś"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" +msgid "Invite Friends!" msgstr "Zaproś przyjaciół!"

#: ../data/glade/chat_to_muc_window.glade.h:3

Modified: branches/osx_newbuildsys/po/pt_BR.po =================================================================== --- branches/osx_newbuildsys/po/pt_BR.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/pt_BR.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1015,7 +1015,7 @@ msgstr "Con_vidar"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" +msgid "Invite Friends!" msgstr "Convidar Amigos!"

#: ../data/glade/chat_to_muc_window.glade.h:3

Modified: branches/osx_newbuildsys/po/ru.po =================================================================== --- branches/osx_newbuildsys/po/ru.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/ru.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -85,19 +85,19 @@ msgstr "" "<b>Соединение с сервером </b>\n" "\n" -"Пожалуйста подождите..." +"Подождите..."

#: ../data/glade/account_creation_wizard_window.glade.h:4 msgid "<b>Please choose one of the options below:</b>" -msgstr "<b>Пожалуйста, выберите одну из опций из списка ниже:</b>" +msgstr "<b>Выберите одну из опций из списка ниже:</b>"

#: ../data/glade/account_creation_wizard_window.glade.h:5 msgid "<b>Please fill in the data for your existing account</b>" -msgstr "<b>Пожалуйста, заполните данные для вашей новой учетной записи</b>" +msgstr "<b>Заполните данные для вашей новой учетной записи</b>"

#: ../data/glade/account_creation_wizard_window.glade.h:6 msgid "<b>Please select a server</b>" -msgstr "<b>Пожалуйста, выберите сервер</b>" +msgstr "<b>Выберите сервер</b>"

#: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "" @@ -1061,16 +1061,16 @@ msgstr "_Пригласить"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Пригласить Друзей !" +msgid "Invite Friends!" +msgstr "Пригласить друзей!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server" -msgstr "MUC сервер" +msgstr "MUC-сервер"

#: ../data/glade/chat_to_muc_window.glade.h:4 msgid "Please select a MUC server." -msgstr "Пожалуйста выберите сервер" +msgstr "Выберите сервер конференций."

#: ../data/glade/chat_to_muc_window.glade.h:5 msgid "" @@ -1339,7 +1339,7 @@ "Generally avoid deletions with contacts you currently chat with." msgstr "" "<b>ВНИМАНИЕ:</b>\n" -"Если вы собираетесь устроить массовую чистку, пожалуйста, удостоверьтесь, " +"Если вы собираетесь устроить массовую чистку, удостоверьтесь, " "что Gajim не запущен. Избегайте удалений из логов контактов, с которыми вы " "разговариваете в этот момент."

@@ -1519,7 +1519,7 @@

#: ../data/glade/message_window.glade.h:1 msgid "Add this contact to roster (Ctrl+D)" -msgstr "Добавляет контакт в ростер (Ctrl+D)" +msgstr "Добавить контакт в ростер (Ctrl+D)"

#: ../data/glade/message_window.glade.h:2 msgid "Bookmark this room (Ctrl+B)" @@ -1758,7 +1758,7 @@

#: ../data/glade/preferences_window.glade.h:51 msgid "Hide all buttons in chat windows" -msgstr "Скрывает кнопки в окнах чата" +msgstr "Не показывать кнопки в окнах чата"

#: ../data/glade/preferences_window.glade.h:52 msgid "" @@ -1830,8 +1830,8 @@ "windows. If no language is explicitly set via right click on the input " "field, the default language will be used for this contact or group chat." msgstr "" -"Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода " -"окон чата. Если язык проверки явно не задан, будет использован язык по " +"Если отмечено, Gajim будет выделять орфографические ошибки в полях ввода " +"окон чата. Если язык проверки явно не задан, будет использован язык по " "умолчанию для данного контакта или комнаты."

#: ../data/glade/preferences_window.glade.h:62 @@ -1877,7 +1877,7 @@ msgstr "" "Если отмечено, то Gajim будет использовать для каждого протокола свои иконки " "(например, контакты из MSN будут иметь соответствующие иконки msn для " -"статусов "в сети", "ушёл", "занят" и т.д.)" +"статусов «в сети», «ушёл», «занят» и т.д.)"

#: ../data/glade/preferences_window.glade.h:67 msgid "" @@ -1893,7 +1893,7 @@ "animated or static graphical emoticons" msgstr "" "Gajim заменяет текстовые смайлики, например ':)', их графическим или " -"анимированным эквивалентом. Выберите "Отключены", чтобы этого не " +"анимированным эквивалентом. Выберите «Отключены», чтобы этого не " "происходило."

#: ../data/glade/preferences_window.glade.h:69 @@ -3000,7 +3000,7 @@ "<b>"%(title)s"</b> by <i>%(artist)s</i>\n" "from <i>%(source)s</i>" msgstr "" -"<b>"%(title)s"</b> <i>%(artist)s</i>\n" +"<b>«%(title)s»</b> <i>%(artist)s</i>\n" "из <i>%(source)s</i>"

#: ../src/chat_control.py:1306 @@ -3363,7 +3363,7 @@ "restructuredtext.html (If you want to use this, install docutils)" msgstr "" "Использует разметку ReStructuredText для отправки HTML, плюс ascii " -"форматирование, если оно выбрано. Синтаксис описан на http://docutils." +"форматирование, если оно выбрано. Синтаксис описан на http://docutils." "sourceforge.net/docs/ref/rst/restructuredtext.htm (Если вы хотите " "воспользоваться этим, установите docutils)"

@@ -3439,8 +3439,8 @@ "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' " "which means use wiktionary." msgstr "" -"Введите свою ссылку с %s, в которой %s подменяет слово/фразу или " -"'WIKTIONARY', что значит: "использовать wiktionary"." +"Введите свою ссылку с %s, в которой %s подменяет слово/фразу, или " +"«WIKTIONARY», чтобы использовать Викисловарь."

#: ../src/common/config.py:179 msgid "If checked, Gajim can be controlled remotely using gajim-remote." @@ -3465,16 +3465,16 @@ msgid "" "Sent chat state notifications. Can be one of all, composing_only, disabled." msgstr "" -"Отсылать уведомления о состоянии беседы. Может быть одним из "все", " -""только печать", "отключено"." +"Отсылать уведомления о состоянии беседы. Варианты: all (все), " +"composing_only (только печать), disabled (никаких уведомлений)."

#: ../src/common/config.py:182 msgid "" "Displayed chat state notifications in chat windows. Can be one of all, " "composing_only, disabled." msgstr "" -"Отображать состояния беседы в окне беседы. Может быть одним из "все", " -""только написание", "отключено"." +"Отображать состояния беседы в окне беседы. Варианты: all (все), " +"composing_only (только печать), disabled (никаких уведомлений)."

#: ../src/common/config.py:184 msgid "" @@ -3538,7 +3538,7 @@ "When negotiating an encrypted session, should Gajim assume you want your " "messages to be logged?" msgstr "" -"Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, " +"Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, " "что вы хотите сохранить историю сообщений?"

#: ../src/common/config.py:204 @@ -3802,7 +3802,7 @@ "and convert before insterting it in chat window." msgstr "" "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, " -"используя dvips и конвертировать до вставки его в окно чата." +"используя dvips и конвертировать до вставки его в окно чата."

#: ../src/common/config.py:262 msgid "Time of inactivity needed before the change status window closes down." @@ -3869,7 +3869,7 @@

#: ../src/common/config.py:294 msgid "Enable ESessions encryption for this account." -msgstr "Включить ESessions шифрование для данной учетной записи." +msgstr "Включить ESessions шифрование для данной учетной записи."

#: ../src/common/config.py:295 msgid "Should Gajim automatically start an encrypted session when possible?" @@ -3904,7 +3904,7 @@ "How many seconds to wait for the answer of keepalive packet before we try to " "reconnect." msgstr "" -"Время ожидания в секундах ответа на "keepalive packet" перед повторной " +"Время ожидания (в секундах) ответа на "keepalive packet" перед повторной " "попыткой соединения."

#. yes, no, ask @@ -3950,13 +3950,13 @@

#: ../src/common/config.py:401 msgid "'yes', 'no', or 'both'" -msgstr ""да", "нет" или "оба"" +msgstr ""yes" (да), "no" (нет) или "both" (оба)"

#: ../src/common/config.py:402 ../src/common/config.py:404 #: ../src/common/config.py:405 ../src/common/config.py:408 #: ../src/common/config.py:409 msgid "'yes', 'no' or ''" -msgstr ""да", "нет" или """ +msgstr ""yes" (да), "no" (нет) или """

#: ../src/common/config.py:415 ../src/common/pep.py:106 msgid "Sleeping" @@ -4407,7 +4407,7 @@

#: ../src/common/connection.py:731 msgid "Please check your login and password for correctness." -msgstr "Пожалуйста, проверьте правильность логина и пароля." +msgstr "Проверьте правильность логина и пароля."

#: ../src/common/connection.py:792 msgid "Error while removing privacy list" @@ -5480,7 +5480,7 @@

#: ../src/common/zeroconf/connection_zeroconf.py:249 msgid "Please check if Avahi or Bonjour is installed." -msgstr "Пожалуйста, удостоверьтесь что Avahi или Bonjour установлен." +msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."

#: ../src/common/zeroconf/connection_zeroconf.py:258 #: ../src/common/zeroconf/connection_zeroconf.py:262 @@ -5495,7 +5495,7 @@ #: ../src/common/zeroconf/connection_zeroconf.py:263 #: ../src/common/zeroconf/connection_zeroconf.py:358 msgid "Please check if avahi-daemon is running." -msgstr "Пожалуйста, удостоверьтесь что демон avahi запущен." +msgstr "Удостоверьтесь, что демон avahi запущен."

#: ../src/common/zeroconf/connection_zeroconf.py:357 #, python-format @@ -5675,8 +5675,7 @@ "This name is already used by another of your accounts. Please choose another " "name." msgstr "" -"Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите " -"другое." +"Это имя уже используется в другой вашей учетной записи. Выберите другое."

#: ../src/config.py:1715 ../src/config.py:1719 msgid "Invalid account name" @@ -5932,7 +5931,7 @@ msgid "" "Please be sure to fill out server and room fields or remove this bookmark." msgstr "" -"Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, " +"Удостоверьтесь, что заполнены поля с именем сервера и комнаты, " "либо удалите эту закладку."

#: ../src/config.py:3074 @@ -5971,7 +5970,7 @@

#: ../src/config.py:3140 msgid "Please provide a server on which you want to register." -msgstr "Пожалуйста, укажите сервер, на котором вы хотите зарегистрироваться." +msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."

#: ../src/config.py:3191 ../src/gajim.py:1990 msgid "Certificate Already in File" @@ -6098,7 +6097,7 @@ #: ../src/dataforms_widget.py:541 msgid "The Jabber ID you entered is already in the list. Choose another one." msgstr "" -"Jabber ID, который вы ввели, уже существует. Пожалуйста, выберите другой." +"Jabber ID, который вы ввели, уже существует. Выберите другой."

#. Default jid #: ../src/dataforms_widget.py:552 @@ -6190,12 +6189,12 @@ #, python-format msgid "Please fill in the data of the contact you want to add in account %s" msgstr "" -"Пожалуйста, заполните данные о контакте,\n" +"Заполните данные о контакте,\n" "который хотите добавить в ростер учетной записи %s"

#: ../src/dialogs.py:713 msgid "Please fill in the data of the contact you want to add" -msgstr "Пожалуйста, заполните данные о контакте, который вы хотите добавить" +msgstr "Заполните данные о контакте, который вы хотите добавить"

#: ../src/dialogs.py:870 ../src/dialogs.py:876 ../src/dialogs.py:881 msgid "Invalid User ID" @@ -6368,7 +6367,7 @@ #: ../src/dialogs.py:1963 ../src/dialogs.py:2338 ../src/dialogs.py:2481 #, python-format msgid "Please make sure you are connected with "%s"." -msgstr "Пожалуйста, удостоверьтесь, что вы подключены к "%s"." +msgstr "Удостоверьтесь, что вы подключены к "%s"."

#: ../src/dialogs.py:1972 ../src/dialogs.py:1975 msgid "Invalid JID" @@ -6681,7 +6680,7 @@ "\n" "This session's Short Authentication String is <b>%(sas)s</b>." msgstr "" -"Для предотвращения атаки типа «человек посередине», вы должны переговорить с " +"Для предотвращения атаки типа «человек посередине» вы должны переговорить с " "<b>%(jid)s</b> напрямую (лично или по телефону) и убедиться, что он видит ту " "же Short Authentication String (SAS), что и вы.\n" "\n" @@ -6954,7 +6953,7 @@ msgid "" "Requires python-gnome2-extras or compiled trayicon module from Gajim sources." msgstr "" -"Требует python-gnome2-extras или скомпилированного модуля trayicon из " +"Требует python-gnome2-extras или скомпилированного модуля trayicon из " "исходных кодов Gajim."

#: ../src/features_window.py:94 @@ -6989,7 +6988,7 @@ "'use_latex' to True in the Advanced Configuration Editor." msgstr "" "Требует texlive-latex-base, dvips и imagemagick. Необходимо присвоить пункту " -"'use_latex' значение True в Расширенном редакторе настроек." +"'use_latex' значение True в Расширенном редакторе настроек."

#: ../src/features_window.py:103 msgid "End to End Encryption" @@ -7205,7 +7204,7 @@

#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663 msgid "Name: " -msgstr "Имя: " +msgstr "Имя: "

#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667 msgid "Sender: " @@ -7250,13 +7249,13 @@ "Please remove your current GTK+ runtime and install the latest stable " "version from %s" msgstr "" -"Пожалуйста, удалите вашу текущую версию GTK и установите последнюю " +"Удалите вашу текущую версию GTK и установите последнюю " "стабильную версию с %s"

#: ../src/gajim.py:199 msgid "" "Please make sure that GTK+ and PyGTK have libglade support in your system." -msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade." +msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."

#: ../src/gajim.py:204 msgid "Gajim needs PySQLite2 to run" @@ -7272,7 +7271,7 @@ "Please make sure that Pywin32 is installed on your system. You can get it at " "%s" msgstr "" -"Пожалуйста, удостоверьтесь что в вашей системе установлен Pywin32. Вы можете " +"Удостоверьтесь, что в вашей системе установлен Pywin32. Вы можете " "получить его на сайте: %s"

#. set the icon to all newly opened wind @@ -7305,7 +7304,7 @@ #: ../src/gajim.py:500 msgid "Please retype your GPG passphrase or press Cancel." msgstr "" -"Пожалуйста, введите парольную фразу для GPG еще раз или нажмите Отмена." +"Введите парольную фразу для GPG еще раз или нажмите «Отмена»."

#: ../src/gajim.py:547 #, python-format @@ -7316,7 +7315,7 @@ msgstr "" "Тот ник, что вы ввели в комнате %s уже используется или зарегистрирован " "другим пользователем.\n" -"Пожалуйста, укажите другой ник ниже:" +"Укажите другой ник:"

#: ../src/gajim.py:561 msgid "Do you accept this request?" @@ -7526,7 +7525,7 @@ #: ../src/gajim.py:1896 msgid "Please type a new username for your local account" msgstr "" -"Пожалуйста, введите новое имя пользователя для локальной учетной записи" +"Введите новое имя пользователя для локальной учетной записи"

#: ../src/gajim.py:1908 msgid "Ping?" @@ -7616,7 +7615,7 @@ "install PyOpenSSL to prevent that. Are you sure you want to do that?" msgstr "" "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? " -"Установите PyOpenSSL чтоб предотвратить это." +"(Установите PyOpenSSL, чтобы этого не происходило.)"

#: ../src/gajim.py:2103 msgid "PEP node was not removed" @@ -7645,7 +7644,7 @@ "for more details." msgstr "" "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла " -"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons." +"emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."

#: ../src/gajim.py:2600 ../src/roster_window.py:3296 msgid "You cannot join a group chat while you are invisible" @@ -8006,7 +8005,7 @@

#: ../src/gajim-remote.py:276 msgid "Check if Gajim is running" -msgstr "Проверьте что Gajim запущен" +msgstr "Проверить, запущен ли Gajim"

#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290 msgid "Shows or hides the ipython window" @@ -8022,12 +8021,12 @@ "'%s' is not in your roster.\n" "Please specify account for sending the message." msgstr "" -"'%s' не в вашем ростере\n" -"Пожалуйста, укажите учетную запись для отправки сообщения." +"'%s' не в вашем ростере.\n" +"Укажите учетную запись для отправки сообщения."

#: ../src/gajim-remote.py:336 msgid "You have no active account" -msgstr "У вас нет активной учетной записи" +msgstr "У вас нет ни одной активной учетной записи"

#: ../src/gajim-remote.py:389 msgid "It seems Gajim is not running. So you can't use gajim-remote." @@ -8092,7 +8091,7 @@

#: ../src/gajim_themes_window.py:98 msgid "Please create a clean new theme with your desired name." -msgstr "Пожалуйста, cоздайте новую тему с желаемым названием." +msgstr "Создайте новую тему с желаемым названием."

#. don't confuse translators #: ../src/gajim_themes_window.py:172 @@ -8105,7 +8104,7 @@

#: ../src/gajim_themes_window.py:190 msgid "Please first choose another for your current theme." -msgstr "Пожалуйста, выберите сначала другую тему." +msgstr "Выберите сначала другую тему."

#: ../src/groupchat_control.py:145 msgid "Sending private message failed" @@ -8350,19 +8349,19 @@

#: ../src/groupchat_control.py:1798 msgid "Changing Subject" -msgstr "Изменяет тему" +msgstr "Смена темы"

#: ../src/groupchat_control.py:1799 msgid "Please specify the new subject:" -msgstr "Пожалуйста, введите новую тему:" +msgstr "Введите новую тему:"

#: ../src/groupchat_control.py:1803 msgid "Changing Nickname" -msgstr "Изменяет ник" +msgstr "Смена ника"

#: ../src/groupchat_control.py:1804 msgid "Please specify the new nickname you want to use:" -msgstr "Пожалуйста, введите новый ник, который вы хотите использовать:" +msgstr "Введите новый ник, который вы хотите использовать:"

# смотря где вылазит меседж - нужно присмотреться #. Ask for a reason @@ -8376,12 +8375,12 @@ "You are going to definitively destroy this room.\n" "You may specify a reason below:" msgstr "" -"Вы хотите уничтожить комнату.\n" -"Вы можете указать причину:" +"Вы собираетесь полностью уничтожить эту комнату.\n" +"Можете указать причину:"

#: ../src/groupchat_control.py:1834 msgid "You may also enter an alternate venue:" -msgstr "Альтернативная причина:" +msgstr "Можете указать альтернативную комнату:"

#. ask for reason #: ../src/groupchat_control.py:2008 @@ -8556,7 +8555,7 @@ #: ../src/history_window.py:416 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" -msgstr "Статус установлен в: %(status)s: %(status_msg)s" +msgstr "Статус установлен в: %(status)s: %(status_msg)s"

#: ../src/history_window.py:419 #, python-format @@ -8898,7 +8897,7 @@ "is used when the same person has several Jabber accounts or transport " "accounts." msgstr "" -"Метаконтакты - это метод группировки нескольких контактов в одну запись. " +"Метаконтакты — это метод группировки нескольких контактов в одну запись. " "Обычно используется, когда один и тот же человек имеет несколько учетных " "записей в Jabber или на транспортах."

@@ -9217,8 +9216,8 @@ "This service could not respond with detailed information.\n" "It is most likely legacy or broken" msgstr "" -"Этот сервис не может предоставить информацию о себе . \n" -"Похоже что он или неверно настроен или сломан" +"Этот сервис не может предоставить подробную информацию о себе. \n" +"Скорее всего, он устарел или сломан"

#: ../src/vcard.py:246 msgid "?Client:Unknown"

Modified: branches/osx_newbuildsys/po/sk.po =================================================================== --- branches/osx_newbuildsys/po/sk.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/sk.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1040,7 +1040,7 @@ msgstr "Poz_vať"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" +msgid "Invite Friends!" msgstr "Pozvať priateľov!"

#: ../data/glade/chat_to_muc_window.glade.h:3

Modified: branches/osx_newbuildsys/po/sr.po =================================================================== --- branches/osx_newbuildsys/po/sr.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/sr.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1049,8 +1049,8 @@ msgstr "Позо_ви"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Позови пријатеље !" +msgid "Invite Friends!" +msgstr "Позови пријатеље!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server"

Modified: branches/osx_newbuildsys/po/sr@Latn.po =================================================================== --- branches/osx_newbuildsys/po/sr@Latn.po 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/po/sr@Latn.po 2008-09-13 08:35:26 UTC (rev 10412) @@ -1051,8 +1051,8 @@ msgstr "Pozo_vi"

#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends !" -msgstr "Pozovi prijatelje !" +msgid "Invite Friends!" +msgstr "Pozovi prijatelje!"

#: ../data/glade/chat_to_muc_window.glade.h:3 msgid "MUC server"

Modified: branches/osx_newbuildsys/src/chat_control.py =================================================================== --- branches/osx_newbuildsys/src/chat_control.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/chat_control.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -1025,6 +1025,11 @@ self.handlers[id] = self._add_to_roster_button

self._send_file_button = self.xml.get_widget('send_file_button') + # add a special img for send file button + path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + img = gtk.Image() + img.set_from_file(path_to_upload_img) + self._send_file_button.set_image(img) id = self._send_file_button.connect('clicked', self._on_send_file_menuitem_activate) self.handlers[id] = self._send_file_button @@ -1793,13 +1798,12 @@ '''print esession settings to textview''' e2e_is_active = bool(self.session) and self.session.enable_encryption if e2e_is_active: - msg = _('E2E encryption enabled') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + msg = _('This session is encrypted')

if self.session.is_loggable(): - msg = _('Session WILL be logged') + msg += _(' and WILL be logged') else: - msg = _('Session WILL NOT be logged') + msg += _(' and WILL NOT be logged')

ChatControlBase.print_conversation_line(self, msg, 'status', '', None)

@@ -1970,6 +1974,12 @@ separatormenuitem1 = xml.get_widget('separatormenuitem1') separatormenuitem2 = xml.get_widget('separatormenuitem2')

+ # add a special img for send file menuitem + path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + img = gtk.Image() + img.set_from_file(path_to_upload_img) + send_file_menuitem.set_image(img) + muc_icon = gtkgui_helpers.load_icon('muc_active') if muc_icon: convert_to_gc_menuitem.set_image(muc_icon)

Modified: branches/osx_newbuildsys/src/common/connection.py =================================================================== --- branches/osx_newbuildsys/src/common/connection.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/common/connection.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -638,6 +638,14 @@ return self.connection_accepted(con, con_type)

def connection_accepted(self, con, con_type): + if not con or not con.Connection: + self.disconnect(on_purpose=True) + self.dispatch('STATUS', 'offline') + self.dispatch('CONNECTION_LOST', + (_('Could not connect to account %s') % self.name, + _('Connection with account %s has been lost. Retry connecting.') % \ + self.name)) + return self.hosts = [] self.connection_auto_accepted = False self.connected_hostname = self._current_host['host'] @@ -678,17 +686,19 @@ con.auth(name, self.password, self.server_resource, 1, self.__on_auth)

def ssl_certificate_accepted(self): + if not self.connection: + self.disconnect(on_purpose=True) + self.dispatch('STATUS', 'offline') + self.dispatch('CONNECTION_LOST', + (_('Could not connect to account %s') % self.name, + _('Connection with account %s has been lost. Retry connecting.') % \ + self.name)) + return name = gajim.config.get_per('accounts', self.name, 'name') self._register_handlers(self.connection, 'ssl') self.connection.auth(name, self.password, self.server_resource, 1, self.__on_auth)

- def plain_connection_accepted(self): - name = gajim.config.get_per('accounts', self.name, 'name') - self._register_handlers(self.connection, 'tcp') - self.connection.auth(name, self.password, self.server_resource, 1, - self.__on_auth) - def _register_handlers(self, con, con_type): self.peerhost = con.get_peerhost() # notify the gui about con_type @@ -697,7 +707,7 @@

def __on_auth(self, con, auth): if not con: - self.disconnect(on_purpose = True) + self.disconnect(on_purpose=True) self.dispatch('STATUS', 'offline') self.dispatch('CONNECTION_LOST', (_('Could not connect to "%s"') % self._hostname,

Modified: branches/osx_newbuildsys/src/common/connection_handlers.py =================================================================== --- branches/osx_newbuildsys/src/common/connection_handlers.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/common/connection_handlers.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -1780,7 +1780,7 @@ and gajim.config.get_per('accounts', self.name, 'answer_receipts') and contact and contact.sub \ not in (u'to', u'none'): - receipt = common.xmpp.Message(to = jid, typ = 'chat') + receipt = common.xmpp.Message(to = frm, typ = 'chat') receipt.setID(msg.getID()) receipt.setTag('received', namespace='urn:xmpp:receipts')

Modified: branches/osx_newbuildsys/src/common/idle_c/idle.c =================================================================== --- branches/osx_newbuildsys/src/common/idle_c/idle.c 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/common/idle_c/idle.c 2008-09-13 08:35:26 UTC (rev 10412) @@ -23,36 +23,27 @@ * along with Gajim. If not, see http://www.gnu.org/licenses/. */

-#ifndef _WIN32 - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/extensions/scrnsaver.h> -#endif +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/extensions/scrnsaver.h>

#include <Python.h>

-#ifndef _WIN32 - Display *display; -#endif +Display *display;

- static PyObject * idle_init(PyObject *self, PyObject *args) { -#ifndef _WIN32 display = XOpenDisplay(NULL); -#endif + Py_INCREF(Py_None); return Py_None; }

static PyObject * idle_getIdleSec(PyObject *self, PyObject *args) { -#ifndef _WIN32 static XScreenSaverInfo *mit_info = NULL; int idle_time, event_base, error_base; -#endif

-#ifndef _WIN32 if (XScreenSaverQueryExtension(display, &event_base, &error_base)) { if (mit_info == NULL) @@ -62,24 +53,23 @@ } else idle_time = 0; -#endif + return Py_BuildValue("i", idle_time); }

static PyObject * idle_close(PyObject *self, PyObject *args) { -#ifndef _WIN32 XCloseDisplay(display); -#endif + Py_INCREF(Py_None); return Py_None; }

static PyMethodDef idleMethods[] = { - {"init", idle_init, METH_VARARGS, "init idle"}, - {"getIdleSec", idle_getIdleSec, METH_VARARGS, "Give the idle time in secondes"}, - {"close", idle_close, METH_VARARGS, "close idle"}, + {"init", idle_init, METH_NOARGS, "init idle"}, + {"getIdleSec", idle_getIdleSec, METH_NOARGS, "Give the idle time in secondes"}, + {"close", idle_close, METH_NOARGS, "close idle"}, {NULL, NULL, 0, NULL} };

Modified: branches/osx_newbuildsys/src/common/logger.py =================================================================== --- branches/osx_newbuildsys/src/common/logger.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/common/logger.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -707,21 +707,26 @@ # get data from table # the data field contains binary object (gzipped data), this is a hack # to get that data without trying to convert it to unicode - #tmp, self.con.text_factory = self.con.text_factory, str try: self.cur.execute('SELECT hash_method, hash, data FROM caps_cache;'); except sqlite.OperationalError: # might happen when there's no caps_cache table yet # -- there's no data to read anyway then - #self.con.text_factory = tmp return - #self.con.text_factory = tmp + + # list of corrupted entries that will be removed + to_be_removed = [] for hash_method, hash, data in self.cur: # for each row: unpack the data field # (format: (category, type, name, category, type, name, ... # ..., 'FEAT', feature1, feature2, ...).join(' ')) # NOTE: if there's a need to do more gzip, put that to a function - data = GzipFile(fileobj=StringIO(str(data))).read().split('\0') + try: + data = GzipFile(fileobj=StringIO(str(data))).read().decode('utf-8').split('\0') + except IOError: + # This data is corrupted. It probably contains non-ascii chars + to_be_removed.append((hash_method, hash)) + continue i=0 identities = list() features = list() @@ -740,6 +745,9 @@

# yield the row yield hash_method, hash, identities, features + for hash_method, hash in to_be_removed: + sql = 'DELETE FROM caps_cache WHERE hash_method = "%s" AND hash = "%s"' % (hash_method, hash) + self.simple_commit(sql)

def add_caps_entry(self, hash_method, hash, identities, features): data=[] @@ -755,6 +763,7 @@ # if there's a need to do more gzip, put that to a function string = StringIO() gzip = GzipFile(fileobj=string, mode='w') + data = data.encode('utf-8') # the gzip module can't handle unicode objects gzip.write(data) gzip.close() data = string.getvalue()

Modified: branches/osx_newbuildsys/src/config.py =================================================================== --- branches/osx_newbuildsys/src/config.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/config.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -3174,8 +3174,8 @@ self.update_progressbar) # Get form from serveur con = connection.Connection(self.account) + gajim.connections[self.account] = con con.new_account(self.account, config) - gajim.connections[self.account] = con elif cur_page == 3: checked = self.xml.get_widget('ssl_checkbutton').get_active() if checked: @@ -3274,6 +3274,8 @@

def new_acc_not_connected(self, reason): '''Account creation failed: connection to server failed''' + if self.account not in gajim.connections: + return if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) del gajim.connections[self.account]

Modified: branches/osx_newbuildsys/src/dialogs.py =================================================================== --- branches/osx_newbuildsys/src/dialogs.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/dialogs.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -3827,8 +3827,15 @@ if self.session.control: self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), True) - self.window.set_title(_('''Contact's identity verified''')) - self.xml.get_widget('dialog-action_area1').set_no_show_all(True) + + verification_status = _('''Contact's identity verified''') + self.window.set_title(verification_status) + self.xml.get_widget('verification_status_label').set_markup( + '<b><span size="x-large">' + + verification_status + + '</span></b>') + + self.xml.get_widget('dialog-action_area1').set_no_show_all(True) self.button_label.set_text(_('Verify again...')) else: if self.session.control: @@ -3836,7 +3843,14 @@ self.session.is_loggable(), False) labeltext += '\n\n' + _('''To be certain that <b>only</b> the expected person can read your messages or send you messages, you need to verify their identity by clicking the button below.''') security_image = 'security-low-big.png' - self.window.set_title(_('''Contact's identity NOT verified''')) + + verification_status = _('''Contact's identity NOT verified''') + self.window.set_title(verification_status) + self.xml.get_widget('verification_status_label').set_markup( + '<b><span size="x-large">' + + verification_status + + '</span></b>') + self.button_label.set_text(_('Verify...'))

path = os.path.join(dir, security_image)

Modified: branches/osx_newbuildsys/src/gajim-remote.py =================================================================== --- branches/osx_newbuildsys/src/gajim-remote.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/gajim-remote.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -283,13 +283,6 @@

}

- path = os.getcwd() - if '.svn' in os.listdir(path) or '_svn' in os.listdir(path): - # command only for svn - self.commands['toggle_ipython'] = [ - _('Shows or hides the ipython window'), - [] - ] self.sbus = None if self.argv_len < 2 or sys.argv[1] not in self.commands.keys(): # no args or bad args

Modified: branches/osx_newbuildsys/src/gajim.py =================================================================== --- branches/osx_newbuildsys/src/gajim.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/gajim.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -473,7 +473,7 @@ self.passphrase = passphrase self.completed = True if passphrase is not None: - gobject.timeout_add(30000, gajim.interface.forget_gpg_passphrase, + gobject.timeout_add_seconds(30, gajim.interface.forget_gpg_passphrase, self.keyid) for (account, cb) in self.callbacks: self.run_callback(account, cb)

Modified: branches/osx_newbuildsys/src/groupchat_control.py =================================================================== --- branches/osx_newbuildsys/src/groupchat_control.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/groupchat_control.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -2109,6 +2109,12 @@ self.handlers[id] = item

item = xml.get_widget('send_file_menuitem') + # add a special img for send file menuitem + path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + img = gtk.Image() + img.set_from_file(path_to_upload_img) + item.set_image(img) + if not c.resource: item.set_sensitive(False) else:

Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/roster_window.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -2031,9 +2031,15 @@ del gajim.interface.status_sent_to_users[account][contact.jid]

# Delete pep if needed - keep_pep = any(c.show not in ('error', 'offline') for c in - contact_instances) - if not keep_pep and not contact.is_groupchat(): + #FIXME: py2.5only +# keep_pep = any(c.show not in ('error', 'offline') for c in +# contact_instances) + keep_pep = False + for c in contact_instances: + if c.show not in ('error', 'offline'): + keep_pep = True + if not keep_pep and contact.jid != gajim.get_jid_from_account(account) \ + and not contact.is_groupchat(): pep.delete_pep(contact.jid, account)

# Redraw everything and select the sender @@ -3085,7 +3091,8 @@ if contact.sub != 'to' and is_checked: remove_auth = False for (contact, account) in list_: - gajim.connections[account].unsubscribe(contact.jid, remove_auth) + if _('Not in Roster') not in contact.get_shown_groups(): + gajim.connections[account].unsubscribe(contact.jid, remove_auth) self.remove_contact(contact.jid, account, backend=True) if not remove_auth and contact.sub == 'both': contact.name = '' @@ -3108,6 +3115,10 @@ _('By removing this contact you also remove authorization ' 'resulting in him or her always seeing you as offline.'), on_response_ok = (on_ok2, list_)) + elif _('Not in Roster') in contact.get_shown_groups(): + # Contact is not in roster + dialogs.ConfirmationDialog(pritext, _('Do you want to continue?'), + on_response_ok = (on_ok2, list_)) else: dialogs.ConfirmationDialogCheck(pritext, _('By removing this contact you also by default remove ' @@ -5163,6 +5174,13 @@ add_special_notification_menuitem = xml.get_widget( 'add_special_notification_menuitem')

+ # add a special img for send file menuitem + path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', + 'upload.png') + img = gtk.Image() + img.set_from_file(path_to_upload_img) + send_file_menuitem.set_image(img) + if not our_jid: # add a special img for rename menuitem path_to_kbd_input_img = os.path.join(gajim.DATA_DIR, 'pixmaps', @@ -5285,6 +5303,12 @@ execute_command_menuitem = xml.get_widget( 'execute_command_menuitem')

+ # add a special img for send file menuitem + path_to_upload_img = os.path.join(gajim.DATA_DIR, 'pixmaps', 'upload.png') + img = gtk.Image() + img.set_from_file(path_to_upload_img) + send_file_menuitem.set_image(img) + # send custom status icon blocked = False if jid in gajim.connections[account].blocked_contacts:

Modified: branches/osx_newbuildsys/src/systray.py =================================================================== --- branches/osx_newbuildsys/src/systray.py 2008-09-12 05:25:10 UTC (rev 10411) +++ branches/osx_newbuildsys/src/systray.py 2008-09-13 08:35:26 UTC (rev 10412) @@ -252,6 +252,15 @@ account) break # No other connected account

+ newitem = gtk.SeparatorMenuItem() # separator + gc_sub_menu.append(newitem) + newitem = gtk.ImageMenuItem(_('_Manage Bookmarks...')) + img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) + newitem.set_image(img) + newitem.connect('activate', + gajim.interface.roster.on_manage_bookmarks_menuitem_activate) + gc_sub_menu.append(newitem) + sounds_mute_menuitem.set_active(not gajim.config.get('sounds_on'))

if os.name == 'nt':