[Xfce4-commits] orage:orage-4.8 test update

2012-01-05 Thread Juha Kautto
Updating branch refs/heads/orage-4.8
 to e955ef908119c3bb1974e159de44d35ed46f5cd4 (commit)
   from 749340ec6b7bbc1800483e0dc73776501e4e9b53 (commit)

commit e955ef908119c3bb1974e159de44d35ed46f5cd4
Author: Juha Kautto j...@xfce.org
Date:   Thu Jan 5 10:21:27 2012 +0200

test update

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index a81439b..98151ed 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -2,7 +2,7 @@ dnl $Id$
 dnl
 dnl Orage - Calendar application for Xfce
 dnl
-dnl Copyright (c) 2003-2011
+dnl Copyright (c) 2003-2012
 dnl The Xfce development team. All rights reserved.
 dnl
 dnl Written for Xfce by Juha Kautto j...@xfce.org
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar-vfs:master l10n: Updated Norwegian Nynorsk (nn) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to 030368bf1439bf0872bcf994fed2129512815a9f (commit)
   from 564f8d1a45dbaa56c7ec2a0714025cfe141f6ced (commit)

commit 030368bf1439bf0872bcf994fed2129512815a9f
Author: Eivind Ødegård ginger...@yahoo.no
Date:   Thu Jan 5 13:06:28 2012 +0100

l10n: Updated Norwegian Nynorsk (nn) translation to 100%

New status: 86 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nn.po |   55 +--
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/po/nn.po b/po/nn.po
index ab045ac..13c5309 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,9 +6,9 @@ msgid 
 msgstr 
 Project-Id-Version: Thunar\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 17:48+0100\n
-PO-Revision-Date: 2008-06-09 17:12+0200\n
-Last-Translator: Eirik U. Birkeland eir...@gmail.com\n
+POT-Creation-Date: 2012-01-05 09:51+\n
+PO-Revision-Date: 2012-01-05 13:05+0100\n
+Last-Translator: Eivind Ødegård meinmycell-for...@yahoo.no\n
 Language-Team: Norwegian Nynorsk i18n...@lister.ping.uio.no\n
 Language: nn\n
 MIME-Version: 1.0\n
@@ -20,96 +20,97 @@ msgstr 
 #: ../thunar-vfs/exo-hal.c:434
 #, c-format
 msgid External %s Drive
-msgstr 
+msgstr Ekstern %s-stasjon
 
 #: ../thunar-vfs/exo-hal.c:436
 #, c-format
 msgid %s Drive
-msgstr 
+msgstr %s-stasjon
 
 #: ../thunar-vfs/exo-hal.c:445
 msgid External Floppy Drive
-msgstr 
+msgstr Compact Flash-stasjon
 
 #: ../thunar-vfs/exo-hal.c:447
 msgid Floppy Drive
-msgstr 
+msgstr Diskettstasjon
 
 #: ../thunar-vfs/exo-hal.c:451
 msgid Compact Flash Drive
-msgstr 
+msgstr Compact Flash-stasjon
 
 #: ../thunar-vfs/exo-hal.c:455
 msgid Memory Stick Drive
-msgstr 
+msgstr Minnepinne
 
 #: ../thunar-vfs/exo-hal.c:459
 msgid Smart Media Drive
-msgstr 
+msgstr Smart-stasjon
 
 #: ../thunar-vfs/exo-hal.c:463
 msgid SD/MMC Drive
-msgstr 
+msgstr SD/MMC-stasjon
 
 #: ../thunar-vfs/exo-hal.c:467
 msgid Zip Drive
-msgstr 
+msgstr Zip-stasjon
 
 #: ../thunar-vfs/exo-hal.c:471
 msgid Jaz Drive
-msgstr 
+msgstr Jaz-stasjon
 
 #: ../thunar-vfs/exo-hal.c:475
 msgid Pen Drive
-msgstr 
+msgstr Minnepenn
 
 #. 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 musikkspelar
 
 #. 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 digitalkamera
 
 #. last fallback to Drive
 #: ../thunar-vfs/exo-hal.c:522
 msgid Drive
-msgstr 
+msgstr Stasjon
 
 #: ../thunar-vfs/exo-hal.c:739
 #, c-format
 msgid Blank %s Disc
-msgstr 
+msgstr Tom %s-plate
 
 #: ../thunar-vfs/exo-hal.c:741
 #, c-format
 msgid %s Disc
-msgstr 
+msgstr %s-plate
 
 #. special case for pure audio disc
 #: ../thunar-vfs/exo-hal.c:746
 msgid Audio CD
-msgstr 
+msgstr Lyd-CD
 
 #: ../thunar-vfs/exo-hal.c:782
 #, c-format
 msgid %s Removable Volume
-msgstr 
+msgstr %s flyttbar stasjon
 
 #: ../thunar-vfs/exo-hal.c:784
 #, c-format
 msgid %s Volume
-msgstr 
+msgstr %s-stasjon
 
-#: ../thunar-vfs/exo-mount-point.c:218 ../thunar-vfs/exo-mount-point.c:247
+#: ../thunar-vfs/exo-mount-point.c:218
+#: ../thunar-vfs/exo-mount-point.c:247
 #: ../thunar-vfs/exo-mount-point.c:435
-#, fuzzy, c-format
+#, c-format
 msgid Failed to open file \%s\: %s
-msgstr Klarte ikkje opna fila «%s»
+msgstr Klarte ikkje opna fila \%s\: %s
 
 #. base directory not readable
 #: ../thunar-vfs/thunar-vfs-deep-count-job.c:233
@@ -134,7 +135,8 @@ msgstr Exec-felt er ikkje oppgjeve
 msgid No URL field specified
 msgstr URL-felt er ikkje oppgjeve
 
-#: ../thunar-vfs/thunar-vfs-info.c:414 ../thunar-vfs/thunar-vfs-private.c:384
+#: ../thunar-vfs/thunar-vfs-info.c:414
+#: ../thunar-vfs/thunar-vfs-private.c:384
 #, c-format
 msgid Invalid desktop file
 msgstr Ugyldig skrivebordsfil
@@ -466,3 +468,4 @@ msgstr Klarte ikkje finna monteringspunktet til %s
 #, c-format
 msgid Failed to connect to the HAL daemon: %s
 msgstr Greidde ikkje å kopla til HAL-nissen: %s
+
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Chinese (China) (zh_CN) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to 16431b27f1b25101c02c66126a88acda877e589d (commit)
   from 9615029493ae548d9e7a0e939007f8676e2e5279 (commit)

commit 16431b27f1b25101c02c66126a88acda877e589d
Author: Chipong Luo chipon...@yahoo.com
Date:   Thu Jan 5 13:09:18 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 100%

New status: 47 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   51 ---
 1 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 945e33c..0cd383d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 # the xfce4-clipman-plugin package.
 # Hydonsingore Cia hydonsing...@educities.edu.tw, 2006.
 # Hunt Xu hun...@live.cn, 2009.
-# Chipong Luo chipon...@yahoo.com, 2011.
+# Chipong Luo chipon...@yahoo.com, 2011, 2012.
 #
 msgid 
 msgstr 
@@ -52,15 +52,15 @@ msgstr 图片
 
 #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:5
 msgid Long URL
-msgstr 长地址
+msgstr 长 URL
 
 #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:6
 msgid Shrink the URL
-msgstr 缩短地址
+msgstr 短 URL
 
 #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:7
 msgid View with Ristretto
-msgstr 使用 Ristretto 图片查看器查看
+msgstr 使用 Ristretto 查看
 
 #: ../panel-plugin/xfce4-clipman-actions.xml.in.h:8
 msgid Xfce Bug
@@ -104,7 +104,8 @@ msgid 
 By default the action is triggerred by a selection, check this option to 
 trigger the action only when you make a manual copy
 msgstr 
-默认为选中即激活此动作,如果只需要在您手动复制时执行此动作则选中此选项
+默认为选中即激活此动作,如果只需要在您
+手动复制时执行此动作则选中此选项
 
 #: ../panel-plugin/settings-dialog.glade.h:8
 msgid Command:
@@ -131,32 +132,39 @@ msgid 
 If checked, the clipboard texts will be matched against regular expressions 
 and a menu will display possible actions
 msgstr 
-如果选中,剪贴板中的文字会相对正则表达式匹配并显示一可能动作的菜单
+如果选中,剪贴板文字会相对正则表达式
+匹配并显示一可能动作的菜单
 
 #: ../panel-plugin/settings-dialog.glade.h:14
 msgid 
 If checked, the selections will be synced with the default clipboard in a 
 way that you can paste what you select
 msgstr 
-如果选中,选择的内容会以一种您能粘贴您所选内容的方式与默认的剪贴板同步
+如果选中,选择区会以一种您能粘贴您所选
+内容的方式与默认的剪贴板同步
 
 #: ../panel-plugin/settings-dialog.glade.h:15
 msgid 
 If checked, the selections won't affect the history except the manual copies
-msgstr 如果选中,除非手动复制,否则所选内容将不会影响历史
+msgstr 
+如果选中,除非手动复制,否则选择区将
+不会影响历史
 
 #: ../panel-plugin/settings-dialog.glade.h:16
 msgid If checked, this option allows to store one image inside the history
-msgstr 如果选中,此选项让在历史中储存图片
+msgstr 
+如果选中,此选项让在历史中储存图片
 
 #: ../panel-plugin/settings-dialog.glade.h:17
 msgid 
 If checked, this option will restore the history on every new Xfce session
-msgstr 如果选中,此选项将在每个新 Xfce 会话中恢复历史
+msgstr 
+如果选中,此选项将在每个新 Xfce 会话中
+恢复历史
 
 #: ../panel-plugin/settings-dialog.glade.h:18
 msgid Ignore s_elections
-msgstr 忽略所选内容(_E)
+msgstr 忽略选择区(_E)
 
 #: ../panel-plugin/settings-dialog.glade.h:19
 msgid Name:
@@ -184,15 +192,18 @@ msgstr 储存图片(_I)
 
 #: ../panel-plugin/settings-dialog.glade.h:25
 msgid Sync _selections
-msgstr 同步所选内容(_S)
+msgstr 同步选择区(_S)
 
 #: ../panel-plugin/settings-dialog.glade.h:26
 msgid The pattern is always anchored within the special characters ^$
-msgstr 匹配规则总是固定在特殊字符 ^$ 内
+msgstr 
+匹配规则总是固定在特殊字符 ^$ 内
 
 #: ../panel-plugin/settings-dialog.glade.h:27
 msgid Type here your custom text, for example an URL, a filename, etc.
-msgstr 在这里输入您的自定义文本,比如地址、文件名等。
+msgstr 
+在这里输入您的自定义文本,比如 URL、
+文件名等。
 
 #: ../panel-plugin/settings-dialog.glade.h:28
 msgid 
@@ -201,8 +212,10 @@ msgid 
 know regular expressions, have a look at the documentation of Clipman that 
 has an introdution for them.
 msgstr 
-您可以在命令中使用 “\\1”、“\\2” 等替换参数。参数 “\\0” 代表完整文本。
-如果您不了解正则表达式,看看 Clipman 剪贴板管理器的介绍它们的文档。
+您可以在命令中使用 “\\1”、“\\2” 等
+替换参数。参数 “\\0” 代表完整文本。
+如果您不了解正则表达式,看看 Clipman 
+剪贴板管理器的介绍它们的文档。
 
 #: ../panel-plugin/actions.c:367
 #, c-format
@@ -211,7 +224,7 @@ msgid 
 \n
 %s
 msgstr 
-无法执行命令 “%s”\n
+未能执行命令 “%s”\n
 \n
 %s
 
@@ -237,8 +250,8 @@ msgid translator-credits
 msgstr 
 Hydonsingore Cia hydonsing...@educities.edu.tw, 2006.\n
 Hunt Xu hun...@live.cn, 2009.\n
-Chipong Luo chipon...@yahoo.com, 2011.
+Chipong Luo chipon...@yahoo.com, 2011, 2012。
 
 #: ../panel-plugin/plugin.c:331
 msgid Unable to open the settings dialog
-msgstr 无法打开设置对话框
+msgstr 未能打开设置对话框
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 50%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to 9907e2e11a4b534958925ee7170c6c67505c5495 (commit)
   from ab514f7b1bf94e58470d1c0039320ddcd8b8f896 (commit)

commit 9907e2e11a4b534958925ee7170c6c67505c5495
Author: Chipong Luo chipon...@yahoo.com
Date:   Thu Jan 5 13:36:56 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 50%

New status: 54 messages complete with 28 fuzzies and 25 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |  132 +-
 1 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 61b103f..3fe8457 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,9 @@
-# This file is distributed under the same license as 
+# Simplified Chinese translations for
+# the xfce4-clipman-plugin.docs package.
+# This file is distributed under the same license as
 # the xfce4-clipman-plugin.docs package.
 # Hunt Xu hun...@live.cn, 2009.
-# Chipong Luo chipon...@yahoo.com, 2011.
+# Chipong Luo chipon...@yahoo.com, 2011, 2012.
 #
 msgid 
 msgstr 
@@ -10,7 +12,7 @@ msgstr 
 PO-Revision-Date: 2009-11-18 19:28+0800\n
 Last-Translator: Chipong Luo chipon...@yahoo.com\n
 Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n
-Language: \n
+Language: zh_CN\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
@@ -20,7 +22,7 @@ msgctxt _
 msgid translator-credits
 msgstr 
 Hunt Xu hun...@live.cn, 2009.\n
-Chipong Luo chipon...@yahoo.com, 2011.
+Chipong Luo chipon...@yahoo.com, 2011, 2012.
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -103,10 +105,12 @@ msgid 
 complete license text is available from the link href=\http://www.fsf.org/;
 \Free Software Foundation/link.
 msgstr 
