Commits January 2009

commits@gajim.org

7 participants
115 discussions

[commit-gajim] r11027 - www-website/locale/pl_PL/LC_MESSAGES
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 22:29:07 +0100 (Sun, 25 Jan 2009) New Revision: 11027 Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po Log: typo Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 21:21:09 UTC (rev 11026) +++ www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 21:29:07 UTC (rev 11027) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Gajim-0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-25 18:05+0100\n" +"POT-Creation-Date: 2009-01-25 22:28+0100\n" "PO-Revision-Date: 2008-10-19 20:18+0100\n" "Last-Translator: Tadzik Sośnierz <tadzikes(a)gmail.com>\n" "Language-Team: Polish\n" @@ -129,7 +129,7 @@ msgid " Language:" msgstr " Język" -#: Design.php:177 +#: Design.php:178 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" @@ -411,8 +411,7 @@ #, c-format msgid "" " Gajim uses the %s library to do the interface with Jabber network.\n" -msgstr "" -" Gajim używa biblioteki %s do komunikacji z siecią Jabber.\n" +msgstr " Gajim używa biblioteki %s do komunikacji z siecią Jabber.\n" #: downloads.php:8 msgid " Latest version of Gajim is" @@ -658,8 +657,9 @@ " To run Gajim, you need external libraries. You can find a tutorial on the " "way to install them" msgstr "" -" Aby uruchomić Gajima potrzebujesz zewnętrznych bibliotek. Możesz znaleźć tutorial " -"z opisem ich instalacji" +" Aby uruchomić Gajima potrzebujesz zewnętrznych bibliotek. Możesz znaleźć " +"tutorial z opisem ich instalacji" + #: downloads.php:201 msgid "On the Wiki" msgstr "Na Wiki" @@ -909,9 +909,9 @@ #: index.php:97 msgid "Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism" -msgstr "Ulepszone mechanizmy bezpieczeństwa: Uwierzytelnianie Kerberos -(GSSAPI) poprzez -SASL" +msgstr "" +"Ulepszone mechanizmy bezpieczeństwa: Uwierzytelnianie Kerberos (GSSAPI) " +"poprzez SASL" #: index.php:98 msgid "Improve GUI of some windows"

1 0

[commit-gajim] r11026 - www-website/locale/pl_PL/LC_MESSAGES
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 22:21:09 +0100 (Sun, 25 Jan 2009) New Revision: 11026 Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po Log: some more update in polish translation of wensite Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 18:30:02 UTC (rev 11025) +++ www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 21:21:09 UTC (rev 11026) @@ -229,11 +229,11 @@ #: dev.php:47 msgid " Bug reporting: in case you find a bug, do not hesitate to" -msgstr " Zgłaszając błąd: jeśli znajdziesz błąd, nie wahaj się" +msgstr " Zgłaszając błąd: jeśli znajdziesz błąd," #: dev.php:47 msgid "report it" -msgstr "zgłosić go" +msgstr "zgłoś go" #: dev.php:50 msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" @@ -889,7 +889,7 @@ #: index.php:90 msgid "Fix GSSAPI authentification" -msgstr "Poprawiona autentyfikacja GSSAPI" +msgstr "Poprawione uwierzytelnianie GSSAPI" #: index.php:91 msgid "" @@ -909,7 +909,9 @@ #: index.php:97 msgid "Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism" -msgstr "Ulepszone mechanizmy bezpieczeństwa: Autentyfikacja Kerberos (GSSAPI) poprzez SASL" +msgstr "Ulepszone mechanizmy bezpieczeństwa: Uwierzytelnianie Kerberos +(GSSAPI) poprzez +SASL" #: index.php:98 msgid "Improve GUI of some windows"

1 0

[commit-gajim] r11025 - www-website/locale/pl_PL/LC_MESSAGES
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 19:30:02 +0100 (Sun, 25 Jan 2009) New Revision: 11025 Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po Log: missing space in polish transltion of website Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 18:29:13 UTC (rev 11024) +++ www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 18:30:02 UTC (rev 11025) @@ -424,7 +424,7 @@ #: downloads.php:12 msgid "or the " -msgstr "lub" +msgstr "lub " #: downloads.php:12 msgid "source tarball"

1 0

[commit-gajim] r11024 - www-website/locale/pl_PL/LC_MESSAGES
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 19:29:13 +0100 (Sun, 25 Jan 2009) New Revision: 11024 Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po Log: some fixes in polish translation Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 18:15:29 UTC (rev 11023) +++ www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 18:29:13 UTC (rev 11024) @@ -159,7 +159,7 @@ #: dev.php:19 msgid " You may also want to subscribe to our mailing list (low-traffic): " -msgstr " Może chcesz subskrybować naszą listę mailingową:" +msgstr " Możesz również subskrybować naszą listę mailingową: " #: dev.php:19 msgid "or by visiting" @@ -181,7 +181,7 @@ #: dev.php:27 msgid "To checkout svn do" -msgstr "Aby sprawdzić SVN: " +msgstr "Aby sprawdzić SVN wpisz" #: dev.php:29 msgid " You can also"

1 0

[commit-gajim] r11023 - www-website/locale/pl_PL/LC_MESSAGES
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 19:15:29 +0100 (Sun, 25 Jan 2009) New Revision: 11023 Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po Log: fixed polish translation Modified: www-website/locale/pl_PL/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 17:48:07 UTC (rev 11022) +++ www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 18:15:29 UTC (rev 11023) @@ -91,7 +91,7 @@ #: Design.php:106 msgid "Autopackage" -msgstr "" +msgstr "Paczka automatyczna" #: Design.php:107 msgid "Windows installer" @@ -127,7 +127,7 @@ #: Design.php:135 msgid " Language:" -msgstr "Język" +msgstr " Język" #: Design.php:177 msgid "" @@ -147,7 +147,7 @@ #: dev.php:12 msgid " Our room is" -msgstr " Nasz pokój to" +msgstr " Nasz pokój to" #: dev.php:12 msgid "You are welcome to join and communicate with us." @@ -181,7 +181,7 @@ #: dev.php:27 msgid "To checkout svn do" -msgstr "Aby sprawdzić SVN" +msgstr "Aby sprawdzić SVN: " #: dev.php:29 msgid " You can also" @@ -229,7 +229,7 @@ #: dev.php:47 msgid " Bug reporting: in case you find a bug, do not hesitate to" -msgstr " Zgłaszanie błędów: jeśli znajdziesz błąd, nie wahaj się" +msgstr " Zgłaszając błąd: jeśli znajdziesz błąd, nie wahaj się" #: dev.php:47 msgid "report it" @@ -274,9 +274,9 @@ msgstr "pobierz" #: docs.php:20 -#, fuzzy, c-format +#, c-format msgid " To get one of these versions, go to the %s page.\n" -msgstr " Aby zdobyć jedną z tych wersji, odwiedź" +msgstr " Aby zdobyć jedną z tych wersji, odwiedź stronę %s.\n" #: docs.php:22 downloads.php:160 msgid " Under GNU/Linux\n" @@ -352,9 +352,9 @@ msgstr " Na systemie Microsoft Windows\n" #: docs.php:47 -#, fuzzy, c-format +#, c-format msgid " In a first time, you have to install %s, %s, %s and %s.\n" -msgstr " W pierwszej kolejności, musisz zainstalować" +msgstr " W pierwszej kolejności, musisz zainstalować %s, %s, %s i %s.\n" #: docs.php:51 msgid " To get python, download the latest version" @@ -391,9 +391,9 @@ msgstr "pobierz Gajima" #: docs.php:65 -#, fuzzy, c-format +#, c-format msgid " You can now %s and double click on gajim.py in src folder.\n" -msgstr "i kliknij dwa razy na gajim.py w folderze src.\n" +msgstr " Teraz %s i kliknij dwukrotnie na ikonkę gajim.py w folderze src.\n" #: docs.php:72 msgid " Please read" @@ -408,10 +408,11 @@ msgstr " Możesz zrozumieć jak działa Gajim" #: docs.php:81 -#, fuzzy, c-format +#, c-format msgid "" " Gajim uses the %s library to do the interface with Jabber network.\n" -msgstr "do komunikacji z siecią Jabber.\n" +msgstr "" +" Gajim używa biblioteki %s do komunikacji z siecią Jabber.\n" #: downloads.php:8 msgid " Latest version of Gajim is" @@ -419,7 +420,7 @@ #: downloads.php:11 msgid "If your distribution doesn't have the latest version " -msgstr "Jeśli twoja dystrybucja nie posiada najnowszej wersji" +msgstr "Jeśli twoja dystrybucja nie posiada najnowszej wersji " #: downloads.php:12 msgid "or the " @@ -427,7 +428,7 @@ #: downloads.php:12 msgid "source tarball" -msgstr "spakowane źródła" +msgstr "spakowanych źródeł" #: downloads.php:12 msgid "you are advised to use the " @@ -673,7 +674,7 @@ "can use them if svn is broken for you at the moment." msgstr "" " Każdego dnia o godzinie 01:00 (Strefa czasowa GMT+1) archiwa gz są " -"budowane z svn. Możesz ich używać jeśli nie możesz użyć w tym momencie svn" +"budowane z svn. Możesz ich używać jeśli nie możesz użyć w tym momencie svn." #: downloads.php:209 msgid "Here to get them" @@ -685,7 +686,7 @@ #: downloads.php:217 msgid " You'll find old releases of Gajim" -msgstr " Znajdziesz tam stare wydania Gajima" +msgstr " Stare wydania Gajima możesz znaleźć" #: index.php:11 msgid "Hello and welcome to the Gajim project website" @@ -774,7 +775,6 @@ msgstr "łączenie lokalne (bonjour / zeroconf)" #: index.php:38 -#, fuzzy msgid "" "Gajim is available in 24 languages: Basque, Belarusian, Brasilian, British, " "Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, " @@ -851,7 +851,6 @@ msgstr "Naprawione przesyłanie plików" #: index.php:78 -#, fuzzy msgid "Updated german translation" msgstr "Uaktualnione tłumaczenie na język niemiecki" @@ -868,9 +867,8 @@ msgstr "Poprawione renderowanie tekstu w powiadomieniach" #: index.php:85 -#, fuzzy msgid "Fix forward unread messages under Windows" -msgstr "Poprawiony Idle i języki nie-ascii pod Windows" +msgstr "Poprawione przekazywanie nieczytanych wiadomości pod Windows" #: index.php:86 msgid "Better sessions support" @@ -887,7 +885,7 @@ #: index.php:89 #, fuzzy msgid "Quodlibet support" -msgstr "Wsparcie dla wielu kont" +msgstr "Wsparcie dla Quodlibet" #: index.php:90 msgid "Fix GSSAPI authentification" @@ -926,9 +924,8 @@ msgstr "Poprawione zamarzanie przy połączeniu" #: index.php:101 -#, fuzzy msgid "Improved windows installer" -msgstr "Nowy instalator dla Windows" +msgstr "Ulepszony instalator dla Windows" #: index.php:104 index.php:117 msgid "Known Bugs/Annoyances"

