Commits

commits@gajim.org

17632 discussions

gajim-website: [pvtlth] new download page
by Gajim Website 26 Aug '13

26 Aug '13

changeset 1d37ff56b121 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=1d37ff56b121 description: [pvtlth] new download page diffstat: css/main.css | 39 ++- downloads.php | 355 +++++++++++++++++++++++++-------------- imgs/agilialinux.png | Bin imgs/archlinux.png | Bin imgs/debian.png | Bin imgs/fedora.png | Bin imgs/freebsd.png | Bin imgs/gentoo.png | Bin imgs/mandriva.png | Bin imgs/opensuse.png | Bin imgs/pld.png | Bin imgs/slackware.png | Bin imgs/source.png | Bin imgs/sourcemage.png | Bin imgs/ubuntu.png | Bin imgs/windows.png | Bin imgs/zenwalk.png | Bin locale/bg_BG/LC_MESSAGES/msg.po | 285 ++++++++++++++++--------------- locale/de_DE/LC_MESSAGES/msg.po | 284 ++++++++++++++++--------------- locale/eo/LC_MESSAGES/msg.po | 284 ++++++++++++++++--------------- locale/es_ES/LC_MESSAGES/msg.po | 260 +++++++++++++--------------- locale/fr_FR/LC_MESSAGES/msg.po | 284 ++++++++++++++++--------------- locale/he_IL/LC_MESSAGES/msg.po | 266 ++++++++++++++++------------- locale/hu_HU/LC_MESSAGES/msg.po | 285 +++++++++++++++++-------------- locale/it_IT/LC_MESSAGES/msg.po | 283 ++++++++++++++++--------------- locale/pl_PL/LC_MESSAGES/msg.po | 288 ++++++++++++++++--------------- locale/pt_BR/LC_MESSAGES/msg.po | 288 ++++++++++++++++--------------- locale/ru_RU/LC_MESSAGES/msg.po | 287 ++++++++++++++++--------------- msg.pot | 228 ++++++++++++------------- 29 files changed, 1964 insertions(+), 1752 deletions(-) diffs (truncated from 6249 to 300 lines): diff -r 9c69cf4da135 -r 1d37ff56b121 css/main.css --- a/css/main.css Mon Aug 26 07:33:51 2013 +0200 +++ b/css/main.css Mon Aug 26 11:23:49 2013 +0200 @@ -31,14 +31,6 @@ } -/* -#end_menu -{ - background-image: url(../bar.png); - background-repeat:no-repeat; - float:left; - width:144px; -}*/ #translator { position: absolute; top : 20px; @@ -71,9 +63,6 @@ } .menu a:hover { -/* background-color: #84C1D7; - border: none; -*/ color: gray; } .main { @@ -86,10 +75,6 @@ border: 2px dashed #26667E; margin-right:20px; } -/*#main_content -{ - -}*/ .submenu ul { clear: both; @@ -150,3 +135,27 @@ .translation-status td.trans-img img { vertical-align:middle; } + +table.os { + margin:25px auto; +} + +td.os-logo { + min-width:100px; + max-width:100px; + text-align:center; + vertical-align:bottom; +} + +img.os-logo { + max-width:75px; + max-height:75px; + margin:0px auto; +} + +div#os-details div { + border:1px solid #bbbbbb; + border-radius:5px; + margin:10px; + padding:5px; +} diff -r 9c69cf4da135 -r 1d37ff56b121 downloads.php --- a/downloads.php Mon Aug 26 07:33:51 2013 +0200 +++ b/downloads.php Mon Aug 26 11:23:49 2013 +0200 @@ -11,153 +11,211 @@ printf(_(" A %s version is in test"), "<strong>0.16-alpha2</strong>"); print ("<br/>\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"; +print _("you are advised to use the ")."<a href=\"#source\" id=\"top-sourcelink\">"._("source tarball")."</a>\n"; -print ("<a name=\"debian\">\n"); -print (" <h2>\n"); -print (" Debian GNU/Linux\n"); -print (" </h2>\n"); -print ("</a>\n"); + +#OS-Table START +print "<table class='os'>\n<tr>\n"; + +$os_table = array( + 0 => array ( + "agilialinux", # href / image + "AgiliaLinux", # Tooltip + "AgiliaLinux (MOPSLinux)", #text + ), + 1 => array ( + "archlinux", + "Archlinux", + "Archlinux", + ), + 2 => array ( + "debian", + "Debian GNU/Linux", + "Debian GNU/Linux", + ), + 3 => array ( + "fedora", + "Fedora", + "Fedora", + ), + 4 => array ( + "freebsd", + "FreeBSD", + "FreeBSD", + ), + 5 => array ( + "gentoo", + "Gentoo", + "Gentoo", + ), + 6 => array ( + "mandriva", + "Mandriva", + "Mandriva", + ), + 7 => array ( + "opensuse", + "openSUSE", + "openSUSE", + ), + 8 => array ( + "pld", + "PLD", + "PLD", + ), + 9 => array ( + "slackware", + "Slackware", + "Slackware", + ), + 10 => array ( + "sourcemage", + "SourceMage", + "SourceMage", + ), + 11 => array ( + "ubuntu", + "Ubuntu", + "Ubuntu", + ), + 12 => array ( + "windows", + "Windows", + "Windows", + ), + 13 => array ( + "zenwalk", + "ZenWalk", + "ZenWalk", + ), + 14 => array ( + "source", + "Other Linux", + "Other Linux / Source", + ), +); + +foreach ($os_table as $num => $values) { + if ((($num % 8) == 0) and ($num > 0)) { + print "</tr>\n<tr>\n"; + } + print "<td class='os-logo'><a id='ostable" . $num . "' href='#" . $values[0] . "' title='"; + printf(_("Download Gajim for %s"), $values[1]); + print "'><img src='imgs/" . $values[0] . ".png' class='os-logo' /><br/>" . $values[2] . "</a></td>\n"; + +} + +#OS-Table END +print "</tr></table>\n"; + +#Details START + +print "<div id=\"os-details\">\n"; + +#1)AgiliaLinux +print "<div>\n"; +print "<a name=\"agilialinux\"><h2>AgiliaLinux:</h2></a>\n"; +print _("Just")." <i>mpkg-install gajim</i>\n"; +print "</div>\n"; + +#2)Archlinux +print "<div>\n"; +print "<a name=\"archlinux\"><h2>Archlinux:</h2></a>\n"; +print _("Just")." <i>pacman -S gajim</i>\n"; +print "</div>\n"; + +#3)Debian GNU/Linux +print "<div>\n"; +print "<a name=\"debian\"><h2>Debian GNU/Linux:</h2></a>\n"; print _(" If you use Debian unstable do")." <i>apt-get install gajim</i>\n"; print (" <br/>\n"); printf(_(" The Debian package of %s is "), "0.16-alpha2"); print "<a href=\"ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~alpha2…">"._("here")."</a>.<br />\n"; -print _(" A daily package from mercurial is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("add this line to your")." /etc/apt/sources.list:\n"; +print _(" A daily package from mercurial is also built. To use it, remove gajim")." (<i>apt-get remove gajim</i>), "._("add this line to your")." /etc/apt/source.list:\n"; print (" <br/>\n"); print (" <i>deb ftp://ftp.gajim.org/debian unstable main</i>\n"); print (" <br/>\n"); print _("and install it by doing")." <i>apt-get install gajim-nightly</i>.\n"; print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." <i>apt-get install gajim-dev-keyring</i>.\n"; -print (" <br/>\n"); +print "</div>\n"; -print ("<a name=\"slackware\">\n"); -print (" <h2>\n"); -print (" Slackware\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" You can get the Slackware package of Gajim")." <a href=\"http://slackbuilds.org/result/?search=gajim&sv=all\"> "._("here")."</a>."; -print (" <br/>\n"); +#4)Fedora +print "<div>\n"; +print "<a name=\"fedora\"><h2>Fedora:</h2></a>\n"; +print _("Just")." <i>yum install gajim</i>\n"; +print "</div>\n"; -print ("<a name=\"ubuntu\">\n"); -print (" <h2>\n"); -print (" Ubuntu\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" If you use Ubuntu universe repository do")." <i>apt-get install gajim</i>\n"; -print (" <br/>\n"); -print _(" If you want newer version of Gajim, you can also use")." <a href=\"https://launchpad.net/~gajim/+archive/gajim-ppa\">"._("this PPA")."</a>\n"; -print (" <br/>\n"); - -print ("<a name=\"fedora\">\n"); -print (" <h2>\n"); -print (" Fedora\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>yum install gajim</i>\n"; - -print ("<a name=\"gentoo\">\n"); -print (" <h2>\n"); -print _(" Gentoo\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>emerge gajim</i>\n"; - -print ("<a name=\"archlinux\">\n"); -print (" <h2>\n"); -print _(" Archlinux\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>pacman -S gajim</i>\n"; - -print ("<a name=\"suse\">\n"); -print (" <h2>\n"); -print _(" SUSE\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" One click install for openSuSE")." <a href=\"http://software.opensuse.org/ymp/server:messaging/openSUSE_12.2/gajim.ymp\">12.2</a>, <a href=\"http://software.opensuse.org/ymp/server:messaging/openSUSE_12.3/gajim.ymp\">12.3</a><br/>"; -print _(" For other versions, ")."<a href=\"http://software.opensuse.org/package/gajim?search_term=Gajim\">"._("get it here")."</a><br>\n"; - -print ("<a name=\"pld\">\n"); -print (" <h2>\n"); -print _(" PLD\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just ")."<i>poldek -U gajim</i>\n"; - -print ("<a name=\"sourcemage\">\n"); -print (" <h2>\n"); -print _(" SourceMage\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>cast gajim</i>\n"; -print (" <br/>\n"); - -print ("<a name=\"mandriva\">\n"); -print (" <h2>\n"); -print (" Mandriva\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>urpmi gajim</i>\n"; -print (" <br/>\n"); - -print ("<a name=\"zenwalk\">\n"); -print (" <h2>\n"); -print (" Zenwalk\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>netpkg gajim</i>\n"; -print (" <br/>\n"); - -print ("<a name=\"agilialinux\">\n"); -print (" <h2>\n"); -print (" AgiliaLinux (MOPSLinux)\n"); -print (" </h2>\n"); -print ("</a>\n"); -print _(" Just")." <i>mpkg-install gajim</i>\n"; -print (" <br/>\n");

