Commits October 2011

commits@gajim.org

3 participants
64 discussions

gajim: stop using shelve, it cannot work when upgrading python v...
by Yann Leboulanger 10 Oct '11

10 Oct '11

changeset 5fd419ea860d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5fd419ea860d description: stop using shelve, it cannot work when upgrading python version. Fixes #6988 diffstat: src/plugins/plugin.py | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 7 deletions(-) diffs (88 lines): diff -r 28c32181add1 -r 5fd419ea860d src/plugins/plugin.py --- a/src/plugins/plugin.py Sun Oct 09 13:51:43 2011 +0200 +++ b/src/plugins/plugin.py Mon Oct 10 16:43:22 2011 +0200 @@ -32,6 +32,9 @@ from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog +import logging +log = logging.getLogger('gajim.p.plugin') + class GajimPlugin(object): ''' @@ -191,17 +194,15 @@ def deactivate(self): pass -import shelve -import UserDict +import cPickle -class GajimPluginConfig(UserDict.DictMixin): +class GajimPluginConfig(): @log_calls('GajimPluginConfig') def __init__(self, plugin): self.plugin = plugin self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, self.plugin.short_name).decode('utf-8').encode( locale.getpreferredencoding()) - #log.debug('FILE_PATH = %s'%(self.FILE_PATH)) self.data = None @log_calls('GajimPluginConfig') @@ -222,17 +223,51 @@ del self.data[key] self.save() + @log_calls('GajimPluginConfig') + def __contains__(self, key): + return key in self.data + + def __iter__(self): + for k in self.data.keys(): + yield k + def keys(self): return self.data.keys() @log_calls('GajimPluginConfig') def save(self): - self.data.sync() - #log.debug(str(self.data)) + fd = open(self.FILE_PATH, 'wb') + cPickle.dump(self.data, fd) + fd.close() @log_calls('GajimPluginConfig') def load(self): - self.data = shelve.open(self.FILE_PATH) + if os.path.isfile('qwe'): + fd = open(self.FILE_PATH, 'rb') + try: + self.data = cPickle.load(fd) + fd.close() + except EOFError: + fd.close() + try: + import shelve + s = shelve.open(self.FILE_PATH) + for (k, v) in s.iteritems(): + self.data[k] = v + s.close() + self.save() + except: + log.warn('%s plugin config file not readable. Saving it as ' + '%s and creating a new one' % (self.plugin.short_name, + self.FILE_PATH + '.bak')) + if os.path.exists(self.FILE_PATH + '.bak'): + os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') + self.data = {} + self.save() + else: + self.data = {} + self.save() + class GajimPluginException(Exception): pass

1 0

gajim-website: [Manu and I] updated french translation
by Yann Leboulanger 09 Oct '11

09 Oct '11

