Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: prepare 0.15-alpha1 release
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset 8ec78f5747ec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ec78f5747ec description: prepare 0.15-alpha1 release diffstat: ChangeLog | 10 ++++++++++ autogen.sh | 2 +- debian/README.Debian | 2 -- debian/changelog | 9 +++++++++ debian/control | 4 ++-- debian/copyright | 4 ++-- debian/docs | 2 +- debian/rules | 6 +----- gajim.nsi | 2 +- src/common/defs.py | 2 +- 10 files changed, 28 insertions(+), 15 deletions(-) diffs (143 lines): diff -r 44193810ee87 -r 8ec78f5747ec ChangeLog --- a/ChangeLog Sat Aug 27 12:17:33 2011 +0200 +++ b/ChangeLog Sat Aug 27 12:21:09 2011 +0200 @@ -1,3 +1,13 @@ +Gajim 0.15 (XX XX 2011) + + * Plugin system + * Whiteboard (via a plugin) + * Message archiving + * Stream managment + * IBB + * Nested roster group + * Roster filtrering + Gajim 0.14.4 (22 July 2011) * Fix translation issue diff -r 44193810ee87 -r 8ec78f5747ec autogen.sh --- a/autogen.sh Sat Aug 27 12:17:33 2011 +0200 +++ b/autogen.sh Sat Aug 27 12:21:09 2011 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.14.0.1" + gajimversion="0.15-alpha1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 44193810ee87 -r 8ec78f5747ec debian/README.Debian --- a/debian/README.Debian Sat Aug 27 12:17:33 2011 +0200 +++ b/debian/README.Debian Sat Aug 27 12:21:09 2011 +0200 @@ -1,8 +1,6 @@ gajim for Debian ---------------- -If you want to use OpenPGP in gajim, you have to install python-gnupginterface. - For video chat support, you have to install python-farsight. -- Yann Le Boulanger <asterix(a)lagaule.org>, Mon, 20 Jun 2005 12:02:31 +0200 diff -r 44193810ee87 -r 8ec78f5747ec debian/changelog --- a/debian/changelog Sat Aug 27 12:17:33 2011 +0200 +++ b/debian/changelog Sat Aug 27 12:21:09 2011 +0200 @@ -1,3 +1,12 @@ +gajim (0.15~alpha1-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 + gajim (0.14.4-1) unstable; urgency=low * New upstream release. Closes: #637071 diff -r 44193810ee87 -r 8ec78f5747ec debian/control --- a/debian/control Sat Aug 27 12:17:33 2011 +0200 +++ b/debian/control Sat Aug 27 12:21:09 2011 +0200 @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Yann Leboulanger <asterix(a)lagaule.org> -Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), dh-autoreconf, gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev +Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev Standards-Version: 3.9.2 Homepage: http://www.gajim.org Vcs-Hg: http://hg.gajim.org/gajim/ @@ -11,7 +11,7 @@ Package: gajim Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils -Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl (>= 0.9), python-crypto +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 Description: Jabber client written in PyGTK Gajim is a Jabber client. It has a tabbed user interface with normal chats, diff -r 44193810ee87 -r 8ec78f5747ec debian/copyright --- a/debian/copyright Sat Aug 27 12:17:33 2011 +0200 +++ b/debian/copyright Sat Aug 27 12:21:09 2011 +0200 @@ -5,8 +5,8 @@ http://www.gajim.org/downloads/ Upstream Authors: - - Alexander Cherniuk <ts33kr(a)gmail.com> - - Yann Le Boulanger <asterix(a)lagaule.org> + - Denis Fomin <fominde(a)gmail.com> + - Yann Leboulanger <asterix(a)lagaule.org> Copyright: (c) 2003-2011 Gajim Team diff -r 44193810ee87 -r 8ec78f5747ec debian/docs --- a/debian/docs Sat Aug 27 12:17:33 2011 +0200 +++ b/debian/docs Sat Aug 27 12:21:09 2011 +0200 @@ -1,1 +1,1 @@ -README +README.html diff -r 44193810ee87 -r 8ec78f5747ec debian/rules --- a/debian/rules Sat Aug 27 12:17:33 2011 +0200 +++ b/debian/rules Sat Aug 27 12:21:09 2011 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with python2,autoreconf + dh $@ --with python2 # test target is broken override_dh_auto_test: @@ -10,10 +10,6 @@ convert icons/hicolor/64x64/apps/gajim.png -resize 32x32 debian/gajim.xpm dh_auto_configure -override_dh_auto_install: - dh_auto_install - rm debian/gajim/usr/share/gajim/src/common/GnuPGInterface.py* - override_dh_auto_clean: -rm -f debian/gajim.xpm dh_auto_clean diff -r 44193810ee87 -r 8ec78f5747ec gajim.nsi --- a/gajim.nsi Sat Aug 27 12:17:33 2011 +0200 +++ b/gajim.nsi Sat Aug 27 12:21:09 2011 +0200 @@ -188,7 +188,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 44193810ee87 -r 8ec78f5747ec src/common/defs.py --- a/src/common/defs.py Sat Aug 27 12:17:33 2011 +0200 +++ b/src/common/defs.py Sat Aug 27 12:21:09 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.14.90.0' +version = '0.15-alpha1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: fix resumption when server fails to resumesession (server...
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset 44193810ee87 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=44193810ee87 description: fix resumption when server fails to resumesession (server restart). Fixes #6951 diffstat: src/common/xmpp/smacks.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 7ecc1acb6e81 -r 44193810ee87 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Fri Aug 26 15:13:19 2011 +0200 +++ b/src/common/xmpp/smacks.py Sat Aug 27 12:17:33 2011 +0200 @@ -114,8 +114,9 @@ # Ask for service discovery, etc.. if stanza.getTag('item-not-found'): self.resuming = False - self.negociate() - self.con._discover_server_at_connection(self.con.connection) + # we need to bind a resource + self._owner.NonBlockingBind.resuming = False + self._owner._on_auth_bind(None) return # Doesn't support resumption

1 0

gajim: change plugin name in Makefile.am too
by Yann Leboulanger 26 Aug '11

26 Aug '11

changeset 7ecc1acb6e81 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7ecc1acb6e81 description: change plugin name in Makefile.am too diffstat: plugins/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 23a518e90a01 -r 7ecc1acb6e81 plugins/Makefile.am --- a/plugins/Makefile.am Fri Aug 26 13:37:35 2011 +0200 +++ b/plugins/Makefile.am Fri Aug 26 15:13:19 2011 +0200 @@ -3,7 +3,7 @@ gajimpluginsdir = $(gajim_pluginsdir) -installedplugins = acronyms_expander banner_tweaks ftp_manager length_notifier triggers whiteboard +installedplugins = acronyms_expander banner_tweaks length_notifier plugin_installer triggers whiteboard installedpluginsfiles = $(wildcard ${srcdir}/${p}/*.py ${srcdir}/${p}/manifest.ini ${srcdir}/${p}/*.ui ${srcdir}/${p}/*.png)

1 0

gajim: rename ftp manager plugin to plugin installer
by Yann Leboulanger 26 Aug '11

26 Aug '11

changeset 23a518e90a01 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=23a518e90a01 description: rename ftp manager plugin to plugin installer diffstat: plugins/ftp_manager/__init__.py | 1 - plugins/ftp_manager/config_dialog.ui | 281 ---------------- plugins/ftp_manager/ftp_manager.py | 460 --------------------------- plugins/ftp_manager/manifest.ini | 7 - plugins/plugin_installer/__init__.py | 1 + plugins/plugin_installer/config_dialog.ui | 281 ++++++++++++++++ plugins/plugin_installer/manifest.ini | 7 + plugins/plugin_installer/plugin_installer.py | 457 ++++++++++++++++++++++++++ 8 files changed, 746 insertions(+), 749 deletions(-) diffs (truncated from 1527 to 300 lines): diff -r faf20adeef92 -r 23a518e90a01 plugins/ftp_manager/__init__.py --- a/plugins/ftp_manager/__init__.py Fri Aug 26 12:23:37 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -from ftp_manager import FtpManager diff -r faf20adeef92 -r 23a518e90a01 plugins/ftp_manager/config_dialog.ui --- a/plugins/ftp_manager/config_dialog.ui Fri Aug 26 12:23:37 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,281 +0,0 @@ -<?xml version="1.0"?> -<interface> - <requires lib="gtk+" version="2.16"/> -  - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> - </object> - <object class="GtkWindow" id="window1"> - <child> - <object class="GtkHPaned" id="hpaned2"> - <property name="width_request">600</property> - <property name="height_request">350</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="position">340</property> - <property name="position_set">True</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">6</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="available_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="search_column">1</property> - </object> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">False</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox4"> - <property name="visible">True</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="plugin_name_label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox8"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="label" translatable="yes">Authors:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="plugin_authors_label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">6</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox9"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label9"> - <property name="visible">True</property> - <property name="label" translatable="yes">Homepage:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLinkButton" id="plugin_homepage_linkbutton1"> - <property name="label" translatable="yes">button</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <property name="focus_on_click">False</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox5"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkHBox" id="hbox10"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="label" translatable="yes">Description:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTextView" id="plugin_description_textview1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="pixels_above_lines">6</property> - <property name="wrap_mode">word</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="indent">1</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox15"> - <property name="visible">True</property> - <child> - <object class="GtkProgressBar" id="progressbar"> - <property name="ellipsize">end</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHButtonBox" id="hbuttonbox3"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="inslall_upgrade_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_inslall_upgrade_clicked"/> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-refresh</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Install/Upgrade</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">True</property> - </packing> - </child> - </object> - </child> - </object> - <object class="GtkWindow" id="window2"> - <child> - <object class="GtkHBox" id="hbox111"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Ftp server:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="ftp_server"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> diff -r faf20adeef92 -r 23a518e90a01 plugins/ftp_manager/ftp_manager.py --- a/plugins/ftp_manager/ftp_manager.py Fri Aug 26 12:23:37 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,460 +0,0 @@ -# -*- coding: utf-8 -*- -# -## plugins/ftp_manager/ftp_manager.py -## -## Copyright (C) 2010 Denis Fomin <fominde AT gmail.com> -##

1 0

gajim: add some file to archive when building it
by Yann Leboulanger 26 Aug '11

26 Aug '11

changeset faf20adeef92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=faf20adeef92 description: add some file to archive when building it diffstat: Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 70ad7766be8a -r faf20adeef92 Makefile.am --- a/Makefile.am Fri Aug 26 12:02:48 2011 +0200 +++ b/Makefile.am Fri Aug 26 12:23:37 2011 +0200 @@ -5,7 +5,8 @@ bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote EXTRA_DIST = \ - $(docfiles_DATA) \ + README.html \ + THANKS.artists \ autogen.sh \ intltool-extract.in \ intltool-merge.in \

1 0

gajim: fix traceback
by Yann Leboulanger 26 Aug '11

26 Aug '11

changeset 70ad7766be8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70ad7766be8a description: fix traceback diffstat: src/common/connection_handlers_events.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r b84d5f72ea69 -r 70ad7766be8a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 25 21:47:11 2011 +0300 +++ b/src/common/connection_handlers_events.py Fri Aug 26 12:02:48 2011 +0200 @@ -2005,6 +2005,9 @@ self.do_sound = True def handle_incoming_gc_msg_event(self, msg_obj): + if not msg_obj.msg_obj.gc_control: + # we got a message from a room we're not in? ignore it + return sound = msg_obj.msg_obj.gc_control.highlighting_for_message( msg_obj.msgtxt, msg_obj.timestamp)[1]

1 0

gajim: update ru.po
by Fomin Denis 25 Aug '11

25 Aug '11

changeset b84d5f72ea69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b84d5f72ea69 description: update ru.po diffstat: po/ru.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diffs (34 lines): diff -r ba8c65da223d -r b84d5f72ea69 po/ru.po --- a/po/ru.po Thu Aug 25 21:43:24 2011 +0300 +++ b/po/ru.po Thu Aug 25 21:47:11 2011 +0300 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-08-25 22:24+0400\n" -"PO-Revision-Date: 2011-08-25 22:40+0300\n" +"PO-Revision-Date: 2011-08-25 22:46+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -7717,9 +7717,8 @@ msgstr "Возможность голосового и видео общения." #: ../src/features_window.py:108 -#, fuzzy msgid "Requires python-farsight and gstreamer-plugins-bad." -msgstr "Требует python-farsight." +msgstr "Требует python-farsight и gstreamer-plugins-bad." #: ../src/features_window.py:110 msgid "UPnP-IGD" @@ -7730,9 +7729,8 @@ msgstr "" #: ../src/features_window.py:112 -#, fuzzy msgid "Requires python-gupnp-igd." -msgstr "Требует python-gnome2." +msgstr "Требует python-gupnp-igd." #: ../src/features_window.py:120 msgid "?features:Available"

1 0

gajim: update ru.po
by Fomin Denis 25 Aug '11

25 Aug '11

changeset ba8c65da223d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ba8c65da223d description: update ru.po diffstat: po/ru.po | 3627 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 1840 insertions(+), 1787 deletions(-) diffs (truncated from 7926 to 300 lines): diff -r a8c164d16b30 -r ba8c65da223d po/ru.po --- a/po/ru.po Thu Aug 25 20:53:54 2011 +0300 +++ b/po/ru.po Thu Aug 25 21:43:24 2011 +0300 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 17:04+0300\n" -"PO-Revision-Date: 2011-03-24 21:13+0300\n" +"POT-Creation-Date: 2011-08-25 22:24+0400\n" +"PO-Revision-Date: 2011-08-25 22:40+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -34,7 +34,7 @@ msgstr "_Добавить контакт..." #: ../data/gui/account_context_menu.ui.h:3 -#: ../data/gui/roster_window.ui.h:18 +#: ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "_Просмотреть сервисы" @@ -126,22 +126,22 @@ #: ../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:1295 -#: ../src/config.py:1398 -#: ../src/config.py:1709 -#: ../src/config.py:1714 -#: ../src/config.py:2280 -#: ../src/config.py:2359 -#: ../src/config.py:2372 -#: ../src/config.py:3649 -#: ../src/config.py:3724 -#: ../src/dialogs.py:312 -#: ../src/dialogs.py:314 -#: ../src/dialogs.py:520 -#: ../src/dialogs.py:533 -#: ../src/roster_window.py:3047 -#: ../src/roster_window.py:3053 -#: ../src/roster_window.py:3058 +#: ../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:3654 +#: ../src/config.py:3729 +#: ../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 msgid "None" msgstr "Нет" @@ -171,7 +171,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 "_Дополнительно" @@ -184,12 +184,12 @@ msgstr "_Хост: " #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:61 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:63 #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "_Пароль:" @@ -254,17 +254,18 @@ msgstr "_Соединяться при запуске Gajim" #: ../data/gui/accounts_window.ui.h:13 +#, fuzzy +msgid "Certificate is e_ncrypted" +msgstr "Сертификат отклонен" + +#: ../data/gui/accounts_window.ui.h:14 msgid "Chan_ge Password" msgstr "И_зменить пароль" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 msgid "Check this so Gajim will ask you before sending your password over an insecure connection." msgstr "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля через незащищенное соединение." -#: ../data/gui/accounts_window.ui.h:15 -msgid "Choose Client Cert" -msgstr "Выбрать сертификат" - #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." msgstr "Выбрать _ключ..." @@ -302,12 +303,12 @@ #. 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:530 -#: ../src/notify.py:553 -#: ../src/notify.py:602 -#: ../src/notify.py:618 +#: ../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 msgid "Gajim" msgstr "Gajim" @@ -316,12 +317,12 @@ #. 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 +#: ../data/gui/preferences_window.ui.h:56 #: ../src/common/contacts.py:141 -#: ../src/dialogs.py:113 -#: ../src/dialogs.py:125 -#: ../src/roster_window.py:2989 -#: ../src/roster_window.py:5570 +#: ../src/dialogs.py:112 +#: ../src/dialogs.py:124 +#: ../src/roster_window.py:3034 +#: ../src/roster_window.py:5652 msgid "General" msgstr "Общие" @@ -359,8 +360,8 @@ #: ../data/gui/accounts_window.ui.h:35 #: ../data/gui/zeroconf_information_window.ui.h:4 -#: ../src/config.py:1832 -#: ../src/dialogs.py:838 +#: ../src/config.py:1826 +#: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -374,8 +375,8 @@ msgstr "_Объединить учетные записи" #: ../data/gui/accounts_window.ui.h:38 -#: ../src/config.py:1805 -#: ../src/config.py:2373 +#: ../src/config.py:1799 +#: ../src/config.py:2377 msgid "No key selected" msgstr "Не выбран ключ" @@ -398,7 +399,7 @@ #. Rename #: ../data/gui/accounts_window.ui.h:44 -#: ../src/roster_window.py:5520 +#: ../src/roster_window.py:5602 msgid "Re_name" msgstr "П_ереименовать" @@ -432,57 +433,53 @@ msgstr "Объединить контакты" #: ../data/gui/accounts_window.ui.h:53 -msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "Путь к сертификату и ключу в формате PKCS#12" - -#: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" msgstr "Использовать GPG _Agent" -#: ../data/gui/accounts_window.ui.h:55 +#: ../data/gui/accounts_window.ui.h:54 msgid "Use cust_om hostname/port" msgstr "Использовать польз_овательские хост/порт" -#: ../data/gui/accounts_window.ui.h:56 +#: ../data/gui/accounts_window.ui.h:55 msgid "Use cust_om port:" msgstr "_Другой порт:" -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:56 msgid "Use file transfer proxies" msgstr "Использовать прокси для передачи файла" -#: ../data/gui/accounts_window.ui.h:58 +#: ../data/gui/accounts_window.ui.h:57 msgid "_Client Cert File:" msgstr "Файл сертификата:" -#: ../data/gui/accounts_window.ui.h:59 +#: ../data/gui/accounts_window.ui.h:58 msgid "_Edit Personal Information..." msgstr "Редактировать личную информацию..." #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:60 +#: ../data/gui/accounts_window.ui.h:59 #: ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "_Включить" -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:60 msgid "_Hostname: " msgstr "_Хост: " -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:62 msgid "_Manage..." msgstr "_Управление..." -#: ../data/gui/accounts_window.ui.h:65 +#: ../data/gui/accounts_window.ui.h:64 msgid "_Port: " msgstr "_Порт:" # insecure - небезопастный или незащищенный? -#: ../data/gui/accounts_window.ui.h:66 +#: ../data/gui/accounts_window.ui.h:65 msgid "_Warn before using an insecure connection" msgstr "_Предупреждать перед использованием незащищенного соединения" -#: ../data/gui/accounts_window.ui.h:67 +#: ../data/gui/accounts_window.ui.h:66 msgid "_use HTTP__PROXY environment variable" msgstr "_использовать переменную HTTP_PROXY" @@ -499,7 +496,7 @@ msgstr "Добавить новый контакт" #: ../data/gui/add_new_contact_window.ui.h:4 -#: ../src/common/helpers.py:1341 +#: ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?" @@ -653,181 +650,6 @@ msgid "_Send Server Message..." msgstr "_Отправить сообщение сервера" -#: ../data/gui/advanced_notifications_window.ui.h:1 -msgid " a window/tab opened with that contact " -msgstr " с этим контактом открытых окон/вкладок" - -#: ../data/gui/advanced_notifications_window.ui.h:2 -msgid "Actions" -msgstr "Действия" - -#: ../data/gui/advanced_notifications_window.ui.h:3 -msgid "Conditions" -msgstr "Условия" - -#: ../data/gui/advanced_notifications_window.ui.h:4 -#: ../data/gui/preferences_window.ui.h:17 -msgid "Sounds" -msgstr "Звуки" - -#: ../data/gui/advanced_notifications_window.ui.h:5 -msgid "Advanced Actions" -msgstr "Дополнительные действия" - -#: ../data/gui/advanced_notifications_window.ui.h:6 -msgid "Advanced Notifications Control" -msgstr "Дополнительное управление уведомлениями" - -#: ../data/gui/advanced_notifications_window.ui.h:7 -msgid "All statuses" -msgstr "Все статусы" - -#: ../data/gui/advanced_notifications_window.ui.h:8 -#: ../src/common/commands.py:106 -#: ../src/common/helpers.py:239 -#: ../src/tooltips.py:193 -msgid "Away" -msgstr "Ушел" - -#: ../data/gui/advanced_notifications_window.ui.h:9 -msgid "Busy " -msgstr "Занят " -

1 0

gajim: do not shrink scrolledwindow in the ftp manager
by Fomin Denis 25 Aug '11

25 Aug '11

changeset a8c164d16b30 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8c164d16b30 description: do not shrink scrolledwindow in the ftp manager diffstat: plugins/ftp_manager/config_dialog.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3aa9ee04f201 -r a8c164d16b30 plugins/ftp_manager/config_dialog.ui --- a/plugins/ftp_manager/config_dialog.ui Thu Aug 25 13:02:50 2011 +0300 +++ b/plugins/ftp_manager/config_dialog.ui Thu Aug 25 20:53:54 2011 +0300 @@ -31,7 +31,7 @@ </object> <packing> <property name="resize">False</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> <child>

1 0

gajim: merge
by Fomin Denis 25 Aug '11

25 Aug '11

changeset 3aa9ee04f201 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3aa9ee04f201 description: merge diffstat: data/gui/plugins_window.ui | 398 ++++++---------------------------- plugins/ftp_manager/config_dialog.ui | 2 +- 2 files changed, 77 insertions(+), 323 deletions(-) diffs (truncated from 491 to 300 lines): diff -r b20793bde31b -r 3aa9ee04f201 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Thu Aug 25 00:03:03 2011 +0200 +++ b/data/gui/plugins_window.ui Thu Aug 25 13:02:50 2011 +0300 @@ -25,24 +25,82 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">250</property> - <property name="position_set">True</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">6</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="xalign">0</property> <child> - <object class="GtkTreeView" id="installed_plugins_treeview"> + <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">6</property> + <property name="hscrollbar_policy">never</property> + <child> + <object class="GtkTreeView" id="installed_plugins_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAspectFrame" id="aspectframe1"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <property name="xalign">0</property> + <child> + <object class="GtkButton" id="install_plugin_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_install_plugin_button_clicked"/> + <child> + <object class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="configure_plugin_button_label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Install from zip</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> </object> </child> </object> <packing> <property name="resize">False</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -166,7 +224,6 @@ <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkHBox" id="hbox5"> <property name="visible">True</property> @@ -181,15 +238,7 @@ </packing> </child> <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> @@ -220,58 +269,21 @@ </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox2"> + <object class="GtkHButtonBox" id="hbuttonbox3"> <property name="visible">True</property> <property name="spacing">5</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="install_plugin_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_install_plugin_button_clicked"/> - <child> - <object class="GtkHBox" id="hbox13"> - <property name="visible">True</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="install_plugin_button_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Install</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkButton" id="uninstall_plugin_button"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked"/> <child> - <object class="GtkHBox" id="hbox11"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> <child> - <object class="GtkImage" id="image1"> + <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="stock">gtk-cancel</property> </object> @@ -280,7 +292,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="uninstall_plugin_button_label"> + <object class="GtkLabel" id="uninstall_plugin_button_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Uninstall</property> @@ -305,10 +317,10 @@ <property name="receives_default">True</property> <signal name="clicked" handler="on_configure_plugin_button_clicked"/> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> <child> - <object class="GtkImage" id="image2"> + <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="stock">gtk-preferences</property> </object> @@ -317,7 +329,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="configure_plugin_button_label"> + <object class="GtkLabel" id="configure_plugin_button_label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Configure</property> @@ -359,264 +371,6 @@ </packing> </child> <child> - <object class="GtkHPaned" id="hpaned2"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox4"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="plugin_name_label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox7"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">Version:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="plugin_version_label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"><empty></property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </object>

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011