1 0

gajim: Update russian translation
by Gajim 26 Aug '13

26 Aug '13

changeset 2e4d14f22026 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2e4d14f22026 description: Update russian translation diffstat: po/ru.po | 1883 +++++++++++++++++++++++++++++++------------------------------ 1 файлов изменено, 962 вставок(+), 921 удалений(-) различия (урезанные с 4923 до 300 строк): diff -r 413c07ee9f49 -r 2e4d14f22026 po/ru.po --- a/po/ru.po Mon Aug 26 09:32:16 2013 +0400 +++ b/po/ru.po Mon Aug 26 10:01:00 2013 +0400 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 01:12+0400\n" -"PO-Revision-Date: 2013-08-16 13:10+0300\n" +"POT-Creation-Date: 2013-08-26 09:36+0400\n" +"PO-Revision-Date: 2013-08-26 10:00+0300\n" "Last-Translator: Fomin Denis <fominde(a)gmail.com>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -181,13 +181,13 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1248 ../src/config.py:1262 ../src/config.py:1267 -#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1733 -#: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 -#: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 +#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 +#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 +#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 +#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3148 -#: ../src/roster_window.py:3154 ../src/roster_window.py:3159 +#: ../src/dialogs.py:536 ../src/roster_window.py:3149 +#: ../src/roster_window.py:3155 ../src/roster_window.py:3160 msgid "None" msgstr "Нет" @@ -196,19 +196,19 @@ msgstr "Учётные записи" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3509 -#: ../src/dialogs.py:3555 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 +#: ../src/dialogs.py:3570 msgid "Add" msgstr "Добавить" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3513 -#: ../src/dialogs.py:3610 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 +#: ../src/dialogs.py:3625 msgid "Delete" msgstr "Удалить" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5793 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5794 msgid "Re_name" msgstr "П_ереименовать" @@ -365,8 +365,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 -#: ../src/roster_window.py:3090 ../src/roster_window.py:4220 -#: ../src/roster_window.py:5843 +#: ../src/roster_window.py:3091 ../src/roster_window.py:4217 +#: ../src/roster_window.py:5844 msgid "General" msgstr "Общие" @@ -374,7 +374,7 @@ msgid "_use HTTP__PROXY environment variable" msgstr "_использовать переменную HTTP_PROXY" -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:133 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 msgid "_Manage..." msgstr "_Управление..." @@ -419,7 +419,7 @@ msgid "_Port: " msgstr "_Порт:" -#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138 msgid "<b>Miscellaneous</b>" msgstr "<b>Прочее</b>" @@ -427,8 +427,8 @@ msgid "Connection" msgstr "Соединение" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1829 -#: ../src/config.py:2407 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 +#: ../src/config.py:2436 msgid "No key selected" msgstr "Не выбран ключ" @@ -502,7 +502,7 @@ msgstr "Почта:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1856 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 #: ../src/dialogs.py:841 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -590,8 +590,9 @@ msgstr "Проверить еще раз" #: ../data/gui/adhoc_commands_window.ui.h:5 -msgid "Please wait while the command is sending..." -msgstr "Происходит отправка команды. Подождите..." +#, fuzzy +msgid "Please wait while the command is being sent..." +msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n" #: ../data/gui/adhoc_commands_window.ui.h:6 msgid "Please wait..." @@ -760,8 +761,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5812 -#: ../src/roster_window.py:5939 ../src/roster_window.py:6072 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5813 +#: ../src/roster_window.py:5940 ../src/roster_window.py:6073 msgid "_Unblock" msgstr "_Разблокировать" @@ -970,8 +971,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5748 -#: ../src/roster_window.py:5907 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5749 +#: ../src/roster_window.py:5908 msgid "In_vite to" msgstr "_Пригласить в" @@ -987,8 +988,8 @@ msgid "Toggle End to End Encryption" msgstr "Включить End to End шифрование" -#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5758 -#: ../src/roster_window.py:5996 +#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759 +#: ../src/roster_window.py:5997 msgid "Send Cus_tom Status" msgstr "Установи_ть статус" @@ -1025,20 +1026,23 @@ msgstr "_Подписка" #: ../data/gui/contact_context_menu.ui.h:17 -msgid "_Allow him/her to see my status" +#, fuzzy +msgid "_Allow contact to see my status" msgstr "_Позволить ему или ей видеть мой статус" #: ../data/gui/contact_context_menu.ui.h:18 -msgid "A_sk to see his/her status" +#, fuzzy +msgid "A_sk to see contact status" msgstr "_Попросить возможность видеть его или её статус" #: ../data/gui/contact_context_menu.ui.h:19 -msgid "_Forbid him/her to see my status" +#, fuzzy +msgid "_Forbid contact to see my status" msgstr "_Запретить ему или ей видеть мой статус" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5820 -#: ../src/roster_window.py:5945 ../src/roster_window.py:6075 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5821 +#: ../src/roster_window.py:5946 ../src/roster_window.py:6076 msgid "_Block" msgstr "_Блокировать" @@ -1057,7 +1061,7 @@ #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6146 +#: ../src/roster_window.py:6147 msgid "_History" msgstr "_История" @@ -1138,7 +1142,7 @@ msgstr "_Приостановить" #: ../data/gui/filetransfers.ui.h:12 -msgid "Cancels the selected file transfer and removes incomplete file" +msgid "Cancels the selected file transfer and removes incomplete files" msgstr "Отменяет выбранную передачу и удаляет неполные файлы" #: ../data/gui/filetransfers.ui.h:13 @@ -1157,7 +1161,7 @@ msgid "_Continue" msgstr "_Продолжить" -#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3386 +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3350 #: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "_Открыть папку с принятым файлом" @@ -1198,11 +1202,11 @@ msgid "Font style:" msgstr "Начертание:" -#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1088 +#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045 msgid "Bold" msgstr "Полужирный" -#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1089 +#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046 msgid "Italic" msgstr "Курсив" @@ -1268,7 +1272,7 @@ msgid "_Request Voice" msgstr "_Запросить право говорить" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1839 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843 msgid "_Bookmark" msgstr "Добавить эту комнату в _закладки" @@ -1316,7 +1320,7 @@ msgid "_Add to Roster" msgstr "_Добавить в ростер" -#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1760 +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1722 msgid "Show a list of formattings" msgstr "Показать список форматирования" @@ -1415,7 +1419,7 @@ #: ../data/gui/history_window.ui.h:7 #, fuzzy -msgid "searching only in the selected day " +msgid "Searching only in the selected day " msgstr "Использовать только выбранные в диалоге предпросмотра снимки." #: ../data/gui/history_window.ui.h:8 @@ -1493,7 +1497,7 @@ msgid "require" msgstr "Требуемый пакет:" -#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2401 +#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416 msgid "Join Group Chat" msgstr "Войти в комнату" @@ -1521,7 +1525,7 @@ msgid "_Bookmark this room" msgstr "Добавить комнату в закладк_и" -#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1846 +#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857 msgid "Server:" msgstr "Сервер:" @@ -1529,8 +1533,8 @@ msgid "Bro_wse Rooms" msgstr "Просмотр конферен_ций" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3421 -#: ../src/disco.py:1392 ../src/disco.py:1843 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3385 +#: ../src/disco.py:1396 ../src/disco.py:1847 msgid "_Join" msgstr "_Присоединиться" @@ -1929,8 +1933,9 @@ msgstr "Отображать _дополнительные данные о почте" #: ../data/gui/preferences_window.ui.h:50 -msgid "" -"If checked, Gajim will also include information about the sender of the new " +#, fuzzy +msgid "" +"If checked, Gajim will also include information about the sender of new " "emails" msgstr "" "Если отмечено, то Gajim будет включать информацию об отправителе новых писем." @@ -2109,8 +2114,9 @@ msgstr "Использовать иконки _транспортов" #: ../data/gui/preferences_window.ui.h:88 -msgid "" -"If checked, Gajim will use protocol-specific status icons. (eg. A contact " +#, fuzzy +msgid "" +"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "

1 0

gajim-website: improve HTML validity
by Yann Leboulanger 26 Aug '13

26 Aug '13

changeset 9c69cf4da135 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=9c69cf4da135 description: improve HTML validity diffstat: Design.php | 4 +- css/gajim.css | 181 ---------------------------------------------------- css/main.css | 2 +- index.php | 10 +- templates/index.tpl | 2 +- 5 files changed, 9 insertions(+), 190 deletions(-) diffs (269 lines): diff -r 49c73986f637 -r 9c69cf4da135 Design.php --- a/Design.php Wed Aug 14 11:13:10 2013 +0200 +++ b/Design.php Mon Aug 26 07:33:51 2013 +0200 @@ -119,9 +119,9 @@ $page = $_SERVER["SCRIPT_NAME"]; $p = explode("/", $page); $page = $p[count($p)-1]; - echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 Strict//FR\"\n"; + echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"; echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"; - echo "<html>\n <head>\n"; + echo "<html xmlns='http://www.w3.org/1999/xhtml'>\n <head>\n"; echo " <meta name=\"Author\" content=\"Le Boulanger Yann (asterix)\"/>"; echo " <meta name=\"description\" content=\"Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. Gajim is released under the GNU General Public License\"/>\n"; echo " <meta name=\"keywords\" content=\"gajim client jabber python gtk xmpp chat linux gnu instant messaging messenger pygtk contact transport file transfer hig chatstate bookmark avatars srv wikipedia\"/>\n"; diff -r 49c73986f637 -r 9c69cf4da135 css/gajim.css --- a/css/gajim.css Wed Aug 14 11:13:10 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ -body {color: black; - background-color: white; - background: url('../imgs/fond22.jpg') no-repeat; -} - -a:link {color: blue} -a:visited {color: blue} - -#spacer { - clear: both; -} - -#header { - position: float; - z-index: 1; - margin: 0px; - padding: 0px; - width: 100%; - height:305px; -/* border: 1px solid #ed7e00;*/ -} -/* -html>body #header { - position: fixed; - top:0px; - left:0px; - background-color: white; - background: url('/imgs/fond22-t.jpg') no-repeat; -} -*/ -#translator { - position: absolute; - z-index: 2; - top: 15px; - left: 450px; - width: 450px; - height: 50px; - vertical-align: middle; - text-decoration: none; -/* border: 1px solid #ed7e00;*/ -} -/* -html>body #translator { - position: fixed; -} -*/ -#translator img { - border: 0px; -} - -#inner { - width: 100%; - position: absolute; - left: 0px; - top: 305px; -/* border: 1px solid #ed7e00;*/ -} -/* -html>body #inner { - background: url('/imgs/fond22-b.jpg') no-repeat; - background-position: 0px 305px; - background-attachment:fixed; -} -*/ -#menu { - position: absolute; - left: 5px; - top: 15px; - width: 130px; - font-size: 11pt; - text-align:left; -/* border : 1px solid black;*/ -} -/* -html>body #menu { - position: fixed; - top: 320px; -} -*/ -#menu ul { - margin: 0px; - padding: 0px; - list-style-type: none; -} - -#menu li { - margin: 0px; - display: inline; -} - -#menu li a { - margin: 10px 0px; - padding: 2px; - color: #DB0B0B; - font-weight:bold; - display: block; - text-decoration: none; -/* border: 1px solid #ed7e00;*/ -} - -#menu li a:hover { - padding: 1px; /* <-- compensation du border 1px, l'addition redonne un padding 2px*/ - background: #ffa6a6; - border: 1px solid red; -} - -#menu a.submenu { - padding: 1px; - padding-left: 0.5em; - margin: 2px; - font-weight:normal; - font-size: 10pt; -} - -/* Ajout d'un hover sur le submenu, car padding different dans a.submenu*/ -#menu a.submenu:hover { - padding: 0 0 0 0.5em; - margin-left: 1px; -} - -#content { - margin-left: 200px; - position: float; -/* border: 1px solid #ed7e00;*/ -} - -#content h1 { - color: #e13131; - font-weight:bolder; -} - -#content h2{ - color: #3197e1; -} - -#image_index { - float: right; - margin-right: 20px; -} - -#image_index img{ - border : 0px solid; -} - -#photos img{ - vertical-align: middle; - text-align: center; - margin: 20px; - border : 0px solid; -} - -#footer { - margin: 0px; - margin-top: 50px; - padding: 0px; - font-size: 8pt; -/* text-align:center;*/ -/* border: 1px solid #ed7e00;*/ -} - -#footerCenter { - float:left; - width: 60%; -/* position:relative; - top:40px;*/ -/* border: 1px solid #ed7e00;*/ -} - -#news_title { - background: #5377ff; - font-size: 15pt; - font-weight:bold; - text-align: center; - width: 70%; - border: 2px solid #5377ff; -} - -#news { - border: 2px solid #5377ff; - width: 70%; -} diff -r 49c73986f637 -r 9c69cf4da135 css/main.css --- a/css/main.css Wed Aug 14 11:13:10 2013 +0200 +++ b/css/main.css Mon Aug 26 07:33:51 2013 +0200 @@ -113,7 +113,7 @@ width: 70%; } -#news { +.news { border: 2px dashed #BAD3DC; width: 70%; } diff -r 49c73986f637 -r 9c69cf4da135 index.php --- a/index.php Wed Aug 14 11:13:10 2013 +0200 +++ b/index.php Mon Aug 26 07:33:51 2013 +0200 @@ -92,7 +92,7 @@ 0 => _("Fix connection to non-SSL servers"), 1 => _("Minor other fixes"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.4/ChangeLog\">"._("Full ChangeLog")."</a> ", - 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.4\">"._("List of fixed bugs")."</a>", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.4\">"._("List of fixed bugs")."</a>", ); $array_news_items[1] = array( @@ -100,20 +100,20 @@ 1 => _("Better handling of canceling file transfer"), 2 => _("Improve farstream calls"), 3 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.3/ChangeLog\">"._("Full ChangeLog")."</a> ", - 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.3\">"._("List of fixed bugs")."</a>", + 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.3\">"._("List of fixed bugs")."</a>", ); $array_news_items[2] = array( 0 => _("Fix crash when pressing ESC in chat window"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.2/ChangeLog\">"._("Full ChangeLog")."</a> ", - 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.2\">"._("List of fixed bugs")."</a>", + 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.2\">"._("List of fixed bugs")."</a>", ); $array_news_items[3] = array( 0 => _("Switch to python-farstream"), 1 => _("Fix several issues"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.1/ChangeLog\">"._("Full ChangeLog")."</a> ", - 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.1\">"._("List of fixed bugs")."</a>", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.1\">"._("List of fixed bugs")."</a>", ); $array_news_items[4] = array( @@ -125,7 +125,7 @@ 5 => _("Roster filtrering"), 6 => _("GPG and spell checking support for windows"), 7 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15/ChangeLog\">"._("Full ChangeLog")."</a> ", - 8 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>", + 8 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>", ); $tpl->set_block("page", "NEWS_LIST", "item"); // define intern block diff -r 49c73986f637 -r 9c69cf4da135 templates/index.tpl --- a/templates/index.tpl Wed Aug 14 11:13:10 2013 +0200 +++ b/templates/index.tpl Mon Aug 26 07:33:51 2013 +0200 @@ -24,7 +24,7 @@ <div id="news_title"> {NEWS_MAIN} </div> - <div id="news"> + <div class="news"> <b>{NEWS_TITLE}</b> ({NEWS_DATE}) <br/> {NEWS_DESC}