changeset 4a930c10c456 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=4a930c10c456 description: [Manu and I] updated french translation diffstat: index.php | 2 +- locale/bg_BG/LC_MESSAGES/msg.po | 4 +- locale/de_DE/LC_MESSAGES/msg.po | 4 +- locale/eo/LC_MESSAGES/msg.po | 4 +- locale/es_ES/LC_MESSAGES/msg.po | 4 +- locale/fr_FR/LC_MESSAGES/msg.po | 56 +++++++++++++++++++--------------------- locale/hu_HU/LC_MESSAGES/msg.po | 4 +- locale/it_IT/LC_MESSAGES/msg.po | 4 +- locale/pl_PL/LC_MESSAGES/msg.po | 4 +- locale/pt_BR/LC_MESSAGES/msg.po | 4 +- locale/ru_RU/LC_MESSAGES/msg.po | 4 +- msg.pot | 4 +- 12 files changed, 48 insertions(+), 50 deletions(-) diffs (truncated from 380 to 300 lines): diff -r 72ce4277f8ad -r 4a930c10c456 index.php --- a/index.php Sun Oct 09 14:19:23 2011 +0200 +++ b/index.php Sun Oct 09 18:08:48 2011 +0200 @@ -99,7 +99,7 @@ 0 => _("Fix End to End encryption."), 1 => _("Fix auto-opening chat window when a contact connects."), 2 => _("Fix registering a new account."), - 3 => _("Fix In Bad Bytestream."), + 3 => _("Fix In Band Bytestream."), 4 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/d687f2253f17/ChangeLog\">"._("Full ChangeLog")."</a> ", ); diff -r 72ce4277f8ad -r 4a930c10c456 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\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" @@ -857,7 +857,7 @@ msgstr "" #: index.php:102 -msgid "Fix In Bad Bytestream." +msgid "Fix In Band Bytestream." msgstr "" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 diff -r 72ce4277f8ad -r 4a930c10c456 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -887,7 +887,7 @@ msgstr "" #: index.php:102 -msgid "Fix In Bad Bytestream." +msgid "Fix In Band Bytestream." msgstr "" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 diff -r 72ce4277f8ad -r 4a930c10c456 locale/eo/LC_MESSAGES/msg.po --- a/locale/eo/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/eo/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -843,7 +843,7 @@ msgstr "" #: index.php:102 -msgid "Fix In Bad Bytestream." +msgid "Fix In Band Bytestream." msgstr "" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 diff -r 72ce4277f8ad -r 4a930c10c456 locale/es_ES/LC_MESSAGES/msg.po --- a/locale/es_ES/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/es_ES/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\n" "PO-Revision-Date: 2005-06-01 19:05+0300\n" "Last-Translator: <membriskhan(a)gmail.com>\n" "Language-Team: Spanish <es(a)li.org>\n" @@ -860,7 +860,7 @@ msgstr "" #: index.php:102 -msgid "Fix In Bad Bytestream." +msgid "Fix In Band Bytestream." msgstr "" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 diff -r 72ce4277f8ad -r 4a930c10c456 locale/fr_FR/LC_MESSAGES/msg.po --- a/locale/fr_FR/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/fr_FR/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" -"PO-Revision-Date: 2005-08-18 13:21+0100\n" -"Last-Translator: Yann Le Boulanger <asterix(a)lagaule.org>\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\n" +"PO-Revision-Date: 2011-10-09 14:48+0100\n" +"Last-Translator: manu <manuk7(a)laposte.net>\n" "Language-Team: none\n" "Language: \n" "MIME-Version: 1.0\n" @@ -366,9 +366,9 @@ msgstr " Si vous utilisez Debian instable, faites" #: downloads.php:23 -#, fuzzy, c-format +#, c-format msgid " The Debian package of %s is " -msgstr " La version tarball de la %s est " +msgstr " Le paquet Debian de %s est " #: downloads.php:25 msgid "" @@ -490,9 +490,9 @@ msgstr " Voici un " #: downloads.php:152 -#, fuzzy, c-format +#, c-format msgid "for %s version " -msgstr "pour les autres versions, " +msgstr "pour la version %s" #: downloads.php:159 msgid " Source\n" @@ -646,7 +646,6 @@ msgstr "Bonjour et bienvenue sur le site du projet Gajim" #: index.php:14 -#, fuzzy msgid "" "The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP " "client. Gajim works nicely with GNOME, but does not require it to run. It is " @@ -756,9 +755,9 @@ msgstr "NEWS" #: index.php:52 -#, fuzzy, c-format +#, c-format msgid "Beta2-release of Gajim %s" -msgstr "Version béta de Gajim %s" +msgstr "Version béta2 de Gajim %s" #: index.php:53 #, c-format @@ -776,19 +775,16 @@ msgstr "La version %s de Gajim est sortie !" #: index.php:65 -#, fuzzy msgid "08 October 2011" -msgstr "26 Octobre 2010" +msgstr "8 Octobre 2011" #: index.php:66 -#, fuzzy msgid "17 September 2011" -msgstr "2 Septembre 2010" +msgstr "17 Septembre 2011" #: index.php:67 -#, fuzzy msgid "27 August 2011" -msgstr "7 août 2009" +msgstr "27 août 2011" #: index.php:68 msgid "22 July 2011" @@ -833,19 +829,21 @@ #: index.php:99 msgid "Fix End to End encryption." -msgstr "" +msgstr "Résolution du problème de chiffrage de bout en bout." #: index.php:100 msgid "Fix auto-opening chat window when a contact connects." msgstr "" +"Résolution du problème d'ouverture intempestive d'une fenêtre de discussion " +"lorsqu'un contact se connecte." #: index.php:101 msgid "Fix registering a new account." -msgstr "" +msgstr "Résolution du problème de création d'un nouveau compte." #: index.php:102 -msgid "Fix In Bad Bytestream." -msgstr "" +msgid "Fix In Band Bytestream." +msgstr "Corrige le transfer de fichier \"In-Band\"" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 #: index.php:140 index.php:145 index.php:156 @@ -858,39 +856,39 @@ #: index.php:107 msgid "Plugins are now translatable" -msgstr "" +msgstr "Les plugins sont traductibles" #: index.php:108 msgid "Workarround a D-Bus issue with non-character unicode" -msgstr "" +msgstr "Contourne un problème de D-Bus avec les non-caractères unicodes" #: index.php:109 msgid "Fix windows usage when GTK library is already in PATH" -msgstr "" +msgstr "Corrige la version windows lorsque la librairie GTK est déjà dans le chemin par défaut" #: index.php:114 msgid "Plugin system" -msgstr "" +msgstr "Système de plugin" #: index.php:115 msgid "Whiteboard (via a plugin)" -msgstr "" +msgstr "Tableau blanc (avec un plugin)" #: index.php:116 msgid "Message archiving" -msgstr "" +msgstr "Archivage des messages" #: index.php:117 msgid "Stream managment" -msgstr "" +msgstr "Gestion de flux" #: index.php:118 msgid "Nested roster group" -msgstr "" +msgstr "Sous-groupes" #: index.php:119 msgid "Roster filtrering" -msgstr "" +msgstr "Filtrage de la liste de contact" #: index.php:121 index.php:127 index.php:134 index.php:141 index.php:146 #: index.php:157 diff -r 72ce4277f8ad -r 4a930c10c456 locale/hu_HU/LC_MESSAGES/msg.po --- a/locale/hu_HU/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/hu_HU/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\n" "PO-Revision-Date: 2010-11-25 02:26+0200\n" "Last-Translator: Gabriel Papp <gabriel.papp(a)gmx.com>\n" "Language-Team: -\n" @@ -846,7 +846,7 @@ msgstr "" #: index.php:102 -msgid "Fix In Bad Bytestream." +msgid "Fix In Band Bytestream." msgstr "" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 diff -r 72ce4277f8ad -r 4a930c10c456 locale/it_IT/LC_MESSAGES/msg.po --- a/locale/it_IT/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/it_IT/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-09 14:19+0200\n" +"POT-Creation-Date: 2011-10-09 18:05+0200\n" "PO-Revision-Date: 2007-09-23 00:39+0100\n" "Last-Translator: neoex <neoex.dc(a)gmail.com>\n" "Language-Team: Italian\n" @@ -855,7 +855,7 @@ msgstr "" #: index.php:102 -msgid "Fix In Bad Bytestream." +msgid "Fix In Band Bytestream." msgstr "" #: index.php:103 index.php:110 index.php:120 index.php:126 index.php:133 diff -r 72ce4277f8ad -r 4a930c10c456 locale/pl_PL/LC_MESSAGES/msg.po --- a/locale/pl_PL/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 +++ b/locale/pl_PL/LC_MESSAGES/msg.po Sun Oct 09 18:08:48 2011 +0200 @@ -7,7 +7,7 @@

