Commits March 2012

commits@gajim.org

4 participants
56 discussions

gajim: updated french translation
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset da5a3cc7b8df in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=da5a3cc7b8df description: updated french translation diffstat: po/fr.po | 1420 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 729 insertions(+), 691 deletions(-) diffs (truncated from 3787 to 300 lines): diff -r 7b9f18e75aca -r da5a3cc7b8df po/fr.po --- a/po/fr.po Sun Mar 18 10:36:30 2012 +0100 +++ b/po/fr.po Sun Mar 18 12:17:29 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" +"POT-Creation-Date: 2012-03-18 12:16+0100\n" "PO-Revision-Date: 2011-05-30 08:28+0100\n" "Last-Translator: Florent Le Coz <louizatakk(a)fedoraproject.org>\n" "Language-Team: <>\n" @@ -125,10 +125,10 @@ #: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 #: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 #: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 -#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774 +#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3139 -#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 +#: ../src/dialogs.py:532 ../src/roster_window.py:3133 +#: ../src/roster_window.py:3139 ../src/roster_window.py:3144 msgid "None" msgstr "Aucun" @@ -245,9 +245,8 @@ msgstr "C_onnexion au démarrage" #: ../data/gui/accounts_window.ui.h:14 -#, fuzzy msgid "Certificate is e_ncrypted" -msgstr "Certificat refusé" +msgstr "Le certificat est chiffré" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" @@ -316,8 +315,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 #: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3081 ../src/roster_window.py:4148 -#: ../src/roster_window.py:5738 +#: ../src/roster_window.py:3075 ../src/roster_window.py:4142 +#: ../src/roster_window.py:5732 msgid "General" msgstr "Général" @@ -419,7 +418,7 @@ msgstr "La priorité va changer automatiquement selon votre état." #. Rename -#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688 +#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5682 msgid "Re_name" msgstr "Re_nommer" @@ -458,7 +457,6 @@ msgstr "S_ynchroniser l'état du compte avec l'état global" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "Synchroniser les contacts" @@ -694,9 +692,8 @@ msgstr "<i>Méthode manuelle</i>" #: ../data/gui/archiving_preferences_window.ui.h:4 -#, fuzzy msgid "Auto" -msgstr "Rejoindre automatiquement" +msgstr "Auto" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Concede" @@ -711,9 +708,8 @@ msgstr "Non" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Prefer" -msgstr "Préférences" +msgstr "Préfère" #: ../data/gui/archiving_preferences_window.ui.h:9 msgid "Yes" @@ -745,8 +741,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5707 -#: ../src/roster_window.py:5834 ../src/roster_window.py:5967 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5701 +#: ../src/roster_window.py:5828 ../src/roster_window.py:5961 msgid "_Unblock" msgstr "_Débloquer" @@ -910,12 +906,12 @@ msgstr "Afficher le profil du contact (Ctrl+I)" #: ../data/gui/chat_control.ui.h:20 -#: ../src/command_system/implementation/standard.py:208 +#: ../src/command_system/implementation/standard.py:214 msgid "Toggle audio session" msgstr "Démarrer/arrêter une session audio" #: ../data/gui/chat_control.ui.h:21 -#: ../src/command_system/implementation/standard.py:218 +#: ../src/command_system/implementation/standard.py:224 msgid "Toggle video session" msgstr "Démarrer/arrêter une session vidéo" @@ -927,7 +923,7 @@ #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10 msgid "label" -msgstr "" +msgstr "label" #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "In_vite" @@ -976,8 +972,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:6 -#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5643 -#: ../src/roster_window.py:5802 +#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5637 +#: ../src/roster_window.py:5796 msgid "In_vite to" msgstr "In_viter à" @@ -986,7 +982,6 @@ msgstr "Inviter des _Contacts" #: ../data/gui/contact_context_menu.ui.h:8 -#, fuzzy msgid "M_anage Contact" msgstr "_Gérer le Contact" @@ -994,8 +989,8 @@ msgid "Remo_ve" msgstr "Suppri_mer" -#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5653 -#: ../src/roster_window.py:5891 +#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5647 +#: ../src/roster_window.py:5885 msgid "Send Cus_tom Status" msgstr "Envoyer un Statut Personnalisé" @@ -1028,8 +1023,8 @@ msgstr "L'autoriser à voir mon état" #: ../data/gui/contact_context_menu.ui.h:19 -#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5715 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5970 +#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5709 +#: ../src/roster_window.py:5834 ../src/roster_window.py:5964 msgid "_Block" msgstr "_Bloquer" @@ -1040,7 +1035,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_control_popup_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23 -#: ../src/roster_window.py:6041 +#: ../src/roster_window.py:6035 msgid "_History" msgstr "_Historique" @@ -1173,13 +1168,13 @@ msgid "Account row" msgstr "Ligne de compte" -#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041 +#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1039 msgid "Bold" msgstr "Gras" #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "" +msgstr "Bannière" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Composing" @@ -1209,7 +1204,7 @@ msgid "Inactive" msgstr "Inactif" -#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1042 +#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1040 msgid "Italic" msgstr "Italique" @@ -1275,9 +1270,8 @@ msgstr "_Minimiser à la fermeture" #: ../data/gui/gc_control_popup_menu.ui.h:9 -#, fuzzy msgid "_Request Voice" -msgstr "_S'exprimer" +msgstr "_Demander la parole" #: ../data/gui/gc_occupants_menu.ui.h:2 msgid "Mo_derator" @@ -1419,7 +1413,7 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:1 msgid "approve" -msgstr "" +msgstr "approuver" #: ../data/gui/item_archiving_preferences_window.ui.h:2 msgid "body" @@ -1427,11 +1421,11 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:3 msgid "concede" -msgstr "" +msgstr "concéder" #: ../data/gui/item_archiving_preferences_window.ui.h:4 msgid "expire" -msgstr "" +msgstr "expirer" #: ../data/gui/item_archiving_preferences_window.ui.h:5 msgid "false" @@ -1455,7 +1449,7 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:9 msgid "oppose" -msgstr "" +msgstr "opposer" #: ../data/gui/item_archiving_preferences_window.ui.h:10 msgid "otr" @@ -1463,11 +1457,11 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:11 msgid "prefer" -msgstr "" +msgstr "préfère" #: ../data/gui/item_archiving_preferences_window.ui.h:12 msgid "require" -msgstr "" +msgstr "nécessite" #: ../data/gui/item_archiving_preferences_window.ui.h:13 msgid "save" @@ -1531,21 +1525,20 @@ msgstr "Gérer les marque-pages" #: ../data/gui/manage_bookmarks_window.ui.h:4 -#, fuzzy msgid "Minimi_ze on Auto Join" -msgstr "Minimiser automatiquement" +msgstr "_Minimiser automatiquement" #: ../data/gui/manage_bookmarks_window.ui.h:5 msgid "Pr_int status:" -msgstr "Afficher l'état :" +msgstr "_Afficher l'état :" #: ../data/gui/manage_bookmarks_window.ui.h:6 msgid "Roo_m:" -msgstr "" +msgstr "_Salon:" #: ../data/gui/manage_bookmarks_window.ui.h:10 msgid "_Title:" -msgstr "Titre :" +msgstr "_Titre :" #: ../data/gui/manage_pep_services_window.ui.h:1 msgid "PEP Service Configuration" @@ -1644,9 +1637,8 @@ msgstr "Site perso :" #: ../data/gui/plugins_window.ui.h:7 -#, fuzzy msgid "Install from zip" -msgstr "Installer" +msgstr "Installer d'un zip" #: ../data/gui/plugins_window.ui.h:8 msgid "Installed" @@ -1662,7 +1654,7 @@ #: ../data/gui/plugins_window.ui.h:10 msgid "Plugins" -msgstr "" +msgstr "Plugins" #: ../data/gui/plugins_window.ui.h:11 msgid "Uninstall"

1 0

gajim: prepare 0.15 debian package
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 7b9f18e75aca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b9f18e75aca description: prepare 0.15 debian package diffstat: debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (29 lines): diff -r 18eb2e6be69f -r 7b9f18e75aca debian/changelog --- a/debian/changelog Sun Mar 18 10:30:08 2012 +0100 +++ b/debian/changelog Sun Mar 18 10:36:30 2012 +0100 @@ -1,11 +1,11 @@ -gajim (0.15~beta4-1) unstable; urgency=low +gajim (0.15-1) unstable; urgency=low * New upstream release. * remove 00_debian-copying.diff because upstream doesn't install it anymore * remove 01_configure-ac.diff because upstream changed configure dependencies * remove python-gnupginterface from recommands list, it's no more used - -- Yann Leboulanger <asterix(a)lagaule.org> Sat, 08 Oct 2011 22:15:03 +0200 + -- Yann Leboulanger <asterix(a)lagaule.org> Sat, 18 Mar 2012 10:32:38 +0100 gajim (0.14.4-1) unstable; urgency=low diff -r 18eb2e6be69f -r 7b9f18e75aca debian/control --- a/debian/control Sun Mar 18 10:30:08 2012 +0100 +++ b/debian/control Sun Mar 18 10:36:30 2012 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Yann Leboulanger <asterix(a)lagaule.org> Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.gajim.org Vcs-Hg: http://hg.gajim.org/gajim/ Vcs-Browser: http://hg.gajim.org/gajim/file

1 0

gajim: prepare 0.15 release
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 18eb2e6be69f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=18eb2e6be69f description: prepare 0.15 release diffstat: ChangeLog | 2 +- autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diffs (31 lines): diff -r c742f43be543 -r 18eb2e6be69f ChangeLog --- a/ChangeLog Sat Mar 17 23:02:27 2012 +0000 +++ b/ChangeLog Sun Mar 18 10:30:08 2012 +0100 @@ -1,4 +1,4 @@ -Gajim 0.15 (XX XX 2012) +Gajim 0.15 (18 March 2012) * Plugin system * Whiteboard (via a plugin) diff -r c742f43be543 -r 18eb2e6be69f autogen.sh --- a/autogen.sh Sat Mar 17 23:02:27 2012 +0000 +++ b/autogen.sh Sun Mar 18 10:30:08 2012 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-beta4" + gajimversion="0.15" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r c742f43be543 -r 18eb2e6be69f src/common/defs.py --- a/src/common/defs.py Sat Mar 17 23:02:27 2012 +0000 +++ b/src/common/defs.py Sun Mar 18 10:30:08 2012 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15-beta4' +version = '0.15' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: updated french translation
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 113257a46c8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=113257a46c8b description: updated french translation diffstat: po/fr.po | 3621 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 2002 insertions(+), 1619 deletions(-) diffs (truncated from 8650 to 300 lines): diff -r 264a19cacb3a -r 113257a46c8b po/fr.po --- a/po/fr.po Sun Mar 18 12:17:55 2012 +0100 +++ b/po/fr.po Sun Mar 18 12:18:04 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-19 00:05+0200\n" +"POT-Creation-Date: 2012-03-18 12:14+0100\n" "PO-Revision-Date: 2011-05-30 08:28+0100\n" "Last-Translator: Florent Le Coz <louizatakk(a)fedoraproject.org>\n" "Language-Team: <>\n" @@ -31,7 +31,7 @@ msgid "_Add Contact..." msgstr "_Ajouter un contact..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:20 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "_Découvrir les services" @@ -51,7 +51,7 @@ msgid "_Personal Events" msgstr "Évènements P_ersonnels" -#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:25 +#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 msgid "_Start Chat..." msgstr "Commencer une _discussion..." @@ -111,7 +111,7 @@ msgstr "Je veux _créer un nouveau compte" #: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:30 msgid "If checked, Gajim will remember the password for this account" msgstr "" "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte" @@ -121,13 +121,14 @@ msgstr "Gérer..." #: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 -#: ../src/config.py:1708 ../src/config.py:2274 ../src/config.py:2353 -#: ../src/config.py:2366 ../src/config.py:3644 ../src/config.py:3719 +#: ../data/gui/accounts_window.ui.h:41 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 +#: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 +#: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 +#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3096 -#: ../src/roster_window.py:3102 ../src/roster_window.py:3107 +#: ../src/dialogs.py:532 ../src/roster_window.py:3133 +#: ../src/roster_window.py:3139 ../src/roster_window.py:3144 msgid "None" msgstr "Aucun" @@ -136,7 +137,7 @@ msgstr "Prox_y :" #: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:48 +#: ../data/gui/accounts_window.ui.h:50 msgid "Save pass_word" msgstr "Sauver le mot de _passe" @@ -157,7 +158,7 @@ "au réseau Jabber." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:18 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "_Avancées" @@ -170,12 +171,12 @@ msgstr "Nom d'_Hôte :" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:63 msgid "_Jabber ID:" msgstr "Identifiant _Jabber : " #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/accounts_window.ui.h:65 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "Mot de _passe : " @@ -217,31 +218,41 @@ msgid "Accounts" msgstr "Comptes" -#: ../data/gui/accounts_window.ui.h:8 +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:8 ../src/dialogs.py:3387 +#: ../src/dialogs.py:3433 +msgid "Add" +msgstr "Ajouter" + +#: ../data/gui/accounts_window.ui.h:9 msgid "Administration operations" msgstr "Opérations d'administration" -#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:10 msgid "Anonymous authentication" msgstr "Authentification anonyme" -#: ../data/gui/accounts_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:11 msgid "Auto-reconnect when connection is lost" msgstr "Reconnexion automatique quand la connexion est perdue" -#: ../data/gui/accounts_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:12 msgid "Browse..." msgstr "_Parcourir..." -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "C_onnexion au démarrage" -#: ../data/gui/accounts_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:14 +msgid "Certificate is e_ncrypted" +msgstr "Le certificat est chiffré" + +#: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" msgstr "Chan_ger le mot de passe" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:16 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -249,50 +260,52 @@ "Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de " "passe via une connexion non-sécurisée" -#: ../data/gui/accounts_window.ui.h:15 -msgid "Choose Client Cert" -msgstr "Choisissez le certificat client" - -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." msgstr "Choisissez une _clé..." -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to change account's password" msgstr "Cliquez pour changer le mot de passe du compte" -#: ../data/gui/accounts_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:19 msgid "Click to request authorization to all contacts of another account" msgstr "" "Cliquez pour demander l'autorisation à tous les contacts d'un autre compte" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:20 msgid "Client certificate" msgstr "Certificat client" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" msgstr "C_onnexion au démarrage de Gajim" -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:22 msgid "Connection" msgstr "Connexion" -#: ../data/gui/accounts_window.ui.h:22 +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:23 ../src/dialogs.py:3391 +#: ../src/dialogs.py:3488 +msgid "Delete" +msgstr "Supprimer" + +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "Courriel :" -#: ../data/gui/accounts_window.ui.h:23 +#: ../data/gui/accounts_window.ui.h:25 #: ../data/gui/zeroconf_information_window.ui.h:3 msgid "First Name:" msgstr "Prénom :" #. No configured account -#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 -#: ../src/notify.py:474 ../src/notify.py:497 ../src/notify.py:546 -#: ../src/notify.py:562 +#: ../data/gui/accounts_window.ui.h:26 ../data/gui/roster_window.ui.h:5 +#: ../src/common/helpers.py:1168 ../src/common/helpers.py:1180 +#: ../src/notify.py:314 ../src/notify.py:337 ../src/notify.py:387 +#: ../src/notify.py:403 msgid "Gajim" msgstr "Gajim" @@ -300,13 +313,14 @@ #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3038 ../src/roster_window.py:5643 +#: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 +#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3075 ../src/roster_window.py:4142 +#: ../src/roster_window.py:5732 msgid "General" msgstr "Général" -#: ../data/gui/accounts_window.ui.h:26 +#: ../data/gui/accounts_window.ui.h:28 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -314,13 +328,13 @@ "Si cette case est cochée, Gajim va diffuser des adresses IP en plus de la " "vôtre, les transferts de fichiers ont ainsi plus de chance de fonctionner." -#: ../data/gui/accounts_window.ui.h:27 +#: ../data/gui/accounts_window.ui.h:29 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "" "Si cette case est cochée, Gajim obtiendra le mot de passe depuis un agent " "GPG comme seahorse" -#: ../data/gui/accounts_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:31 msgid "" "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" @@ -328,7 +342,7 @@ "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir " "des temps de latence pouvant entraîner des déconnexions" -#: ../data/gui/accounts_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:32 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " "this account" @@ -336,7 +350,7 @@ "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement " "à jabber en utilisant ce compte" -#: ../data/gui/accounts_window.ui.h:31 +#: ../data/gui/accounts_window.ui.h:33 msgid "" "If checked, any change to the global status (handled by the combobox at the " "bottom of the roster window) will change the status of this account " @@ -346,7 +360,7 @@ "l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état " "de ce compte" -#: ../data/gui/accounts_window.ui.h:32 +#: ../data/gui/accounts_window.ui.h:34 msgid "" "If the default port that is used for incoming messages is unfitting for your " "setup you can select another one here.\n" @@ -357,39 +371,39 @@ "Vous devriez considérer modifier les paramètres de votre pare-feu si vous en " "avez un." -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" msgstr "Les informations vous concernant, stockées sur le serveur" -#: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1869 #: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Identifiant Jabber :" -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:38 #: ../data/gui/zeroconf_information_window.ui.h:5 msgid "Last Name:" msgstr "Nom :" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:39 msgid "Mer_ge accounts" msgstr "_Regrouper les comptes"