-以自由软件基金会发布的 GNU 自由文档许可协议 1.3 版或
-更高版的方式允许复制、分发和/或修改此文档;不要求保留
-特定章节、封面文本或封底文本。完整的许可协议文本在:ulink type=\http\ url=
-\http://www.gnu.org/\;Free Software Foundation/ulink。
+以自由软件基金会发布的 GNU 自由文档许可
+协议 1.3 版或更高版的方式允许复制、分发
+和/或修改此文档;不要求保留特定章节、封面
+文本或封底文本。完整的许可协议文本在:
+ulink type=\http\ url=\http://www.gnu.org/;
+\Free Software Foundation/ulink。
 
 #: index.page:26(page/title)
 msgid Clipman
@@ -124,9 +128,11 @@ msgid 
 execute actions on specific text by matching them against regular 
 expressions.
 msgstr 
-appClipman/app 是 appXfce/app 的剪贴板管理器。它保留在您关闭应用
-程序后会丢失的剪贴板内容。它能够处理文本和图片,并且
-有通过与正则表达式匹配在特定文本上执行动作的功能。
+appClipman/app 是 appXfce/app 的剪贴板管理器。
+它保留在您关闭应用程序后会丢失的剪贴板
+内容。它能够处理文本和图片,并且有通过
+与正则表达式匹配在特定文本上执行动作的
+功能。
 
 #: index.page:40(section/title)
 msgid Anatomy of a Clipboard
@@ -140,10 +146,11 @@ msgid 
 button), and there is a primary clipboard which is modified by selections 
 (for instance when you select text in a field).
 msgstr 
-在 X11(所有 Unix 平台)中默认有两个剪贴板交换窗口间
-的数据。一个通过手动复制(比如您选中文件并按复制按钮)
-修改的默认剪贴板,一个通过所选内容(比如您在主区域中
-选中文本)修改的主剪贴板。
+在 X11(所有 Unix 平台)中默认有两个剪贴板
+交换窗口间的数据。一个通过手动复制(比如您
+选中文件并按复制按钮)修改的默认剪贴板,一个
+通过选择区(比如您在一区域中选择文本)修改的
+主剪贴板。
 
 #: index.page:48(section/p)
 msgid 
@@ -152,14 +159,15 @@ msgid 
 clipboard will always be synced with it and contain the same data. By this 
 meaning you can paste with the keyboard what you select on screen.
 msgstr 
-appClipman/app 仅处理默认剪贴板,但可以选择的是它也能注意
-所选内容。当它正在处理所选内容时,默认剪贴板会一直与其
-同步并包含相同数据。也就是说您可以使用键盘粘贴您在屏幕
-上选中的内容。
+appClipman/app 仅处理默认剪贴板,但可以选择的
+是它也能注意选择区。当它正在处理选择区时,
+默认剪贴板会一直与其同步并包含相同数据。
+就是说您可以使用键盘粘贴您在屏幕上选中的
+内容。
 
 #: index.page:61(section/title)
 msgid Starting Clipman
-msgstr 启动 Clipman 剪贴板管理器
+msgstr 启动 Clipman
 
 #: index.page:62(section/p)
 msgid 
@@ -168,21 +176,21 @@ msgid 
 main icon. Within the menu it is possible to restore a text and to clear the 
 history.
 msgstr 
-appClipman/app 用来保留剪贴板内容列表历史用于恢复。在
-主图标上点击历史会显示在菜单中。在此菜单内您能够恢复
-文本也能够清除历史。
+appClipman/app 用来保留剪贴板内容列表历史用于
+恢复。在主图标上点击历史会显示在菜单中。在此
+菜单内您能够恢复文本也能够清除历史。
 
 #: index.page:68(figure/title)
 msgid Clipman menu with the history
-msgstr 带历史的 Clipman 剪贴板管理器菜单
+msgstr 带历史的 Clipman 菜单
 
 #: index.page:69(figure/desc)
 msgid 
 Shows the menu that popups when clicking the Clipman icon in the Xfce Panel 
 or the notification area
 msgstr 
-显示在点击 Xfce 面板上的 Clipman 图标或通知区域时
-弹出的菜单
+显示在点击 Xfce 面板上的 Clipman 图标或
+通知区域时弹出的菜单
 
 #: index.page:72(section/p)
 msgid 
@@ -192,9 +200,10 @@ msgid 
 a new item in the panel right click the panel and select gui style=
 \menuitem\Add new item.../gui.
 msgstr 
-有两种运行 appClipman/app 的方式。您可以在工具类别下的
-应用程序菜单中选择 appClipman/app、在命令行中输入 cmdxfce4-clipman/cmd 
-或在面板上右击并选择 gui style=\menuitem\添加新项目.../gui 将它添加到您的
+有两种运行 appClipman/app 的方式。您可以
+在工具类别下的应用程序菜单中选择 appClipman/app、
+在命令行中输入 cmdxfce4-clipman/cmd 或在面板上
+右击并选择 gui style=\menuitem\添加新项目.../gui 将它添加到您的
 面板上。
 
 #: index.page:80(section/title)
@@ -209,113 +218,104 @@ msgid 
 guiguiSettings/guiguiKeyboard/gui/guiseq.
 msgstr 
 @PACKAGE_NAME@ 提供一个命令行工具 applicationxfce4-popup-clipman/
-application。当它被执行时将弹出主菜单。使用在 

[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 55%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to 6c175a47be81f65ef301a105e0f13d40b42a308f (commit)
   from 9907e2e11a4b534958925ee7170c6c67505c5495 (commit)

commit 6c175a47be81f65ef301a105e0f13d40b42a308f
Author: Chipong Luo chipon...@yahoo.com
Date:   Thu Jan 5 14:06:47 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 55%

New status: 59 messages complete with 26 fuzzies and 22 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   33 +++--
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3fe8457..6269806 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -322,20 +322,23 @@ msgid 
 remove an action select an action and click the guiDelete/gui icon. By 
 adding or editing an action a new dialog is opened.
 msgstr 
-要添加一个动作,请点击添加图标;要编辑一个动作,请选择该动作并点击编辑图标或
-者直接双击该动作;要删除一个动作,请选择该动作并点击删除图标。选择添加或者编
-译一个动作,一个新对话框将会被打开。
+要添加动作,点击 gui添加/gui 图标,要编辑
+动作,选择此作并点击 gui编辑/gui 图标或者
+双击此动作,要删除动作,选择此动作并
+点击 gui删除/gui 图标。添加或编辑动作时会
+打开一个新的对话框。
 
 #: index.page:149(section/p)
-#, fuzzy
 msgid 
 To learn more about actions go to the link xref=\#action-dialog\next 
 section/link.
-msgstr 想要学习更多关于动作的内容,请转到 xref linkend=\action-dialog\/。
+msgstr 
+要了解更多关于动作的内容,转到 
+link xref=\#action-dialog\下一节/link。
 
 #: index.page:154(figure/desc)
 msgid Settings dialog with the Actions tab
-msgstr 带有动作标签的设置对话框
+msgstr 带动作标签的设置对话框
 
 #: index.page:160(section/title) index.page:170(figure/title)
 msgid Action Dialog
@@ -347,25 +350,27 @@ msgid 
 to match. An action must have at least one command which also has a human 
 readable name. The matched text can be reused in the command.
 msgstr 
-每个动作都有一个易于理解的名称用以描述匹配模式将匹配的内容。同样,每个动作都
-应该至少有一个同样拥有一个易于理解的名称的命令。匹配的文本可以在命令中被再次
-使用。
+动作有一个描述要匹配的匹配类型的人可读的
+名称。动作至少必须有一个人也可读的名称的
+命令。匹配的文字可以在命令中重复使用。
 
 #: index.page:165(section/p)
-#, fuzzy
 msgid 
 The actions are always matched against text selections unless specified 
 otherwise. When the box guiActivate only on manual copy/gui is checked, 
 the action will be matched from the default clipboard (e.g. with 
 keyseqkeyCtrl/keykeyC/key/keyseq).
 msgstr 
-除非您指定其他设置,否则动作将会对每次文本选择进行匹配。当选中 “仅在手动复制
-时激活” 选项框时,仅会对预设剪贴板进行匹配 (例如当您使用 Crtl+C 进行复制)
+除非您另外指定,动作总是相对文字选择区
+匹配。当选中 gui仅在手动复制时激活/gui 选项框时,
+将会从默认剪贴板匹配
+(如用 keyseqkeyCtrl/keykeyC/key/keyseq)。
 
 #: index.page:171(figure/desc)
 msgid 
 Settings dialog showing the Action Dialog when creating or editing an action
 msgstr 
+创建或编辑动作时设置对话框显示动作对话框
 
 #: index.page:177(section/title)
 msgid Regular Expression
@@ -373,11 +378,11 @@ msgstr 正则表达式
 
 #: index.page:178(section/p)
 msgid Basic special characters: \_:input-1/\.
-msgstr 
+msgstr 基本的特殊字符:“_:input-1/”。
 
 #: index.page:182(item/p)
 msgid \_:input-1/\: represents a single character.
-msgstr 
+msgstr “_:input-1/”:代表单个字符。
 
 #: index.page:183(item/p)
 #, fuzzy
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 61%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to 9767f7acdc93a22fe0a2d470ba4fa819cd79 (commit)
   from 6c175a47be81f65ef301a105e0f13d40b42a308f (commit)

commit 9767f7acdc93a22fe0a2d470ba4fa819cd79
Author: Chipong Luo chipon...@yahoo.com
Date:   Thu Jan 5 14:31:33 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 61%

New status: 66 messages complete with 20 fuzzies and 21 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   30 --
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6269806..f9b3983 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -385,58 +385,52 @@ msgid \_:input-1/\: represents a single character.
 msgstr “_:input-1/”:代表单个字符。
 
 #: index.page:183(item/p)
-#, fuzzy
 msgid 
 \_:input-1/\: respectively means zero or one character, one or more 
 characters, and zero or more characters.
 msgstr 
-”emphasis role=\bold\placeholder-1//emphasis”: 分别代表零或一个字符,
-一个或一个以上字符,以及任意多个(包括0个)字符。
+“_:input-1/”:分别表示零或一个字符,
+一个或更多字符,以及零或更多字符。
 
 #: index.page:185(item/p)
-#, fuzzy
 msgid 
 \_:input-1/\: used for grouping and substitution, the vertical bar is 
 used as an OR operation.
 msgstr 
-”emphasis role=\bold\placeholder-1//emphasis”: 在分组和替换中,竖线
-(|)用以表示 “或” 。
+“_:input-1/”:用于分组和替换,竖线
+用作 OR 操作。
 
 #: index.page:187(item/p)
-#, fuzzy
 msgid 
 \_:input-1/\: used to match a character from a set of characters and 
 special characters, the circumflex is used at the start as a negation.
 msgstr 
-”emphasis role=\bold\placeholder-1//emphasis”: 在一系列字符或特殊字符
-中匹配一个字符时,“^” 符号在开头使用表示否定。
+“_:input-1/”:用于从一系列字符或特殊
+字符中匹配一个字符,‘^’ 用在开头作为否定。
 
 #: index.page:189(item/p)
 msgid \_:input-1/\: escapes a special character.
-msgstr 
+msgstr “_:input-1/”:转义特殊字符。
 
 #: index.page:191(section/p)
-#, fuzzy
 msgid 
 Basic alphanumeric character class: \_:input-1/\. Character classes are 
 used within square brackets to represent a set of characters.
 msgstr 
-基本的字母和数字字符类: \emphasis role=\bold\codeA-Za-z0-9/code/
-emphasis\。 字符类用于方括号中表示一系列的字符。
+基本的字母和数字字符类: “_:input-1/”。
+字符类用于方括号中表示一系列的字符。
 
 #: index.page:197(list/title)
-#, fuzzy
 msgid Regular Expression Examples
-msgstr 正则表达式
+msgstr 正则表达式示例
 
 #: index.page:198(item/p)
-#, fuzzy
 msgid 
 \_:input-1/\: text \_:input-2/\, zero or one space, zero or one 
 sharp character, and one or more numbers.
 msgstr 
-\emphasis role=\bold\placeholder-1//emphasis\: 文本 
-\placeholder-2/\,零或一个空格,零或一个 “#” 字符,后面是一个或多个数字。
+“_:input-1/”:文字 “_:input-2/”,
+零或一个空格,零或一个 ‘#’ 字符,一个或更多数字。
 
 #: index.page:200(item/p)
 #, fuzzy
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 67%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to a23f08fc023e1c1183d7966aa80c7ebf301023bf (commit)
   from 9767f7acdc93a22fe0a2d470ba4fa819cd79 (commit)

commit a23f08fc023e1c1183d7966aa80c7ebf301023bf
Author: Chipong Luo chipon...@yahoo.com
Date:   Thu Jan 5 14:42:12 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 67%

New status: 72 messages complete with 15 fuzzies and 20 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   32 +++-
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f9b3983..964e795 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -389,8 +389,8 @@ msgid 
 \_:input-1/\: respectively means zero or one character, one or more 
 characters, and zero or more characters.
 msgstr 
-“_:input-1/”:分别表示零或一个字符,
-一个或更多字符,以及零或更多字符。
+“_:input-1/”:分别表示零或一个字符、
+一个或更多字符和零或更多字符。
 
 #: index.page:185(item/p)
 msgid 
@@ -429,49 +429,47 @@ msgid 
 \_:input-1/\: text \_:input-2/\, zero or one space, zero or one 
 sharp character, and one or more numbers.
 msgstr 
-“_:input-1/”:文字 “_:input-2/”,
-零或一个空格,零或一个 ‘#’ 字符,一个或更多数字。
+“_:input-1/”:文字 “_:input-2/”、
+零或一个空格、零或一个 ‘#’ 字符和一个或
+更多数字。
 
 #: index.page:200(item/p)
-#, fuzzy
 msgid 
 \_:input-1/\: text \_:input-2/\ or \_:input-3/\, one or more 
 character, a point, and the text \_:input-4/\, \_:input-5/\ or \_:
 input-6/\.
 msgstr 
-\emphasis role=\bold\placeholder-1//emphasis\: 文本 
-\placeholder-2/\ 或 \placeholder-3/\,一或多个字符,一个点,后面是文
-本 \placeholder-4/\,\placeholder-5/\ 或 \placeholder-6/\。
+“_:input-1/”:文字 “_:input-2/” 
+或 “_:input-3/”、一或更多字符、一个点
+和文字 “_:input-4/”、“_:input-5/” 
+或 “_:input-6/”。
 
 #: index.page:203(item/p)
-#, fuzzy
 msgid 
 \_:input-1/\: text \_:input-2/\, 120 characters, and one or more 
 characters except a space.
 msgstr 
-“emphasis role=\bold\placeholder-1//emphasis”: 文本“placeholder-2/
-”,120 个字符,后面加一个或一个以上非空格的字符。
+“_:input-1/”:文字 “_:input-2/”、
+120 个字符和一个或更多除空格外的字符。
 
 #: index.page:208(list/title)
-#, fuzzy
 msgid External Resources
 msgstr 外部资源
 
 #: index.page:209(item/p)
-#, fuzzy
 msgid 
 link href=\http://en.wikipedia.org/wiki/Regular_expression\;Wikipedia 
 article about regular expressions/link
 msgstr 
-请参看 ulink type=\http\ url=\http://en.wikipedia.org/wiki/;
-Regular_expression\Wikipedia 上关于正则表达式的一篇文章/ulink。
+link href=\http://en.wikipedia.org/wiki/;
+Regular_expression\Wikipedia 
+article about regular expressions/link
 
 #: index.page:209(list/item)
 msgid _:p-1/.
-msgstr 
+msgstr _:p-1/。
 
 #: index.page:217(section/title)
-#, fuzzy
 msgid Commands
 msgstr 命令
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] exo:xfce-4.8 l10n: Updated Norwegian Nynorsk (nn) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce-4.8
 to 347aa26ef07bc8a96aa7ce42c3df48f99adf6baf (commit)
   from aa1dfa9c6b1b635d07c3f306b058536b97c3f19f (commit)

