[Xfce4-commits] xfdesktop:master l10n: Updated Lithuanian (lt) translation to 37%
Updating branch refs/heads/master to 5d2565708709ccb05a4740666bd5bc3480377031 (commit) from c2415720d921dcf71ad4f9e6f4243e9d51c21ffe (commit) commit 5d2565708709ccb05a4740666bd5bc3480377031 Author: Ričardas Vasiulis ricarda...@inbox.lt Date: Sat Dec 4 11:05:28 2010 +0100 l10n: Updated Lithuanian (lt) translation to 37% New status: 74 messages complete with 62 fuzzies and 64 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/lt.po | 531 ++ 1 files changed, 185 insertions(+), 346 deletions(-) diff --git a/po/lt.po b/po/lt.po index ccc77c2..58e035d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2,24 +2,24 @@ # Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the xfdesktop package. # Mantas Zapolskas man...@users.sf.net, 2003. -# +# msgid msgstr Project-Id-Version: xfdesktop 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-04 20:14+0100\n +POT-Creation-Date: 2010-12-04 05:09+\n PO-Revision-Date: 2005-10-09 22:19+0900\n Last-Translator: Mantas Zapolskas man...@users.sf.net\n Language-Team: Lithuanian komp...@konferencijos.lt\n -Language: lt\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: lt\n #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 -#, fuzzy, c-format +#, c-format msgid Backdrop list file is not valid -msgstr Pasirinkite fonų sąrašo failo vardą +msgstr Netinkamas fonų sąrašo failas #. no need to escape markup; it's already done for us #: ../settings/main.c:162 @@ -28,104 +28,98 @@ msgid %s\n iSize: %dx%d/i msgstr +%s\n +iDydis: %dx%d/i #: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 #: ../src/xfdesktop-special-file-icon.c:413 msgid Home -msgstr +msgstr Pradžia #: ../settings/main.c:274 -#, fuzzy msgid Filesystem -msgstr sistema +msgstr Failų išdėstymo sistema #: ../settings/main.c:276 -#, fuzzy msgid Trash -msgstr Leistukas +msgstr Šiukšlinė #: ../settings/main.c:278 msgid Removable Devices -msgstr +msgstr Išimami įrenginiai #: ../settings/main.c:458 -#, fuzzy, c-format +#, c-format msgid Cannot create backdrop list \%s\ -msgstr Sukurti fonų sąrašą +msgstr Nepavyko sukurti fonų sąrašo „%s” #: ../settings/main.c:462 ../settings/main.c:779 -#, fuzzy msgid Backdrop List Error -msgstr Fonų sąrašas +msgstr Fonų sąrašo klaida #: ../settings/main.c:487 -#, fuzzy msgid Create/Load Backdrop List -msgstr Sukurti fonų sąrašą +msgstr Sukurti / įkelti fonų sąrašą #: ../settings/main.c:511 #, c-format -msgid -File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? -msgstr +msgid File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? +msgstr Failas „%s” nėra tinkamas fonų sąrašo failas. Ar norite jį perrašyti? #: ../settings/main.c:516 #, fuzzy msgid Invalid List File -msgstr Rodyti Failų +msgstr Netinkamas failų sąrašas #: ../settings/main.c:519 msgid Overwriting the file will cause its contents to be lost. -msgstr +msgstr Perrašant failą galima prarasti informaciją. #: ../settings/main.c:521 -#, fuzzy msgid Replace -msgstr Mastelis +msgstr Pakeisti #: ../settings/main.c:775 -#, fuzzy, c-format +#, c-format msgid Failed to write backdrop list to \%s\ -msgstr Redaguoti fonų sąrašą +msgstr Nepavyko įrašyti fonų sąrašo į „%s” #: ../settings/main.c:802 -#, fuzzy msgid Add Image File(s) -msgstr Paveikslų Failai +msgstr Pridėti vaizdo failą (-us) #: ../settings/main.c:811 msgid Image files msgstr Paveiksliukų failai #: ../settings/main.c:816 -#, fuzzy msgid All files -msgstr Visi Failai +msgstr Visi failai -#: ../settings/main.c:1249 -#, fuzzy, c-format +#: ../settings/main.c:1248 +#, c-format msgid Screen %d, Monitor %d (%s) -msgstr Ekranas %d, Monitorius %d +msgstr Ekranas %d, Monitorius %d (%s) -#: ../settings/main.c:1254 +#: ../settings/main.c:1252 #, c-format msgid Screen %d, Monitor %d msgstr Ekranas %d, Monitorius %d -#: ../settings/main.c:1257 +#: ../settings/main.c:1255 #, c-format msgid Screen %d msgstr Ekranas %d -#: ../settings/main.c:1263 +#: ../settings/main.c:1260 #, c-format msgid Monitor %d (%s) -msgstr +msgstr Monitorius %d (%s) -#: ../settings/main.c:1268 -#, fuzzy, c-format +#: ../settings/main.c:1264 +#, c-format msgid Monitor %d -msgstr Ekranas %d, Monitorius %d +msgstr Monitorius %d #: ../settings/main.c:1477 msgid Settings manager socket @@ -136,64 +130,59 @@ msgid SOCKET ID msgstr #: ../settings/main.c:1478 -#, fuzzy msgid Version information -msgstr Atmesti modifikacijas +msgstr Versijos informacija #: ../settings/main.c:1498 #, c-format msgid Type '%s --help' for usage. -msgstr +msgstr Tipui „%s - help” kad gauti naudojimas. #: ../settings/main.c:1510 +#, fuzzy msgid The Xfce development team. All rights reserved. -msgstr +msgstr Xfce
[Xfce4-commits] xfdesktop:master Updates for release.
Updating branch refs/heads/master to 8578b2dfaab04c523e7fa315656e158676e34ae9 (commit) from 5d2565708709ccb05a4740666bd5bc3480377031 (commit) commit 8578b2dfaab04c523e7fa315656e158676e34ae9 Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 11:28:10 2010 +0100 Updates for release. NEWS| 15 --- configure.ac.in |4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 44a3c4a..ad8664d 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,22 @@ -Xfdesktop 4.7.x +Xfdesktop 4.7.3 --- * Fix a crash caused by accessing the wrong variable when adding items to the right-click menu. - * Select the correct icon style in the desktop settings on first + * Select the correct icon style in the desktop settings on first start (bug #6798). * Depend on libwnck = 2.22 so we no longer have to implement hacks for the two different active-workspace-changed signal variants in libwnck (bug #6638). + * Add menu item monitoring. + * Fix critical when session manager is not running (bug #6822). + * Remove checks for older GLib/GTK+ versions that are no longer needed. + * Allow workspace names that start with a number (bug #6318). + * Delay notification initialization until we show one. + * Set the correct session priority. + * Do not call gtk_widget_show() on menus (bug #6198). + * Translation updates: gl, ca, de, it, kk, fi, sk, pt, uk, el, +zh_TW, da, id, eu, hu, lt. Xfdesktop 4.7.2 @@ -26,7 +35,7 @@ Xfdesktop 4.7.1 introduced in Thunar 1.1.3. * Port xfdesktop to thunarx-2. * Translation updates: Portuguese, Basque, Italian, Danish, Kazakh, -Galician, Catalan (Valencian), Spanish (Castilian), Swedish, +Galician, Catalan (Valencian), Spanish (Castilian), Swedish, Finnish, Greek, Japanese, Ukrainian, Russian, Chinese (Taiwan), German, Uyghur. diff --git a/configure.ac.in b/configure.ac.in index 5832422..889027a 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,10 +6,10 @@ dnl dnl version info m4_define([xfdesktop_version_major], [4]) m4_define([xfdesktop_version_minor], [7]) -m4_define([xfdesktop_version_micro], [2]) +m4_define([xfdesktop_version_micro], [3]) m4_define([xfdesktop_version_nano], []) m4_define([xfdesktop_version_build], [...@revision@]) -m4_define([xfdesktop_version_tag],[git]) +m4_define([xfdesktop_version_tag],[]) m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])]) dnl minimum required versions ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Post release tag bump.
Updating branch refs/heads/master to 85fa958a61c2320bd732ed1281cedf35de1a034f (commit) from 24f215db42d5190a127c598f03f19f3195fc63bc (commit) commit 85fa958a61c2320bd732ed1281cedf35de1a034f Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 11:52:38 2010 +0100 Post release tag bump. configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 88c8d62..0b47771 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -15,7 +15,7 @@ m4_define([xfce4_panel_version_minor], [7]) m4_define([xfce4_panel_version_micro], [5]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [...@revision@]) -m4_define([xfce4_panel_version_tag], []) +m4_define([xfce4_panel_version_tag], [git]) m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Updates for release.
Updating branch refs/heads/master to 24f215db42d5190a127c598f03f19f3195fc63bc (commit) from a67084dcbdf4326c69f7536cef32ec791022173f (commit) commit 24f215db42d5190a127c598f03f19f3195fc63bc Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 11:45:49 2010 +0100 Updates for release. NEWS| 30 ++ configure.ac.in |4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 77b50bc..f6c51f9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,33 @@ +4.7.5 += +- Don't destroy the about dialog. +- Allow using enter in the launcher treeviews. +- Fix crash in always group mode (bug #6792). +- Drop the automatic grouping option from tasklist; not implemented yet. +- Fix Gdk key macro names. +- Fix confustion with panel opacity (bug #6827). +- Make miniature view the default in the pager (bug #6825). +- Fix wrong capitalization of Xfce. +- Fix issue in systray size allocation with 1 row (bug #6809). +- Fix 'add launcher' desktop file. +- Improve debugging output for display changes. +- Restore shadow of spin button in systray dialog. +- Add function to return the Xfconf panel name. +- Warning why # pager rows does not apply (bug #6555). +- Gracefully handle abort signal (bug #6563). +- Restart the panel if we receive SIGUSR1. +- Fix format of 12-hour clock. +- Add option to not rotate buttons in vertical panel (bug #6687). +- Propertly handle insensitive clock colors. +- Set correct session priority. +- Improve support for a menu editor (alacarte) in the applications menu. +- Don't destroy the application menu under the users' cursor on reload. +- Add window DND to the pager in tasklist. +- Make viewports work in the tasklist (bug #6898 and #6665). +- Support viewports in button pager. +- Translation updates (be, ca, da, de, eu, fi, gl, hu, id, it, ja, + kk, nl, pt, sk, ta, uk, zh_CN, zh_TW). + 4.7.4 = - Add support for menu monitoring. diff --git a/configure.ac.in b/configure.ac.in index de14fc5..88c8d62 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,10 +12,10 @@ m4_define([libxfce4panel_verinfo], [3:0:0]) dnl current:revision:age m4_define([libxfce4panel_version_api], [1.0]) m4_define([xfce4_panel_version_major], [4]) m4_define([xfce4_panel_version_minor], [7]) -m4_define([xfce4_panel_version_micro], [4]) +m4_define([xfce4_panel_version_micro], [5]) m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version m4_define([xfce4_panel_version_build], [...@revision@]) -m4_define([xfce4_panel_version_tag], [git]) +m4_define([xfce4_panel_version_tag], []) m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel|xfce4-panel-4.7.5 Creating annotated tag xfce4-panel-4.7.5
Updating annotated tag refs/tags/xfce4-panel-4.7.5 as new annotated tag to e791a288c0b08e6dbf396bd478d1cd1498b30f5c (tag) succeeds xfce4-panel-4.7.4 tagged by Nick Schermer n...@xfce.org on 2010-12-04 10:52 + Andhika Padmawan (1): l10n: Updated Indonesian (id) translation to 100% Bauzhan Muftakhidinov (5): l10n: Updated Kazakh (kk) translation to 100% l10n: Updated Kazakh (kk) translation to 100% l10n: Updated Kazakh (kk) translation to 100% l10n: Updated Kazakh (kk) translation to 100% l10n: Updated Kazakh (kk) translation to 100% Cheng-Chia Tseng (1): l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% Cristian Marchi (3): l10n: Updated Italian (it) translation to 100% l10n: Updated Italian (it) translation to 100% l10n: Updated Italian (it) translation to 100% Dmitry Nikitin (1): l10n: Updated Ukrainian (uk) translation to 100% Enrico Tröger (1): Fix Gdk key macro names. Gabor Kelemen (2): l10n: Updated Hungarian (hu) translation to 100% l10n: Updated Hungarian (hu) translation to 100% Harald Servat (2): l10n: Updated Catalan (Valencian) (ca) translation to 100% l10n: Updated Catalan (Valencian) (ca) translation to 100% Jari Rahkonen (1): l10n: Updated Finnish (fi) translation to 100% Johannes Lips (1): l10n: Updated German (de) translation to 95% Leandro Regueiro (1): l10n: Updated Galician (gl) translation to 97% Masato Hashimoto (4): l10n: Updated Japanese (ja) translation to 100% l10n: Updated Japanese (ja) translation to 100% l10n: Updated Japanese (ja) translation to 100% l10n: Updated Japanese (ja) translation to 100% Nick Schermer (42): Post release tag bump. Don't destroy the about dialog. Allow using enter in the launcher treeviews. Fix crash in always group mode (bug #6792). Drop the automatics grouping option from tasklist. l10n: Updated Dutch (Flemish) (nl) translation to 93% Clear the error, so it is usable again. Fix confustion with panel opacity (bug #6827). Make miniature view the default in the pager (bug #6825). Fix wrong capitalization of Xfce. Fix issue in systray size allocation with 1 row (bug #6809). Fix the previous commit with hidden icons. Fix add launcher desktop file. Fix some string and drop Xfce in most of them. Print complete display layout when debugging is enabled. Fix crash in systray with no children. Restore shadow of spin button in systrau dialog. Print Gtk and Glib version in start of log. Add function to return the Xfconf panel name. Warning why # pager rows does not apply (bug #6555). Gracefully handle abort signal (bug #6563). No need to handle SIGHUP. Restart the panel if we receive SIGUSR1. Fix format of 12-hour clock. Add TODO in tasklist. Add option to not rotate buttons in vertical panel (bug #6687). Do not start a motion timeout if button is insensitive. Propertly handle the insensitive clock colors. Do not double-expose the window child (bug #6872). Set session priority. Improve support for a menu editor in the applications menu. Don't destroy the menu under the users' cursor. Add window DND to the pager. Debugging info if window is hidden/shown on output change. Rename some functions. Improve session management signals a bit. Revert Do not double-expose the window child (bug #6872). Make viewports work in the tasklist (bug #6898). Make viewports work like workspaces in tasklist (bug #6665). Remove debug line in previous commit. Support viewports in pager. Updates for release. Nuno Miguel (1): l10n: Updated Portuguese (pt) translation to 100% Paul Seyfert (1): l10n: Updated German (de) translation to 99% Per Kongstad (7): l10n: Updated Danish (da) translation to 100% l10n: Updated Danish (da) translation to 99% l10n: Updated Danish (da) translation to 100% l10n: Updated Danish (da) translation to 100% l10n: Updated Danish (da) translation to 100% l10n: Updated Danish (da) translation to 100% l10n: Updated Danish (da) translation to 100% Piarres Beobide (1): l10n: Updated Basque (eu) translation to 100% Robert Hartl (1): l10n: Updated Slovak (sk) translation to 66% Sergio Marques (5): l10n: Updated Portuguese (pt) translation to 100% l10n: Updated Portuguese (pt) translation to 100% l10n: Updated Portuguese (pt) translation to 100% l10n: Updated Portuguese (pt) translation to 100% l10n: Updated Portuguese (pt) translation to 100% Xu Meihong (1): l10n: Updated Chinese (China) (zh_CN) translation to 100% ___ Xfce4-commits mailing list Xfce4-commits@xfce.org
[Xfce4-commits] xfce4-dict:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 86506dd141c5a14e89429a95a55585669f353cbd (commit) from 8d6a87dd7881f080e58990561a4b958cf8852826 (commit) commit 86506dd141c5a14e89429a95a55585669f353cbd Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 13:15:50 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 110 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 135 + 1 files changed, 64 insertions(+), 71 deletions(-) diff --git a/po/pt.po b/po/pt.po index 4e34b06..93f3191 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,12 +2,12 @@ # Copyright (C) 2006-2007 Enrico Tröger # This file is distributed under the same license as the xfce4-dict package. # Nuno Miguel nu...@netcabo.pt, 2007, 2008, 2009, 2010. -# +# msgid msgstr Project-Id-Version: xfce4-dict 0.6.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-06-07 15:23+0100\n +POT-Creation-Date: 2010-12-04 11:02+\n PO-Revision-Date: 2010-06-07 15:37+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n @@ -20,31 +20,26 @@ msgstr #: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1 msgid A plugin to query different dictionaries. -msgstr Um plugin para consultar diferentes dicionários. +msgstr Um \plug-in\ para consultar diversos dicionários. #: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2 -#: ../src/xfce4-dict.desktop.in.h:2 -#: ../lib/gui.c:628 -#: ../lib/prefs.c:270 +#: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:628 ../lib/prefs.c:270 msgid Dictionary msgstr Dicionário -#: ../panel-plugin/xfce4-dict-plugin.c:346 -#: ../panel-plugin/xfce4-dict-plugin.c:472 -#: ../src/xfce4-dict.c:200 -#: ../lib/spell.c:243 -#: ../lib/gui.c:411 +#: ../panel-plugin/xfce4-dict-plugin.c:347 +#: ../panel-plugin/xfce4-dict-plugin.c:473 ../src/xfce4-dict.c:200 +#: ../lib/spell.c:243 ../lib/gui.c:411 msgid Ready msgstr Pronto -#: ../panel-plugin/xfce4-dict-plugin.c:412 +#: ../panel-plugin/xfce4-dict-plugin.c:413 msgid Look up a word msgstr Encontrar uma palavra -#: ../panel-plugin/xfce4-dict-plugin.c:443 -#: ../lib/gui.c:652 +#: ../panel-plugin/xfce4-dict-plugin.c:444 ../lib/gui.c:652 msgid Search term -msgstr Pesquisar termo +msgstr Termo de pesquisa #: ../src/xfce4-dict.c:51 msgid Search the given text using a Dict server(RFC 2229) @@ -64,11 +59,11 @@ msgstr Obter o foco no campo de texto do painel #: ../src/xfce4-dict.c:55 msgid Start stand-alone application even if the panel plugin is loaded -msgstr Iniciar aplicação independente mesmo se o plugin no painel estiver carregado +msgstr Iniciar aplicação independente mesmo se o \plug-in\ no painel estiver carregado #: ../src/xfce4-dict.c:56 msgid Grabs the PRIMARY selection content and uses it as search text -msgstr Grava o conteúdo da selecção PRIMÁRIA e usa-o como texto de procura +msgstr Grava o conteúdo da selecção PRIMÁRIA e usa-o como texto de pesquisa #: ../src/xfce4-dict.c:57 msgid Be verbose @@ -87,10 +82,9 @@ msgstr [TEXTO] msgid Please report bugs to %s. msgstr Por favor, reporte erros para %s. -#: ../src/xfce4-dict.desktop.in.h:1 -#: ../lib/gui.c:851 +#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:851 msgid A client program to query different dictionaries. -msgstr Um programa para consultar dicionários diferentes. +msgstr Um programa para consultar diversos dicionários. #: ../src/xfce4-dict.desktop.in.h:3 msgid Dictionary Client @@ -98,7 +92,7 @@ msgstr Cliente de Dicionário #: ../lib/spell.c:75 msgid Spell Checker Results: -msgstr Resultados do Verificador Ortográfico: +msgstr Resultados do verificador ortográfico: #: ../lib/spell.c:101 #, c-format @@ -133,18 +127,16 @@ msgstr Erro durante a execução de \%s\ (%s). msgid Please set the spell check command in the preferences dialog. msgstr Por favor, defina o comando do verificador no diálogo de preferências. -#: ../lib/spell.c:208 -#: ../lib/common.c:224 +#: ../lib/spell.c:208 ../lib/common.c:224 msgid Invalid input msgstr Entrada inválida #: ../lib/spell.c:247 #, c-format msgid Process failed (%s) -msgstr Processo falhou (%s) +msgstr Falha do processo (%s) -#: ../lib/speedreader.c:80 -#: ../lib/speedreader.c:683 +#: ../lib/speedreader.c:80 ../lib/speedreader.c:683 msgid P_ause msgstr P_ausa @@ -162,7 +154,7 @@ msgstr Concluído #: ../lib/speedreader.c:274 msgid Speed Reader -msgstr Leitura Rápida +msgstr Leitura rápida #: ../lib/speedreader.c:369 msgid You must enter a text. @@ -175,7 +167,7 @@ msgstr Escolha o ficheiro a carregar #: ../lib/speedreader.c:535 #, c-format msgid The file '%s' could not be loaded. -msgstr O ficheiro '%s' não pôde ser carregado. +msgstr O ficheiro \%s\ não pôde ser carregado. #: ../lib/speedreader.c:561 #, c-format @@ -190,19 +182,19 @@ msgstr Este é um utilitário de leitura para o treinar a ler rapidamente. Func
[Xfce4-commits] xfce-utils:master Set XDG_MENU_PREFIX to xfce- and export it (bug #5980).
Updating branch refs/heads/master to f9e552c4b599949425978e176e5b7222c985fe64 (commit) from c102297da49a821158935d3f51146410be917644 (commit) commit f9e552c4b599949425978e176e5b7222c985fe64 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Dec 4 12:41:09 2010 +0100 Set XDG_MENU_PREFIX to xfce- and export it (bug #5980). NEWS |6 ++ scripts/xinitrc.in.in |5 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 9a2e989..276c5b4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +4.7.x += +- Set XDG_MENU_PREFIX to xfce- and export it (bug #5980). + + 4.7.2 = - Return support for vendor information. @@ -7,6 +12,7 @@ - Translation updates (id, zh_TW, kk, it, fi, gl, da, ca, pt, uk, eu, sk, de, hu). + 4.7.1 = - Drop ck-launch-session as CK is handled in xfce4-session (bug #6684). diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index 45d0c93..b4d2cd5 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -9,6 +9,11 @@ if test x$UID = x; then fi fi +# set $XDG_MENU_PREFIX to xfce- so that xfce-applications.menu is picked +# over applications.menu in all Xfce applications. +XDG_MENU_PREFIX=xfce- +export XDG_MENU_PREFIX + # $XDG_CONFIG_HOME defines the base directory relative to which user specific # configuration files should be stored. If $XDG_CONFIG_HOME is either not set # or empty, a default equal to $HOME/.config should be used. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master Add support for XDG_MENU_PREFIX (bug #5980).
Updating branch refs/heads/master
to ab3d16ac5fb3870d51e1217183a46183427bb218 (commit)
from b53fe3381f46b0bc824762808af0cfcb710c7c9b (commit)
commit ab3d16ac5fb3870d51e1217183a46183427bb218
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Dec 4 12:47:13 2010 +0100
Add support for XDG_MENU_PREFIX (bug #5980).
With this change, we can finally drop the code that tries to guess
the default application menu file, which makes garcon useful for
any desktop environment, regardless of the default .menu file they
decide on.
NEWS |7 ++
garcon/garcon-menu.c | 153 ++
2 files changed, 86 insertions(+), 74 deletions(-)
diff --git a/NEWS b/NEWS
index 1d6b664..9a90cc5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,16 @@
+0.1.x
+=
+- Add support for XDG_MENU_PREFIX; use applications.menu as a fallback
+ (bug #5980).
+
+
0.1.3
=
- Merge consecutive file change events using an idle handler.
- Fix empty charset in Polish translation file (bug #6783).
- Translation updates (pt, ja, id).
+
0.1.2
=
- Fix license headers (bug #6226).
diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index 8a4cd30..2cd1a13 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -63,17 +63,6 @@
-/* Potential root menu files */
-static const gchar GARCON_MENU_ROOT_SPECS[][30] =
-{
- menus/applications.menu,
- menus/xfce-applications.menu,
- menus/gnome-applications.menu,
- menus/kde-applications.menu,
-};
-
-
-
#define GARCON_MENU_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj),
GARCON_TYPE_MENU, GarconMenuPrivate))
@@ -401,7 +390,8 @@ garcon_menu_finalize (GObject *object)
garcon_menu_clear (menu);
/* Free file */
- g_object_unref (menu-priv-file);
+ if (menu-priv-file != NULL)
+g_object_unref (menu-priv-file);
/* Free item pool */
g_object_unref (menu-priv-pool);
@@ -667,9 +657,10 @@ garcon_menu_load (GarconMenu *menu,
GarconMenuParser *parser;
GarconMenuMerger *merger;
GHashTable *desktop_id_table;
+ const gchar *prefix;
gboolean success = TRUE;
gchar*filename;
- guint n;
+ gchar*relative_filename;
g_return_val_if_fail (GARCON_IS_MENU (menu), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -687,29 +678,32 @@ garcon_menu_load (GarconMenu *menu,
menu-priv-file = NULL;
}
- /* Search for a usable applications menu file */
- for (n = 0;
- menu-priv-file == NULL n G_N_ELEMENTS
(GARCON_MENU_ROOT_SPECS);
- ++n)
-{
- /* Search for the applications menu file */
- filename = garcon_config_lookup (GARCON_MENU_ROOT_SPECS[n]);
-
- /* Use the file if it exists */
- if (filename != NULL)
-menu-priv-file = _garcon_file_new_for_unknown_input (filename,
NULL);
-
- /* Free the filename string */
- g_free (filename);
-}
+ /* Build the ${XDG_MENU_PREFIX}applications.menu filename */
+ prefix = g_getenv (XDG_MENU_PREFIX);
+ relative_filename = g_strconcat (menus, G_DIR_SEPARATOR_S,
+ prefix != NULL ? prefix : ,
applications.menu,
+ NULL);
+
+ /* Search for the menu file in user and system config dirs */
+ filename = garcon_config_lookup (relative_filename);
+
+ /* Use the file if it exists */
+ if (filename != NULL)
+menu-priv-file = _garcon_file_new_for_unknown_input (filename, NULL);
/* Abort with an error if no suitable applications menu file was found */
if (menu-priv-file == NULL)
{
g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT,
- _(No suitable application menu file found));
+ _(File \%s\ not found), relative_filename);
+ g_free (relative_filename);
return FALSE;
}
+
+ /* Free the filename strings */
+ g_free (relative_filename);
+ g_free (filename);
+
}
parser = garcon_menu_parser_new (menu-priv-file);
@@ -1831,10 +1825,11 @@ static void
garcon_menu_monitor_menu_files (GarconMenu *menu)
{
GFileMonitor *monitor;
+ const gchar *prefix;
GFile*file;
+ gchar*relative_filename;
gchar **paths;
- guint n;
- gint i;
+ gint n;
g_return_if_fail (GARCON_IS_MENU (menu));
@@ -1851,28 +1846,33 @@ garcon_menu_monitor_menu_files (GarconMenu *menu)
}
else
{
+ /* Build ${XDG_MENU_PREFIX}applications.menu filename */
+ prefix = g_getenv (XDG_MENU_PREFIX);
+ relative_filename = g_strconcat (menus, G_DIR_SEPARATOR_S,
+ prefix != NULL ? prefix : ,
applications.menu,
+ NULL);
+
/* Monitor all application
[Xfce4-commits] xfce4-mixer:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to aecbda9899577c09b43b0977c14bfc1cd25a3dcd (commit) from 84036788d1b74fbcbe5072d6819fe56443938452 (commit) commit aecbda9899577c09b43b0977c14bfc1cd25a3dcd Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 13:22:30 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 37 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 58 +++--- 1 files changed, 27 insertions(+), 31 deletions(-) diff --git a/po/pt.po b/po/pt.po index c32ed96..cdf7372 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ # Copyright (C) 2008 THE xfce4-mixer'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-mixer package. # Nuno Miguel nu...@netcabo.pt, 2007, 2008, 2009. -# +# msgid msgstr Project-Id-Version: xfce4-mixer\n @@ -28,7 +28,7 @@ msgstr Nenhum comando de clique esquerdo definido #: ../panel-plugin/xfce-mixer-plugin.c:349 msgid No left-click command defined yet. You can change this in the plugin properties. -msgstr Nenhum comando de clique esquerdo ainda definido. Pode alterar isto nas propriedades do plugin. +msgstr Nenhum comando de clique esquerdo ainda definido. Pode alterar isto nas propriedades do \plug-in\. #: ../panel-plugin/xfce-mixer-plugin.c:350 msgid Properties @@ -38,20 +38,19 @@ msgstr Propriedades #: ../panel-plugin/xfce-mixer-plugin.c:365 #, c-format msgid Could not execute the command \%s\. Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command. -msgstr Incapaz de executar comando \%s\. Assegure-se de que a localização do comando está incluída na variável de ambiente PATH ou de que forneceu o caminho completo para o comando. +msgstr Incapaz de executar o comando \%s\. Certifique-se que a localização do comando está incluída na variável de ambiente PATH ou de que forneceu o caminho completo para o comando. -#: ../panel-plugin/xfce-mixer-plugin.c:398 -#: ../xfce4-mixer/main.c:89 +#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89 msgid GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem. -msgstr GStreamer foi incapaz de detectar qualquer dispositivo de som. Alguns pacotes específicos do GStreamer podem estar em falta. Também pode ser um problema de permissões. +msgstr O GStreamer não foi capaz de detectar quaisquer dispositivos de som. Pode ser necessário instalar alguns pacotes GStreamer. Pode também ser um problema de permissões. #: ../panel-plugin/xfce-plugin-dialog.c:234 msgid Mixer Plugin -msgstr Plugin Misturador +msgstr \Plug-in\ Misturador #: ../panel-plugin/xfce-plugin-dialog.c:236 msgid Configure the mixer track and left-click command -msgstr Configurar a pista misturadora e comando de clique esquerdo +msgstr Configurar a faixa misturadora e o comando de clique esquerdo #: ../panel-plugin/xfce-plugin-dialog.c:248 msgid Sound card @@ -59,7 +58,7 @@ msgstr Placa de som #: ../panel-plugin/xfce-plugin-dialog.c:266 msgid Mixer track -msgstr Pista misturadora +msgstr Faixa misturadora #: ../panel-plugin/xfce-plugin-dialog.c:284 msgid Left-click command @@ -67,7 +66,7 @@ msgstr Comando de clique esquerdo #: ../panel-plugin/xfce-plugin-dialog.c:322 msgid Select command -msgstr Seleccionar comando +msgstr Seleccione o comando #: ../panel-plugin/xfce-plugin-dialog.c:330 msgid All Files @@ -79,24 +78,23 @@ msgstr Ficheiros executáveis #: ../panel-plugin/xfce-plugin-dialog.c:350 msgid Perl Scripts -msgstr Scripts Perl +msgstr \Scripts\ Perl #: ../panel-plugin/xfce-plugin-dialog.c:356 msgid Python Scripts -msgstr Scripts Python +msgstr \Scripts\ Python #: ../panel-plugin/xfce-plugin-dialog.c:362 msgid Ruby Scripts -msgstr Scripts Ruby +msgstr \Scripts\ Ruby #: ../panel-plugin/xfce-plugin-dialog.c:368 msgid Shell Scripts -msgstr Scripts Shell +msgstr Shell \Scripts\ #. Set application name #: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1 -#: ../xfce4-mixer/main.c:60 -#: ../xfce4-mixer/xfce-mixer-window.c:165 +#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165 #: ../xfce4-mixer/xfce-mixer-window.c:183 #: ../xfce4-mixer/xfce-mixer-window.c:284 #: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2 @@ -110,12 +108,12 @@ msgstr Controlador de volume para a placa de som #: ../libxfce4mixer/libxfce4mixer.c:243 #, c-format msgid Unknown Volume Control %d -msgstr Controlo de Volume Desconhecido %d +msgstr Controlo de volume desconhecido %d #: ../xfce4-mixer/main.c:70 #, c-format msgid Failed to initialize xfconf: %s -msgstr Falhou a iniciar xfconf: %s +msgstr Falha ao iniciar o xfconf: %s #: ../xfce4-mixer/xfce-mixer.c:164 msgid Playback @@ -139,15
[Xfce4-commits] xfdesktop:master Let Garcon decide what menu file to choose. Drop UserMenu kiosk option.
Updating branch refs/heads/master
to 7749a45105e9437403e953c1be947e8752ea0420 (commit)
from 2fb8c140ad2d4913f45d4774690f08f6f70de944 (commit)
commit 7749a45105e9437403e953c1be947e8752ea0420
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Dec 4 13:21:30 2010 +0100
Let Garcon decide what menu file to choose. Drop UserMenu kiosk option.
Garcon now supports XDG_MENU_PREFIX which we can use to make
xfce-applications.menu the default menu file in all our applications.
This way, xfdesktop no longer needs to decide which file to pick on
its own. The bad news is that this makes the UserMenu kiosk option
nearly impossible. Therefor I decided to drop it; we don't restrict
the application menu in the panel either, so why should we do here?
src/menu.c |2 +-
src/xfce-desktop-menu.c | 86 --
src/xfce-desktop-menu.h |3 +-
3 files changed, 10 insertions(+), 81 deletions(-)
diff --git a/src/menu.c b/src/menu.c
index 6e67394..4cc0af3 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -57,7 +57,7 @@ _stop_menu_module(void) {
static gboolean
_start_menu_module(void)
{
-desktop_menu = xfce_desktop_menu_new(NULL, TRUE);
+desktop_menu = xfce_desktop_menu_new(TRUE);
if(desktop_menu) {
xfce_desktop_menu_set_show_icons(desktop_menu,
show_desktop_menu_icons);
return TRUE;
diff --git a/src/xfce-desktop-menu.c b/src/xfce-desktop-menu.c
index f0615ef..2e3b1de 100644
--- a/src/xfce-desktop-menu.c
+++ b/src/xfce-desktop-menu.c
@@ -4,7 +4,7 @@
* 2003 Biju Chacko (bot...@users.sourceforge.net)
* 2004 Danny Milosavljevic danny.m...@gmx.net
*2004-2008 Brian Tarricone bj...@cornell.edu
- * 2009 Jannis Pohlmann jan...@xfce.org
+ *2009-2010 Jannis Pohlmann jan...@xfce.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -185,31 +185,19 @@ static gboolean
_generate_menu(XfceDesktopMenu *desktop_menu)
{
gboolean ret = TRUE;
-XfceKiosk *kiosk;
-gboolean user_menu;
GError *error = NULL;
_xfce_desktop_menu_free_menudata(desktop_menu);
-if(!desktop_menu-filename) {
-g_critical(%s: can't load menu: no menu file found, PACKAGE);
-return FALSE;
-}
-
-kiosk = xfce_kiosk_new(xfdesktop);
-user_menu = xfce_kiosk_query(kiosk, UserMenu);
-xfce_kiosk_free(kiosk);
-
-DBG(menu file name is %s, desktop_menu-filename);
-
-if(desktop_menu-garcon_menu)
-g_object_unref(G_OBJECT(desktop_menu-garcon_menu));
+/* allocate a menu for the ${XDG_MENU_PREFIX}applications.menu file */
+desktop_menu-garcon_menu = garcon_menu_new_applications();
-desktop_menu-garcon_menu =
garcon_menu_new_for_path(desktop_menu-filename);
+/* make sure the member variable is set to NULL when the object is
destroyed */
+g_object_add_weak_pointer (G_OBJECT (desktop_menu-garcon_menu),
+ (gpointer) desktop_menu-garcon_menu);
if(!garcon_menu_load (desktop_menu-garcon_menu, NULL, error)) {
-g_critical(Unable to create GarconMenu from file '%s': %s,
- desktop_menu-filename, error-message);
+g_warning(Unable to load menu: %s, error-message);
g_error_free(error);
_xfce_desktop_menu_free_menudata(desktop_menu);
return FALSE;
@@ -226,10 +214,7 @@ _xfce_desktop_menu_free_menudata(XfceDesktopMenu
*desktop_menu)
{
if(desktop_menu-garcon_menu) {
g_object_unref(G_OBJECT(desktop_menu-garcon_menu));
-desktop_menu-garcon_menu = NULL;
}
-
-desktop_menu-garcon_menu = NULL;
}
static gboolean
@@ -245,56 +230,8 @@ _generate_menu_idled(gpointer data)
return FALSE;
}
-static gchar *
-xfce_desktop_get_menufile(void)
-{
-XfceKiosk *kiosk;
-gboolean user_menu;
-gchar *menu_file = NULL;
-gchar **all_dirs;
-const gchar *userhome = xfce_get_homedir();
-gint i;
-
-kiosk = xfce_kiosk_new(xfdesktop);
-user_menu = xfce_kiosk_query(kiosk, UserMenu);
-xfce_kiosk_free(kiosk);
-
-if(user_menu) {
-gchar *file = xfce_resource_save_location(XFCE_RESOURCE_CONFIG,
-
menus/xfce-applications.menu,
- FALSE);
-if(file) {
-DBG(checking %s, file);
-if(g_file_test(file, G_FILE_TEST_IS_REGULAR))
-return file;
-else
-g_free(file);
-}
-}
-
-all_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_CONFIG,
-menus/xfce-applications.menu);
-for(i = 0; all_dirs[i]; i++) {
-DBG(checking %s, all_dirs[i]);
-if(user_menu || strstr(all_dirs[i], userhome) != all_dirs[i]) {
-
[Xfce4-commits] xfdesktop:master Update NEWS.
Updating branch refs/heads/master to a40bbb2d8ed4a247895f83a5ed2584d0e21ea8cc (commit) from 7749a45105e9437403e953c1be947e8752ea0420 (commit) commit a40bbb2d8ed4a247895f83a5ed2584d0e21ea8cc Author: Jannis Pohlmann jan...@xfce.org Date: Sat Dec 4 13:26:43 2010 +0100 Update NEWS. NEWS |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index ad8664d..30a4eb1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Xfdesktop 4.7.x +--- + + * Let garcon choose the default applications menu file using +XDG_MENU_PREFIX. Drop the UserMenu kiosk option as the panel +sort of allows to bypass it anyway. + + Xfdesktop 4.7.3 --- ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:master Only set XDG_MENU_PREFIX if it's empty.
Updating branch refs/heads/master to f21ca48e5fa7b0386a524de6e9ced69c813c5f22 (commit) from f9e552c4b599949425978e176e5b7222c985fe64 (commit) commit f21ca48e5fa7b0386a524de6e9ced69c813c5f22 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Dec 4 13:28:59 2010 +0100 Only set XDG_MENU_PREFIX if it's empty. AFAIK, there is no way to check whether the variable has been defined before. We only have the is-it-empty check. This makes it impossible to set XDG_MENU_PREFIX= to override the xfce- prefix... perhaps someone knows a way? scripts/xinitrc.in.in |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index b4d2cd5..3004743 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -11,8 +11,10 @@ fi # set $XDG_MENU_PREFIX to xfce- so that xfce-applications.menu is picked # over applications.menu in all Xfce applications. -XDG_MENU_PREFIX=xfce- -export XDG_MENU_PREFIX +if test x$XDG_MENU_PREFIX = x; then + XDG_MENU_PREFIX=xfce- + export XDG_MENU_PREFIX +fi # $XDG_CONFIG_HOME defines the base directory relative to which user specific # configuration files should be stored. If $XDG_CONFIG_HOME is either not set ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master Explicitly link against gobject, add other missing libs (bug #6405).
Updating branch refs/heads/master to 0f7034bbc0032d62dff25c1fa0d02b8b769e37c8 (commit) from ab3d16ac5fb3870d51e1217183a46183427bb218 (commit) commit 0f7034bbc0032d62dff25c1fa0d02b8b769e37c8 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Dec 4 13:36:58 2010 +0100 Explicitly link against gobject, add other missing libs (bug #6405). configure.in.in|1 + docs/reference/Makefile.am |6 +- garcon/Makefile.am |8 +--- tests/Makefile.am | 12 ++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/configure.in.in b/configure.in.in index 7b9092e..139a91e 100644 --- a/configure.in.in +++ b/configure.in.in @@ -112,6 +112,7 @@ dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.14.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.14.0]) dnl * diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 2cb0e91..1decf21 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -58,13 +58,17 @@ content_files = \ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ + $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) GTKDOC_LIBS = \ - $(GLIB_CFLAGS) \ + $(GIO_LIBS) \ + $(GLIB_LIBS)\ + $(GOBJECT_LIBS) \ $(GTHREAD_LIBS) \ $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_LIBS)\ diff --git a/garcon/Makefile.am b/garcon/Makefile.am index 3ae2c35..b524b38 100644 --- a/garcon/Makefile.am +++ b/garcon/Makefile.am @@ -79,9 +79,10 @@ libgarcon_1_la_SOURCES = \ $(libgarcon_headers) libgarcon_1_la_CFLAGS =\ + $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) \ $(GTHREAD_CFLAGS) \ - $(GIO_CFLAGS) \ $(PLATFORM_CFLAGS) libgarcon_1_la_LDFLAGS = \ @@ -92,9 +93,10 @@ libgarcon_1_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) libgarcon_1_la_LIBADD =\ + $(GIO_LIBS) \ $(GLIB_LIBS)\ - $(GTHREAD_LIBS) \ - $(GIO_LIBS) + $(GOBJECT_LIBS) \ + $(GTHREAD_LIBS) EXTRA_DIST = \ garcon-config.h.in \ diff --git a/tests/Makefile.am b/tests/Makefile.am index ec22c5a..e399e80 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,14 +30,18 @@ test_menu_parser_SOURCES = \ test_menu_parser_CFLAGS = \ $(LIBXFCE4UTIL_CFLAGS) \ - $(GLIB_CFLAGS) + $(GIO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GOBJECT_CFLAGS) test_menu_parser_DEPENDENCIES = \ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la test_menu_parser_LDADD = \ $(LIBXFCE4UTIL_LIBS)\ + $(GIO_LIBS) \ $(GLIB_LIBS)
[Xfce4-commits] garcon:master Update the NEWS file.
Updating branch refs/heads/master to b8d44bd58d20ec2c16dc9620db3cb9e8776c6bc8 (commit) from 0f7034bbc0032d62dff25c1fa0d02b8b769e37c8 (commit) commit b8d44bd58d20ec2c16dc9620db3cb9e8776c6bc8 Author: Jannis Pohlmann jan...@xfce.org Date: Sat Dec 4 13:39:34 2010 +0100 Update the NEWS file. NEWS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 9a90cc5..38b9d37 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ = - Add support for XDG_MENU_PREFIX; use applications.menu as a fallback (bug #5980). +- Explicitly link against gobject, add other missing libs (bug #6405). 0.1.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 85cbdda7f1a7133bede4670cf295da2a18662abe (commit) from 486c6dcf0ca600b6ff44390355a8b6ffad00b210 (commit) commit 85cbdda7f1a7133bede4670cf295da2a18662abe Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 13:39:08 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 200 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 130 +++--- 1 files changed, 65 insertions(+), 65 deletions(-) diff --git a/po/pt.po b/po/pt.po index 9cd56f2..80a0fe6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-04-28 10:01+\n +POT-Creation-Date: 2010-12-04 11:02+\n PO-Revision-Date: 2009-08-31 16:32+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n @@ -22,7 +22,7 @@ msgstr bAcções/b #: ../data/interfaces/xfpm-settings.ui.h:2 msgid bAdvanced Options/b -msgstr bOpções Avançadas/b +msgstr bOpções avançadas/b #: ../data/interfaces/xfpm-settings.ui.h:3 msgid bBrightness/b @@ -30,7 +30,7 @@ msgstr bBrilho/b #: ../data/interfaces/xfpm-settings.ui.h:4 msgid bGeneral Options/b -msgstr bOpções Gerais/b +msgstr bOpções gerais/b #: ../data/interfaces/xfpm-settings.ui.h:5 msgid bMonitor/b @@ -42,7 +42,7 @@ msgstr Acções #: ../data/interfaces/xfpm-settings.ui.h:7 msgid Consider the computer on low power at: -msgstr Considerar o computador com baixa energia em: +msgstr Considerar o computador com energia baixa em: #. Hibernate menu option #: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:789 @@ -55,7 +55,7 @@ msgstr Hibernar #: ../data/interfaces/xfpm-settings.ui.h:9 msgid Lock screen when going for suspend/hibernate -msgstr Bloquear ecrã ao suspender/hibernar +msgstr Bloquear o ecrã ao suspender/hibernar #: ../data/interfaces/xfpm-settings.ui.h:10 ../src/xfpm-power-common.c:132 msgid Monitor @@ -78,31 +78,31 @@ msgstr Definições de gestão de energia #: ../data/interfaces/xfpm-settings.ui.h:14 msgid Prefer power savings over performance -msgstr Preferir poupança de energia sobre performance +msgstr Preferir poupança de energia sobre desempenho #: ../data/interfaces/xfpm-settings.ui.h:15 msgid Put display to sleep when computer is inactive for: -msgstr Colocar o monitor inactivo quando o computador está inactivo por: +msgstr Suspender o monitor se o computador estiver inactivo por: #: ../data/interfaces/xfpm-settings.ui.h:16 msgid Put the computer to sleep when inactive for: -msgstr Colocar o computador em 'sleep' quando inactivo por: +msgstr Suspender o computador se estiver inactivo por: #: ../data/interfaces/xfpm-settings.ui.h:17 msgid Reduce screen brightness when computer is inactive for: -msgstr Reduzir o brilho do ecrã quando o computador está inactivo por: +msgstr Reduzir o brilho do ecrã se o computador estiver inactivo por: #: ../data/interfaces/xfpm-settings.ui.h:18 msgid Set computer inactivity sleep mode: -msgstr Definir o modo de inactividade do computador: +msgstr Definir o modo de suspensão do computador: #: ../data/interfaces/xfpm-settings.ui.h:19 msgid Set monitor sleep mode: -msgstr Definir modo de inactividade do monitor: +msgstr Definir o modo de suspensão do monitor: #: ../data/interfaces/xfpm-settings.ui.h:20 msgid Show notifications to notify about the battery state -msgstr Mostrar notificações para avisar do estado da bateria +msgstr Mostrar notificações para avisar o estado da bateria #: ../data/interfaces/xfpm-settings.ui.h:21 msgid Spin down hard disks @@ -110,7 +110,7 @@ msgstr Reduzir rotação do disco #: ../data/interfaces/xfpm-settings.ui.h:22 msgid Standby -msgstr Standby +msgstr Em espera #. Suspend menu option #: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:783 @@ -123,7 +123,7 @@ msgstr Suspender #: ../data/interfaces/xfpm-settings.ui.h:24 msgid Switch off display when computer is inactive for: -msgstr Desligar o monitor quando o computador estiver inactivo por: +msgstr Desligar o monitor se o computador estiver inactivo por: #: ../data/interfaces/xfpm-settings.ui.h:25 msgid System tray icon: @@ -135,26 +135,26 @@ msgstr Quando o nível de carga da bateria é crítico: #: ../data/interfaces/xfpm-settings.ui.h:27 msgid When hibernate button is pressed: -msgstr Quando o botão de hibernar é pressionado: +msgstr Quando o botão de hibernar for pressionada: #: ../data/interfaces/xfpm-settings.ui.h:28 msgid When laptop lid is closed: -msgstr Quando a tampa do portátil é fechada: +msgstr Quando a tampa do portátil for fechada: #: ../data/interfaces/xfpm-settings.ui.h:29 msgid When power button is pressed: -msgstr Quando o botão de energia é pressionado: +msgstr Quando o botão de energia for pressionado: #:
[Xfce4-commits] xfce4-screenshooter:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to c04ee8c9a3e4beb255784ac077a577b63a82f4c5 (commit) from 0195996f78dad79726e6671ca4fb493a9f99d8b9 (commit) commit c04ee8c9a3e4beb255784ac077a577b63a82f4c5 Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 14:34:55 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 73 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 185 +- 1 files changed, 86 insertions(+), 99 deletions(-) diff --git a/po/pt.po b/po/pt.po index 68fa175..b92c460 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the xfce4-screenshooter package. # Automatically generated, 2009. # Nuno Miguel nu...@netcabo.pt, 2007, 2008, 2009. -# +# msgid msgstr Project-Id-Version: xfce4-screenshooter 1.6.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-11-29 11:58+0100\n +POT-Creation-Date: 2010-12-04 11:03+\n PO-Revision-Date: 2009-11-30 17:12+0100\n Last-Translator: \n Language-Team: \n @@ -19,174 +19,167 @@ msgstr X-Poedit-Language: Portuguese\n X-Poedit-Country: PORTUGAL\n -#: ../lib/screenshooter-dialogs.c:478 +#: ../lib/screenshooter-dialogs.c:453 #, c-format msgid %.2fKb of %.2fKb msgstr %.2fKb de %.2fKb -#: ../lib/screenshooter-dialogs.c:560 +#: ../lib/screenshooter-dialogs.c:535 msgid Transfer msgstr Transferir -#: ../lib/screenshooter-dialogs.c:581 +#: ../lib/screenshooter-dialogs.c:556 msgid span weight=\bold\ stretch=\semiexpanded\The screenshot is being transferred to:/span msgstr span weight=\bold\ stretch=\semiexpanded\A captura de ecrã está a ser transferida para:/span -#: ../lib/screenshooter-dialogs.c:697 -#: ../lib/screenshooter-dialogs.c:714 -#: ../lib/screenshooter-dialogs.c:905 -#: ../lib/screenshooter-utils.c:64 +#: ../lib/screenshooter-dialogs.c:672 ../lib/screenshooter-dialogs.c:689 +#: ../lib/screenshooter-dialogs.c:880 ../lib/screenshooter-utils.c:64 #: ../lib/screenshooter-utils.c:96 #: ../src/xfce4-screenshooter.desktop.in.in.h:1 #: ../panel-plugin/screenshooter.desktop.in.in.h:1 msgid Screenshot msgstr Captura de ecrã -#: ../lib/screenshooter-dialogs.c:709 +#: ../lib/screenshooter-dialogs.c:684 msgid Take a screenshot msgstr Tirar uma captura de ecrã -#: ../lib/screenshooter-dialogs.c:724 +#: ../lib/screenshooter-dialogs.c:699 msgid Preferences msgstr Preferências -#: ../lib/screenshooter-dialogs.c:754 +#: ../lib/screenshooter-dialogs.c:729 msgid span weight=\bold\ stretch=\semiexpanded\Region to capture/span msgstr span weight=\bold\ stretch=\semiexpanded\Zona a capturar/span -#: ../lib/screenshooter-dialogs.c:774 +#: ../lib/screenshooter-dialogs.c:749 msgid Entire screen -msgstr Ecrã inteiro +msgstr Ecrã completo -#: ../lib/screenshooter-dialogs.c:781 -#: ../src/main.c:53 -#: ../panel-plugin/screenshooter-plugin.c:308 +#: ../lib/screenshooter-dialogs.c:756 ../src/main.c:53 +#: ../panel-plugin/screenshooter-plugin.c:311 msgid Take a screenshot of the entire screen msgstr Tirar uma captura de todo o ecrã -#: ../lib/screenshooter-dialogs.c:789 +#: ../lib/screenshooter-dialogs.c:764 msgid Active window msgstr Janela activa -#: ../lib/screenshooter-dialogs.c:796 -#: ../src/main.c:90 -#: ../panel-plugin/screenshooter-plugin.c:313 +#: ../lib/screenshooter-dialogs.c:771 ../src/main.c:90 +#: ../panel-plugin/screenshooter-plugin.c:316 msgid Take a screenshot of the active window msgstr Tirar uma captura da janela activa -#: ../lib/screenshooter-dialogs.c:804 +#: ../lib/screenshooter-dialogs.c:779 msgid Select a region msgstr Seleccione uma zona -#: ../lib/screenshooter-dialogs.c:809 -#: ../src/main.c:68 -#: ../panel-plugin/screenshooter-plugin.c:318 +#: ../lib/screenshooter-dialogs.c:784 ../src/main.c:68 +#: ../panel-plugin/screenshooter-plugin.c:321 msgid Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button. -msgstr Seleccione a zona para capturar clicando num ponto do ecrã e, sem libertar o botão do rato arraste-o para o outro canto da zona libertando então aí o botão do rato. +msgstr Seleccione a zona para capturar clicando num ponto do ecrã e, sem libertar o botão do rato, arraste-o para o outro canto da zona libertando então aí o botão do rato. -#: ../lib/screenshooter-dialogs.c:819 +#: ../lib/screenshooter-dialogs.c:794 msgid Capture the mouse pointer msgstr Capturar o ponteiro do rato -#: ../lib/screenshooter-dialogs.c:824 +#: ../lib/screenshooter-dialogs.c:799 msgid Display the mouse pointer on the screenshot msgstr Apresentar o ponteiro do rato na captura -#: ../lib/screenshooter-dialogs.c:840 +#: ../lib/screenshooter-dialogs.c:815 msgid span weight=\bold\ stretch=\semiexpanded\Delay before capturing/span
[Xfce4-commits] xfce4-taskmanager:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 423e8deef12428221f3a53f6f89c53bf79e0dc70 (commit) from b7d80b846ac216a391e0782da84f043568dbb532 (commit) commit 423e8deef12428221f3a53f6f89c53bf79e0dc70 Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 14:37:30 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 75 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 16 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/pt.po b/po/pt.po index c83162b..e565fc5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-taskmanager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-10-04 22:11+\n +POT-Creation-Date: 2010-12-04 11:13+\n PO-Revision-Date: 2010-05-25 14:47+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n @@ -37,16 +37,16 @@ msgstr Não foi possível encontrar o comando de execução. #: ../src/exec-tool-button.c:164 msgid Run Task Manager as root -msgstr Executar Gestor de Tarefas como root +msgstr Executar gestor de tarefas como \root\ #: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177 #: ../src/exec-tool-button.c:179 msgid Run Program... -msgstr Executar Programa... +msgstr Executar programa... #: ../src/exec-tool-button.c:182 msgid Application Finder -msgstr Localizar Aplicações +msgstr Localizar aplicações #: ../src/exec-tool-button.c:185 msgid Terminal emulator @@ -217,7 +217,7 @@ msgstr Nuno Miguel #: ../src/process-window.ui.h:2 msgid Warning, you are using the root account, you may harm your system. -msgstr Cuidado, está a utilizar a conta de root e pode danificar o seu sistema. +msgstr Cuidado, está a utilizar a conta de \root\ e pode danificar o seu sistema. #: ../src/settings.c:378 msgid Default @@ -253,7 +253,7 @@ msgstr Colunas: #: ../src/settings-dialog.ui.h:5 msgid Draw borders around monitors -msgstr Desenhar limites à volta do monitor +msgstr Desenhar contornos do monitor #: ../src/settings-dialog.ui.h:6 msgid Hide into the notification area @@ -326,11 +326,11 @@ msgstr Taxa de actualização #: ../src/settings-tool-button.c:177 msgid Virtual Bytes -msgstr Bytes Virtuais +msgstr \Bytes\ virtuais #: ../src/settings-tool-button.c:178 msgid Private Bytes -msgstr Bytes Privados +msgstr \Bytes\ privados #: ../src/task-manager.c:229 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-volstatus-icon:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 06f2f71bc81718cedaa66dcbf460adbbb3c275a7 (commit) from c7a14892644c3c49c0608762fdf049910ebfd2f8 (commit) commit 06f2f71bc81718cedaa66dcbf460adbbb3c275a7 Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 14:44:37 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 56 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 73 + 1 files changed, 35 insertions(+), 38 deletions(-) diff --git a/po/pt.po b/po/pt.po index cfa81a0..226703d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Nuno Miguel nu...@netcabo.pt, 2007. -# +# msgid msgstr Project-Id-Version: \n @@ -15,11 +15,10 @@ msgstr Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n -#: xfce4-volstatus-icon/main.c:102 -#: xfce4-volstatus-icon/main.c:115 +#: xfce4-volstatus-icon/main.c:102 xfce4-volstatus-icon/main.c:115 #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:733 msgid Removable Volumes -msgstr Volumes Removíveis +msgstr Discos amovíveis #: xfce4-volstatus-icon/main.c:104 msgid This is the first time you've run the Xfce Volstatus Icon application @@ -27,15 +26,15 @@ msgstr Esta é a primeira vez que executa a aplicação Xfce Volstatus Icon #: xfce4-volstatus-icon/main.c:105 msgid Would you like Xfce Volstatus to run automatically each time your session begins? You can disable this behavior later by using the \Autostarted Applications\ settings panel. -msgstr Deseja que o Xfce Volstatus execute automaticamente cada vez que inicia a sessão? Pode desligar este comportamento mais tarde usando o painel de definições \Autostarted Applications\ +msgstr Deseja que o Xfce Volstatus execute automaticamente cada vez que inicia a sessão? Pode desligar este comportamento mais tarde usando o painel de definições \Aplicações de arranque automático\ #: xfce4-volstatus-icon/main.c:117 msgid Failed to write autostart file -msgstr Falhou ao escrever para ficheiro autostart +msgstr Falha ao escrever para o ficheiro \autostart\ #: xfce4-volstatus-icon/main.c:118 msgid For some reason, the autostart location could not be found or written to. This location is usually in your home directory, in ~/.config/autostart/. -msgstr Por alguma razão, a localização autostart não foi encontrada. Esta localização está habitualmente na sua pasta home, em ~/.config/autostart/. +msgstr Por alguma razão, a localização não foi encontrada. Esta localização está habitualmente na sua pasta pessoal, em ~/.config/autostart/. #: xfce4-volstatus-icon/main.c:125 msgid Xfce Volstatus Icon @@ -43,29 +42,28 @@ msgstr Ícone Xfce Volstatus #: xfce4-volstatus-icon/main.c:127 msgid Safe removal of removable volumes -msgstr Remoção segura de volumes amovíveis +msgstr Remoção segura de discos amovíveis #: xfce4-volstatus-icon/main.c:213 msgid An unknown error occurred. msgstr Ocorreu um erro desconhecido. -#: xfce4-volstatus-icon/main.c:215 -#: xfce4-volstatus-icon/main.c:226 +#: xfce4-volstatus-icon/main.c:215 xfce4-volstatus-icon/main.c:226 #: xfce4-volstatus-icon/main.c:241 msgid Xfce Volstatus msgstr Xfce Volstatus #: xfce4-volstatus-icon/main.c:216 msgid Unable to connect to D-Bus system bus daemon -msgstr Incapaz de ligar à daemon de bus de sistema D-Bus +msgstr Incapaz de ligar ao serviço de sistema D-Bus #: xfce4-volstatus-icon/main.c:227 msgid Unable to connect to HAL -msgstr Incapaz de ligar a HAL +msgstr Incapaz de ligar ao HAL #: xfce4-volstatus-icon/main.c:242 msgid Unable to get device list from HAL -msgstr Incapaz de obter lista de dispositivos do HAL +msgstr Incapaz de obter a lista de dispositivos do HAL #: xfce4-volstatus-icon/xfce-volstatus-common.c:76 #, c-format @@ -86,11 +84,11 @@ msgstr CD Áudio #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:178 msgid Recordable CD -msgstr CD de Gravação +msgstr CD gravável #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:181 msgid Rewritable CD -msgstr CD Regravável +msgstr CD regravável #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:184 msgid DVD @@ -98,15 +96,15 @@ msgstr DVD #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:187 msgid Rewritable DVD (DVD-RAM) -msgstr DVD Regravável (DVD-RAM) +msgstr DVD regravável (DVD-RAM) #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:192 msgid Recordable DVD -msgstr DVD de Gravação +msgstr DVD gravável #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:196 msgid Rewritable DVD -msgstr DVD Regravável +msgstr DVD regravável #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:199 msgid Blu-ray Disc @@ -114,11 +112,11 @@ msgstr Disco Blu-ray #: xfce4-volstatus-icon/xfce-volstatus-dialog.c:202 msgid Recordable Blu-ray Disc
[Xfce4-commits] xfmpc:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to c01a1adc24c924b3a533bf337d3ffeedff214aa9 (commit) from 0dbaf89fbb795df3c9dd79f059399a39afc1faff (commit) commit c01a1adc24c924b3a533bf337d3ffeedff214aa9 Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 14:48:12 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 56 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 51 ++- 1 files changed, 22 insertions(+), 29 deletions(-) diff --git a/po/pt.po b/po/pt.po index 4c455d1..4febbee 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ # Copyright (C) 2008 THE Xfmpc'S COPYRIGHT HOLDER # This file is distributed under the same license as the Xfmpc package. # Nuno Miguel nu...@netcabo.pt, 2008. -# +# msgid msgstr Project-Id-Version: xfmpc\n @@ -20,8 +20,7 @@ msgstr msgid Replace msgstr Substituir -#: ../src/dbbrowser.c:919 -#: ../src/playlist.c:884 +#: ../src/dbbrowser.c:919 ../src/playlist.c:884 msgid Browse msgstr Explorar @@ -33,8 +32,7 @@ msgstr Repetir msgid Random msgstr Aleatório -#: ../src/extended-interface.c:397 -#: ../xfmpc.desktop.in.h:2 +#: ../src/extended-interface.c:397 ../xfmpc.desktop.in.h:2 msgid MPD client written in GTK+ for Xfce msgstr Cliente MPD escrito em GTK+ para Xfce @@ -44,29 +42,28 @@ msgstr Nuno Miguel nu...@netcabo.pt #: ../src/extended-interface.c:466 msgid Clear Playlist -msgstr Limpar Lista de reprodução +msgstr Limpar lista de reprodução #: ../src/extended-interface.c:473 msgid Refresh Database -msgstr Actualizar Base de Dados +msgstr Actualizar base de dados #: ../src/extended-interface.c:481 msgid Context Menu -msgstr Menu de Contexto +msgstr Menu de contexto #: ../src/extended-interface.c:499 msgid Current Playlist -msgstr Lista de Reprodução Actual +msgstr Lista de reprodução actual #: ../src/extended-interface.c:501 msgid Browse database msgstr Explorar base de dados -#. #. // write private function in case it is wished to avoid the #. // n/a values, but no big deal IMO #. text = get_subtitle (interface); -#. +#. #. TRANSLATORS: subtitle by \artist\ from \album\ (year) #: ../src/interface.c:263 #, c-format @@ -77,32 +74,29 @@ msgstr por \%s\ de \%s\ (%s) msgid Stopped msgstr Parado -#: ../src/interface.c:272 -#: ../src/interface.c:470 +#: ../src/interface.c:272 ../src/interface.c:470 msgid Not connected msgstr Não ligado #: ../src/main-window.c:383 #, c-format msgid %d songs, %d hours and %d minutes -msgstr %d canções, %d horas e %d minutos +msgstr %d músicas, %d horas e %d minutos #: ../src/main-window.c:385 #, c-format msgid %d songs, %d minutes -msgstr %d canções, %d minutos +msgstr %d músicas, %d minutos #: ../src/mpdclient.c:348 msgid Failed to connect to MPD -msgstr Falha ao ligar a MPD +msgstr Falha ao ligar ao MPD #: ../src/mpdclient.c:353 msgid Connected to MPD -msgstr Ligado a MPD +msgstr Ligado ao MPD -#: ../src/mpdclient.c:569 -#: ../src/mpdclient.c:599 -#: ../src/mpdclient.c:614 +#: ../src/mpdclient.c:569 ../src/mpdclient.c:599 ../src/mpdclient.c:614 msgid n/a msgstr n/d @@ -116,15 +110,15 @@ msgstr Ligação #: ../src/preferences-dialog.c:366 msgid Use _default system settings -msgstr Usar as _definições por omissão do sistema +msgstr Usar as _definições do sistema #: ../src/preferences-dialog.c:367 msgid If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost -msgstr Se activo, Xfmpc irá tentar ler as variáveis de ambiente MPD_HOST e MPD_PORT caso contrário usará o anfitrião local +msgstr Se activo, o Xfmpc irá tentar ler as variáveis de ambiente MPD_HOST e MPD_PORT, caso contrário usará o servidor local #: ../src/preferences-dialog.c:378 msgid Hostname: -msgstr Nome do anfitrião: +msgstr Nome do servidor: #: ../src/preferences-dialog.c:386 msgid Port: @@ -132,7 +126,7 @@ msgstr Porta: #: ../src/preferences-dialog.c:397 msgid Password: -msgstr Palavra-passe: +msgstr Senha: #: ../src/preferences-dialog.c:414 msgid Appearance @@ -148,14 +142,13 @@ msgstr Mostrar barra de e_stado #: ../src/preferences-dialog.c:431 msgid Song Format -msgstr Formato da Canção +msgstr Formato da música #: ../src/preferences-dialog.c:436 msgid Song Format: -msgstr Formato da Canção: +msgstr Formato da música: -#: ../src/preferences-dialog.c:441 -#: ../src/song-dialog.c:139 +#: ../src/preferences-dialog.c:441 ../src/song-dialog.c:139 msgid Title msgstr Título @@ -262,6 +255,6 @@ msgstr Xfmpc #~ msgid Xfmpc Preferences #~ msgstr Preferências Xfmpc + #~ msgid Song format: #~ msgstr Formato da canção: - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-time-out-plugin:master l10n: Updated French (fr) translation to 98%
Updating branch refs/heads/master to d75825ecc5a957a0f05979b5ab7ad078f702737e (commit) from fc55dc90f18316ae9874dc4bae5403ce582adcb5 (commit) commit d75825ecc5a957a0f05979b5ab7ad078f702737e Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sat Dec 4 14:56:32 2010 +0100 l10n: Updated French (fr) translation to 98% New status: 50 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index c5656ac..a102bde 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,7 +2,7 @@ # Copyright (C) 2007 Jannis Pohlmann jan...@xfce.org # This file is distributed under the same license as the xfce4-time-out-plugin package. # Jannis Pohlmann jan...@xfce.org, 2007. -# +# msgid msgstr Project-Id-Version: xfce4-time-out-plugin 0.1.1\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2010-11-07 16:28+0900\n Last-Translator: Florian Rivoal friv...@xfce.org\n Language-Team: Xfce xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: \n X-Poedit-Language: French\n X-Poedit-Country: FRANCE\n @@ -26,7 +26,7 @@ msgstr Prendre une pause #. Create menu item for resetting the timer #: ../panel-plugin/time-out.c:273 msgid Reset timer -msgstr +msgstr Remettre à zéro le compteur #. Create menu item for enabling/disabling the countdown #: ../panel-plugin/time-out.c:281 @@ -34,13 +34,13 @@ msgid Enabled msgstr Activé #: ../panel-plugin/time-out.c:422 -msgid -Xfce Panel plugin for taking a break from computer work every now and then. -msgstr +#, fuzzy +msgid Xfce Panel plugin for taking a break from computer work every now and then. +msgstr Plugin du panneau Xfce pour prendre de temps en temps une pause d'ordinateur. #: ../panel-plugin/time-out.c:431 msgid translator-credits -msgstr +msgstr Crédits de traduction #. Create properties dialog #: ../panel-plugin/time-out.c:463 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfvnc:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 9fa22a7cb134133895bf8653c298a939c4357b98 (commit) from f347aef621955165734e7bae442c3f92c5b0f86d (commit) commit 9fa22a7cb134133895bf8653c298a939c4357b98 Author: Sergio Marques smarque...@gmail.com Date: Sat Dec 4 14:56:16 2010 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 18 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 24 +++- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/pt.po b/po/pt.po index bca9408..b5b9c92 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ # Copyright (C) 2007 THE Xfvnc'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfvnc package. # Nuno Miguel nu...@netcabo.pt 2009. -# +# msgid msgstr Project-Id-Version: xfvnc\n @@ -18,7 +18,7 @@ msgstr #: ../xfvnc/main.c:28 msgid Connected. Starting session... -msgstr Conectado. Iniciando sessão... +msgstr Ligado. Iniciando sessão... #: ../xfvnc/main.c:50 #, c-format @@ -27,7 +27,7 @@ msgstr XfVNC .:. %s #: ../xfvnc/main.c:64 msgid Connection Error -msgstr Erro de Conexão +msgstr Erro de ligação #: ../xfvnc/main.c:66 msgid There was an error connecting to the VNC server @@ -41,30 +41,29 @@ msgstr Infelizmente, o tipo de erro é desconhecido. msgid VNC Viewer msgstr Visualizador VNC -#: ../xfvnc/xfvnc.desktop.in.h:2 -#: ../xfvnc/xfvnc.glade.h:4 +#: ../xfvnc/xfvnc.desktop.in.h:2 ../xfvnc/xfvnc.glade.h:4 msgid XfVNC msgstr XfVNC #: ../xfvnc/xfvnc.desktop.in.h:3 msgid Xfce VNC Viewer Application -msgstr Aplicativo Visualizador VNC do Xfce +msgstr Aplicação de VNC para o Xfce #: ../xfvnc/xfvnc.glade.h:1 msgid Connecting... -msgstr Conectando... +msgstr A ligar... #: ../xfvnc/xfvnc.glade.h:2 msgid Display _number: -msgstr Exibir _número: +msgstr _Exibir número: #: ../xfvnc/xfvnc.glade.h:3 msgid Show _fullscreen -msgstr Mostrar _ecrã inteiro +msgstr _Mostrar ecrã completo #: ../xfvnc/xfvnc.glade.h:5 msgid XfVNC Status -msgstr Status do XfVNC +msgstr Estado do XfVNC #: ../xfvnc/xfvnc.glade.h:6 msgid Xfce VNC Viewer @@ -72,11 +71,11 @@ msgstr Visualizador VNC do Xfce #: ../xfvnc/xfvnc.glade.h:7 msgid _Allow other clients to connect -msgstr Per_mitir ligação a outros clientes +msgstr _Permitir ligação a outros clientes #: ../xfvnc/xfvnc.glade.h:8 msgid _Computer name: -msgstr Nome do _computador: +msgstr _Nome do computador: #: ../xfvnc/xfvnc.glade.h:9 msgid _Password: @@ -89,4 +88,3 @@ msgstr Servidores _recentes: #: ../xfvnc/xfvnc.glade.h:11 msgid _View only msgstr _Ver apenas - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated French (fr) translation to 71%
Updating branch refs/heads/master to d1fbc62af18f68e82539fe3f755e9b5a807ac173 (commit) from 72a06bc662e2c1ffd750c8046b9e5046e3085970 (commit) commit d1fbc62af18f68e82539fe3f755e9b5a807ac173 Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sat Dec 4 15:01:22 2010 +0100 l10n: Updated French (fr) translation to 71% New status: 200 messages complete with 79 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 38 +- 1 files changed, 9 insertions(+), 29 deletions(-) diff --git a/po/fr.po b/po/fr.po index d570837..7733eec 100644 --- a/po/fr.po +++ b/po/fr.po @@ -347,26 +347,22 @@ msgid Edit Properties msgstr Éditer les propriétés #: ../thunar-vcs-plugin/tvp-svn-action.c:409 -#, fuzzy msgid Menu|Relocate msgstr Menu|Transférer #: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309 #: ../tvp-svn-helper/tsh-relocate.c:114 #: ../tvp-svn-helper/tsh-relocate-dialog.c:217 -#, fuzzy msgid Relocate msgstr Transférer #: ../thunar-vcs-plugin/tvp-svn-action.c:415 -#, fuzzy msgid Menu|Resolved msgstr Menu|Résolu #: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305 #: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113 #: ../tvp-svn-helper/tsh-resolved.c:126 -#, fuzzy msgid Resolved msgstr Résolu @@ -379,9 +375,8 @@ msgid Resolve msgstr Fixer comme résolu #: ../thunar-vcs-plugin/tvp-svn-action.c:425 -#, fuzzy msgid Menu|Revert -msgstr Menu|Retour +msgstr Menu|Revert #: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313 #: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125 @@ -398,9 +393,8 @@ msgid Switch msgstr Modifier l'adresse du dépôt #: ../thunar-vcs-plugin/tvp-svn-action.c:440 -#, fuzzy msgid Menu|Unlock -msgstr Débloquer +msgstr Menu|Débloquer #: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325 #: ../tvp-svn-helper/tsh-unlock.c:111 @@ -515,27 +509,23 @@ msgid Print version information msgstr Afficher l'information sur la version #: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112 -#, fuzzy msgid Execute add action -msgstr Exécuter une action +msgstr Exécuter ajouter une action #: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118 -#, fuzzy msgid Execute blame action msgstr Exécuter un blâme #: ../tvp-git-helper/main.c:97 #, fuzzy msgid Execute branch action -msgstr Exécuter un branch +msgstr Effectuer un branch #: ../tvp-git-helper/main.c:103 -#, fuzzy msgid Execute clean action msgstr Exécuter un nettoyage #: ../tvp-git-helper/main.c:109 -#, fuzzy msgid Execute clone action msgstr Exécuter un clonage @@ -545,9 +535,8 @@ msgid Execute log action msgstr Exécuter une journalisation #: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184 -#, fuzzy msgid Execute move action -msgstr Exécuter un déplacement +msgstr Effectuer un déplacement #: ../tvp-git-helper/main.c:127 #, fuzzy @@ -569,22 +558,18 @@ msgid Add Related Options: msgstr Ajouter des options: #: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253 -#, fuzzy msgid Blame Related Options: msgstr Options liées à blame: #: ../tvp-git-helper/main.c:159 -#, fuzzy msgid Branch Related Options: -msgstr Options liées à la branche: +msgstr Options liées au branch: #: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167 -#, fuzzy msgid Clone Related Options: msgstr Options liées au clonage: #: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293 -#, fuzzy msgid Log Related Options: msgstr Options liées à la journalisation: @@ -593,12 +578,10 @@ msgid Move Related Options: msgstr Déplacer des options connexes: #: ../tvp-git-helper/main.c:179 -#, fuzzy msgid Reset Related Options: msgstr Options liées à la réinitialisation: #: ../tvp-git-helper/main.c:183 -#, fuzzy msgid Stash Related Options: msgstr Options liées à un stash: @@ -656,23 +639,20 @@ msgid Include ignored files msgstr Inclure les fichiers ignorés #: ../tvp-git-helper/tgh-clean-dialog.c:83 -#, fuzzy msgid Only ignored files -msgstr Afficher les Fichiers ignorés +msgstr Uniquement les fichiers ignorés #: ../tvp-git-helper/tgh-clean-dialog.c:93 msgid Force clean. msgstr Forcer un nettoyage. #: ../tvp-git-helper/tgh-clone.c:58 -#, fuzzy msgid Clone finished -msgstr Nettoyer les verrous +msgstr Clonage terminé #: ../tvp-git-helper/tgh-clone.c:123 -#, fuzzy msgid Cloning ... -msgstr Nettoyer les verrous +msgstr Clonage... #: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73 #: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master Add workaround to fix empty DefaultLayout elements (bug #6882).
Updating branch refs/heads/master
to b66e39c727817d6ce6cc4de89d3caeee643008fc (commit)
from b8d44bd58d20ec2c16dc9620db3cb9e8776c6bc8 (commit)
commit b66e39c727817d6ce6cc4de89d3caeee643008fc
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Dec 4 15:00:18 2010 +0100
Add workaround to fix empty DefaultLayout elements (bug #6882).
For more information see my comment on the bug on
http://bugzilla.xfce.org/show_bug.cgi?id=6882#c2
NEWS|1 +
garcon/garcon-menu-merger.c | 33 +
tests/test-menu-parser.c| 48 +++---
3 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/NEWS b/NEWS
index 38b9d37..8a636f7 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
- Add support for XDG_MENU_PREFIX; use applications.menu as a fallback
(bug #5980).
- Explicitly link against gobject, add other missing libs (bug #6405).
+- Add workaround to fix empty DefaultLayout elements (bug #6882).
0.1.3
diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index 81dfb8c..07bc8b0 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -332,6 +332,7 @@ garcon_menu_merger_run (GarconMenuMerger *merger,
garcon_menu_merger_clean_up_elements (merger-priv-menu,
GARCON_MENU_NODE_TYPE_ONLY_UNALLOCATED);
garcon_menu_merger_prepend_default_layout (merger-priv-menu);
+ garcon_menu_merger_clean_up_elements (merger-priv-menu,
GARCON_MENU_NODE_TYPE_DEFAULT_LAYOUT);
garcon_menu_merger_clean_up_elements (merger-priv-menu,
GARCON_MENU_NODE_TYPE_LAYOUT);
g_list_foreach (context.file_stack, (GFunc) g_object_unref, NULL);
@@ -910,9 +911,10 @@ static void
garcon_menu_merger_clean_up_elements (GNode *node,
GarconMenuNodeType type)
{
- GNode *child;
- GNode *remaining_node = NULL;
- GList *destroy_list = NULL;
+ GarconMenuNode *node_;
+ GNode *child;
+ GNode *remaining_node = NULL;
+ GList *destroy_list = NULL;
for (child = g_node_last_child (node); child != NULL; child =
g_node_prev_sibling (child))
{
@@ -937,7 +939,13 @@ garcon_menu_merger_clean_up_elements (GNode
*node,
}
if (type == GARCON_MENU_NODE_TYPE_LAYOUT
- garcon_menu_node_tree_get_node_type (child) !=
GARCON_MENU_NODE_TYPE_LAYOUT)
+ garcon_menu_node_tree_get_node_type (child) != type)
+{
+ continue;
+}
+
+ if (type == GARCON_MENU_NODE_TYPE_DEFAULT_LAYOUT
+ garcon_menu_node_tree_get_node_type (child) != type)
{
continue;
}
@@ -951,12 +959,27 @@ garcon_menu_merger_clean_up_elements (GNode
*node,
g_list_foreach (destroy_list, (GFunc) garcon_menu_node_tree_free, NULL);
g_list_free (destroy_list);
- if (type == GARCON_MENU_NODE_TYPE_LAYOUT
+ if (type == GARCON_MENU_NODE_TYPE_LAYOUT
remaining_node != NULL
G_NODE_IS_LEAF (remaining_node))
{
garcon_menu_node_tree_free (remaining_node);
}
+
+ if (type == GARCON_MENU_NODE_TYPE_DEFAULT_LAYOUT
+ remaining_node != NULL
+ G_NODE_IS_LEAF (remaining_node))
+{
+ /* FIXME Fix empty DefaultLayout elements created due to a bug in
+ * alacarte. See http://bugzilla.xfce.org/show_bug.cgi?id=6882#c2
+ * for more information */
+ node_ = garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE,
+ GUINT_TO_POINTER
(GARCON_MENU_LAYOUT_MERGE_MENUS));
+ g_node_append_data (remaining_node, node_);
+ node_ = garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE,
+ GUINT_TO_POINTER
(GARCON_MENU_LAYOUT_MERGE_FILES));
+ g_node_append_data (remaining_node, node_);
+}
}
diff --git a/tests/test-menu-parser.c b/tests/test-menu-parser.c
index 792dc4b..ee4da65 100644
--- a/tests/test-menu-parser.c
+++ b/tests/test-menu-parser.c
@@ -53,6 +53,7 @@ node_name (GNode *node)
case GARCON_MENU_NODE_TYPE_AND: return And; break;
case GARCON_MENU_NODE_TYPE_NOT: return Not; break;
case GARCON_MENU_NODE_TYPE_MOVE: return Move; break;
+ case GARCON_MENU_NODE_TYPE_DEFAULT_LAYOUT: return DefaultLayout; break;
case GARCON_MENU_NODE_TYPE_LAYOUT: return Layout; break;
default: return NULL; break;
}
@@ -83,14 +84,15 @@ print_node (GNode *node,
#define INDENT {for (i = 0; i depth; ++i) g_print ( );}
- if (G_UNLIKELY (garcon_menu_node_tree_get_node_type (node) ==
GARCON_MENU_NODE_TYPE_MENU ||
- garcon_menu_node_tree_get_node_type (node) ==
GARCON_MENU_NODE_TYPE_INCLUDE ||
- garcon_menu_node_tree_get_node_type (node) ==
GARCON_MENU_NODE_TYPE_EXCLUDE ||
- garcon_menu_node_tree_get_node_type (node) ==
GARCON_MENU_NODE_TYPE_OR ||
- garcon_menu_node_tree_get_node_type (node)
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated French (fr) translation to 73%
Updating branch refs/heads/master to 95602fbdc41c81b278d3804b83285c14ac09fbd7 (commit) from d1fbc62af18f68e82539fe3f755e9b5a807ac173 (commit) commit 95602fbdc41c81b278d3804b83285c14ac09fbd7 Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sat Dec 4 15:03:42 2010 +0100 l10n: Updated French (fr) translation to 73% New status: 204 messages complete with 75 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 12 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7733eec..9158a3c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1334,14 +1334,12 @@ msgid Relocate failed msgstr Restaurer #: ../tvp-svn-helper/tsh-relocate.c:86 -#, fuzzy msgid Relocate finished -msgstr Nettoyer les verrous +msgstr Transfert terminé #: ../tvp-svn-helper/tsh-relocate.c:128 -#, fuzzy msgid Relocating ... -msgstr Nettoyer les verrous +msgstr Transfert... #: ../tvp-svn-helper/tsh-relocate-dialog.c:88 msgid _From: @@ -1352,9 +1350,8 @@ msgid _To: msgstr _à: #: ../tvp-svn-helper/tsh-status.c:86 -#, fuzzy msgid Status failed -msgstr État +msgstr Echec de l'obtention du status #: ../tvp-svn-helper/tsh-status-dialog.c:224 msgid Show Unmodified Files @@ -1369,9 +1366,8 @@ msgid Show Ignored Files msgstr Afficher les Fichiers ignorés #: ../tvp-svn-helper/tsh-status-dialog.c:236 -#, fuzzy msgid Hide Externals -msgstr Externe +msgstr Cacher les externals #: ../tvp-svn-helper/tsh-status-dialog.c:240 msgid Check Repository ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated French (fr) translation to 81%
Updating branch refs/heads/master to 3324b7a93b4d070943ac8107504f6b81719e32b0 (commit) from 95602fbdc41c81b278d3804b83285c14ac09fbd7 (commit) commit 3324b7a93b4d070943ac8107504f6b81719e32b0 Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sat Dec 4 15:08:27 2010 +0100 l10n: Updated French (fr) translation to 81% New status: 226 messages complete with 53 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 66 - 1 files changed, 22 insertions(+), 44 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9158a3c..eb8b5db 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1073,28 +1073,24 @@ msgid Lock failed msgstr Le verrouillage à échoué #: ../tvp-svn-helper/tsh-common.c:539 -#, fuzzy msgid Unlock failed -msgstr Débloquer +msgstr Echec du déblocage #: ../tvp-svn-helper/tsh-common.c:540 msgid Exists msgstr Existe #: ../tvp-svn-helper/tsh-common.c:541 -#, fuzzy msgid Changelist set -msgstr Pistes choisies +msgstr Changelist appliquée #: ../tvp-svn-helper/tsh-common.c:542 -#, fuzzy msgid Changelist cleared -msgstr Pistes autorisées +msgstr Changelist effacée #: ../tvp-svn-helper/tsh-common.c:543 -#, fuzzy msgid Changelist moved -msgstr Pistes déplacées +msgstr Changelist déplacée #: ../tvp-svn-helper/tsh-common.c:544 msgid Merge begin @@ -1109,24 +1105,20 @@ msgid Replace msgstr Remplacer #: ../tvp-svn-helper/tsh-common.c:548 -#, fuzzy msgid Property added -msgstr Éditer les propriétés +msgstr Propriété ajoutée #: ../tvp-svn-helper/tsh-common.c:549 -#, fuzzy msgid Property modified -msgstr Éditer les propriétés +msgstr Propriété modifiée #: ../tvp-svn-helper/tsh-common.c:550 -#, fuzzy msgid Property deleted -msgstr Éditer les propriétés +msgstr Propriété effacée #: ../tvp-svn-helper/tsh-common.c:551 -#, fuzzy msgid Property nonexisting -msgstr Éditer les propriétés +msgstr Propriété non existante #: ../tvp-svn-helper/tsh-common.c:552 #, fuzzy @@ -1139,19 +1131,16 @@ msgid Revision property deleted msgstr Restaurer #: ../tvp-svn-helper/tsh-common.c:554 -#, fuzzy msgid Merge completed -msgstr Complété +msgstr Merge complété #: ../tvp-svn-helper/tsh-common.c:555 -#, fuzzy msgid Tree conflict -msgstr Complété +msgstr Conflict dans l'arbre #: ../tvp-svn-helper/tsh-common.c:556 -#, fuzzy msgid External failed -msgstr Externe +msgstr Echec dans l'external #: ../tvp-svn-helper/tsh-common.c:617 msgid Inapplicable @@ -1178,9 +1167,8 @@ msgid Merged msgstr Fusionné #: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659 -#, fuzzy msgid Conflicted -msgstr Complété +msgstr Conflictuel #. N_(None), #. N_(Unversioned), @@ -1193,9 +1181,8 @@ msgid Ignored msgstr Ignoré #: ../tvp-svn-helper/tsh-common.c:663 -#, fuzzy msgid Incomplete -msgstr Complété +msgstr Incomplet #: ../tvp-svn-helper/tsh-copy.c:104 msgid Local copy @@ -1210,9 +1197,8 @@ msgid Local delete msgstr Suppression locale #: ../tvp-svn-helper/tsh-delete.c:145 -#, fuzzy msgid Delete Message -msgstr Envoyer +msgstr Effacer message #: ../tvp-svn-helper/tsh-file-dialog.c:60 msgid _Certificate: @@ -1229,19 +1215,16 @@ msgid Remember msgstr Se souvenir #: ../tvp-svn-helper/tsh-file-dialog.c:86 -#, fuzzy msgid Certificate -msgstr Notification +msgstr Certificat #: ../tvp-svn-helper/tsh-import.c:125 -#, fuzzy msgid Import Message -msgstr Envoyer +msgstr Importer Message #: ../tvp-svn-helper/tsh-log.c:113 -#, fuzzy msgid Log failed -msgstr Débloquer +msgstr Echec de la journalisation #: ../tvp-svn-helper/tsh-login-dialog.c:65 msgid _Username: @@ -1256,9 +1239,8 @@ msgid Login msgstr Se connecter #: ../tvp-svn-helper/tsh-log-message-dialog.c:93 -#, fuzzy msgid State -msgstr État +msgstr Etat #: ../tvp-svn-helper/tsh-log-message-dialog.c:118 msgid Log Message @@ -1283,9 +1265,8 @@ msgid Set property failed msgstr Restaurer #: ../tvp-svn-helper/tsh-properties.c:104 -#, fuzzy msgid Properties failed -msgstr Éditer les propriétés +msgstr Echec des propriétés #: ../tvp-svn-helper/tsh-properties-dialog.c:132 msgid Value @@ -1312,9 +1293,8 @@ msgstr Soi-même #. #: ../tvp-svn-helper/tsh-properties-dialog.c:218 #: ../tvp-svn-helper/tsh-status-dialog.c:191 -#, fuzzy msgid Immediate files -msgstr Restaurer +msgstr Fichiers immédiats #. Translators: svn recursion selection #. * Recursive means the update is full recursive @@ -1324,14 +1304,12 @@ msgstr Restaurer #. #: ../tvp-svn-helper/tsh-properties-dialog.c:236 #: ../tvp-svn-helper/tsh-status-dialog.c:209 -#, fuzzy msgid Recursive -msgstr Fixer comme résolu +msgstr Récursif #: ../tvp-svn-helper/tsh-relocate.c:71 -#, fuzzy msgid Relocate failed -msgstr Restaurer +msgstr Echec du transfert #: ../tvp-svn-helper/tsh-relocate.c:86 msgid Relocate finished ___ Xfce4-commits mailing list
[Xfce4-commits] www:master Initial work on the 4.8pre2 changelog.
Updating branch refs/heads/master
to 8a0e10b916951a6c91988a1d6adfbf92f83d7e4b (commit)
from cf909bfe0690c6fe69f41211fe5dbc1e2b1bca77 (commit)
commit 8a0e10b916951a6c91988a1d6adfbf92f83d7e4b
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sat Dec 4 15:10:36 2010 +0100
Initial work on the 4.8pre2 changelog.
i18n/documentation/changelogs/4.8pre2.en.php | 155 ++
1 files changed, 155 insertions(+), 0 deletions(-)
diff --git a/i18n/documentation/changelogs/4.8pre2.en.php
b/i18n/documentation/changelogs/4.8pre2.en.php
new file mode 100644
index 000..8cf1a4a
--- /dev/null
+++ b/i18n/documentation/changelogs/4.8pre2.en.php
@@ -0,0 +1,155 @@
+?php
+function bug ($id){
+echo 'bug a href=http://bugzilla.xfce.org/show_bug.cgi?id='. $id .'#'.
$id .'/a';
+}
+?
+
+h2Xfce 4.8pre1 Changelog/h2
+
+h3Extension Library em(exo)/em:/h3
+
+ul
+ liFix opening of URIs with spaces in claws-mail and sylpheed./li
+ liFix two @libexecdir@ - @HELPERDIR@ replacements./li
+ liAdd Icedove helper./li
+ liFix Opera helper with Opera newer as 10.60./li
+ liAdd mime types to the exo-open desktop files (?php bug('6800') ?)./li
+ liStore preferred application in mimeapps.list (?php bug('6800') ?)./li
+ liDon't build the GIO module after glib 2.27 (?php bug('6800') ?)./li
+ liMake exo-open more standalone (?php bug('6573') ?)./li
+ liTranslation updates (ug, gl, zh_TW, ru, sk, ja, el, sv, es, eu, hu, pt,
kk, it, ja, he, uk, ca, da, id)./li
+/ul
+
+h3Widget Library em(libxfce4ui)/em:/h3
+
+ul
+ liAlso request an interact for save-state-extended./li
+ liReturn a NULL state file is the sm-client is disabled./li
+ liFix the save-state signal./li
+ liTranslation updates (pt)./li
+/ul
+
+h3Utility Library em(libxfce4util)/em:/h3
+
+ul
+ liFix wrong capitalization of Xfce./li
+ liFix stdarg.h include (?php bug('6897') ?)./li
+ liTranslation updates (pt)./li
+/ul
+
+h3File Manager em(thunar)/em:/h3
+
+ul
+ liMake .desktop entries installed by Thunar validate against
desktop-file-utils 0.16 (?php bug('6655') ?). Patch by Samuli Suominen./li
+ liFix missing instruction to load the sendto model (?php bug('6762')
?)./li
+ liAllow scrolling in the 'Open With' combo box of the file properties
dialog (?php bug('3055') ?)./li
+ liExpand filenames starting with './' based on the current working
directory instead of home (?php bug('3451') ?)./li
+ liPrint an error if thunar-settings fails to contact the file manager
service (?php bug('6547') ?)./li
+ liPermanently delete files if at least one of them cannot be trashed
(?php bug('6748') ?)./li
+ liFix a typo in configure.in.in (?php bug('6724') ?)./li
+ liUse GTK_STOCK_FILE as the fallback icon for files (?php bug('6662')
?)./li
+ liUse Name field as display name of desktop entries (?php bug('6860')
?)./li
+/ul
+
+h3Utilities em(xfce-utils)/em:/h3
+
+ul
+ liReturn support for vendor information./li
+ liHookup the help button in xfce4-about./li
+ liFix typo in xfce4-about --help./li
+ liFix some wrong capitalizations of Xfce./li
+ liTranslation updates (id, zh_TW, kk, it, fi, gl, da, ca, pt, uk, eu, sk,
de, hu)./li
+/ul
+
+h3Application Finder em(xfce4-appfinder)/em:/h3
+
+ul
+
+/ul
+
+h3Panel em(xfce4-panel)/em:/h3
+
+ul
+ liDon't destroy the about dialog./li
+ liAllow using enter in the launcher treeviews./li
+ liFix crash in always group mode (?php bug('6792') ?)./li
+ liDrop the automatic grouping option from tasklist; not implemented
yet./li
+ liFix Gdk key macro names./li
+ liFix confustion with panel opacity (?php bug('6827') ?)./li
+ liMake miniature view the default in the pager (?php bug('6825') ?)./li
+ liFix wrong capitalization of Xfce./li
+ liFix issue in systray size allocation with 1 row (?php bug('6809')
?)./li
+ liFix 'add launcher' desktop file./li
+ liImprove debugging output for display changes./li
+ liRestore shadow of spin button in systray dialog./li
+ liAdd function to return the Xfconf panel name./li
+ liWarning why # pager rows does not apply (?php bug('6555') ?)./li
+ liGracefully handle abort signal (?php bug('6563') ?)./li
+ liRestart the panel if we receive SIGUSR1./li
+ liFix format of 12-hour clock./li
+ liAdd option to not rotate buttons in vertical panel (?php bug('6687')
?)./li
+ liPropertly handle insensitive clock colors./li
+ liSet correct session priority./li
+ liImprove support for a menu editor (alacarte) in the applications
menu./li
+ liDon't destroy the application menu under the users' cursor on
reload./li
+ liAdd window DND to the pager in tasklist./li
+ liMake viewports work in the tasklist (?php bug('6898') ? and ?php
bug('6665') ?)./li
+ liSupport viewports in button pager./li
+ liTranslation updates (be, ca, da, de, eu, fi, gl, hu, id, it, ja, kk, nl,
pt, sk, ta, uk, zh_CN, zh_TW)./li
+/ul
+
+h3Session Manager em(xfce4-session)/em:/h3
+
+ul
+liDo not try unix-session authorization with PolicyKit as this seems to be
either broken or
[Xfce4-commits] thunarx-python:master Add module.xml file
Updating branch refs/heads/master to 390542146f50dd0c04333c8d93273400afb8e05c (commit) from c47b29130a0b69c9866ee60a1698a34f9f52e362 (commit) commit 390542146f50dd0c04333c8d93273400afb8e05c Author: Adam Plumb adampl...@gmail.com Date: Sat Dec 4 08:47:04 2010 -0500 Add module.xml file module.xml | 18 ++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/module.xml b/module.xml new file mode 100644 index 000..d64c24c --- /dev/null +++ b/module.xml @@ -0,0 +1,18 @@ +?xml version='1.0' encoding='UTF-8'? +Project xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:rdfs=http://www.w3.org/2000/01/rdf-schema#; + xmlns:foaf=http://xmlns.com/foaf/0.1/; + xmlns:gnome=http://api.gnome.org/doap-extensions#; + xmlns=http://usefulinc.com/ns/doap#; + +name xml:lang=enthunarx-python/name +shortdesc xml:lang=enThunarx Python Bindings/shortdesc + +maintainer +foaf:Person +foaf:nameAdam Plumb/foaf:name +foaf:mboxmailto:adampl...@gmail.com/foaf:mbox +gnome:useridadamplumb/gnome:userid +/foaf:Person +/maintainer +/Project ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated French (fr) translation to 96%
Updating branch refs/heads/master to 01ef4876e75985d82818b974fed3b81d771abb7a (commit) from 608d6dbbeb8114187ae8c01f49bfc227523c5f08 (commit) commit 01ef4876e75985d82818b974fed3b81d771abb7a Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sat Dec 4 15:17:50 2010 +0100 l10n: Updated French (fr) translation to 96% New status: 269 messages complete with 10 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 67 - 1 files changed, 22 insertions(+), 45 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2fff4fc..c0ba222 100644 --- a/po/fr.po +++ b/po/fr.po @@ -517,7 +517,6 @@ msgid Execute blame action msgstr Exécuter un blâme #: ../tvp-git-helper/main.c:97 -#, fuzzy msgid Execute branch action msgstr Effectuer un branch @@ -530,28 +529,24 @@ msgid Execute clone action msgstr Exécuter un clonage #: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178 -#, fuzzy msgid Execute log action -msgstr Exécuter une journalisation +msgstr Effectuer une journalisation #: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184 msgid Execute move action msgstr Effectuer un déplacement #: ../tvp-git-helper/main.c:127 -#, fuzzy msgid Execute reset action -msgstr Exécuter un reset +msgstr Effectuer une réinitialisation #: ../tvp-git-helper/main.c:133 -#, fuzzy msgid Execute stash action -msgstr Exécuter un stash +msgstr Effectuer un stash #: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214 -#, fuzzy msgid Execute status action -msgstr Exécuter un statut +msgstr Obtenir le statut #: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249 msgid Add Related Options: @@ -669,7 +664,6 @@ msgstr A échoué #: ../tvp-git-helper/tgh-common.c:199 #: ../tvp-git-helper/tgh-file-selection-dialog.c:251 -#, fuzzy msgid untracked msgstr non suivie @@ -679,26 +673,22 @@ msgid Select/Unselect all msgstr Sélectionner / Désélectionner tout #: ../tvp-git-helper/tgh-log-dialog.c:131 -#, fuzzy msgid AuthorDate -msgstr Auteur +msgstr AuthorDate #: ../tvp-git-helper/tgh-log-dialog.c:143 -#, fuzzy msgid CommitDate -msgstr Envoyer +msgstr CommitDate #: ../tvp-git-helper/tgh-log-dialog.c:149 #: ../tvp-svn-helper/tsh-log-dialog.c:142 -#, fuzzy msgid Message -msgstr Envoyer +msgstr Message #: ../tvp-git-helper/tgh-log-dialog.c:187 #: ../tvp-git-helper/tgh-stash-dialog.c:198 -#, fuzzy msgid Changes -msgstr Changé +msgstr Changements #: ../tvp-git-helper/tgh-log-dialog.c:194 #: ../tvp-git-helper/tgh-stash-dialog.c:205 @@ -706,18 +696,16 @@ msgid File msgstr Fichier #: ../tvp-git-helper/tgh-move.c:58 -#, fuzzy msgid Move finished -msgstr Nettoyer les verrous +msgstr Déplacement terminé #: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137 msgid Move To msgstr Déplacer vers #: ../tvp-git-helper/tgh-move.c:151 -#, fuzzy msgid Move ... -msgstr Déplacer +msgstr Déplacement ... #: ../tvp-git-helper/tgh-notify-dialog.c:87 #: ../tvp-svn-helper/tsh-log-dialog.c:180 @@ -730,20 +718,17 @@ msgid Notify msgstr Notifier #: ../tvp-git-helper/tgh-reset.c:58 -#, fuzzy msgid Reset finished -msgstr Nettoyer les verrous +msgstr Réinitialisation terminée #: ../tvp-git-helper/tgh-reset.c:143 -#, fuzzy msgid Reset ... -msgstr Restaurer +msgstr Réinitialiser ... #: ../tvp-git-helper/tgh-stash-dialog.c:162 #: ../tvp-svn-helper/tsh-properties-dialog.c:126 -#, fuzzy msgid Name -msgstr Différences détaillées +msgstr Nom #: ../tvp-git-helper/tgh-stash-dialog.c:174 msgid Description @@ -754,7 +739,7 @@ msgid Stash description: msgstr Description du stash: #: ../tvp-git-helper/tgh-stash-dialog.c:574 -#, c-format, fuzzy +#, c-format msgid Are you sure you want to drop %s? msgstr Etes-vous sûr de vouloir supprimer %s? @@ -792,48 +777,40 @@ msgid Transfer msgstr Transfert #: ../tvp-svn-helper/main.c:124 -#, fuzzy msgid Execute changelist action -msgstr Exécuter une extraction +msgstr Exécuter un changelist #: ../tvp-svn-helper/main.c:130 msgid Execute checkout action msgstr Exécuter une extraction #: ../tvp-svn-helper/main.c:136 -#, fuzzy msgid Execute cleanup action -msgstr Exécuter une extraction +msgstr Effectuer un nettoyage #: ../tvp-svn-helper/main.c:142 -#, fuzzy msgid Execute commit action -msgstr Exécuter une extraction +msgstr Effectuer un commit #: ../tvp-svn-helper/main.c:148 -#, fuzzy msgid Execute copy action -msgstr Exécuter une extraction +msgstr Effectuer une copie #: ../tvp-svn-helper/main.c:154 -#, fuzzy msgid Execute delete action -msgstr Exécuter une mise à jour +msgstr Effectuer une suppression #: ../tvp-svn-helper/main.c:160 -#, fuzzy msgid Execute export action -msgstr Exécuter une extraction +msgstr Effectuer une exportation #: ../tvp-svn-helper/main.c:166 -#, fuzzy msgid Execute import action -msgstr Exécuter une extraction +msgstr Effectuer
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated French (fr) translation to 99%
Updating branch refs/heads/master to d1bf09631625c06e0e112c0081fddc9a7604aba3 (commit) from 01ef4876e75985d82818b974fed3b81d771abb7a (commit) commit d1bf09631625c06e0e112c0081fddc9a7604aba3 Author: Xavier Devlamynck magicrhe...@ouranos.be Date: Sat Dec 4 15:24:01 2010 +0100 l10n: Updated French (fr) translation to 99% New status: 278 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 23 +++ 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/po/fr.po b/po/fr.po index c0ba222..fa9034a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -813,9 +813,8 @@ msgid Execute lock action msgstr Exécuter un verrouillage #: ../tvp-svn-helper/main.c:190 -#, fuzzy msgid Execute properties action -msgstr Exécuter une extraction +msgstr Exécuter une propriété #: ../tvp-svn-helper/main.c:196 #, fuzzy @@ -827,9 +826,8 @@ msgid Execute relocate action msgstr Effectuer un transfert #: ../tvp-svn-helper/main.c:208 -#, fuzzy msgid Execute revert action -msgstr Exécuter une extraction +msgstr Exécuter une restauration #: ../tvp-svn-helper/main.c:220 msgid Execute switch action @@ -895,14 +893,12 @@ msgid Resolved Related Options: msgstr Options connexes résolues: #: ../tvp-svn-helper/main.c:309 -#, fuzzy msgid Relocate Related Options: -msgstr Exécuter une mise à jour +msgstr Options liées au transfert: #: ../tvp-svn-helper/main.c:313 -#, fuzzy msgid Revert Related Options: -msgstr Revenir à une version antérieure: +msgstr Options liées à la restauration: #: ../tvp-svn-helper/main.c:321 msgid Switch Related Options: @@ -983,12 +979,10 @@ msgid Restored msgstr Restauré #: ../tvp-svn-helper/tsh-common.c:519 -#, fuzzy msgid Reverted msgstr Restauration #: ../tvp-svn-helper/tsh-common.c:520 -#, fuzzy msgid Revert failed msgstr Echec de la restauration @@ -1080,14 +1074,12 @@ msgid Property nonexisting msgstr Propriété non existante #: ../tvp-svn-helper/tsh-common.c:552 -#, fuzzy msgid Revision property set -msgstr Restaurer +msgstr Propriété de la révision ajoutée #: ../tvp-svn-helper/tsh-common.c:553 -#, fuzzy msgid Revision property deleted -msgstr Restaurer +msgstr Propriété de la révision supprimée #: ../tvp-svn-helper/tsh-common.c:554 msgid Merge completed @@ -1219,9 +1211,8 @@ msgstr Notification #. tsh_properties_dialog_done (dialog); #: ../tvp-svn-helper/tsh-properties.c:81 -#, fuzzy msgid Set property failed -msgstr Restaurer +msgstr Echec de l'ajout de la propriété #: ../tvp-svn-helper/tsh-properties.c:104 msgid Properties failed ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Always use applications menu for default menu.
Updating branch refs/heads/master to 148ed036003bc5fef18e5c2f7090549e915f0476 (commit) from 85fa958a61c2320bd732ed1281cedf35de1a034f (commit) commit 148ed036003bc5fef18e5c2f7090549e915f0476 Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 15:37:34 2010 +0100 Always use applications menu for default menu. Garcon respects the XDG_MENU_PREFIX variable, which is set the xfce- in xinitrc and used by alacarte too. .../applicationsmenu/applicationsmenu-dialog.glade | 23 +--- plugins/applicationsmenu/applicationsmenu.c| 118 +--- 2 files changed, 34 insertions(+), 107 deletions(-) diff --git a/plugins/applicationsmenu/applicationsmenu-dialog.glade b/plugins/applicationsmenu/applicationsmenu-dialog.glade index 06f4379..a95e359 100644 --- a/plugins/applicationsmenu/applicationsmenu-dialog.glade +++ b/plugins/applicationsmenu/applicationsmenu-dialog.glade @@ -195,20 +195,6 @@ property name=orientationvertical/property property name=spacing6/property child - object class=GtkRadioButton id=use-xfce-menu -property name=label translatable=yesUse the _Xfce menu/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=receives_defaultFalse/property -property name=use_underlineTrue/property -property name=activeTrue/property -property name=draw_indicatorTrue/property - /object - packing -property name=position0/property - /packing -/child -child object class=GtkHBox id=hbox1 property name=visibleTrue/property property name=spacing12/property @@ -220,7 +206,6 @@ property name=receives_defaultFalse/property property name=use_underlineTrue/property property name=draw_indicatorTrue/property -property name=groupuse-xfce-menu/property /object packing property name=position0/property @@ -242,7 +227,7 @@ /child /object packing -property name=position1/property +property name=position0/property /packing /child child @@ -254,10 +239,10 @@ property name=use_underlineTrue/property property name=activeTrue/property property name=draw_indicatorTrue/property -property name=groupuse-xfce-menu/property +property name=groupuse-default-menu/property /object packing -property name=position2/property +property name=position1/property /packing /child child @@ -292,7 +277,7 @@ /child /object packing -property name=position3/property +property name=position2/property /packing /child /object diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c index 79ac910..b0108ed 100644 --- a/plugins/applicationsmenu/applicationsmenu.c +++ b/plugins/applicationsmenu/applicationsmenu.c @@ -38,9 +38,6 @@ #define DEFAULT_TITLE _(Applications Menu) #define DEFAULT_ICON_NAME xfce4-panel-menu #define DEFAULT_ICON_SIZE (16) -#define DEFAULT_MENU xfce-applications.menu -#define APPLICATIONS_MENU applications.menu -#define CUSTOM_MENU custom @@ -65,7 +62,7 @@ struct _ApplicationsMenuPlugin guintshow_button_title : 1; gchar *button_title; gchar *button_icon; - gchar *menu_file; + gboolean custom_menu; gchar *custom_menu_file; /* temp item we store here when the @@ -82,7 +79,7 @@ enum PROP_SHOW_BUTTON_TITLE, PROP_BUTTON_TITLE, PROP_BUTTON_ICON, - PROP_MENU_FILE, + PROP_CUSTOM_MENU, PROP_CUSTOM_MENU_FILE }; @@ -185,10 +182,10 @@ applications_menu_plugin_class_init (ApplicationsMenuPluginClass *klass)
[Xfce4-commits] exo:master Set application name for Thunar loop detection.
Updating branch refs/heads/master
to 5b3ef158a43486e8cf0068061ac238f5a8d24ab7 (commit)
from 95d44fbd3077e4bc5082ee8b324a90dcbfbc51b7 (commit)
commit 5b3ef158a43486e8cf0068061ac238f5a8d24ab7
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 4 16:11:49 2010 +0100
Set application name for Thunar loop detection.
exo-gio-module/exo-module.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/exo-gio-module/exo-module.c b/exo-gio-module/exo-module.c
index 898d453..3e76411 100644
--- a/exo-gio-module/exo-module.c
+++ b/exo-gio-module/exo-module.c
@@ -62,13 +62,14 @@ struct _KnownSchemes
{
const gchar *pattern;
const gchar *category;
+ const gchar *app_name; /* name of the desktop files we use after gio 2.27
for thunar */
};
static KnownSchemes known_schemes[] =
{
- { ^(https?|ftps?|gopher)$, WebBrowser },
- { ^mailto$,MailReader },
- { ^(file|trash|ssh)$, FileManager }
+ { ^(https?|ftps?|gopher)$, WebBrowser, exo-web-browser },
+ { ^mailto$,MailReader, exo-mail-reader },
+ { ^(file|trash|ssh)$, FileManager, exo-file-manager }
};
@@ -141,7 +142,8 @@ exo_gio_module_get_default_for_uri_scheme
(GDesktopAppInfoLookup *lookup,
{
/* use the exo-helper directly here to avoid possible roundtrips
with exo-open */
command = g_strconcat (EXO_HELPER_LAUNCH, known_schemes[i].category,
NULL);
- info = g_app_info_create_from_commandline (command, NULL,
G_APP_INFO_CREATE_SUPPORTS_URIS, error);
+ info = g_app_info_create_from_commandline (command,
known_schemes[i].app_name,
+
G_APP_INFO_CREATE_SUPPORTS_URIS, error);
if (G_UNLIKELY (info == NULL))
{
/* show error */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Avoid GIO 2.20 calls; fix the recursive file manager launch check.
Updating branch refs/heads/master
to 01236511efffe38645d962d2d4129dd322b21607 (commit)
from 2133f883d1cc752374f176f0fcc0c61bcc48f42d (commit)
commit 01236511efffe38645d962d2d4129dd322b21607
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Dec 4 16:23:37 2010 +0100
Avoid GIO 2.20 calls; fix the recursive file manager launch check.
NEWS |3 +++
thunar/thunar-file.c |7 +++
thunar/thunar-gio-extensions.c |2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 3bf9944..2a83af0 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@
- Fix a typo in configure.in.in (bug #6724).
- Use GTK_STOCK_FILE as the fallback icon for files (bug #6662).
- Use Name field as display name of desktop entries (bug #6860).
+- Avoid GIO 2.20 function calls.
+- Properly avoid launching the file manager recursively by checking
+ the GAppInfo id/name.
1.1.4
=
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index dc0f59b..1171527 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -1158,7 +1158,6 @@ thunar_file_launch (ThunarFile *file,
GAppInfo*app_info;
gboolean succeed;
GListpath_list;
- const gchar *command_line;
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -1199,9 +1198,9 @@ thunar_file_launch (ThunarFile *file,
/* HACK: check if we're not trying to launch another file manager again,
possibly
* ourselfs which will end in a loop */
- command_line = g_app_info_get_commandline (app_info);
- if (command_line != NULL
- strstr (command_line, exo-helper-1 --launch FileManager) != NULL)
+ if (g_strcmp0 (g_app_info_get_id (app_info), exo-file-manager.desktop) == 0
+ || g_strcmp0 (g_app_info_get_id (app_info), Thunar.desktop) == 0
+ || g_strcmp0 (g_app_info_get_name (app_info), exo-file-manager) == 0)
{
g_object_unref (G_OBJECT (app_info));
thunar_show_chooser_dialog (parent, file, TRUE);
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index e4717b3..58360eb 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -555,12 +555,14 @@ thunar_g_volume_is_present (GVolume *volume)
g_object_unref (drive);
}
+#if GLIB_CHECK_VERSION (2, 20, 0)
mount = g_volume_get_mount (volume);
if (mount != NULL)
{
is_shadowed = g_mount_is_shadowed (mount);
g_object_unref (mount);
}
+#endif
return has_media !is_shadowed;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master Guard GIO 2.20 function calls, provide alternatives to GTK+ 2.18 calls.
Updating branch refs/heads/master
to 6b4711a7c749d0ae5eaaac5b613e29c908635af0 (commit)
from a40bbb2d8ed4a247895f83a5ed2584d0e21ea8cc (commit)
commit 6b4711a7c749d0ae5eaaac5b613e29c908635af0
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Dec 4 16:40:35 2010 +0100
Guard GIO 2.20 function calls, provide alternatives to GTK+ 2.18 calls.
NEWS |2 ++
src/xfdesktop-file-icon-manager.c |8 ++--
src/xfdesktop-file-utils.c|4
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/NEWS b/NEWS
index 30a4eb1..75b76f5 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Xfdesktop 4.7.x
* Let garcon choose the default applications menu file using
XDG_MENU_PREFIX. Drop the UserMenu kiosk option as the panel
sort of allows to bypass it anyway.
+ * Avoid GTK+ 2.18 and GIO 2.20 function calls (or at least guard them
+so that xfdesktop still builds with older versions).
Xfdesktop 4.7.3
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index 2685e32..c5944a7 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -588,7 +588,7 @@ xfdesktop_file_icon_manager_trash_files_cb(DBusGProxy
*proxy,
if(error) {
GtkWidget *parent =
gtk_widget_get_toplevel(GTK_WIDGET(fmanager-priv-icon_view));
-xfce_message_dialog(GTK_WINDOW (parent),
+xfce_message_dialog(GTK_WINDOW(parent),
_(Trash Error), GTK_STOCK_DIALOG_ERROR,
_(The selected files could not be trashed),
_(This feature requires a file manager service to
@@ -632,7 +632,7 @@
xfdesktop_file_icon_manager_trash_files(XfdesktopFileIconManager *fmanager,
{
GtkWidget *parent =
gtk_widget_get_toplevel(GTK_WIDGET(fmanager-priv-icon_view));
-xfce_message_dialog(GTK_WINDOW (parent),
+xfce_message_dialog(GTK_WINDOW(parent),
_(Trash Error), GTK_STOCK_DIALOG_ERROR,
_(The selected files could not be trashed),
_(This feature requires a file manager service to
@@ -2223,7 +2223,11 @@ xfdesktop_file_icon_manager_files_ready(GFileEnumerator
*enumerator,
if(!files) {
if(error) {
GtkWidget *toplevel =
gtk_widget_get_toplevel(GTK_WIDGET(fmanager-priv-icon_view));
+#if GTK_CHECK_VERSION (2, 18, 0)
xfce_message_dialog(gtk_widget_is_toplevel(toplevel) ?
GTK_WINDOW(toplevel) : NULL,
+#else
+xfce_message_dialog(GTK_WIDGET_TOPLEVEL(toplevel) ?
GTK_WINDOW(toplevel) : NULL,
+#endif
_(Load Error),
GTK_STOCK_DIALOG_WARNING,
_(Failed to load the desktop folder),
error-message,
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 7a69e39..644b26c 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -165,7 +165,9 @@ xfdesktop_file_utils_volume_is_present(GVolume *volume)
gboolean has_media = FALSE;
gboolean is_shadowed = FALSE;
GDrive *drive;
+#if GLIB_CHECK_VERSION (2, 20, 0)
GMount *mount;
+#endif
g_return_val_if_fail(G_IS_VOLUME(volume), FALSE);
@@ -175,11 +177,13 @@ xfdesktop_file_utils_volume_is_present(GVolume *volume)
g_object_unref(drive);
}
+#if GLIB_CHECK_VERSION (2, 20, 0)
mount = g_volume_get_mount(volume);
if(mount) {
is_shadowed = g_mount_is_shadowed(mount);
g_object_unref(mount);
}
+#endif
return has_media !is_shadowed;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to 2166c9e66fe2613ca93f7b2585e79b82f34d1db4 (commit) from 3a9f0f2c330fc8419b4f7714ffe39dfa81ee87f4 (commit) commit 2166c9e66fe2613ca93f7b2585e79b82f34d1db4 Author: Michael Martins michaelf...@gmail.com Date: Sat Dec 4 17:01:48 2010 +0100 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 80 -- 1 files changed, 55 insertions(+), 25 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 22f456d..9dc2393 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11,7 +11,7 @@ msgid msgstr Project-Id-Version: xfwm4 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-03-28 12:06+0200\n +POT-Creation-Date: 2010-12-04 11:10+\n PO-Revision-Date: 2009-02-04 20:21-0500\n Last-Translator: Og Maciel ogmac...@gnome.org\n Language-Team: Brazilian Portuguese ldp...@bazar2.conectiva.com.br\n @@ -40,26 +40,26 @@ msgid Session manager socket msgstr Socket do gerenciador de sessão #: ../settings-dialogs/tweaks-settings.c:421 -#: ../settings-dialogs/workspace-settings.c:360 +#: ../settings-dialogs/workspace-settings.c:370 #: ../settings-dialogs/xfwm4-settings.c:310 msgid SOCKET ID msgstr SOCKET ID #: ../settings-dialogs/tweaks-settings.c:422 -#: ../settings-dialogs/workspace-settings.c:361 +#: ../settings-dialogs/workspace-settings.c:371 #: ../settings-dialogs/xfwm4-settings.c:312 msgid Version information msgstr Informações de versão #: ../settings-dialogs/tweaks-settings.c:440 -#: ../settings-dialogs/workspace-settings.c:378 -#: ../settings-dialogs/xfwm4-settings.c:948 +#: ../settings-dialogs/workspace-settings.c:388 +#: ../settings-dialogs/xfwm4-settings.c:942 msgid . msgstr . #: ../settings-dialogs/tweaks-settings.c:444 -#: ../settings-dialogs/workspace-settings.c:382 -#: ../settings-dialogs/xfwm4-settings.c:952 +#: ../settings-dialogs/workspace-settings.c:392 +#: ../settings-dialogs/xfwm4-settings.c:946 #, c-format msgid %s: %s\n @@ -68,17 +68,17 @@ msgstr %s: %s\n Digite %s --help para ver uma lista completa de opções disponíveis de linha de comando.\n -#: ../settings-dialogs/workspace-settings.c:72 -#: ../settings-dialogs/workspace-settings.c:87 +#: ../settings-dialogs/workspace-settings.c:73 +#: ../settings-dialogs/workspace-settings.c:88 #, c-format msgid Workspace %d msgstr Espaço de trabalho %d -#: ../settings-dialogs/workspace-settings.c:252 +#: ../settings-dialogs/workspace-settings.c:280 msgid Workspace Name msgstr Nome de espaços de trabalho -#: ../settings-dialogs/workspace-settings.c:360 +#: ../settings-dialogs/workspace-settings.c:370 #: ../settings-dialogs/xfwm4-settings.c:310 msgid Settings manager socket msgstr Socket de gerenciador de configurações @@ -598,33 +598,33 @@ msgstr Excluir último espaço de trabalho msgid Delete active workspace msgstr Excluir espaço de trabalho ativo -#: ../settings-dialogs/xfwm4-settings.c:450 +#: ../settings-dialogs/xfwm4-settings.c:448 msgid Theme msgstr Tema -#: ../settings-dialogs/xfwm4-settings.c:599 +#: ../settings-dialogs/xfwm4-settings.c:597 msgid Action msgstr Ação -#: ../settings-dialogs/xfwm4-settings.c:604 +#: ../settings-dialogs/xfwm4-settings.c:602 msgid Shortcut msgstr Atalho -#: ../settings-dialogs/xfwm4-settings.c:977 +#: ../settings-dialogs/xfwm4-settings.c:971 #, c-format msgid Failed to initialize xfconf. Reason: %s msgstr Falha ao inicializar o xfconf. Motivo: %s -#: ../settings-dialogs/xfwm4-settings.c:988 +#: ../settings-dialogs/xfwm4-settings.c:982 msgid Could not create the settings dialog. msgstr Não foi possível criar o diálogo de configurações. -#: ../settings-dialogs/xfwm4-settings.c:1880 -#: ../settings-dialogs/xfwm4-settings.c:1881 +#: ../settings-dialogs/xfwm4-settings.c:1869 +#: ../settings-dialogs/xfwm4-settings.c:1870 msgid Reset to Defaults msgstr Restaurar para padrões -#: ../settings-dialogs/xfwm4-settings.c:1882 +#: ../settings-dialogs/xfwm4-settings.c:1871 msgid This will reset all shortcuts to their default values. Do you really want to do this? msgstr Isto restaurará todos os atalhos aos seus valores padrões. Você realmente deseja fazer isso? @@ -832,16 +832,49 @@ msgid _Number of workspaces: msgstr _Número de espaços de trabalho: #. TRANSLATORS: (on %s) is like running on the name of the other host -#: ../src/client.c:182 +#: ../src/client.c:184 #, c-format msgid %s (on %s) msgstr %s (em %s) -#: ../src/main.c:138 +#: ../src/main.c:140 #, c-format msgid %s: Segmentation fault msgstr %s: Falha de segmentação +#: ../src/main.c:534 +msgid Fork to the background +msgstr Mover para o fundo + +#: ../src/main.c:536 +msgid Fork to the background (not supported) +msgstr Mover para o fundo (não suportado) + +#: ../src/main.c:539 +msgid Set the compositor mode
[Xfce4-commits] garcon:master Derive DefaultMergeDirs value from the menu filename (bug #6491).
Updating branch refs/heads/master
to 6a6807b37ba4409132fa067a3f5bcfe388127b6a (commit)
from b66e39c727817d6ce6cc4de89d3caeee643008fc (commit)
commit 6a6807b37ba4409132fa067a3f5bcfe388127b6a
Author: Jannis Pohlmann jan...@xfce.org
Date: Sat Dec 4 17:10:16 2010 +0100
Derive DefaultMergeDirs value from the menu filename (bug #6491).
We now use the following algorithm to derive the directory name of the
default merge dirs:
- if the .menu file is ${XDG_MENU_PREFIX}applications.menu or if
the name cannot be derived (e.g. because the .menu file is called
.menu only) we use $XDG_CONFIG_DIRS/menus/applications-merged
- in all other cases, we use $XDG_CONFIG_DIRS/menus/XYZ-merged
(where the .menu file is called XYZ.menu)
NEWS|3 ++
garcon/garcon-menu-merger.c | 61 +++---
2 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 8a636f7..8fc61e9 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
(bug #5980).
- Explicitly link against gobject, add other missing libs (bug #6405).
- Add workaround to fix empty DefaultLayout elements (bug #6882).
+- Derive the directory name of DefaultMergeDirs from the name of the
+ .menu file (e.g. preferences.menu becomes preferences-merged) (bug
+ #6491).
0.1.3
diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index 07bc8b0..e498ed4 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -457,8 +457,9 @@ compare_files (GFile *file,
static void
-garcon_menu_merger_insert_default_merge_dirs (GNode *parent,
- GNode *defaults_node)
+garcon_menu_merger_insert_default_merge_dirs (GNode *parent,
+ GNode *defaults_node,
+ const gchar *merge_dir_basename)
{
GNode *node;
GNode *prev_node;
@@ -468,6 +469,7 @@ garcon_menu_merger_insert_default_merge_dirs (GNode *parent,
g_return_if_fail (parent != NULL);
g_return_if_fail (defaults_node != NULL);
+ g_return_if_fail (merge_dir_basename != NULL *merge_dir_basename != '\0');
prev_node = defaults_node;
@@ -475,7 +477,8 @@ garcon_menu_merger_insert_default_merge_dirs (GNode *parent,
dirs = g_get_system_config_dirs ();
for (i = 0; dirs[i] != NULL; i++)
{
- path = g_build_path (G_DIR_SEPARATOR_S, dirs[i], menus,
applications-merged, NULL);
+ path = g_build_path (G_DIR_SEPARATOR_S, dirs[i], menus,
+ merge_dir_basename, NULL);
if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
{
node = g_node_new (garcon_menu_node_create
(GARCON_MENU_NODE_TYPE_MERGE_DIR, path));
@@ -486,7 +489,7 @@ garcon_menu_merger_insert_default_merge_dirs (GNode *parent,
/* Append user config dir */
path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_config_dir (), menus,
- applications-merged, NULL);
+ merge_dir_basename, NULL);
if (G_LIKELY (g_file_test (path, G_FILE_TEST_IS_DIR)))
{
node = g_node_new (garcon_menu_node_create
(GARCON_MENU_NODE_TYPE_MERGE_DIR, path));
@@ -501,6 +504,15 @@ static gboolean
garcon_menu_merger_resolve_default_dirs (GNode *node,
GarconMenuMergerContext *context)
{
+ const gchar *prefix;
+ gboolean is_application_menu = FALSE;
+ GFile *file;
+ gchar *applications_filename;
+ gchar *extension;
+ gchar *filename;
+ gchar *menu_name;
+ gchar *merge_dir_basename = NULL;
+
g_return_val_if_fail (context != NULL, FALSE);
if (garcon_menu_node_tree_get_node_type (node) == context-node_type)
@@ -510,7 +522,46 @@ garcon_menu_merger_resolve_default_dirs (GNode
*node,
}
else if (garcon_menu_node_tree_get_node_type (node) ==
GARCON_MENU_NODE_TYPE_DEFAULT_MERGE_DIRS)
{
- garcon_menu_merger_insert_default_merge_dirs (node-parent, node);
+ /* determine the .menu file basename */
+ file = g_list_first (context-file_stack)-data;
+ filename = g_file_get_basename (file);
+
+ /* check if we have an application menu file */
+ prefix = g_getenv (XDG_MENU_PREFIX);
+ applications_filename = g_strconcat (prefix != NULL ? prefix : ,
+ applications.menu, NULL);
+ if (g_strcmp0 (filename, applications_filename) == 0)
+is_application_menu = TRUE;
+ g_free (applications_filename);
+
+ /* derive the basename of default merge dirs from the menu filename */
+ if (!is_application_menu)
+{
+ /* find the extension */
+ extension = g_strstr_len (filename, -1, .);
+
+ /* derive the merge dir name by stripping the extension */
+ if
[Xfce4-commits] xfce4-cpugraph-plugin:master Adjust files
Updating branch refs/heads/master to 34e55f3dc4209bacd39b91199c3be47df1e343f3 (commit) from 570fbee3008d715d604c2843bfe7fd4dea538e71 (commit) commit 34e55f3dc4209bacd39b91199c3be47df1e343f3 Author: Florian Rivoal friv...@xfce.org Date: Sun Dec 5 01:49:32 2010 +0900 Adjust files Rename configure.ac into configure.ac.in, as it should be; and remove the now unneeded LINGUAS. configure.ac = configure.ac.in |0 po/LINGUAS |2 -- 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac.in similarity index 100% rename from configure.ac rename to configure.ac.in diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index 29ff86b..000 --- a/po/LINGUAS +++ /dev/null @@ -1,2 +0,0 @@ -# set of available languages (in alphabetic order) -ast be ca cs da de en_GB es eu fi fr gl hu id it ja kk ku lv nb pa pl pt_BR pt ro ru sq sv tr ug uk ur_PK ur zh_CN zh_TW ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master Fix a minor typo in the README
Updating branch refs/heads/master to 570fbee3008d715d604c2843bfe7fd4dea538e71 (commit) from c159a3366aa92ad19d88367b6a4e488ce4d7a692 (commit) commit 570fbee3008d715d604c2843bfe7fd4dea538e71 Author: Florian Rivoal friv...@xfce.org Date: Sun Dec 5 01:37:53 2010 +0900 Fix a minor typo in the README README |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 431863c..cf15178 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -CPU Graph plugin for the XFce4 panel. +CPU Graph plugin for the Xfce4 panel. This plugin displays an graph from your latest system load. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to b27fd617ad192c7cc1928737106db05889a709c7 (commit) from 6a6807b37ba4409132fa067a3f5bcfe388127b6a (commit) commit b27fd617ad192c7cc1928737106db05889a709c7 Author: Michael Martins michaelf...@gmail.com Date: Sat Dec 4 20:31:22 2010 +0100 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 29 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 1cf7bec..36f92d5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,12 +2,12 @@ # Copyright (C) 2007 THE libxfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the libxfce package. # Og Maciel ogmac...@gnome.org, 2007. -# +# msgid msgstr Project-Id-Version: libxfce 4menu\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-23 11:03+\n +POT-Creation-Date: 2010-12-04 17:03+\n PO-Revision-Date: 2010-11-23 15:04-0300\n Last-Translator: Tomas A. Schertel tscher...@gmail.com\n Language-Team: Brazilian Portuguese ldp...@bazar2.conectiva.com.br\n @@ -15,9 +15,9 @@ msgstr Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n Language: pt_BR\n -X-Poedit-Country: BRAZIL\n Plural-Forms: nplurals=2; plural=(n 1);\n X-Poedit-Language: Portuguese\n +X-Poedit-Country: BRAZIL\n #: ../data/xfce/xfce-accessories.directory.in.h:1 msgid Accessories @@ -123,10 +123,10 @@ msgstr Sistema msgid System tools and utilities msgstr Ferramentas do sistema e utilidades -#: ../garcon/garcon-menu.c:710 +#: ../garcon/garcon-menu.c:698 #, c-format -msgid No suitable application menu file found -msgstr Nenhum arquivo de menu de aplicativos encontrado +msgid File \%s\ not found +msgstr Arquivo \%s\ não encontrado #: ../garcon/garcon-menu-parser.c:278 #, c-format @@ -138,6 +138,9 @@ msgstr Não foi possível carregar dados do arquivo de menu %s: %s msgid Could not load menu file data from %s msgstr Não foi possível carregar dados do arquivo de menu de %s +#~ msgid No suitable application menu file found +#~ msgstr Nenhum arquivo de menu de aplicativos encontrado + #~ msgid XfceMenu: Display Menu Test #~ msgstr XfceMenu: Mostrar o menu de teste ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:nick/gettext Add logo in header.
Updating branch refs/heads/nick/gettext
to 2156df35bbae10be248e1f25aa3463539a50b7cf (commit)
from be2249f6038ed6ec4f6fcdffc95a0af582fbaac6 (commit)
commit 2156df35bbae10be248e1f25aa3463539a50b7cf
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 4 20:51:29 2010 +0100
Add logo in header.
pages/header.php|2 +-
style/base.css | 24
style/img/logosmall.png | Bin 0 - 6422 bytes
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/pages/header.php b/pages/header.php
index 935b8fb..dba2705 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -30,7 +30,7 @@ else
div id=page-header
div
- h1Xfce/h1
+ h1 class=hiddenXfce/h1
h5 class=hiddenSub domains/h5
ul
lia href=http://www.xfce.org; title=Go to the
homepage class=activeHome/a/li
diff --git a/style/base.css b/style/base.css
index fea7473..2fd408a 100644
--- a/style/base.css
+++ b/style/base.css
@@ -5,24 +5,14 @@ body {
line-height: 1.7em;
font-family: Arial;
font-size: 90%;
-
- /* background: -moz-Field; color: -moz-FieldText; */
}
#page-header {
-/*border-bottom: 5px #0C6AD4 solid;*/
-background: #333;
-}
-#page-header h1 {
-color: #fff;
-line-height: 50px;
-margin: 0 0 0 15px;
- padding: 0;
-float: left;
- border: 0;
- font-size: 200%;
- text-shadow: #69f 0px 1px 3px;
+/*border-bottom: 2px #69f solid;*/
+background: #333 url('img/logosmall.png') no-repeat 6px 55%;
+ padding-left: 120px;
}
+
#page-header ul {
float: right ;
list-style: none;
@@ -67,7 +57,6 @@ body {
list-style: none;
margin: 0;
padding: 0;
-
}
#menu-main ul li {
border-left: 1px solid #ccc;
@@ -83,7 +72,6 @@ body {
#menu-main ul li a {
color: #666;
text-decoration: none;
-
}
#menu-main ul li a:hover {
color: #06c;
@@ -99,6 +87,7 @@ body {
background: #eee;
border: 1px solid #ccc;
padding: 10px;
+ padding-top: 0;
}
#menu-sub ul {
list-style: none;
@@ -115,6 +104,9 @@ body {
#menu-sub a {
display: block;
}
+#menu-sub h5 {
+ margin-top: 10px;
+}
table th {
text-align: left;
diff --git a/style/img/logosmall.png b/style/img/logosmall.png
new file mode 100644
index 000..2c49bc6
Binary files /dev/null and b/style/img/logosmall.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master Add checks for API change in libnotify 0.7.0 (bug #6915).
Updating branch refs/heads/master to ccfa0d3ca9daa9191442c0d285d46b4502d6bdb5 (commit) from 6b4711a7c749d0ae5eaaac5b613e29c908635af0 (commit) commit ccfa0d3ca9daa9191442c0d285d46b4502d6bdb5 Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 22:45:42 2010 +0100 Add checks for API change in libnotify 0.7.0 (bug #6915). src/xfdesktop-notify.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/xfdesktop-notify.c b/src/xfdesktop-notify.c index c91103b..4e0cb05 100644 --- a/src/xfdesktop-notify.c +++ b/src/xfdesktop-notify.c @@ -144,7 +144,11 @@ xfdesktop_notify_unmount (GMount *mount) name); } +#if NOTIFY_CHECK_VERSION (0, 7, 0) + notification = notify_notification_new (summary, message, icon_name); +#else notification = notify_notification_new (summary, message, icon_name, NULL); +#endif notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL); notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); notify_notification_show (notification, NULL); @@ -260,7 +264,11 @@ xfdesktop_notify_eject (GVolume *volume) name); } +#if NOTIFY_CHECK_VERSION (0, 7, 0) + notification = notify_notification_new (summary, message, icon_name); +#else notification = notify_notification_new (summary, message, icon_name, NULL); +#endif notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL); notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); notify_notification_show (notification, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Add checks for API change in libnotify 0.7.0.
Updating branch refs/heads/master
to 34b6d96921eca46f6b083259301b2bb93a5454dc (commit)
from 134fc3c1b1e5772dceb0ec6bb3db679e7bab8a4b (commit)
commit 34b6d96921eca46f6b083259301b2bb93a5454dc
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 4 22:48:38 2010 +0100
Add checks for API change in libnotify 0.7.0.
xfce4-settings-helper/accessibility.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/xfce4-settings-helper/accessibility.c
b/xfce4-settings-helper/accessibility.c
index 0f2f48d..9209371 100644
--- a/xfce4-settings-helper/accessibility.c
+++ b/xfce4-settings-helper/accessibility.c
@@ -411,7 +411,11 @@ xfce_accessibility_helper_notification_show
(XfceAccessibilityHelper *helper,
if (helper-notification == NULL)
{
/* create a new notification */
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+helper-notification = notify_notification_new (summary, body,
keyboard);
+#else
helper-notification = notify_notification_new (summary, body,
keyboard, NULL);
+#endif
/* close signal */
g_signal_connect (G_OBJECT (helper-notification), closed,
G_CALLBACK (xfce_accessibility_helper_notification_closed), helper);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Add checks for API change in libnotify 0.7.0.
Updating branch refs/heads/master to d9f4d906f3f75c2dde271e9d27e456a2f60067ad (commit) from 01236511efffe38645d962d2d4129dd322b21607 (commit) commit d9f4d906f3f75c2dde271e9d27e456a2f60067ad Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 22:50:13 2010 +0100 Add checks for API change in libnotify 0.7.0. thunar/thunar-notify.c |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/thunar/thunar-notify.c b/thunar/thunar-notify.c index f6643fe..c85c099 100644 --- a/thunar/thunar-notify.c +++ b/thunar/thunar-notify.c @@ -134,7 +134,11 @@ thunar_notify_unmount (GMount *mount) name); } +#if NOTIFY_CHECK_VERSION (0, 7, 0) + notification = notify_notification_new (summary, message, icon_name); +#else notification = notify_notification_new (summary, message, icon_name, NULL); +#endif notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL); notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); notify_notification_show (notification, NULL); @@ -244,7 +248,11 @@ thunar_notify_eject (GVolume *volume) name); } +#if NOTIFY_CHECK_VERSION (0, 7, 0) + notification = notify_notification_new (summary, message, icon_name); +#else notification = notify_notification_new (summary, message, icon_name, NULL); +#endif notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL); notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); notify_notification_show (notification, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master Add checks for API change in libnotify 0.7.0.
Updating branch refs/heads/master to 7d00b0e0776200a61b7923cd3b7ed480048acf1c (commit) from b156b72c9cb25b4777cdd36cf1e31770acd28a65 (commit) commit 7d00b0e0776200a61b7923cd3b7ed480048acf1c Author: Nick Schermer n...@xfce.org Date: Sat Dec 4 22:51:15 2010 +0100 Add checks for API change in libnotify 0.7.0. thunar-volman/tvm-notify.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/thunar-volman/tvm-notify.c b/thunar-volman/tvm-notify.c index 8947b87..71bb956 100644 --- a/thunar-volman/tvm-notify.c +++ b/thunar-volman/tvm-notify.c @@ -65,7 +65,11 @@ tvm_notify (const gchar *icon, } } +#if NOTIFY_CHECK_VERSION (0, 7, 0) + notification = notify_notification_new (summary, message, icon); +#else notification = notify_notification_new (summary, message, icon, NULL); +#endif notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); notify_notification_show (notification, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:master Update translators.
Updating branch refs/heads/master to f8bd586a0be03f691d5b00d8be3fb9ddad5f116c (commit) from 15135a904ef306d6f3b5357af55a73f4a7f40ac4 (commit) commit f8bd586a0be03f691d5b00d8be3fb9ddad5f116c Author: Transifex norep...@xfce.org Date: Sun Dec 5 00:00:04 2010 +0100 Update translators. xfce4-about/translators.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h index 2bddfbc..120e0c2 100644 --- a/xfce4-about/translators.h +++ b/xfce4-about/translators.h @@ -24,7 +24,7 @@ #include gtk/gtk.h #include libxfce4util/libxfce4util.h -#define TRANSLATORS_H_STAMP 2010-11-28 00:00:04 +#define TRANSLATORS_H_STAMP 2010-12-05 00:00:04 #define ATSIGN @ #define DOTSIGN . ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:master Move xfconf migration script to $libdir (bug #6917).
Updating branch refs/heads/master to 7bdc7a72f68b00a0d74e3ef02aecdd67b22d6a81 (commit) from f8bd586a0be03f691d5b00d8be3fb9ddad5f116c (commit) commit 7bdc7a72f68b00a0d74e3ef02aecdd67b22d6a81 Author: Nick Schermer n...@xfce.org Date: Sun Dec 5 01:06:48 2010 +0100 Move xfconf migration script to $libdir (bug #6917). scripts/Makefile.am |4 ++-- scripts/xfconf-migration-4.6.desktop.in |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2ea17e4..54b6b8f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -49,7 +49,7 @@ conffiles_DATA=\ if XFCONF_MIGRATION -migrationscriptdir = $(libexecdir)/xfce4/xfconf-migration +migrationscriptdir = $(libdir)/xfce4/xfconf-migration migrationscript_in_files = xfconf-migration-4.6.pl.in migrationscript_SCRIPTS = $(migrationscript_in_files:.pl.in=.pl) @@ -61,7 +61,7 @@ autostart_in_files = xfconf-migration-4.6.desktop.in autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) xfconf-migration-4.6.desktop: $(srcdir)/xfconf-migration-4.6.desktop.in - sed 's,\...@libexecdir\@,$(libexecdir),' $ $@ + sed 's,\...@libdir\@,$(libdir),' $ $@ endif diff --git a/scripts/xfconf-migration-4.6.desktop.in b/scripts/xfconf-migration-4.6.desktop.in index f31795c..56f658f 100644 --- a/scripts/xfconf-migration-4.6.desktop.in +++ b/scripts/xfconf-migration-4.6.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Name=Xfconf Migration Script -ex...@libexecdir@/xfce4/xfconf-migration/xfconf-migration-4.6.pl +ex...@libdir@/xfce4/xfconf-migration/xfconf-migration-4.6.pl Terminal=false Type=Application StartupNotify=false ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskmanager:master Unselect row when sending TERMINATE/KILL signal
Updating branch refs/heads/master
to ac98f4d89de5c4e96b95d4b269d0cbc9e8a2fbc7 (commit)
from 423e8deef12428221f3a53f6f89c53bf79e0dc70 (commit)
commit ac98f4d89de5c4e96b95d4b269d0cbc9e8a2fbc7
Author: Mike Massonnet mmasson...@xfce.org
Date: Sun Dec 5 08:48:07 2010 +0100
Unselect row when sending TERMINATE/KILL signal
src/process-tree-view.c | 14 --
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/process-tree-view.c b/src/process-tree-view.c
index 2fb917a..37ec367 100644
--- a/src/process-tree-view.c
+++ b/src/process-tree-view.c
@@ -372,6 +372,15 @@ cb_send_signal (GtkMenuItem *mi, gpointer user_data)
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}
+
+ if (xtm_signal == XTM_SIGNAL_TERMINATE || xtm_signal == XTM_SIGNAL_KILL)
+ {
+ GtkTreeSelection *selection;
+ GtkWidget *treeview;
+ treeview = g_object_get_data (G_OBJECT (mi), treeview);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW
(treeview));
+ gtk_tree_selection_unselect_all (selection);
+ }
}
static void
@@ -394,7 +403,7 @@ cb_set_priority (GtkMenuItem *mi, gpointer user_data)
}
static GtkWidget *
-build_context_menu (guint pid)
+build_context_menu (XtmProcessTreeView *treeview, guint pid)
{
GtkWidget *menu, *menu_priority, *mi;
@@ -402,6 +411,7 @@ build_context_menu (guint pid)
mi = gtk_menu_item_new_with_label (_(Terminate));
g_object_set_data (G_OBJECT (mi), pid, GUINT_TO_POINTER (pid));
+ g_object_set_data (G_OBJECT (mi), treeview, treeview);
gtk_container_add (GTK_CONTAINER (menu), mi);
g_signal_connect (mi, activate, G_CALLBACK (cb_send_signal),
GINT_TO_POINTER (XTM_SIGNAL_TERMINATE));
@@ -482,7 +492,7 @@ popup_menu (XtmProcessTreeView *treeview, guint pid, guint
activate_time, gboole
if (menu != NULL)
gtk_widget_destroy (menu);
- menu = build_context_menu (pid);
+ menu = build_context_menu (treeview, pid);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, position_func, treeview,
1, activate_time);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