1 0

gajim: fix string
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 264a19cacb3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=264a19cacb3a description: fix string diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 04fb31f97e70 -r 264a19cacb3a src/common/config.py --- a/src/common/config.py Sat Mar 17 23:02:27 2012 +0000 +++ b/src/common/config.py Sun Mar 18 12:17:55 2012 +0100 @@ -456,7 +456,7 @@ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], }, {}), 'plugins': ({ - 'active': [opt_bool, False, _('State whether plugins should be activated on exit (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], + 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], },{}), }

1 0

gajim: fix anonymous login when server has a SSL error. Fixes #7121
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 68855f4fa5f6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=68855f4fa5f6 description: fix anonymous login when server has a SSL error. Fixes #7121 diffstat: src/common/connection.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 9a121ea3d010 -r 68855f4fa5f6 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 +++ b/src/common/connection.py Fri Mar 16 23:09:00 2012 +0100 @@ -1344,7 +1344,10 @@ msg=_('Connection with account %s has been lost. Retry ' 'connecting.') % self.name)) return - name = gajim.config.get_per('accounts', self.name, 'name') + if gajim.config.get_per('accounts', self.name, 'anonymous_auth'): + name = None + else: + 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)

1 0

gajim: make sure SM is disabled with reconnecting
by Jefry Lagrange 18 Mar '12

18 Mar '12

changeset 9a121ea3d010 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9a121ea3d010 description: make sure SM is disabled with reconnecting diffstat: src/common/connection.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r fbed9bf7aea4 -r 9a121ea3d010 src/common/connection.py --- a/src/common/connection.py Wed Mar 14 23:37:32 2012 -0400 +++ b/src/common/connection.py Wed Mar 14 23:49:37 2012 -0400 @@ -822,6 +822,7 @@ gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) else: + self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) self.disconnect()

1 0

gajim: handle data forms in groupchat messages. This way room ad...
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset 75094d353cc4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=75094d353cc4 description: handle data forms in groupchat messages. This way room admins can handle voice requests. diffstat: src/common/connection_handlers_events.py | 2 ++ src/gui_interface.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diffs (40 lines): diff -r f585536ea6d1 -r 75094d353cc4 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Mar 13 14:42:52 2012 +0100 +++ b/src/common/connection_handlers_events.py Tue Mar 13 17:30:48 2012 +0100 @@ -1292,6 +1292,8 @@ if self.status_code != []: gajim.nec.push_incoming_event(GcConfigChangedReceivedEvent( None, conn=self.conn, msg_event=self)) + if self.msg_obj.form_node: + return True return self.displaymarking = None diff -r f585536ea6d1 -r 75094d353cc4 src/gui_interface.py --- a/src/gui_interface.py Tue Mar 13 14:42:52 2012 +0100 +++ b/src/gui_interface.py Tue Mar 13 17:30:48 2012 +0100 @@ -329,6 +329,16 @@ if gc_control and gc_control.autorejoin: gc_control.autorejoin = False + def handle_event_gc_message(self, obj): + if not obj.stanza.getTag('body'): # no <body> + # It could be a voice request. See + # http://www.xmpp.org/extensions/xep-0045.html#voiceapprove + if obj.msg_obj.form_node: + dialogs.SingleMessageWindow(obj.conn.name, obj.fjid, + action='receive', from_whom=obj.fjid, + subject='', message='', resource='', session=None, + form_node=obj.msg_obj.form_node) + def handle_event_presence(self, obj): # 'NOTIFY' (account, (jid, status, status message, resource, # priority, # keyID, timestamp, contact_nickname)) @@ -1396,6 +1406,7 @@ 'fingerprint-error': [self.handle_event_fingerprint_error], 'gc-invitation-received': [self.handle_event_gc_invitation], 'gc-presence-received': [self.handle_event_gc_presence], + 'gc-message-received': [self.handle_event_gc_message], 'gmail-notify': [self.handle_event_gmail_notify], 'gpg-password-required': [self.handle_event_gpg_password_required], 'gpg-trust-key': [self.handle_event_gpg_trust_key],

1 0

gajim: [Matthew Wild] fix stream management error handling. Fixe...
by Jefry Lagrange 18 Mar '12

18 Mar '12

changeset fbed9bf7aea4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fbed9bf7aea4 description: [Matthew Wild] fix stream management error handling. Fixes #7091 diffstat: src/common/xmpp/smacks.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 75094d353cc4 -r fbed9bf7aea4 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Tue Mar 13 17:30:48 2012 +0100 +++ b/src/common/xmpp/smacks.py Wed Mar 14 23:37:32 2012 -0400 @@ -114,6 +114,7 @@ # Ask for service discovery, etc.. if stanza.getTag('item-not-found'): self.resuming = False + self.enabled = False # we need to bind a resource self._owner.NonBlockingBind.resuming = False self._owner._on_auth_bind(None)

1 0

gajim: close jingle audio/video request window when we click ok/...
by Yann Leboulanger 18 Mar '12

18 Mar '12

changeset f585536ea6d1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f585536ea6d1 description: close jingle audio/video request window when we click ok/cancel button is seesion has been canceled. Fixes #7119 diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r e85378e7a9ef -r f585536ea6d1 src/dialogs.py --- a/src/dialogs.py Tue Mar 13 14:32:09 2012 +0100 +++ b/src/dialogs.py Tue Mar 13 14:42:52 2012 +0100 @@ -5158,6 +5158,7 @@ session = gajim.connections[self.account].get_jingle_session(self.fjid, self.sid) if not session: + dialog.destroy() return if response == gtk.RESPONSE_YES: #TODO: Ensure that ctrl.contact.resource == resource

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2012