1 0

gajim-website: update website po files
by Yann Leboulanger 09 Oct '11

09 Oct '11

changeset 72ce4277f8ad in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=72ce4277f8ad description: update website po files diffstat: locale/bg_BG/LC_MESSAGES/msg.po | 358 +++++++++++++++++++++++--------------- locale/de_DE/LC_MESSAGES/msg.po | 364 +++++++++++++++++++++++--------------- locale/eo/LC_MESSAGES/msg.po | 365 +++++++++++++++++++++++--------------- locale/es_ES/LC_MESSAGES/msg.po | 346 ++++++++++++++++++++++--------------- locale/fr_FR/LC_MESSAGES/msg.po | 366 ++++++++++++++++++++++++--------------- locale/hu_HU/LC_MESSAGES/msg.po | 344 ++++++++++++++++++++++++------------ locale/it_IT/LC_MESSAGES/msg.po | 363 +++++++++++++++++++++++--------------- locale/pl_PL/LC_MESSAGES/msg.po | 366 ++++++++++++++++++++++++--------------- locale/pt_BR/LC_MESSAGES/msg.po | 364 +++++++++++++++++++++++--------------- locale/ru_RU/LC_MESSAGES/msg.po | 368 ++++++++++++++++++++++++--------------- msg.pot | 318 ++++++++++++++++++++++------------ 11 files changed, 2401 insertions(+), 1521 deletions(-) diffs (truncated from 7680 to 300 lines): diff -r c18b44b02bdc -r 72ce4277f8ad locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Sat Oct 08 22:35:02 2011 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sun Oct 09 14:19:23 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-22 13:17+0200\n" +"POT-Creation-Date: 2011-10-09 14:19+0200\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" @@ -175,8 +175,9 @@ msgid " List archives are available " msgstr " Архивите на списъка са достъпни " -#: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:160 -#: downloads.php:172 downloads.php:210 downloads.php:230 +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:24 downloads.php:38 +#: downloads.php:162 downloads.php:164 downloads.php:174 downloads.php:212 +#: downloads.php:232 msgid "here" msgstr "тук" @@ -283,7 +284,7 @@ msgid " To get one of these versions, go to the %s page.\n" msgstr " За да изтеглите някоя от тези версии, отидете на страницата" -#: docs.php:22 downloads.php:175 +#: docs.php:22 downloads.php:177 msgid " Under GNU/Linux\n" msgstr " Под GNU/Линукс\n" @@ -340,6 +341,11 @@ msgid " Latest version of Gajim is" msgstr " Последната версия на Gajim е" +#: downloads.php:11 +#, fuzzy, c-format +msgid " A %s version is in test" +msgstr " Последната версия на Gajim е" + #: downloads.php:13 msgid "If your distribution doesn't have the latest version " msgstr "Ако дистрибуцията ви не разпространява последната версия, " @@ -361,6 +367,11 @@ msgstr " Ако използвате Дебиан „unstable“, напишете" #: downloads.php:23 +#, fuzzy, c-format +msgid " The Debian package of %s is " +msgstr " Архивиран изходен код на версията на Gajim има " + +#: downloads.php:25 #, fuzzy msgid "" " A daily package from mercurial is also built. To use it, remove gajim" @@ -368,132 +379,147 @@ " Всеки ден се компилира пакет от хранилището на svn. За да го " "използвате, премахнете gajim" -#: downloads.php:23 +#: downloads.php:25 msgid "add this line to your" msgstr "и добавете този ред към" -#: downloads.php:27 +#: downloads.php:29 msgid "and install it by doing" msgstr "Инсталирайте го чрез" -#: downloads.php:28 +#: downloads.php:30 msgid "" "You can get the GPG key of this package by installing gajim-dev-keyring " "package from the same repository. Just do" msgstr "" -#: downloads.php:36 +#: downloads.php:38 #, fuzzy msgid " You can get the Slackware package of Gajim" msgstr " Ще намерите стари версии на Gajim" -#: downloads.php:44 +#: downloads.php:46 msgid " If you use Ubuntu universe repository do" msgstr " Ако използвате хранилището „universe“ на Убунту, изпълнете" -#: downloads.php:46 +#: downloads.php:48 #, fuzzy msgid " If you want newer version of Gajim, you can also use" msgstr " Последната версия на Gajim е" -#: downloads.php:46 +#: downloads.php:48 msgid "this PPA" msgstr "" -#: downloads.php:54 downloads.php:61 downloads.php:68 downloads.php:91 -#: downloads.php:99 downloads.php:107 downloads.php:115 +#: downloads.php:56 downloads.php:63 downloads.php:70 downloads.php:93 +#: downloads.php:101 downloads.php:109 downloads.php:117 msgid " Just" msgstr " Само" -#: downloads.php:58 +#: downloads.php:60 msgid " Gentoo\n" msgstr " Дженту\n" -#: downloads.php:65 +#: downloads.php:67 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:72 +#: downloads.php:74 msgid " SUSE\n" msgstr " SuSE\n" -#: downloads.php:75 +#: downloads.php:77 msgid " One click install for openSuSE" msgstr "" -#: downloads.php:77 +#: downloads.php:79 msgid " For other versions, " msgstr "" -#: downloads.php:77 +#: downloads.php:79 msgid "get it here" msgstr "" -#: downloads.php:81 +#: downloads.php:83 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:84 +#: downloads.php:86 #, fuzzy msgid " Just " msgstr " Само" -#: downloads.php:88 +#: downloads.php:90 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:120 +#: downloads.php:122 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:123 +#: downloads.php:125 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" " Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " -#: downloads.php:125 +#: downloads.php:127 msgid "Find out more" msgstr "Научете повече" -#: downloads.php:129 +#: downloads.php:131 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:132 +#: downloads.php:134 msgid "Soon available here." msgstr "Скоро достъпен тук." -#: downloads.php:142 +#: downloads.php:144 msgid " Windows installer\n" msgstr " Инсталатор за „Уиндоус“\n" -#: downloads.php:146 +#: downloads.php:148 #, fuzzy msgid " There is a " msgstr " Ето някои" -#: downloads.php:146 +#: downloads.php:148 downloads.php:151 #, fuzzy msgid "Gajim installer" msgstr "Инсталатор за „Уиндоус“" -#: downloads.php:157 +#: downloads.php:151 +#, fuzzy +msgid " Here is a" +msgstr " Ето някои" + +#: downloads.php:152 +#, c-format +msgid "for %s version " +msgstr "" + +#: downloads.php:159 msgid " Source\n" msgstr " Изходен код\n" -#: downloads.php:160 +#: downloads.php:162 msgid " The tarball version of Gajim is " msgstr " Архивиран изходен код на версията на Gajim има " -#: downloads.php:160 +#: downloads.php:162 msgid "For information on how to build Gajim," msgstr "За информация как да компилирате Gajim," -#: downloads.php:160 +#: downloads.php:162 msgid "in English" msgstr "на английски език" #: downloads.php:163 +#, fuzzy, c-format +msgid " The tarball version of %s is " +msgstr " Архивиран изходен код на версията на Gajim има " + +#: downloads.php:165 #, fuzzy msgid "" "If you want to use the last unstable development version, then you should " @@ -502,27 +528,27 @@ "Ако искате да ползвате последната нестабилна версия, все още в процес на " "разработка, то изтеглете работно копие на хранилището на subversion.\n" -#: downloads.php:169 +#: downloads.php:171 #, fuzzy msgid " Mercurial\n" msgstr " Структура\n" -#: downloads.php:172 +#: downloads.php:174 #, fuzzy msgid " The mercurial repository is available at this address: " msgstr " Сървърът на subversion е достъпен на този адрес: " -#: downloads.php:172 +#: downloads.php:174 msgid "and viewable" msgstr "и може да се разглежда" -#: downloads.php:177 +#: downloads.php:179 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" " За да изтеглите изходния код на Gajim, трябва да изпълните следните " "стъпки:\n" -#: downloads.php:178 +#: downloads.php:180 #, fuzzy msgid "" " You first have to install mercurial (apt-get install mercurial " @@ -531,31 +557,31 @@ " Да инсталирате subversion (apt-get install subversion под " "Дебиан)\n" -#: downloads.php:180 +#: downloads.php:182 msgid " Then in a console, enter the following commands:\n" msgstr " След това, в конзола въведете следните команди:\n" -#: downloads.php:188 +#: downloads.php:190 msgid " Install dependencies, and build Gajim. Please see the" msgstr " Инсталирайте зависимостите и компилирайте Gajim. Вижте" -#: downloads.php:188 +#: downloads.php:190 msgid "English" msgstr "на английски език" -#: downloads.php:188 +#: downloads.php:190 msgid "for details.\n" msgstr "за подробности.\n" -#: downloads.php:191 +#: downloads.php:193 msgid " You can run Gajim by typing the following:\n" msgstr " Може да стартирате Gajim, като напишете:\n" -#: downloads.php:195 +#: downloads.php:197 msgid "and then"