1 0

[commit-gajim] r11022 - www-website
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 18:48:07 +0100 (Sun, 25 Jan 2009) New Revision: 11022 Modified: www-website/Design.php Log: update lang detection to support polish Modified: www-website/Design.php =================================================================== --- www-website/Design.php 2009-01-25 17:46:31 UTC (rev 11021) +++ www-website/Design.php 2009-01-25 17:48:07 UTC (rev 11022) @@ -58,7 +58,7 @@ $preflang = get_pref_language_array($_SERVER["HTTP_ACCEPT_LANGUAGE"]); else $preflang = array(0 => 'en'); - $availablelang = array('fr', 'en', 'es', 'bg', 'pt-br', 'eo', 'ru', 'de', 'it'); + $availablelang = array('fr', 'en', 'es', 'bg', 'pt-br', 'eo', 'ru', 'de', 'it', 'pl'); $result = array_intersect($preflang, $availablelang); if (count($result) != 0) $language = $result[0]; @@ -72,7 +72,7 @@ session_start(); // print_r($_SERVER); $language = get_language(); - $lang_association = array('fr' => 'fr_FR', 'fr_CA' => 'fr_FR', 'en' => 'en_US', 'en-gb' => 'en_US', 'en-us' => 'en_US', 'es' => 'es_ES', 'es_MX' => 'es_ES', 'es_AR' => 'es_ES', 'es_UY' => 'es_ES', 'bg' => 'bg_BG', 'pt' => 'pt_BR', 'pt-br' => 'pt_BR', 'eo_EO' => 'eo', 'eo_XX' => 'eo', 'eo' => 'eo', 'ru' => 'ru_RU', 'ru_SU' => 'ru_RU', 'de' => 'de_DE', 'at' => 'de_DE', 'ch' => 'de_DE', 'it' => 'it_IT'); + $lang_association = array('fr' => 'fr_FR', 'fr_CA' => 'fr_FR', 'en' => 'en_US', 'en-gb' => 'en_US', 'en-us' => 'en_US', 'es' => 'es_ES', 'es_MX' => 'es_ES', 'es_AR' => 'es_ES', 'es_UY' => 'es_ES', 'bg' => 'bg_BG', 'pt' => 'pt_BR', 'pt-br' => 'pt_BR', 'eo_EO' => 'eo', 'eo_XX' => 'eo', 'eo' => 'eo', 'ru' => 'ru_RU', 'ru_SU' => 'ru_RU', 'de' => 'de_DE', 'at' => 'de_DE', 'ch' => 'de_DE', 'it' => 'it_IT', 'pl' => 'pl_PL'); $lang = $lang_association[$language]; putenv("LANG=$lang"); setlocale(LC_ALL, $lang);

1 0

[commit-gajim] r11021 - www-website
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 18:46:31 +0100 (Sun, 25 Jan 2009) New Revision: 11021 Modified: www-website/Design.php Log: add polish flag in website banner Modified: www-website/Design.php =================================================================== --- www-website/Design.php 2009-01-25 17:42:15 UTC (rev 11020) +++ www-website/Design.php 2009-01-25 17:46:31 UTC (rev 11021) @@ -143,6 +143,7 @@ echo " <a href = \"$page?lang=ru\"><img src=\"imgs/ru_flag.png\" alt=\"ru_flag\" title=\"Сайт на русском языке\" /></a>\n"; echo " <a href = \"$page?lang=de\"><img src=\"imgs/de_flag.png\" alt=\"de_flag\" title=\"Webseite in Deutsch\" /></a>\n"; echo " <a href = \"$page?lang=it\"><img src=\"imgs/it_flag.png\" alt=\"it_flag\" title=\"Sito in italiano\" /></a>\n"; + echo " <a href = \"$page?lang=pl\"><img src=\"imgs/pl_flag.png\" alt=\"pl_flag\" title=\"Strona w języku Polskim\" /></a>\n"; echo " </div> \n</div>\n"; echo " <div style=\"text-align:left;\">\n"; echo "<div class=\"menu\">\n";

1 0

