gajim-website: Jabber -> Jabber/XMPP
changeset 29be426dde91 in /home/hg/repos/gajim-website
details:http://hg.gajim.org/gajim-website?cmd=changeset;node=29be426dde91
description: Jabber -> Jabber/XMPP
diffstat:
index.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r b0fe9c1f13a4 -r 29be426dde91 index.php
--- a/index.php Sun Jan 22 20:42:35 2012 +0100
+++ b/index.php Sun Jan 22 22:16:09 2012 +0100
@@ -4,7 +4,7 @@
require_once ("Design.php");
- Entete (_("Gajim, a Jabber client"), "GAJIM");
+ Entete (_("Gajim, a Jabber/XMPP client"), "GAJIM");
$tpl = new Template("templates");
$tpl->set_file("page","index.tpl");
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim-website: prepare website for 0.15-beta4
changeset b0fe9c1f13a4 in /home/hg/repos/gajim-website
details:http://hg.gajim.org/gajim-website?cmd=changeset;node=b0fe9c1f13a4
description: prepare website for 0.15-beta4
diffstat:
downloads.php | 14 +-
index.php | 97 +++
locale/bg_BG/LC_MESSAGES/msg.po | 178 ---
locale/de_DE/LC_MESSAGES/msg.po | 179 +---
locale/eo/LC_MESSAGES/msg.po| 178 ---
locale/es_ES/LC_MESSAGES/msg.po | 174 --
locale/fr_FR/LC_MESSAGES/msg.po | 196 ++-
locale/hu_HU/LC_MESSAGES/msg.po | 174 --
locale/it_IT/LC_MESSAGES/msg.po | 178 ---
locale/pl_PL/LC_MESSAGES/msg.po | 179 +---
locale/pt_BR/LC_MESSAGES/msg.po | 179 +---
locale/ru_RU/LC_MESSAGES/msg.po | 178 +---
msg.pot | 173 --
13 files changed, 1195 insertions(+), 882 deletions(-)
diffs (truncated from 4362 to 300 lines):
diff -r abfcfbbaad3d -r b0fe9c1f13a4 downloads.php
--- a/downloads.php Mon Dec 19 11:24:34 2011 +0100
+++ b/downloads.php Sun Jan 22 20:42:35 2012 +0100
@@ -8,7 +8,7 @@
$last_version = "0.14.4";
print (" \n");
print _("Latest version of Gajim is")."
".$last_version."\n";
-printf(_("A %s version is in test"), "0.15-beta3");
+printf(_("A %s version is in test"), "0.15-beta4");
print ("\n");
print _("If your distribution doesn't have the latest version ");
print _("you are advised to use the ")."autopackage "._("or the ").""._("source tarball")."\n";
@@ -20,8 +20,8 @@
print ("\n");
print _("If you use Debian unstable do")." apt-get install gajim\n";
print ("\n");
-printf(_(" The Debian package of %s is "), "0.15-beta3");
-print ""._("here").".\n";
+printf(_(" The Debian package of %s is "), "0.15-beta4");
+print ""._("here").".\n";
print _("A daily package from mercurial is also built. To use it, remove
gajim")." (apt-get remove gajim), "._("add this line to your")."
/etc/apt/source.list:\n";
print ("\n");
print ("deb ftp://ftp.gajim.org/debian unstable main\n");
@@ -148,8 +148,8 @@
print _("There is a ")." "._("Gajim
installer").".\n";
#print _("The installer doesn't contain translations because of a") . " https://bugzilla.gnome.org/show_bug.cgi?id=574520\";>" . _("GTK bug") .
".\n";
print ("\n");
-print _("Here is a")." "._("Gajim installer")." ";
-printf(_("for %s version "), "0.15-beta3");
+print _("Here is a")." "._("Gajim installer")." ";
+printf(_("for %s version "), "0.15-beta4");
print (".\n");
print ("\n");
@@ -160,8 +160,8 @@
print (" \n");
print ("\n");
print _("The tarball version of Gajim is ").""._("here").".
"._("For information on how to build Gajim,")." http://hg.gajim.org/gajim/raw-file/tip/README.html\";>see the
README ("._("in English").").\n";
-printf(_(" The tarball version of %s is "), "0.15-beta3");
-print ""._("here").".\n";
+printf(_(" The tarball version of %s is "), "0.15-beta4");
+print ""._("here").".\n";
print _("If you want to use the last unstable development version, then you
should checkout the mercurial repository.\n");
diff -r abfcfbbaad3d -r b0fe9c1f13a4 index.php
--- a/index.php Mon Dec 19 11:24:34 2011 +0100
+++ b/index.php Sun Jan 22 20:42:35 2012 +0100
@@ -22,7 +22,7 @@
$tpl->set_var("FEATURES_TITLE", _("FEATURES:"));
$array_features = array(
0 => _("Tabbed chat window and single window modes"),
- 1 => _("Group chat support (with MUC protocol), invitation, chat to
group chat transformation, minimize group chat to roster"),
+ 1 => _("Group chat support (with Multi-User Chat protocol), invitation,
chat to group chat transformation, minimize group chat to roster"),
2 => _("Emoticons, avatars, PEP (user activity, mood and tune)"),
3 => _("Audio / video conferences"),
4 => _("File transfer, room rookmarks"),
@@ -49,57 +49,70 @@
$tpl->set_var("NEWS_MAIN", _("NEWS"));
$array_news_title = array(
- 0 => sprintf(_("Beta3-release of Gajim %s"), "0.15"),
- 1 => sprintf(_("Beta2-release of Gajim %s"), "0.15"),
- 2 => sprintf(_("Beta-release of Gajim %s"), "0.15"),
- 3 => sprintf(_("Alpha-release of Gajim %s"), "0.15"),
- 4 => sprintf(_("Gajim %s is here!"), "0.14.4"),
- 5 => sprintf(_("Gajim %s is here!"), "0.14.3"),
- 6 => sprintf(_("Gajim %s is here!"), "0.14.2"),
- 7 => sprintf(_("Gajim %s is here!"), "0.14.1"),
- 8 => sprintf(_("Gajim %s is here!"), "0.14"));
+ 0 => sprintf(_("Beta4-release of Gajim %s"), "0.15"),
+ 1 => sprintf(_("Beta3-release of Gajim %s"), "0.15"),
+ 2 => sprintf(_("Beta2-release of Gajim %s"), "0.15"),
+ 3 => sp
gajim: Added tag gajim-0.15-beta4 for changeset 5a486555abcd
changeset c6cddacb5a2b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c6cddacb5a2b description: Added tag gajim-0.15-beta4 for changeset 5a486555abcd diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 5a486555abcd -r c6cddacb5a2b .hgtags --- a/.hgtags Sun Jan 22 19:54:07 2012 +0100 +++ b/.hgtags Sun Jan 22 20:33:16 2012 +0100 @@ -8,3 +8,4 @@ 50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1 e745457fee76cb5212787e8595a7060689cb9f60 gajim-0.15-beta2 76657ac81686993ff3e29c9bde1ca94c17a5c791 gajim-0.15-beta3 +5a486555abcdf2413144d71a0703e618134ca3e6 gajim-0.15-beta4 ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: update debian files for beta4
changeset 5a486555abcd in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=5a486555abcd
description: update debian files for beta4
diffstat:
debian/changelog | 4 ++--
debian/control | 4 ++--
debian/copyright | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diffs (43 lines):
diff -r 8f06ea418610 -r 5a486555abcd debian/changelog
--- a/debian/changelog Sun Jan 22 18:59:43 2012 +0100
+++ b/debian/changelog Sun Jan 22 19:54:07 2012 +0100
@@ -1,11 +1,11 @@
-gajim (0.15~alpha1-1) unstable; urgency=low
+gajim (0.15~beta4-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 Fri, 26 Aug 2011 12:13:51 +0200
+ -- Yann Leboulanger Sat, 08 Oct 2011 22:15:03 +0200
gajim (0.14.4-1) unstable; urgency=low
diff -r 8f06ea418610 -r 5a486555abcd debian/control
--- a/debian/controlSun Jan 22 18:59:43 2012 +0100
+++ b/debian/controlSun Jan 22 19:54:07 2012 +0100
@@ -11,8 +11,8 @@
Package: gajim
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils
-Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.9),
python-crypto
-Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon,
python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring,
gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng,
python-farsight, gstreamer0.10-plugins-ugly
+Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12),
python-crypto, python-pyasn1
+Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon,
python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring,
gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng,
python-farsight, gstreamer0.10-plugins-ugly, python-pycurl
Description: Jabber client written in PyGTK
Gajim is a Jabber client. It has a tabbed user interface with normal chats,
group chats, and has many features such as, TLS, GPG, SSL, multiple accounts,
diff -r 8f06ea418610 -r 5a486555abcd debian/copyright
--- a/debian/copyright Sun Jan 22 18:59:43 2012 +0100
+++ b/debian/copyright Sun Jan 22 19:54:07 2012 +0100
@@ -9,7 +9,7 @@
- Yann Leboulanger
-Copyright: (c) 2003-2011 Gajim Team
+Copyright: (c) 2003-2012 Gajim Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: update po files
changeset 8f06ea418610 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8f06ea418610 description: update po files diffstat: po/be.po | 4978 ++-- po/b...@latin.po | 5006 ++-- po/bg.po | 5029 ++--- po/br.po | 4975 ++--- po/cs.po | 6713 +-- po/da.po | 4930 ++-- po/de.po | 3001 +--- po/el.po | 5031 ++--- po/en_GB.po| 5009 ++-- po/eo.po | 5002 ++-- po/es.po | 5058 +++--- po/eu.po | 5009 ++--- po/fr.po | 3231 ++ po/gl.po | 5122 +++--- po/hr.po | 5009 ++-- po/it.po | 5038 ++--- po/ja.po | 944 +++--- po/kk.po | 6429 +--- po/lt.po | 4995 ++--- po/nb.po | 4994 ++-- po/nl.po | 5013 ++--- po/no.po | 4994 ++-- po/pl.po | 5231 +++ po/pt.po | 5008 ++--- po/pt_BR.po| 5037 ++--- po/ru.po | 4251 --- po/sk.po | 5031 ++--- po/sr.po | 4990 ++-- po/s...@latn.po | 4994 ++-- po/sv.po | 5057 +++--- po/uk.po | 2610 - po/zh_CN.po| 4966 ++-- po/zh_TW.po| 3972 - 33 files changed, 86159 insertions(+), 70498 deletions(-) diffs (truncated from 330312 to 300 lines): diff -r c34967934132 -r 8f06ea418610 po/be.po --- a/po/be.po Sun Jan 22 18:51:25 2012 +0100 +++ b/po/be.po Sun Jan 22 18:59:43 2012 +0100 @@ -3,15 +3,11 @@ # This file is distributed under the same license as Gajim. # # Ihar Hrachyshka , 2006, 2009. -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 msgid "" msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" +"POT-Creation-Date: 2012-01-22 18:56+0100\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka \n" "Language-Team: Belarusian \n" @@ -31,7 +27,7 @@ msgid "_Add Contact..." msgstr "_Дадаць чалавека..." -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "_Пошук сервісаў" @@ -116,7 +112,7 @@ msgstr "_Зарэгістраваць новы рахунак" #: ../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 "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка" @@ -125,13 +121,14 @@ msgstr "Кіраванне..." #: ../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:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../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:3699 ../src/config.py:3774 +#: ../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 msgid "None" msgstr "Ніякі" @@ -141,7 +138,7
gajim: [Mako] update japanese translation
changeset c34967934132 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c34967934132 description: [Mako] update japanese translation diffstat: po/ja.po | 2884 ++--- 1 files changed, 1612 insertions(+), 1272 deletions(-) diffs (truncated from 7054 to 300 lines): diff -r 6be8d72891e2 -r c34967934132 po/ja.po --- a/po/ja.po Sun Jan 22 18:44:46 2012 +0100 +++ b/po/ja.po Sun Jan 22 18:51:25 2012 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: Gajim 0.15 ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-08 19:14+0200\n" -"PO-Revision-Date: 2011-09-02 19:09+0900\n" +"POT-Creation-Date: 2012-01-22 18:48+0100\n" +"PO-Revision-Date: 2012-01-22 21:59+0900\n" "Last-Translator: Mako N \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -104,7 +104,7 @@ msgstr "新しいアカウントを作成する (_r)" #: ../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 "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します" @@ -113,13 +113,14 @@ msgstr "管理..." #: ../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:2284 ../src/config.py:2363 -#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730 +#: ../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:3699 ../src/config.py:3774 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3092 -#: ../src/roster_window.py:3098 ../src/roster_window.py:3103 +#: ../src/dialogs.py:532 ../src/roster_window.py:3139 +#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 msgid "None" msgstr "なし" @@ -128,7 +129,7 @@ msgstr "プロキシ (_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 "パスワードを保存する" @@ -160,12 +161,12 @@ msgstr "ホスト名 (_H):" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:63 msgid "_Jabber ID:" msgstr "Jabber ID (_J):" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:65 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "パスワード (_P):" @@ -207,36 +208,41 @@ msgid "Accounts" msgstr "アカウント" -#: ../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:3384 +#: ../src/dialogs.py:3430 +msgid "Add" +msgstr "追加" + +#: ../data/gui/accounts_window.ui.h:9 msgid "Administration operations" msgstr "管理の操作" -#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:10 msgid "Anonymous authentication" msgstr "匿名の認証" -#: ../data/gui/accounts_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:11 msgid "Auto-reconnect when connection is lost" msgstr "切断したら自動で再接続する" -#: ../data/gui/accounts_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:12 msgid "Browse..." msgstr "参照..." -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "Gajim 起動時に接続する (_o)" -#: ../data/gui/accounts_window.ui.h:13 -#, fuzzy +#: ../data/gui/accounts_window.ui.h:14 msgid "Certificate is e_ncrypted" -msgstr "証明書は暗号化される (_e)" - -#: ../data/gui/accounts_window.ui.h:14 +msgstr "証明書は暗号化されている (_n)" + +#: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" msgstr "パスワードを変更する (_g)" -#: ../data/gui/accounts_window.ui.h:15 +#: ../data/gui/accounts_window.ui.h:16 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -244,45 +250,51 @@ "チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま" "す。" -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." msgstr "鍵の選択 (_K)..." -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to change account's password" msgstr "アカウントのパスワードを変更するにはクリック" -#: ../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 "別アカウントのすべての相手先に承認を求めるにはクリック" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:20 msgid "Client certificate" msgst
gajim: ability to send file to contacts without a resource (but ...
changeset 6be8d72891e2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=6be8d72891e2
description: ability to send file to contacts without a resource (but still not
to fake jid) Fixes #7077
diffstat:
src/chat_control.py | 9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (27 lines):
diff -r 2e38bfaa5a5d -r 6be8d72891e2 src/chat_control.py
--- a/src/chat_control.py Sun Jan 22 13:19:12 2012 +0100
+++ b/src/chat_control.py Sun Jan 22 18:44:46 2012 +0100
@@ -1722,18 +1722,19 @@
self._video_button.set_sensitive(self.video_available)
# Send file
-if self.contact.supports(NS_FILE) and self.contact.resource:
+if self.contact.supports(NS_FILE) and (self.type_id == 'chat' or \
+self.gc_contact.resource):
self._send_file_button.set_sensitive(True)
self._send_file_button.set_tooltip_text('')
else:
self._send_file_button.set_sensitive(False)
if not self.contact.supports(NS_FILE):
self._send_file_button.set_tooltip_text(_(
-"This contact does not support file transfer."))
+"This contact does not support file transfer."))
else:
self._send_file_button.set_tooltip_text(
-_("You need to know the real JID of the contact to
send him or "
-"her a file."))
+_("You need to know the real JID of the contact to send "
+"him or her a file."))
# Convert to GC
if self.contact.supports(NS_MUC):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Mako] update japanese translation
changeset 94c7a7736449 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=94c7a7736449 description: [Mako] update japanese translation diffstat: po/ja.po | 3652 ++--- 1 files changed, 2004 insertions(+), 1648 deletions(-) diffs (truncated from 7539 to 300 lines): diff -r 6174a59d21c2 -r 94c7a7736449 po/ja.po --- a/po/ja.po Sun Jan 22 18:44:46 2012 +0100 +++ b/po/ja.po Sun Jan 22 18:51:25 2012 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: Gajim 0.15 ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-02 18:31+0900\n" -"PO-Revision-Date: 2011-09-02 19:09+0900\n" +"POT-Creation-Date: 2012-01-22 18:48+0100\n" +"PO-Revision-Date: 2012-01-22 21:59+0900\n" "Last-Translator: Mako N \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -104,7 +104,7 @@ msgstr "新しいアカウントを作成する (_r)" #: ../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 "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します" @@ -113,13 +113,14 @@ msgstr "管理..." #: ../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:2284 ../src/config.py:2363 -#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730 +#: ../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:3699 ../src/config.py:3774 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3092 -#: ../src/roster_window.py:3098 ../src/roster_window.py:3103 +#: ../src/dialogs.py:532 ../src/roster_window.py:3139 +#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 msgid "None" msgstr "なし" @@ -128,7 +129,7 @@ msgstr "プロキシ (_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 "パスワードを保存する" @@ -160,12 +161,12 @@ msgstr "ホスト名 (_H):" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:63 msgid "_Jabber ID:" msgstr "Jabber ID (_J):" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:65 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "パスワード (_P):" @@ -207,36 +208,41 @@ msgid "Accounts" msgstr "アカウント" -#: ../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:3384 +#: ../src/dialogs.py:3430 +msgid "Add" +msgstr "追加" + +#: ../data/gui/accounts_window.ui.h:9 msgid "Administration operations" msgstr "管理の操作" -#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:10 msgid "Anonymous authentication" msgstr "匿名の認証" -#: ../data/gui/accounts_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:11 msgid "Auto-reconnect when connection is lost" msgstr "切断したら自動で再接続する" -#: ../data/gui/accounts_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:12 msgid "Browse..." msgstr "参照..." -#: ../data/gui/accounts_window.ui.h:12 +#: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" msgstr "Gajim 起動時に接続する (_o)" -#: ../data/gui/accounts_window.ui.h:13 -#, fuzzy +#: ../data/gui/accounts_window.ui.h:14 msgid "Certificate is e_ncrypted" -msgstr "証明書は暗号化される (_e)" - -#: ../data/gui/accounts_window.ui.h:14 +msgstr "証明書は暗号化されている (_n)" + +#: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" msgstr "パスワードを変更する (_g)" -#: ../data/gui/accounts_window.ui.h:15 +#: ../data/gui/accounts_window.ui.h:16 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -244,45 +250,51 @@ "チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま" "す。" -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." msgstr "鍵の選択 (_K)..." -#: ../data/gui/accounts_window.ui.h:17 +#: ../data/gui/accounts_window.ui.h:18 msgid "Click to change account's password" msgstr "アカウントのパスワードを変更するにはクリック" -#: ../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 "別アカウントのすべての相手先に承認を求めるにはクリック" -#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/accounts_window.ui.h:20 msgid "Client certificate" msgst
gajim: ability to send file to contacts without a resource (but ...
changeset 6174a59d21c2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=6174a59d21c2
description: ability to send file to contacts without a resource (but still not
to fake jid) Fixes #7077
diffstat:
src/chat_control.py | 9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (27 lines):
diff -r fd9b3c14f832 -r 6174a59d21c2 src/chat_control.py
--- a/src/chat_control.py Sun Jan 22 11:25:22 2012 +0100
+++ b/src/chat_control.py Sun Jan 22 18:44:46 2012 +0100
@@ -1723,18 +1723,19 @@
self._video_button.set_sensitive(self.video_available)
# Send file
-if self.contact.supports(NS_FILE) and self.contact.resource:
+if self.contact.supports(NS_FILE) and (self.type_id == 'chat' or \
+self.gc_contact.resource):
self._send_file_button.set_sensitive(True)
self._send_file_button.set_tooltip_text('')
else:
self._send_file_button.set_sensitive(False)
if not self.contact.supports(NS_FILE):
self._send_file_button.set_tooltip_text(_(
-"This contact does not support file transfer."))
+"This contact does not support file transfer."))
else:
self._send_file_button.set_tooltip_text(
-_("You need to know the real JID of the contact to
send him or "
-"her a file."))
+_("You need to know the real JID of the contact to send "
+"him or her a file."))
# Convert to GC
if self.contact.supports(NS_MUC):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prepare beta4 release
changeset 2e38bfaa5a5d in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=2e38bfaa5a5d
description: prepare beta4 release
diffstat:
ChangeLog | 3 ++-
autogen.sh | 2 +-
gajim.nsi | 3 ---
src/common/defs.py | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diffs (59 lines):
diff -r cbc8d7b4b702 -r 2e38bfaa5a5d ChangeLog
--- a/ChangeLog Sun Jan 22 11:25:22 2012 +0100
+++ b/ChangeLog Sun Jan 22 13:19:12 2012 +0100
@@ -1,4 +1,4 @@
-Gajim 0.15 (XX XX 2011)
+Gajim 0.15 (XX XX 2012)
* Plugin system
* Whiteboard (via a plugin)
@@ -9,6 +9,7 @@
* Roster filtrering
* UPower support
* GPG support for windows
+ * Spell checking support for windows
Gajim 0.14.4 (22 July 2011)
diff -r cbc8d7b4b702 -r 2e38bfaa5a5d autogen.sh
--- a/autogen.shSun Jan 22 11:25:22 2012 +0100
+++ b/autogen.shSun Jan 22 13:19:12 2012 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15-beta3"
+ gajimversion="0.15-beta4"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff -r cbc8d7b4b702 -r 2e38bfaa5a5d gajim.nsi
--- a/gajim.nsi Sun Jan 22 11:25:22 2012 +0100
+++ b/gajim.nsi Sun Jan 22 13:19:12 2012 +0100
@@ -224,8 +224,6 @@
SetOutPath "$INSTDIR\bin\gtk"
File /r "bin\gtk\bin"
File /r "bin\gtk\etc"
- SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0"
- File /r "bin\gtk\lib\gtk-2.0\2.10.0\loaders"
SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines"
File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"
File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
@@ -527,7 +525,6 @@
Section "Uninstall"
RMDir /r "$INSTDIR\bin\gtk\bin"
RMDir /r "$INSTDIR\bin\gtk\etc"
- RMDir /r "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\loaders"
Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"
Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll"
diff -r cbc8d7b4b702 -r 2e38bfaa5a5d src/common/defs.py
--- a/src/common/defs.pySun Jan 22 11:25:22 2012 +0100
+++ b/src/common/defs.pySun Jan 22 13:19:12 2012 +0100
@@ -27,7 +27,7 @@
basedir = '../'
localedir = '../po'
-version = '0.15-beta3'
+version = '0.15-beta4'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: don't allow to open information window when we are offlin...
changeset cbc8d7b4b702 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=cbc8d7b4b702
description: don't allow to open information window when we are offline. Fixes
#7082
diffstat:
src/chat_control.py | 68 ++--
src/gui_menu_builder.py | 5 ++-
2 files changed, 40 insertions(+), 33 deletions(-)
diffs (196 lines):
diff -r ff41575b0b0e -r cbc8d7b4b702 src/chat_control.py
--- a/src/chat_control.py Sun Jan 22 00:28:14 2012 +0100
+++ b/src/chat_control.py Sun Jan 22 11:25:22 2012 +0100
@@ -1436,22 +1436,22 @@
def __init__(self, parent_win, contact, acct, session, resource=None):
ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-'chat_control', contact, acct, resource)
+'chat_control', contact, acct, resource)
self.gpg_is_active = False
# for muc use:
# widget = self.xml.get_object('muc_window_actions_button')
self.actions_button =
self.xml.get_object('message_window_actions_button')
id_ = self.actions_button.connect('clicked',
-self.on_actions_button_clicked)
+self.on_actions_button_clicked)
self.handlers[id_] = self.actions_button
self._formattings_button = self.xml.get_object('formattings_button')
self._add_to_roster_button = self.xml.get_object(
-'add_to_roster_button')
+'add_to_roster_button')
id_ = self._add_to_roster_button.connect('clicked',
-self._on_add_to_roster_menuitem_activate)
+self._on_add_to_roster_menuitem_activate)
self.handlers[id_] = self._add_to_roster_button
self._audio_button = self.xml.get_object('audio_togglebutton')
@@ -1459,14 +1459,14 @@
self.handlers[id_] = self._audio_button
# add a special img
gtkgui_helpers.add_image_to_button(self._audio_button,
-'gajim-mic_inactive')
+'gajim-mic_inactive')
self._video_button = self.xml.get_object('video_togglebutton')
id_ = self._video_button.connect('toggled',
self.on_video_button_toggled)
self.handlers[id_] = self._video_button
# add a special img
gtkgui_helpers.add_image_to_button(self._video_button,
-'gajim-cam_inactive')
+'gajim-cam_inactive')
self._send_file_button = self.xml.get_object('send_file_button')
# add a special img for send file button
@@ -1475,30 +1475,30 @@
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._on_send_file_menuitem_activate)
self.handlers[id_] = self._send_file_button
self._convert_to_gc_button = self.xml.get_object(
-'convert_to_gc_button')
+'convert_to_gc_button')
id_ = self._convert_to_gc_button.connect('clicked',
-self._on_convert_to_gc_menuitem_activate)
+self._on_convert_to_gc_menuitem_activate)
self.handlers[id_] = self._convert_to_gc_button
-contact_information_button = self.xml.get_object(
-'contact_information_button')
-id_ = contact_information_button.connect('clicked',
-self._on_contact_information_menuitem_activate)
-self.handlers[id_] = contact_information_button
+self._contact_information_button = self.xml.get_object(
+'contact_information_button')
+id_ = self._contact_information_button.connect('clicked',
+self._on_contact_information_menuitem_activate)
+self.handlers[id_] = self._contact_information_button
compact_view = gajim.config.get('compact_view')
self.chat_buttons_set_visible(compact_view)
self.widget_set_visible(self.xml.get_object('banner_eventbox'),
-gajim.config.get('hide_chat_banner'))
+gajim.config.get('hide_chat_banner'))
self.authentication_button = self.xml.get_object(
-'authentication_button')
+'authentication_button')
id_ = self.authentication_button.connect('clicked',
-self._on_authentication_button_clicked)
+self._on_authentication_button_clicked)
self.handlers[id_] = self.authentication_button
# Add lock image to show chat encryption
@@ -1540,31 +1540,31 @@
# Hook up signals
id_ = self.parent_win.window.connect('motion-notify-event',
-self._on_window_motion_notify)
+self._on_window_motion_notify)
self.handlers[id_] = self.parent_win.window
message_tv_buffer = self.msg_textview.get_buffer()
id_ = message_tv_buffer.connect('changed',
-self._on_message_tv_buffer_changed)
+self.
gajim: prevent traceback. Fixes #7080
changeset ff41575b0b0e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ff41575b0b0e
description: prevent traceback. Fixes #7080
diffstat:
src/common/helpers.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (19 lines):
diff -r 47f4f35af77c -r ff41575b0b0e src/common/helpers.py
--- a/src/common/helpers.py Sat Jan 21 16:32:52 2012 +0100
+++ b/src/common/helpers.py Sun Jan 22 00:28:14 2012 +0100
@@ -1432,6 +1432,8 @@
if p:
proxy = {}
proxyptr = gajim.config.get_per('proxies', p)
+if not proxyptr:
+return proxy
for key in proxyptr.keys():
proxy[key] = proxyptr[key][1]
return proxy
@@ -1542,4 +1544,4 @@
proxy = get_proxy_info(account)
if proxy and proxy['type'] in ('http', 'socks5'):
return _get_img_proxy(attrs, proxy)
-return _get_img_direct(attrs)
\ No newline at end of file
+return _get_img_direct(attrs)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix behaviour when we remove a contact for which we have ...
changeset 47f4f35af77c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=47f4f35af77c
description: fix behaviour when we remove a contact for which we have a chat
tab opened (re-add it to not in roster group). Fixes #7078
diffstat:
src/common/connection_handlers.py | 2 +-
src/roster_window.py | 57 --
2 files changed, 31 insertions(+), 28 deletions(-)
diffs (89 lines):
diff -r 79296520f295 -r 47f4f35af77c src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Sat Jan 21 09:17:09 2012 +0100
+++ b/src/common/connection_handlers.py Sat Jan 21 16:32:52 2012 +0100
@@ -865,7 +865,7 @@
elif obj.contact.show in statuss:
obj.old_show = statuss.index(obj.contact.show)
if (resources != [''] and (len(obj.contact_list) != 1 or \
-obj.contact_list[0].show != 'offline')) and \
+obj.contact_list[0].show not in ('not in roster', 'offline'))) and
\
not gajim.jid_is_transport(jid):
# Another resource of an existing contact connected
obj.old_show = 0
diff -r 79296520f295 -r 47f4f35af77c src/roster_window.py
--- a/src/roster_window.py Sat Jan 21 09:17:09 2012 +0100
+++ b/src/roster_window.py Sat Jan 21 16:32:52 2012 +0100
@@ -726,17 +726,9 @@
if not contact:
return
-if not force and (self.contact_has_pending_roster_events(contact,
-account) or gajim.interface.msg_win_mgr.get_control(jid, account)):
-# Contact has pending events or window
-#TODO: or single message windows? Bur they are not listed for the
-# moment
-key = (jid, account)
-if not key in self.contacts_to_be_removed:
-self.contacts_to_be_removed[key] = {'backend': backend}
-# if more pending event, don't remove from roster
-if self.contact_has_pending_roster_events(contact, account):
-return False
+if not force and self.contact_has_pending_roster_events(contact,
+account):
+return False
iters = self._get_contact_iter(jid, account, contact, self.model)
if iters:
@@ -749,25 +741,36 @@
else:
self._remove_entity(contact, account)
-if backend and (not gajim.interface.msg_win_mgr.get_control(jid,
-account) or force):
-# If a window is still opened: don't remove contact instance
-# Remove contact before redrawing, otherwise the old
-# numbers will still be show
-gajim.contacts.remove_jid(account, jid, remove_meta=True)
-if iters:
-rest_of_family = [data for data in family
-if account != data['account'] or jid != data['jid']]
-if rest_of_family:
-# reshow the rest of the family
-brothers = self._add_metacontact_family(rest_of_family,
-account)
-for c, acc in brothers:
-self.draw_completely(c.jid, acc)
+old_grps = []
+if backend:
+if not gajim.interface.msg_win_mgr.get_control(jid, account) or \
+force:
+# If a window is still opened: don't remove contact instance
+# Remove contact before redrawing, otherwise the old
+# numbers will still be show
+gajim.contacts.remove_jid(account, jid, remove_meta=True)
+if iters:
+rest_of_family = [data for data in family
+if account != data['account'] or jid != data['jid']]
+if rest_of_family:
+# reshow the rest of the family
+brothers = self._add_metacontact_family(rest_of_family,
+account)
+for c, acc in brothers:
+self.draw_completely(c.jid, acc)
+else:
+for c in gajim.contacts.get_contacts(account, jid):
+c.sub = 'none'
+c.show = 'not in roster'
+c.status = ''
+old_grps = c.get_shown_groups()
+c.groups = [_('Not in Roster')]
+self._add_entity(c, account)
+self.draw_contact(jid, account)
if iters:
# Draw all groups of the contact
-for group in contact.get_shown_groups():
+for group in contact.get_shown_groups() + old_grps:
self.draw_group(group, account)
self.draw_account(account)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: strip spaces arround server and room name in join groupch...
changeset 79296520f295 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=79296520f295
description: strip spaces arround server and room name in join groupchat
dialog. Fixes #7081
diffstat:
src/dialogs.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (15 lines):
diff -r 8080681cc0c6 -r 79296520f295 src/dialogs.py
--- a/src/dialogs.pyMon Jan 16 21:11:16 2012 +0100
+++ b/src/dialogs.pySat Jan 21 09:17:09 2012 +0100
@@ -2464,8 +2464,9 @@
'groupchat.'))
return
nickname = self._nickname_entry.get_text().decode('utf-8')
-server = self.server_comboboxentry.child.get_text().decode('utf-8')
-room = self._room_jid_entry.get_text().decode('utf-8')
+server = self.server_comboboxentry.child.get_text().decode('utf-8').\
+strip()
+room = self._room_jid_entry.get_text().decode('utf-8').strip()
room_jid = room + '@' + server
password = self._password_entry.get_text().decode('utf-8')
try:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix restoring expanded / collapsed metacontacts when we f...
changeset 8080681cc0c6 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=8080681cc0c6
description: fix restoring expanded / collapsed metacontacts when we finish
using roster filter. Fixes #7060
diffstat:
src/roster_window.py | 30 +-
1 files changed, 25 insertions(+), 5 deletions(-)
diffs (47 lines):
diff -r c63539ae74ed -r 8080681cc0c6 src/roster_window.py
--- a/src/roster_window.py Thu Jan 12 21:44:53 2012 +0100
+++ b/src/roster_window.py Mon Jan 16 21:11:16 2012 +0100
@@ -1451,10 +1451,27 @@
self.tree.set_cursor(path)
def _readjust_expand_collapse_state(self):
-for account in gajim.connections:
-self._adjust_account_expand_collapse_state(account)
-for group in gajim.groups[account]:
-self._adjust_group_expand_collapse_state(group, account)
+def func(model, path, iter_):
+type_ = model[iter_][C_TYPE]
+acct = model[iter_][C_ACCOUNT].decode('utf-8')
+jid = model[iter_][C_JID].decode('utf-8')
+key = None
+if type_ == 'account':
+key = acct
+elif type_ == 'group':
+key = acct + jid
+elif type_ == 'contact':
+parent_iter = model.iter_parent(iter_)
+ptype = model[parent_iter][C_TYPE]
+if ptype == 'group':
+grp = model[parent_iter][C_JID].decode('utf-8')
+key = acct + grp + jid
+if key:
+if key in self.collapsed_rows:
+self.tree.collapse_row(path)
+else:
+self.tree.expand_row(path, False)
+self.modelfilter.foreach(func)
def _adjust_account_expand_collapse_state(self, account):
"""
@@ -4123,7 +4140,10 @@
jid = model[titer][C_JID].decode('utf-8')
account = model[titer][C_ACCOUNT].decode('utf-8')
contact = gajim.contacts.get_contact(account, jid)
-for group in contact.groups:
+groups = contact.groups
+if not groups:
+groups = [_('General')]
+for group in groups:
if account + group + jid not in self.collapsed_rows:
self.collapsed_rows.append(account + group + jid)
family = gajim.contacts.get_metacontacts_family(account, jid)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: update bonjour for windows string to link to bonjour SDK....
changeset c63539ae74ed in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=c63539ae74ed
description: update bonjour for windows string to link to bonjour SDK. Fixes
#7072
diffstat:
src/features_window.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 5405450fd687 -r c63539ae74ed src/features_window.py
--- a/src/features_window.pyWed Jan 11 22:28:56 2012 +0100
+++ b/src/features_window.pyThu Jan 12 21:44:53 2012 +0100
@@ -54,7 +54,7 @@
_('Bonjour / Zeroconf'): (self.zeroconf_available,
_('Serverless chatting with autodetected clients in a local
network.'),
_('Requires python-avahi.'),
-_('Requires pybonjour
(http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')),
+_('Requires pybonjour and bonjour SDK running
(http://developer.apple.com/opensource/).')),
_('Command line'): (self.dbus_available,
_('A script to control Gajim via commandline.'),
_('Requires python-dbus.'),
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: don't allow to open information window when we are offlin...
changeset fd9b3c14f832 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fd9b3c14f832
description: don't allow to open information window when we are offline. Fixes
#7082
diffstat:
src/chat_control.py | 68 ++--
src/gui_menu_builder.py | 5 ++-
2 files changed, 40 insertions(+), 33 deletions(-)
diffs (196 lines):
diff -r 191e7d74f635 -r fd9b3c14f832 src/chat_control.py
--- a/src/chat_control.py Sun Jan 22 00:28:14 2012 +0100
+++ b/src/chat_control.py Sun Jan 22 11:25:22 2012 +0100
@@ -1437,22 +1437,22 @@
def __init__(self, parent_win, contact, acct, session, resource=None):
ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-'chat_control', contact, acct, resource)
+'chat_control', contact, acct, resource)
self.gpg_is_active = False
# for muc use:
# widget = self.xml.get_object('muc_window_actions_button')
self.actions_button =
self.xml.get_object('message_window_actions_button')
id_ = self.actions_button.connect('clicked',
-self.on_actions_button_clicked)
+self.on_actions_button_clicked)
self.handlers[id_] = self.actions_button
self._formattings_button = self.xml.get_object('formattings_button')
self._add_to_roster_button = self.xml.get_object(
-'add_to_roster_button')
+'add_to_roster_button')
id_ = self._add_to_roster_button.connect('clicked',
-self._on_add_to_roster_menuitem_activate)
+self._on_add_to_roster_menuitem_activate)
self.handlers[id_] = self._add_to_roster_button
self._audio_button = self.xml.get_object('audio_togglebutton')
@@ -1460,14 +1460,14 @@
self.handlers[id_] = self._audio_button
# add a special img
gtkgui_helpers.add_image_to_button(self._audio_button,
-'gajim-mic_inactive')
+'gajim-mic_inactive')
self._video_button = self.xml.get_object('video_togglebutton')
id_ = self._video_button.connect('toggled',
self.on_video_button_toggled)
self.handlers[id_] = self._video_button
# add a special img
gtkgui_helpers.add_image_to_button(self._video_button,
-'gajim-cam_inactive')
+'gajim-cam_inactive')
self._send_file_button = self.xml.get_object('send_file_button')
# add a special img for send file button
@@ -1476,30 +1476,30 @@
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._on_send_file_menuitem_activate)
self.handlers[id_] = self._send_file_button
self._convert_to_gc_button = self.xml.get_object(
-'convert_to_gc_button')
+'convert_to_gc_button')
id_ = self._convert_to_gc_button.connect('clicked',
-self._on_convert_to_gc_menuitem_activate)
+self._on_convert_to_gc_menuitem_activate)
self.handlers[id_] = self._convert_to_gc_button
-contact_information_button = self.xml.get_object(
-'contact_information_button')
-id_ = contact_information_button.connect('clicked',
-self._on_contact_information_menuitem_activate)
-self.handlers[id_] = contact_information_button
+self._contact_information_button = self.xml.get_object(
+'contact_information_button')
+id_ = self._contact_information_button.connect('clicked',
+self._on_contact_information_menuitem_activate)
+self.handlers[id_] = self._contact_information_button
compact_view = gajim.config.get('compact_view')
self.chat_buttons_set_visible(compact_view)
self.widget_set_visible(self.xml.get_object('banner_eventbox'),
-gajim.config.get('hide_chat_banner'))
+gajim.config.get('hide_chat_banner'))
self.authentication_button = self.xml.get_object(
-'authentication_button')
+'authentication_button')
id_ = self.authentication_button.connect('clicked',
-self._on_authentication_button_clicked)
+self._on_authentication_button_clicked)
self.handlers[id_] = self.authentication_button
# Add lock image to show chat encryption
@@ -1541,31 +1541,31 @@
# Hook up signals
id_ = self.parent_win.window.connect('motion-notify-event',
-self._on_window_motion_notify)
+self._on_window_motion_notify)
self.handlers[id_] = self.parent_win.window
message_tv_buffer = self.msg_textview.get_buffer()
id_ = message_tv_buffer.connect('changed',
-self._on_message_tv_buffer_changed)
+self.