commit 347aa26ef07bc8a96aa7ce42c3df48f99adf6baf
Author: Eivind Ødegård ginger...@yahoo.no
Date:   Thu Jan 5 14:46:08 2012 +0100

l10n: Updated Norwegian Nynorsk (nn) translation to 100%

New status: 334 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nn.po |  406 +-
 1 files changed, 190 insertions(+), 216 deletions(-)

diff --git a/po/nn.po b/po/nn.po
index 7c8e792..b3a8279 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgstr 
 Project-Id-Version: exo 0.3.4\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2012-01-05 08:24+\n
-PO-Revision-Date: 2012-01-05 13:42+0100\n
+PO-Revision-Date: 2012-01-05 14:46+0100\n
 Last-Translator: Eivind Ødegård meinmycell-for...@yahoo.no\n
 Language-Team: Norwegian nynorsk i18n...@lister.ping.uio.no\n
 Language: nn\n
@@ -65,17 +65,16 @@ msgstr Klarte ikkje lese frå file \%s\: %s
 
 #: ../exo/exo-gdk-pixbuf-extensions.c:890
 #, c-format
-msgid 
-Failed to load image \%s\: Unknown reason, probably a corrupt image file
-msgstr 
-Klarte ikkje lasta bilete \%s\: Ukjend årsak, sannsynlegvis er fila 
øydelagd.
+msgid Failed to load image \%s\: Unknown reason, probably a corrupt image 
file
+msgstr Klarte ikkje lasta bilete \%s\: Ukjend årsak, sannsynlegvis er fila 
øydelagd.
 
 #: ../exo/exo-gtk-extensions.c:227
 #, c-format
 msgid Failed to open \%s\.
 msgstr Klarte ikkje opna \%s\.
 
-#: ../exo/exo-icon-bar.c:277 ../exo/exo-icon-view.c:776
+#: ../exo/exo-icon-bar.c:277
+#: ../exo/exo-icon-view.c:776
 msgid Orientation
 msgstr Orientering
 
@@ -83,19 +82,23 @@ msgstr Orientering
 msgid The orientation of the iconbar
 msgstr Orientering av ikonverktøylinje
 
-#: ../exo/exo-icon-bar.c:294 ../exo/exo-icon-view.c:793
+#: ../exo/exo-icon-bar.c:294
+#: ../exo/exo-icon-view.c:793
 msgid Pixbuf column
 msgstr Pixbufspalte
 
-#: ../exo/exo-icon-bar.c:295 ../exo/exo-icon-view.c:794
+#: ../exo/exo-icon-bar.c:295
+#: ../exo/exo-icon-view.c:794
 msgid Model column used to retrieve the icon pixbuf from
 msgstr Modellspalte som pixbuf blir henta frå
 
-#: ../exo/exo-icon-bar.c:310 ../exo/exo-icon-view.c:920
+#: ../exo/exo-icon-bar.c:310
+#: ../exo/exo-icon-view.c:920
 msgid Text column
 msgstr Tekstspalte
 
-#: ../exo/exo-icon-bar.c:311 ../exo/exo-icon-view.c:921
+#: ../exo/exo-icon-bar.c:311
+#: ../exo/exo-icon-view.c:921
 msgid Model column used to retrieve the text from
 msgstr Modellspalte som teksten blir henta frå
 
@@ -115,27 +118,33 @@ msgstr Aktiv
 msgid Active item index
 msgstr Aktivt element indeks
 
-#: ../exo/exo-icon-bar.c:347 ../exo/exo-icon-bar.c:348
+#: ../exo/exo-icon-bar.c:347
+#: ../exo/exo-icon-bar.c:348
 msgid Active item fill color
 msgstr Fyllfarge på aktivt element
 
-#: ../exo/exo-icon-bar.c:354 ../exo/exo-icon-bar.c:355
+#: ../exo/exo-icon-bar.c:354
+#: ../exo/exo-icon-bar.c:355
 msgid Active item bordar color
 msgstr Kantfarge på aktivt element
 
-#: ../exo/exo-icon-bar.c:361 ../exo/exo-icon-bar.c:362
+#: ../exo/exo-icon-bar.c:361
+#: ../exo/exo-icon-bar.c:362
 msgid Active item text color
 msgstr Tekstfarge på aktivt element
 
-#: ../exo/exo-icon-bar.c:368 ../exo/exo-icon-bar.c:369
+#: ../exo/exo-icon-bar.c:368
+#: ../exo/exo-icon-bar.c:369
 msgid Cursor item fill color
 msgstr Fyllfarge på peikaren
 
-#: ../exo/exo-icon-bar.c:375 ../exo/exo-icon-bar.c:376
+#: ../exo/exo-icon-bar.c:375
+#: ../exo/exo-icon-bar.c:376
 msgid Cursor item bordar color
 msgstr Kantfarge på spesielle element
 
-#: ../exo/exo-icon-bar.c:382 ../exo/exo-icon-bar.c:383
+#: ../exo/exo-icon-bar.c:382
+#: ../exo/exo-icon-bar.c:383
 msgid Cursor item text color
 msgstr Tekstfarge på peikar
 
@@ -205,7 +214,8 @@ msgid All Icons
 msgstr Alle ikon
 
 #. EXO_iCON_cHOOSER_cONTEXT_fILE
-#: ../exo/exo-icon-chooser-dialog.c:139 ../exo/exo-icon-chooser-dialog.c:285
+#: ../exo/exo-icon-chooser-dialog.c:139
+#: ../exo/exo-icon-chooser-dialog.c:285
 msgid Image Blir Filt
 msgstr Bildefiler
 
@@ -288,10 +298,8 @@ msgid The model for the icon view
 msgstr Modellen for ikonvising
 
 #: ../exo/exo-icon-view.c:777
-msgid 
-How the text and icon of each item are positioned relative to each other
-msgstr 
-Korleis tekst og ikon for kvart element er plassert i høve til kvarandre
+msgid How the text and icon of each item are positioned relative to each 
other
+msgstr Korleis tekst og ikon for kvart element er plassert i høve til 
kvarandre
 
 #: ../exo/exo-icon-view.c:809
 msgid Reorderable
@@ -325,25 +333,25 @@ msgstr Veljarmodus
 msgid The selection mode
 msgstr Veljarmodus
 
-#: ../exo/exo-icon-view.c:871 ../exo/exo-tree-view.c:154
+#: ../exo/exo-icon-view.c:871
+#: ../exo/exo-tree-view.c:154
 msgid Single Click
 msgstr Enkeltklikk
 
-#: ../exo/exo-icon-view.c:872 ../exo/exo-tree-view.c:155
+#: 

[Xfce4-commits] libxfce4ui:xfce-4.8 l10n: Added Norwegian nynorsk translation

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce-4.8
 to 912ef70bdae44660348e691e8ab260fca0723c60 (commit)
   from f8ea8e2f89006713f352dc3288ccd0b7426fdba5 (commit)

commit 912ef70bdae44660348e691e8ab260fca0723c60
Author: Eivind Ødegård ginger...@yahoo.no
Date:   Thu Jan 5 14:57:02 2012 +0100

l10n: Added Norwegian nynorsk translation

New status: 31 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/{nb.po = nn.po} |   91 +-
 1 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/po/nb.po b/po/nn.po
similarity index 61%
copy from po/nb.po
copy to po/nn.po
index 756b854..7c27a55 100644
--- a/po/nb.po
+++ b/po/nn.po
@@ -1,21 +1,21 @@
-# Norwegian bokmaal translations for libxfce4ui package.
+# Norwegian nynorsk translations for libxfce4ui package.
 # Copyright (C) 2008 THE libxfce4ui COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Terje Uriansrud te...@uriansrud.net, 2010.
+# Eivind Ødegård ginger...@yahoo.no, 2012.
 #
 msgid 
 msgstr 
 Project-Id-Version: libxfce4ui 1.4.7.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 16:03+0100\n
-PO-Revision-Date: 2009-10-18 21:21+0100\n
-Last-Translator: Terje Uriansrud te...@uriansrud.net\n
-Language-Team: Norwegian Bokmal i18n...@lister.ping.uio.no\n
-Language: nb\n
+POT-Creation-Date: 2012-01-05 08:42+\n
+Last-Translator: Eivind Ødegård meinmycell-for...@yahoo.no\n
+Language-Team: Norwegian nynorsk i18n...@lister.ping.uio.no\n
+Language: nn\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
+PO-Revision-Date: \n
 
 #: ../libxfce4ui/xfce-dialogs.c:69
 msgid Information
@@ -23,7 +23,7 @@ msgstr Informasjon
 
 #: ../libxfce4ui/xfce-dialogs.c:102
 msgid Warning
-msgstr Advarsel
+msgstr Åtvaring
 
 #: ../libxfce4ui/xfce-dialogs.c:136
 msgid Error
@@ -35,51 +35,43 @@ msgstr Spørsmål
 
 #: ../libxfce4ui/xfce-sm-client.c:1401
 msgid Session management client ID
-msgstr Klient id fra øktbehandling
+msgstr Klient-ID for økthandsaming
 
 #: ../libxfce4ui/xfce-sm-client.c:1401
 msgid ID
-msgstr Id
+msgstr ID
 
 #: ../libxfce4ui/xfce-sm-client.c:1402
 msgid Disable session management
-msgstr Slå øktbehandling av
+msgstr Slå av økthandsaming
 
 #: ../libxfce4ui/xfce-sm-client.c:1412
 msgid Session management options
-msgstr Øktbehandling innstillinger
+msgstr Val for økthandsaming
 
 #: ../libxfce4ui/xfce-sm-client.c:1413
 msgid Show session management options
-msgstr Vis øktbehandling valg
+msgstr Vis val for økthandsaming
 
 #: ../libxfce4ui/xfce-sm-client.c:1589
 #, c-format
 msgid Failed to connect to the session manager: %s
-msgstr Klarte ikke koble til øktbehandling: %s
+msgstr Greidde ikkje kopla til økthandsamaren: %s
 
 #: ../libxfce4ui/xfce-sm-client.c:1596
 #, c-format
 msgid Session manager did not return a valid client id
-msgstr Øktbehandling returnerte ikke en gyldig klient id
+msgstr Økthandsamaren gav ikkje ein gyldig klient-ID
 
 #. print warning for user
 #: ../libxfce4ui/xfce-spawn.c:407
 #, c-format
-msgid 
-Working directory \%s\ does not exist. It won't be used when spawning \%s
-\.
-msgstr 
-Arbeindsmappen \%s\ finnes ikke. Den vil ikke bli brukt ved klargjøring av 
-\%s\.
+msgid Working directory \%s\ does not exist. It won't be used when spawning 
\%s\.
+msgstr Arbeidsmappa «%s» finst ikkje. Me kjem ikkje til å bruka henne når me 
startar «%s».
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:52
-msgid 
-This shortcut is already being used for another window manager action. Which 
-action do you want to use?
-msgstr 
-Denne snarveien benyttes allerede for en annen aksjon i vindusbehandleren. 
-Hvilken aksjon ønsker du å bruke?
+msgid This shortcut is already being used for another window manager action. 
Which action do you want to use?
+msgstr Denne snarvegen er alt oppteken av ei anna vindaugshandterar-handling. 
Kva handling vil du bruka?
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:53
 #: ../libxfce4kbd-private/xfce-shortcuts.c:56
@@ -87,61 +79,53 @@ msgstr 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:62
 #, c-format
 msgid Use '%s'
-msgstr Bruk '%s'
+msgstr Bruk «%s»
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:53
 msgid Keep the other one
-msgstr Behold den andre
+msgstr Behald den andre
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:55
 #: ../libxfce4kbd-private/xfce-shortcuts.c:58
 #, c-format
-msgid 
-This shortcut is already being used for the command '%s'. Which action do 
-you want to use?
-msgstr 
-Denne svarveien benyttes allerede for kommandoen '%s'. Hvilken aksjon ønsker 
-du å bruke?
+msgid This shortcut is already being used for the command '%s'. Which action 
do you want to use?
+msgstr Denne snarvegen er alt oppteken av kommandoen «%s». Kva kommando vil 
du bruka?
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:56
 #: 

[Xfce4-commits] garcon:master l10n: Added Norwegian nynorsk translation

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to edabf9e94eeb0f4cf3b745a02a7b69b456036712 (commit)
   from b748e9ed9bda195409937e98e284e2d420f1526d (commit)