[commit-gajim] r11020 - in www-website: . imgs locale locale/pl_PL locale/pl_PL/LC_MESSAGES
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 18:42:15 +0100 (Sun, 25 Jan 2009) New Revision: 11020 Added: www-website/imgs/pl_flag.png www-website/locale/pl_PL/ www-website/locale/pl_PL/LC_MESSAGES/ www-website/locale/pl_PL/LC_MESSAGES/msg.po Modified: www-website/msg.pot Log: [tadzik] polish translation of the website Added: www-website/imgs/pl_flag.png =================================================================== (Binary files differ) Property changes on: www-website/imgs/pl_flag.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: www-website/locale/pl_PL/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pl_PL/LC_MESSAGES/msg.po (rev 0) +++ www-website/locale/pl_PL/LC_MESSAGES/msg.po 2009-01-25 17:42:15 UTC (rev 11020) @@ -0,0 +1,1116 @@ +# Polish translations for Gajim package. +# Copyright (C) 2008 THE Gajim'S COPYRIGHT HOLDER +# This file is distributed under the same license as the Gajim package. +# Yann <asterix(a)obelix.lagaule.org>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: Gajim-0.12\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-25 18:05+0100\n" +"PO-Revision-Date: 2008-10-19 20:18+0100\n" +"Last-Translator: Tadzik Sośnierz <tadzikes(a)gmail.com>\n" +"Language-Team: Polish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#: Design.php:85 +msgid "Home" +msgstr "Strona Główna" + +#: Design.php:86 +msgid "Screenshots" +msgstr "Zrzuty ekranu" + +#: Design.php:87 +msgid "Download" +msgstr "Pobierz" + +#: Design.php:88 +msgid "Documentation" +msgstr "Dokumentacja" + +#: Design.php:89 +msgid "Wiki" +msgstr "Wiki" + +#: Design.php:90 +msgid "Development" +msgstr "Rozwój" + +#: Design.php:94 +msgid "Debian" +msgstr "Debian" + +#: Design.php:95 +msgid "Slackware" +msgstr "Slackware" + +#: Design.php:96 +msgid "Ubuntu" +msgstr "Ubuntu" + +#: Design.php:97 +msgid "Fedora" +msgstr "Fedora" + +#: Design.php:98 +msgid "Gentoo" +msgstr "Gentoo" + +#: Design.php:99 +msgid "Archlinux" +msgstr "Archlinux" + +#: Design.php:100 +msgid "SuSE" +msgstr "SuSE" + +#: Design.php:101 +msgid "PLD" +msgstr "PLD" + +#: Design.php:102 +msgid "Sourcemage" +msgstr "Sourcemage" + +#: Design.php:103 +msgid "Mandriva" +msgstr "Mandriva" + +#: Design.php:104 +msgid "Zenwalk" +msgstr "Zenwalk" + +#: Design.php:105 +msgid "FreeBSD" +msgstr "FreeBSD" + +#: Design.php:106 +msgid "Autopackage" +msgstr "" + +#: Design.php:107 +msgid "Windows installer" +msgstr "Instalator dla Windows" + +#: Design.php:108 +msgid "Source" +msgstr "Źródła" + +#: Design.php:109 +msgid "Subversion" +msgstr "Subversion" + +#: Design.php:110 +msgid "Daily snapshots" +msgstr "Codzienne buildy" + +#: Design.php:111 +msgid "Old releases" +msgstr "Stare wydania" + +#: Design.php:115 +msgid "Installation" +msgstr "Instalacja" + +#: Design.php:116 +msgid "Jabber" +msgstr "Jabber" + +#: Design.php:117 +msgid "Structure" +msgstr "Struktura" + +#: Design.php:135 +msgid " Language:" +msgstr "Język" + +#: Design.php:177 +msgid "" +" Site optimized for W3C Standards and realized with vim editor under GNU/" +"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +msgstr "" +"Strona zoptymalizowana według standartów W3C i napisana w edytorze vim na " +"systemie GNU/Linux przez Asterix'a (Jabber ID: asterix(a)jabber.lagaule.org)\n" + +#: dev.php:5 downloads.php:5 index.php:7 screenshots.php:7 +msgid "Gajim, a Jabber client" +msgstr "Gajim, klient Jabbera" + +#: dev.php:10 +msgid " Our Room" +msgstr " Nasz pokój" + +#: dev.php:12 +msgid " Our room is" +msgstr " Nasz pokój to" + +#: dev.php:12 +msgid "You are welcome to join and communicate with us." +msgstr "Zapraszamy do dołączenia i komunikacji z nami" + +#: dev.php:17 +msgid " Mailing List" +msgstr " Lista mailingowa" + +#: dev.php:19 +msgid " You may also want to subscribe to our mailing list (low-traffic): " +msgstr " Może chcesz subskrybować naszą listę mailingową:" + +#: dev.php:19 +msgid "or by visiting" +msgstr "lub odwiedzić" + +#: dev.php:20 +msgid " List archives are available " +msgstr " Archiwum listy jest dostępne " + +#: dev.php:20 docs.php:51 docs.php:54 docs.php:57 docs.php:60 docs.php:72 +#: docs.php:78 downloads.php:146 downloads.php:157 downloads.php:195 +#: downloads.php:217 index.php:14 +msgid "here" +msgstr "tutaj" + +#: dev.php:25 +msgid " Repository" +msgstr " Repozytorium" + +#: dev.php:27 +msgid "To checkout svn do" +msgstr "Aby sprawdzić SVN" + +#: dev.php:29 +msgid " You can also" +msgstr " Możesz również" + +#: dev.php:29 +msgid "browse SVN repository" +msgstr "przejrzeć repozytorium SVN" + +#: dev.php:34 +msgid " How you can help" +msgstr " Jak możesz pomóc" + +#: dev.php:36 +msgid " Here are some" +msgstr " Tutaj znajdują się" + +#: dev.php:36 +msgid "to track bugs and plan the development of Gajim.\n" +msgstr "znaleźć błędy i planować rozwój Gajima\n" + +#: dev.php:36 +msgid "wiki pages" +msgstr "strony wiki" + +#: dev.php:38 +msgid " You can help us make Gajim even better by:\n" +msgstr " Możesz nam pomóc sprawić by Gajim był jeszcze lepszy :\n" + +#: dev.php:41 +msgid "" +" Coding: contact us on our mailing list or in our room gajim@conference." +"gajim.org \n" +msgstr "" +" Programując: skontaktuj się z nami na naszej liście mailingowej lub w " +"naszym pokoju gajim(a)conference.gajim.org \n" + +#: dev.php:44 +msgid " Submitting a translation: see" +msgstr " Wysyłając nam tłumaczenie: zobacz" + +#: dev.php:44 +msgid "DevTranslate page" +msgstr "stronę DevTranslate" + +#: dev.php:47 +msgid " Bug reporting: in case you find a bug, do not hesitate to" +msgstr " Zgłaszanie błędów: jeśli znajdziesz błąd, nie wahaj się" + +#: dev.php:47 +msgid "report it" +msgstr "zgłosić go" + +#: dev.php:50 +msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" +msgstr "" +" Zasponsorować: skontaktuj się ze mną na Jabberze (asterix@jabber." +"lagaule.org)" + +#: dev.php:55 +msgid " Translations status" +msgstr " Stan tłumaczeń" + +#: dev.php:84 +msgid " Authors" +msgstr " Autorzy" + +#: dev.php:86 +msgid " Project is composed of:" +msgstr " Projekt jest stworzony z:" + +#: dev.php:100 +msgid " We also want to thank" +msgstr " Chcielibyśmy również podziękować" + +#: dev.php:100 +msgid "these people" +msgstr "tym ludziom" + +#: docs.php:11 +msgid " Installation\n" +msgstr " Instalacja\n" + +#: docs.php:17 +msgid " Tarball and Subversion\n" +msgstr " Archiwa i Subversion\n" + +#: docs.php:19 +msgid "download" +msgstr "pobierz" + +#: docs.php:20 +#, fuzzy, c-format +msgid " To get one of these versions, go to the %s page.\n" +msgstr " Aby zdobyć jedną z tych wersji, odwiedź" + +#: docs.php:22 downloads.php:160 +msgid " Under GNU/Linux\n" +msgstr " Na systemie GNU/Linux\n" + +#: docs.php:24 +msgid "" +" To run this version, you have to install some packages: python2.3 " +"python2.3-gtk2 and python2.3-glade2.\n" +msgstr "" +" Aby uruchomić tę wersję, musisz zainstalować kilka pakietów: python2.3 " +"python2.3-gtk2 i python2.3-glade2.\n" + +#: docs.php:25 +msgid " (With Debian, just run:" +msgstr " (Na Debianie uruchom po prostu:" + +#: docs.php:26 +msgid " Note that python2.4 can be used instead of python2.3.\n" +msgstr " Pamiętaj, że możesz używać python2.4 zamiast python2.3.\n" + +#: docs.php:29 +msgid "" +" To use the idle module, the trayicon one and the gtkspell one, you have " +"to compile them. For idle you may need libxss-dev (if you don't have " +"scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, " +"if you have gnome-python-extras." +msgstr "" +" Aby użyć modułów idle, trayicon i gtkspell, będziesz musiał je " +"skompilować. Dla 'idle' będziesz potrzebował pakietu libxss-dev (jeśli nie " +"masz scrnsaver.h), a dla 'trayicon' i 'gtkspell' możesz ich nie kompilować " +"jeśli posiadasz pakiet gnome-python-extras." + +#: docs.php:31 +msgid " In order to compile them all type" +msgstr " Aby skompilować je wszystkie, napisz" + +#: docs.php:31 +msgid "" +"in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and " +"libgtk2.0-dev packages are needed)\n" +msgstr "" +"w folderze gajima. (Potrzebne są pakiety python-dev, python-gtk2-dev, " +"libgtkspell-dev i libgtk2.0-dev)\n" + +#: docs.php:34 +msgid " You can install or run from source. To run from source" +msgstr "" +" Możesz zainstalować lub uruchomić ze źródeł. Aby uruchomić ze źródeł" + +#: docs.php:35 +msgid "in the gajim folder." +msgstr "w folderze gajima" + +#: docs.php:37 +msgid " To install " +msgstr " Aby zainstalować" + +#: docs.php:37 +msgid "in the gajim folder" +msgstr "w folderze gajima" + +#: docs.php:38 +msgid " and then you just have to run" +msgstr " a potem musisz już tylko uruchomić" + +#: docs.php:38 +msgid "in order to use Gajim.\n" +msgstr "Aby użyć Gajima.\n" + +#: docs.php:41 +msgid " Under Microsoft Windows\n" +msgstr " Na systemie Microsoft Windows\n" + +#: docs.php:47 +#, fuzzy, c-format +msgid " In a first time, you have to install %s, %s, %s and %s.\n" +msgstr " W pierwszej kolejności, musisz zainstalować" + +#: docs.php:51 +msgid " To get python, download the latest version" +msgstr " Aby zdobyć pythona, pobierz najnowszą wersję" + +#: docs.php:51 +msgid "(Gajim works with python-2.4.x)" +msgstr "(Gajim działa na pythonie 2.4.x)" + +#: docs.php:51 docs.php:54 +msgid "and install it.\n" +msgstr "i zainstaluj go.\n" + +#: docs.php:54 +msgid "" +" To get GTK+, download the latest version of the \"Runtime Environment" +"\"" +msgstr " Aby zdobyć GTK+, pobierz najnowszą wersję środowiska" + +#: docs.php:57 +msgid " To get pygtk, download latest version " +msgstr " Aby zdobyć pygtk, pobierz najnowszą wersję" + +#: docs.php:57 docs.php:60 +msgid " and install it.\n" +msgstr " i zainstaluj ją.\n" + +#: docs.php:60 +msgid " At last, to get pywin32, download latest version " +msgstr " Wreszcie, aby zdobyć pywin32. pobierz najnowszą wersję" + +#: docs.php:64 +msgid "download Gajim" +msgstr "pobierz Gajima" + +#: docs.php:65 +#, fuzzy, c-format +msgid " You can now %s and double click on gajim.py in src folder.\n" +msgstr "i kliknij dwa razy na gajim.py w folderze src.\n" + +#: docs.php:72 +msgid " Please read" +msgstr " Proszę przeczytaj" + +#: docs.php:76 +msgid " Structure\n" +msgstr " Struktura\n" + +#: docs.php:78 +msgid " You can understand how Gajim works" +msgstr " Możesz zrozumieć jak działa Gajim" + +#: docs.php:81 +#, fuzzy, c-format +msgid "" +" Gajim uses the %s library to do the interface with Jabber network.\n" +msgstr "do komunikacji z siecią Jabber.\n" + +#: downloads.php:8 +msgid " Latest version of Gajim is" +msgstr " Najnowszą wersją Gajima jest" + +#: downloads.php:11 +msgid "If your distribution doesn't have the latest version " +msgstr "Jeśli twoja dystrybucja nie posiada najnowszej wersji" + +#: downloads.php:12 +msgid "or the " +msgstr "lub" + +#: downloads.php:12 +msgid "source tarball" +msgstr "spakowane źródła" + +#: downloads.php:12 +msgid "you are advised to use the " +msgstr "radzimy użyć " + +#: downloads.php:19 +msgid " If you use Debian unstable do" +msgstr "" +" Jeśli używasz niestabilnej wersji Debiana wykonaj następujące kroki" + +#: downloads.php:21 +msgid " A daily package from svn is also built. To use it, remove gajim" +msgstr "" +" Dostępne są również codzienne paczki z svn. Aby ich użyć, usuń gajima" + +#: downloads.php:21 +msgid "add this line to your" +msgstr "dodaj tę linię do twojego" + +#: downloads.php:25 +msgid "and install it by doing" +msgstr "i zainstaluj ją robiąc" + +#: downloads.php:26 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" +"Możesz również zdobyć klucz GPG tej paczki instalująć gajim-dev-keyring z " +"tego samego repozytorium. Po prostu zrób" + +#: downloads.php:34 downloads.php:121 +msgid "Soon available here." +msgstr "Dostępne tu już wkrótce" + +#: downloads.php:43 +msgid " If you use Ubuntu universe repository do" +msgstr "" +" Jeśli używasz repozytorium \"Ubuntu universe\", wykonaj następujące kroki" + +#: downloads.php:51 downloads.php:58 downloads.php:65 downloads.php:88 +#: downloads.php:96 downloads.php:104 +msgid " Just" +msgstr " Po prostu" + +#: downloads.php:55 +msgid " Gentoo\n" +msgstr " Gentoo\n" + +#: downloads.php:62 +msgid " Archlinux\n" +msgstr " Archlinux\n" + +#: downloads.php:69 +msgid " SUSE\n" +msgstr " SUSE\n" + +#: downloads.php:72 +msgid " openSuSE 11: " +msgstr " openSuSE 11: " + +#: downloads.php:72 +msgid "one click install" +msgstr "zainstaluj jednym kliknięciem" + +#: downloads.php:74 +msgid " openSuSE 10.x: " +msgstr " openSuSE 10.x: " + +#: downloads.php:74 +msgid "get it here" +msgstr "ściągnij stąd" + +#: downloads.php:78 +msgid " PLD\n" +msgstr " PLD\n" + +#: downloads.php:81 +msgid " Gajim is in the ac-main tree. So just " +msgstr " Gajim znajduje się w repozytorium ac-main. Więc po prostu" + +#: downloads.php:85 +msgid " SourceMage\n" +msgstr " SourceMage\n" + +#: downloads.php:109 +msgid " FreeBSD\n" +msgstr " FreeBSD\n" + +#: downloads.php:112 +msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " +msgstr " Gajim jest dostępny w portach FreeBSD. Po prostu" + +#: downloads.php:114 +msgid "Find out more" +msgstr "Dowiedz się więcej" + +#: downloads.php:118 +msgid " Autopackage\n" +msgstr " Pakiet automatyczny\n" + +#: downloads.php:131 +msgid " Windows installer\n" +msgstr " Instalator dla Windows\n" + +#: downloads.php:134 +#, fuzzy +msgid " There is a " +msgstr " Tutaj znajduje się" + +#: downloads.php:134 +msgid "Gajim installer" +msgstr "instalator Gajima" + +#: downloads.php:143 +msgid " Source\n" +msgstr " Źródła\n" + +#: downloads.php:146 +msgid " The tarball version of Gajim is " +msgstr " Spakowana wersja Gajima jest" + +#: downloads.php:146 +msgid "For information on how to build Gajim," +msgstr "Aby zdobyć " + +#: downloads.php:146 +msgid "in English" +msgstr "po Angielsku" + +#: downloads.php:148 +msgid "" +"If you want to use the last unstable development version, then you should " +"checkout the subversion repository.\n" +msgstr "" +"Jeśli chcesz używać najnowszej niestabilnej wersji, sprawdź repozytorium " +"svn.\n" + +#: downloads.php:154 +msgid " Subversion\n" +msgstr " Subversion\n" + +#: downloads.php:157 +msgid " The subversion server is available at this address: " +msgstr " Serwer SVN jest dostępny pod adresem:" + +#: downloads.php:157 +msgid "and viewable" +msgstr "i można je obejrzeć" + +#: downloads.php:162 +msgid " In order to download Gajim sources, here is what you have to do:\n" +msgstr " Aby pobrać źródła Gajima, musisz:\n" + +#: downloads.php:163 +msgid "" +" You first have to install subversion (<i>apt-get install subversion</i> " +"under Debian)\n" +msgstr "" +" Najpierw musisz zainstalować subversion (<i>apt-get install subversion</" +"i> na Debianie)\n" + +#: downloads.php:165 +msgid " Then in a console, enter the following commands:\n" +msgstr " W konsoli wpisz następujące polecenia:\n" + +#: downloads.php:173 +msgid " Install dependencies, and build Gajim. Please see the" +msgstr " Zainstaluj zależności i skompiluj Gajima. Zwróć uwagę na" + +#: downloads.php:173 +msgid "English" +msgstr "Angielski" + +#: downloads.php:173 +msgid "for details.\n" +msgstr "aby poznać szczegóły.\n" + +#: downloads.php:176 +msgid " You can run Gajim by typing the following:\n" +msgstr " Możesz uruchomić Gajima wpisując:\n" + +#: downloads.php:180 +msgid "and then" +msgstr "i wtedy" + +#: downloads.php:184 +msgid "" +" Once you have the repository, you can update it periodicaly so it matches " +"the latest version from the server with the following command:\n" +msgstr "" +" Gdy masz już dodane repozytorium, możesz je raz na jakiś czas uaktualniać " +"tak, żeby zgadzało się z serwerem za pomocą następującej komendy:\n" + +#: downloads.php:193 +msgid " Under Windows\n" +msgstr " Na systemie Windows\n" + +#: downloads.php:195 +msgid "" +" You first have to install subversion for windows. In order to do that, " +"download the binary" +msgstr "" +" Najpierw musisz zainstalować subversion dla windows. Aby to zrobić, " +"pobierz pakiet binarny" + +#: downloads.php:197 +msgid "" +" Once subversion is installed, the commands are the same with those under " +"GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " +"them in an MS-DOS command line and you're done." +msgstr "" +" Jeśli zainstalowałeś już subversion, polecenia są takie same jak te pod " +"GNU/Linuksem. Jedyna różnica jest taka, że zamiast uruchamiać launch.sh " +"uruchamiasz launch.bat. Wpisz je w linii komend MS-DOS i gotowe." + +#: downloads.php:199 +msgid " You can also use a graphical program like" +msgstr " Możesz również użyć programu graficznego, jak np." + +#: downloads.php:199 +msgid "to get the latest Subversion version\n" +msgstr "aby zdobyć najnowszą wersję z SVN\n" + +#: downloads.php:201 +msgid "" +" To run Gajim, you need external libraries. You can find a tutorial on the " +"way to install them" +msgstr "" +" Aby uruchomić Gajima potrzebujesz zewnętrznych bibliotek. Możesz znaleźć tutorial " +"z opisem ich instalacji" +#: downloads.php:201 +msgid "On the Wiki" +msgstr "Na Wiki" + +#: downloads.php:206 +msgid " Daily Snapshots\n" +msgstr " Codzienne paczki\n" + +#: downloads.php:209 +msgid "" +" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from svn. You " +"can use them if svn is broken for you at the moment." +msgstr "" +" Każdego dnia o godzinie 01:00 (Strefa czasowa GMT+1) archiwa gz są " +"budowane z svn. Możesz ich używać jeśli nie możesz użyć w tym momencie svn" + +#: downloads.php:209 +msgid "Here to get them" +msgstr "Możesz je zdobyć tutaj" + +#: downloads.php:214 +msgid " Old releases\n" +msgstr " Stare wydania\n" + +#: downloads.php:217 +msgid " You'll find old releases of Gajim" +msgstr " Znajdziesz tam stare wydania Gajima" + +#: index.php:11 +msgid "Hello and welcome to the Gajim project website" +msgstr "Witaj na stronie projektu Gajim" + +#: index.php:14 +msgid "" +"The goal of Gajim is to provide a full featured and easy to use Jabber " +"client. Gajim works nicely with GNOME, but does not require it to run. It is " +"released under the GNU General Public License. If you find bugs or have " +"ideas how Gajim can be better please send tickets" +msgstr "" +"Celem Gajima jest dostarczenie w pełni funkcjonalnego i łatwego w użyciu " +"klienta Jabbera. Gajim działa dobrze z GNOME, ale nie wymaga go do " +"uruchomienia. Jest wydany na licencji GNU General Public License. Jeśli " +"znalazłeś błędy albo masz pomysł jak ulepszyć Gajima prześlij nam je proszę." + +#: index.php:22 +msgid "FEATURES:" +msgstr "MOŻLIWOŚCI:" + +#: index.php:24 +msgid "Tabbed chat window and single window modes" +msgstr "Rozmowy w kartach i tryb pojedyńczego okna" + +#: index.php:25 +msgid "" +"Group chat support (with MUC protocol), invitation, chat to groupchat " +"transformation, minimize groupchat to roster" +msgstr "" +"Wsparcie dla konferencji (protokół MUC), zaproszenie, transformacja rozmowa-" +"konferencja, minimalizowanie konferencji do listy kontaktów" + +#: index.php:26 +msgid "Emoticons, Avatars, PEP (user activity, mood and tune)" +msgstr "Emotikony, Avatary, PEP (aktywność użytkoników, nastrój i dostrajanie)" + +#: index.php:27 +msgid "File transfer, Room Bookmarks" +msgstr "Transport plików, Zakładki pokoji" + +#: index.php:28 +msgid "Metacontacts Support" +msgstr "Wsparcie dla metakontaktów" + +#: index.php:29 +msgid "Trayicon, Speller, extented chat history functionalities" +msgstr "" +"Ikona w trayu systemowym, Sprawdzanie pisowni, Poszerzona funkcjonalność " +"historii" + +#: index.php:30 +msgid "TLS, GPG and End-To-End encryption support (with SSL legacy support)" +msgstr "TLS, GPG i szyfrowanie End-To-End (ze wsparciem dla SSL legacy)" + +#: index.php:31 +msgid "Transport Registration support" +msgstr "Wsparcie dla rejstracji Transportów" + +#: index.php:32 +msgid "Service Discovery including Nodes, user search" +msgstr "Wykrywanie usług, wyszukiwanie użytkowników" + +#: index.php:33 +msgid "Wikipedia, dictionary and search engine lookup" +msgstr "Dostęp do Wikipedii, słownika i wyszukiwarek" + +#: index.php:34 +msgid "Multiple accounts support" +msgstr "Wsparcie dla wielu kont" + +#: index.php:35 +msgid "DBus Capabilities. Read" +msgstr "Wsparcie dla DBus. Dowiedz" + +#: index.php:35 +msgid "more information" +msgstr "się więcej" + +#: index.php:36 +msgid "XML Console" +msgstr "Konsola XML" + +#: index.php:37 +msgid "link local (bonjour / zeroconf)" +msgstr "łączenie lokalne (bonjour / zeroconf)" + +#: index.php:38 +#, fuzzy +msgid "" +"Gajim is available in 24 languages: Basque, Belarusian, Brasilian, British, " +"Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, " +"Esperanto, French, Galician, German, Italian, Lithuanian, Norwegian " +"(Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and Ukrainian" +msgstr "" +"Gajim jest dostępny w 27 językach: Baskijskim, Białorusiński, Brazylijskim, " +"Bretońskim, Brytyjskim, Bułgarskim, Chińskim (uproszczonym), Chorwackim, " +"Czeskim, Duńskim, Holenderskim, Angielskim, Esperanto, Francuskim, " +"Galicyjskim, Niemieckim, Greckim, Włoskim, Litewskim, Norweskim (Bokmål), " +"Polskim, Portugalskim, Rosyjskim, Serbskim, Hiszpańskim, Słowackim i " +"Szwedzkim." + +#: index.php:48 +msgid "NEWS" +msgstr "AKTUALNOŚCI" + +#: index.php:51 index.php:52 +#, c-format +msgid "Gajim %s is here!" +msgstr "Gajim %s już jest!" + +#: index.php:53 +#, fuzzy, c-format +msgid "Beta-release of Gajim %s" +msgstr "Przedpremierowe wydanie Gajima %s" + +#: index.php:54 +#, c-format +msgid "Alpha-release of Gajim %s" +msgstr "Wydano wersję alpha %s" + +#: index.php:57 +#, fuzzy +msgid "21 December 2008" +msgstr "13 Grudnia 2007" + +#: index.php:58 +#, fuzzy +msgid "17 December 2008" +msgstr "13 Grudnia 2007" + +#: index.php:59 +#, fuzzy +msgid "12 November 2008" +msgstr "17 Listopada 2007" + +#: index.php:60 +msgid "12 August 2008" +msgstr "12 Sierpnia 2008" + +#: index.php:63 index.php:64 +#, c-format +msgid "Version %s of Gajim has been released." +msgstr "Wersja %s Gajima została wydana" + +#: index.php:65 +#, fuzzy, c-format +msgid "Version %s will arrive very soon." +msgstr "Wersja %s już wktrótce." + +#: index.php:66 +#, c-format +msgid "Version %s will arrive soon." +msgstr "Wersja %s już wktrótce." + +#: index.php:70 index.php:71 index.php:72 index.php:73 +#, c-format +msgid "What's new since %s:" +msgstr "Co nowego od czasu %s:" + +#: index.php:77 +msgid "Fix filetransfer" +msgstr "Naprawione przesyłanie plików" + +#: index.php:78 +#, fuzzy +msgid "Updated german translation" +msgstr "Uaktualnione tłumaczenie na język niemiecki" + +#: index.php:79 +msgid "Fix click on notifications when text string is empty" +msgstr "Naprawione klikanie na powiadomienia nie zawierające tekstu" + +#: index.php:80 +msgid "Improve systray popup menu" +msgstr "Poprawione menu ikony w tacce systemowej" + +#: index.php:84 +msgid "Fix text rendering in notifications" +msgstr "Poprawione renderowanie tekstu w powiadomieniach" + +#: index.php:85 +#, fuzzy +msgid "Fix forward unread messages under Windows" +msgstr "Poprawiony Idle i języki nie-ascii pod Windows" + +#: index.php:86 +msgid "Better sessions support" +msgstr "Lepsze wsparcie dla sesji" + +#: index.php:87 +msgid "Better auto-away support" +msgstr "Lepsze wsparcie dla automatycznego statusu \"Zaraz wracam\"" + +#: index.php:88 +msgid "Fix banshee support" +msgstr "Poprawione wsparcie dla banshee" + +#: index.php:89 +#, fuzzy +msgid "Quodlibet support" +msgstr "Wsparcie dla wielu kont" + +#: index.php:90 +msgid "Fix GSSAPI authentification" +msgstr "Poprawiona autentyfikacja GSSAPI" + +#: index.php:91 +msgid "" +"Those translations have been temporarily removed because they are outdated: " +"Breton (br), Greek (el), Dutch (nl), Portugese (pt)." +msgstr "" +"Poniższe tłumaczenia zostały tymczasowo usunięte gdyż są przestarzałe: " +"Bretońskie (br), Greckie (el), Duńskie (nl), Portugalskie (pt)." + +#: index.php:92 index.php:102 index.php:115 +msgid "Full ChangeLog" +msgstr "Pełna lista zmian (ChangeLog)" + +#: index.php:93 index.php:103 index.php:116 +msgid "Bugs/Annoyances closed" +msgstr "Błędy/Niewygody zamknięte" + +#: index.php:97 +msgid "Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism" +msgstr "Ulepszone mechanizmy bezpieczeństwa: Autentyfikacja Kerberos (GSSAPI) poprzez SASL" + +#: index.php:98 +msgid "Improve GUI of some windows" +msgstr "Poprawiony interfejs niektórych okien" + +#: index.php:99 +msgid "Fix handling of invalid XML" +msgstr "Poprawiona obsługa nieprawidłowych tagów XML" + +#: index.php:100 +msgid "Fix freeze on connection" +msgstr "Poprawione zamarzanie przy połączeniu" + +#: index.php:101 +#, fuzzy +msgid "Improved windows installer" +msgstr "Nowy instalator dla Windows" + +#: index.php:104 index.php:117 +msgid "Known Bugs/Annoyances" +msgstr "Znane błędy/niewygody" + +#: index.php:108 +msgid "" +"Security improvements: End-to-End encryption, SSL certificat verification" +msgstr "" +"Poprawione bezpieczeństwo: szyfrowanie End-to-End, weryfikacja certyfikatów " +"SSL" + +#: index.php:109 +msgid "Ability to minimize groupchats in roster" +msgstr "Możliwość minimalizacji rozmów gupowych do listy" + +#: index.php:110 +msgid "Chat to groupchat transformation" +msgstr "Transformacja rozmowy do konferencji" + +#: index.php:111 +msgid "Block/Unblock contacts directly from roster" +msgstr "Blokuj/Odblokowywuj kontakty bezpośrednio z listy" + +#: index.php:112 +msgid "Single window mode" +msgstr "Tryb pojedyńczego okna" + +#: index.php:113 +msgid "PEP support (User activity, mood and tune)" +msgstr "Wsparcie dla PEP" + +#: index.php:114 +msgid "Much faster contact list" +msgstr "Dużo szybsza lista kontaktów" + +#: screenshots.php:11 +msgid "Here are some screenshots of Gajim:" +msgstr "Tutaj możesz zobaczyć zrzuty ekranu z Gajima:" + +#~ msgid "page.\n" +#~ msgstr "strony.\n" + +#~ msgid "and" +#~ msgstr "i" + +#~ msgid " You can now" +#~ msgstr " Teraz możesz" + +#~ msgid " Gajim uses the" +#~ msgstr " Gajim używa biblioteki" + +#~ msgid " A %s version is in test" +#~ msgstr " Wersja %s jest w fazie testów" + +#~ msgid " You need: " +#~ msgstr " Potrzebujesz:" + +#~ msgid "gajim rpm" +#~ msgstr "gajim rpm" + +#~ msgid "pydns rpm" +#~ msgstr "pydns rpm" + +#~ msgid "python-sqlite2 rpm" +#~ msgstr "python-sqlite2 rpm" + +#~ msgid " There is a Gajim installer " +#~ msgstr " Istnieje instalator Gajima" + +#~ msgid "with GTK+ included" +#~ msgstr "z dołączonym GTK+" + +#~ msgid "without GTK+" +#~ msgstr "bez GTK+" + +#~ msgid "for 0.12-alpha version" +#~ msgstr "dla wersji 0.12-alpha" + +#~ msgid " The tarball version of 0.12 alpha-release is " +#~ msgstr " Archiwum dla wersji 0.12 alpha jest" + +#~ msgid " To run Gajim, you need" +#~ msgstr " Aby uzywać Gajima, potrzebujesz" + +#~ msgid "(Version 2.4 or higher, 2.5 is recommended)," +#~ msgstr "(Wersja 2.4 lub wyższa, zalecana 2.5)," + +#~ msgid "" +#~ "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " +#~ "gimp-win.sf.net will NOT work (libglade is missing)," +#~ msgstr "" +#~ "(Wersja 2.6.x lub wyższa, 2.10.x jest zalecana) UWAGA: Biblioteki GTK+ z " +#~ "pakietu gimp-win.sf.net NIE będą działąć (brak libglade)," + +#~ msgid "GTK Runtime Environment" +#~ msgstr "Środowisko GTK" + +#~ msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" +#~ msgstr "PyGTK dla Windows (PyGTK wraz z pycairo i pygobject)" + +#~ msgid "and at last" +#~ msgstr "i na końcu" + +#~ msgid "by Mark Hammond." +#~ msgstr "przez Marka Hammonda." + +#~ msgid "01 April 2008" +#~ msgstr "01 Kwietnia 2008" + +#~ msgid "06 December 2007" +#~ msgstr "06 Grudnia 2007" + +#~ msgid "22 September 2007" +#~ msgstr "22 Września 2007" + +#~ msgid "09 September 2007" +#~ msgstr "09 Września 2007" + +#~ msgid "18 February 2007" +#~ msgstr "18 Lutego 2007" + +#~ msgid "07 February 2007" +#~ msgstr "07 Lutego 2007" + +#~ msgid "19 December 2006" +#~ msgstr "19 Grudnia 2006" + +#~ msgid "New Windows Installer with GTK+ included." +#~ msgstr "Nowy instalator dla Windows z dołączonym GTK+" + +#~ msgid "What's new in it:" +#~ msgstr "Co jest w nim nowego:" + +#~ msgid "" +#~ "GTK+ 2.12.9 is included. This fixes a bug when minimizing Gajim to " +#~ "taskbar, and improve stability." +#~ msgstr "" +#~ "GTK+ 2.12.9 jest dołączone. Naprawia to błąd z minimalizowaniem Gajima do " +#~ "paska zadań, i zwiększa stabilność" + +#~ msgid "" +#~ "GTK+ 2.12.3 is included instead of 2.10.11. This fixes a bug when right " +#~ "clicking on systray icon." +#~ msgstr "" +#~ "Dołączone jest GTK+ 2.12.3 zamiast 2.10.11. Naprawia to błąd z klikaniem " +#~ "w ikonkę w trayu." + +#~ msgid "Fix decoding error when replying to jabber:iq:time request." +#~ msgstr "Poprawione " + +#~ msgid "This is a bug-fix only release." +#~ msgstr "To wydanie ma na celu wyłączenie poprawienie błędów." + +#~ msgid "This is a bug-fix only release. Nothing new" +#~ msgstr "" +#~ "To wydanie ma na celu wyłączenie poprawienie błędów. Nie zawiera nic " +#~ "nowego" + +#~ msgid "Fix International Domain Name usage" +#~ msgstr "Poprawiony błąd z używaniem Międzynarodowych Nazw Domen" + +#~ msgid "Fixed avatars cache problems in group chats" +#~ msgstr "Naprawiony problem z cache avatarów w rozmowie grupowej" + +#~ msgid "Support of XEP-0199 (XMPP Ping)" +#~ msgstr "Wsparcie dla XEP-0199 (XMPP Ping)" + +#~ msgid "New translation: Serbian" +#~ msgstr "Nowe tłumaczenie: Serbski" + +#~ msgid "Support for Network Manager" +#~ msgstr "Wsparcie dla Network Managera" + +#~ msgid "IPv6 support to connect to server" +#~ msgstr "Wsparcie dla IPv6 przy łączeniu się z serwerem" + +#~ msgid "XHTML Support" +#~ msgstr "Wsparcie dla XHTML" + +#~ msgid "Ad-Hoc commands" +#~ msgstr "Polecenia Ad-Hoc" + +#~ msgid "GNOME Keyring support" +#~ msgstr "Wsparcie dla GNOME Keyring" Modified: www-website/msg.pot =================================================================== --- www-website/msg.pot 2009-01-25 15:24:28 UTC (rev 11019) +++ www-website/msg.pot 2009-01-25 17:42:15 UTC (rev 11020) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-21 14:51+0100\n" +"POT-Creation-Date: 2009-01-25 18:05+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n"