1 0

gajim: [Darlan]Fix gajim-remote -help.
by Gajim 26 Aug '13

26 Aug '13

changeset 413c07ee9f49 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=413c07ee9f49 description: [Darlan]Fix gajim-remote -help. diffstat: src/gajim.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 58b0f93e4ce1 -r 413c07ee9f49 src/gajim.py --- a/src/gajim.py Mon Aug 26 09:16:51 2013 +0400 +++ b/src/gajim.py Mon Aug 26 09:32:16 2013 +0400 @@ -142,7 +142,7 @@ '\n -v, --verbose ' + \ _('Print xml stanzas and other debug information') + \ '\n -p, --profile ' + \ - _('Use config.name in configuration directory') + \ + _('Use defined profile in configuration directory') + \ '\n -c, --config-path ' + \ _('Set configuration directory') + \ '\n -l, --loglevel ' + \

1 0

gajim: [Darlan]Fix gajim-history-manager -help and gajim-remote ...
by Gajim 26 Aug '13

26 Aug '13

changeset 58b0f93e4ce1 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=58b0f93e4ce1 description: [Darlan]Fix gajim-history-manager -help and gajim-remote -help. See #7439 diffstat: src/gajim-remote.py | 3 ++- src/history_manager.py | 7 ++++++- 2 файлов изменено, 8 вставок(+), 2 удалений(-) различия (30 строк): diff -r ded33bd80e52 -r 58b0f93e4ce1 src/gajim-remote.py --- a/src/gajim-remote.py Mon Aug 26 00:59:46 2013 +0400 +++ b/src/gajim-remote.py Mon Aug 26 09:16:51 2013 +0400 @@ -444,7 +444,8 @@ """ Print usage, and list available commands """ - s = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME + s = _('Usage:\n %s command [arguments]\n\nCommand is one of:\n' ) % ( + BASENAME) for command in sorted(self.commands): s += ' ' + command for arg in self.commands[command][1]: diff -r ded33bd80e52 -r 58b0f93e4ce1 src/history_manager.py --- a/src/history_manager.py Mon Aug 26 00:59:46 2013 +0400 +++ b/src/history_manager.py Mon Aug 26 09:16:51 2013 +0400 @@ -70,7 +70,12 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print 'history_manager [--help] [--config-path]' + print _('Usage:') + \ + '\n gajim-history-manager [options] filename\n\n' + \ + _('Options:') + \ + '\n -h, --help ' + \ + _('Show this help message and exit') + \ + '\n -c, --config-path ' + _('Set logs directory') sys.exit() elif o in ('-c', '--config-path'): config_path = a