commit edabf9e94eeb0f4cf3b745a02a7b69b456036712
Author: Eivind Ødegård ginger...@yahoo.no
Date:   Thu Jan 5 15:10:03 2012 +0100

l10n: Added Norwegian nynorsk translation

New status: 27 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/{nb.po = nn.po} |   75 +++
 1 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/po/nb.po b/po/nn.po
similarity index 63%
copy from po/nb.po
copy to po/nn.po
index 8f15164..854e05d 100644
--- a/po/nb.po
+++ b/po/nn.po
@@ -1,17 +1,17 @@
-# Norwegian Bokmal translations for garcon.
+# Norwegian nynorsk translations for garcon.
 # Copyright (c) 2007 The Xfce development team.
 # This file is distributed under the same license as the garcon package.
-# Terje Uriansrud te...@uriansrud.net, 2010.
+# Eivind Ødegård ginger...@yahoo.no, 2012.
 #
 msgid 
 msgstr 
 Project-Id-Version: garcon x.y.z\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-01-16 14:36+0100\n
-PO-Revision-Date: 2009-08-15 19:29+0100\n
-Last-Translator: Terje Uriansrud te...@uriansrud.net\n
-Language-Team: Norwegian Bokmal i18n...@lister.ping.uio.no\n
-Language: nb\n
+POT-Creation-Date: 2012-01-05 08:30+\n
+PO-Revision-Date: 2012-01-05 15:05+0100\n
+Last-Translator: Eivind Ødegård meinmycell-for...@yahoo.no\n
+Language-Team: Norwegian nynorsk i18n...@lister.ping.uio.no\n
+Language: nn\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
@@ -19,11 +19,11 @@ msgstr 
 
 #: ../data/xfce/xfce-accessories.directory.in.h:1
 msgid Accessories
-msgstr Tilbehør
+msgstr Ymse
 
 #: ../data/xfce/xfce-accessories.directory.in.h:2
 msgid Common desktop tools and applications
-msgstr Standard skrivebordsværktøy og applikasjoner
+msgstr Vanlege program og verktøy for skrivebordet
 
 #: ../data/xfce/xfce-development.directory.in.h:1
 msgid Development
@@ -31,23 +31,23 @@ msgstr Utvikling
 
 #: ../data/xfce/xfce-development.directory.in.h:2
 msgid Software development tools
-msgstr Utviklingsverktøy
+msgstr Program for å utvikla programvare
 
 #: ../data/xfce/xfce-education.directory.in.h:1
 msgid Education
-msgstr Utdannelse
+msgstr Læring
 
 #: ../data/xfce/xfce-education.directory.in.h:2
 msgid Educational software
-msgstr Programvare innen utdannelse
+msgstr Program for læring og utdanning
 
 #: ../data/xfce/xfce-games.directory.in.h:1
 msgid Games
-msgstr Spill
+msgstr Spel
 
 #: ../data/xfce/xfce-games.directory.in.h:2
 msgid Games, puzzles, and other fun software
-msgstr Spill, puslespill og underholdende programvare
+msgstr Spel, pusleri og anna moro
 
 #: ../data/xfce/xfce-graphics.directory.in.h:1
 msgid Graphics
@@ -55,23 +55,23 @@ msgstr Grafikk
 
 #: ../data/xfce/xfce-graphics.directory.in.h:2
 msgid Graphics creation and manipulation applications
-msgstr Applikasjoner for grafisk behandling
+msgstr Program for å laga og endra grafikk og bilete
 
 #: ../data/xfce/xfce-multimedia.directory.in.h:1
 msgid Audio and video players and editors
-msgstr Applikasjoner for lyd of bilde
+msgstr Program for å spela og endra lyd og video
 
 #: ../data/xfce/xfce-multimedia.directory.in.h:2
 msgid Multimedia
 msgstr Multimedia
 
 #: ../data/xfce/xfce-network.directory.in.h:1
-msgid Network
-msgstr Nettverk
+msgid Applications for Internet access
+msgstr Program for internettoppgåver
 
 #: ../data/xfce/xfce-network.directory.in.h:2
-msgid Network applications and utilities
-msgstr Nettverksapplikasjoner og verktøy
+msgid Internet
+msgstr Internett
 
 #: ../data/xfce/xfce-office.directory.in.h:1
 msgid Office
@@ -79,39 +79,31 @@ msgstr Kontor
 
 #: ../data/xfce/xfce-office.directory.in.h:2
 msgid Office and productivity applications
-msgstr Kontor og produktivitetsapplikasjoner
+msgstr Program for å skriva og løysa kontoroppgåver
 
 #: ../data/xfce/xfce-other.directory.in.h:1
 msgid Applications that don't fit into other categories
-msgstr Applikasjoner som ikke passer i andre kategorier
+msgstr Program som ikkje høyrer innunder andre kategoriar
 
 #: ../data/xfce/xfce-other.directory.in.h:2
 msgid Other
-msgstr Diverse
-
-#: ../data/xfce/xfce-science.directory.in.h:1
-msgid Science
-msgstr Vitenskap
-
-#: ../data/xfce/xfce-science.directory.in.h:2
-msgid Scientific software
-msgstr Vitenskaplige programvare
+msgstr Andre
 
 #: ../data/xfce/xfce-screensavers.directory.in.h:1
 msgid Screensaver applets
-msgstr Skjermsparerprogrammer
+msgstr Skjermspararprogram
 
 #: ../data/xfce/xfce-screensavers.directory.in.h:2
 msgid Screensavers
-msgstr Skjermsparere
+msgstr Skjermspararar
 
 #: ../data/xfce/xfce-settings.directory.in.h:1
 msgid Desktop and system settings applications
-msgstr Skrivebords og systeminnstillinger
+msgstr Innstillingar for skrivebordet og systemet
 
 #: 

[Xfce4-commits] xfce4-panel:master l10n: Updated Danish (da) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to ebc59cd34977ba6000175d0f52220bda3b0a1f34 (commit)
   from 47193427a25676fd1498a74a974f46bef00578f1 (commit)

commit ebc59cd34977ba6000175d0f52220bda3b0a1f34
Author: Per Kongstad p_kongs...@op.pl
Date:   Thu Jan 5 18:19:33 2012 +0100

l10n: Updated Danish (da) translation to 100%

New status: 384 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/da.po |  410 +-
 1 files changed, 217 insertions(+), 193 deletions(-)

diff --git a/po/da.po b/po/da.po
index ef15a1e..da07153 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-panel 4.7.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-11-11 05:08+\n
+POT-Creation-Date: 2012-01-05 11:36+\n
 PO-Revision-Date: 2010-06-14 11:44+0100\n
 Last-Translator: Per Kongstad p_kongs...@op.pl\n
 Language-Team: Danish da...@dansk-gruppen.dk\n
@@ -37,7 +37,7 @@ msgid Customize the panel
 msgstr Tilpas panelet
 
 #: ../panel-preferences.desktop.in.h:2
-#: ../panel/panel-preferences-dialog.glade.h:26 ../panel/panel-window.c:2275
+#: ../panel/panel-preferences-dialog.glade.h:29 ../panel/panel-window.c:2327
 #: ../migrate/main.c:117
 msgid Panel
 msgstr Panel
@@ -64,78 +64,78 @@ msgid Failed to open the documentation browser
 msgstr Kunne ikke åbne dokumentationsbrowseren
 
 #. I18N: %s is the name of the plugin
-#: ../libxfce4panel/xfce-panel-plugin.c:919
-#: ../panel/panel-preferences-dialog.c:1056
+#: ../libxfce4panel/xfce-panel-plugin.c:1037
+#: ../panel/panel-preferences-dialog.c:1078
 #, c-format
 msgid Are you sure that you want to remove \%s\?
 msgstr Er du sikker på at du vil fjerne \%s\?
 
-#: ../libxfce4panel/xfce-panel-plugin.c:924
-#: ../panel/panel-preferences-dialog.c:1059
+#: ../libxfce4panel/xfce-panel-plugin.c:1042
+#: ../panel/panel-preferences-dialog.c:1081
 msgid If you remove the item from the panel, it is permanently lost.
 msgstr Hvis du fjerner elementet fra panelet vil det være tabt.
 
 #. move item
-#: ../libxfce4panel/xfce-panel-plugin.c:1084
+#: ../libxfce4panel/xfce-panel-plugin.c:1202
 msgid _Move
 msgstr _Flyt
 
-#: ../libxfce4panel/xfce-panel-plugin.c:1118
+#: ../libxfce4panel/xfce-panel-plugin.c:1236
 msgid Pane_l
 msgstr Pane_l
 
 #. add new items
-#: ../libxfce4panel/xfce-panel-plugin.c:1126 ../panel/panel-window.c:2287
+#: ../libxfce4panel/xfce-panel-plugin.c:1244 ../panel/panel-window.c:2339
 msgid Add _New Items...
 msgstr Tilføj _nye elementer...
 
 #. customize panel
-#: ../libxfce4panel/xfce-panel-plugin.c:1137 ../panel/panel-window.c:2298
+#: ../libxfce4panel/xfce-panel-plugin.c:1255 ../panel/panel-window.c:2350
 msgid Panel Pr_eferences...
 msgstr Paneli_ndstillinger...
 
 #. logout item
-#: ../libxfce4panel/xfce-panel-plugin.c:1154 ../panel/panel-window.c:2314
+#: ../libxfce4panel/xfce-panel-plugin.c:1272 ../panel/panel-window.c:2366
 msgid Log _Out
 msgstr _Logud
 
-#: ../panel/main.c:79
+#: ../panel/main.c:78
 msgid Show the 'Panel Preferences' dialog
 msgstr Vis dialogen 'Panelindstillinger'
 
-#: ../panel/main.c:79 ../panel/main.c:80
+#: ../panel/main.c:78 ../panel/main.c:79
 msgid PANEL-NUMBER
 msgstr PANELNUMMER
 
-#: ../panel/main.c:80
+#: ../panel/main.c:79
 msgid Show the 'Add New Items' dialog
 msgstr Vis dialogen 'Tilføj nye elementer'
 
-#: ../panel/main.c:81
+#: ../panel/main.c:80
 msgid Save the panel configuration
 msgstr Gem indstilling til panelet
 
-#: ../panel/main.c:82
+#: ../panel/main.c:81
 msgid Add a new plugin to the panel
 msgstr Tilføj et nyt udvidelsesmodul til panelet
 
-#: ../panel/main.c:82
+#: ../panel/main.c:81
 msgid PLUGIN-NAME
 msgstr UDVIDELSESMODULNAVN
 
-#: ../panel/main.c:83
+#: ../panel/main.c:82
 msgid Restart the running panel instance
 msgstr Genstart den kørende panelinstans
 
-#: ../panel/main.c:84
+#: ../panel/main.c:83
 msgid Quit the running panel instance
 msgstr Afslut den kørende panelinstans
 
-#: ../panel/main.c:85
+#: ../panel/main.c:84
 msgid Do not wait for a window manager on startup
 msgstr Vent ikke på vindueshåndtering ved opstart
 
-#: ../panel/main.c:86
+#: ../panel/main.c:85
 #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:33
 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:33
 #: ../plugins/windowmenu/xfce4-popup-windowmenu.sh:33
@@ -143,62 +143,62 @@ msgid Print version information and exit
 msgstr Udskriv versionsinformation og afslut
 
 #. parse context options
-#: ../panel/main.c:250
+#: ../panel/main.c:232
 msgid [ARGUMENTS...]
 msgstr [ARGUMENTER...]
 
-#: ../panel/main.c:257
+#: ../panel/main.c:239
 #, c-format
 msgid Type \%s --help\ for usage.
 msgstr Tast \%s --help\ for brugervejledning.
 
-#: ../panel/main.c:276
+#: ../panel/main.c:258
 msgid The Xfce development team. All rights reserved.
 msgstr Xfce udviklingsholdet. Alle rettigheder forbeholdes.
 
-#: ../panel/main.c:277
+#: 

[Xfce4-commits] orage:master l10n: Updated Danish (da) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to 41bc7cf7bcf59c9d96cb042d583052138def83ee (commit)
   from 225d77101abaade964d44715dd301ccc0927966a (commit)

commit 41bc7cf7bcf59c9d96cb042d583052138def83ee
Author: Per Kongstad p_kongs...@op.pl
Date:   Thu Jan 5 18:21:46 2012 +0100

l10n: Updated Danish (da) translation to 100%

New status: 801 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/da.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/da.po b/po/da.po
index 4d963e6..943cf17 100644
--- a/po/da.po
+++ b/po/da.po
@@ -520,7 +520,7 @@ msgstr Orage-urindstillinger
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:627
 msgid %A %d %B %Y/%V
 msgstr %A %d %B %Y/%V
@@ -1780,7 +1780,7 @@ msgid Never
 msgstr Aldrig
 
 #: ../src/mainbox.c:453
-#, fuzzy, c-format
+#, c-format
 msgid 
 Title: %s\n
  Location: %s\n
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:xfce-4.8 l10n: Updated Danish (da) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce-4.8
 to f36442b84ae0a8c81fe4c904c9a18ed2c15b2c10 (commit)
   from ea669129932676b79fc936f4fbc6225593c8bb2f (commit)

commit f36442b84ae0a8c81fe4c904c9a18ed2c15b2c10
Author: Per Kongstad p_kongs...@op.pl
Date:   Thu Jan 5 18:20:52 2012 +0100

l10n: Updated Danish (da) translation to 100%

New status: 347 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/da.po |  342 +++--
 1 files changed, 219 insertions(+), 123 deletions(-)

diff --git a/po/da.po b/po/da.po
index e41be55..ef367e8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-panel 4.7.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-02-08 17:10+\n
+POT-Creation-Date: 2012-01-05 11:39+\n
 PO-Revision-Date: 2010-06-14 11:44+0100\n
 Last-Translator: Per Kongstad p_kongs...@op.pl\n
 Language-Team: Danish da...@dansk-gruppen.dk\n