1 0

[commit-gajim] r11019 - trunk/po
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 16:24:28 +0100 (Sun, 25 Jan 2009) New Revision: 11019 Modified: trunk/po/cs.po Log: [nijel] some fixes in Czech translation. Fixes #4729 Modified: trunk/po/cs.po =================================================================== --- trunk/po/cs.po 2009-01-25 09:19:24 UTC (rev 11018) +++ trunk/po/cs.po 2009-01-25 15:24:28 UTC (rev 11019) @@ -1030,7 +1030,7 @@ #: ../data/glade/chat_control_popup_menu.glade.h:3 msgid "Toggle End to End Encryption" -msgstr "Přepnout Open_PGP šifrování" +msgstr "Přepnout šifrování mezi uživateli" #: ../data/glade/chat_control_popup_menu.glade.h:4 msgid "Toggle Open_PGP Encryption" @@ -1338,17 +1338,13 @@ "If you plan to do massive deletions, please make sure Gajim is not running. " "Generally avoid deletions with contacts you currently chat with." msgstr "" -"<big><b>Vítejte do Gajimova Správce Historie</b></big>\n" -"\n" -"Můžete zvolit záznamy nalevo a/nebo prohledat databázi dole.\n" -"\n" "<b>VAROVÁNÍ:</b>\n" "Pokud plánujete rozsáhlé promazání, ujistěte se, že Gajim neběží. Obecně se " "vyvarujte mazání historie kontaktu, se kterým si právě píšete." #: ../data/glade/history_manager.glade.h:3 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>" -msgstr "Gajimův Správce Historie" +msgstr "<big><b>Vítejte do Gajimova Správce Historie</b></big>" #: ../data/glade/history_manager.glade.h:4 msgid "Delete" @@ -2223,7 +2219,7 @@ #: ../data/glade/profile_window.glade.h:9 #: ../data/glade/vcard_information_window.glade.h:11 msgid "<b>Extra Address:</b>" -msgstr "<b>Další adresa:</b." +msgstr "<b>Další adresa:</b>" #. Family Name #: ../data/glade/profile_window.glade.h:11

1 0

[commit-gajim] r11018 - in trunk: . data/glade src src/common
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 10:19:24 +0100 (Sun, 25 Jan 2009) New Revision: 11018 Modified: trunk/configure.ac trunk/data/glade/preferences_window.glade trunk/src/common/config.py trunk/src/common/defs.py trunk/src/common/optparser.py trunk/src/config.py trunk/src/gajim.py trunk/src/systray.py Log: ability to hide systray icon when there is no pending events. Fixes #4645 Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/configure.ac 2009-01-25 09:19:24 UTC (rev 11018) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.0.1-svn],[http://trac.gajim.org/],[gajim]) + [0.12.1.1-svn],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/data/glade/preferences_window.glade 2009-01-25 09:19:24 UTC (rev 11018) @@ -211,45 +211,55 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label379"> + <widget class="GtkComboBox" id="one_window_type_combobox"> + <property name="width_request">50</property> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">_Window behavior:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">one_window_type_combobox</property> + <property name="items" translatable="yes">Detached roster with detached chats +Detached roster with single chat +Single window for everything +Detached roster with chat grouped by account +Detached roster with chat grouped by type</property> + <signal name="changed" handler="on_one_window_type_combo_changed"/> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="emoticons_combobox"> - <property name="visible">True</property> - <signal name="changed" handler="on_emoticons_combobox_changed"/> + <widget class="GtkCheckButton" id="speller_checkbutton"> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> + <property name="label" translatable="yes">_Highlight misspelled words</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_speller_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox5"> + <widget class="GtkCheckButton" id="xhtml_checkbutton"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> - <child> - <widget class="GtkLabel" id="label381"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">_Emoticons:</property> - <property name="use_underline">True</property> - </widget> - </child> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> + <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> </widget> <packing> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -271,56 +281,46 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="xhtml_checkbutton"> + <widget class="GtkEventBox" id="eventbox5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> - <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> + <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> + <child> + <widget class="GtkLabel" id="label381"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Emoticons:</property> + <property name="use_underline">True</property> + </widget> + </child> </widget> <packing> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="speller_checkbutton"> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> - <property name="label" translatable="yes">_Highlight misspelled words</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_speller_checkbutton_toggled"/> + <widget class="GtkComboBox" id="emoticons_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_emoticons_combobox_changed"/> </widget> <packing> + <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="one_window_type_combobox"> - <property name="width_request">50</property> + <widget class="GtkLabel" id="label379"> <property name="visible">True</property> - <property name="items" translatable="yes">Detached roster with detached chats -Detached roster with single chat -Single window for everything -Detached roster with chat grouped by account -Detached roster with chat grouped by type</property> - <signal name="changed" handler="on_one_window_type_combo_changed"/> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Window behavior:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">one_window_type_combobox</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> </widget> @@ -524,6 +524,38 @@ </packing> </child> <child> + <widget class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="label" translatable="yes">Show systray:</property> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="systray_combobox"> + <property name="visible">True</property> + <property name="items" translatable="yes">Never +Only when pending events +Always</property> + <signal name="changed" handler="on_systray_combobox_changed"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">5</property> + </packing> + </child> + <child> <widget class="GtkHBox" id="hbox2"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> @@ -547,7 +579,7 @@ </child> </widget> <packing> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </widget> @@ -678,67 +710,67 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="displayed_chat_states_combobox"> + <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> <property name="visible">True</property> <property name="items" translatable="yes">All chat states Composing only Disabled</property> - <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/> + <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox8"> + <widget class="GtkEventBox" id="eventbox9"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> + <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> <child> - <widget class="GtkLabel" id="label33"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Display chat state notifications:</property> + <property name="label" translatable="yes">_Send chat state notifications:</property> <property name="use_underline">True</property> </widget> </child> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox9"> + <widget class="GtkEventBox" id="eventbox8"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> + <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> <child> - <widget class="GtkLabel" id="label34"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Send chat state notifications:</property> + <property name="label" translatable="yes">_Display chat state notifications:</property> <property name="use_underline">True</property> </widget> </child> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> + <widget class="GtkComboBox" id="displayed_chat_states_combobox"> <property name="visible">True</property> <property name="items" translatable="yes">All chat states Composing only Disabled</property> - <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/> + <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -802,65 +834,60 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="auto_away_checkbutton"> + <widget class="GtkEntry" id="auto_xa_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> - <property name="label" translatable="yes">_Away after:</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> + <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message +$S will be replaced by previous status message +$T will be replaced by auto-not-available timeout</property> + <signal name="changed" handler="on_auto_xa_message_entry_changed"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkCheckButton" id="auto_xa_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> - <property name="label" translatable="yes">_Not available after:</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> - </widget> - <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label77"> + <widget class="GtkEntry" id="auto_away_message_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message +$S will be replaced by previous status message +$T will be replaced by auto-away timeout</property> + <signal name="changed" handler="on_auto_away_message_entry_changed"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label78"> + <widget class="GtkAlignment" id="alignment34"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> + <property name="xalign">1</property> + <property name="xscale">0</property> + <child> + <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> + <property name="width_request">50</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">20 1 1440 1 10 10</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> + </widget> + </child> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -887,62 +914,67 @@ </packing> </child> <child> - <widget class="GtkAlignment" id="alignment34"> + <widget class="GtkLabel" id="label78"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="xscale">0</property> - <child> - <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> - <property name="width_request">50</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">20 1 1440 1 10 10</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> - </widget> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="auto_away_message_entry"> + <widget class="GtkLabel" id="label77"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message -$S will be replaced by previous status message -$T will be replaced by auto-away timeout</property> - <signal name="changed" handler="on_auto_away_message_entry_changed"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="auto_xa_message_entry"> + <widget class="GtkCheckButton" id="auto_xa_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message -$S will be replaced by previous status message -$T will be replaced by auto-not-available timeout</property> - <signal name="changed" handler="on_auto_xa_message_entry_changed"/> + <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> + <property name="label" translatable="yes">_Not available after:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkCheckButton" id="auto_away_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> + <property name="label" translatable="yes">_Away after:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> </widget> </child> </widget> @@ -1100,40 +1132,24 @@ <placeholder/> </child> <child> - <widget class="GtkVButtonBox" id="vbuttonbox3"> + <widget class="GtkScrolledWindow" id="scrolledwindow23"> <property name="visible">True</property> - <property name="spacing">5</property> - <property name="layout_style">GTK_BUTTONBOX_START</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkButton" id="new_msg_button"> + <widget class="GtkTextView" id="msg_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-new</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_new_msg_button_clicked"/> + <property name="border_width">3</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> </widget> </child> - <child> - <widget class="GtkButton" id="delete_msg_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_delete_msg_button_clicked"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -1156,24 +1172,40 @@ </widget> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <widget class="GtkVButtonBox" id="vbuttonbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="spacing">5</property> + <property name="layout_style">GTK_BUTTONBOX_START</property> <child> - <widget class="GtkTextView" id="msg_textview"> + <widget class="GtkButton" id="new_msg_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="can_default">True</property> + <property name="label">gtk-new</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_new_msg_button_clicked"/> </widget> </child> + <child> + <widget class="GtkButton" id="delete_msg_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-delete</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_delete_msg_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -1239,15 +1271,14 @@ <placeholder/> </child> <child> - <widget class="GtkFontButton" id="conversation_fontbutton"> + <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="response_id">0</property> - <signal name="font_set" handler="on_conversation_fontbutton_font_set"/> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Chat message:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -1268,14 +1299,15 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label4"> + <widget class="GtkFontButton" id="conversation_fontbutton"> <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="label" translatable="yes">Chat message:</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <signal name="font_set" handler="on_conversation_fontbutton_font_set"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> </packing> </child> </widget> @@ -1325,35 +1357,43 @@ <placeholder/> </child> <child> - <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> + <widget class="GtkLabel" id="label249"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">T_heme:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">theme_combobox</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="manage_theme_button"> + <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> - <property name="label" translatable="yes">Use _transports icons</property> + <property name="tooltip" translatable="yes">Configure color and font of the interface</property> + <property name="label" translatable="yes">Ma_nage...</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> + <signal name="clicked" handler="on_manage_theme_button_clicked"/> </widget> <packing> - <property name="left_attach">1</property> + <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="iconset_combobox"> + <widget class="GtkComboBox" id="theme_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_iconset_combobox_changed"/> + <signal name="changed" handler="on_theme_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -1372,45 +1412,37 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="theme_combobox"> + <widget class="GtkComboBox" id="iconset_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_theme_combobox_changed"/> + <signal name="changed" handler="on_iconset_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkButton" id="manage_theme_button"> + <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Configure color and font of the interface</property> - <property name="label" translatable="yes">Ma_nage...</property> + <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="label" translatable="yes">Use _transports icons</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <signal name="clicked" handler="on_manage_theme_button_clicked"/> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label249"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">T_heme:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">theme_combobox</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> </widget> </child> </widget> @@ -1450,65 +1482,119 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label72"> + <widget class="GtkHBox" id="hbox3022"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Incoming message:</property> - <property name="use_underline">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">incoming_msg_colorbutton</property> + <child> + <widget class="GtkLabel" id="label383"> + <property name="visible">True</property> + </widget> + <packing> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="reset_colors_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_reset_colors_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment52"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox2936"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image439"> + <property name="visible">True</property> + <property name="stock">gtk-revert-to-saved</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label217"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Reset to Default Colors</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </widget> <packing> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="incoming_msg_colorbutton"> + <widget class="GtkColorButton" id="url_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkLabel" id="label371"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Outgoing message:</property> + <property name="label" translatable="yes">_URL highlight:</property> <property name="use_underline">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">outgoing_msg_colorbutton</property> + <property name="mnemonic_widget">url_msg_colorbutton</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> + <widget class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> @@ -1530,120 +1616,66 @@ </packing> </child> <child> - <widget class="GtkColorButton" id="status_msg_colorbutton"> + <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label371"> + <widget class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_URL highlight:</property> + <property name="label" translatable="yes">_Outgoing message:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">url_msg_colorbutton</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">outgoing_msg_colorbutton</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="url_msg_colorbutton"> + <widget class="GtkColorButton" id="incoming_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3022"> + <widget class="GtkLabel" id="label72"> <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="label383"> - <property name="visible">True</property> - </widget> - <packing> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="reset_colors_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_reset_colors_button_clicked"/> - <child> - <widget class="GtkAlignment" id="alignment52"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox2936"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image439"> - <property name="visible">True</property> - <property name="stock">gtk-revert-to-saved</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label217"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Reset to Default Colors</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Incoming message:</property> + <property name="use_underline">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">incoming_msg_colorbutton</property> </widget> <packing> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> </widget> @@ -1730,85 +1762,85 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="custom_file_manager_entry"> + <widget class="GtkLabel" id="label199"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_file_manager_entry_changed"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Browser:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">custom_browser_entry</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label355"> + <widget class="GtkLabel" id="label200"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_File manager:</property> + <property name="label" translatable="yes">_Mail client:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_file_manager_entry</property> + <property name="mnemonic_widget">custom_mail_client_entry</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_browser_entry"> + <widget class="GtkEntry" id="custom_mail_client_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_browser_entry_changed"/> + <signal name="changed" handler="on_custom_mail_client_entry_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_mail_client_entry"> + <widget class="GtkEntry" id="custom_browser_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_mail_client_entry_changed"/> + <signal name="changed" handler="on_custom_browser_entry_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label200"> + <widget class="GtkLabel" id="label355"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Mail client:</property> + <property name="label" translatable="yes">_File manager:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_mail_client_entry</property> + <property name="mnemonic_widget">custom_file_manager_entry</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label199"> + <widget class="GtkEntry" id="custom_file_manager_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Browser:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_browser_entry</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_custom_file_manager_entry_changed"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> @@ -1872,18 +1904,19 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> + <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> - <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> + <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> + <property name="label" translatable="yes">Log _encrypted chat session</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> + <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> @@ -1903,19 +1936,18 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> + <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> - <property name="label" translatable="yes">Log _encrypted chat session</property> + <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> + <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> + <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> </widget> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/src/common/config.py 2009-01-25 09:19:24 UTC (rev 11018) @@ -98,7 +98,7 @@ 'last_status_msg_dnd': [ opt_str, '' ], 'last_status_msg_invisible': [ opt_str, '' ], 'last_status_msg_offline': [ opt_str, '' ], - 'trayicon': [ opt_bool, True, '', True ], + 'trayicon': [opt_str, 'always', _("When to show systray icon. Can be 'never', 'on_event', 'always'."), True], 'iconset': [ opt_str, DEFAULT_ICONSET, '', True ], 'mood_iconset': [ opt_str, DEFAULT_MOOD_ICONSET, '', True ], 'activity_iconset': [ opt_str, DEFAULT_ACTIVITY_ICONSET, '', True ], @@ -269,7 +269,7 @@ 'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to systray icon.')], 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], 'latex_png_dpi': [opt_str, '108',_('Change the value to change the size of latex formulas displayed. The higher is larger.') ], - 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled seperately)')], + 'uri_schemes': [opt_str, 'aaa aaas acap cap cid crid data dav dict dns fax file ftp go gopher h323 http https icap im imap info ipp iris iris.beep iris.xpc iris.xpcs iris.lwz ldap mid modem msrp msrps mtqp mupdate news nfs nntp opaquelocktoken pop pres rtsp service shttp sip sips snmp soap.beep soap.beeps tag tel telnet tftp thismessage tip tv urn vemmi xmlrpc.beep xmlrpc.beeps z39.50r z39.50s about cvs daap ed2k feed fish git iax2 irc ircs ldaps magnet mms rsync ssh svn sftp smb webcal', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled seperately)'), True], } __options_per_key = { Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/src/common/defs.py 2009-01-25 09:19:24 UTC (rev 11018) @@ -26,7 +26,7 @@ docdir = '../' datadir = '../' -version = '0.12.0.1-svn' +version = '0.12.1.1-svn' import sys, os.path for base in ('.', 'common'): Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/src/common/optparser.py 2009-01-25 09:19:24 UTC (rev 11018) @@ -187,6 +187,8 @@ self.update_config_to_01144() if old < [0, 12, 0, 1] and new >= [0, 12, 0, 1]: self.update_config_to_01201() + if old < [0, 12, 1, 1] and new >= [0, 12, 1, 1]: + self.update_config_to_01211() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -563,8 +565,8 @@ cur.executescript( ''' CREATE TABLE IF NOT EXISTS rooms_last_message_time( - jid_id INTEGER PRIMARY KEY UNIQUE, - time INTEGER + jid_id INTEGER PRIMARY KEY UNIQUE, + time INTEGER ); ''' ) @@ -607,5 +609,13 @@ replace(' xmpp', '') gajim.config.set('uri_schemes', new_values) gajim.config.set('version', '0.12.0.1') + + def update_config_to_01211(self): + if 'trayicon' in self.old_values: + if self.old_values['trayicon'] == 'False': + gajim.config.set('trayicon', 'never') + else: + gajim.config.set('trayicon', 'always') + gajim.config.set('version', '0.12.1.1') # vim: se ts=3: Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/src/config.py 2009-01-25 09:19:24 UTC (rev 11018) @@ -301,6 +301,15 @@ st = gajim.config.get('autopopupaway') self.auto_popup_away_checkbutton.set_active(st) + # Systray + systray_combobox = self.xml.get_widget('systray_combobox') + if gajim.config.get('trayicon') == 'never': + systray_combobox.set_active(0) + elif gajim.config.get('trayicon') == 'on_event': + systray_combobox.set_active(1) + else: + systray_combobox.set_active(2) + # sounds if gajim.config.get('sounds_on'): self.xml.get_widget('play_sounds_checkbutton').set_active(True) @@ -720,6 +729,15 @@ def on_auto_popup_away_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'autopopupaway') + def on_systray_combobox_changed(self, widget): + active = widget.get_active() + if active == 0: + gajim.config.set('trayicon', 'never') + elif active == 1: + gajim.config.set('trayicon', 'on_event') + else: + gajim.config.set('trayicon', 'always') + def on_advanced_notifications_button_clicked(self, widget): dialogs.AdvancedNotificationsWindow() Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/src/gajim.py 2009-01-25 09:19:24 UTC (rev 11018) @@ -3265,7 +3265,7 @@ if self.systray_capabilities: self.systray = systray.Systray() - if self.systray_capabilities and gajim.config.get('trayicon'): + if self.systray_capabilities and gajim.config.get('trayicon') != 'never': self.show_systray() path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png') Modified: trunk/src/systray.py =================================================================== --- trunk/src/systray.py 2009-01-24 14:01:15 UTC (rev 11017) +++ trunk/src/systray.py 2009-01-25 09:19:24 UTC (rev 11018) @@ -99,6 +99,10 @@ state = 'event' else: state = self.status + if state != 'event' and gajim.config.get('trayicon') == 'on_event': + self.t.hide() + else: + self.t.show() image = gajim.interface.jabber_state_images['16'][state] if image.get_storage_type() == gtk.IMAGE_ANIMATION: self.img_tray.set_from_animation(image.get_animation())

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2009