1 0

gajim: All strings translatable in -help
by Gajim 25 Aug '13

25 Aug '13

changeset ded33bd80e52 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ded33bd80e52 description: All strings translatable in -help diffstat: src/gajim.py | 10 +++++----- 1 файлов изменено, 5 вставок(+), 5 удалений(-) различия (22 строк): diff -r 6528ecfbf8c1 -r ded33bd80e52 src/gajim.py --- a/src/gajim.py Mon Aug 26 00:40:05 2013 +0400 +++ b/src/gajim.py Mon Aug 26 00:59:46 2013 +0400 @@ -132,13 +132,13 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print 'Usage: ' + \ - '\n gajim [options] filename\n' + \ - '\nOptions:' + \ + print _('Usage:') + \ + '\n gajim [options] filename\n\n' + \ + _('Options:') + \ '\n -h, --help ' + \ _('Show this help message and exit') + \ - '\n -q, --quiet ' + _\ - ('Show only critical errors') + \ + '\n -q, --quiet ' + \ + _('Show only critical errors') + \ '\n -v, --verbose ' + \ _('Print xml stanzas and other debug information') + \ '\n -p, --profile ' + \

1 0

gajim: [Darlan] Expand --help. Fixes #7439
by Gajim 25 Aug '13

25 Aug '13