@@ -22,8 +22,11 @@ msgstr 
 X-Poedit-Country: DENMARK\n
 
 #: ../panel-desktop-handler.desktop.in.h:1
-msgid Add a new launcher to the panel based on the information of this 
desktop file
-msgstr Føj en ny opstarter til panelet baseret på informationen fra denne 
skrivebordsfil
+msgid 
+Add a new launcher to the panel based on the information of this desktop file
+msgstr 
+Føj en ny opstarter til panelet baseret på informationen fra denne 
+skrivebordsfil
 
 #: ../panel-desktop-handler.desktop.in.h:2
 msgid Create Launcher on the panel
@@ -34,25 +37,29 @@ msgid Customize the panel
 msgstr Tilpas panelet
 
 #: ../panel-preferences.desktop.in.h:2
-#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2247
+#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2263
 #: ../migrate/main.c:84
 msgid Panel
 msgstr Panel
 
-#: ../common/panel-utils.c:155
+#: ../common/panel-utils.c:157
 msgid _Read Online
 msgstr _Læs på internet
 
-#: ../common/panel-utils.c:156
-msgid You can read the user manual online. This manual may however not 
exactly match your panel version.
-msgstr Du kan læse brugermanualen på internettet. Den manual kan være ikke 
helt i overenstemmelse med din panelversion.
-
 #: ../common/panel-utils.c:158
+msgid 
+You can read the user manual online. This manual may however not exactly 
+match your panel version.
+msgstr 
+Du kan læse brugermanualen på internettet. Den manual kan være ikke helt i 
+overenstemmelse med din panelversion.
+
+#: ../common/panel-utils.c:160
 msgid The user manual is not installed on your computer
 msgstr Brugermanualen er ikke installeret på din computer
 
 #. 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 Kunne ikke åbne dokumentationsbrowseren
 
@@ -78,53 +85,57 @@ msgid Pane_l
 msgstr Pane_l
 
 #. add new items
-#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2259
+#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2275
 msgid Add _New Items...
 msgstr Tilføj _nye elementer...
 
 #. customize panel
-#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2270
+#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2286
 msgid Panel Pr_eferences...
 msgstr Paneli_ndstillinger...
 
 #. logout item
-#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2286
+#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2302
 msgid Log _Out
 msgstr _Logud
 
-#: ../panel/main.c:78
+#: ../panel/main.c:79
 msgid Show the 'Panel Preferences' dialog
 msgstr Vis dialogen 'Panelindstillinger'
 
-#: ../panel/main.c:78 ../panel/main.c:79
+#: ../panel/main.c:79 ../panel/main.c:80
 msgid PANEL-NUMBER
 msgstr PANELNUMMER
 
-#: ../panel/main.c:79
+#: ../panel/main.c:80
 msgid Show the 'Add New Items' dialog
 msgstr Vis dialogen 'Tilføj nye elementer'
 
-#: ../panel/main.c:80
+#: ../panel/main.c:81
 msgid Save the panel configuration
 msgstr Gem indstilling til panelet
 
-#: ../panel/main.c:81
+#: ../panel/main.c:82
 msgid Add a new plugin to the panel
 msgstr Tilføj et nyt udvidelsesmodul til panelet
 
-#: ../panel/main.c:81
+#: ../panel/main.c:82
 msgid PLUGIN-NAME
 msgstr UDVIDELSESMODULNAVN
 
-#: ../panel/main.c:82
+#: ../panel/main.c:83
 msgid Restart the running panel instance
 msgstr Genstart den kørende panelinstans
 
-#: ../panel/main.c:83
+#: ../panel/main.c:84
 msgid Quit the running panel instance
 msgstr Afslut den kørende panelinstans
 
-#: ../panel/main.c:84
+#: ../panel/main.c:85
+msgid Do not wait for a window manager on startup
+msgstr Undlad at vente for vindueshåndtering under opstart
+
+#: ../panel/main.c:86
 #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:33
 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:33
 #: ../plugins/windowmenu/xfce4-popup-windowmenu.sh:33
@@ -132,95 +143,110 @@ msgid Print 

[Xfce4-commits] xfce4-genmon-plugin:master l10n: Updated Danish (da) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to d8543af5fad179bb88d26432310b324cb7ed16b5 (commit)
   from d985a0e0061cf3b29b2e4cc84b48afca5c2b4971 (commit)

commit d8543af5fad179bb88d26432310b324cb7ed16b5
Author: Per Kongstad p_kongs...@op.pl
Date:   Thu Jan 5 18:22:19 2012 +0100

l10n: Updated Danish (da) translation to 100%

New status: 19 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/da.po |   19 +++
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/po/da.po b/po/da.po
index efff897..962f2c0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,13 +8,14 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-genmon-plugin 3.2\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-03-02 05:06+\n
+POT-Creation-Date: 2012-01-05 17:09+\n
 PO-Revision-Date: 2008-10-05 21:36+0100\n
 Last-Translator: Claus Futtrup cfutt...@stofanet.dk\n
 Language-Team: Danish da...@dansk-gruppen.dk\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: da\n
 
 #: ../panel-plugin/cmdspawn.c:174
 #, c-format
@@ -29,7 +30,7 @@ msgstr Panelet til Xfce
 msgid About...
 msgstr Om...
 
-#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:677
+#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:670
 #: ../panel-plugin/genmon.desktop.in.in.h:1
 msgid Generic Monitor
 msgstr Generisk overvågning
@@ -79,29 +80,31 @@ msgstr (Standardskrifttype)
 msgid Could not run \%s\
 msgstr Kunne ikke køre \%s\
 
-#: ../panel-plugin/main.c:602
+#: ../panel-plugin/main.c:595
 #, c-format
 msgid 
 %s %s - Generic Monitor\n
-Cyclically spawns a script/program, captures its output and displays the 
resulting string in the panel\n
+Cyclically spawns a script/program, captures its output and displays the 
+resulting string in the panel\n
 \n
 (c) 2004 Roger Seguin roger_seg...@msn.com\n
 (c) 2006 Julien Devemy jujuc...@gmail.com
 msgstr 
 %s %s - Generisk overvågning\n
-Cyklisk kørsel af skript/program, fanger dets uddata og viser den 
resulterende streng i panelet\n
+Cyklisk kørsel af skript/program, fanger dets uddata og viser den 
+resulterende streng i panelet\n
 \n
 (c) 2004 Roger Seguin roger_seg...@msn.com\n
 (c) 2006 Julien Devemy jujuc...@gmail.com
 
-#: ../panel-plugin/main.c:620
+#: ../panel-plugin/main.c:613
 msgid Font Selection
 msgstr Vælg skrifttype
 
-#: ../panel-plugin/main.c:665
+#: ../panel-plugin/main.c:658
 msgid Configuration
 msgstr Konfiguration
 
 #: ../panel-plugin/genmon.desktop.in.in.h:2
-msgid Show output of a command. 
+msgid Show output of a command.
 msgstr Vis resultat af en kommando.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-settings:master Improve numlock state saving.

2012-01-05 Thread Nick Schermer
Updating branch refs/heads/master
 to fabc8dfa6f286efcd988df401ef740362335bfcb (commit)
   from cdcaee8e5738e8ddf1268751836765157fe1e8df (commit)

commit fabc8dfa6f286efcd988df401ef740362335bfcb
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 5 20:11:08 2012 +0100

Improve numlock state saving.

- Add a property /Default/RestoreNumlock to enable or disable
  numlock restoring.
- Don't set a value if it does not exist.
- Add error traps around the x11 code.

 xfsettingsd/keyboards.c |   32 +---
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/xfsettingsd/keyboards.c b/xfsettingsd/keyboards.c
index 0512513..976e2ba 100644
--- a/xfsettingsd/keyboards.c
+++ b/xfsettingsd/keyboards.c
@@ -73,7 +73,7 @@ struct _XfceKeyboardsHelper
 
 
 
-G_DEFINE_TYPE (XfceKeyboardsHelper, xfce_keyboards_helper, G_TYPE_OBJECT);
+G_DEFINE_TYPE (XfceKeyboardsHelper, xfce_keyboards_helper, G_TYPE_OBJECT)
 
 
 
@@ -227,14 +227,26 @@ xfce_keyboards_helper_restore_numlock_state 
(XfconfChannel *channel)
 Display  *dpy;
 gboolean  state;
 
-dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-state = xfconf_channel_get_bool (channel, /Default/Numlock, FALSE);
+if (xfconf_channel_has_property (channel, /Default/Numlock)
+ xfconf_channel_get_bool (channel, /Default/RestoreNumlock, TRUE))
+{
+state = xfconf_channel_get_bool (channel, /Default/Numlock, FALSE);
 
-numlock_mask = XkbKeysymToModifiers (dpy, XK_Num_Lock);
+gdk_error_trap_push ();
 
-XkbLockModifiers (dpy, XkbUseCoreKbd, numlock_mask, state ? numlock_mask : 
0);
+dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+numlock_mask = XkbKeysymToModifiers (dpy, XK_Num_Lock);
+XkbLockModifiers (dpy, XkbUseCoreKbd, numlock_mask, state ? 
numlock_mask : 0);
 
-xfsettings_dbg (XFSD_DEBUG_KEYBOARDS, set numlock %s, state ? on : 
off);
+if (gdk_error_trap_pop () != 0)
+g_critical (Failed to change numlock modifier);
+
+xfsettings_dbg (XFSD_DEBUG_KEYBOARDS, set numlock %s, state ? on : 
off);
+}
+else
+{
+xfsettings_dbg (XFSD_DEBUG_KEYBOARDS, don't set numlock);
+}
 }
 
 
@@ -246,10 +258,16 @@ xfce_keyboards_helper_save_numlock_state (XfconfChannel 
*channel)
 Bool numlock_state;
 Atom numlock;
 
+gdk_error_trap_push ();
+
 dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 numlock = XInternAtom(dpy, Num Lock, False);
-
 XkbGetNamedIndicator (dpy, numlock, NULL, numlock_state, NULL, NULL);
 
+if (gdk_error_trap_pop () != 0)
+g_critical (Failed to get numlock state);
+
+xfsettings_dbg (XFSD_DEBUG_KEYBOARDS, save numlock %s, numlock_state ? 
on : off);
+
 xfconf_channel_set_bool (channel, /Default/Numlock, numlock_state);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfwm4:master l10n: Updated German (de) translation to 1%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to 1d15f5307bff5a4c0e7c885b16c7156549c0d0c7 (commit)
   from 0df071bddedfd41b3d896f899d04c3c220a43eca (commit)

commit 1d15f5307bff5a4c0e7c885b16c7156549c0d0c7
Author: Chris Leick c.le...@vollbio.de
Date:   Thu Jan 5 21:27:49 2012 +0100

l10n: Updated German (de) translation to 1%

New status: 2 messages complete with 71 fuzzies and 126 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 doc/manual/po/de.po |   24 +++-
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/manual/po/de.po b/doc/manual/po/de.po
index cd06333..78504e9 100644
--- a/doc/manual/po/de.po
+++ b/doc/manual/po/de.po
@@ -399,11 +399,12 @@ msgstr Xftaskbar4
 #: ./xfwm4.xml295(para)
 #, fuzzy
 msgid the list of windows, accessible with a middle-click on the desktop 
background. This list shows all opened windows, classified by workspaces. 
Windows that are currently hidden are marked between [ ].
-msgstr Die Liste der Fenster, auf die mit einem Mittelklick auf den 
Arbeitsflächenhintergrund zugegriffen werden kann. Diese Liste zeigt alle 
offenen Fenster, geordnet nach Arbeitsflächen. Fenster, die derzeit verborgen 
sind, werden markiert, indem sie in Klammern [] gesetzt werden. 
+msgstr die Liste der Fenster, auf die mit einem Mittelklick auf den 
Arbeitsflächenhintergrund zugegriffen werden kann. Diese Liste zeigt alle 
offenen Fenster, geordnet nach Arbeitsflächen. Fenster, die derzeit verborgen 
sind, werden markiert, indem sie in Klammern [] gesetzt werden. 
 
 #: ./xfwm4.xml299(para)
+#, fuzzy
 msgid the applicationxfce4-iconbox/application
-msgstr 
+msgstr die applicationXfce4-Iconbox/application
 
 #: ./xfwm4.xml305(term)
 msgid Shade / unshade windows
@@ -422,12 +423,14 @@ msgid open the window menu from the title bar and choose 
\Shade\ or \Unshade
 msgstr 
 
 #: ./xfwm4.xml314(para)
+#, fuzzy
 msgid use the mouse scrollwheel while you hold the pointer over the title bar
-msgstr 
+msgstr Benutzen Sie das Mausrad, während sie den Zeiger über die Titelleiste 
halten.
 
 #: ./xfwm4.xml316(para)
+#, fuzzy
 msgid use the Alt + F9 keyboard shortcut
-msgstr 
+msgstr Benutzen Sie das Tastaturkürzel »Alt« + »F9«.
 
 #: ./xfwm4.xml322(term)
 msgid Stick / unstick windows
@@ -447,7 +450,7 @@ msgstr 
 
 #: ./xfwm4.xml332(para)
 msgid use the Alt + F10 keyboard shortcut
-msgstr 
+msgstr Benutzen Sie das Tastaturkürzel »Alt«+»F10«.
 
 #: ./xfwm4.xml338(term)
 msgid Raise / lower windows
@@ -542,8 +545,9 @@ msgid Alt + Control + End will move a window to the next 
workspace
 msgstr 
 
 #: ./xfwm4.xml409(para)
+#, fuzzy
 msgid Alt + Control + Home will move a window to the previous workspace
-msgstr 
+msgstr »Alt« + »Strg« + »Pos1« wird ein Fenster auf die vorherige 
Arbeitsfläche verschieben.
 
 #: ./xfwm4.xml411(para)
 msgid Alt + Control + Keypad-Number will move the current window to 
corresponding workspace
@@ -567,15 +571,17 @@ msgstr 
 
 #: ./xfwm4.xml430(para)
 msgid Open the window menu from the title bar and choose the \Close\ item