1 0

gajim: Fix hotkeys. Fixes #7012
by Yann Leboulanger 09 Oct '11

09 Oct '11

changeset 28c32181add1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=28c32181add1 description: Fix hotkeys. Fixes #7012 diffstat: data/gui/contact_context_menu.ui | 2 +- data/gui/roster_window.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 4abb1631ce13 -r 28c32181add1 data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Sun Oct 09 00:10:22 2011 +0300 +++ b/data/gui/contact_context_menu.ui Sun Oct 09 13:51:43 2011 +0200 @@ -98,7 +98,7 @@ </child> <child> <object class="GtkImageMenuItem" id="manage_contact"> - <property name="label" translatable="yes">_Manage Contact</property> + <property name="label" translatable="yes">M_anage Contact</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> diff -r 4abb1631ce13 -r 28c32181add1 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Sun Oct 09 00:10:22 2011 +0300 +++ b/data/gui/roster_window.ui Sun Oct 09 13:51:43 2011 +0200 @@ -202,7 +202,7 @@ <child> <object class="GtkCheckMenuItem" id="show_transports_menuitem"> <property name="visible">True</property> - <property name="label" translatable="yes">Show Trans_ports</property> + <property name="label" translatable="yes">Show T_rans_ports</property> <property name="use_underline">True</property> <signal name="activate" handler="on_show_transports_menuitem_activate"/> </object>