changeset 6528ecfbf8c1 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6528ecfbf8c1 description: [Darlan] Expand --help. Fixes #7439 diffstat: src/gajim.py | 18 +++++++++++++++--- 1 файлов изменено, 15 вставок(+), 3 удалений(-) различия (28 строк): diff -r da80e2a35d06 -r 6528ecfbf8c1 src/gajim.py --- a/src/gajim.py Sun Aug 25 19:03:15 2013 +0200 +++ b/src/gajim.py Mon Aug 26 00:40:05 2013 +0400 @@ -132,9 +132,21 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print 'gajim [--help] [--quiet] [--verbose] ' + \ - '[--loglevel subsystem=level[,subsystem=level[...]]] ' + \ - '[--profile name] [--config-path]' + print 'Usage: ' + \ + '\n gajim [options] filename\n' + \ + '\nOptions:' + \ + '\n -h, --help ' + \ + _('Show this help message and exit') + \ + '\n -q, --quiet ' + _\ + ('Show only critical errors') + \ + '\n -v, --verbose ' + \ + _('Print xml stanzas and other debug information') + \ + '\n -p, --profile ' + \ + _('Use config.name in configuration directory') + \ + '\n -c, --config-path ' + \ + _('Set configuration directory') + \ + '\n -l, --loglevel ' + \ + _('Configure logging system') sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet()

1 0

gajim: hide useless scrollbar. Fixes #7239
by Gajim 25 Aug '13

25 Aug '13

changeset da80e2a35d06 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=da80e2a35d06 description: hide useless scrollbar. Fixes #7239 diffstat: data/gui/preferences_window.ui | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diffs (38 lines): diff -r 371b4cb440d3 -r da80e2a35d06 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Aug 25 18:57:27 2013 +0200 +++ b/data/gui/preferences_window.ui Sun Aug 25 19:03:15 2013 +0200 @@ -1256,6 +1256,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="default_msg_treeview"> @@ -2012,12 +2014,6 @@ </packing> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <child> @@ -2062,6 +2058,12 @@ <property name="y_options"/> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> </object>

1 0

gajim: get gtkexcepthook back (Thanks demandimport once again ...)
by Gajim 25 Aug '13

25 Aug '13

changeset 371b4cb440d3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=371b4cb440d3 description: get gtkexcepthook back (Thanks demandimport once again ...) diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cba8934c2688 -r 371b4cb440d3 src/gajim.py --- a/src/gajim.py Sun Aug 25 16:14:38 2013 +0200 +++ b/src/gajim.py Sun Aug 25 18:57:27 2013 +0200 @@ -74,7 +74,7 @@ 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'gst.interfaces', - 'monotonic'] + 'monotonic', 'gtkexcepthook'] if os.name == 'nt': import locale

1 0

gajim: handle config-path instead of config_path
by Yann Leboulanger 25 Aug '13

25 Aug '13

changeset cba8934c2688 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cba8934c2688 description: handle config-path instead of config_path diffstat: src/gajim.py | 2 +- src/history_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 3aaa9cd58e85 -r cba8934c2688 src/gajim.py --- a/src/gajim.py Sun Aug 25 15:23:22 2013 +0200 +++ b/src/gajim.py Sun Aug 25 16:14:38 2013 +0200 @@ -122,7 +122,7 @@ try: shortargs = 'hqvl:p:c:' # add gtk/gnome session option as gtk_get_option_group is not wrapped - longargs = 'help quiet verbose loglevel= profile= config_path=' + longargs = 'help quiet verbose loglevel= profile= config-path=' longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings' longargs += ' sm-client-id= sm-client-state-file= sm-disable' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] diff -r 3aaa9cd58e85 -r cba8934c2688 src/history_manager.py --- a/src/history_manager.py Sun Aug 25 15:23:22 2013 +0200 +++ b/src/history_manager.py Sun Aug 25 16:14:38 2013 +0200 @@ -62,7 +62,7 @@ try: shortargs = 'hc:' - longargs = 'help config_path=' + longargs = 'help config-path=' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] except getopt.error, msg: print str(msg)

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