-msgstr 
+msgstr Öffnen Sie das Fenstermenü der Titlelleiste und wählen Sie das Element 
»Schließen«
 
 #: ./xfwm4.xml432(para)
+#, fuzzy
 msgid or use Alt + F4 keyboard shortcut
-msgstr 
+msgstr oder benutzen Sie das Tastaturkürzel »Alt«+»F4«.
 
 #: ./xfwm4.xml443(title)
+#, fuzzy
 msgid Customizing application@PACKAGE_NAME@/application
-msgstr 
+msgstr application@PACKAGE_NAME@/application anpassen
 
 #: ./xfwm4.xml445(para)
 msgid To open the Window Manager preferences dialog, click the button 
labelled \Window Manager\ in the ulink 
url=\xfce-mcs-manager.html#manager-dialog\ type=\http\Xfce 4 Settings 
manager/ulink. The dialog shows four tabs : Style, Keyboard, Focus, Advanced. 
All modifications will have an immediate effect on the behaviour of the 
selected module.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfwm4:master l10n: Updated German (de) translation to 0%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to e3002b684bbb0712f9ad48ef77448b5b85cc2b7f (commit)
   from 1d15f5307bff5a4c0e7c885b16c7156549c0d0c7 (commit)

commit e3002b684bbb0712f9ad48ef77448b5b85cc2b7f
Author: Chris Leick c.le...@vollbio.de
Date:   Thu Jan 5 21:28:35 2012 +0100

l10n: Updated German (de) translation to 0%

New status: 0 messages complete with 73 fuzzies and 126 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 doc/manual/po/de.po |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/doc/manual/po/de.po b/doc/manual/po/de.po
index 78504e9..4f70391 100644
--- a/doc/manual/po/de.po
+++ b/doc/manual/po/de.po
@@ -449,6 +449,7 @@ msgid open the window menu button from the title bar and 
choose \Stick\ or \
 msgstr 
 
 #: ./xfwm4.xml332(para)
+#, fuzzy
 msgid use the Alt + F10 keyboard shortcut
 msgstr Benutzen Sie das Tastaturkürzel »Alt«+»F10«.
 
@@ -570,6 +571,7 @@ msgid click the close button of the title bar
 msgstr 
 
 #: ./xfwm4.xml430(para)
+#, fuzzy
 msgid Open the window menu from the title bar and choose the \Close\ item
 msgstr Öffnen Sie das Fenstermenü der Titlelleiste und wählen Sie das Element 
»Schließen«
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] wiki:master Add recent button.

2012-01-05 Thread Nick Schermer
Updating branch refs/heads/master
 to 1573b0f2fe016dfaa47f6bffa3d5f4854798f206 (commit)
   from e9b8817f54a68a1fef6901195e0047ab240fd300 (commit)

commit 1573b0f2fe016dfaa47f6bffa3d5f4854798f206
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 5 21:40:04 2012 +0100

Add recent button.

 lib/tpl/docs/footer.html |   41 -
 lib/tpl/docs/main.php|1 +
 2 files changed, 1 insertions(+), 41 deletions(-)

diff --git a/lib/tpl/docs/footer.html b/lib/tpl/docs/footer.html
deleted file mode 100644
index 38aab72..000
--- a/lib/tpl/docs/footer.html
+++ /dev/null
@@ -1,41 +0,0 @@
-?php
-/**
- * Example footer include
- *
- * This file shows you how to use the include hooks. However I recommend to
- * create your own complete new template instead.
- */
-
-$tgt = ($conf['target']['extern']) ? 'target='.$conf['target']['extern'].'' 
: '';
-?
-
-div class=footerinc
-
-  a ?php echo $tgt? href=?php echo DOKU_BASE; ?feed.php title=Recent 
changes RSS feedimg src=?php echo DOKU_TPL; ?images/button-rss.png 
width=80 height=15 alt=Recent changes RSS feed //a
-
-  ?php
-$lic = license_img('button');
-if($lic){
-  ?
-  a ?php echo $tgt? href=?php echo 
$license[$conf['license']]['url']? rel=license title=?php echo 
$license[$conf['license']]['name']?img src=?php echo DOKU_BASE.$lic ? 
width=80 height=15 alt= //a
-  ?php } ?
-
-  a ?php echo $tgt? href=http://www.dokuwiki.org/donate; 
title=Donateimg src=?php echo DOKU_TPL; ?images/button-donate.gif 
alt=Donate width=80 height=15 //a
-
-  a ?php echo $tgt? href=http://www.php.net; title=Powered by PHPimg 
src=?php echo DOKU_TPL; ?images/button-php.gif width=80 height=15 
alt=Powered by PHP //a
-
-  a ?php echo $tgt? href=http://validator.w3.org/check/referer; 
title=Valid XHTML 1.0img src=?php echo DOKU_TPL; 
?images/button-xhtml.png width=80 height=15 alt=Valid XHTML 1.0 //a
-
-  a ?php echo $tgt? 
href=http://jigsaw.w3.org/css-validator/check/referer?profile=css3; 
title=Valid CSSimg src=?php echo DOKU_TPL; ?images/button-css.png 
width=80 height=15 alt=Valid CSS //a
-
-  a ?php echo $tgt? href=http://dokuwiki.org/; title=Driven by 
DokuWikiimg src=?php echo DOKU_TPL; ?images/button-dw.png width=80 
height=15 alt=Driven by DokuWiki //a
-
-?php
-if ($conf['allowdebug']) {
-echo '!-- page made in '.round(delta_time(DOKU_START_TIME), 3).' seconds 
--';
-}
-?
-
-
-/div
-?php include(dirname(__FILE__).'/dwtb.html') ?
diff --git a/lib/tpl/docs/main.php b/lib/tpl/docs/main.php
index 0571cda..e61ae3e 100644
--- a/lib/tpl/docs/main.php
+++ b/lib/tpl/docs/main.php
@@ -133,6 +133,7 @@ if (!defined('DOKU_INC')) die();
   ?php tpl_button('edit')?
   ?php tpl_button('history')?
   ?php tpl_button('revert')?
+  ?php tpl_button('recent')?
 /div
 div class=bar-right id=bar__bottomright
   ?php tpl_button('subscribe')?
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-panel:master Don't destroy window when focussed and Alt+F4 is pressed (bug #7378).

2012-01-05 Thread Nick Schermer
Updating branch refs/heads/master
 to 5d15b8be24aabc04c0dcbedcd3a117c3b13bb925 (commit)
   from ebc59cd34977ba6000175d0f52220bda3b0a1f34 (commit)

commit 5d15b8be24aabc04c0dcbedcd3a117c3b13bb925
Author: Nick Schermer n...@xfce.org
Date:   Thu Jan 5 21:48:24 2012 +0100

