[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 92%
Updating branch refs/heads/master to ad5879998301e9388a4b7eb7f24532210c96c227 (commit) from 95cc88335d75f2a8c2e8100efef5144e4fd8fa6d (commit) commit ad5879998301e9388a4b7eb7f24532210c96c227 Author: 玉堂 白鹤 Date: Thu May 17 08:12:42 2012 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 92% New status: 48 messages complete with 1 fuzzy and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 25 ++--- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f5c1080..06fe81a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,19 +5,19 @@ # Xiaobin Wu , 2008. # Hunt Xu , 2008, 2009, 2010. # Chipong Luo , 2011, 2012. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-mount-plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-14 00:16+0200\n" +"POT-Creation-Date: 2012-05-17 02:00+\n" "PO-Revision-Date: 2010-06-07 08:40+0800\n" "Last-Translator: Chipong Luo \n" "Language-Team: Chinese (Simplified) \n" -"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" #: ../panel-plugin/devices.c:71 @@ -86,31 +86,34 @@ msgid "not mounted\n" msgstr "未挂载\n" #. show error message if smth failed -#. xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin:\n\nError executing command."), -#. _("Return value:"), WEXITSTATUS(exit_status), _("\nError was:"), erroutput); +#. xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount +#. Plugin:\n\nError executing command."), +#. _("Return value:"), WEXITSTATUS(exit_status), _("\nError was:"), +#. erroutput); #: ../panel-plugin/devices.c:288 #, c-format msgid "Failed to mount device \"%s\"." -msgstr "" +msgstr "挂载设备 \"%s\" 失败。" #: ../panel-plugin/devices.c:303 #, fuzzy, c-format msgid "Error executing on-mount command \"%s\"." msgstr "挂载插件:执行 on-mount 时出错。" -#. xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin: Error executing command."), +#. xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin: +#. Error executing command."), #. _("Returned"), WEXITSTATUS(exit_status), _("error was"), erroutput); -#: ../panel-plugin/devices.c:353 +#: ../panel-plugin/devices.c:357 #, c-format msgid "Failed to umount device \"%s\"." -msgstr "" +msgstr "卸载设备 \"%s\" 失败。" -#: ../panel-plugin/devices.c:356 +#: ../panel-plugin/devices.c:360 #, c-format msgid "The device \"%s\" should be removable safely now." msgstr "现在应该可以安全地移除设备 “%s” 了。" -#: ../panel-plugin/devices.c:358 +#: ../panel-plugin/devices.c:362 #, c-format msgid "An error occurred. The device \"%s\" should not be removed!" msgstr "出错。不应移除设备 “%s”!" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to bcff2fb07bc6a7a54191559e1f85a0922b800328 (commit) from e9f8a7efd62fc2c9799a86c24f75f1701aef52f3 (commit) commit bcff2fb07bc6a7a54191559e1f85a0922b800328 Author: 玉堂 白鹤 Date: Thu May 17 08:09:16 2012 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 653 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e6a2878..4f528d9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1731,9 +1731,8 @@ msgid "Open Address in New _Tab" msgstr "在新标签中打开地址(_T)" #: ../midori/midori-view.c:2686 -#, fuzzy msgid "Open _Frame in New Tab" -msgstr "在新标签中打开图片(_I)" +msgstr "在新标签中打开帧(_F)" #: ../midori/midori-view.c:2946 msgid "Open or download file" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 330cf910ec0661e18b30ff9e8c772a01dcc82932 (commit) from 6bdc36ba239ab5339b7aaba1fd70a525fbf6b7a7 (commit) commit 330cf910ec0661e18b30ff9e8c772a01dcc82932 Author: 玉堂 白鹤 Date: Thu May 17 07:57:36 2012 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 142 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 60 +++--- 1 files changed, 32 insertions(+), 28 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f1332f4..59de82d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,38 +5,42 @@ # Hunt Xu , 2009, 2010. # Jiahua Huang , 2009. # Chipong Luo , 2011, 2012. -# +# msgid "" msgstr "" "Project-Id-Version: gigolo\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-22 19:42+\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-05-17 04:48+\n" "PO-Revision-Date: 2010-11-23 23:33+0800\n" "Last-Translator: Chipong Luo \n" "Language-Team: Chinese (Simplified) \n" -"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/main.c:46 +#: ../src/main.c:47 +msgid "Connect all bookmarks marked as 'auto connect' and exit" +msgstr "连接所有标记为'自动连接'的书签,并退出" + +#: ../src/main.c:48 msgid "Ignore running instances, enforce opening a new instance" msgstr "忽略正在运行的实例,强制打开一个新实例" -#: ../src/main.c:47 +#: ../src/main.c:49 msgid "Print a list of supported URI schemes" msgstr "列印支持的 URI 方案列表" -#: ../src/main.c:48 +#: ../src/main.c:50 msgid "Be verbose" msgstr "冗长" -#: ../src/main.c:49 +#: ../src/main.c:51 msgid "Show version information" msgstr "显示版本信息" -#: ../src/main.c:79 +#: ../src/main.c:112 msgid "- a simple frontend to easily connect to remote filesystems" msgstr "-易于与远程文件系统连接的简单前端" @@ -339,81 +343,81 @@ msgstr "您必须输入一个共享名称。" msgid "You must enter a valid URI for the connection." msgstr "您必须为连接输入一个有效的 URI。" -#: ../src/bookmarkeditdialog.c:580 +#: ../src/bookmarkeditdialog.c:584 msgid "_Device:" msgstr "设备(_D):" -#: ../src/bookmarkeditdialog.c:582 ../src/bookmarkeditdialog.c:1096 +#: ../src/bookmarkeditdialog.c:586 ../src/bookmarkeditdialog.c:1100 msgid "_Server:" msgstr "服务器(_S):" -#: ../src/bookmarkeditdialog.c:893 +#: ../src/bookmarkeditdialog.c:897 msgid "Create Bookmark" msgstr "创建书签" -#: ../src/bookmarkeditdialog.c:900 +#: ../src/bookmarkeditdialog.c:904 msgid "Edit Bookmark" msgstr "编辑书签" -#: ../src/bookmarkeditdialog.c:908 +#: ../src/bookmarkeditdialog.c:912 msgid "Connect to Server" msgstr "与服务器连接" -#: ../src/bookmarkeditdialog.c:1032 +#: ../src/bookmarkeditdialog.c:1036 msgid "_Bookmark name:" msgstr "书签名(_B):" -#: ../src/bookmarkeditdialog.c:1040 +#: ../src/bookmarkeditdialog.c:1044 msgid "_Color:" msgstr "颜色(_C):" -#: ../src/bookmarkeditdialog.c:1051 +#: ../src/bookmarkeditdialog.c:1055 msgid "Au_to-Connect" msgstr "自动连接(_T)" -#: ../src/bookmarkeditdialog.c:1062 +#: ../src/bookmarkeditdialog.c:1066 msgid "Service t_ype:" msgstr "服务类型(_Y):" -#: ../src/bookmarkeditdialog.c:1087 +#: ../src/bookmarkeditdialog.c:1091 msgid "Set the port to 0 to use the default port" msgstr "将端口设置为 0 以便使用默认端口" -#: ../src/bookmarkeditdialog.c:1089 +#: ../src/bookmarkeditdialog.c:1093 msgid "" "This is not used for the actual mount, only necessary for opening the mount " "point in a file browser" msgstr "它并不真正用于挂载,只在文件浏览器中打开此挂载点时才需要" -#: ../src/bookmarkeditdialog.c:1095 +#: ../src/bookmarkeditdialog.c:1099 msgid "_Location (URI):" msgstr "位置(URI)(_L):" -#: ../src/bookmarkeditdialog.c:1097 +#: ../src/bookmarkeditdialog.c:1101 msgid "_Folder:" msgstr "文件夹(_F):" -#: ../src/bookmarkeditdialog.c:1098 +#: ../src/bookmarkeditdialog.c:1102 msgid "P_ath:" msgstr "路径(_A):" -#: ../src/bookmarkeditdialog.c:1099 +#: ../src/bookmarkeditdialog.c:1103 msgid "_User Name:" msgstr "用户名(_U):" -#: ../src/bookmarkeditdialog.c:1100 +#: ../src/bookmarkeditdialog.c:1104 msgid "Optional information:" msgstr "可选信息:" -#: ../src/bookmarkeditdialog.c:1101 +#: ../src/bookmarkeditdialog.c:1105 msgid "_Port:" msgstr "端口(_P):" -#: ../src/bookmarkeditdialog.c:1102 +#: ../src/bookmarkeditdialog.c:1106 msgid "_Domain:" msgstr "域(_D):" -#: ../src/bookmarkeditdialog.c:1103 +#: ../src/bookmarkeditdialog.c:1107 msgid "_Share:" msgstr "共享(_S):" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updated license text at the top of source files.
Updating branch refs/heads/master to 30a30c7d8b10e3b2bb94240472fc56753bfacf93 (commit) from b8d6251d38c6570dbcbd05eb833d09c6beaf83bf (commit) commit 30a30c7d8b10e3b2bb94240472fc56753bfacf93 Author: David Schneider Date: Wed May 16 18:48:58 2012 -0700 Updated license text at the top of source files. COPYING.LIB | 58 - configure.ac.in |5 +-- panel-plugin/embed-dialogs.c | 12 panel-plugin/embed-dialogs.h | 12 panel-plugin/embed.c | 12 panel-plugin/embed.h | 12 panel-plugin/ewmh.c | 12 panel-plugin/ewmh.h | 12 8 files changed, 89 insertions(+), 46 deletions(-) diff --git a/COPYING.LIB b/COPYING.LIB index 191a97f..5bc8fb2 100644 --- a/COPYING.LIB +++ b/COPYING.LIB @@ -1,15 +1,15 @@ - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the library GPL. It is numbered 2 because it goes with version 2 of the ordinary GPL.] - Preamble +Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -99,7 +99,7 @@ works together with the library. Note that it is possible for a library to be covered by the ordinary General Public License rather than by this special one. - GNU LIBRARY GENERAL PUBLIC LICENSE + GNU LIBRARY GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library which @@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY +NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. @@ -434,4 +434,48 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + +Copyright (C) + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/configure.ac.in b/configure.ac.in index 62655c5..bea17fb 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,8 +1,7 @@ -dnl $Id$ dn
[Xfce4-commits] Added *.gmo and *.tar.* to .gitignore.
Updating branch refs/heads/master to b8d6251d38c6570dbcbd05eb833d09c6beaf83bf (commit) from d20cec5e01cc5486423a82b284e53f3b79239912 (commit) commit b8d6251d38c6570dbcbd05eb833d09c6beaf83bf Author: David Schneider Date: Mon May 7 15:27:20 2012 -0700 Added *.gmo and *.tar.* to .gitignore. .gitignore |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index cf31546..18719b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ +*.gmo *.la *.lo *.swp +*.tar.* +*.tar.* .deps .libs ChangeLog ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set the eventbox above its childs, clicks are transferred properly now (bug #7251)
Updating branch refs/heads/master to d2db8a619cfcf2e373b4106826387b163edcd754 (commit) from 0011e3999febae9cc521209d7a9594fa12539e59 (commit) commit d2db8a619cfcf2e373b4106826387b163edcd754 Author: Landry Breuil Date: Wed May 16 21:53:34 2012 +0200 Set the eventbox above its childs, clicks are transferred properly now (bug #7251) panel-plugin/cpu.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index 1ea0c03..f72c626 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -102,6 +102,7 @@ static CPUGraph * create_gui( XfcePanelPlugin * plugin ) ebox = gtk_event_box_new(); gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); + gtk_event_box_set_above_child(GTK_EVENT_BOX(ebox), TRUE); gtk_container_add( GTK_CONTAINER( plugin ), ebox ); xfce_panel_plugin_add_action_widget( plugin, ebox ); g_signal_connect( ebox, "button-press-event", G_CALLBACK( command_cb ), base ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix transparency (bug #8747).
Updating branch refs/heads/master to 5f802c26355640421f9bb0e476f1460152a66489 (commit) from 32c062eaa5299b9385a15c6b3a74ef9ffd0e32cc (commit) commit 5f802c26355640421f9bb0e476f1460152a66489 Author: Harald Judt Date: Wed May 16 13:37:23 2012 +0200 Fix transparency (bug #8747). Set the Gtk.EventBox invisible like other panel plugins do. Signed-off-by: Landry Breuil panel-plugin/time-out.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/time-out.c b/panel-plugin/time-out.c index cc204b7..2544f01 100644 --- a/panel-plugin/time-out.c +++ b/panel-plugin/time-out.c @@ -189,6 +189,7 @@ time_out_new (XfcePanelPlugin *plugin) /* Create event box to catch user events */ time_out->ebox = gtk_event_box_new (); + gtk_event_box_set_visible_window(GTK_EVENT_BOX(time_out->ebox), FALSE); gtk_widget_show (time_out->ebox); /* Create flexible box which can do both, horizontal and vertical layout */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin
Updating branch refs/heads/master to 0011e3999febae9cc521209d7a9594fa12539e59 (commit) from 5ebb0b229a0da1d31f913de20baab4b50aebadfa (commit) commit 0011e3999febae9cc521209d7a9594fa12539e59 Merge: 5ebb0b2 7516159 Author: Landry Breuil Date: Wed May 16 20:59:18 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin commit 75161594d3135d48c0bb045ffc92801641ddcf1a Author: Tomáš Vadina Date: Tue May 15 16:43:13 2012 +0200 l10n: Updated Slovak (sk) translation to 100% New status: 36 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 2052e931e98111bc297a37865c22f620f5e00f68 Author: Andrei Zakharevich Date: Fri May 4 20:52:56 2012 +0200 l10n: Updated Belarusian (be) translation to 91% New status: 33 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit c679a5a6f959c46175c80487fe7b1a91823843e6 Author: Andrei Zakharevich Date: Fri May 4 20:51:28 2012 +0200 l10n: Updated Belarusian (be) translation to 88% New status: 32 messages complete with 0 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 7cdec4c1656ecc3cc887edfad9023c3357609698 Author: Seong-ho Cho Date: Thu May 3 11:45:50 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 36 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 3a82ee389bc076c83016af2289880465b7aa3e78 Author: Ivica Kolić Date: Wed May 2 21:11:15 2012 +0200 l10n: Initial Croatian (hr) translation New status: 22 messages complete with 0 fuzzies and 14 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 9a13793b4e06ed97c6594701f1853ab7dcae0e64 Author: Piarres Beobide Date: Mon Apr 30 00:50:43 2012 +0200 l10n: Updated Basque (eu) translation to 100% New status: 36 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/be.po| 34 ++ po/eu.po| 20 ++ po/{ur.po => hr.po} | 97 +++--- po/ko.po|2 +- po/sk.po| 22 +++- 5 files changed, 97 insertions(+), 78 deletions(-) diff --git a/po/be.po b/po/be.po index 8c67970..f56d82b 100644 --- a/po/be.po +++ b/po/be.po @@ -2,28 +2,36 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: Alexander Nyakhaychyk \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-18 23:23+0200\n" +"POT-Creation-Date: 2012-05-04 13:30+\n" "PO-Revision-Date: 2008-11-09 14:04+0200\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" -"Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: be\n" + +#: ../panel-plugin/cpu.c:150 ../panel-plugin/cpugraph.desktop.in.h:2 +msgid "Graphical representation of the CPU load" +msgstr "Графічнае прадстаўленьне нагрузкі на ЦП" + +#: ../panel-plugin/cpu.c:152 +msgid "Copyright (c) 2003-2012\n" +msgstr "Аўтарскія правы (c) 2003-2012\n" -#: ../panel-plugin/cpu.c:303 +#: ../panel-plugin/cpu.c:359 #, c-format msgid "Usage: %u%%" -msgstr "" +msgstr "Выкарыстанне: %u%%" #: ../panel-plugin/properties.c:78 msgid "CPU Graph Properties" -msgstr "" +msgstr "Наладкі CPU Graph" #: ../panel-plugin/properties.c:96 msgid "Use non-linear time-scale" @@ -35,7 +43,7 @@ msgstr "Паказваць рамку" #: ../panel-plugin/properties.c:98 msgid "Show border" -msgstr "" +msgstr "Паказваць межы" #: ../panel-plugin/properties.c:99 msgid "Show current usage bar" @@ -45,11 +53,11 @@ msgstr[1] "" #: ../panel-plugin/properties.c:101 msgid "Run in terminal" -msgstr "" +msgstr "Запусціць у тэрмінале" #: ../panel-plugin/properties.c:102 msgid "Use startup notification" -msgstr "" +msgstr "Паказваць паведамленне пра запусу" #: ../panel-plugin/properties.c:105 msgid "Color 1:" @@ -97,7 +105,7 @@ msgstr "Інтэрвал абнаўленьня:" #: ../panel-plugin/properties.c:208 msgid "All" -msgstr "" +msgstr "Усе" #: ../panel-plugin/properties.c:213 msgid "Tracked Core:" @@ -129,7 +137,7 @@ msgstr "Без гісторыі" #: ../panel-plugin/properties.c:267 msgid "Grid" -msgstr "" +msgstr "Сетка" #: ../panel-plugin/properties.c:271 msgid "Mode:" @@ -154,7 +162,3 @@ msgstr "Рэжым колераў:" #: ../panel-plugin/cpugraph.desktop.in.h:1 msgid "CPU Graph" msgstr "Графікі ЦП" - -#: ../panel-plugin/cpugraph.desktop.in.h:2 -msgid "Graphical representation of the CPU load" -msgstr "Графічнае прадстаўленьне нагрузкі на ЦП" diff --git a/po/eu.po b/po/eu.po
[Xfce4-commits] Fix transparency issues (bug #8893).
Updating branch refs/heads/master to 5ebb0b229a0da1d31f913de20baab4b50aebadfa (commit) from 7f16899a2989714c6892d1eb96d2df7b97b4ff90 (commit) commit 5ebb0b229a0da1d31f913de20baab4b50aebadfa Author: Harald Judt Date: Wed May 16 13:13:39 2012 +0200 Fix transparency issues (bug #8893). Set the Gtk.EventBox invisible. Signed-off-by: Landry Breuil panel-plugin/cpu.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index d4adeda..1ea0c03 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -101,6 +101,7 @@ static CPUGraph * create_gui( XfcePanelPlugin * plugin ) base->plugin = plugin; ebox = gtk_event_box_new(); + gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); gtk_container_add( GTK_CONTAINER( plugin ), ebox ); xfce_panel_plugin_add_action_widget( plugin, ebox ); g_signal_connect( ebox, "button-press-event", G_CALLBACK( command_cb ), base ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin
Updating branch refs/heads/master to c0e0c4fb14f8db2d08988fb5d50e43a1310645fd (commit) from 2062b48a4f93a09210ea51a07a14ecd66ea2eef0 (commit) commit c0e0c4fb14f8db2d08988fb5d50e43a1310645fd Merge: 2062b48 4792621 Author: Landry Breuil Date: Wed May 16 20:55:02 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin commit 4792621f3593c7cc74ac38564c660889851d084e Author: Sergio Marques Date: Tue May 15 17:08:59 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 174330ba7a8a3fd0f96e953c12a7ac3fabb2d62f Author: Tomáš Vadina Date: Tue May 15 16:46:53 2012 +0200 l10n: Updated Slovak (sk) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit f6e7766ce5f02e5e8528c9a0ae0065fdec3f68d2 Author: Piarres Beobide Date: Mon May 14 00:53:25 2012 +0200 l10n: Updated Basque (eu) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 19 +-- po/pt.po |3 --- po/sk.po | 28 ++-- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/po/eu.po b/po/eu.po index 794f741..691d6eb 100644 --- a/po/eu.po +++ b/po/eu.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2008-11-09 15:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale \n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 1.2.0\n" @@ -27,7 +27,6 @@ msgid "Input the device name, then press " msgstr "Gailu izena idatzi eta sakatu" #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" msgstr "/dev/hda1" @@ -64,9 +63,8 @@ msgid "I/O transfer" msgstr "S/I transferentzia" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" -msgstr "MB transeferentzia / segundu" +msgstr "MB transefirentzia / segundu" #: ../panel-plugin/config_gui.c:187 msgid "Busy time" @@ -77,7 +75,6 @@ msgid "Percentage of time the device is busy" msgstr "Gailua lanpeturik dagoen denbora ehunekoa" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " msgstr "Geh. S/I erlazioa (MB/s) " @@ -137,7 +134,7 @@ msgstr "\"Idazkteta\" monitorea lehenengo" #: ../panel-plugin/main.c:180 #, c-format msgid "%s: Device statistics unavailable." -msgstr "" +msgstr "%s: gaitu estatistika eskuraezinak" #: ../panel-plugin/main.c:219 #, c-format @@ -153,6 +150,16 @@ msgid "" " Write : %3d\n" " Total : %3d" msgstr "" +"%s\n" +"\n" +"S/I(MiB/s)\n" +" Iraku :%3.2f\n" +" Idatz :%3.2f\n" +" Guzt :%3.2f\n" +"Lan denb (%c)\n" +" Iraku : %3d\n" +" Idatz : %3d\n" +" Guzt : %3d" #: ../panel-plugin/main.c:823 msgid "Select color" diff --git a/po/pt.po b/po/pt.po index 377fc58..4c2cad9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -25,7 +25,6 @@ msgid "Input the device name, then press " msgstr "Indique o nome do dispositivo e prima " #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" msgstr "/dev/sda1" @@ -62,7 +61,6 @@ msgid "I/O transfer" msgstr "Transferência E/S" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" msgstr "MB transferidos/segundo" @@ -75,7 +73,6 @@ msgid "Percentage of time the device is busy" msgstr "Percentagem de tempo de ocupação do dispositivo" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " msgstr "Taxa máxima de I/O (MB/s)" diff --git a/po/sk.po b/po/sk.po index 1a1f726..1488d28 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,15 +2,16 @@ # Copyright (C) 2006 THE xfce4-diskperf-plugin'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-diskperf-plugin package. # Marek Hlava , 2011. +# Tomáš Vadina , 2012. # msgid "" msgstr "" "Project-Id-Version: xfce4-diskperf-plugin\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-04 16:57+0200\n" -"PO-Revision-Date: 2011-08-21 12:06+0100\n" -"Last-Translator: Marek Hlava \n" -"Language-Team: Slovak \n" +"PO-Revision-Date: 2012-05-15 16:45+0200\n" +"Last-Translator: Tomáš Vadina \n" +"Language-Team: slovenčina \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,9 +27,8 @@ msgid "Input the device name, then press " msgstr "Zadajte názov zariadenia a stlačte " #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" -msgstr "/dev/hda1" +msgstr "/dev/sda1" #: ../panel-plugin/config_gui.c:136 msgid "Data collection period" @@ -63,9 +63,8 @@ msgid "I/O transfer" msg
[Xfce4-commits] Fix transparency (bug #8892).
Updating branch refs/heads/master to 2062b48a4f93a09210ea51a07a14ecd66ea2eef0 (commit) from 39bdecb2b8788b2193acec6fb82ff60597201812 (commit) commit 2062b48a4f93a09210ea51a07a14ecd66ea2eef0 Author: Harald Judt Date: Wed May 16 13:02:58 2012 +0200 Fix transparency (bug #8892). Set the Gtk.EventBox invisible like other panel plugins do. Signed-off-by: Landry Breuil panel-plugin/main.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 7efbc7e..c5f71c1 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -474,6 +474,7 @@ static diskperf_t *diskperf_create_control (XfcePanelPlugin *plugin) poPlugin->oMonitor.oPrevPerf.timestamp_ns = 0; poMonitor->wEventBox = gtk_event_box_new (); +gtk_event_box_set_visible_window(GTK_EVENT_BOX(poMonitor->wEventBox), FALSE); gtk_widget_show (poMonitor->wEventBox); xfce_panel_plugin_add_action_widget (plugin, poMonitor->wEventBox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix background transparency by setting the main evbox hidden (bug #8891).
Updating branch refs/heads/master to 2fe17f0ae322c42a389775288562adab568615eb (commit) from 25a45351d1cb77edf34cd1b4937dc65fd8cd2aba (commit) commit 2fe17f0ae322c42a389775288562adab568615eb Author: Harald Judt Date: Wed May 16 12:36:28 2012 +0200 Fix background transparency by setting the main evbox hidden (bug #8891). The transparency fix in commit e22c9b78384e31720c29e71fc87ba145b21e6cce is incomplete. There is another Gtk.EventBox that needs to be set invisible, otherwise the label background will not be transparent. Signed-off-by: Landry Breuil panel-plugin/systemload.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c index 50c2aa5..58cc658 100644 --- a/panel-plugin/systemload.c +++ b/panel-plugin/systemload.c @@ -342,6 +342,7 @@ monitor_update_orientation (XfcePanelPlugin *plugin, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box)); +gtk_event_box_set_visible_window(GTK_EVENT_BOX(global->ebox), FALSE); gtk_widget_show(GTK_WIDGET(global->ebox)); update_monitors (global); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use GtkLabel for actions, drop SexyUrlLabel.
Updating branch refs/heads/nick/gtk3 to ca2a6fefaf7138c627e229a008d707da765ad4e0 (commit) from a41de453dae24ee18bc30ebc4a63bd95235bbc56 (commit) commit ca2a6fefaf7138c627e229a008d707da765ad4e0 Author: Nick Schermer Date: Wed May 16 18:05:26 2012 +0200 Use GtkLabel for actions, drop SexyUrlLabel. thunar/Makefile.am |2 - thunar/sexy-url-label.c| 847 thunar/sexy-url-label.h| 74 thunar/thunar-preferences-dialog.c | 10 +- 4 files changed, 4 insertions(+), 929 deletions(-) diff --git a/thunar/Makefile.am b/thunar/Makefile.am index 28c446b..fe4b114 100644 --- a/thunar/Makefile.am +++ b/thunar/Makefile.am @@ -37,8 +37,6 @@ thunar_SOURCES = \ $(thunar_dbus_sources) \ $(thunar_notify_sources)\ main.c \ - sexy-url-label.c\ - sexy-url-label.h\ thunar-abstract-dialog.c\ thunar-abstract-dialog.h\ thunar-abstract-icon-view-ui.h \ diff --git a/thunar/sexy-url-label.c b/thunar/sexy-url-label.c deleted file mode 100644 index f0a4fd1..000 --- a/thunar/sexy-url-label.c +++ /dev/null @@ -1,847 +0,0 @@ -/* - * @file libsexy/sexy-url-label.c URL Label - * - * @Copyright (C) 2007 Benedikt Meurer - * @Copyright (C) 2005-2006 Christian Hammond - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifdef HAVE_MEMORY_H -#include -#endif -#include -#ifdef HAVE_STRING_H -#include -#endif - -#include "sexy-url-label.h" - -#define SEXY_URL_LABEL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), SEXY_TYPE_URL_LABEL, \ - SexyUrlLabelPrivate)) - -typedef struct -{ - int start; - int end; - const gchar *url; - -} SexyUrlLabelLink; - -typedef struct -{ - GList *links; - GList *urls; - SexyUrlLabelLink *active_link; - GtkWidget *popup_menu; - GdkWindow *event_window; - - int layout_x; - int layout_y; - - size_t wrap_width; - - GString *temp_markup_result; - -} SexyUrlLabelPrivate; - -/* - * NOTE: This *MUST* match the LabelWrapWidth struct in gtklabel.c. - */ -typedef struct -{ - gint width; - PangoFontDescription *font_desc; - -} LabelWrapWidth; - -enum -{ - URL_ACTIVATED, - LAST_SIGNAL -}; - -static void sexy_url_label_finalize(GObject *obj); -static void sexy_url_label_realize(GtkWidget *widget); -static void sexy_url_label_unrealize(GtkWidget *widget); -static void sexy_url_label_map(GtkWidget *widget); -static void sexy_url_label_unmap(GtkWidget *widget); -static void sexy_url_label_size_allocate(GtkWidget *widget, - GtkAllocation *allocation); -static gboolean sexy_url_label_motion_notify_event(GtkWidget *widget, - GdkEventMotion *event); -static gboolean sexy_url_label_leave_notify_event(GtkWidget *widget, - GdkEventCrossing *event); -static gboolean sexy_url_label_button_press_event(GtkWidget *widget, - GdkEventButton *event); - -static void open_link_activate_cb(GtkMenuItem *menu_item, - SexyUrlLabel *url_label); -static void copy_link_activate_cb(GtkMenuItem *menu_item, - SexyUrlLabel *url_label); - -static void sexy_url_label_clear_links(SexyUrlLabel *url_label); -static void sexy_url_label_clear_urls(SexyUrlLabel *url_label); -static void sexy
[Xfce4-commits] Remove unneeded line.
Updating branch refs/heads/nick/gtk3 to a41de453dae24ee18bc30ebc4a63bd95235bbc56 (commit) from d9abe12738a256f994f9f8295899e7e0a10f9d26 (commit) commit a41de453dae24ee18bc30ebc4a63bd95235bbc56 Author: Nick Schermer Date: Wed May 16 17:24:43 2012 +0200 Remove unneeded line. thunar/thunar-folder.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c index c697573..1bf7e66 100644 --- a/thunar/thunar-folder.c +++ b/thunar/thunar-folder.c @@ -258,7 +258,6 @@ thunar_folder_dispose (GObject *object) { folder->in_destruction = TRUE; g_signal_emit (G_OBJECT (folder), folder_signals[DESTROY], 0); - folder->in_destruction = TRUE; } (*G_OBJECT_CLASS (thunar_folder_parent_class)->dispose) (object); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 95cc88335d75f2a8c2e8100efef5144e4fd8fa6d (commit) from eed324431a7f9a95e44f84ab59aad86e284b30aa (commit) commit 95cc88335d75f2a8c2e8100efef5144e4fd8fa6d Author: Seong-ho Cho Date: Wed May 16 12:14:40 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 52 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 79 ++ 1 files changed, 28 insertions(+), 51 deletions(-) diff --git a/po/ko.po b/po/ko.po index 1b11fbc..69094f4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9,14 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-mount-plugin 0.5.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-14 00:16+0200\n" -"PO-Revision-Date: 2012-04-30 09:03+0900\n" +"POT-Creation-Date: 2012-05-16 09:57+\n" +"PO-Revision-Date: 2012-05-16 19:14+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: xfce-i18n \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../panel-plugin/devices.c:71 #, c-format @@ -89,26 +90,26 @@ msgstr "마운트하지 않았습니다\n" #: ../panel-plugin/devices.c:288 #, c-format msgid "Failed to mount device \"%s\"." -msgstr "" +msgstr "\"%s\" 장치를 마운트 하는데 실패했습니다." #: ../panel-plugin/devices.c:303 -#, fuzzy, c-format +#, c-format msgid "Error executing on-mount command \"%s\"." -msgstr "마운트 플러그인: 마운트 명령 실행 중 오류가 발생했습니다." +msgstr "마운트 명령 \"%s\" 실행 중 오류가 발생했습니다." #. xfce_dialog_show_error (NULL, error, "%s %s %d, %s %s", _("Mount Plugin: Error executing command."), #. _("Returned"), WEXITSTATUS(exit_status), _("error was"), erroutput); -#: ../panel-plugin/devices.c:353 +#: ../panel-plugin/devices.c:357 #, c-format msgid "Failed to umount device \"%s\"." -msgstr "" +msgstr "\"%s\" 장치를 마운트 해제하는데 실패했습니다." -#: ../panel-plugin/devices.c:356 +#: ../panel-plugin/devices.c:360 #, c-format msgid "The device \"%s\" should be removable safely now." msgstr "\"%s\" 장치를 안전하게 분리할 수 있습니다." -#: ../panel-plugin/devices.c:358 +#: ../panel-plugin/devices.c:362 #, c-format msgid "An error occurred. The device \"%s\" should not be removed!" msgstr "오류가 발생했습니다. 장치 \"%s\"을(를) 제거할 수 없습니다!" @@ -130,12 +131,8 @@ msgid "Properties" msgstr "속성" #: ../panel-plugin/mount-plugin.c:745 -msgid "" -"This is only useful and recommended if you specify \"sync\" as part of the " -"\"unmount\" command string." -msgstr "" -"\"unmount\" 명령의 일부로 \"sync\"를 추가하면 상당히 유용하기 때문에 추천하고" -"자 합니다." +msgid "This is only useful and recommended if you specify \"sync\" as part of the \"unmount\" command string." +msgstr "\"unmount\" 명령의 일부로 \"sync\"를 추가하면 상당히 유용하기 때문에 추천하고자 합니다." #: ../panel-plugin/mount-plugin.c:750 msgid "Show _message after unmount" @@ -160,28 +157,21 @@ msgstr "일반(_G)" #: ../panel-plugin/mount-plugin.c:795 #, c-format msgid "" -"This command will be executed after mounting the device with the mount point " -"of the device as argument.\n" +"This command will be executed after mounting the device with the mount point of the device as argument.\n" "If you are unsure what to insert, try \"exo-open %m\".\n" "'%d' can be used to specify the device, '%m' for the mountpoint." msgstr "" -"이 명령어는 인수로서의 장치 마운트 포인트에 장치를 마운트하고 나서 실행합니" -"다.\n" +"이 명령어는 인수로서의 장치 마운트 포인트에 장치를 마운트하고 나서 실행합니다.\n" "어떤 명령어를 입력할지 망설이신다면, \"exo-open %m\"을(를) 입력해 보십시오.\n" -"'%d'은(는) 장치를 지정할 때 사용하고, '%m'은(는) 마운트 지점을 지정할 때 사용" -"합니다." +"'%d'은(는) 장치를 지정할 때 사용하고, '%m'은(는) 마운트 지점을 지정할 때 사용합니다." #: ../panel-plugin/mount-plugin.c:805 msgid "_Execute after mounting:" msgstr "마운트 후 실행(_E):" #: ../panel-plugin/mount-plugin.c:828 -msgid "" -"WARNING: These options are for experts only! If you do not know what they " -"may be good for, keep your hands off!" -msgstr "" -"경고: 이 옵션은 고급 사용자를 위한 것입니다. 무엇을 어떻게 해야할지 모르시면 " -"만지지 마십시오." +msgid "WARNING: These options are for experts only! If you do not know what they may be good for, keep your hands off!" +msgstr "경고: 이 옵션은 고급 사용자를 위한 것입니다. 무엇을 어떻게 해야할지 모르시면 만지지 마십시오." #: ../panel-plugin/mount-plugin.c:833 msgid "_Custom commands" @@ -190,14 +180,11 @@ msgstr "사용자 정의 명령(_C)" #: ../panel-plugin/mount-plugin.c:852 #, c-format msgid "" -"Most users will only want to prepend \"sudo\" to both commands or prepend " -"\"sync %d &&\" to the \"unmount %d\" command.\n" +"Most users will only want to prepend \"sudo\" to both commands or prepend \"sync %d &&\" to the \"unmount %d\" command.\n" "'%d' is used to specify the device, '%m' for the mountpoint." msgstr "" -"대부분의 사용자는 명령어에 \"sudo\"를 덧붙이거나 \"unmount %d\" 명령에 " -"\"sync %d &&\"을(를) 덧붙여 사용하기를 원합니다.\n" -"'%d'은(는) 장치를 지정할 때 사용하고 '%m'은(는) 마운트 지점을 지정할 때 사용" -"합니다." +"대부분의 사용자는 명령어에 \"sudo\"를 덧붙이거나 \"unmount %d\" 명령에 \"sync %d &&\"을(를) 덧붙여 사용하기를 원합니다.\n" +"'%d'은(는) 장치를 지정할 때 사용하고 '%m'은(는) 마운트 지점을 지정할 때 사용