[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 99%
Updating branch refs/heads/master to 1c8aeff5b3fa0d29c80d34171b37481662b40b17 (commit) from e30cc60ed614c73647308c7c3d912927da8d7a93 (commit) commit 1c8aeff5b3fa0d29c80d34171b37481662b40b17 Author: Chipong Luo Date: Mon May 9 06:53:48 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 99% New status: 346 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 361 +++ 1 files changed, 216 insertions(+), 145 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 3e47acd..326fe0e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-13 05:11+\n" +"POT-Creation-Date: 2011-05-09 04:11+\n" "PO-Revision-Date: 2010-11-27 21:07+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" @@ -23,7 +23,8 @@ msgstr "" "Language: \n" #: ../panel-desktop-handler.desktop.in.h:1 -msgid "Add a new launcher to the panel based on the information of this desktop file" +msgid "" +"Add a new launcher to the panel based on the information of this desktop file" msgstr "基于此 desktop 文件中的信息在面板上添加一个新的启动器" #: ../panel-desktop-handler.desktop.in.h:2 @@ -35,61 +36,63 @@ msgid "Customize the panel" msgstr "定制面板" #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2263 -#: ../migrate/main.c:84 +#: ../panel/panel-preferences-dialog.glade.h:25 ../panel/panel-window.c:2263 +#: ../migrate/main.c:100 msgid "Panel" msgstr "面板" -#: ../common/panel-utils.c:155 +#: ../common/panel-utils.c:157 msgid "_Read Online" msgstr "在线阅读(_R)" -#: ../common/panel-utils.c:156 -msgid "You can read the user manual online. This manual may however not exactly match your panel version." +#: ../common/panel-utils.c:158 +msgid "" +"You can read the user manual online. This manual may however not exactly " +"match your panel version." msgstr "你可以在线阅读用户手册。但本手册未必完全适合您当前面板的版本。" -#: ../common/panel-utils.c:158 +#: ../common/panel-utils.c:160 msgid "The user manual is not installed on your computer" msgstr "你的电脑上没有安装用户手册" #. display an error message to the user -#: ../common/panel-utils.c:171 +#: ../common/panel-utils.c:175 msgid "Failed to open the documentation browser" msgstr "无法打开文档浏览器" #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:889 -#: ../panel/panel-preferences-dialog.c:1048 +#: ../libxfce4panel/xfce-panel-plugin.c:919 +#: ../panel/panel-preferences-dialog.c:1049 #, c-format msgid "Are you sure that you want to remove \"%s\"?" msgstr "你确认要移除 '%s' 吗？" -#: ../libxfce4panel/xfce-panel-plugin.c:894 -#: ../panel/panel-preferences-dialog.c:1051 +#: ../libxfce4panel/xfce-panel-plugin.c:924 +#: ../panel/panel-preferences-dialog.c:1052 msgid "If you remove the item from the panel, it is permanently lost." msgstr "如果你从面板移除该项目，它将永久消失。" #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1054 +#: ../libxfce4panel/xfce-panel-plugin.c:1084 msgid "_Move" msgstr "移动(_M)" -#: ../libxfce4panel/xfce-panel-plugin.c:1088 +#: ../libxfce4panel/xfce-panel-plugin.c:1118 msgid "Pane_l" msgstr "面板(_L)" #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2275 +#: ../libxfce4panel/xfce-panel-plugin.c:1126 ../panel/panel-window.c:2275 msgid "Add _New Items..." msgstr "添加新项目(_N)..." #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2286 +#: ../libxfce4panel/xfce-panel-plugin.c:1137 ../panel/panel-window.c:2286 msgid "Panel Pr_eferences..." msgstr "面板属性(_E)..." #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2302 +#: ../libxfce4panel/xfce-panel-plugin.c:1154 ../panel/panel-window.c:2302 msgid "Log _Out" msgstr "登出(_O)" @@ -133,66 +136,70 @@ msgid "Print version information and exit" msgstr "显示版本信息然后退出" #. parse context options -#: ../panel/main.c:240 +#: ../panel/main.c:248 msgid "[ARGUMENTS...]" msgstr "[参数...]" -#: ../panel/main.c:247 +#: ../panel/main.c:255 #, c-format msgid "Type \"%s --help\" for usage." msgstr "使用 \"%s --help\" 显示用法。" -#: ../panel/main.c:266 +#: ../panel/main.c:274 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 开发团队，版权所有。" -#: ../panel/main.c:267 +#: ../panel/main.c:275 #, c-format msgid "Please report bugs to <%s>." msgstr "请向 <%s> 报告程序漏洞。" -#: ../panel/main.c:318 +#: ../panel/main.c:326 msgid "There is already a running instance" msgstr "已经有一个正在运行的实例" #. spawn ourselfs again -#: ../panel/main.c:367 +#: ../panel/main.c:375 msgid "Restarting..." msgstr "重新启动..." -#: ../panel/main.c:382 +#: ../panel/main.c:390 msgid "Failed to show the preferences dialog" msgstr "无法显示属性对话框" -#: ../panel/main.c:384 +#: ../panel/main.c:392
[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 98%
Updating branch refs/heads/master to 663542de58b80dd2b12a8869ba1c20d7139aa08a (commit) from 8e809e67dfb514be6ebf5b862161917b06848057 (commit) commit 663542de58b80dd2b12a8869ba1c20d7139aa08a Author: Chipong Luo Date: Mon May 9 06:35:15 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 98% New status: 208 messages complete with 3 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 233 ++- 1 files changed, 149 insertions(+), 84 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 06e2239..49c7107 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce 4-power-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-07 22:05+\n" +"POT-Creation-Date: 2011-05-09 04:06+\n" "PO-Revision-Date: 2011-02-15 21:22+0800\n" "Last-Translator: Hunt Xu \n" "Language-Team: Simplified Chinese \n" @@ -42,20 +42,20 @@ msgstr "动作" #: ../data/interfaces/xfpm-settings.ui.h:7 msgid "Consider the computer on low power at:" -msgstr "当电量低于...时认为电脑处于低电力状态:" +msgstr "电脑处于低电力状态时的电量认定值:" #. Hibernate menu option #: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:817 -#: ../settings/xfpm-settings.c:885 ../settings/xfpm-settings.c:1032 -#: ../settings/xfpm-settings.c:1206 ../settings/xfpm-settings.c:1263 -#: ../settings/xfpm-settings.c:1315 ../src/xfpm-power.c:484 +#: ../settings/xfpm-settings.c:885 ../settings/xfpm-settings.c:1034 +#: ../settings/xfpm-settings.c:1211 ../settings/xfpm-settings.c:1268 +#: ../settings/xfpm-settings.c:1320 ../src/xfpm-power.c:484 #: ../src/xfpm-power.c:779 msgid "Hibernate" msgstr "休眠" #: ../data/interfaces/xfpm-settings.ui.h:9 msgid "Level:" -msgstr "电量:" +msgstr "亮度:" #: ../data/interfaces/xfpm-settings.ui.h:10 msgid "Lock screen when going for suspend/hibernate" @@ -70,9 +70,9 @@ msgid "Monitor power management control" msgstr "显示器电源管理控制" #: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:806 -#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1021 -#: ../settings/xfpm-settings.c:1195 ../settings/xfpm-settings.c:1252 -#: ../settings/xfpm-settings.c:1304 +#: ../settings/xfpm-settings.c:874 ../settings/xfpm-settings.c:1023 +#: ../settings/xfpm-settings.c:1200 ../settings/xfpm-settings.c:1257 +#: ../settings/xfpm-settings.c:1309 msgid "Nothing" msgstr "什么都不做" @@ -118,9 +118,9 @@ msgstr "等待" #. Suspend menu option #: ../data/interfaces/xfpm-settings.ui.h:24 ../settings/xfpm-settings.c:811 -#: ../settings/xfpm-settings.c:879 ../settings/xfpm-settings.c:1026 -#: ../settings/xfpm-settings.c:1200 ../settings/xfpm-settings.c:1257 -#: ../settings/xfpm-settings.c:1309 ../src/xfpm-power.c:499 +#: ../settings/xfpm-settings.c:879 ../settings/xfpm-settings.c:1028 +#: ../settings/xfpm-settings.c:1205 ../settings/xfpm-settings.c:1262 +#: ../settings/xfpm-settings.c:1314 ../src/xfpm-power.c:499 #: ../src/xfpm-power.c:792 msgid "Suspend" msgstr "挂起" @@ -154,7 +154,7 @@ msgid "When sleep button is pressed:" msgstr "按下睡眠按钮时执行:" #: ../data/interfaces/xfpm-settings.ui.h:32 -#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:410 +#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:413 msgid "Xfce Power Manager" msgstr "Xfce 电源管理器" @@ -193,91 +193,93 @@ msgstr "小时" msgid "Seconds" msgstr "秒" -#: ../settings/xfpm-settings.c:789 ../settings/xfpm-settings.c:985 -#: ../settings/xfpm-settings.c:1462 +#: ../settings/xfpm-settings.c:789 ../settings/xfpm-settings.c:987 +#: ../settings/xfpm-settings.c:1467 msgid "Hibernate and suspend operations not supported" msgstr "不支持休眠或挂起操作" -#: ../settings/xfpm-settings.c:794 ../settings/xfpm-settings.c:990 -#: ../settings/xfpm-settings.c:1467 +#: ../settings/xfpm-settings.c:794 ../settings/xfpm-settings.c:992 +#: ../settings/xfpm-settings.c:1472 msgid "Hibernate and suspend operations not permitted" msgstr "没有权限进行休眠或挂起操作" -#: ../settings/xfpm-settings.c:823 ../settings/xfpm-settings.c:1212 +#: ../settings/xfpm-settings.c:823 ../settings/xfpm-settings.c:1217 #: ../src/xfpm-power.c:805 msgid "Shutdown" msgstr "关机" -#: ../settings/xfpm-settings.c:827 ../settings/xfpm-settings.c:1216 -#: ../settings/xfpm-settings.c:1267 ../settings/xfpm-settings.c:1319 +#: ../settings/xfpm-settings.c:827 ../settings/xfpm-settings.c:1221 +#: ../settings/xfpm-settings.c:1272 ../settings/xfpm-settings.c:1324 msgid "Ask" msgstr "询问" -#: ../settings/xfpm-settings.c:889 ../settings/xfpm-settings.c:1036 +#: ../settings/xfpm-settings.c:889 ../settings/xfpm-settings.c:1038 msgid "Lock screen" msgstr "锁屏" -#: ../settings/xfpm-settings.c:955 ../settings/xfpm-settings.c:1102 +#: ../settings/xfpm-settings.c:957 ../settings/xfpm-settings.c:1107 msgid "Spinning down hard disks permission denied" msgstr "降低硬盘转速权限不足" -#: ../settings/xfpm-settings.c:1142 +#: ../settings
[Xfce4-commits] Remove mime-types from the exo helper desktop files (bug #7257).
Updating branch refs/heads/master to 2e3744b9f9e64fbed18513027c0d000cbc8d046b (commit) from 93d930e68a6b75420097d58fd41ee63d0c2eed8d (commit) commit 2e3744b9f9e64fbed18513027c0d000cbc8d046b Author: Nick Schermer Date: Sun May 8 23:00:07 2011 +0200 Remove mime-types from the exo helper desktop files (bug #7257). The desktop files are only used to advertise the preferred application framework in menus and launchers. It should not show up when opening applications, since the user can choose the native application for that. exo-open/exo-file-manager.desktop.in |1 - exo-open/exo-mail-reader.desktop.in |1 - exo-open/exo-web-browser.desktop.in |1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/exo-open/exo-file-manager.desktop.in b/exo-open/exo-file-manager.desktop.in index 8d5fa13..ca4aedf 100644 --- a/exo-open/exo-file-manager.desktop.in +++ b/exo-open/exo-file-manager.desktop.in @@ -7,6 +7,5 @@ StartupNotify=true Terminal=false Categories=Utility;X-XFCE;X-Xfce-Toplevel; OnlyShowIn=XFCE; -MimeType=x-scheme-handler/file;x-scheme-handler/trash; _Name=File Manager _Comment=Browse the file system diff --git a/exo-open/exo-mail-reader.desktop.in b/exo-open/exo-mail-reader.desktop.in index be971c6..541de0d 100644 --- a/exo-open/exo-mail-reader.desktop.in +++ b/exo-open/exo-mail-reader.desktop.in @@ -7,6 +7,5 @@ StartupNotify=false Terminal=false Categories=Network;X-XFCE;X-Xfce-Toplevel; OnlyShowIn=XFCE; -MimeType=x-scheme-handler/mailto; _Name=Mail Reader _Comment=Read your email diff --git a/exo-open/exo-web-browser.desktop.in b/exo-open/exo-web-browser.desktop.in index c323753..65870e5 100644 --- a/exo-open/exo-web-browser.desktop.in +++ b/exo-open/exo-web-browser.desktop.in @@ -7,7 +7,6 @@ StartupNotify=false Terminal=false Categories=Network;X-XFCE;X-Xfce-Toplevel; OnlyShowIn=XFCE; -MimeType=x-scheme-handler/http;x-scheme-handler/https; _Name=Web Browser _Comment=Browse the web ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Do not show an error if spawning fails (bug #7574).
Updating branch refs/heads/xfce-4.8
to cd4497fbf25c52159cb341fc8f4b451ad4c5aac8 (commit)
from 39dde4d2c7253cf79fe7d2b6ea04ac2cfe1cc047 (commit)
commit cd4497fbf25c52159cb341fc8f4b451ad4c5aac8
Author: Nick Schermer
Date: Sun May 8 22:54:06 2011 +0200
Do not show an error if spawning fails (bug #7574).
g_error calls abort, so it should never be used unless the
error is also fatal for the application.
xfce4-settings-helper/keyboard-shortcuts.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xfce4-settings-helper/keyboard-shortcuts.c
b/xfce4-settings-helper/keyboard-shortcuts.c
index aabd084..81ae248 100644
--- a/xfce4-settings-helper/keyboard-shortcuts.c
+++ b/xfce4-settings-helper/keyboard-shortcuts.c
@@ -282,7 +282,7 @@ xfce_keyboard_shortcuts_helper_shortcut_activated
(XfceShortcutsGrabber*
if (!succeed)
{
- g_error ("Failed to spawn command \"%s\": %s", sc->command,
error->message);
+ g_warning ("Failed to spawn command \"%s\": %s", sc->command,
error->message);
g_error_free (error);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Reduce spacing of items to make the dialog cleaner.
Updating branch refs/heads/master to 6c905f2e1a131edbe97d6fc69d3caa8a718cf0f2 (commit) from 88af1cd8c0b64d767687d04fb7e2f458ad2aa320 (commit) commit 6c905f2e1a131edbe97d6fc69d3caa8a718cf0f2 Author: Nick Schermer Date: Sun May 8 22:51:44 2011 +0200 Reduce spacing of items to make the dialog cleaner. xfce4-notifyd-config/xfce4-notifyd-config.glade | 375 --- 1 files changed, 193 insertions(+), 182 deletions(-) diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade b/xfce4-notifyd-config/xfce4-notifyd-config.glade index 29e4390..a6b2fcd 100644 --- a/xfce4-notifyd-config/xfce4-notifyd-config.glade +++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade @@ -1,18 +1,18 @@ - + -10 1 480 +10 1 10 -0.90002 1.01 +0.90002 0.01 0.10001 0.01 @@ -38,6 +38,7 @@ +False Notifications center-on-parent xfce4-notifyd @@ -45,189 +46,12 @@ True -vertical +False 2 - - -True -6 -12 - - -True -6 -vertical - - -True -4 -2 -50 -12 - - -True -True -adjustment2 -2 -2 -right - - -1 -2 -3 -4 -GTK_FILL - - - - -True -0 -_Opacity: -True - - -3 -4 -GTK_FILL - - - - -True -0 -_Disappear after: -True -expire_timeout_sbtn - - -2 -3 -GTK_FILL - - - - -True -0 -Default _position: -True -position_combo - - -1 -2 -GTK_FILL - - - - -True -model1 - - - -0 - - - - -1 -2 -1 -2 -GTK_FILL - - - - -True -0 -Theme: -True -position_combo - - -GTK_FILL - - - - -True - - - -0 - - - - -1 -2 -GTK_FILL - - - - -True -12 - - -True -True -● -adjustment1 -True - - -False -False -0 - - - - -True -seconds -
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 99d8c7510aa9bfa25044629db816d897308d4be4 (commit) from b3d4d66f6c454fcae266a78921ba8af8eaa1c551 (commit) commit 99d8c7510aa9bfa25044629db816d897308d4be4 Author: Pjotr Anon Date: Sun May 8 21:42:06 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 86 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 62 ++ 1 files changed, 34 insertions(+), 28 deletions(-) diff --git a/po/nl.po b/po/nl.po index 613c963..59f7f73 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,109 +2,111 @@ # Copyright (C) 2004-2007 Benedikt Meurer. # This file is distributed under the same license as the thunar package. # Vincent Tunru , 2006-2007. -# +# msgid "" msgstr "" "Project-Id-Version: Thunar 0.9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:48+0100\n" +"POT-Creation-Date: 2011-05-08 16:14+\n" "PO-Revision-Date: 2007-07-06 15:47+0100\n" "Last-Translator: Stephan Arts \n" "Language-Team: Dutch \n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Rosetta-Export-Date: 2007-06-10 10:18:11+\n" #: ../thunar-vfs/exo-hal.c:434 #, c-format msgid "External %s Drive" -msgstr "" +msgstr "Extern %s Station" #: ../thunar-vfs/exo-hal.c:436 #, c-format msgid "%s Drive" -msgstr "" +msgstr "%s Station" #: ../thunar-vfs/exo-hal.c:445 msgid "External Floppy Drive" -msgstr "" +msgstr "Extern Diskettestation" #: ../thunar-vfs/exo-hal.c:447 msgid "Floppy Drive" -msgstr "" +msgstr "Diskettestation" #: ../thunar-vfs/exo-hal.c:451 msgid "Compact Flash Drive" -msgstr "" +msgstr "Compact Flash-station" #: ../thunar-vfs/exo-hal.c:455 msgid "Memory Stick Drive" -msgstr "" +msgstr "Geheugenstaafstation" #: ../thunar-vfs/exo-hal.c:459 msgid "Smart Media Drive" -msgstr "" +msgstr "Smart Media-station" #: ../thunar-vfs/exo-hal.c:463 msgid "SD/MMC Drive" -msgstr "" +msgstr "SD/MMC-station" #: ../thunar-vfs/exo-hal.c:467 msgid "Zip Drive" -msgstr "" +msgstr "Zipstation" #: ../thunar-vfs/exo-hal.c:471 msgid "Jaz Drive" -msgstr "" +msgstr "Jaz-station" #: ../thunar-vfs/exo-hal.c:475 msgid "Pen Drive" -msgstr "" +msgstr "Pen-station" -#. TRANSLATORS: This string requires special care as %s may be the empty string. Trailing/leading whitespace will be removed. +#. TRANSLATORS: This string requires special care as %s may be the empty +#. string. Trailing/leading whitespace will be removed. #: ../thunar-vfs/exo-hal.c:484 #, c-format msgid "%s Music Player" -msgstr "" +msgstr "%s Muziekspeler" -#. TRANSLATORS: This string requires special care as %s may be the empty string. Trailing/leading whitespace will be removed. +#. TRANSLATORS: This string requires special care as %s may be the empty +#. string. Trailing/leading whitespace will be removed. #: ../thunar-vfs/exo-hal.c:499 #, c-format msgid "%s Digital Camera" -msgstr "" +msgstr "%s Digitale camera" #. last fallback to "Drive" #: ../thunar-vfs/exo-hal.c:522 msgid "Drive" -msgstr "" +msgstr "Station" #: ../thunar-vfs/exo-hal.c:739 #, c-format msgid "Blank %s Disc" -msgstr "" +msgstr "Lege %s Schijf" #: ../thunar-vfs/exo-hal.c:741 #, c-format msgid "%s Disc" -msgstr "" +msgstr "%s Schijf" #. special case for pure audio disc #: ../thunar-vfs/exo-hal.c:746 msgid "Audio CD" -msgstr "" +msgstr "Geluids-CD" #: ../thunar-vfs/exo-hal.c:782 #, c-format msgid "%s Removable Volume" -msgstr "" +msgstr "%s Verwijderbare opslag" #: ../thunar-vfs/exo-hal.c:784 #, c-format msgid "%s Volume" -msgstr "" +msgstr "%s Opslag" #: ../thunar-vfs/exo-mount-point.c:218 ../thunar-vfs/exo-mount-point.c:247 #: ../thunar-vfs/exo-mount-point.c:435 @@ -123,15 +125,17 @@ msgstr "Kon de mapinhoud niet lezen" msgid "Unknown error" msgstr "Onbekende fout" +#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it +#. as-is. # Unknown word "Exec" -#. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is. #: ../thunar-vfs/thunar-vfs-info.c:390 #, c-format msgid "No Exec field specified" msgstr "Geen Exec veld gespecificeerd" +#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it +#. as-is. # Unknown word "Exec" -#. TRANSLATORS: `URL' is a field name in a .desktop file. You should leave it as-is. #: ../thunar-vfs/thunar-vfs-info.c:409 #, c-format msgid "No URL field specified" @@ -280,8 +284,9 @@ msgstr "Kon bestandsinfo van \"%s\" niet bepalen" msgid "Failed to create directory \"%s\"" msgstr "Kon map \"%s\" niet maken" +#. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace +#. the word with `pipe'. # Unknown word "fifo" -#. TRANSLATORS: FIFO is
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 98%
Updating branch refs/heads/xfce-4.8 to 83cb6dcbfc918099cd628abf12bf7dbca08ce3ae (commit) from 68960ba9b344b44c095a8206bc028d5cd75caa96 (commit) commit 83cb6dcbfc918099cd628abf12bf7dbca08ce3ae Author: Pjotr Anon Date: Sun May 8 21:38:00 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 98% New status: 668 messages complete with 11 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7a4420e..88d647b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -594,8 +594,7 @@ msgid "translator-credits" msgstr "" "Vincent Tunru \n" "Stephan Arts \n" -"Peter Maassen " -"Pjotr" +"Peter Maassen Pjotr" #. display an error message to the user #. tell the user that we failed @@ -786,9 +785,9 @@ msgid "The root folder has no parent" msgstr "De hoofdmap heeft geen bovenliggende map" #: ../thunar/thunar-file.c:1009 ../thunar/thunar-file.c:1278 -#, fuzzy, c-format +#, c-format msgid "Failed to parse the desktop file: %s" -msgstr "Kon leeg bestand \"%s\" niet maken" +msgstr "Kon het bureaubladbestand niet benoemen: %s" # Unknown word "Exec" #: ../thunar/thunar-file.c:1047 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 98%
Updating branch refs/heads/xfce-4.8 to 68960ba9b344b44c095a8206bc028d5cd75caa96 (commit) from 37136d52edb0dedca2925fe544d4d8d5812addb8 (commit) commit 68960ba9b344b44c095a8206bc028d5cd75caa96 Author: Pjotr Anon Date: Sun May 8 21:34:19 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 98% New status: 667 messages complete with 12 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 254 -- 1 files changed, 116 insertions(+), 138 deletions(-) diff --git a/po/nl.po b/po/nl.po index ff7f2da..7a4420e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Thunar 0.9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-08 10:29+\n" +"POT-Creation-Date: 2011-05-08 16:30+\n" "PO-Revision-Date: 2007-07-06 15:47+0100\n" "Last-Translator: Stephan Arts \n" "Language-Team: Dutch \n" @@ -191,14 +191,14 @@ msgid "Copying files to \"%s\"..." msgstr "Bestanden kopiëren naar \"%s\" ..." #: ../thunar/thunar-application.c:1549 -#, fuzzy, c-format +#, c-format msgid "Creating symbolic links in \"%s\"..." -msgstr "Symbolische links aan het maken..." +msgstr "Symbolische links aan het maken in \"%s\"..." #: ../thunar/thunar-application.c:1602 -#, fuzzy, c-format +#, c-format msgid "Moving files into \"%s\"..." -msgstr "Verplaatsen van bestanden naar de prullenbak..." +msgstr "Bestanden aan het verplaatsen naar \"%s\"..." #: ../thunar/thunar-application.c:1693 #, c-format @@ -328,9 +328,9 @@ msgid "Failed to add new application \"%s\"" msgstr "Kon het nieuwe programma \"%s\" niet toevoegen" #: ../thunar/thunar-chooser-dialog.c:492 -#, fuzzy, c-format +#, c-format msgid "Failed to execute application \"%s\"" -msgstr "Kon het nieuwe programma \"%s\" niet toevoegen" +msgstr "Kon het programma \"%s\" niet uitvoeren" #. append the "Remove Launcher" item #: ../thunar/thunar-chooser-dialog.c:564 @@ -544,19 +544,19 @@ msgid "Atleast one filename must be specified" msgstr "Geef minimaal één bestandsnaam op" #: ../thunar/thunar-dbus-service.c:1000 -#, fuzzy, c-format +#, c-format msgid "At least one source filename must be specified" -msgstr "Geef minimaal één bestandsnaam op" +msgstr "Geef minimaal één naam op van een bronbestand" #: ../thunar/thunar-dbus-service.c:1010 #, c-format msgid "The number of source and target filenames must be the same" -msgstr "" +msgstr "Het aantal namen van bron- en doelbestanden moet hetzelfde zijn" #: ../thunar/thunar-dbus-service.c:1019 -#, fuzzy, c-format +#, c-format msgid "A destination directory must be specified" -msgstr "Geef minimaal één bestandsnaam op" +msgstr "Een bestemmingsmap moet worden aangegeven" #: ../thunar/thunar-dbus-service.c:1222 #, fuzzy, c-format @@ -595,6 +595,7 @@ msgstr "" "Vincent Tunru \n" "Stephan Arts \n" "Peter Maassen " +"Pjotr" #. display an error message to the user #. tell the user that we failed @@ -644,14 +645,14 @@ msgid "_Replace" msgstr "_Vervangen" #: ../thunar/thunar-dialogs.c:608 -#, fuzzy, c-format +#, c-format msgid "This folder already contains a symbolic link \"%s\"." -msgstr "Deze map bevat al een bestand met de naam \"%s\"." +msgstr "Deze map bevat al een symbolische koppeling \"%s\"." #: ../thunar/thunar-dialogs.c:613 -#, fuzzy, c-format +#, c-format msgid "This folder already contains a folder \"%s\"." -msgstr "Deze map bevat al een bestand met de naam \"%s\"." +msgstr "Deze map bevat al een map met de naam \"%s\"." #: ../thunar/thunar-dialogs.c:618 #, c-format @@ -659,14 +660,12 @@ msgid "This folder already contains a file \"%s\"." msgstr "Deze map bevat al een bestand met de naam \"%s\"." #: ../thunar/thunar-dialogs.c:630 -#, fuzzy msgid "ReplaceDialogPart1|Do you want to replace the link" -msgstr "ReplaceDialogPart1|Wilt u het bestaande bestand vervangen" +msgstr "ReplaceDialogPart1|Wilt u de bestaande koppeling vervangen" #: ../thunar/thunar-dialogs.c:632 -#, fuzzy msgid "ReplaceDialogPart1|Do you want to replace the existing folder" -msgstr "ReplaceDialogPart1|Wilt u het bestaande bestand vervangen" +msgstr "ReplaceDialogPart1|Wilt u de bestaande map vervangen" #: ../thunar/thunar-dialogs.c:634 msgid "ReplaceDialogPart1|Do you want to replace the existing file" @@ -685,14 +684,12 @@ msgid "Modified:" msgstr "Gewijzigd:" #: ../thunar/thunar-dialogs.c:661 -#, fuzzy msgid "ReplaceDialogPart2|with the following link?" -msgstr "ReplaceDialogPart2|door het volgende bestand?" +msgstr "ReplaceDialogPart2|door de volgende koppeling?" #: ../thunar/thunar-dialogs.c:663 -#, fuzzy msgid "ReplaceDialogPart2|with the following folder?" -msgstr "ReplaceDialogPart2|door het volgende bestand?" +msgstr "ReplaceDialogPart2|door de volgende map?" #: ../thunar/thunar-dialogs.c:665 msgid "ReplaceDialogPart2|with the following file?" @@ -781,7 +778,7 @@ msgstr "Bestandsnaam"
[Xfce4-commits] Fix compiler warning.
Updating branch refs/heads/master to 88af1cd8c0b64d767687d04fb7e2f458ad2aa320 (commit) from e37072e06d9ad0b223ee109319622865cc27158f (commit) commit 88af1cd8c0b64d767687d04fb7e2f458ad2aa320 Author: Nick Schermer Date: Sun May 8 20:39:07 2011 +0200 Fix compiler warning. xfce4-notifyd-config/main.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c index 1267da8..6ad623c 100644 --- a/xfce4-notifyd-config/main.c +++ b/xfce4-notifyd-config/main.c @@ -239,7 +239,6 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder) XfconfChannel *channel; GtkWidget *dlg, *btn, *sbtn, *slider, *theme_combo, *position_combo; GtkAdjustment *adj; -GtkTreeSelection *sel; GError *error = NULL; gchar *current_theme; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Deleting branch nick/clipboard-manager
Deleting branch refs/heads/nick/clipboard-manager ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Panel: Add option to disable struts in the dialog (bug#7202).
Updating branch refs/heads/master to e30cc60ed614c73647308c7c3d912927da8d7a93 (commit) from be44541780ba7c4fd32cf430e70b5aa3b4d9c328 (commit) commit e30cc60ed614c73647308c7c3d912927da8d7a93 Author: Nick Schermer Date: Sun May 8 19:49:46 2011 +0200 Panel: Add option to disable struts in the dialog (bug#7202). panel/panel-preferences-dialog.c |1 + panel/panel-preferences-dialog.glade | 14 ++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c index ffb71fd..82b2f9e 100644 --- a/panel/panel-preferences-dialog.c +++ b/panel/panel-preferences-dialog.c @@ -407,6 +407,7 @@ panel_preferences_dialog_bindings_update (PanelPreferencesDialog *dialog) panel_preferences_dialog_bindings_add (dialog, "span-monitors", "active"); panel_preferences_dialog_bindings_add (dialog, "position-locked", "active"); panel_preferences_dialog_bindings_add (dialog, "autohide", "active"); + panel_preferences_dialog_bindings_add (dialog, "disable-struts", "active"); panel_preferences_dialog_bindings_add (dialog, "size", "value"); panel_preferences_dialog_bindings_add (dialog, "length", "value"); panel_preferences_dialog_bindings_add (dialog, "length-adjust", "active"); diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade index 3b5a2e4..63f5a2f 100644 --- a/panel/panel-preferences-dialog.glade +++ b/panel/panel-preferences-dialog.glade @@ -272,6 +272,20 @@ 4 + + +Don't _reserve space on borders +True +True +False +Select this option if you want maximized windows to cover the area behind the panel. This only works when the panel is attached to a screen edge. +True +True + + +5 + + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 93%
Updating branch refs/heads/xfce-4.8 to 524c7342cea436df50fe33bcf7b0f51655791dff (commit) from 07dcac5622a597e2a4c14a667398fce21d96482e (commit) commit 524c7342cea436df50fe33bcf7b0f51655791dff Author: Pjotr Anon Date: Sun May 8 18:16:22 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 93% New status: 67 messages complete with 1 fuzzy and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 156 ++ 1 files changed, 55 insertions(+), 101 deletions(-) diff --git a/po/nl.po b/po/nl.po index 987af06..a93abfe 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,216 +3,176 @@ # This file is distributed under the same license as the xfce-utils package. # Jasper Huijsmans , 2004. # Vincent Tunru , 2006. -# +# msgid "" msgstr "" "Project-Id-Version: xfce-utils 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:12+0100\n" +"POT-Creation-Date: 2011-05-08 10:31+\n" "PO-Revision-Date: 2010-04-30 16:20+0100\n" "Last-Translator: Vincent Tunru \n" "Language-Team: Dutch \n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" #: ../xfce4-about/main.c:52 msgid "Version information" -msgstr "" +msgstr "Versie-informatie" #: ../xfce4-about/main.c:70 msgid "Window Manager" -msgstr "" +msgstr "Vensterbeheerder" #: ../xfce4-about/main.c:71 msgid "Handles the placement of windows on the screen." -msgstr "" +msgstr "Zorgt voor de plaatsing van vensters op het scherm." #: ../xfce4-about/main.c:74 msgid "Panel" -msgstr "" +msgstr "Werkbalk" #: ../xfce4-about/main.c:75 -msgid "" -"Program launchers, window buttons, applications menu, workspace switcher and " -"more." -msgstr "" +msgid "Program launchers, window buttons, applications menu, workspace switcher and more." +msgstr "Programmastarters, vensterknoppen, toepassingenmenu, werkruimte-wisselaar en meer." #: ../xfce4-about/main.c:79 msgid "Desktop Manager" -msgstr "" +msgstr "Bureaubladbeheerder" #: ../xfce4-about/main.c:80 -msgid "" -"Sets the background color or image with optional application menu or icons " -"for minimized applications or launchers, devices and folders." +msgid "Sets the background color or image with optional application menu or icons for minimized applications or launchers, devices and folders." msgstr "" #: ../xfce4-about/main.c:84 msgid "File Manager " -msgstr "" +msgstr "Bestandsbeheerder" #: ../xfce4-about/main.c:85 -msgid "" -"A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use " -"and fast." -msgstr "" +msgid "A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use and fast." +msgstr "Een eigentijdse bestandsbeheerder voor de Unix/Linux-werkomgeving, met als doel om makkelijk bedienbaar en snel te zijn." #: ../xfce4-about/main.c:89 msgid "Session Manager" -msgstr "" +msgstr "Sessiebeheerder" #: ../xfce4-about/main.c:90 -msgid "" -"Restores your session on startup and allows you to shutdown the computer " -"from Xfce." -msgstr "" +msgid "Restores your session on startup and allows you to shutdown the computer from Xfce." +msgstr "Herstelt uw sessie bij opstarten en staat u toe om de computer uit te schakelen vanuit Xfce." #: ../xfce4-about/main.c:94 msgid "Setting System" -msgstr "" +msgstr "Instelling systeem" #: ../xfce4-about/main.c:95 -msgid "" -"Configuration system to control various aspects of the desktop like " -"appearance, display, keyboard and mouse settings." -msgstr "" +msgid "Configuration system to control various aspects of the desktop like appearance, display, keyboard and mouse settings." +msgstr "Configuratiesysteem om verschillende aspecten van het bureaublad te beheersen, zoals de instellingen van het uiterlijk, scherm, toetsenbord en muis." #: ../xfce4-about/main.c:99 msgid "Application Finder" -msgstr "" +msgstr "Toepassingenzoeker" #: ../xfce4-about/main.c:100 -msgid "" -"Shows the applications installed on your system in categories, so you can " -"quickly find and launch them." -msgstr "" +msgid "Shows the applications installed on your system in categories, so you can quickly find and launch them." +msgstr "Toont de toepassingen die op uw systeem zijn geïnstalleerd in categorieën, zodat u ze snel kunt vinden en starten." #: ../xfce4-about/main.c:104 msgid "Utilities and Scripts" -msgstr "" +msgstr "Gereedschappen en scripts" #: ../xfce4-about/main.c:105 msgid "Startup scripts, run dialog and about dialog." -msgstr "" +msgstr "Opstartscripts, draai-dialoog en over-dialoog" #: ../xfce4-about/main.c:108 msgid "Settings Daemon" -msgstr "" +msgstr "Instellingen-achtergrondprogramma" #: ../xfce4-about/main.c:109 msgid "D-Bus-based configuration storage system." msgstr "" #: ../xfce4-about/main.c:116 -msgid "" -"Xfce is a collection of programs that togeth
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 30%
Updating branch refs/heads/xfce-4.8 to ae552518d81b0d0d4d910e338237254785f81a5b (commit) from 85f6c0b6127c1c2b5fa9f2cdbea8935b3d31ee1f (commit) commit ae552518d81b0d0d4d910e338237254785f81a5b Author: Pjotr Anon Date: Sun May 8 17:58:13 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 30% New status: 70 messages complete with 126 fuzzies and 34 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 202 ++--- 1 files changed, 33 insertions(+), 169 deletions(-) diff --git a/po/nl.po b/po/nl.po index 55134d8..21d7ba4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,29 +2,31 @@ # Copyright (C) 2002-2006 The Xfce development team. # This file is distributed under the same license as the xfwm4 package. # Jasper Huijsmans , 2004. -# +# msgid "" msgstr "" "Project-Id-Version: xfwm4 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:27+0100\n" +"POT-Creation-Date: 2011-05-08 10:34+\n" "PO-Revision-Date: 2006-11-3 12:41+0100\n" "Last-Translator: Stephan Arts \n" "Language-Team: Dutch \n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" #: ../helper-dialog/helper-dialog.c:84 msgid "" "This window might be busy and is not responding.\n" "Do you want to terminate the application?" msgstr "" +"Het venster zou bezig kunnen zijn en reageert niet.\n" +"Wilt u de toepassing beëindigen?" #: ../helper-dialog/helper-dialog.c:89 msgid "Warning" -msgstr "" +msgstr "Waarschuwing" #: ../settings-dialogs/tweaks-settings.c:49 msgid "None" @@ -32,7 +34,7 @@ msgstr "Geen" #: ../settings-dialogs/tweaks-settings.c:421 msgid "Session manager socket" -msgstr "" +msgstr "Contactpunt voor sessiebeheerder" #: ../settings-dialogs/tweaks-settings.c:421 #: ../settings-dialogs/workspace-settings.c:370 @@ -44,13 +46,13 @@ msgstr "" #: ../settings-dialogs/workspace-settings.c:371 #: ../settings-dialogs/xfwm4-settings.c:312 msgid "Version information" -msgstr "" +msgstr "Versie-informatie" #: ../settings-dialogs/tweaks-settings.c:440 #: ../settings-dialogs/workspace-settings.c:388 #: ../settings-dialogs/xfwm4-settings.c:942 msgid "." -msgstr "" +msgstr "." #: ../settings-dialogs/tweaks-settings.c:444 #: ../settings-dialogs/workspace-settings.c:392 @@ -68,20 +70,18 @@ msgid "Workspace %d" msgstr "Werkblad %d" #: ../settings-dialogs/workspace-settings.c:280 -#, fuzzy msgid "Workspace Name" -msgstr "Werkblad namen" +msgstr "Werkruimte Naam" #: ../settings-dialogs/workspace-settings.c:370 #: ../settings-dialogs/xfwm4-settings.c:310 msgid "Settings manager socket" -msgstr "" +msgstr "Contactpunt voor instellingenbeheerder" #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-dialog.glade.h:29 -#, fuzzy msgid "Configure window behavior and shortcuts" -msgstr "Venster actie annuleren" +msgstr "Configureer venstergedrag en snelkoppelingen" #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-dialog.glade.h:48 @@ -90,9 +90,8 @@ msgstr "Window Manager" #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15 -#, fuzzy msgid "Fine-tune window behaviour and effects" -msgstr "Venster actie annuleren" +msgstr "Fijnregeling venstergedrag en effecten" #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35 @@ -101,9 +100,8 @@ msgstr "Venster Beheer Bijstellen" #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5 -#, fuzzy msgid "Set number and names of workspaces" -msgstr "Aantal werkbladen" +msgstr "Stel het aantal werkruimten (en hun namen) in" #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6 @@ -116,14 +114,12 @@ msgid "Box move and resize" msgstr "Inhoud tonen bij verplaatsen en formaat aanpassen" #: ../settings-dialogs/xfwm4-dialog.glade.h:2 -#, fuzzy msgid "Button layout" -msgstr "Knopvolgorde" +msgstr "Knopvormgeving" #: ../settings-dialogs/xfwm4-dialog.glade.h:3 -#, fuzzy msgid "Double click _action" -msgstr "Dubbelklik actie" +msgstr "Dubbelklik _actie" #: ../settings-dialogs/xfwm4-dialog.glade.h:4 #, fuzzy @@ -325,8 +321,7 @@ msgstr "Wissel werkbladen bij slepen voorbij de rand van het scherm" #: ../settings-dialogs/xfwm4-dialog.glade.h:50 #, fuzzy msgid "Wrap workspaces when the _pointer reaches the screen edge" -msgstr "" -"Wissel werkbladen wanneer de muisaanwijzer de rand van het scherm bereikt" +msgstr "Wissel werkbladen wanneer de muisaanwijzer de rand van het scherm bereikt" #: ../settings-dialogs/xfwm4-dialog.glade.h:51 #, fuzzy @@ -699,9 +694,7 @@ msgid "Reset to Defaults" msgstr "" #:
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 93%
Updating branch refs/heads/xfce-4.8 to cf3bd92377baccb0ad2f7efd28e8747b72b24491 (commit) from f1f0f04e18059a4430f5b0029faf4a5cf12ded2d (commit) commit cf3bd92377baccb0ad2f7efd28e8747b72b24491 Author: Pjotr Anon Date: Sun May 8 17:45:03 2011 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 93% New status: 216 messages complete with 1 fuzzy and 13 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 144 ++--- 1 files changed, 61 insertions(+), 83 deletions(-) diff --git a/po/nl.po b/po/nl.po index b4bbab8..a83da92 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-session 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-07 16:32+\n" +"POT-Creation-Date: 2011-05-08 10:33+\n" "PO-Revision-Date: 2006-11-03 11:50+0100\n" "Last-Translator: Stephan Arts \n" "Language-Team: Dutch \n" @@ -115,9 +115,8 @@ msgid "Choose image..." msgstr "Plaatje kiezen..." #: ../engines/simple/simple.c:419 -#, fuzzy msgid "Images" -msgstr "Plaatje" +msgstr "Afbeeldingen" #: ../engines/simple/simple.c:425 msgid "All files" @@ -132,9 +131,8 @@ msgid "Simple Splash Engine" msgstr "Simpel Beginscherm" #: ../panel-plugin/xfsm-logout-plugin.c:86 -#, fuzzy msgid "Session" -msgstr "Sessie beeindigen" +msgstr "Sessie beëindigen" #: ../panel-plugin/xfsm-logout-plugin.c:87 msgid "Loc_k screen" @@ -157,15 +155,13 @@ msgstr "Herstart" #: ../panel-plugin/xfsm-logout-plugin.c:91 #: ../panel-plugin/xfsm-logout-plugin.c:114 -#, fuzzy msgid "Shut _down" -msgstr "Afsluiten" +msgstr "_Sluit af" #: ../panel-plugin/xfsm-logout-plugin.c:92 #: ../panel-plugin/xfsm-logout-plugin.c:107 -#, fuzzy msgid "_Log out" -msgstr "Uitloggen" +msgstr "_Meld af" #. XFSM_SHUTDOWN_ASK #. XFSM_SHUTDOWN_LOGOUT @@ -228,7 +224,7 @@ msgstr "Sluit Sessie" #: ../settings/main.c:43 msgid "Settings manager socket" -msgstr "" +msgstr "Contactpunt voor instellingenbeheerder" #: ../settings/main.c:43 msgid "SOCKET ID" @@ -241,32 +237,32 @@ msgstr "Versie-informatie" #: ../settings/main.c:74 #, c-format msgid "Type '%s --help' for usage." -msgstr "" +msgstr "Tik '%s --help' voor gebruik." #: ../settings/main.c:86 ../xfce4-session/main.c:226 msgid "The Xfce development team. All rights reserved." -msgstr "" +msgstr "Het Xfce-ontwikkelingsteam. Alle rechten voorbehouden." #: ../settings/main.c:87 ../xfce4-session/main.c:232 #, c-format msgid "Please report bugs to <%s>." -msgstr "" +msgstr "Gelieve fouten te melden aan <%s>." #: ../settings/main.c:96 ../xfce4-session/main.c:238 ../xfce4-tips/main.c:270 msgid "Unable to contact settings server" -msgstr "" +msgstr "Kon geen contact maken met de instellingenserver" #: ../settings/main.c:115 msgid "Unable to create user interface from embedded definition data" -msgstr "" +msgstr "Kon geen gebruikersomgeving maken van de ingebedde definitiegegevens" #: ../settings/main.c:128 msgid "_Application Autostart" -msgstr "" +msgstr "_Toepassing Autostart" #: ../settings/session-editor.c:60 msgid "If running" -msgstr "" +msgstr "Wanneer draaiend" #: ../settings/session-editor.c:61 msgid "Always" @@ -282,11 +278,11 @@ msgstr "Nooit" #: ../settings/session-editor.c:128 msgid "Session Save Error" -msgstr "" +msgstr "Sessie Opslag Fout" #: ../settings/session-editor.c:129 msgid "Unable to save the session" -msgstr "" +msgstr "Kon de sessie niet opslaan" #: ../settings/session-editor.c:184 #, c-format @@ -320,7 +316,7 @@ msgstr "Prioriteit" #: ../settings/session-editor.c:622 msgid "PID" -msgstr "" +msgstr "PID" #: ../settings/session-editor.c:628 msgid "Program" @@ -392,7 +388,7 @@ msgstr "Hieronder staat de lijst met programma's die automatisch worden gestart #: ../settings/xfae-window.c:289 #, c-format msgid "Failed adding \"%s\"" -msgstr "" +msgstr "Kon \"%s\" niet toevoegen" #: ../settings/xfae-window.c:320 ../settings/xfae-window.c:334 msgid "Failed to remove item" @@ -408,28 +404,25 @@ msgid "Are you sure you want to remove \"%s\"" msgstr "Weet u zeker dat u \"%s\" wil verwijderen" #: ../settings/xfae-window.c:362 -#, fuzzy msgid "Failed to edit item" -msgstr "Schrijven naar bestand %s is mislukt" +msgstr "Kon onderdeel niet bewerken" #: ../settings/xfae-window.c:382 -#, fuzzy, c-format +#, c-format msgid "Failed to edit item \"%s\"" -msgstr "Schrijven naar bestand %s is mislukt" +msgstr "Kon onderdeel \"%s\" niet bewerken" #: ../settings/xfae-window.c:410 -#, fuzzy msgid "Failed to toggle item" -msgstr "Schrijven naar bestand %s is mislukt" +msgstr "" #: ../xfce4-session/main.c:76 msgid "Disable binding to TCP ports" msgstr "" #: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:93 -#, fuzzy msgid "Print version information and exit" -msgstr "Informatie" +msgstr "Druk versie-informatie af en sluit af" #: ../xf
[Xfce4-commits] l10n: Updated Danish (da) translation to 21%
Updating branch refs/heads/master to 94280da9f65695270d79b39a4a200233f2e88b81 (commit) from b9107f104c1969b662e2a80d3dcb299e26e265e1 (commit) commit 94280da9f65695270d79b39a4a200233f2e88b81 Author: Per Kongstad Date: Sun May 8 14:16:10 2011 +0200 l10n: Updated Danish (da) translation to 21% New status: 21 messages complete with 0 fuzzies and 77 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/da.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/manual/po/da.po b/doc/manual/po/da.po index 8fa4e8e..95e009c 100644 --- a/doc/manual/po/da.po +++ b/doc/manual/po/da.po @@ -38,7 +38,7 @@ msgstr "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99" #: xfce4-session.xml14(title) msgid "Xfce 4 Session Manager" -msgstr "" +msgstr "Sessionshåndtering til Xfce 4" #: xfce4-session.xml17(year) msgid "2003" @@ -102,7 +102,7 @@ msgstr "" #: xfce4-session.xml84(title) msgid "Session Manager settings" -msgstr "" +msgstr "Indstillinger til sessionshåndtering" #: xfce4-session.xml87(title) msgid "General preferences" @@ -142,7 +142,7 @@ msgstr "" #: xfce4-session.xml135(title) msgid "Advanced preferences" -msgstr "" +msgstr "Avancerede indstillinger" #: xfce4-session.xml138(title) msgid "@PACKAGE_NAME@ advanced preferences" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 18%
Updating branch refs/heads/master to b9107f104c1969b662e2a80d3dcb299e26e265e1 (commit) from 3899b20835ce675933a9d1bef1e64fa8be2d0243 (commit) commit b9107f104c1969b662e2a80d3dcb299e26e265e1 Author: Per Kongstad Date: Sun May 8 14:14:33 2011 +0200 l10n: Updated Danish (da) translation to 18% New status: 18 messages complete with 0 fuzzies and 80 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/da.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manual/po/da.po b/doc/manual/po/da.po index ba9b669..8fa4e8e 100644 --- a/doc/manual/po/da.po +++ b/doc/manual/po/da.po @@ -106,11 +106,11 @@ msgstr "" #: xfce4-session.xml87(title) msgid "General preferences" -msgstr "Generelle præferencer" +msgstr "Generelle indstillinger" #: xfce4-session.xml90(title) msgid "@PACKAGE_NAME@ general preferences" -msgstr " @ PACKAGE_NAME @ generelle præferencer" +msgstr " @ PACKAGE_NAME @ generelle indstillinger" #: xfce4-session.xml98(phrase) msgid "Shows the General tab of the @PACKAGE_NAME@ settings dialog." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 18%
Updating branch refs/heads/master to 3899b20835ce675933a9d1bef1e64fa8be2d0243 (commit) from c8048e7395b30ebd0e699320e92ac68e76bd0185 (commit) commit 3899b20835ce675933a9d1bef1e64fa8be2d0243 Author: Per Kongstad Date: Sun May 8 14:12:25 2011 +0200 l10n: Updated Danish (da) translation to 18% New status: 18 messages complete with 0 fuzzies and 80 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/da.po |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/doc/manual/po/da.po b/doc/manual/po/da.po index 74fb83e..ba9b669 100644 --- a/doc/manual/po/da.po +++ b/doc/manual/po/da.po @@ -19,7 +19,6 @@ msgstr "" #. you. #. It doesn't matter what you translate it to: it's not used at all. #: xfce4-session.xml94(None) -#, fuzzy msgid "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13" msgstr "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13" @@ -27,7 +26,6 @@ msgstr "@@image: 'images/xfsm-general.png'; md5=f99eebd11a391ab3ecd0c038c0683b13 #. you. #. It doesn't matter what you translate it to: it's not used at all. #: xfce4-session.xml142(None) -#, fuzzy msgid "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4" msgstr "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d4" @@ -35,7 +33,6 @@ msgstr "@@image: 'images/xfsm-advanced.png'; md5=ce9a552111026488b3ae76233eaa69d #. you. #. It doesn't matter what you translate it to: it's not used at all. #: xfce4-session.xml205(None) -#, fuzzy msgid "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99" msgstr "@@image: 'images/xfsm-splash.png'; md5=126a4b2c7239f53cfa475468eac8cd99" @@ -77,7 +74,7 @@ msgstr "Softwareudvikler" #: xfce4-session.xml49(orgname) msgid "os-cillation" -msgstr "" +msgstr "os-cillation" #: xfce4-session.xml50(orgdiv) msgid "System development" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add missing include.
Updating branch refs/heads/master to 23f3a2c972e887330acbef1a4062a7b1ff834dd2 (commit) from 2598bfcc4239b6cd50f0cedd9ae1325320911d86 (commit) commit 23f3a2c972e887330acbef1a4062a7b1ff834dd2 Author: Nick Schermer Date: Sun May 8 12:23:26 2011 +0200 Add missing include. xfsettingsd/clipboard-manager.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c index ad56c8e..6ff2773 100644 --- a/xfsettingsd/clipboard-manager.c +++ b/xfsettingsd/clipboard-manager.c @@ -35,6 +35,7 @@ #include #include +#include #include "clipboard-manager.h" #include "xsettings.h" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix gdk 2.24 functions.
Updating branch refs/heads/master
to 2598bfcc4239b6cd50f0cedd9ae1325320911d86 (commit)
from dc6f833ade8904490febe2d17bfdc4f208fda801 (commit)
commit 2598bfcc4239b6cd50f0cedd9ae1325320911d86
Author: Nick Schermer
Date: Sun May 8 12:17:46 2011 +0200
Fix gdk 2.24 functions.
xfsettingsd/clipboard-manager.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
index 9d16d94..ad56c8e 100644
--- a/xfsettingsd/clipboard-manager.c
+++ b/xfsettingsd/clipboard-manager.c
@@ -853,11 +853,19 @@ clipboard_manager_watch_cb (GsdClipboardManager *manager,
GdkDisplay *display;
display = gdk_display_get_default ();
+#if GTK_CHECK_VERSION (2, 24, 0)
gdkwin = gdk_x11_window_lookup_for_display (display, window);
+#else
+gdkwin = gdk_window_lookup_for_display (display, window);
+#endif
if (is_start) {
if (gdkwin == NULL) {
+#if GTK_CHECK_VERSION (2, 24, 0)
gdkwin = gdk_x11_window_foreign_new_for_display
(display, window);
+#else
+gdkwin = gdk_window_foreign_new_for_display (display,
window);
+#endif
} else {
g_object_ref (gdkwin);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Show preview on theme change.
Updating branch refs/heads/master
to e37072e06d9ad0b223ee109319622865cc27158f (commit)
from 578731da48c2cdb3ceb21623aab902f2a521c540 (commit)
commit e37072e06d9ad0b223ee109319622865cc27158f
Author: Jérôme Guelfucci
Date: Sun May 8 12:11:41 2011 +0200
Show preview on theme change.
xfce4-notifyd-config/main.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 807142f..1267da8 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -110,10 +110,21 @@ xfce4_notifyd_config_theme_changed(XfconfChannel *channel,
{
gtk_tree_model_get(GTK_TREE_MODEL(ls), &iter, 0, &theme, -1);
if(!strcmp(theme, new_theme)) {
+GError *error = NULL;
+
gtk_combo_box_set_active_iter(GTK_COMBO_BOX(theme_combo),
&iter);
g_free(theme);
xfce4_notifyd_config_kill_daemon();
+
+if(!g_spawn_command_line_async(_("notify-send \"Notification
Preview\""
+ " \"This is how notifications
will look like\""),
+ &error)) {
+
xfce_dialog_show_error(GTK_WINDOW(gtk_widget_get_toplevel(theme_combo)),
+ error, _("Notification preview
failed"));
+g_error_free(error);
+}
+
return;
}
g_free(theme);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use a combobox for the theme selection.
Updating branch refs/heads/master
to 718bc83f3530f66b06cafd9c413adff2400b3f73 (commit)
from aec7c0439e2c2c3b536f665c1d320a8b898f67ac (commit)
commit 718bc83f3530f66b06cafd9c413adff2400b3f73
Author: Jérôme Guelfucci
Date: Sun May 8 11:32:15 2011 +0200
Use a combobox for the theme selection.
xfce4-notifyd-config/main.c | 63 -
xfce4-notifyd-config/xfce4-notifyd-config.glade | 181 ---
2 files changed, 123 insertions(+), 121 deletions(-)
diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c
index 55ddd1d..807142f 100644
--- a/xfce4-notifyd-config/main.c
+++ b/xfce4-notifyd-config/main.c
@@ -70,17 +70,19 @@ xfce4_notifyd_slider_format_value(GtkScale *slider,
}
static void
-xfce4_notifyd_config_theme_treeview_changed(GtkTreeSelection *sel,
-gpointer user_data)
+xfce4_notifyd_config_theme_combo_changed(GtkComboBox *theme_combo,
+ gpointer user_data)
{
XfconfChannel *channel = user_data;
-GtkTreeModel *model = NULL;
+GtkTreeModel *model;
GtkTreeIter iter;
gchar *theme = NULL;
-if(!gtk_tree_selection_get_selected(sel, &model, &iter))
+if(!gtk_combo_box_get_active_iter(theme_combo, &iter))
return;
+model = gtk_combo_box_get_model (theme_combo);
+
gtk_tree_model_get(model, &iter, 0, &theme, -1);
xfconf_channel_set_string(channel, "/theme", theme);
g_free(theme);
@@ -92,17 +94,15 @@ xfce4_notifyd_config_theme_changed(XfconfChannel *channel,
const GValue *value,
gpointer user_data)
{
-GtkWidget *treeview = user_data;
+GtkWidget *theme_combo = user_data;
GtkListStore *ls;
-GtkTreeSelection *sel;
GtkTreeIter iter;
gchar *theme;
const gchar *new_theme;
new_theme = G_VALUE_TYPE(value) ? g_value_get_string(value) : "Default";
-sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-ls = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)));
+ls = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(theme_combo)));
for(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(ls), &iter);
gtk_list_store_iter_is_valid(ls, &iter);
@@ -110,7 +110,8 @@ xfce4_notifyd_config_theme_changed(XfconfChannel *channel,
{
gtk_tree_model_get(GTK_TREE_MODEL(ls), &iter, 0, &theme, -1);
if(!strcmp(theme, new_theme)) {
-gtk_tree_selection_select_iter(sel, &iter);
+gtk_combo_box_set_active_iter(GTK_COMBO_BOX(theme_combo),
+ &iter);
g_free(theme);
xfce4_notifyd_config_kill_daemon();
return;
@@ -120,7 +121,7 @@ xfce4_notifyd_config_theme_changed(XfconfChannel *channel,
gtk_list_store_append(ls, &iter);
gtk_list_store_set(ls, &iter, 0, new_theme, -1);
-gtk_tree_selection_select_iter(sel, &iter);
+gtk_combo_box_set_active_iter(GTK_COMBO_BOX(theme_combo), &iter);
}
static void
@@ -164,17 +165,14 @@ list_store_add_themes_in_dir(GtkListStore *ls,
}
static void
-xfce4_notifyd_config_setup_treeview(GtkWidget *treeview,
-const gchar *current_theme)
+xfce4_notifyd_config_setup_theme_combo(GtkWidget *theme_combo,
+ const gchar *current_theme)
{
GtkListStore *ls;
gchar *dirname, **dirnames;
GHashTable *themes_seen;
gint i;
-GtkCellRenderer *render;
-GtkTreeViewColumn *col;
GtkTreeIter current_theme_iter;
-GtkTreeSelection *sel;
ls = gtk_list_store_new(1, G_TYPE_STRING);
themes_seen = g_hash_table_new_full(g_str_hash, g_str_equal,
@@ -193,19 +191,11 @@ xfce4_notifyd_config_setup_treeview(GtkWidget *treeview,
g_hash_table_destroy(themes_seen);
-gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(ls));
-
-render = gtk_cell_renderer_text_new();
-col = gtk_tree_view_column_new_with_attributes(_("Theme"), render,
- "text", 0, NULL);
-gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
-
-gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls), 0,
- GTK_SORT_ASCENDING);
+gtk_combo_box_set_model(GTK_COMBO_BOX(theme_combo), GTK_TREE_MODEL(ls));
-sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
if(gtk_list_store_iter_is_valid(ls, ¤t_theme_iter))
-gtk_tree_selection_select_iter(sel, ¤t_theme_iter);
+gtk_combo_box_set_active_iter(GTK_COMBO_BOX(theme_combo),
+ ¤t_theme_iter);
g_object_unref(G_OBJECT(ls));
}
@@ -236,7 +226,7 @@ static GtkWidget *
xfce4_notifyd_config_setup_dialog(GtkBuilder *builder)
{
XfconfChannel *channel;
-GtkWidget *dlg, *btn, *sbtn, *slider, *treeview, *
[Xfce4-commits] Tweak dialog UI.
Updating branch refs/heads/master to 578731da48c2cdb3ceb21623aab902f2a521c540 (commit) from 718bc83f3530f66b06cafd9c413adff2400b3f73 (commit) commit 578731da48c2cdb3ceb21623aab902f2a521c540 Author: Jérôme Guelfucci Date: Sun May 8 12:01:55 2011 +0200 Tweak dialog UI. Remove subtitle as it makes the dialog quite large without being really helpful. Make the dialog scale nicely which makes it usable when using embedded settings dialog. Add an alignment and some border-width to improve the layout. xfce4-notifyd-config/xfce4-notifyd-config.glade | 244 --- 1 files changed, 127 insertions(+), 117 deletions(-) diff --git a/xfce4-notifyd-config/xfce4-notifyd-config.glade b/xfce4-notifyd-config/xfce4-notifyd-config.glade index 0f12eca..29e4390 100644 --- a/xfce4-notifyd-config/xfce4-notifyd-config.glade +++ b/xfce4-notifyd-config/xfce4-notifyd-config.glade @@ -42,26 +42,133 @@ center-on-parent xfce4-notifyd dialog -Customize how notifications appear on your screen True vertical 2 - + True -vertical +6 +12 - + True -4 -2 -10 -10 +6 +vertical - + True +4 +2 +50 +12 + + +True +True +adjustment2 +2 +2 +right + + +1 +2 +3 +4 +GTK_FILL + + + + +True +0 +_Opacity: +True + + +3 +4 +GTK_FILL + + + + +True +0 +_Disappear after: +True +expire_timeout_sbtn + + +2 +3 +GTK_FILL + + + + +True +0 +Default _position: +True +position_combo + + +1 +2 +GTK_FILL + + + + +True +model1 + + + +0 + + + + +1 +2 +1 +2 +GTK_FILL + + + + +True +0 +Theme: +True +position_combo + + +GTK_FILL + + + + +True + + + +0 + + + + +1 +2 +GTK_FILL + + True @@ -94,124 +201,27 @@ -0 +1 +2 +2 +3 +GTK_FILL -1 -2 -2 -
[Xfce4-commits] Cleanup includes.
Updating branch refs/heads/master to dc6f833ade8904490febe2d17bfdc4f208fda801 (commit) from a3e511c8d37b9e4036d6db3e6be6e7a01b6f466f (commit) commit dc6f833ade8904490febe2d17bfdc4f208fda801 Author: Nick Schermer Date: Sun May 8 12:11:23 2011 +0200 Cleanup includes. xfsettingsd/clipboard-manager.c | 20 +++- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c index 0bfe5c1..9d16d94 100644 --- a/xfsettingsd/clipboard-manager.c +++ b/xfsettingsd/clipboard-manager.c @@ -22,25 +22,19 @@ * */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif -#include -#include -#include -#include -#include +#ifdef HAVE_STRING_H #include -#include +#endif -#include +#include +#include -#include -#include #include #include -#include -#include -#include #include "clipboard-manager.h" #include "xsettings.h" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Missed two memory allocation conversions.
Updating branch refs/heads/master
to a3e511c8d37b9e4036d6db3e6be6e7a01b6f466f (commit)
from 3213df6a2ecc810da22cb8d484b52dc230326a47 (commit)
commit a3e511c8d37b9e4036d6db3e6be6e7a01b6f466f
Author: Nick Schermer
Date: Sun May 8 12:02:23 2011 +0200
Missed two memory allocation conversions.
xfsettingsd/clipboard-manager.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
index d3b0290..0bfe5c1 100644
--- a/xfsettingsd/clipboard-manager.c
+++ b/xfsettingsd/clipboard-manager.c
@@ -393,7 +393,7 @@ receive_incrementally (GsdClipboardManager *manager,
tdata->data = data;
tdata->length = length;
} else {
-tdata->data = realloc (tdata->data, tdata->length +
length + 1);
+tdata->data = g_realloc (tdata->data, tdata->length +
length + 1);
memcpy (tdata->data + tdata->length, data, length + 1);
tdata->length += length;
XFree (data);
@@ -642,7 +642,7 @@ convert_clipboard (GsdClipboardManager *manager,
}
for (i = 0; i < nitems; i += 2) {
-rdata = (IncrConversion *) malloc (sizeof
(IncrConversion));
+rdata = g_slice_new (IncrConversion);
rdata->requestor = xev->xselectionrequest.requestor;
rdata->target = multiple[i];
rdata->property = multiple[i+1];
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Allow replacing xfsettingsd.
Updating branch refs/heads/master
to d6afb0e936a41602e0d6139338f08bfec602ca89 (commit)
from 682b5e7025e86f3803bb9789925796586abaa09a (commit)
commit d6afb0e936a41602e0d6139338f08bfec602ca89
Author: Nick Schermer
Date: Sat May 7 19:06:02 2011 +0200
Allow replacing xfsettingsd.
Watch dbus if we loose the name and add required flags to allow
replacing the dbus name. This way xfsettingsd --replace works
as expected.
xfsettingsd/main.c | 43 +--
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index 8a1f5cd..3b37cda 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -63,7 +63,7 @@
#include "displays.h"
#endif
-#define XFSETTINGS_DBUS_NAME("org.xfce.SettingsDaemon")
+#define XFSETTINGS_DBUS_NAME"org.xfce.SettingsDaemon"
#define XFSETTINGS_DESKTOP_FILE (SYSCONFIGDIR
"/xdg/autostart/xfsettingsd.desktop")
@@ -92,6 +92,23 @@ signal_handler (gint signum,
+static DBusHandlerResult
+dbus_connection_filter_func (DBusConnection *connection,
+ DBusMessage*message,
+ void *user_data)
+{
+if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
+{
+g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over.
Leaving...");
+gtk_main_quit ();
+return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+
+
gint
main (gint argc, gchar **argv)
{
@@ -113,6 +130,7 @@ main (gint argc, gchar **argv)
const gintsignums[] = { SIGQUIT, SIGTERM };
DBusConnection *dbus_connection;
gint result;
+guint dbus_flags;
xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
@@ -153,12 +171,21 @@ main (gint argc, gchar **argv)
dbus_connection = dbus_bus_get (DBUS_BUS_SESSION, NULL);
if (G_LIKELY (dbus_connection != NULL))
{
-result = dbus_bus_request_name (dbus_connection, XFSETTINGS_DBUS_NAME,
DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL);
+dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
+
+dbus_flags = DBUS_NAME_FLAG_ALLOW_REPLACEMENT |
DBUS_NAME_FLAG_DO_NOT_QUEUE;
+if (opt_replace)
+ dbus_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
+
+result = dbus_bus_request_name (dbus_connection, XFSETTINGS_DBUS_NAME,
dbus_flags, NULL);
if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
- {
- g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance is already
running. Leaving...");
- return EXIT_SUCCESS;
- }
+{
+g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance is already
running. Leaving...");
+return EXIT_SUCCESS;
+}
+
+dbus_bus_add_match (dbus_connection,
"type='signal',member='NameOwnerChanged',arg0='"XFSETTINGS_DBUS_NAME"'", NULL);
+dbus_connection_add_filter (dbus_connection,
dbus_connection_filter_func, NULL, NULL);
}
else
{
@@ -239,7 +266,11 @@ main (gint argc, gchar **argv)
/* release the dbus name */
if (dbus_connection != NULL)
+{
+dbus_connection_remove_filter (dbus_connection,
dbus_connection_filter_func, NULL);
dbus_bus_release_name (dbus_connection, XFSETTINGS_DBUS_NAME, NULL);
+dbus_connection_unref (dbus_connection);
+}
/* release the sub daemons */
g_object_unref (G_OBJECT (xsettings_helper));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Share xserver time function for clipboard manager.
Updating branch refs/heads/master
to 682b5e7025e86f3803bb9789925796586abaa09a (commit)
from 1badff8a32e9d931ca266f37acf3eed48db90e46 (commit)
commit 682b5e7025e86f3803bb9789925796586abaa09a
Author: Nick Schermer
Date: Sat May 7 18:38:27 2011 +0200
Share xserver time function for clipboard manager.
xfsettingsd/xsettings.c | 31 ++-
xfsettingsd/xsettings.h |3 +++
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/xfsettingsd/xsettings.c b/xfsettingsd/xsettings.c
index bb35fb9..4d96b56 100644
--- a/xfsettingsd/xsettings.c
+++ b/xfsettingsd/xsettings.c
@@ -1029,6 +1029,26 @@ xfce_xsettings_helper_timestamp_predicate (Display
*xdisplay,
+Time
+xfce_xsettings_get_server_time (Display *xdisplay,
+Window window)
+{
+Atom timestamp_atom;
+guchar c = 'a';
+XEvent xevent;
+
+/* get the current xserver timestamp */
+timestamp_atom = XInternAtom (xdisplay, "_TIMESTAMP_PROP", False);
+XChangeProperty (xdisplay, window, timestamp_atom, timestamp_atom,
+ 8, PropModeReplace, &c, 1);
+XIfEvent (xdisplay, &xevent, xfce_xsettings_helper_timestamp_predicate,
+ GUINT_TO_POINTER (window));
+
+return xevent.xproperty.time;
+}
+
+
+
gboolean
xfce_xsettings_helper_register (XfceXSettingsHelper *helper,
GdkDisplay *gdkdisplay,
@@ -1039,11 +1059,9 @@ xfce_xsettings_helper_register (XfceXSettingsHelper
*helper,
Window window;
gcharatom_name[64];
Atom selection_atom;
-Atom timestamp_atom;
gint n_screens, n;
-guchar c = 'a';
+
XfceXSettingsScreen *screen;
-XEvent xevent;
Time timestamp;
XClientMessageEvent xev;
gboolean succeed;
@@ -1079,12 +1097,7 @@ xfce_xsettings_helper_register (XfceXSettingsHelper
*helper,
XSelectInput (xdisplay, window, PropertyChangeMask);
/* get the current xserver timestamp */
-timestamp_atom = XInternAtom (xdisplay, "_TIMESTAMP_PROP", False);
-XChangeProperty (xdisplay, window, timestamp_atom, timestamp_atom,
- 8, PropModeReplace, &c, 1);
-XIfEvent (xdisplay, &xevent, xfce_xsettings_helper_timestamp_predicate,
- GUINT_TO_POINTER (window));
-timestamp = xevent.xproperty.time;
+timestamp = xfce_xsettings_get_server_time (xdisplay, window);
/* request ownership of the xsettings selection on this screen */
XSetSelectionOwner (xdisplay, selection_atom, window, timestamp);
diff --git a/xfsettingsd/xsettings.h b/xfsettingsd/xsettings.h
index 76371a6..01ad801 100644
--- a/xfsettingsd/xsettings.h
+++ b/xfsettingsd/xsettings.h
@@ -36,4 +36,7 @@ gboolean xfce_xsettings_helper_register (XfceXSettingsHelper
*helper,
GdkDisplay *gdkdisplay,
gboolean force_replace);
+Time xfce_xsettings_get_server_time (Display *display,
+ Window window);
+
#endif /* !__XSETTINGS_H__ */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