Don't destroy window when focussed and Alt+F4 is pressed (bug #7378).

 panel/panel-window.c |   13 +
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index d84189a..1852ad5 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -83,6 +83,8 @@ static void panel_window_set_property   
(GObject  *o
 static void panel_window_finalize   (GObject  
*object);
 static gboolean panel_window_expose_event   (GtkWidget
*widget,
  GdkEventExpose   
*event);
+static gboolean panel_window_delete_event   (GtkWidget
*widget,
+ GdkEventAny  
*event);
 static gboolean panel_window_enter_notify_event (GtkWidget
*widget,
  GdkEventCrossing 
*event);
 static gboolean panel_window_leave_notify_event (GtkWidget
*widget,
@@ -331,6 +333,7 @@ panel_window_class_init (PanelWindowClass *klass)
 
   gtkwidget_class = GTK_WIDGET_CLASS (klass);
   gtkwidget_class-expose_event = panel_window_expose_event;
+  gtkwidget_class-delete_event = panel_window_delete_event;
   gtkwidget_class-enter_notify_event = panel_window_enter_notify_event;
   gtkwidget_class-leave_notify_event = panel_window_leave_notify_event;
   gtkwidget_class-drag_motion = panel_window_drag_motion;
@@ -839,6 +842,16 @@ end:
 
 
 static gboolean
+panel_window_delete_event (GtkWidget   *widget,
+   GdkEventAny *event)
+{
+  /* do not respond to alt-f4 or any other signals */
+  return TRUE;
+}
+
+
+
+static gboolean
 panel_window_enter_notify_event (GtkWidget*widget,
  GdkEventCrossing *event)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-timer-plugin:master Release 0.6.3

2012-01-05 Thread Kemal Ilgar Eroglu
Updating branch refs/heads/master
 to d81cfaf14c24c067e6646f37ccb4b59ba94950a3 (commit)
   from 7d810bb8bfaace36a238ea053fc268de5bacb7c6 (commit)

commit d81cfaf14c24c067e6646f37ccb4b59ba94950a3
Author: Kemal Ilgar Eroglu ilgar_ero...@yahoo.com
Date:   Thu Jan 5 23:34:14 2012 +0200

Release 0.6.3

 po/LINGUAS |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index f1cb3c5..000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast cs da el de en_GB es eu fr gl hu id it ja lv pl pt_BR pt ru sv tr uk ur 
ur_PK zh_CN 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-timer-plugin|xfce4-timer-plugin-0.6.3 Creating annotated tag xfce4-timer-plugin-0.6.3

2012-01-05 Thread Kemal Ilgar Eroglu
Updating annotated tag refs/tags/xfce4-timer-plugin-0.6.3
 as new annotated tag
 to b07a46ac09e9daea7b6d98e8a6915e4d0f0203f0 (tag)
   succeeds xfce4-timer-plugin-0.6.2-16-g7d810bb
  tagged by Kemal Ilgar Eroglu ilgar_ero...@yahoo.com
 on 2012-01-05 22:35 +0100

Kemal Ilgar Eroglu (1):
  Release 0.6.3

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Open all Javascript: links in same tab and adjust menu

2012-01-05 Thread Christian Dywan
Updating branch refs/heads/master
 to 20228cfdd65f11db30fd146cbde00b797afaefef (commit)
   from 618fa820771cded06f8a3ecdce083119d383abbc (commit)

commit 20228cfdd65f11db30fd146cbde00b797afaefef
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sun Dec 18 21:16:05 2011 -0400

Open all Javascript: links in same tab and adjust menu

 midori/midori-view.c |   19 +++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index c94f37a..c1ee460 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1679,6 +1679,11 @@ gtk_widget_button_press_event_cb (WebKitWebView*  
web_view,
 case 1:
 if (!link_uri)
 return FALSE;
+
+/* Always open Javascript links in current tab */
+if (g_str_has_prefix (link_uri, javascript:))
+return FALSE;
+
 if (MIDORI_MOD_NEW_TAB (event-state))
 {
 /* Open link in new tab */
@@ -1698,6 +1703,10 @@ gtk_widget_button_press_event_cb (WebKitWebView*  
web_view,
 case 2:
 if (link_uri)
 {
+/* Always open Javascript links in current tab */
+if (g_str_has_prefix (link_uri, javascript:))
+return FALSE;
+
 /* Open link in new tab */
 background = view-open_tabs_in_the_background;
 if (MIDORI_MOD_BACKGROUND (event-state))
@@ -2350,6 +2359,9 @@ midori_view_populate_popup (MidoriView* view,
 }
 if (view-link_uri)
 {
+/* No opening in tab, window or app for Javascript links */
+if (!g_str_has_prefix (view-link_uri, javascript:))
+{
 midori_view_insert_menu_item (menu_shell, -1,
 _(Open Link in New _Tab), STOCK_TAB_NEW,
 G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
@@ -2364,12 +2376,19 @@ midori_view_populate_popup (MidoriView* view,
 midori_view_insert_menu_item (menu_shell, -1,
 _(Open Link as Web A_pplication), NULL,
 G_CALLBACK (midori_web_view_menu_web_app_activate_cb), widget);
+}
+
 midori_view_insert_menu_item (menu_shell, -1,
 _(Copy Link de_stination), NULL,
 G_CALLBACK (midori_web_view_menu_link_copy_activate_cb), widget);
+
+/* No saving for Javascript links */
+if (!g_str_has_prefix (view-link_uri, javascript:))
+{
 midori_view_insert_menu_item (menu_shell, -1,
 NULL, GTK_STOCK_SAVE_AS,
 G_CALLBACK (midori_web_view_menu_save_activate_cb), widget);
+}
 }
 
 if (is_image)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Introduce midori_view_always_same_tab to include mailto

2012-01-05 Thread Christian Dywan
Updating branch refs/heads/master
 to 1bff3b12a306c3e08c49e6fa837f2aa1c01f6e23 (commit)
   from 20228cfdd65f11db30fd146cbde00b797afaefef (commit)

commit 1bff3b12a306c3e08c49e6fa837f2aa1c01f6e23
Author: Christian Dywan christ...@twotoasts.de
Date:   Fri Jan 6 01:41:05 2012 +0100

Introduce midori_view_always_same_tab to include mailto

 midori/midori-view.c |   19 +++
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index c1ee460..f65a9bd 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1622,6 +1622,13 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* 
web_view,
 g_object_set (view, statusbar-text, link_uri, NULL);
 }
 
+static gboolean
+midori_view_always_same_tab (const gchar* uri)
+{
+/* No opening in tab, window or app for Javascript or mailto links */
+return g_str_has_prefix (uri, javascript:) || midori_uri_is_email (uri);
+}
+
 static void
 midori_view_ensure_link_uri (MidoriView* view,
  gint*x,
@@ -1680,8 +1687,7 @@ gtk_widget_button_press_event_cb (WebKitWebView*  
web_view,
 if (!link_uri)
 return FALSE;
 
-/* Always open Javascript links in current tab */
-if (g_str_has_prefix (link_uri, javascript:))
+if (midori_view_always_same_tab (link_uri))
 return FALSE;
 
 if (MIDORI_MOD_NEW_TAB (event-state))
@@ -1703,8 +1709,7 @@ gtk_widget_button_press_event_cb (WebKitWebView*  
web_view,
 case 2:
 if (link_uri)
 {
-/* Always open Javascript links in current tab */
-if (g_str_has_prefix (link_uri, javascript:))
+if (midori_view_always_same_tab (link_uri))
 return FALSE;
 
 /* Open link in new tab */
@@ -2359,8 +2364,7 @@ midori_view_populate_popup (MidoriView* view,
 }
 if (view-link_uri)
 {
-/* No opening in tab, window or app for Javascript links */
-if (!g_str_has_prefix (view-link_uri, javascript:))
+if (!midori_view_always_same_tab (view-link_uri))
 {
 midori_view_insert_menu_item (menu_shell, -1,
 _(Open Link in New _Tab), STOCK_TAB_NEW,
@@ -2382,8 +2386,7 @@ midori_view_populate_popup (MidoriView* view,
 _(Copy Link de_stination), NULL,
 G_CALLBACK (midori_web_view_menu_link_copy_activate_cb), widget);
 
-/* No saving for Javascript links */
-if (!g_str_has_prefix (view-link_uri, javascript:))
+if (!midori_view_always_same_tab (view-link_uri))
 {
 midori_view_insert_menu_item (menu_shell, -1,
 NULL, GTK_STOCK_SAVE_AS,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Reduce URL copying in _midori_web_view_load_icon

2012-01-05 Thread Christian Dywan
Updating branch refs/heads/master
 to b850dd3da29ffe5fb8e17762d80ea4fb51bc0dab (commit)
   from 1bff3b12a306c3e08c49e6fa837f2aa1c01f6e23 (commit)

commit b850dd3da29ffe5fb8e17762d80ea4fb51bc0dab
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sun Dec 18 21:25:52 2011 -0400

Reduce URL copying in _midori_web_view_load_icon

 midori/midori-view.c |   17 ++---
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index f65a9bd..2463599 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -863,8 +863,7 @@ _midori_web_view_load_icon (MidoriView* view)
 
 if (midori_uri_is_http (view-icon_uri) || midori_uri_is_http (view-uri))
 {
-gchar* icon_uri = g_strdup (view-icon_uri);
-if (!icon_uri)
+if (!view-icon_uri)
 {
 guint i = 8;
 while (view-uri[i] != '\0'  view-uri[i] != '/')
@@ -872,28 +871,24 @@ _midori_web_view_load_icon (MidoriView* view)
 if (view-uri[i] == '/')
 {
 gchar* path = g_strndup (view-uri, i);
-icon_uri = g_strdup_printf (%s/favicon.ico, path);
+view-icon_uri = g_strdup_printf (%s/favicon.ico, path);
 g_free (path);
 }
 else
-icon_uri = g_strdup_printf (%s/favicon.ico, view-uri);
+view-icon_uri = g_strdup_printf (%s/favicon.ico, view-uri);
 }
 
-icon_file = katze_net_get_cached_path (NULL, icon_uri, icons);
+icon_file = katze_net_get_cached_path (NULL, view-icon_uri, icons);
 if (g_hash_table_lookup_extended (view-memory,
   icon_file, NULL, (gpointer)pixbuf))
 {
 g_free (icon_file);
 if (pixbuf)
-{
 g_object_ref (pixbuf);
-katze_assign (view-icon_uri, icon_uri);
-}
 }
 else if ((pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL)))
 {
 g_free (icon_file);
-katze_assign (view-icon_uri, icon_uri);
 }
 else if (!view-special)
 {
@@ -901,10 +896,10 @@ _midori_web_view_load_icon (MidoriView* view)
 
 priv = g_slice_new (KatzeNetIconPriv);
 priv-icon_file = icon_file;
-priv-icon_uri = icon_uri;
+priv-icon_uri = g_strdup (view-icon_uri);
 priv-view = view;
 
-katze_net_load_uri (NULL, icon_uri,
+katze_net_load_uri (NULL, priv-icon_uri,
 (KatzeNetStatusCb)katze_net_icon_status_cb,
 (KatzeNetTransferCb)katze_net_icon_transfer_cb, priv);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] midori:master Reload all rulesets instead of re-downloading one

2012-01-05 Thread Christian Dywan
Updating branch refs/heads/master
 to fe6acc509a6c02f44a797aee36a3337ec3ba3fe9 (commit)
   from b850dd3da29ffe5fb8e17762d80ea4fb51bc0dab (commit)

commit fe6acc509a6c02f44a797aee36a3337ec3ba3fe9
Author: Alexander Butenko a.bute...@gmail.com
Date:   Sun Dec 18 10:52:31 2011 -0400

Reload all rulesets instead of re-downloading one

 extensions/adblock.c |   62 +
 1 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index f817b03..3f0c29b 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -35,12 +35,12 @@
 #define adblock_debug(dmsg, darg1, darg2) /* nothing */
 #endif
 
-static GHashTable* pattern;
-static GHashTable* keys;
-static GHashTable* optslist;
-static GHashTable* urlcache;
-static GHashTable* blockcssprivate;
-static GString* blockcss;
+static GHashTable* pattern = NULL;
+static GHashTable* keys = NULL;
+static GHashTable* optslist = NULL;
+static GHashTable* urlcache = NULL;
+static GHashTable* blockcssprivate = NULL;
+static GString* blockcss = NULL;
 #ifdef G_ENABLE_DEBUG
 static guint debug;
 #endif
@@ -93,10 +93,8 @@ adblock_build_js (const gchar* uri)
 while  (cnt = 0)
 {
 g_string_prepend (subdomain, subdomains[cnt]);
-/* g_debug (checking %s, subdomain-str); */
 if ((block = g_hash_table_lookup (blockcssprivate, subdomain-str)))
 {
-/* g_debug (found); */
 g_string_append (code, block);
 g_string_append_c (code, ',');
 blockscnt++;
@@ -131,6 +129,23 @@ adblock_fixup_regexp (const gchar* prefix,
   gchar*   src);
 
 static void
+adblock_destroy_db ()
+{
+if (blockcss)
+g_string_free (blockcss, TRUE);
+blockcss = NULL;
+
+g_hash_table_destroy (pattern);
+pattern = NULL;
+g_hash_table_destroy (optslist);
+optslist = NULL;
+g_hash_table_destroy (urlcache);
+urlcache = NULL;
+g_hash_table_destroy (blockcssprivate);
+blockcssprivate = NULL;
+}
+
+static void
 adblock_init_db ()
 {
 pattern = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -159,22 +174,9 @@ adblock_download_notify_status_cb (WebKitDownload*  
download,
GParamSpec*  pspec,
MidoriExtension* extension)
 {
-gchar* path;
-MidoriApp* app;
-MidoriWebSettings* settings;
-
 if (webkit_download_get_status (download) != 
WEBKIT_DOWNLOAD_STATUS_FINISHED)
 return;
-
-path = g_filename_from_uri (webkit_download_get_destination_uri 
(download), NULL, NULL);
-adblock_parse_file (path);
-g_free (path);
-
-app = midori_extension_get_app (extension);
-settings = katze_object_get_object (app, settings);
-g_string_append (blockcss,  {display: none !important}\n);
-midori_web_settings_add_style (settings, adblock-blockcss, 
blockcss-str);
-g_object_unref (settings);
+adblock_reload_rules (extension, FALSE);
 }
 
 static gchar*
@@ -213,9 +215,9 @@ adblock_reload_rules (MidoriExtension* extension,
 MidoriApp* app = midori_extension_get_app (extension);
 MidoriWebSettings* settings = katze_object_get_object (app, settings);
 
-/* g_test_timer_start (); */
+if (pattern)
+adblock_destroy_db ();
 adblock_init_db ();
-/* g_debug (match: %f%s, g_test_timer_elapsed (), seconds); */
 
 custom_list = g_build_filename (midori_extension_get_config_dir 
(extension),
 CUSTOM_LIST_NAME, NULL);
@@ -1381,16 +1383,13 @@ adblock_parse_file (gchar* path)
 FILE* file;
 gchar line[2000];
 
-/* G_ENABLE_DEBUG g_test_timer_start (); */
 if ((file = g_fopen (path, r)))
 {
 while (fgets (line, 2000, file))
 adblock_parse_line (line);
 fclose (file);
-/* g_debug (match: %f%s %s, g_test_timer_elapsed (), seconds, 
path); */
 return TRUE;
 }
-/* g_debug (match: %f%s %s, g_test_timer_elapsed (), seconds, path); */
 return FALSE;
 }
 
@@ -1431,15 +1430,8 @@ adblock_deactivate_cb (MidoriExtension* extension,
 browser, adblock_add_tab_cb, extension);
 midori_browser_foreach (browser, (GtkCallback)adblock_deactivate_tabs, 
browser);
 
-if (blockcss)
-g_string_free (blockcss, TRUE);
-
+adblock_destroy_db ();
 midori_web_settings_remove_style (settings, adblock-blockcss);
-blockcss = NULL;
-g_hash_table_destroy (pattern);
-g_hash_table_destroy (optslist);
-g_hash_table_destroy (urlcache);
-g_hash_table_destroy (blockcssprivate);
 g_object_unref (settings);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-settings:master l10n: Updated Chinese (China) (zh_CN) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/master
 to 4bce4e83ea24316e3cd3023e230a3d415a1b1759 (commit)
   from 25b42d09611b7db1a8fa6f40c01b6dd11a22eb6a (commit)

commit 4bce4e83ea24316e3cd3023e230a3d415a1b1759
Author: Chipong Luo chipon...@yahoo.com
Date:   Fri Jan 6 04:06:20 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 100%

New status: 301 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |  200 +++---
 1 files changed, 79 insertions(+), 121 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a99e12d..f2deb3c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-12-05 12:06+\n
+POT-Creation-Date: 2012-01-06 00:30+\n
 PO-Revision-Date: 2010-11-27 21:48+0800\n
 Last-Translator: Chipong Luo chipon...@yahoo.com\n
 Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n
@@ -59,9 +59,7 @@ msgstr 两个键同时按下时禁用粘滞键(_T)
 msgid 
 If enabled, the session manager will start the required applications for 
 screen readers and magnifiers
-msgstr 
-如果启用,会话管理器会启动屏幕阅读器和放大镜
-所需的应用程序
+msgstr 如果启用,会话管理器会启动屏幕阅读器和放大镜所需的应用程序
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11
 msgid K_eystroke delay:
@@ -121,9 +119,7 @@ msgstr 以毫秒计的重复移动事件的时间
 msgid 
 The time, in milliseconds, between the initial key press and first repeated 
 motion event
-msgstr 
-以毫秒计的开始按键与第一次重复移动事件
-之间的时间
+msgstr 以毫秒计的开始按键与第一次重复移动事件之间的时间
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25
 msgid The time, in milliseconds, to get to maximum speed
@@ -133,17 +129,13 @@ msgstr 以毫秒计的到达最大速度的时间
 msgid 
 To help prevent accidental keystrokes, slow keys requires that a key is held 
 for a certain minimum amount of time before the keystroke will be accepted
-msgstr 
-为防止意外按键,慢速键需要在按住一个键
-一段最短时间之后才接受此按键
+msgstr 为防止意外按键,慢速键需要在按住一个键一段最短时间之后才接受此按键
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27
 msgid 
 To help prevent accidental multiple keystrokes, bounce keys imposes a 
 minimum delay between keystrokes
-msgstr 
-为防止意外的重复按键,反弹键强制两次按键
-之间的最短延时
+msgstr 为防止意外的重复按键,反弹键强制两次按键之间的最短延时
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28
 msgid Use _bounce keys
@@ -163,33 +155,27 @@ msgid 
 to be held down (they can be pressed and then released) when multiple keys 
 would normally need to be pressed at the same time
 msgstr 
-选中后,在多个按键通常需要同时按下时,
-转义键(比如 Ctrl、Alt 和 Shift)
-不需要一直按住(可以按住它们后再松开)。
+选中后,在多个按键通常需要同时按下时,转义键(比如 Ctrl、Alt 和 Shift)不需要一
+直按住(可以按住它们后再松开)。
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:32
 msgid 
 When selected, modifier keys (such as Control, Alt, and Shift) will remain 
 locked in the pressed state until pressed again
 msgstr 
-选中后,转义键(比如 Ctrl、Alt 和 
-Shift)会保持被按锁定状态直至下次
-再按。
+选中后,转义键(比如 Ctrl、Alt 和 Shift)会保持被按锁定状态直至下次再按。
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:33
 msgid 
 When selected, the \sticky keys\ feature will be disabled if two keys are 
 pressed simultaneously
-msgstr 
-选中后,如果同时按下两个键会禁用 “粘滞键” 
-功能
+msgstr 选中后,如果同时按下两个键会禁用 “粘滞键” 功能
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:34
 msgid 
 When selected, the mouse pointer can be controlled using the keyboard number 
 pad
-msgstr 
-选中后,可以用数字小键盘控制鼠标光标
+msgstr 选中后,可以用数字小键盘控制鼠标光标
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:35
 msgid _Acceleration delay:
@@ -282,8 +268,7 @@ msgstr 改善键盘和鼠标的辅助功能
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:1
 msgid 
 Anti-aliasing, or font smoothing, can improve the look of text on the screen
-msgstr 
-反锯齿或平滑字体会改善屏幕上文本的外观
+msgstr 反锯齿或平滑字体会改善屏幕上文本的外观
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:2
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:1
@@ -334,9 +319,7 @@ msgstr 启用输入回声(_N)
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:13
 msgid Enable or disable event sounds globally (requires \Canberra\ support)
-msgstr 
-全局启用或禁用事件声音
-(需要 “Canberra” 支持)
+msgstr 全局启用或禁用事件声音(需要 “Canberra” 支持)
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:14
 msgid Event sounds
@@ -346,9 +329,7 @@ msgstr 事件声音
 msgid 
 Font quality on a TFT or LCD screen can be greatly improved by choosing the 
 correct sub-pixel order of the screen
-msgstr 
-TFT 或 LCD 显示屏上的字体质量能通过选择
-适当的屏幕次像素次序极大地改善
+msgstr TFT 或 LCD 显示屏上的字体质量能通过选择适当的屏幕次像素次序极大地改善
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:16
 msgid Full
@@ -364,16 +345,15 @@ msgid 
 the mouse over the menu item and pressing the new key combination for the 
 shortcut
 msgstr 
-选中后,将鼠标停在菜单项目上然后按新的
-按键组合可更改此菜单项目的键盘快捷键
+选中后,将鼠标停在菜单项目上然后按新的按键组合可更改此菜单项目的键盘快捷键
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:19
 msgid 
 Many fonts contain information that provides extra hints as to how best draw 
 

[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 70%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to fd0f7bf3351b525cba553e14002a8eb2531eb3a5 (commit)
   from a23f08fc023e1c1183d7966aa80c7ebf301023bf (commit)

commit fd0f7bf3351b525cba553e14002a8eb2531eb3a5
Author: Chipong Luo chipon...@yahoo.com
Date:   Fri Jan 6 04:36:50 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 70%

New status: 75 messages complete with 14 fuzzies and 18 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   19 ---
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 964e795..2fc73bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -397,8 +397,8 @@ msgid 
 \_:input-1/\: used for grouping and substitution, the vertical bar is 
 used as an OR operation.
 msgstr 
-“_:input-1/”:用于分组和替换,竖线
-用作 OR 操作。
+“_:input-1/”:用于分组和替换符,
+竖线用作 OR 操作。
 
 #: index.page:187(item/p)
 msgid 
@@ -474,16 +474,16 @@ msgid Commands
 msgstr 命令
 
 #: index.page:218(section/p)
-#, fuzzy
 msgid 
 A command can reuse one or more substitutions from the regular expression. 
 The substitutions are represented by \input\\lt;numbergt;/input\ 
 where inputlt;numbergt;/input corresponds to the sub-pattern within 
 parentheses or 0 for the complete text.
 msgstr 
-一个命令可以再次使用一个或多个正则表达式匹配到的内容。所匹配的内容可以使用 
-”emphasis role=\bold\code\\lt;数字gt;/code/emphasis” 表示。lt;数
-字gt; 表示匹配到的第几个内容或者用 0 表示全部匹配到的文本。
+命令可以重复使用一个或更多正则表达式中的
+替换符。替换符用 “input\\lt;数字gt;/input” 
+表示,inputlt;数字gt;/input 对应圆括号中的
+子类型或 0 为全文。
 
 #: index.page:223(section/p)
 msgid 
@@ -492,10 +492,15 @@ msgid 
 text \_:output-5/\. With the command \_:input-6/\, the real executed 
 command would be \_:output-7/\.
 msgstr 
+比如,从简单类型 “_:input-1/” 可能
+为文字 “_:output-3/” 使用 “_:input-2/”,
+为文字 “_:output-5/” 使用 “_:input-4/”。
+对于 “_:input-6/”,
+实际执行的命令应该是 “_:output-7/”。
 
 #: index.page:238(section/title) index.page:267(figure/title)
 msgid Tweaks
-msgstr 
+msgstr 微调
 
 #: index.page:239(section/p)
 #, fuzzy
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 95%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to a3b3b165b38a242c2e612c758b503ae31137687d (commit)
   from fd0f7bf3351b525cba553e14002a8eb2531eb3a5 (commit)

commit a3b3b165b38a242c2e612c758b503ae31137687d
Author: Chipong Luo chipon...@yahoo.com
Date:   Fri Jan 6 05:53:07 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 95%

New status: 102 messages complete with 4 fuzzies and 1 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   84 ++
 1 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2fc73bd..c4817d0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -503,74 +503,81 @@ msgid Tweaks
 msgstr 微调
 
 #: index.page:239(section/p)
-#, fuzzy
 msgid 
 The following list describes the available options in the guiTweaks/gui 
 tab of the guiSettings/gui dialog.
-msgstr 以下是可用选项的列表:
+msgstr 
+以下列表描述了 gui设置/gui 对话框的 
+gui微调/gui 标签中可用的选项。
 
 #: index.page:243(terms/title)
 msgid List of available Tweaks
-msgstr 
+msgstr 可用微调列表
 
 #: index.page:245(item/title)
 msgid Paste instantly
-msgstr 
+msgstr 立即粘贴
 
 #: index.page:246(item/p)
 msgid 
 Automatically paste a selected item from the history to the current focused 
 window.
 msgstr 
+将从历史中选中的项目自动粘贴至当前
+已聚焦的窗口。
 
 #: index.page:249(item/title)
 msgid Position menu at mouse pointer
-msgstr 
+msgstr 在鼠标指针处放置菜单
 
 #: index.page:250(item/p)
 msgid 
 Popup the menu at the mouse pointer position, only for the xfce4-popup-
 clipman command.
 msgstr 
+在鼠标指针处弹出菜单,仅对于 
+xfce4-popup-clipman 命令。
 
 #: index.page:253(item/title)
 msgid Reorder history items
-msgstr 
+msgstr 记录历史选项
 
 #: index.page:254(item/p)
 msgid 
 Push last copied text to the top of the history, useful to reorder old items.
 msgstr 
+将上次复制的文字放在历史的上方,对记录
+旧的项目有用。
 
 #: index.page:257(item/title)
 msgid Reverse history order
-msgstr 
+msgstr 翻转历史顺序
 
 #: index.page:258(item/p)
 msgid Reverse order of the history shown in the menu.
-msgstr 
+msgstr 翻转菜单中显示的历史顺序。
 
 #: index.page:261(item/title)
 msgid Skip actions by holding Control
-msgstr 
+msgstr 通过按住 Ctrl 跳过动作
 
 #: index.page:262(item/p)
 msgid 
 When the selection is done (mouse or keyboard) and the Control key is still 
 pressed down, the popup menu for matched actions will be skipped.
 msgstr 
+在选择完成后(鼠标或键盘)且仍按住 Ctrl 时,
+将跳过匹配动作的弹出菜单。
 
 #: index.page:268(figure/desc)
-#, fuzzy
 msgid Settings dialog with the Tweaks tab
-msgstr 带有一般标签的设置对话框
+msgstr 带有微调标签的设置对话框
 
 #: index.page:276(section/title)
 msgid Xfconf
-msgstr Xfconf
+msgstr Xfconf 配置储存
 
 #: index.page:277(section/p)
-#, fuzzy
 msgid 
 appClipman/app uses appXfconf/app to store its settings. That allows 
 you to change the settings with the tool _:cmd-1/ or _:cmd-2/. The 
@@ -578,11 +585,11 @@ msgid 
 base property is _:sys-4/. The following table lists all the properties 
 with their possible values.
 msgstr 
-@PACKAGE_NAME@ 使用 Xfconf 保存它的设置以方便您使用 applicationxfconf-
-query/application 或者 applicationxfce4-settings-editor/application 等
-工具来更改设置。设置保存在 constantxfce4-panel/constant 频道,基本属性是 
-constant/plugins/clipman/constant。下面的表格列出可用的属性以及它们能够接
-受的值:
+appClipman/app 使用 appXfconf/app 储存它的设置。
+它让您用工具 _:cmd-1/ 或_:cmd-2/ 去更改设置。
+appClipman/app 储存其设置的频道是 _:sys-3/,
+基本属性是 _:sys-4/。以下目录列出了所有
+属性及其可能值。
 
 #: index.page:284(table/title)
 msgid Xfconf Properties
@@ -590,7 +597,7 @@ msgstr Xfconf 属性
 
 #: index.page:285(table/desc)
 msgid Description of all Xfconf properties with their possible values
-msgstr 
+msgstr 所有 Xfconf 属性及其可能值的描述
 
 #: index.page:288(td/p)
 msgid Property
@@ -609,77 +616,84 @@ msgid Values
 msgstr 值
 
 #: index.page:299(td/p)
-#, fuzzy
 msgid true or false to sync the primary clipboard with the default clipboard
-msgstr 设置为真将同步主剪贴板中的内容到预设剪贴板中
+msgstr 
+true 或 false 主剪贴板是否与默认剪贴板
+同步
 
 #: index.page:305(td/p)
-#, fuzzy
 msgid true or false to enable actions
-msgstr 设置为真将允许动作
+msgstr true 或 false 启用动作
 
 #: index.page:311(td/p)
-#, fuzzy
 msgid true or false to exclude the primary clipboard from the history
-msgstr 设置为真将从历史中排除主剪贴板的内容
+msgstr 
+true 或 false 从历史中排除主剪贴板
 
 #: index.page:317(td/p)
 msgid 0-5 number of images in history
-msgstr 0-5 个图像内容在历史中
+msgstr 历史中图片的 0 至 5 号
 
 #: index.page:323(td/p)
 msgid 5-100 number of texts in history
-msgstr 5-100 个文本内容在历史中
+msgstr 历史中文字的 5 至 100 号
 
 #: index.page:329(td/p)
-#, fuzzy
 msgid true or false to restore the history at every new session
-msgstr 设置为真将在每次新会话中恢复历史
+msgstr 
+true 或 false 在每次新会话中恢复历史
 
 #: index.page:335(td/p)
 msgid true or false to disable the collector
-msgstr 
+msgstr true 或 false 禁用收集器
 
 #: index.page:341(td/p)
 msgid 
 0 to disable, 1 to paste with Ctrl+V, or 2 to paste with Shift+Insert as 
 soon as an item is selected from the history
 msgstr 
+0 禁用,1 用 Ctrl+V 粘贴,或 2 在从
+历史中选择项目后用 Shift+Ins 立即粘贴
 
 #: index.page:347(td/p)
 msgid 
 true or false to popup the Clipman menu at the mouse pointer position, works 
 only when called 

[Xfce4-commits] xfce4-docs:xfce4-clipman-plugin-master l10n: Updated Chinese (China) (zh_CN) translation to 100%

2012-01-05 Thread Transifex
Updating branch refs/heads/xfce4-clipman-plugin-master
 to 5d61cbadeff36491e5218cb77d582bd09ffce3fe (commit)
   from a3b3b165b38a242c2e612c758b503ae31137687d (commit)

commit 5d61cbadeff36491e5218cb77d582bd09ffce3fe
Author: Chipong Luo chipon...@yahoo.com
Date:   Fri Jan 6 06:12:58 2012 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 100%

New status: 107 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   46 --
 1 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c4817d0..c612022 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -701,56 +701,58 @@ msgid 
 mailing list/link, or point your IRC client to _:sys-2/ and join the 
 channel _:sys-3/ and ask for help.
 msgstr 
-报告错误或者希望添加新的功能,请使用在 ulink type=\http\ url=
-\@PACKAGE_BUGREPORT@\@PACKAGE_BUGREPORT@/ulink 上的 bug 追踪系统。如果您
-在此软件的使用上有任何疑问,请在邮件列表 ulink type=\http\ url=\http://;
-foo-projects.org/mailman/listinfo/xfce\Xfce mailing list/ulink 上发问,或
-者使用 IRC 客户端连接至 emphasis role=\bold\irc.freenode.net/emphasis,
-加入频道 emphasis role=\bold\#xfce/emphasis 寻求帮助。
+要报告缺陷或提请新功能,使用缺陷追踪系统 
+_:link-1/。如果您有此软件使用方面的
+问题,请在在此软件的使用上有任何疑问,
+请在 link href=\https://mail.xfce.org/mailman/;
+listinfo/xfce\Xfce 邮件列表/link,
+或将您的 IRC 客户端指向 _:sys-2/ 
+并加入频道 _:sys-3/ 请求帮助。
 
 #: index.page:394(section/title)
 msgid About Clipman
-msgstr 
+msgstr 关于 Clipman 剪贴板管理器
 
 #: index.page:395(section/p)
-#, fuzzy
 msgid 
 appClipman/app was written by Eduard Roccatello and then maintained by 
 Nick Schermer, and nowadays it is written by Mike Massonnet. Visit the link 
 href=\http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin;
 \appClipman/app Website/link.
 msgstr 
-@PACKAGE_NAME@ 最初由 Eduard Roccatello 所编写,而后由 Nick Schermer 维护。现
-在的编写者是 Mike Massonnet (emailmmasson...@xfce.org/email)。更多信息,
-请查看 ulink type=\http\ url=\http://goodies.xfce.org/projects/panel-;
-plugins/xfce4-clipman-plugin\@PACKAGE_NAME@ 网站/ulink。
+appClipman/app 由 Eduard Roccatello 
+编写,而后由 Nick Schermer 维护。
+现在的编写者是 Mike Massonnet。访问 
+ulink type=\http\ url=\http://goodies.xfce.org/projects/;
+panel-plugins/xfce4-clipman-plugin
+\appClipman/app 网站/ulink。
 
 #: index.page:400(section/p)
-#, fuzzy
 msgid 
 This documentation was written by Mike Massonnet (mmasson...@xfce.com). 
 Please send all your comments and suggestions regarding this manual.
 msgstr 
-这份文档由 Mike Massonnet (emailmmasson...@xfce.org/email) 撰写。请将您对
-这份文档的意见或建议发送到 emailmmasson...@xfce.org/email。
+此文档的撰写者为 
+Mike Massonnet(mmasson...@xfce.com)。
+请发送有关此文档的意见或建议。
 
 #: index.page:405(section/p)
-#, fuzzy
 msgid 
 This software is distributed under the terms of the GNU General Public 
 License as published by the Free Software Foundation; either version 2 of 
 the License, or (at your option) any later version.
 msgstr 
-此软件在自由软件基金会发布的 citetitleGNU 通用公共许可协议/citetitle 条款
-约束下发布;协议的第二版或者(您可以选择)更新的版本。
+此软件以自由软件基金会发布的 GNU 通用公共许可
+协议的第二版或(您可以选择)更高版的方式发布。
 
 #: index.page:409(section/p)
-#, fuzzy
 msgid 
 You should have received a copy of the GNU General Public License along with 
 this program; if not, write to the Free Software Foundation, Inc., 51 
 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
 msgstr 
-您应该能够随此软件获得一份 citetitleGNU 通用公共许可协议/citetitle的副
-本;如果没有,请致信自由软件基金会: Software Foundation, Inc., 51 Franklin 
-Street, Fifth Floor, Boston, MA 02110, USA.
+您应该与此程序一道收到了一份 GUN 通用公共许可
+协议的副本;如果没有,致信给 
+the Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, 
+MA 02111-1307, USA.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits