[Xfce4-commits] xfdesktop:master Fix warnings and obsolete macros

2013-09-09 Thread Eric Koegel 
Updating branch refs/heads/master
 to 72db63766094dd55fa60ffed85ff846adbd00631 (commit)
   from 487e5002a5fa4ef9fa8a204f4547bc0c4f7494e3 (commit)

commit 72db63766094dd55fa60ffed85ff846adbd00631
Author: Eric Koegel eric.koe...@gmail.com
Date:   Mon Sep 9 10:37:43 2013 +0300

Fix warnings and obsolete macros

There were a couple potential variables used uninitialized, some
variables were set before the previous value was used in the code,
and finally some obsolete macros in autoconf that were fixed.

 configure.ac.in |   20 ++--
 src/xfdesktop-file-utils.c  |2 +-
 src/xfdesktop-icon-view.c   |6 +++---
 src/xfdesktop-notify.c  |6 --
 src/xfdesktop-volume-icon.c |5 +++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 8a4c309..982502a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -28,7 +28,7 @@ m4_define([xfconf_minimum_version], [4.8.0])
 
 dnl init autoconf
 AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/])
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl init automake
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
@@ -37,16 +37,15 @@ AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
+AC_SEARCH_LIBS([strerror],[cposix])
 AM_CONDITIONAL([HAVE_CYGWIN], [test `uname | grep \CYGWIN\` != ])
 
 dnl check for basic programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
-AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
+IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
 m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)])
 
 dnl prepare libtool
@@ -95,7 +94,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], 
[glib_minimum_version], [
 
 dnl do we want desktop icons at all?
 AC_ARG_ENABLE([desktop-icons],
-[AC_HELP_STRING([--disable-desktop-icons],
+[AS_HELP_STRING([--disable-desktop-icons],
 [Do not compile in support for desktop icons (default=enabled)])],
 [ac_cv_enable_desktop_icons=$enableval],
 [ac_cv_enable_desktop_icons=yes])
@@ -109,7 +108,7 @@ AM_CONDITIONAL([ENABLE_DESKTOP_ICONS], [test 
x$enable_desktop_icons = xyes])
 
 dnl if we want desktop icons, do we also want file icons?
 AC_ARG_ENABLE([file-icons],
-[AC_HELP_STRING([--disable-file-icons],
+[AS_HELP_STRING([--disable-file-icons],
 [Do not compile in support for desktop file icons 
(default=enabled)])],
 [ac_cv_enable_file_icons=$enableval],
 [ac_cv_enable_file_icons=yes])
@@ -151,7 +150,7 @@ XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
 
 
 AC_ARG_ENABLE([desktop-menu],
-AC_HELP_STRING([--disable-desktop-menu],
+AS_HELP_STRING([--disable-desktop-menu],
 [Do not build the desktop menu module (default=enabled)]),
 [ac_cv_enable_desktop_menu=$enableval],
 [ac_cv_enable_desktop_menu=yes])
@@ -177,7 +176,7 @@ fi
 AM_CONDITIONAL([BUILD_DESKTOP_MENU], [test x$build_desktop_menu = xyes])
 
 AC_ARG_WITH([file-manager-fallback],
-[AC_HELP_STRING([--with-file-manager-fallback=PATH],
+[AS_HELP_STRING([--with-file-manager-fallback=PATH],
 [Default file manager fallback to handle external folders and 
applications (default=Thunar)])],
 [ac_cv_file_manager_fallback=$withval],
 [ac_cv_file_manager_fallback=Thunar])
@@ -193,7 +192,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], 
[0.4.0], [notifications],
 dnl check for debugging support
 XDT_FEATURE_DEBUG
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 backgrounds/Makefile
 common/Makefile
@@ -203,6 +202,7 @@ po/Makefile.in
 settings/Makefile
 src/Makefile
 ])
+AC_OUTPUT
 
 echo
 echo Build Configuration:
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index e593c65..23e5dc3 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -324,7 +324,7 @@ xfdesktop_file_utils_mount_is_internal (GMount *mount)
 gboolean
 xfdesktop_file_utils_volume_is_removable(GVolume *volume)
 {
-  gboolean can_eject = FALSE;
+  gboolean can_eject;
   gboolean can_mount = FALSE;
   gboolean can_unmount = FALSE;
   gboolean is_removable = FALSE;
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index 8a1b2d6..3bec49d 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -1376,7 +1376,7 @@ xfdesktop_icon_view_drag_motion(GtkWidget *widget,
 guint time_)
 {
 XfdesktopIconView *icon_view = XFDESKTOP_ICON_VIEW(widget);
-GdkAtom target = GDK_NONE;
+GdkAtom target;
 guint16 hover_row = 0, hover_col = 0;
 XfdesktopIcon *icon_on_dest = NULL;
 GdkDragAction our_action = 0;
@@ -1496,7 +1496,7 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
   guint time_)
 {
 XfdesktopIconView *icon_view =

[Xfce4-commits] xfce4-mailwatch-plugin:master I18n: Update translation zh_CN (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to da287e6157f4a889a85efd6730cb63af850d0bee (commit)
   from a823536b0509c6f4e19bedbc92abf3a6bea30941 (commit)

commit da287e6157f4a889a85efd6730cb63af850d0bee
Author: 玉堂白鹤 yjw...@qq.com
Date:   Mon Sep 9 12:31:39 2013 +0200

I18n: Update translation zh_CN (100%).

108 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/zh_CN.po |  298 ++-
 1 file changed, 129 insertions(+), 169 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3551ab3..90d9bc2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,24 @@
-# Simplified Chinese translations for
-# the xfce4-mailwatch-plugin package.
-# This file is distributed under the same license as
-# the xfce4-mailwatch-plugin package.
-# Hydonsingore Cia hydonsing...@mail.educities.edu.tw, 2006.
-# Hunt Xu hun...@live.cn, 2009.
-# Chipong Luo chipong@yahoo.com, 2011, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chipong Luo chipong@yahoo.com, 2011-2012
+# Hunt Xu hun...@live.cn, 2009
+# Hydonsingore Cia hydonsing...@mail.educities.edu.tw, 2006
+# 玉堂白鹤 yjw...@qq.com, 2013
 msgid 
 msgstr 
-Project-Id-Version: xfce4-mailwatch-plugin\n
-Report-Msgid-Bugs-To: xfce-i...@xfce.org\n
-POT-Creation-Date: 2012-04-20 07:00+\n
-PO-Revision-Date: 2009-07-19 02:07+0800\n
-Last-Translator: Chipong Luo chipong@yahoo.com\n
-Language-Team: Chinese (Simplified) xfce-i18n...@xfce.org\n
-Language: zh_CN\n
+Project-Id-Version: Xfce Panel Plugins\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-09-01 00:31+0200\n
+PO-Revision-Date: 2013-09-09 08:00+\n
+Last-Translator: 玉堂白鹤 yjw...@qq.com\n
+Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: zh_CN\n
 Plural-Forms: nplurals=1; plural=0;\n
 
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:204
@@ -37,12 +38,10 @@ msgstr 收到 HTTP 回复代码 %d。最可能的原因是您的 GMail 用户
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:261
 #, c-format
 msgid 
-Received HTTP response code %d, which should be 200.  There may be a problem 
-with GMail's servers, or they have incompatibly changed their authentication 
-method or location of the new messages feed.
-msgstr 
-收到了 HTTP 回复代码 %d，本应该是 200。可能是 GMail 服务器有问题，或是他们更
-改成了不相容的认证方式或是更改了新邮件的投送位置。
+Received HTTP response code %d, which should be 200.  There may be a problem
+ with GMail's servers, or they have incompatibly changed their 
+authentication method or location of the new messages feed.
+msgstr 收到了 HTTP 回复代码 %d，本应该是 200。可能是 GMail 
服务器有问题，或是他们更改成了不相容的认证方式或是更改了新邮件的投送位置。
 
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:394
 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:735
@@ -54,25 +53,25 @@ msgid Previous thread hasn't exited yet, not checking mail 
this time.
 msgstr 之前的线程尚未结束，此次不检查新邮件。
 
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:535
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1748
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1723
 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:863
 msgid _Username:
 msgstr 用户名(_U)：
 
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:555
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1768
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1743
 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:883
 msgid _Password:
 msgstr 密码(_P)：
 
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:576
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1807
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1782
 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:915
 msgid Check for _new messages every
 msgstr 检查新邮件间隔(_N)
 
 #: ../libmailwatch-core/mailwatch-mailbox-gmail.c:591
-#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1821
+#: ../libmailwatch-core/mailwatch-mailbox-imap.c:1796
 #: ../libmailwatch-core/mailwatch-mailbox-maildir.c:374
 #: ../libmailwatch-core/mailwatch-mailbox-mbox.c:412
 #: ../libmailwatch-core/mailwatch-mailbox-mh.c:605
@@ -92,15 +91,16 @@ msgstr GMail 插件可以连接到 Goolge 的邮件服务并安全地获取新
 
 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:286
 msgid 
-Secure IMAP is not available, and the IMAP server does not support plaintext 
-logins.
+Secure IMAP is not available, and the IMAP server does not support plaintext
+ logins.
 msgstr 安全 IMAP 不可用，而且此 IMAP 服务器不支持明文登录。
 
 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:337
 #: ../libmailwatch-core/mailwatch-mailbox-imap.c:370
 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:242
 #: ../libmailwatch-core/mailwatch-mailbox-pop3.c:284
-msgid Authentication failed.  Perhaps your username or password is incorrect?
+msgid 
+Authentication failed.  Perhaps your username or password is incorrect?
 msgstr 无法认证。或许您的用户名或密码有误？
 
 #:

[Xfce4-commits] xfce4-power-manager:master I18n: Update translation hr (93%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 23f6f39212bfd4dff11d1f92d3c31be2f653a33e (commit)
   from ce512ec26f267a854238a6a51e08bb0f453ef951 (commit)

commit 23f6f39212bfd4dff11d1f92d3c31be2f653a33e
Author: Ivica  Kolić ik...@yahoo.com
Date:   Mon Sep 9 12:30:47 2013 +0200

I18n: Update translation hr (93%).

200 translated messages, 13 untranslated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/hr.po |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index fa15824..e14b884 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -10,8 +10,8 @@ msgstr 
 Project-Id-Version: Xfce4-power-manager\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-08-12 00:30+0200\n
-PO-Revision-Date: 2013-09-01 17:08+\n
-Last-Translator: destogl denisst...@gmail.com\n
+PO-Revision-Date: 2013-09-09 07:27+\n
+Last-Translator: Ivica  Kolić ik...@yahoo.com\n
 Language-Team: Croatian 
(http://www.transifex.com/projects/p/xfce/language/hr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -49,11 +49,11 @@ msgstr Kada je pritisnuta tipka za paljenje:
 
 #: ../data/interfaces/xfpm-settings.ui.h:7
 msgid System tray icon: 
-msgstr Ikona u indikatoru sustava: 
+msgstr 
 
 #: ../data/interfaces/xfpm-settings.ui.h:8
 msgid Monitor power management control
-msgstr Upravitelj energije zaslona
+msgstr 
 
 #: ../data/interfaces/xfpm-settings.ui.h:9
 msgid Show notifications to notify about the battery state
@@ -65,7 +65,7 @@ msgstr bOsnovne opcije/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:11
 msgid When laptop lid is closed:
-msgstr Kada se prijenosno računalo zatvori:
+msgstr 
 
 #: ../data/interfaces/xfpm-settings.ui.h:12
 msgid Put the computer to sleep when inactive for:
@@ -73,7 +73,7 @@ msgstr Postavi računalo u način spavanja kada je neaktivno:
 
 #: ../data/interfaces/xfpm-settings.ui.h:13
 msgid Spin down hard disks
-msgstr Uspori vrtnju tvrdih diskova
+msgstr 
 
 #: ../data/interfaces/xfpm-settings.ui.h:14
 msgid bActions/b
@@ -344,7 +344,7 @@ msgstr _Hiberniraj
 msgid 
 An application is currently disabling the automatic sleep. Doing this action
  now may damage the working state of this application.
-msgstr Neka aplikacija trenutno onemogućuje automatsko uključenje načina 
spavanja. Trenutno uključivanje načina spavanja može ugroziti rad te 
aplikacije.
+msgstr Neki program trenutno onemogućuje automatsko uključenje načina 
spavanja. Trenutno uključivanje načina spavanja može ugroziti rad tog programa.
 
 #: ../src/xfpm-power.c:331
 msgid Are you sure you want to hibernate the system?
@@ -443,7 +443,7 @@ msgstr UPS
 
 #: ../src/xfpm-power-common.c:126
 msgid Line power
-msgstr Napajanje iz mreže
+msgstr 
 
 #: ../src/xfpm-power-common.c:128
 msgid Mouse
@@ -726,7 +726,7 @@ msgstr Može hibernirati
 
 #: ../src/xfpm-main.c:145
 msgid Can spin down hard disks
-msgstr Usporavanje vrtnje tvrdih diskova je moguće
+msgstr Moguće je usporavanje vrtnje tvrdih diskova
 
 #: ../src/xfpm-main.c:147
 msgid Authorized to suspend
@@ -742,7 +742,7 @@ msgstr Ovlašten da isključi
 
 #: ../src/xfpm-main.c:153
 msgid Authorized to spin down hard disks
-msgstr Usporavanje vrtnje tvrdih diskova je odobreno
+msgstr Odobreno je usporavanje vrtnje tvrdih diskova
 
 #: ../src/xfpm-main.c:155
 msgid Has battery
@@ -754,7 +754,7 @@ msgstr Ima ploču svjetline
 
 #: ../src/xfpm-main.c:159
 msgid Has power button
-msgstr Postoji gumb za uključivanje
+msgstr 
 
 #: ../src/xfpm-main.c:161
 msgid Has hibernate button
@@ -774,7 +774,7 @@ msgstr Onemogući pokretanje procesa kao deamona
 
 #: ../src/xfpm-main.c:265
 msgid Enable debugging
-msgstr Omogući debagiranje
+msgstr 
 
 #: ../src/xfpm-main.c:266
 msgid Dump all information
@@ -790,7 +790,7 @@ msgstr Pokaži dijalog konfiguracije
 
 #: ../src/xfpm-main.c:269
 msgid Quit any running xfce power manager
-msgstr Isključi sve pokrenute Xfce upravitelje energijom
+msgstr Isključi sve pokrenute xfce upravitelje energijom
 
 #: ../src/xfpm-main.c:270 ../src/xfpm-power-info.c:933
 msgid Version information
@@ -875,7 +875,7 @@ msgstr Intel wireless adapter
 #: ../src/xfpm-power-info.c:218
 #, c-format
 msgid Timer %s
-msgstr Tajmer %s
+msgstr 
 
 #. TRANSLATORS: this is a task that's woken up from sleeping
 #: ../src/xfpm-power-info.c:221
@@ -922,7 +922,7 @@ msgstr Probudi %s
 #. TRANSLATORS: interupts on the system required for basic operation
 #: ../src/xfpm-power-info.c:245
 msgid Local interrupts
-msgstr Lokalni prekid
+msgstr Lokalni prekidi
 
 #. TRANSLATORS: interrupts when a task gets moved from one core to another
 #: ../src/xfpm-power-info.c:248
@@ -965,15 +965,15 @@ msgstr Wh
 
 #: ../src/xfpm-power-info.c:420
 msgid Energy full design
-msgstr Nazivni kapacitet - dizajn
+msgstr 
 
 #: ../src/xfpm-power-info.c:434
 msgid Energy full
-msgstr Nazivni kapacitet
+msgstr 
 
 #: ../src/xfpm-power-info.c:448
 msgid Energy empty
-msgstr Prazni kapacitet
+msgstr 
 
 #.

[Xfce4-commits] xfce4-panel:master I18n: Update translation zh_CN (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to ea7d3f39be4c6e42052517fb3a51858d7ac890fb (commit)
   from 1cd0223901a031829db27e9343d3af85b2c15ea5 (commit)

commit ea7d3f39be4c6e42052517fb3a51858d7ac890fb
Author: 玉堂白鹤 yjw...@qq.com
Date:   Mon Sep 9 12:30:40 2013 +0200

I18n: Update translation zh_CN (100%).

393 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/zh_CN.po |  142 ++-
 1 file changed, 73 insertions(+), 69 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 796559b..6b15b56 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,6 +10,7 @@
 # Hunt Xu hun...@live.cn, 2008-2010
 # Jick Nan jick@gmail.com, 2006
 # wuli wuri...@gmail.com, 2007-2008
+# 玉堂白鹤 yjw...@qq.com, 2013
 # Yongtao Yang yongtao.y...@telia.com, 2004
 # 潇波 周 zhouxiaobo@gmail.com, 2013
 # 玉堂 白鹤 sque...@189.cn, 2010
@@ -17,9 +18,9 @@ msgid 
 msgstr 
 Project-Id-Version: Xfce4-panel\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-07-02 22:26+0200\n
-PO-Revision-Date: 2013-07-27 11:10+\n
-Last-Translator: 潇波 周 zhouxiaobo@gmail.com\n
+POT-Creation-Date: 2013-08-03 00:30+0200\n
+PO-Revision-Date: 2013-09-09 08:05+\n
+Last-Translator: 玉堂白鹤 yjw...@qq.com\n
 Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -833,7 +834,7 @@ msgstr 注销、锁屏或其它系统动作
 
 #. I18N: default tooltip of the application menu
 #: ../plugins/applicationsmenu/applicationsmenu-dialog.glade.h:1
-#: ../plugins/applicationsmenu/applicationsmenu.c:38
+#: ../plugins/applicationsmenu/applicationsmenu.c:39
 #: ../plugins/applicationsmenu/applicationsmenu.desktop.in.h:1
 msgid Applications Menu
 msgstr 应用程序菜单
@@ -875,7 +876,7 @@ msgstr 在工具提示中显示应用程序描述(_E)
 #: ../plugins/pager/pager-dialog.glade.h:6
 #: ../plugins/separator/separator-dialog.glade.h:4
 #: ../plugins/systray/systray-dialog.glade.h:4
-#: ../plugins/tasklist/tasklist-dialog.glade.h:6
+#: ../plugins/tasklist/tasklist-dialog.glade.h:14
 #: ../plugins/windowmenu/windowmenu-dialog.glade.h:6
 msgid Appearance
 msgstr 外观
@@ -904,26 +905,17 @@ msgstr 选择菜单文件
 msgid Menu File
 msgstr 菜单文件
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:557
+#: ../plugins/applicationsmenu/applicationsmenu.c:541
 #: ../plugins/directorymenu/directorymenu.c:388
 msgid Select An Icon
 msgstr 选择图标
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:598
-#: ../plugins/applicationsmenu/applicationsmenu.c:839
+#: ../plugins/applicationsmenu/applicationsmenu.c:582
 #: ../plugins/clock/clock.c:865 ../plugins/launcher/launcher.c:2308
 #, c-format
 msgid Failed to execute command \%s\.
 msgstr 无法执行命令 “%s”。
 
-#: ../plugins/applicationsmenu/applicationsmenu.c:1108
-msgid No applications found
-msgstr 未找到应用程序
-
-#: ../plugins/applicationsmenu/applicationsmenu.c:1131
-msgid Failed to load the applications menu
-msgstr 无法载入应用程序菜单
-
 #: ../plugins/applicationsmenu/applicationsmenu.desktop.in.h:2
 msgid Show a menu containing categories of installed applications
 msgstr 显示包含已安装应用程序类别的菜单
@@ -1370,7 +1362,7 @@ msgid Show _hidden files
 msgstr 显示隐藏文件(_H)
 
 #: ../plugins/directorymenu/directorymenu-dialog.glade.h:9
-#: ../plugins/tasklist/tasklist-dialog.glade.h:16
+#: ../plugins/tasklist/tasklist-dialog.glade.h:24
 #: ../plugins/windowmenu/windowmenu-dialog.glade.h:8
 msgid Filtering
 msgstr 过滤
@@ -1536,7 +1528,7 @@ msgid Switch workspaces using the mouse _wheel
 msgstr 使用鼠标滚轮切换工作区(_W)
 
 #: ../plugins/pager/pager-dialog.glade.h:8
-#: ../plugins/tasklist/tasklist-dialog.glade.h:12
+#: ../plugins/tasklist/tasklist-dialog.glade.h:20
 msgid Behaviour
 msgstr 行为
 
@@ -1631,107 +1623,119 @@ msgid Area where notification icons appear
 msgstr 通知图标出现的区域
 
 #: ../plugins/tasklist/tasklist-dialog.glade.h:1
+msgid Never
+msgstr 从不
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:2
+msgid Always
+msgstr 总是
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:3
+msgid When space is limited
+msgstr 当间距有限时
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:4
+msgid Timestamp
+msgstr 时间戳
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:5
+msgid Group title and timestamp
+msgstr 组标题和时间戳
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:6
+msgid Window title
+msgstr 窗口标题
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:7
+msgid Group title and window title
+msgstr 组标题和窗口标题
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:8
+msgid None, allow drag-and-drop
+msgstr 无，允许拖放
+
+#: ../plugins/tasklist/tasklist-dialog.glade.h:9
 #: ../plugins/tasklist/tasklist.desktop.in.h:1
 msgid Window Buttons
 msgstr 窗口按钮
 
-#: ../plugins/tasklist/tasklist-dialog.glade.h:2
+#: ../plugins/tasklist/tasklist-dialog.glade.h:10
 msgid Show button _labels
 msgstr 显示按钮标签(_L)
 
-#: ../plugins/tasklist/tasklist-dialog.glade.h:3
+#: ../plugins/tasklist/tasklist-dialog.glade.h:11
 msgid Show _flat buttons
 msgstr 使用扁平按钮(_F)
 
-#:

[Xfce4-commits] xfce4-power-manager:master I18n: Update translation zh_CN (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to ec8dc09e497fdb3e748b3ef0da41ec34b46dbc92 (commit)
   from 23f6f39212bfd4dff11d1f92d3c31be2f653a33e (commit)

commit ec8dc09e497fdb3e748b3ef0da41ec34b46dbc92
Author: 玉堂白鹤 yjw...@qq.com
Date:   Mon Sep 9 12:30:47 2013 +0200

I18n: Update translation zh_CN (100%).

213 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/zh_CN.po |  277 ++-
 1 file changed, 121 insertions(+), 156 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c0759d6..e462b0b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,127 +1,128 @@
-# Simplified Chinese translations for
-# the xfce4-power-manager package.
-# This file is distributed under the same license as
-# the xfce4-power-manager package.
-# Hunt Xu hun...@live.cn, 2008, 2009, 2010, 2011.
-# Chris K. Zhang plut...@gmail.com, 2009.
-# Chipong Luo chipong@yahoo.com, 2011, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chipong Luo chipong@yahoo.com, 2011-2012
+# Chris K. Zhang plut...@gmail.com, 2009
+# Hunt Xu hun...@live.cn, 2008-2011
+# 玉堂白鹤 yjw...@qq.com, 2013
 msgid 
 msgstr 
-Project-Id-Version: xfce4-power-manager\n
+Project-Id-Version: Xfce4-power-manager\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-22 22:51+\n
-PO-Revision-Date: 2011-02-15 21:22+0800\n
-Last-Translator: Chipong Luo chipong@yahoo.com\n
-Language-Team: Chinese (Simplified) xfce-i18n...@xfce.org\n
-Language: zh_CN\n
+POT-Creation-Date: 2013-08-12 00:30+0200\n
+PO-Revision-Date: 2013-09-09 07:56+\n
+Last-Translator: 玉堂白鹤 yjw...@qq.com\n
+Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: zh_CN\n
 Plural-Forms: nplurals=1; plural=0;\n
 
-#: ../data/interfaces/xfpm-settings.ui.h:1
-msgid bActions/b
-msgstr b动作/b
+#: ../data/interfaces/xfpm-settings.ui.h:1 ../settings/xfpm-settings.c:809
+#: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026
+#: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260
+#: ../settings/xfpm-settings.c:1312
+msgid Nothing
+msgstr 无
 
 #: ../data/interfaces/xfpm-settings.ui.h:2
-msgid bAdvanced Options/b
-msgstr b高级选项/b
+#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:415
+msgid Xfce Power Manager
+msgstr Xfce 电源管理器
 
 #: ../data/interfaces/xfpm-settings.ui.h:3
-msgid bBrightness/b
-msgstr b亮度/b
+msgid Power manager settings
+msgstr 电源管理器设置
 
 #: ../data/interfaces/xfpm-settings.ui.h:4
-msgid bGeneral Options/b
-msgstr b一般选项/b
+msgid When sleep button is pressed:
+msgstr 按下睡眠按钮时：
 
 #: ../data/interfaces/xfpm-settings.ui.h:5
-msgid bMonitor/b
-msgstr b显示器/b
+msgid When hibernate button is pressed:
+msgstr 按下休眠按钮时：
 
 #: ../data/interfaces/xfpm-settings.ui.h:6
-msgid Actions
-msgstr 动作
+msgid When power button is pressed:
+msgstr 按下电源按钮时：
 
 #: ../data/interfaces/xfpm-settings.ui.h:7
-msgid Consider the computer on low power at:
-msgstr 在此认为计算机处于低电量：
+msgid System tray icon: 
+msgstr 系统托盘图标：
 
-#. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:820
-#: ../settings/xfpm-settings.c:888 ../settings/xfpm-settings.c:1037
-#: ../settings/xfpm-settings.c:1214 ../settings/xfpm-settings.c:1271
-#: ../settings/xfpm-settings.c:1323 ../src/xfpm-power.c:484
-#: ../src/xfpm-power.c:779
-msgid Hibernate
-msgstr 休眠
+#: ../data/interfaces/xfpm-settings.ui.h:8
+msgid Monitor power management control
+msgstr 显示器电源管理控制
 
 #: ../data/interfaces/xfpm-settings.ui.h:9
-msgid Level:
-msgstr 级别：
+msgid Show notifications to notify about the battery state
+msgstr 显示有关电池状态报告的通知
 
 #: ../data/interfaces/xfpm-settings.ui.h:10
-msgid Lock screen when going for suspend/hibernate
-msgstr 进入挂起/休眠时锁屏
+msgid bGeneral Options/b
+msgstr b一般选项/b
 
-#: ../data/interfaces/xfpm-settings.ui.h:11 ../src/xfpm-power-common.c:132
-msgid Monitor
-msgstr 显示器
+#: ../data/interfaces/xfpm-settings.ui.h:11
+msgid When laptop lid is closed:
+msgstr 合上笔记本盖时：
 
 #: ../data/interfaces/xfpm-settings.ui.h:12
-msgid Monitor power management control
-msgstr 显示器电源管理控制
+msgid Put the computer to sleep when inactive for:
+msgstr 此时间无活动后计算机转入睡眠：
 
-#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:809
-#: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026
-#: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260
-#: ../settings/xfpm-settings.c:1312
-msgid Nothing
-msgstr 无
+#: ../data/interfaces/xfpm-settings.ui.h:13
+msgid Spin down hard disks
+msgstr 降低硬盘转速
 
 #: ../data/interfaces/xfpm-settings.ui.h:14
-msgid Power manager settings
-msgstr 电源管理器设置
+msgid bActions/b
+msgstr b动作/b
 
 #: ../data/interfaces/xfpm-settings.ui.h:15
-msgid Prefer

[Xfce4-commits] xfwm4:master I18n: Update translation hr (71%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 215be60e57967e090c4df881c9a20c1a734fbbfa (commit)
   from 05f59e232c0fb360e413bb79e9e11d1ffa77d0bd (commit)

commit 215be60e57967e090c4df881c9a20c1a734fbbfa
Author: Ivica  Kolić ik...@yahoo.com
Date:   Mon Sep 9 12:32:24 2013 +0200

I18n: Update translation hr (71%).

121 translated messages, 49 untranslated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/hr.po |  731 ++
 1 file changed, 262 insertions(+), 469 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index 32da9f3..959e9cc 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,29 +1,29 @@
-# Croatian translations for  xfwm4 package.
-# Copyright (C) 2010 The Xfce Development Team.
-# This file is distributed under the same license as the xfwm4 package.
-#  Ivica Kolićik...@yahoo.com, 2010.
-#  Petar Koretićpetar.kore...@gmail.com
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ivica  Kolić ik...@yahoo.com, 2010
+# Ivica  Kolić ik...@yahoo.com, 2013
 msgid 
 msgstr 
-Project-Id-Version: xfwm4\n
+Project-Id-Version: Xfwm4\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-03-05 04:57+\n
-PO-Revision-Date: 2010-06-12 00:06+0200\n
-Last-Translator: Ivica Kolićik...@yahoo.com \n
-Language-Team: Croatian \n
+POT-Creation-Date: 2013-07-02 22:21+0200\n
+PO-Revision-Date: 2013-09-09 07:17+\n
+Last-Translator: Ivica  Kolić ik...@yahoo.com\n
+Language-Team: Croatian 
(http://www.transifex.com/projects/p/xfce/language/hr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Language: hr\n
-Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
+Plural-Forms: nplurals=3; plural=n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2;\n
 
 #: ../helper-dialog/helper-dialog.c:84
 msgid 
 This window might be busy and is not responding.\n
 Do you want to terminate the application?
-msgstr 
-Ovaj prozor ne reagira.\n
-Želite li prisilno ugasiti aplikaciju?
+msgstr Ovaj prozor ne reagira.\nŽelite li prisilno ugasiti aplikaciju?
 
 #: ../helper-dialog/helper-dialog.c:89
 msgid Warning
@@ -33,38 +33,36 @@ msgstr Upozorenje
 msgid None
 msgstr Ništa
 
-#: ../settings-dialogs/tweaks-settings.c:454
+#: ../settings-dialogs/tweaks-settings.c:463
 msgid Session manager socket
 msgstr Socket upravitelja sesijom
 
-#: ../settings-dialogs/tweaks-settings.c:454
+#: ../settings-dialogs/tweaks-settings.c:463
 #: ../settings-dialogs/workspace-settings.c:381
 #: ../settings-dialogs/xfwm4-settings.c:241
 msgid SOCKET ID
 msgstr SOCKET ID
 
-#: ../settings-dialogs/tweaks-settings.c:455
+#: ../settings-dialogs/tweaks-settings.c:464
 #: ../settings-dialogs/workspace-settings.c:382
 #: ../settings-dialogs/xfwm4-settings.c:243
 msgid Version information
 msgstr Informacija o verziji
 
-#: ../settings-dialogs/tweaks-settings.c:473
+#: ../settings-dialogs/tweaks-settings.c:482
 #: ../settings-dialogs/workspace-settings.c:399
 #: ../settings-dialogs/xfwm4-settings.c:895
 msgid .
 msgstr .
 
-#: ../settings-dialogs/tweaks-settings.c:477
+#: ../settings-dialogs/tweaks-settings.c:486
 #: ../settings-dialogs/workspace-settings.c:403
 #: ../settings-dialogs/xfwm4-settings.c:899
 #, c-format
 msgid 
 %s: %s\n
 Try %s --help to see a full list of available command line options.\n
-msgstr 
-%s: %s\n
-Pokušajte %s --help da vi vidjeli popis svih mogućih opcija.\n
+msgstr %s: %s\nPokušajte %s --help da vi vidjeli popis svih mogućih opcija.\n
 
 #: ../settings-dialogs/workspace-settings.c:74
 #: ../settings-dialogs/workspace-settings.c:89
@@ -74,245 +72,245 @@ msgstr Radni prostor %d
 
 #: ../settings-dialogs/workspace-settings.c:275
 msgid Workspace Name
-msgstr Naziv Radnog Prostora
+msgstr Ime radnog prostora
 
 #: ../settings-dialogs/workspace-settings.c:381
 #: ../settings-dialogs/xfwm4-settings.c:241
 msgid Settings manager socket
-msgstr Socket upravitelja postavkama
+msgstr 
 
 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-dialog.glade.h:28
-msgid Configure window behavior and shortcuts
-msgstr Postavi ponašanje prozora i prečica
-
-#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
-#: ../settings-dialogs/xfwm4-dialog.glade.h:47
+#: ../settings-dialogs/xfwm4-dialog.glade.h:1
 msgid Window Manager
 msgstr Upravitelj prozora
 
+#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2
+#: ../settings-dialogs/xfwm4-dialog.glade.h:2
+msgid Configure window behavior and shortcuts
+msgstr Konfiguriraj ponašanje prozora i prečace
+
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1
-#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16
-msgid Fine-tune window behaviour and effects
-msgstr Detaljno postavljanje ponašanja prozora i efekata
+#:

[Xfce4-commits] xfce4-mailwatch-plugin:jansucan/build Creating branch jansucan/build

2013-09-09 Thread Ján Sučan 
Updating branch refs/heads/jansucan/build
 as new branch
 to c9aa7a4b835ad542d09f6449811a12714926212c (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/jansucan/build

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:jansucan/build Update build files and layout of the files

2013-09-09 Thread Ján Sučan 
Updating branch refs/heads/jansucan/build
 to c9aa7a4b835ad542d09f6449811a12714926212c (commit)
   from a823536b0509c6f4e19bedbc92abf3a6bea30941 (commit)

commit c9aa7a4b835ad542d09f6449811a12714926212c
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 9 14:33:32 2013 +0200

Update build files and layout of the files

This update was inspired by the xfce4-sample-plugin.

 Makefile.am  |   28 ++
 configure.ac.in  |  138 --
 icons/48x48/Makefile.am  |7 ++
 {pixmaps = icons/48x48}/xfce-newmail.png|  Bin 1494 - 1494 bytes
 {pixmaps = icons/48x48}/xfce-nomail.png |  Bin 1314 - 1314 bytes
 icons/Makefile.am|   16 +++
 icons/scalable/Makefile.am   |7 ++
 {pixmaps = icons/scalable}/xfce-newmail.svg |0
 {pixmaps = icons/scalable}/xfce-nomail.svg  |0
 libmailwatch-core/Makefile.am|   24 +++--
 libmailwatch-core/mailwatch.c|2 +-
 panel-plugin/Makefile.am |   26 +++--
 panel-plugin/mailwatch-plugin.c  |2 +-
 pixmaps/Makefile.am  |   20 
 14 files changed, 156 insertions(+), 114 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7d75959..ff7db3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,12 @@
-@SET_MAKE@
-
 SUBDIRS = \
doc \
+   icons \
libmailwatch-core \
panel-plugin \
-   pixmaps \
po
 
-$(top_srcdir)/configure: $(top_srcdir)/configure.ac
-   [ -x $(top_srcdir)/autogen.sh ]  cd $(top_srcdir)  NOCONFIGURE=1 
./autogen.sh || /bin/true
-
-html:
-   $(MAKE) -C doc html
+distclean-local:
+   rm -rf *.cache *~
 
 .PHONY: ChangeLog
 
@@ -25,21 +20,10 @@ dist-hook: ChangeLog
 EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
-   intltool-update.in \
-   TODO
+   intltool-update.in
 
 DISTCLEANFILES = \
intltool-extract \
intltool-merge \
-   intltool-update
-
-checksums: distcheck
-   sha1sum $(PACKAGE)-$(VERSION).tar.bz2  
$(PACKAGE)-$(VERSION).tar.bz2.sha1.asc
-
-gpg-sign: checksums
-   gpg -b --armor $(PACKAGE)-$(VERSION).tar.bz2
-
-release: gpg-sign
-   -mkdir releases/
-   mv $(PACKAGE)-$(VERSION).tar.bz2* releases/
-   -rm $(PACKAGE)-$(VERSION).tar.gz
+   intltool-update \
+   intltool-update-tmp
diff --git a/configure.ac.in b/configure.ac.in
index 7c36b24..d2ad9a6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,72 +1,84 @@
-dnl configure.ac.in
 dnl
 dnl xfce4-mailwatch-plugin - a mail notification plugin for the xfce4 panel
 dnl
 
-dnl version info
+dnl ***
+dnl *** Version information ***
+dnl ***
 m4_define([mailwatch_version_major], [1])
 m4_define([mailwatch_version_minor], [1])
 m4_define([mailwatch_version_micro], [0])
+m4_define([mailwatch_version_nano], []) dnl leave this empty to have no nano 
version
 m4_define([mailwatch_version_build], [@REVISION@])
 m4_define([mailwatch_version_tag], [git])
-m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(),
 [git], [mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
+m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_nano(),
 [], [], [.mailwatch_version_nano()])ifelse(mailwatch_version_tag(), [git], 
[mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
 
-dnl init autoconf
-AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version],
-[http://bugzilla.xfce.org/])
+dnl ***
+dnl *** Initialize autoconf ***
+dnl ***
+AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version], 
[http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
+AC_REVISION([mailwatch_version_build])
 
-dnl init automake
-AM_INIT_AUTOMAKE([dist-bzip2])
+dnl ***
+dnl *** Initialize automake ***
+dnl ***
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test `uname | grep \CYGWIN\` != ])
-
-dnl check for basic programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_INTLTOOL([0.31], [no-xml])
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl **
+dnl *** Initialize libtool ***
+dnl **
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-dnl check for standard header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h fcntl.h math.h netdb.h netinet/in.h \
-  signal.h stddef.h string.h sys/select.h \
-  sys/socket.h

[Xfce4-commits] garcon:master I18n: Update translation hu (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 9b60a90575a1f816907c7ac1ce75ba976a3d0ffa (commit)
   from d4537d6ab5b9d5346f484c31f59ce5b92c4eb015 (commit)

commit 9b60a90575a1f816907c7ac1ce75ba976a3d0ffa
Author: Nucleo nuc...@indamail.hu
Date:   Tue Sep 10 00:30:12 2013 +0200

I18n: Update translation hu (100%).

34 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/hu.po |   99 --
 1 file changed, 44 insertions(+), 55 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 73dc008..d5bec59 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,19 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Nucleo nuc...@indamail.hu, 2013
 msgid 
 msgstr 
-Project-Id-Version: libxfce4menu\n
+Project-Id-Version: Garcon\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-14 16:09+\n
-PO-Revision-Date: \n
-Last-Translator: SZERVÁC Attila s...@321.hu\n
-Language-Team: Hungarian debian-l10n-hungarian@lists.d.o\n
+POT-Creation-Date: 2013-08-03 00:30+0200\n
+PO-Revision-Date: 2013-09-09 21:08+\n
+Last-Translator: Nucleo nuc...@indamail.hu\n
+Language-Team: Hungarian 
(http://www.transifex.com/projects/p/xfce/language/hu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Language: hu\n
-Plural-Forms: nplurals=2; plural=n1;\n
-X-Poedit-Language: Hungarian\n
-X-Poedit-Country: HUNGARY\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
 
 #: ../data/xfce/xfce-accessories.directory.in.h:1
 msgid Accessories
@@ -64,21 +67,21 @@ msgid Settings for several hardware devices
 msgstr Számos hardvereszköz beállításai
 
 #: ../data/xfce/xfce-multimedia.directory.in.h:1
-msgid Audio and video players and editors
-msgstr Hang- és videolejátszók és -szerkesztők
-
-#: ../data/xfce/xfce-multimedia.directory.in.h:2
 msgid Multimedia
 msgstr Multimédia
 
-#: ../data/xfce/xfce-network.directory.in.h:1
-msgid Applications for Internet access
-msgstr Alkalmazások az internet eléréséhez
+#: ../data/xfce/xfce-multimedia.directory.in.h:2
+msgid Audio and video players and editors
+msgstr Hang- és videolejátszók és -szerkesztők
 
-#: ../data/xfce/xfce-network.directory.in.h:2
+#: ../data/xfce/xfce-network.directory.in.h:1
 msgid Internet
 msgstr Internet
 
+#: ../data/xfce/xfce-network.directory.in.h:2
+msgid Applications for Internet access
+msgstr Alkalmazások az internet eléréséhez
+
 #: ../data/xfce/xfce-office.directory.in.h:1
 msgid Office
 msgstr Iroda
@@ -88,13 +91,13 @@ msgid Office and productivity applications
 msgstr Irodai alkalmazások
 
 #: ../data/xfce/xfce-other.directory.in.h:1
-msgid Applications that don't fit into other categories
-msgstr Más kategóriákba nem illeszkedő alkalmazások
-
-#: ../data/xfce/xfce-other.directory.in.h:2
 msgid Other
 msgstr Egyéb
 
+#: ../data/xfce/xfce-other.directory.in.h:2
+msgid Applications that don't fit into other categories
+msgstr Más kategóriákba nem illeszkedő alkalmazások
+
 #: ../data/xfce/xfce-personal.directory.in.h:1
 msgid Personal
 msgstr Személyes
@@ -104,21 +107,21 @@ msgid Personal settings
 msgstr Személyes beállítások
 
 #: ../data/xfce/xfce-screensavers.directory.in.h:1
-msgid Screensaver applets
-msgstr Képernyővédő alkalmazások
-
-#: ../data/xfce/xfce-screensavers.directory.in.h:2
 msgid Screensavers
 msgstr Képernyővédők
 
-#: ../data/xfce/xfce-settings.directory.in.h:1
-msgid Desktop and system settings applications
-msgstr Az asztali környezet és a rendszer beállításai
+#: ../data/xfce/xfce-screensavers.directory.in.h:2
+msgid Screensaver applets
+msgstr Képernyővédő alkalmazások
 
-#: ../data/xfce/xfce-settings.directory.in.h:2
+#: ../data/xfce/xfce-settings.directory.in.h:1
 msgid Settings
 msgstr Beállítások
 
+#: ../data/xfce/xfce-settings.directory.in.h:2
+msgid Desktop and system settings applications
+msgstr Az asztali környezet és a rendszer beállításai
+
 #: ../data/xfce/xfce-system.directory.in.h:1
 msgid System
 msgstr Rendszer
@@ -127,44 +130,30 @@ msgstr Rendszer
 msgid System tools and utilities
 msgstr Rendszereszközök és segédprogramok
 
-#: ../garcon/garcon-menu.c:706
+#: ../garcon/garcon-menu.c:702
 #, c-format
 msgid File \%s\ not found
 msgstr A fájl („%s”) nem található
 
-#: ../garcon/garcon-menu-parser.c:280
+#: ../garcon/garcon-menu-parser.c:276
 #, c-format
 msgid Could not load menu file data from %s: %s
 msgstr Nem tölthetők be a menüfájl adatai innen: %s: %s
 
-#: ../garcon/garcon-menu-parser.c:287
+#: ../garcon/garcon-menu-parser.c:283
 #, c-format
 msgid Could not load menu file data from %s
 msgstr Nem tölthetők be a menüfájl adatai innen: %s
 
-#~ msgid Network
-#~ msgstr Hálózat
-
-#~ msgid Network applications and utilities
-#~ msgstr Hálózati alkalmazások és segédprogramok
-
-#~ msgid Science
-#~ msgstr Tudomány
-
-#~ msgid Scientific software
-#~

[Xfce4-commits] xfce4-appfinder:master I18n: Update translation hr (89%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to b7caa4d98e425348ff069e60042e011ba395a8bc (commit)
   from f33b95c2131645d07c59a8a6b632bea9599a88e9 (commit)

commit b7caa4d98e425348ff069e60042e011ba395a8bc
Author: Ivica  Kolić ik...@yahoo.com
Date:   Tue Sep 10 00:30:38 2013 +0200

I18n: Update translation hr (89%).

62 translated messages, 7 untranslated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/hr.po |  279 --
 1 file changed, 126 insertions(+), 153 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index 2688720..feea8e2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,54 +1,61 @@
-# Croatian translations for  xfce4-appfinder package.
-# Copyright (C) 2010 The Xfce development team.
-# This file is distributed under the same license as the  xfce4-appfinder 
package.
-#  Ivica Kolićik...@yahoo.com, 2010.
-#  Ivica Kolićik...@yahoo.com , 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ivica  Kolić ik...@yahoo.com, 2010
+# Ivica  Kolić ik...@yahoo.com, 2010
+# Ivica  Kolić ik...@yahoo.com, 2013
 msgid 
 msgstr 
-Project-Id-Version: xfce4-appfinder\n
+Project-Id-Version: Xfce4-appfinder\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-06 22:00+\n
-PO-Revision-Date: 2012-05-05 09:26+0100\n
-Last-Translator: Ivica Kolić ik...@yahoo.com\n
-Language-Team: Croatian \n
+POT-Creation-Date: 2013-07-29 00:30+0200\n
+PO-Revision-Date: 2013-09-09 20:26+\n
+Last-Translator: Ivica  Kolić ik...@yahoo.com\n
+Language-Team: Croatian 
(http://www.transifex.com/projects/p/xfce/language/hr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Language: hr\n
-Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
+Plural-Forms: nplurals=3; plural=n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2;\n
 
 #: ../src/appfinder-category-model.c:146
 msgid All Applications
 msgstr Svi programi
 
-#: ../src/appfinder-model.c:545
+#: ../src/appfinder-model.c:575
 msgid Name
 msgstr Ime
 
-#: ../src/appfinder-model.c:546
+#: ../src/appfinder-model.c:576
 msgid Comment
 msgstr Komentar
 
-#: ../src/appfinder-model.c:547
+#: ../src/appfinder-model.c:577
 msgid Command
 msgstr Naredba
 
-#: ../src/appfinder-model.c:548
+#: ../src/appfinder-model.c:578
 msgid Categories
 msgstr Kategorije
 
-#: ../src/appfinder-model.c:549
+#: ../src/appfinder-model.c:579
 msgid Filename
 msgstr Ime datoteke
 
-#: ../src/appfinder-model.c:1829
+#: ../src/appfinder-model.c:2100
 msgid Application has no command
 msgstr Program nema naredbe
 
-#: ../src/appfinder-model.c:2153
+#: ../src/appfinder-model.c:2519
 msgid Commands History
 msgstr Povijest naredbi
 
+#: ../src/appfinder-model.c:2543
+msgid Bookmarks
+msgstr Zabilješke
+
 #: ../src/appfinder-preferences.c:219
 msgid C_lear
 msgstr O_čisti
@@ -70,240 +77,236 @@ msgstr Prilagođena akcija biti će trajno izbrisana.
 msgid Are you sure you want to delete pattern \%s\?
 msgstr Jeste li sigurni da želite izbrisati uzorak \%s\?
 
-#: ../src/appfinder-window.c:219 ../src/main.c:446
-#: ../src/appfinder-preferences.glade.h:4
+#: ../src/appfinder-window.c:222 ../src/appfinder-preferences.glade.h:10
 #: ../data/xfce4-appfinder.desktop.in.h:1
 msgid Application Finder
 msgstr Nalaznik programa
 
-#: ../src/appfinder-window.c:286
+#: ../src/appfinder-window.c:289
 msgid Toggle view mode
 msgstr Promjeni način pregleda
 
-#: ../src/appfinder-window.c:391
+#: ../src/appfinder-window.c:394
 msgid La_unch
 msgstr Po_kreni
 
-#: ../src/appfinder-window.c:826
+#: ../src/appfinder-window.c:880
 msgid Failed to launch desktop item editor
 msgstr Neuspjelo pokretanje uređivača stavki radne površine
 
-#: ../src/appfinder-window.c:852
+#: ../src/appfinder-window.c:906
 msgid 
 This will permanently remove the custom desktop file from your home 
 directory.
-msgstr 
-Ovo će trajno ukloniti prilagođenu datoteku radne površine iz vaše osobne 
-mape.
+msgstr Ovo će trajno ukloniti prilagođenu datoteku radne površine iz vaše 
osobne mape.
 
-#: ../src/appfinder-window.c:853
+#: ../src/appfinder-window.c:907
 #, c-format
 msgid Are you sure you want to revert \%s\?
 msgstr Jeste li sigurni da želite vratiti  \%s\?
 
-#: ../src/appfinder-window.c:863
+#: ../src/appfinder-window.c:917
 msgid Failed to remove desktop file
 msgstr Neuspjelo uklanjanje datoteke radne površine
 
 #. I18N: the first %s will be replace with users' applications directory, the
 #. * second with Hidden=true
-#: ../src/appfinder-window.c:896
+#: ../src/appfinder-window.c:950
 #, c-format
 msgid 
 To unhide the item you have to manually remove the desktop file from \%s\ 
 or open the file in the same directory and remove the line \%s\.
-msgstr 
+msgstr Za otkrivanje stavke morate ručno

[Xfce4-commits] thunar-volman:master I18n: Update translation hr (81%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 59d4cc15f082805c6cbd8ea3662e3a6c088b66e3 (commit)
   from f81a4fb5926a0368cf223bc799a2ad33bfec00be (commit)

commit 59d4cc15f082805c6cbd8ea3662e3a6c088b66e3
Author: Ivica  Kolić ik...@yahoo.com
Date:   Tue Sep 10 00:30:31 2013 +0200

I18n: Update translation hr (81%).

92 translated messages, 21 untranslated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/hr.po |   41 -
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index a911621..32152d4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,31 +1,30 @@
-# Croatian translation for the thunar-volman package.
-# Copyright (C) 2007 Benedikt Meurer.
-# This file is distributed under the same license as the thunar-volman package.
-# Ivica Kolić ik...@yahoo.com, 2011.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Ivica  Kolić ik...@yahoo.com, 2013
+# Ivica  Kolić ik...@yahoo.com, 2011
 msgid 
 msgstr 
-Project-Id-Version: thunar-volman\n
+Project-Id-Version: Thunar-volman\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-12-13 00:18+\n
-PO-Revision-Date: 2011-05-28 16:45+0200\n
-Last-Translator: Ivica Kolić ik...@yahoo.com\n
-Language-Team: Croatian ik...@yahoo.com\n
+POT-Creation-Date: 2013-07-02 22:37+0200\n
+PO-Revision-Date: 2013-09-09 20:39+\n
+Last-Translator: Ivica  Kolić ik...@yahoo.com\n
+Language-Team: Croatian 
(http://www.transifex.com/projects/p/xfce/language/hr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Language: hr\n
-Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
-X-Poedit-Language: Croatian\n
-X-Poedit-SourceCharset: utf-8\n
-X-Poedit-Country: CROATIA\n
+Plural-Forms: nplurals=3; plural=n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2;\n
 
 #: ../thunar-volman/main.c:59
 msgid The syfs path of the newly added device
 msgstr Syfs putanja novo dodanog uređaja
 
 #: ../thunar-volman/main.c:60
-#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:104
 msgid Configure management of removable drives and media
 msgstr Konfiguriraj upravljanje uklonjivih pogona i medija
@@ -263,7 +262,7 @@ msgstr Umetnut je prazan DVD
 
 #: ../thunar-volman/tvm-run.c:190
 msgid You have inserted a blank DVD.
-msgstr Umetnuli ste prazan DVD
+msgstr Umetnuli ste prazan DVD.
 
 #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202
 msgid What would you like to do?
@@ -279,7 +278,7 @@ msgstr Umetnut je prazan CD
 
 #: ../thunar-volman/tvm-run.c:201
 msgid You have inserted a blank CD.
-msgstr Umetnuli ste prazan CD
+msgstr Umetnuli ste prazan CD.
 
 #: ../thunar-volman/tvm-run.c:204
 msgid Burn _Data CD
@@ -325,7 +324,7 @@ msgstr Nepodržana vrsta USB uređaja \%s\
 msgid Thunar Volume Manager Settings
 msgstr 
 
-#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:2
+#: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:102
 msgid Removable Drives and Media
 msgstr Uklonjivi pogoni i mediji
@@ -356,7 +355,7 @@ msgstr Ruby skripte
 
 #: ../thunar-volman-settings/tvm-command-entry.c:288
 msgid Shell Scripts
-msgstr 
+msgstr Skripte ljuske
 
 #. Storage
 #. 
@@ -402,7 +401,7 @@ msgstr Naredba za _podatkovne CD-e:
 
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:239
 msgid Command for A_udio CDs:
-msgstr Naredba za a_udio CD-e
+msgstr Naredba za a_udio CD-e:
 
 #. Multimedia
 #. 
@@ -443,7 +442,7 @@ msgstr N_aredba:
 
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:343
 msgid Portable Music Players
-msgstr Prijenosni glazbeni svirači
+msgstr 
 
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:360
 msgid Play _music files when connected
@@ -494,7 +493,7 @@ msgstr Pisači
 
 #: ../thunar-volman-settings/tvm-preferences-dialog.c:545
 msgid Automatically run a program when a _printer is connected
-msgstr Automatski poreni program kada je _pisač spojen
+msgstr Automatski pokreni program kada je _pisač spojen
 
 #. Input Devices
 #. 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfconf:master I18n: Update translation hr (56%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 029a7914234a263929cb3abfbd0c6530d820b07c (commit)
   from 0c565e5c36e7c25fde3db269a2565c94c0d1812d (commit)

commit 029a7914234a263929cb3abfbd0c6530d820b07c
Author: Ivica  Kolić ik...@yahoo.com
Date:   Tue Sep 10 00:32:16 2013 +0200

I18n: Update translation hr (56%).

38 translated messages, 29 untranslated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/hr.po |   77 +++---
 1 file changed, 23 insertions(+), 54 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index 6464823..a291785 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,27 +1,25 @@
-# Croazian translation of xconf package..
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the  xconf package.
-# Ivica Kolić ik...@yahoo.com, 2011.
-#
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ivica  Kolić ik...@yahoo.com, 2013
+# Ivica  Kolić ik...@yahoo.com, 2011
 msgid 
 msgstr 
-Project-Id-Version: xconf\n
+Project-Id-Version: Xfconf\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-11-28 21:48+0100\n
-PO-Revision-Date: 2011-05-21 08:59+0200\n
-Last-Translator: Ivica Kolić ik...@yahoo.com\n
-Language-Team: Croatian ik...@yahoo.com\n
-Language: hr\n
+POT-Creation-Date: 2013-07-02 22:48+0200\n
+PO-Revision-Date: 2013-09-09 21:25+\n
+Last-Translator: Ivica  Kolić ik...@yahoo.com\n
+Language-Team: Croatian 
(http://www.transifex.com/projects/p/xfce/language/hr/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-X-Poedit-Country: CROATIA\n
-Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  n
-%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
-X-Poedit-Language: Croatian\n
-X-Poedit-SourceCharset: utf-8\n
+Language: hr\n
+Plural-Forms: nplurals=3; plural=n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2;\n
 
-#: ../xfconf/xfconf-cache.c:876
+#: ../xfconf/xfconf-cache.c:897
 #, c-format
 msgid Failed to make ResetProperty DBus call
 msgstr 
@@ -35,7 +33,7 @@ msgstr Nije moguće napraviti konfiguracijski direktorij 
\%s\
 #: ../xfconfd/xfconf-daemon.c:238
 #, c-format
 msgid Permission denied while modifying property \%s\ on channel \%s\
-msgstr Dozvola odbijena dok je mjenjano svojstvo \\%s\ na kanalu \%s\
+msgstr Dozvola odbijena dok je mjenjano svojstvo \%s\ na kanalu \%s\
 
 #: ../xfconfd/xfconf-backend-perchannel-xml.c:387
 #: ../xfconfd/xfconf-backend-perchannel-xml.c:469
@@ -102,9 +100,7 @@ msgstr Korijenski element ('/') nije valjano ime svojstva
 msgid 
 Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', 
 '-', '' and '', as well as '/' as a separator
-msgstr 
-Imena svojstava mogu sadržavati samo ASCII znakove A-Z, a-z, 0-9, '_', '-', 
-'' i ''kao i '/' kao razdjelnik
+msgstr Imena svojstava mogu sadržavati samo ASCII znakove A-Z, a-z, 0-9, '_', 
'-', '' i ''kao i '/' kao razdjelnik
 
 #: ../xfconfd/xfconf-backend.c:135
 #, c-format
@@ -126,8 +122,7 @@ msgstr 
 msgid 
 Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and 
 '-'
-msgstr 
-Imena kanala mogu sadržavati samo ASCII znakove  A-Z, a-z, 0-9, '_', i '-'
+msgstr Imena kanala mogu sadržavati samo ASCII znakove  A-Z, a-z, 0-9, '_', i 
'-'
 
 #: ../xfconfd/xfconf-backend.c:398
 #, c-format
@@ -142,8 +137,8 @@ msgstr Ispis xconfd verzije
 
 #: ../xfconfd/main.c:136
 msgid 
-Configuration backends to use.  The first backend specified is opened read/
-write; the others, read-only.
+Configuration backends to use.  The first backend specified is opened 
+read/write; the others, read-only.
 msgstr 
 
 #: ../xfconfd/main.c:139
@@ -219,7 +214,7 @@ msgstr Odredi tip vrijednosti svojstva
 
 #: ../xfconf-query/main.c:208
 msgid Reset property
-msgstr Ponovno pokreni svojstvo
+msgstr Ponovno postavi svojstvo
 
 #: ../xfconf-query/main.c:212
 msgid Recursive (use with -r)
@@ -279,7 +274,7 @@ msgstr 
 #: ../xfconf-query/main.c:319
 #, c-format
 msgid Start monitoring channel \%s\:
-msgstr Započnite praćenje kanala \% s\:
+msgstr Započnite praćenje kanala \%s\:
 
 #: ../xfconf-query/main.c:353 ../xfconf-query/main.c:458
 #: ../xfconf-query/main.c:527
@@ -304,9 +299,7 @@ msgstr 
 msgid 
 Property \%s\ does not exist on channel \%s\. If a new property should 
 be created, use the --create option
-msgstr 
-Svojstvo \%s\ ne postoji na kanalu \%s\.  Ako treba napraviti novo 
-koristite opciju --create
+msgstr Svojstvo \%s\ ne postoji na kanalu \%s\.  Ako treba napraviti novo 
koristite opciju --create
 
 #: ../xfconf-query/main.c:407
 msgid When creating a new property, the value type must be specified
@@ -314,7 +307,7 @@ msgstr Pri stvaranju novoga svojstva tip vrijednosti mora 
biti određen
 
 #: ../xfconf-query/main.c:417
 msgid Failed to get the existing type for the value
-msgstr Nije moguće odrediti tip

[Xfce4-commits] parole:bluesabre/gtk3 Initial GtkAction implementation

2013-09-09 Thread Sean Davis 
Updating branch refs/heads/bluesabre/gtk3
 to 5e2fffef8e7aba5889f8906a4a458f6bc546a7ca (commit)
   from 0e4103763f45c0930d8d12664713f7ae3d72442c (commit)

commit 5e2fffef8e7aba5889f8906a4a458f6bc546a7ca
Author: Sean Davis smd.seanda...@gmail.com
Date:   Mon Sep 9 22:40:03 2013 -0400

Initial GtkAction implementation

 data/interfaces/parole.ui |  171 ---
 src/parole-player.c   |  280 +++--
 2 files changed, 215 insertions(+), 236 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 2280ed3..56bc136 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -1,136 +1,136 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
-  object class=GtkImage id=image12
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namegtk-about-symbolic/property
-property name=use_fallbackTrue/property
-  /object
   object class=GtkAdjustment id=adjustment1
 property name=upper100/property
 property name=step_increment1/property
 property name=page_increment10/property
   /object
-  object class=GtkImage id=image10
+  object class=GtkImage id=image_media_fullscreen
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_nameface-sick-symbolic/property
+property name=pixel_size24/property
+property name=icon_nameview-fullscreen-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image1
+  object class=GtkImage id=image_media_next
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namemedia-optical-symbolic/property
+property name=pixel_size24/property
+property name=icon_namemedia-skip-forward-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image11
+  object class=GtkImage id=image_media_playpause
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namedocument-save-as-symbolic/property
+property name=pixel_size24/property
+property name=icon_namemedia-playback-start-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image2
+  object class=GtkImage id=image_media_previous
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namefolder-remote-symbolic/property
+property name=pixel_size24/property
+property name=icon_namemedia-skip-backward-symbolic/property
 property name=use_fallbackTrue/property
-property name=icon-size1/property
   /object
-  object class=GtkImage id=image3
+  object class=GtkImage id=image_about
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=pixel_size16/property
-property name=icon_nameaudio-volume-high-symbolic/property
+property name=icon_namegtk-about-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image4
+  object class=GtkImage id=image_disc
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=pixel_size16/property
-property name=icon_nameaudio-volume-low-symbolic/property
+property name=icon_namemedia-optical-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image5
+  object class=GtkImage id=image_help_reportbug
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=pixel_size16/property
-property name=icon_nameaudio-volume-muted-symbolic/property
+property name=icon_nameface-sick-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image6
+  object class=GtkImage id=image_menu_fullscreen
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=pixel_size16/property
 property name=icon_nameview-fullscreen-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image7
+  object class=GtkImage id=image_open
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=pixel_size16/property
 property name=icon_namedocument-open-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image8
+  object class=GtkImage id=image_open_location
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+

[Xfce4-commits] parole:bluesabre/gtk3 Use GtkAction for Repeat/Shuffle

2013-09-09 Thread Sean Davis 
Updating branch refs/heads/bluesabre/gtk3
 to ed4fe2eca1abc79fc568cd8623e735a1a12af7af (commit)
   from 5e2fffef8e7aba5889f8906a4a458f6bc546a7ca (commit)

commit ed4fe2eca1abc79fc568cd8623e735a1a12af7af
Author: Sean Davis smd.seanda...@gmail.com
Date:   Mon Sep 9 23:44:25 2013 -0400

Use GtkAction for Repeat/Shuffle

 data/interfaces/parole.ui   |   44 +
 data/interfaces/playlist.ui |   24 --
 src/parole-medialist.c  |  110 ---
 src/parole-medialist.h  |   22 -
 src/parole-player.c |   91 ---
 5 files changed, 68 insertions(+), 223 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 56bc136..a9b4d8c 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -6,6 +6,20 @@
 property name=step_increment1/property
 property name=page_increment10/property
   /object
+  object class=GtkImage id=image_disc
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+property name=icon_namemedia-optical-symbolic/property
+property name=use_fallbackTrue/property
+  /object
+  object class=GtkImage id=image_help_reportbug
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+property name=icon_nameface-sick-symbolic/property
+property name=use_fallbackTrue/property
+  /object
   object class=GtkImage id=image_media_fullscreen
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -34,27 +48,6 @@
 property name=icon_namemedia-skip-backward-symbolic/property
 property name=use_fallbackTrue/property
   /object
-  object class=GtkImage id=image_about
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namegtk-about-symbolic/property
-property name=use_fallbackTrue/property
-  /object
-  object class=GtkImage id=image_disc
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namemedia-optical-symbolic/property
-property name=use_fallbackTrue/property
-  /object
-  object class=GtkImage id=image_help_reportbug
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_nameface-sick-symbolic/property
-property name=use_fallbackTrue/property
-  /object
   object class=GtkImage id=image_menu_fullscreen
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -133,6 +126,13 @@
 property name=icon_nameaudio-volume-high-symbolic/property
 property name=use_fallbackTrue/property
   /object
+  object class=GtkImage id=image_about
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+property name=icon_namegtk-about-symbolic/property
+property name=use_fallbackTrue/property
+  /object
   object class=GtkWindow id=main-window
 property name=can_focusFalse/property
 property name=title translatable=yesParole Media Player/property
@@ -263,7 +263,6 @@
 property name=can_focusFalse/property
 property name=label 
translatable=yes_Repeat/property
 property name=use_underlineTrue/property
-signal name=toggled 
handler=parole_player_repeat_toggled_cb swapped=no/
   /object
 /child
 child
@@ -272,7 +271,6 @@
 property name=can_focusFalse/property
 property name=label 
translatable=yes_Shuffle/property
 property name=use_underlineTrue/property
-signal name=toggled 
handler=parole_player_shuffle_toggled_cb swapped=no/
   /object
 /child
 child
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index 2158a69..18c0716 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -149,7 +149,6 @@
 property name=label translatable=yesRepeat/property
 property name=use_underlineTrue/property
 property 
name=icon_namemedia-playlist-repeat-symbolic/property
-signal name=toggled 
handler=parole_media_list_repeat_toggled_cb swapped=no/
   /object
   packing
 property name=expandFalse/property
@@ -164,7 +163,6 @@
 property name=label translatable=yesShuffle/property
 property name=use_underlineTrue/property
 property 
name=icon_namemedia-playlist-shuffle-symbolic/property
-signal name=toggled

[Xfce4-commits] xfce4-appfinder:master I18n: Update translation zh_CN (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 25f55a16a2d5211f89e4a7ce1e9540084a8f9578 (commit)
   from b7caa4d98e425348ff069e60042e011ba395a8bc (commit)

commit 25f55a16a2d5211f89e4a7ce1e9540084a8f9578
Author: 玉堂白鹤 yjw...@qq.com
Date:   Tue Sep 10 06:30:36 2013 +0200

I18n: Update translation zh_CN (100%).

69 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/zh_CN.po |  271 +--
 1 file changed, 134 insertions(+), 137 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ea2614b..f878a0d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,315 +1,312 @@
-# Simplified Chinese translations for
-# the xfce4-appfinder package.
-# This file is distributed under the same license as
-# the xfce4-appfinder package.
-# Yongtao Yang yongtao.y...@telia.com, 2004.
-# Huang Huan unicon...@gmail.com, 2006.
-# Jick Nan jick@gmail.com, 2006.
-# Hunt Xu hun...@live.cn, 2008, 2010.
-# Chris K. Zhang plut...@gmail.com, 2009.
-# Chipong Luo chipong@yahoo.com, 2011, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chipong Luo chipong@yahoo.com, 2011-2012
+# Chris K. Zhang plut...@gmail.com, 2009
+# Huang Huan unicon...@gmail.com, 2006
+# Hunt Xu hun...@live.cn, 2008,2010
+# Jick Nan jick@gmail.com, 2006
+# 玉堂白鹤 yjw...@qq.com, 2013
+# Yongtao Yang yongtao.y...@telia.com, 2004
 msgid 
 msgstr 
-Project-Id-Version: xfce4-appfinder\n
+Project-Id-Version: Xfce4-appfinder\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-22 21:24+\n
-PO-Revision-Date: 2010-11-23 23:14+0800\n
-Last-Translator: Chipong Luo chipong@yahoo.com\n
-Language-Team: Chinese (Simplified) xfce-i18n...@xfce.org\n
-Language: zh_CN\n
+POT-Creation-Date: 2013-07-29 00:30+0200\n
+PO-Revision-Date: 2013-09-10 03:21+\n
+Last-Translator: 玉堂白鹤 yjw...@qq.com\n
+Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: zh_CN\n
 Plural-Forms: nplurals=1; plural=0;\n
 
 #: ../src/appfinder-category-model.c:146
 msgid All Applications
 msgstr 所有应用程序
 
-#: ../src/appfinder-model.c:545
+#: ../src/appfinder-model.c:575
 msgid Name
 msgstr 名称
 
-#: ../src/appfinder-model.c:546
+#: ../src/appfinder-model.c:576
 msgid Comment
 msgstr 注释
 
-#: ../src/appfinder-model.c:547
+#: ../src/appfinder-model.c:577
 msgid Command
 msgstr 命令
 
-#: ../src/appfinder-model.c:548
+#: ../src/appfinder-model.c:578
 msgid Categories
 msgstr 类别
 
-#: ../src/appfinder-model.c:549
+#: ../src/appfinder-model.c:579
 msgid Filename
 msgstr 文件名
 
-#: ../src/appfinder-model.c:1829
+#: ../src/appfinder-model.c:2100
 msgid Application has no command
 msgstr 应用程序没有命令
 
-#: ../src/appfinder-model.c:2153
+#: ../src/appfinder-model.c:2519
 msgid Commands History
 msgstr 命令历史
 
-#: ../src/appfinder-preferences.c:221
+#: ../src/appfinder-model.c:2543
+msgid Bookmarks
+msgstr 书签
+
+#: ../src/appfinder-preferences.c:219
 msgid C_lear
 msgstr 清除(_L)
 
-#: ../src/appfinder-preferences.c:222
+#: ../src/appfinder-preferences.c:220
 msgid This will permanently clear the custom command history.
 msgstr 这会永远清除自定义的命令历史。
 
-#: ../src/appfinder-preferences.c:223
+#: ../src/appfinder-preferences.c:221
 msgid Are you sure you want to clear the command history?
 msgstr 您确定要清除命令历史吗？
 
-#: ../src/appfinder-preferences.c:333
+#: ../src/appfinder-preferences.c:331
 msgid The custom action will be deleted permanently.
 msgstr 将永远删除自定义的动作。
 
-#: ../src/appfinder-preferences.c:334
+#: ../src/appfinder-preferences.c:332
 #, c-format
 msgid Are you sure you want to delete pattern \%s\?
 msgstr 您确定要删除类型 “%s” 吗？
 
-#: ../src/appfinder-window.c:219 ../src/main.c:446
-#: ../src/appfinder-preferences.glade.h:4
+#: ../src/appfinder-window.c:222 ../src/appfinder-preferences.glade.h:10
 #: ../data/xfce4-appfinder.desktop.in.h:1
 msgid Application Finder
 msgstr 应用程序查找器
 
-#: ../src/appfinder-window.c:271
+#: ../src/appfinder-window.c:289
 msgid Toggle view mode
 msgstr 切换视图模式
 
-#: ../src/appfinder-window.c:363
+#: ../src/appfinder-window.c:394
 msgid La_unch
 msgstr 启动(_U)
 
-#: ../src/appfinder-window.c:798
+#: ../src/appfinder-window.c:880
 msgid Failed to launch desktop item editor
 msgstr 无法启动桌面项目编辑器
 
-#: ../src/appfinder-window.c:824
+#: ../src/appfinder-window.c:906
 msgid 
 This will permanently remove the custom desktop file from your home 
 directory.
 msgstr 这会从您的主文件夹中永远移除自定义的桌面文件。
 
-#: ../src/appfinder-window.c:825
+#: ../src/appfinder-window.c:907
 #, c-format
 msgid Are you sure you want to revert \%s\?
 msgstr 您确定要恢复 “%s” 吗？
 
-#: ../src/appfinder-window.c:835
+#: ../src/appfinder-window.c:917
 msgid Failed to remove desktop file
 msgstr 无法移除桌面文件
 
 #. I18N: the first %s will be replace with users'

[Xfce4-commits] xfdesktop:master I18n: Update translation kk (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to c5d4b833b1ed537e782de0b5bbc590e7ce79d070 (commit)
   from 72db63766094dd55fa60ffed85ff846adbd00631 (commit)

commit c5d4b833b1ed537e782de0b5bbc590e7ce79d070
Author: Baurzhan Muftakhidinov baurthefi...@gmail.com
Date:   Tue Sep 10 06:32:13 2013 +0200

I18n: Update translation kk (100%).

196 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/kk.po |   88 ++
 1 file changed, 54 insertions(+), 34 deletions(-)

diff --git a/po/kk.po b/po/kk.po
index 64eada0..5997497 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: Xfdesktop\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-08-27 06:32+0200\n
-PO-Revision-Date: 2013-08-28 05:13+\n
+POT-Creation-Date: 2013-08-31 06:32+0200\n
+PO-Revision-Date: 2013-09-10 02:49+\n
 Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n
 Language-Team: Kazakh kk...@googlegroups.com\n
 MIME-Version: 1.0\n
@@ -269,7 +269,7 @@ msgstr Қайырылған қолданбалар таңбашалары
 msgid File/launcher icons
 msgstr Файл/жөнелткіштер таңбашалары
 
-#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:945
+#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:950
 msgid Desktop
 msgstr Жұмыс үстелі
 
@@ -379,74 +379,74 @@ msgstr bБастапқы таңбашалар/b
 msgid _Icons
 msgstr _Таңбашалар
 
-#: ../src/main.c:243
+#: ../src/main.c:241
 msgid Display version information
 msgstr Нұсқа ақпаратын көрсету
 
-#: ../src/main.c:244
+#: ../src/main.c:242
 msgid Reload all settings, refresh image list
 msgstr Баптауларды қайта жүктеу, суреттер тізімін жаңарту
 
-#: ../src/main.c:245
+#: ../src/main.c:243
 msgid Pop up the menu (at the current mouse position)
 msgstr Мәзірді көрсету (тышқанның ағымдағы орнында)
 
-#: ../src/main.c:246
+#: ../src/main.c:244
 msgid Pop up the window list (at the current mouse position)
 msgstr Терезелер тізімін шығару (тышқанның ағымдағы орнында)
 
-#: ../src/main.c:248
+#: ../src/main.c:246
 msgid Automatically arrange all the icons on the desktop
 msgstr Жұмыс үстеліндегі барлық таңбашаларды автореттеу
 
-#: ../src/main.c:250
+#: ../src/main.c:248
 msgid Cause xfdesktop to quit
 msgstr Xfdesktop жұмысын аяқтау
 
-#: ../src/main.c:267
+#: ../src/main.c:265
 #, c-format
 msgid Failed to parse arguments: %s\n
 msgstr Аргументтерді өндеу қатемен аяқталды: %s\n
 
-#: ../src/main.c:275
+#: ../src/main.c:273
 #, c-format
 msgid This is %s version %s, running on Xfce %s.\n
 msgstr Бұл %s, нұсқасы %s, Xfce %s қосылған.\n
 
-#: ../src/main.c:277
+#: ../src/main.c:275
 #, c-format
 msgid Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d.
 msgstr Жиналған GTK+ %d.%d.%d нұсқасымен, байланысқан GTK+ %d.%d.%d.
 
-#: ../src/main.c:281
+#: ../src/main.c:279
 #, c-format
 msgid Build options:\n
 msgstr Жинау опциялары:\n
 
-#: ../src/main.c:282
+#: ../src/main.c:280
 #, c-format
 msgid Desktop Menu:%s\n
 msgstr Жұмыс үстел мәзірі:%s\n
 
-#: ../src/main.c:284 ../src/main.c:291 ../src/main.c:298
+#: ../src/main.c:282 ../src/main.c:289 ../src/main.c:296
 msgid enabled
 msgstr қосулы
 
-#: ../src/main.c:286 ../src/main.c:293 ../src/main.c:300
+#: ../src/main.c:284 ../src/main.c:291 ../src/main.c:298
 msgid disabled
 msgstr сөндірулі
 
-#: ../src/main.c:289
+#: ../src/main.c:287
 #, c-format
 msgid Desktop Icons:   %s\n
 msgstr Жұмыс үстел таңбашалары:   %s\n
 
-#: ../src/main.c:296
+#: ../src/main.c:294
 #, c-format
 msgid Desktop File Icons:  %s\n
 msgstr Жұмыс үстел файл таңбашалары:  %s\n
 
-#: ../src/main.c:329
+#: ../src/main.c:327
 #, c-format
 msgid %s is not running.\n
 msgstr %s қосулы тұрған жоқ.\n
@@ -455,35 +455,55 @@ msgstr %s қосулы тұрған жоқ.\n
 msgid _Applications
 msgstr Қолд_анбалар
 
-#: ../src/windowlist.c:229
-msgid Window List
-msgstr Терезелер тізімі
+#: ../src/windowlist.c:72
+#, c-format
+msgid Remove Workspace %d
+msgstr %d жұмыс орнын өшіру
 
-#: ../src/windowlist.c:255
+#: ../src/windowlist.c:73
 #, c-format
-msgid bWorkspace %d/b
-msgstr bЖұмыс орны %d/b
+msgid 
+Do you really want to remove workspace %d?\n
+Note: You are currently on workspace %d.
+msgstr %d жұмыс орнын өшіруді шынымен қалайсыз ба?\nЕскерту: Сіз қазір %d 
жұмыс орнындасыз.
 
-#: ../src/windowlist.c:264
+#: ../src/windowlist.c:77
 #, c-format
-msgid Workspace %d
-msgstr Жұмыс орны %d
+msgid Remove Workspace '%s'
+msgstr '%s' жұмыс орнын өшіру
 
-#: ../src/windowlist.c:266
+#: ../src/windowlist.c:78
 #, c-format
-msgid iWorkspace %d/i
-msgstr iЖұмыс орны %d/i
+msgid 
+Do you really want to remove workspace '%s'?\n
+Note: You are currently on workspace '%s'.
+msgstr '%s' жұмыс орнын өшіруді шынымен қалайсыз ба?\nЕскерту: Сіз қазір '%s' 
жұмыс орнындасыз.
+
+#. Popup a dialog box confirming that the user wants to remove a
+#. * workspace
+#: ../src/windowlist.c:85
+msgid Remove
+msgstr Өшіру
+
+#:

[Xfce4-commits] xfdesktop:master I18n: Update translation zh_CN (100%).

2013-09-09 Thread Transifex 
Updating branch refs/heads/master
 to 3f4da9db4b49ce212e1034963c81e2fa76ec4457 (commit)
   from c5d4b833b1ed537e782de0b5bbc590e7ce79d070 (commit)

commit 3f4da9db4b49ce212e1034963c81e2fa76ec4457
Author: 玉堂白鹤 yjw...@qq.com
Date:   Tue Sep 10 06:32:13 2013 +0200

I18n: Update translation zh_CN (100%).

196 translated messages.

Transifex (https://www.transifex.com/projects/p/xfce/).

 po/zh_CN.po |  814 +++
 1 file changed, 374 insertions(+), 440 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 761f49a..5415f71 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,104 +1,133 @@
-# Simplified Chinese translations for
-# the xfdesktop package.
-# This file is distributed under the same license as
-# the xfdesktop package.
-# Yongtao Yang yongtao.y...@telia.com, 2004.
-# wuli wuri...@gmail.com,2007
-# Chris K. Zhang plut...@gmail.com, 2009.
-# Aron Xu aronmala...@163.com, 2009.
-# Hunt Xu hun...@live.cn, 2009, 2010.
-# Chipong Luo chipong@yahoo.com, 2011, 2012.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Aron Xu aronmala...@163.com, 2009
+# Chipong chipong@yahoo.com, 2011-2013
+# Chris K. Zhang plut...@gmail.com, 2009
+# Hunt Xu hun...@live.cn, 2009-2010
+# 玉堂白鹤 yjw...@qq.com, 2013
+# Yongtao Yang yongtao.y...@telia.com, 2004
+# 潇波 周 zhouxiaobo@gmail.com, 2013
+# 潇波 周 zhouxiaobo@gmail.com, 2013
+# 潇波 周 zhouxiaobo@gmail.com, 2013
+# 玉堂白鹤 yjw...@qq.com, 2013
 msgid 
 msgstr 
-Project-Id-Version: xfdesktop\n
+Project-Id-Version: Xfdesktop\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-02-01 07:30+\n
-PO-Revision-Date: 2010-11-27 22:17+0800\n
-Last-Translator: Chipong Luo chipong@yahoo.com\n
-Language-Team: Chinese (Simplified) xfce-i18n...@xfce.org\n
-MIME-Version: 1.1\n
+POT-Creation-Date: 2013-08-31 06:32+0200\n
+PO-Revision-Date: 2013-09-10 02:10+\n
+Last-Translator: 玉堂白鹤 yjw...@qq.com\n
+Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/xfce/language/zh_CN/)\n
+MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 Language: zh_CN\n
 Plural-Forms: nplurals=1; plural=0;\n
 
-#. no need to escape markup; it's already done for us
-#: ../settings/main.c:151
-#, c-format
-msgid 
-%s\n
-iSize: %dx%d/i
-msgstr 
-%s\n
-i大小：%dx%d/i
-
-#: ../settings/main.c:263 ../src/xfdesktop-special-file-icon.c:271
-#: ../src/xfdesktop-special-file-icon.c:434
+#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:272
+#: ../src/xfdesktop-special-file-icon.c:443
 msgid Home
 msgstr 主文件夹
 
-#: ../settings/main.c:265
+#: ../settings/main.c:377
 msgid Filesystem
 msgstr 文件系统
 
-#: ../settings/main.c:267
+#: ../settings/main.c:379
 msgid Trash
 msgstr 回收站
 
-#: ../settings/main.c:269
+#: ../settings/main.c:381
 msgid Removable Devices
 msgstr 可移动设备
 
-#: ../settings/main.c:454
+#. Display the file name, file type, and file size in the tooltip.
+#: ../settings/main.c:486
+#, c-format
+msgid 
+b%s/b\n
+Type: %s\n
+Size: %s
+msgstr b%s/b\n类型： %s\n大小：%s
+
+#: ../settings/main.c:667
+#, c-format
+msgid Wallpaper for Monitor %d (%s)
+msgstr 监视器 %d (%s) 壁纸
+
+#: ../settings/main.c:670
+#, c-format
+msgid Wallpaper for Monitor %d
+msgstr 监视器 %d 壁纸
+
+#: ../settings/main.c:676
 #, c-format
 msgid Wallpaper for %s on Monitor %d (%s)
-msgstr 
+msgstr %s 的壁纸，位于%d (%s) 显示器
 
-#: ../settings/main.c:458
+#: ../settings/main.c:680
 #, c-format
 msgid Wallpaper for %s on Monitor %d
-msgstr 
+msgstr %s 的壁纸，位于 %d 显示器
+
+#. Single monitor and single workspace
+#: ../settings/main.c:687
+#, c-format
+msgid Wallpaper for my desktop
+msgstr 我桌面的壁纸
+
+#. Single monitor and per workspace wallpaper
+#: ../settings/main.c:690
+#, c-format
+msgid Wallpaper for %s
+msgstr %s 壁纸
 
-#: ../settings/main.c:862
+#: ../settings/main.c:982
+msgid Image selection is unavailable while the image style is set to None.
+msgstr 图片样式设为空时图片选择器无效。
+
+#: ../settings/main.c:1199
 msgid Spanning screens
-msgstr 
+msgstr 跨屏幕
 
-#: ../settings/main.c:1011
+#: ../settings/main.c:1418
 msgid Image files
 msgstr 图片文件
 
-#: ../settings/main.c:
+#: ../settings/main.c:1555
 msgid Settings manager socket
 msgstr 设置管理器套接字
 
-#: ../settings/main.c:
+#: ../settings/main.c:1555
 msgid SOCKET ID
 msgstr 套接字 ID
 
-#: ../settings/main.c:1112
+#: ../settings/main.c:1556
 msgid Version information
 msgstr 版本信息
 
-#: ../settings/main.c:1129
+#: ../settings/main.c:1574
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr 输入 ‘%s --help’ 获取用法。
 
-#: ../settings/main.c:1141
+#: ../settings/main.c:1586
 msgid The Xfce development team. All rights reserved.
 msgstr Xfce 开发团队。保留所有权利。
 
-#: ../settings/main.c:1142
+#: ../settings/main.c:1587
 #, c-format
 msgid Please report bugs to %s.
 msgstr 请向 %s 报告缺陷。
 
-#: ../settings/main.c:1149
+#: ../settings/main.c:1594
 msgid