1 0

gajim: add 'command_system.implementation.execute'(execute plugi...
by Fomin Denis 08 Oct '11

08 Oct '11

changeset 4abb1631ce13 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4abb1631ce13 description: add 'command_system.implementation.execute'(execute plugin) to demandimport.ignore diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r d6f5cd306b63 -r 4abb1631ce13 src/gajim.py --- a/src/gajim.py Sat Oct 08 22:48:00 2011 +0200 +++ b/src/gajim.py Sun Oct 09 00:10:22 2011 +0300 @@ -66,7 +66,8 @@ demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', - 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', + 'command_system.implementation.standard', + 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] if os.name == 'nt':

1 0

gajim: enable execute plugin
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset d6f5cd306b63 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d6f5cd306b63 description: enable execute plugin diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ae10e1fb5546 -r d6f5cd306b63 src/chat_control.py --- a/src/chat_control.py Sat Oct 08 22:54:05 2011 +0300 +++ b/src/chat_control.py Sat Oct 08 22:48:00 2011 +0200 @@ -64,6 +64,7 @@ # Here we load the module with the standard commands, so they are being detected # and dispatched. import command_system.implementation.standard +import command_system.implementation.execute try: import gtkspell

1 0

gajim-website: announce beta2
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset c18b44b02bdc in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=c18b44b02bdc description: announce beta2 diffstat: downloads.php | 14 +++++----- index.php | 78 ++++++++++++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 40 deletions(-) diffs (183 lines): diff -r 849679809f96 -r c18b44b02bdc downloads.php --- a/downloads.php Sat Sep 17 22:08:01 2011 +0200 +++ b/downloads.php Sat Oct 08 22:35:02 2011 +0200 @@ -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-beta1"); +printf(_(" A %s version is in test"), "0.15-beta2"); 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-alpha1"); -print "<a href=\"downloads/0.15/gajim_0.15~alpha1-1_all.deb\">"._("here")."</a>. \n"; +printf(_(" The Debian package of %s is "), "0.15-beta2"); +print "<a href=\"downloads/0.15/gajim_0.15~beta2-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-beta1-1.exe\">"._("Gajim installer")."</a> "; -printf(_("for %s version "), "0.15-beta1"); +print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta2-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.15-beta2"); 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-alpha1"); -print "<a href=\"downloads/0.15/gajim-0.15-alpha1.tar.gz\">"._("here")."</a>. \n"; +printf(_(" The tarball version of %s is "), "0.15-beta2"); +print "<a href=\"downloads/0.15/gajim-0.15-beta2.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 849679809f96 -r c18b44b02bdc index.php --- a/index.php Sat Sep 17 22:08:01 2011 +0200 +++ b/index.php Sat Oct 08 22:35:02 2011 +0200 @@ -49,56 +49,68 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Beta-release of Gajim %s"), "0.15"), - 1 => sprintf(_("Alpha-release of Gajim %s"), "0.15"), - 2 => sprintf(_("Gajim %s is here!"), "0.14.4"), - 3 => sprintf(_("Gajim %s is here!"), "0.14.3"), - 4 => sprintf(_("Gajim %s is here!"), "0.14.2"), - 5 => sprintf(_("Gajim %s is here!"), "0.14.1"), - 6 => sprintf(_("Gajim %s is here!"), "0.14")); + 0 => sprintf(_("Beta2-release of Gajim %s"), "0.15"), + 1 => sprintf(_("Beta-release of Gajim %s"), "0.15"), + 2 => sprintf(_("Alpha-release of Gajim %s"), "0.15"), + 3 => sprintf(_("Gajim %s is here!"), "0.14.4"), + 4 => sprintf(_("Gajim %s is here!"), "0.14.3"), + 5 => sprintf(_("Gajim %s is here!"), "0.14.2"), + 6 => sprintf(_("Gajim %s is here!"), "0.14.1"), + 7 => 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 => _("17 September 2011"), - 1 => _("27 August 2011"), - 2 => _("22 July 2011"), - 3 => _("19 June 2011"), - 4 => _("07 June 2011"), - 5 => _("26 October 2010"), - 6 => _("02 September 2010")); + 0 => _("08 October 2011"), + 1 => _("17 September 2011"), + 2 => _("27 August 2011"), + 3 => _("22 July 2011"), + 4 => _("19 June 2011"), + 5 => _("07 June 2011"), + 6 => _("26 October 2010"), + 7 => _("02 September 2010")); $array_news_desc = array( 0 => sprintf(_("Version %s will arrive very soon."), "0.15"), - 1 => sprintf(_("Version %s will arrive soon."), "0.15"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), - 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), - 6 => sprintf(_("Version %s of Gajim has been released."), "0.14")); + 1 => sprintf(_("Version %s will arrive very soon."), "0.15"), + 2 => sprintf(_("Version %s will arrive soon."), "0.15"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), + 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), + 6 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), + 7 => 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-alpha1"), - 1 => sprintf(_("What's new since %s:"), "0.14.4"), - 2 => sprintf(_("What's new since %s:"), "0.14.3"), - 3 => sprintf(_("What's new since %s:"), "0.14.2"), - 4 => sprintf(_("What's new since %s:"), "0.14.1"), - 5 => sprintf(_("What's new since %s:"), "0.14"), - 6 => sprintf(_("What's new since %s:"), "0.13.4")); + 0 => sprintf(_("What's new since %s:"), "0.15-beta1"), + 1 => sprintf(_("What's new since %s:"), "0.15-alpha1"), + 2 => sprintf(_("What's new since %s:"), "0.14.4"), + 3 => sprintf(_("What's new since %s:"), "0.14.3"), + 4 => sprintf(_("What's new since %s:"), "0.14.2"), + 5 => sprintf(_("What's new since %s:"), "0.14.1"), + 6 => sprintf(_("What's new since %s:"), "0.14"), + 7 => sprintf(_("What's new since %s:"), "0.13.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Fix End to End encryption."), + 1 => _("Fix auto-opening chat window when a contact connects."), + 2 => _("Fix registering a new account."), + 3 => _("Fix In Bad Bytestream."), + 4 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/d687f2253f17/ChangeLog\">"._("Full ChangeLog")."</a> ", + ); + +$array_news_items[1] = 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[1] = array( +$array_news_items[2] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), @@ -109,32 +121,32 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = 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[3] = array( +$array_news_items[4] = 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[4] = array( +$array_news_items[5] = 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[5] = array( +$array_news_items[6] = 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[6] = array( +$array_news_items[7] = array( 0 => _("Jingle audio / video chat"), 1 => _("Improve startup time"), 2 => _("Groupchat auto-rejoin"),

1 0

gajim: Added tag gajim-0.15-beta2 for changeset e745457fee76
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset d687f2253f17 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d687f2253f17 description: Added tag gajim-0.15-beta2 for changeset e745457fee76 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r e745457fee76 -r d687f2253f17 .hgtags --- a/.hgtags Fri Oct 07 22:22:25 2011 +0300 +++ b/.hgtags Sat Oct 08 22:28:42 2011 +0200 @@ -6,3 +6,4 @@ 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1 +e745457fee76cb5212787e8595a7060689cb9f60 gajim-0.15-beta2

1 0

gajim: Fix gtk.label + wrapping in the dataform widget.(problem ...
by Fomin Denis 08 Oct '11

08 Oct '11

changeset e745457fee76 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e745457fee76 description: Fix gtk.label + wrapping in the dataform widget.(problem - http://img36.imageshack.us/img36/2782/tmpbhyeyn.png) diffstat: src/gtkgui_helpers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 0134934a46bf -r e745457fee76 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Oct 07 17:57:24 2011 +0200 +++ b/src/gtkgui_helpers.py Fri Oct 07 22:22:25 2011 +0300 @@ -1081,6 +1081,7 @@ return # set wrap width to the pango.Layout of the labels ### + widget.set_alignment(0.0, 0.0) layout.set_width (allocation.width * pango.SCALE) lh = layout.get_size()[1]

1 0

gajim: [Zash] support latest version of XEP-0258. Fixes #7010
by Yann Leboulanger 08 Oct '11

08 Oct '11

changeset 0134934a46bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0134934a46bf description: [Zash] support latest version of XEP-0258. Fixes #7010 diffstat: src/common/connection.py | 3 ++- src/common/connection_handlers.py | 10 +++------- src/common/xmpp/protocol.py | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diffs (48 lines): diff -r 824b54a64fea -r 0134934a46bf src/common/connection.py --- a/src/common/connection.py Fri Oct 07 17:51:57 2011 +0200 +++ b/src/common/connection.py Fri Oct 07 17:57:24 2011 +0200 @@ -2065,7 +2065,8 @@ if not gajim.account_is_connected(self.name): return self.seclabel_catalogue_request(to, callback) - iq = common.xmpp.Iq(typ='get') + server = gajim.get_jid_from_account(self.name).split("@")[1] # Really, no better way? + iq = common.xmpp.Iq(typ='get', to=server) iq2 = iq.addChild(name='catalog', namespace=common.xmpp.NS_SECLABEL_CATALOG) iq2.setAttr('to', to) self.connection.send(iq) diff -r 824b54a64fea -r 0134934a46bf src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Oct 07 17:51:57 2011 +0200 +++ b/src/common/connection_handlers.py Fri Oct 07 17:57:24 2011 +0200 @@ -1414,16 +1414,12 @@ log.debug('SecLabelCB') query = iq_obj.getTag('catalog') to = query.getAttr('to') - items = query.getTags('securitylabel') + items = query.getTags('item') labels = {} ll = [] for item in items: - display_tag = item.getTag('displaymarking') - if display_tag: - label = display_tag.getData() - else: - label = '' - labels[label] = item + label = item.getAttr('selector') + labels[label] = item.getTag('securitylabel') ll.append(label) if to not in self.seclabel_catalogues: self.seclabel_catalogues[to] = [[], None, None] diff -r 824b54a64fea -r 0134934a46bf src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Fri Oct 07 17:51:57 2011 +0200 +++ b/src/common/xmpp/protocol.py Fri Oct 07 17:57:24 2011 +0200 @@ -119,7 +119,7 @@ NS_RSM = 'http://jabber.org/protocol/rsm' NS_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl' NS_SECLABEL = 'urn:xmpp:sec-label:0' -NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:0' +NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:2' NS_SEARCH = 'jabber:iq:search' NS_SERVER = 'jabber:server' NS_SESSION = 'urn:ietf:params:xml:ns:xmpp-session'

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2011