Commits

commits@gajim.org

17632 discussions

gajim-website: prepare website for 0.15-beta4
by Yann Leboulanger 22 Jan '12

22 Jan '12

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 ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -20,8 +20,8 @@ print ("</a>\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 "<a href=\"downloads/0.15/gajim_0.15~beta3-1_all.deb\">"._("here")."</a>. \n"; +printf(_(" The Debian package of %s is "), "0.15-beta4"); +print "<a href=\"downloads/0.15/gajim_0.15~beta4-1_all.deb\">"._("here")."</a>. \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 ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); -print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta3-2.exe\">"._("Gajim installer")."</a> "; -printf(_("for %s version "), "0.15-beta3"); +print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta4-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.15-beta4"); print (".\n"); print (" \n"); @@ -160,8 +160,8 @@ print (" </h2>\n"); print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">see the <tt>README</tt></a> ("._("in English")."). \n"; -printf(_(" The tarball version of %s is "), "0.15-beta3"); -print "<a href=\"downloads/0.15/gajim-0.15-beta3.tar.gz\">"._("here")."</a>. \n"; +printf(_(" The tarball version of %s is "), "0.15-beta4"); +print "<a href=\"downloads/0.15/gajim-0.15-beta4.tar.gz\">"._("here")."</a>. \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 => sprintf(_("Beta-release of Gajim %s"), "0.15"), + 4 => sprintf(_("Alpha-release of Gajim %s"), "0.15"), + 5 => sprintf(_("Gajim %s is here!"), "0.14.4"), + 6 => sprintf(_("Gajim %s is here!"), "0.14.3"), + 7 => sprintf(_("Gajim %s is here!"), "0.14.2"), + 8 => sprintf(_("Gajim %s is here!"), "0.14.1"), + 9 => sprintf(_("Gajim %s is here!"), "0.14")); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("18 December 2011"), - 1 => _("08 October 2011"), - 2 => _("17 September 2011"), - 3 => _("27 August 2011"), - 4 => _("22 July 2011"), - 5 => _("19 June 2011"), - 6 => _("07 June 2011"), - 7 => _("26 October 2010"), - 8 => _("02 September 2010")); + 0 => _("22 January 2012"), + 1 => _("18 December 2011"), + 2 => _("08 October 2011"), + 3 => _("17 September 2011"), + 4 => _("27 August 2011"), + 5 => _("22 July 2011"), + 6 => _("19 June 2011"), + 7 => _("07 June 2011"), + 8 => _("26 October 2010"), + 9 => _("02 September 2010")); $array_news_desc = array( 0 => sprintf(_("Version %s will arrive very soon."), "0.15"), 1 => sprintf(_("Version %s will arrive very soon."), "0.15"), 2 => sprintf(_("Version %s will arrive very soon."), "0.15"), - 3 => sprintf(_("Version %s will arrive soon."), "0.15"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), - 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), - 6 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), - 7 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), - 8 => sprintf(_("Version %s of Gajim has been released."), "0.14")); + 3 => sprintf(_("Version %s will arrive very soon."), "0.15"), + 4 => sprintf(_("Version %s will arrive soon."), "0.15"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), + 6 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), + 7 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), + 8 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), + 9 => sprintf(_("Version %s of Gajim has been released."), "0.14")); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.15-beta2"), - 1 => sprintf(_("What's new since %s:"), "0.15-beta1"), - 2 => sprintf(_("What's new since %s:"), "0.15-alpha1"), - 3 => sprintf(_("What's new since %s:"), "0.14.4"), - 4 => sprintf(_("What's new since %s:"), "0.14.3"), - 5 => sprintf(_("What's new since %s:"), "0.14.2"), - 6 => sprintf(_("What's new since %s:"), "0.14.1"), - 7 => sprintf(_("What's new since %s:"), "0.14"), - 8 => sprintf(_("What's new since %s:"), "0.13.4")); + 0 => sprintf(_("What's new since %s:"), "0.15-beta3"), + 1 => sprintf(_("What's new since %s:"), "0.15-beta2"), + 2 => sprintf(_("What's new since %s:"), "0.15-beta1"), + 3 => sprintf(_("What's new since %s:"), "0.15-alpha1"), + 4 => sprintf(_("What's new since %s:"), "0.14.4"), + 5 => sprintf(_("What's new since %s:"), "0.14.3"), + 6 => sprintf(_("What's new since %s:"), "0.14.2"), + 7 => sprintf(_("What's new since %s:"), "0.14.1"), + 8 => sprintf(_("What's new since %s:"), "0.14"), + 9 => sprintf(_("What's new since %s:"), "0.13.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Fix some crashes"), + 1 => _("Check hostname in SSL certificates "), + 2 => _("Use 'login' keyring as default keyring instead of 'default'"), + 3 => _("Fix Out Of Band registration "), + 4 => _("Improve search in roster"), + 5 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15-beta4/ChangeLog\">"._("Full ChangeLog")."</a> ", + ); + +$array_news_items[1] = array( 0 => _("Spell checking under windows"), 1 => _("handle default value in seclabel XEP"), 2 => _("Fix convertion from chat to groupchat"), @@ -113,7 +126,7 @@ 10 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9903fad02c40/ChangeLog\">"._("Full ChangeLog")."</a> ", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Fix End to End encryption."), 1 => _("Fix auto-opening chat window when a contact connects."), 2 => _("Fix registering a new account."), @@ -121,14 +134,14 @@ 4 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/d687f2253f17/ChangeLog\">"._("Full ChangeLog")."</a> ", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Plugins are now translatable"), 1 => _("Workarround a D-Bus issue with non-character unicode"), 2 => _("Fix windows usage when GTK library is already in PATH"), 3 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/41dd6ee4817d/ChangeLog\">"._("Full ChangeLog")."</a> ", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), @@ -139,32 +152,32 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>", ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Fix translation issue"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9476e66272c3/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.4\">"._("List of fixed bugs")."</a>", ); -$array_news_items[5] = array( +$array_news_items[6] = array( 0 => _("Fix history viewer"), 1 => _("Fix closing roster window"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/7798a90157c7/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.3\">"._("List of fixed bugs")."</a>", ); -$array_news_items[6] = array( +$array_news_items[7] = array( 0 => _("Fix CPU usage when testing file transfer proxies"), 1 => _("Fix invalid XML char regex"), 2 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/baf4786b33fe/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[7] = array( +$array_news_items[8] = array( 0 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/d56f061aca8d/ChangeLog\">"._("Full ChangeLog")."</a> ", 1 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[8] = array( +$array_news_items[9] = array( 0 => _("Jingle audio / video chat"), 1 => _("Improve startup time"), 2 => _("Groupchat auto-rejoin"), diff -r abfcfbbaad3d -r b0fe9c1f13a4 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Mon Dec 19 11:24:34 2011 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sun Jan 22 20:42:35 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-18 15:07+0100\n" +"POT-Creation-Date: 2012-01-22 20:38+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -683,8 +683,8 @@ #: index.php:25 msgid "" -"Group chat support (with MUC protocol), invitation, chat to group chat " -"transformation, minimize group chat to roster" +"Group chat support (with Multi-User Chat protocol), invitation, chat to " +"group chat transformation, minimize group chat to roster" msgstr "" #: index.php:26 @@ -769,242 +769,272 @@ #: index.php:52 #, fuzzy, c-format -msgid "Beta3-release of Gajim %s" +msgid "Beta4-release of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" #: index.php:53 #, fuzzy, c-format -msgid "Beta2-release of Gajim %s" +msgid "Beta3-release of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" #: index.php:54 #, fuzzy, c-format -msgid "Beta-release of Gajim %s" +msgid "Beta2-release of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" #: index.php:55 #, fuzzy, c-format +msgid "Beta-release of Gajim %s" +msgstr "Предварително издание на Gajim 0.11.1" + +#: index.php:56 +#, fuzzy, c-format msgid "Alpha-release of Gajim %s" msgstr "Предварително издание на Gajim 0.11.1" -#: index.php:56 index.php:57 index.php:58 index.php:59 index.php:60 +#: index.php:57 index.php:58 index.php:59 index.php:60 index.php:61 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:66 +#: index.php:67 +#, fuzzy +msgid "22 January 2012" +msgstr "18 февруари 2007 г." + +#: index.php:68 #, fuzzy msgid "18 December 2011" msgstr "19 декември 2006 г." -#: index.php:67 +#: index.php:69 #, fuzzy msgid "08 October 2011" msgstr "19 декември 2006 г."

1 0

gajim: Added tag gajim-0.15-beta4 for changeset 5a486555abcd
by Yann Leboulanger 22 Jan '12

22 Jan '12

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

1 0

gajim: update debian files for beta4
by Yann Leboulanger 22 Jan '12

22 Jan '12

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 <asterix(a)lagaule.org> Fri, 26 Aug 2011 12:13:51 +0200 + -- Yann Leboulanger <asterix(a)lagaule.org> 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/control Sun Jan 22 18:59:43 2012 +0100 +++ b/debian/control Sun 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 <asterix(a)lagaule.org> -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

1 0

gajim: update po files
by Yann Leboulanger 22 Jan '12

22 Jan '12

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/be(a)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/sr(a)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 <ihar.hrachyshka(a)gmail.com>, 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 <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\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 @@ msgstr "Проксі:" #: ../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 "Захоўваць па_роль" @@ -162,7 +159,7 @@ "сеткі Jabber." #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "_Адмысловыя" @@ -176,12 +173,13 @@ msgstr "Назва вузла: " #: ../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 "_Jabber ID:" #: ../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 "_Пароль:" @@ -190,6 +188,7 @@ msgstr "_Порт:" #: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/manage_bookmarks_window.ui.h:9 msgid "_Server:" msgstr "_Сервер:" @@ -223,98 +222,113 @@ 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:3383 +#: ../src/dialogs.py:3429 +#, fuzzy +msgid "Add" +msgstr "Адрас" + +#: ../data/gui/accounts_window.ui.h:9 #, fuzzy msgid "Administration operations" msgstr "Спіс адміністратараў" -#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:10 #, fuzzy 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 #, fuzzy 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" -#: ../data/gui/accounts_window.ui.h:13 +#: ../data/gui/accounts_window.ui.h:14 +#, fuzzy +msgid "Certificate is e_ncrypted" +msgstr "[Гэтае паведамленне зашыфраванае]" + +#: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" msgstr "З_мяніць пароль" -#: ../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." msgstr "" -#: ../data/gui/accounts_window.ui.h:15 -#, fuzzy -msgid "Choose Client Cert" -msgstr "Выберыце файл..." - -#: ../data/gui/accounts_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." msgstr "Выберыце _ключ..." -#: ../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 #, fuzzy msgid "Client certificate" msgstr "Няправільнае імя карыстальніка" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:21 #, fuzzy msgid "Co_nnect on Gajim startup" msgstr "_Злучацца па старце Gajim" -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:22 msgid "Connection" msgstr "Злучэнне" -#: ../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:3387 +#: ../src/dialogs.py:3484 +msgid "Delete" +msgstr "Выдаліць" + +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "E-mail:" -#: ../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 "Імя:" #. No configured account -#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 -#: ../src/notify.py:616 +#: ../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" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. 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:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122 -#: ../src/roster_window.py:2898 ../src/roster_window.py:5451 +#: ../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 msgid "General" msgstr "Агульная" -#: ../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." @@ -322,12 +336,12 @@ "Калі гэтая опцыя ўключаная, Gajim зойме некаторыя іншыя адрасы IP, і шанец " "правільнай перадачы файлаў падвысіцца." -#: ../data/gui/accounts_window.ui.h:27 +#: ../data/gui/accounts_window.ui.h:29 #, fuzzy msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка" -#: ../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" @@ -335,7 +349,7 @@ "Калі гэтая опцыя ўключаная, Gajim адпраўляе адмысловыя інфармацыйныя пакункі " "для запэўнівання сервера ў Вашым існаванні" -#: ../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" @@ -343,7 +357,7 @@ "Калі гэтая опцыя ўключаная, Gajim будзе аўтаматычна злучацца з дапамогай " "гэтага рахунка" -#: ../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 " @@ -352,7 +366,7 @@ "Калі гэтая опцыя ўключаная, любыя глабальныя змены стану (праз адмысловы " "спіс унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам" -#: ../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" @@ -361,39 +375,39 @@ "Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n" "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола." -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" msgstr "Звесткі аб Вас, якія захоўваюцца на серверы" -#: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:831 +#: ../data/gui/accounts_window.ui.h:37

1 0

gajim: [Mako] update japanese translation
by Yann Leboulanger 22 Jan '12

22 Jan '12

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 <mako(a)pasero.net>\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" msgstr "クライアントの証明書" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" msgstr "Gajim 起動時に接続する (_n)" -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:22 msgid "Connection" msgstr "接続" -#: ../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:3388 +#: ../src/dialogs.py:3485 +msgid "Delete" +msgstr "削除" + +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "E-メール:" -#: ../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 "名:" #. 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:311 ../src/notify.py:334 ../src/notify.py:383 -#: ../src/notify.py:399 +#: ../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" @@ -290,14 +302,15 @@ #. 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:3034 ../src/roster_window.py:5652 +#: ../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:3081 ../src/roster_window.py:4148 +#: ../src/roster_window.py:5738 msgid "General" msgstr "全般" # (Mako)broadcast 困った。ここは「同報」で -#: ../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." @@ -305,13 +318,13 @@ "チェックをつけると、Gajim はあなたの IP を除くいくつかの IP に同報します。そ" "れによってファイル転送はうまくいく可能性が高くなります。" -#: ../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 "" "チェックをつけると、Gajim は seahorse など GPG エージェントからパスワードを受" "け取ります" -#: ../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" @@ -319,7 +332,7 @@ "チェックをつけると、Gajim はタイムアウトで接続が切れてしまうのを防ぐために生" "存パケットを流すようになります" -#: ../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" @@ -327,7 +340,7 @@ "チェックをつけると、Gajim は起動時に、このアカウントを使って jabber に自動的" "に接続します" -#: ../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 " @@ -336,7 +349,7 @@ "チェックをつけると、(名簿ウィンドウの最下段の選択肢による)全体の在席状況の変" "更がこのアカウントの在席状況の変更に反映されます。" -#: ../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" @@ -346,39 +359,39 @@ "ポートを指定できます。\n" "ファイアーウォールの設定を考慮しましょう。" -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" msgstr "サーバに格納する、あなたに関する情報です" -#: ../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 "Jabber ID:" -#: ../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 "姓:" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:39 msgid "Mer_ge accounts" -msgstr "アカウントの統合 (_g)" - -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 -#: ../src/config.py:2377 +msgstr "アカウントを統合 (_g)" + +#: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842 +#: ../src/config.py:2420 msgid "No key selected" msgstr "鍵が選択されていません" -#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:42 ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "個人情報" -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:43 msgid "Priori_ty:" msgstr "優先順位 (_t):" -#: ../data/gui/accounts_window.ui.h:42 +#: ../data/gui/accounts_window.ui.h:44 msgid "" "Priority is used in Jabber to determine who gets the events from the jabber " "server when two or more clients are connected using the same account; The "

1 0

gajim: ability to send file to contacts without a resource (but ...
by Yann Leboulanger 22 Jan '12

22 Jan '12

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):

1 0

gajim: [Mako] update japanese translation
by Yann Leboulanger 22 Jan '12

22 Jan '12

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 <mako(a)pasero.net>\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" msgstr "クライアントの証明書" -#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" msgstr "Gajim 起動時に接続する (_n)" -#: ../data/gui/accounts_window.ui.h:21 +#: ../data/gui/accounts_window.ui.h:22 msgid "Connection" msgstr "接続" -#: ../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:3388 +#: ../src/dialogs.py:3485 +msgid "Delete" +msgstr "削除" + +#: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" msgstr "E-メール:" -#: ../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 "名:" #. 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:311 ../src/notify.py:334 ../src/notify.py:383 -#: ../src/notify.py:399 +#: ../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" @@ -290,14 +302,15 @@ #. 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 +#: ../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:3034 ../src/roster_window.py:5652 +#: ../src/roster_window.py:3081 ../src/roster_window.py:4148 +#: ../src/roster_window.py:5738 msgid "General" msgstr "全般" # (Mako)broadcast 困った。ここは「同報」で -#: ../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." @@ -305,13 +318,13 @@ "チェックをつけると、Gajim はあなたの IP を除くいくつかの IP に同報します。そ" "れによってファイル転送はうまくいく可能性が高くなります。" -#: ../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 "" "チェックをつけると、Gajim は seahorse など GPG エージェントからパスワードを受" "け取ります" -#: ../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" @@ -319,7 +332,7 @@ "チェックをつけると、Gajim はタイムアウトで接続が切れてしまうのを防ぐために生" "存パケットを流すようになります" -#: ../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" @@ -327,7 +340,7 @@ "チェックをつけると、Gajim は起動時に、このアカウントを使って jabber に自動的" "に接続します" -#: ../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 " @@ -336,7 +349,7 @@ "チェックをつけると、(名簿ウィンドウの最下段の選択肢による)全体の在席状況の変" "更がこのアカウントの在席状況の変更に反映されます。" -#: ../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" @@ -346,39 +359,39 @@ "ポートを指定できます。\n" "ファイアーウォールの設定を考慮しましょう。" -#: ../data/gui/accounts_window.ui.h:34 +#: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" msgstr "サーバに格納する、あなたに関する情報です" -#: ../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 "Jabber ID:" -#: ../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 "姓:" -#: ../data/gui/accounts_window.ui.h:37 +#: ../data/gui/accounts_window.ui.h:39 msgid "Mer_ge accounts" -msgstr "アカウントの統合 (_g)" - -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 -#: ../src/config.py:2377 +msgstr "アカウントを統合 (_g)" + +#: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842 +#: ../src/config.py:2420 msgid "No key selected" msgstr "鍵が選択されていません" -#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:42 ../data/gui/profile_window.ui.h:35 msgid "Personal Information" msgstr "個人情報" -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:43 msgid "Priori_ty:" msgstr "優先順位 (_t):" -#: ../data/gui/accounts_window.ui.h:42 +#: ../data/gui/accounts_window.ui.h:44 msgid "" "Priority is used in Jabber to determine who gets the events from the jabber " "server when two or more clients are connected using the same account; The " @@ -388,20 +401,20 @@

1 0

gajim: ability to send file to contacts without a resource (but ...
by Yann Leboulanger 22 Jan '12

22 Jan '12

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):

1 0

gajim: prepare beta4 release
by Yann Leboulanger 22 Jan '12

22 Jan '12

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.sh Sun Jan 22 11:25:22 2012 +0100 +++ b/autogen.sh Sun 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.py Sun Jan 22 11:25:22 2012 +0100 +++ b/src/common/defs.py Sun 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,

1 0

gajim: don't allow to open information window when we are offlin...
by Yann Leboulanger 22 Jan '12

22 Jan '12

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._on_message_tv_buffer_changed) self.handlers[id_] = message_tv_buffer widget = self.xml.get_object('avatar_eventbox') widget.set_property('height-request', gajim.config.get( - 'chat_avatar_height')) + 'chat_avatar_height')) id_ = widget.connect('enter-notify-event', - self.on_avatar_eventbox_enter_notify_event) + self.on_avatar_eventbox_enter_notify_event) self.handlers[id_] = widget id_ = widget.connect('leave-notify-event', - self.on_avatar_eventbox_leave_notify_event) + self.on_avatar_eventbox_leave_notify_event) self.handlers[id_] = widget id_ = widget.connect('button-press-event', - self.on_avatar_eventbox_button_press_event) + self.on_avatar_eventbox_button_press_event) self.handlers[id_] = widget widget = self.xml.get_object('location_eventbox') id_ = widget.connect('button-release-event', - self.on_location_eventbox_button_release_event) + self.on_location_eventbox_button_release_event) self.handlers[id_] = widget for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): @@ -1613,7 +1613,7 @@ if not resource: resource = contact.resource session = gajim.connections[self.account].find_controlless_session( - self.contact.jid, resource) + self.contact.jid, resource) self.setup_seclabel(self.xml.get_object('label_selector')) if session: @@ -1626,8 +1626,7 @@ # Enable encryption if needed self.no_autonegotiation = False e2e_is_active = self.session and self.session.enable_encryption - gpg_pref = gajim.config.get_per('contacts', contact.jid, - 'gpg_enabled') + gpg_pref = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled') # try GPG first if not e2e_is_active and gpg_pref and \ @@ -1636,15 +1635,15 @@ self.gpg_is_active = True gajim.encrypted_chats[self.account].append(contact.jid) msg = _('GPG encryption enabled') - ChatControlBase.print_conversation_line(self, msg, - 'status', '', None) + ChatControlBase.print_conversation_line(self, msg, 'status', '', + None) if self.session: self.session.loggable = gajim.config.get_per('accounts', - self.account, 'log_encrypted_sessions') + self.account, 'log_encrypted_sessions') # GPG is always authenticated as we use GPG's WoT self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, - self.session and self.session.is_loggable(), True) + self.session and self.session.is_loggable(), True) self.update_ui() # restore previous conversation @@ -1742,6 +1741,13 @@ else: self._convert_to_gc_button.set_sensitive(False) + # Information + if gajim.account_is_disconnected(self.account): + self._contact_information_button.set_sensitive(False) + else: + self._contact_information_button.set_sensitive(True) + + def update_all_pep_types(self): for pep_type in self._pep_images: self.update_pep(pep_type) diff -r ff41575b0b0e -r cbc8d7b4b702 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Jan 22 00:28:14 2012 +0100 +++ b/src/gui_menu_builder.py Sun Jan 22 11:25:22 2012 +0100 @@ -272,8 +272,9 @@ # Unsensitive many items when account is offline if gajim.account_is_disconnected(account): - for widget in (start_chat_menuitem, rename_menuitem, - edit_groups_menuitem, send_file_menuitem, convert_to_gc_menuitem): + for widget in (start_chat_menuitem, rename_menuitem, + edit_groups_menuitem, send_file_menuitem, convert_to_gc_menuitem, + information_menuitem): widget.set_sensitive(False) if not show_start_chat:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits