[Xfce4-commits] Fix some potential bugs
Updating branch refs/heads/master to 78393c501d071ec05986d62b210b26e0170942ad (commit) from da61495218044db15bf95c4f2184ec969dc50c7a (commit) commit 78393c501d071ec05986d62b210b26e0170942ad Author: Eric Koegel Date: Sat Jan 25 08:32:29 2014 +0300 Fix some potential bugs Correct some of the issues found with coverity scan. Things like an unused pointer, variables that could potentially be used in an uninitialized state, a copy-paste error, and a couple spots where the return value wasn't checked. common/xfdesktop-thumbnailer.c| 10 +- settings/main.c |4 ++-- src/xfce-workspace.c |2 +- src/xfdesktop-file-icon-manager.c | 12 +--- src/xfdesktop-file-utils.c|2 +- src/xfdesktop-icon-view.c | 13 + src/xfdesktop-volume-icon.c |1 - 7 files changed, 27 insertions(+), 17 deletions(-) diff --git a/common/xfdesktop-thumbnailer.c b/common/xfdesktop-thumbnailer.c index 248a3c5..f49edb2 100644 --- a/common/xfdesktop-thumbnailer.c +++ b/common/xfdesktop-thumbnailer.c @@ -216,13 +216,13 @@ xfdesktop_thumbnailer_dispose(GObject *object) { XfdesktopThumbnailer *thumbnailer = XFDESKTOP_THUMBNAILER(object); -if(thumbnailer->priv->proxy) -g_object_unref(thumbnailer->priv->proxy); +if(thumbnailer->priv) { +if(thumbnailer->priv->proxy) +g_object_unref(thumbnailer->priv->proxy); -if(thumbnailer->priv->supported_mimetypes) -g_free(thumbnailer->priv->supported_mimetypes); +if(thumbnailer->priv->supported_mimetypes) +g_free(thumbnailer->priv->supported_mimetypes); -if(thumbnailer->priv) { g_free(thumbnailer->priv); thumbnailer->priv = NULL; } diff --git a/settings/main.c b/settings/main.c index dec5ea4..41e4d5c 100644 --- a/settings/main.c +++ b/settings/main.c @@ -1276,12 +1276,12 @@ xfdesktop_settings_background_tab_change_bindings(AppearancePanel *panel, /* If the first color doesn't exist, try to load the old one */ if(!xfconf_channel_has_property(channel, buf)) { GValue value = { 0, }; -old_property = xfdesktop_settings_generate_old_binding_string(panel, "color1"); +old_property = xfdesktop_settings_generate_old_binding_string(panel, "color2"); xfconf_channel_get_property(channel, old_property, &value); if(G_VALUE_HOLDS_BOXED(&value)) { -gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color1_btn), +gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color2_btn), g_value_get_boxed(&value)); g_value_unset(&value); } else { diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c index 0a9f84a..13aa924 100644 --- a/src/xfce-workspace.c +++ b/src/xfce-workspace.c @@ -145,7 +145,7 @@ xfce_workspace_change_backdrop(XfceWorkspace *workspace, XfconfChannel *channel = workspace->priv->channel; char buf[1024]; gchar *monitor_name = NULL; -guint i, monitor_num; +guint i, monitor_num = 0; g_return_if_fail(workspace->priv->nbackdrops > 0); diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c index a3201e6..7870635 100644 --- a/src/xfdesktop-file-icon-manager.c +++ b/src/xfdesktop-file-icon-manager.c @@ -2456,7 +2456,7 @@ xfdesktop_file_icon_manager_file_changed(GFileMonitor *monitor, XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); XfdesktopFileIcon *icon, *moved_icon; GFileInfo *file_info; -guint16 row, col; +guint16 row = 0, col = 0; gchar *filename; switch(event) { @@ -2470,7 +2470,10 @@ xfdesktop_file_icon_manager_file_changed(GFileMonitor *monitor, if(icon) { /* Get the old position so we can use it for the new icon */ -xfdesktop_icon_get_position(XFDESKTOP_ICON(icon), &row, &col); +if(!xfdesktop_icon_get_position(XFDESKTOP_ICON(icon), &row, &col)) { +/* Failed to get position... not supported? */ +row = col = 0; +} DBG("row %d, col %d", row, col); /* Remove the old icon */ @@ -2484,7 +2487,10 @@ xfdesktop_file_icon_manager_file_changed(GFileMonitor *monitor, if(moved_icon) { /* Since we're replacing an existing icon, get that location * to use instead */ -xfdesktop_icon_get_position(XFDESKTOP_ICON(moved_icon), &row, &col); +if(!xfdesktop_icon_get_position(XFDESKTOP_ICON(icon), &row, &col)) { +/* Failed to get position... not supported? */ +row = col = 0; +} DBG("row %d, col %d", row, col); xfdesktop_file_icon_manager
[Xfce4-commits] I18n: Update translation sv (81%).
Updating branch refs/heads/master to a21b73459078846556f2360909afc668d19d7367 (commit) from 77efede3991f9507c208adb9e7420f4d42ae54ae (commit) commit a21b73459078846556f2360909afc668d19d7367 Author: peterdenk Date: Sat Jan 25 00:31:09 2014 +0100 I18n: Update translation sv (81%). 35 translated messages, 8 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/sv.po | 145 +- 1 file changed, 68 insertions(+), 77 deletions(-) diff --git a/po/sv.po b/po/sv.po index 4479c56..c7814f9 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,210 +1,201 @@ -# Swedish translation for xfce4-battery-plugin. -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. -# This file is distributed under the same license as the xfce4-battery-plugin package. -# Daniel Nylander , 2008, 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Daniel Nylander , 2008-2009 +# peterdenk , 2014 msgid "" msgstr "" -"Project-Id-Version: xfce4-battery-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-23 17:18+0200\n" -"PO-Revision-Date: 2009-02-01 18:44+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"Language: sv\n" +"POT-Creation-Date: 2013-07-03 20:48+0200\n" +"PO-Revision-Date: 2014-01-24 21:30+\n" +"Last-Translator: peterdenk \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../panel-plugin/battery.c:551 +#: ../panel-plugin/battery.c:536 msgid "(No battery, AC on-line)" msgstr "(Inget batteri, extern ström ansluten)" -#: ../panel-plugin/battery.c:553 +#: ../panel-plugin/battery.c:538 msgid "(Charging from AC)" msgstr "(Laddar upp från extern strömkälla)" -#: ../panel-plugin/battery.c:553 +#: ../panel-plugin/battery.c:538 msgid "(AC on-line)" msgstr "(Extern ström ansluten)" -#: ../panel-plugin/battery.c:563 +#: ../panel-plugin/battery.c:548 #, c-format msgid "%d%% (%02d:%02d) remaining" msgstr "%d%% (%02d:%02d) återstår" -#: ../panel-plugin/battery.c:565 +#: ../panel-plugin/battery.c:550 #, c-format msgid "%02d:%02d remaining" msgstr "%02d:%02d återstår" -#: ../panel-plugin/battery.c:567 +#: ../panel-plugin/battery.c:552 #, c-format msgid "%d%% remaining" msgstr "%d%% återstår" -#: ../panel-plugin/battery.c:569 +#: ../panel-plugin/battery.c:554 #, c-format msgid "AC off-line" msgstr "Extern ström frånkopplad" -#: ../panel-plugin/battery.c:637 +#: ../panel-plugin/battery.c:624 msgid "" "WARNING: Your battery has reached critical status. You should plug in or " "shutdown your computer now to avoid possible data loss." -msgstr "" -"VARNING: Ditt batteri har nått kritisk status. Du bör ansluta en extern " -"strömkälla eller stänga av din dator nu för att undvika att data går " -"förlorat." +msgstr "VARNING: Ditt batteri har nått kritisk status. Du bör ansluta en extern strömkälla eller stänga av din dator nu för att undvika att data går förlorat." -#: ../panel-plugin/battery.c:655 +#: ../panel-plugin/battery.c:642 msgid "" "WARNING: Your battery is running low. You should consider plugging in or " "shutting down your computer soon to avoid possible data loss." -msgstr "" -"VARNING: Ditt batteri börjar få låg laddningskapacitet. Du bör överväga att " -"ansluta en extern strömkälla eller stänga av din dator snart för att undvika " -"att data går förlorat." +msgstr "VARNING: Ditt batteri börjar få låg laddningskapacitet. Du bör överväga att ansluta en extern strömkälla eller stänga av din dator snart för att undvika att data går förlorat." -#: ../panel-plugin/battery.c:709 +#: ../panel-plugin/battery.c:678 msgid "Battery" msgstr "Batteri" -#: ../panel-plugin/battery.c:1285 +#: ../panel-plugin/battery.c:1207 msgid "Select file" msgstr "Välj fil" -#: ../panel-plugin/battery.c:1326 +#: ../panel-plugin/battery.c:1248 msgid "Select command" msgstr "Välj kommando" -#: ../panel-plugin/battery.c:1341 -#, fuzzy +#: ../panel-plugin/battery.c:1263 msgid "Select color" -msgstr "Välj fil" +msgstr "Välj färg" -#: ../panel-plugin/battery.c:1383 +#: ../panel-plugin/battery.c:1305 #, c-format msgid "Unable to open the following url: %s" msgstr "Kunde inte öppna följande url: %s" -#: ../panel-plugin/battery.c:1408 ../panel-plugin/battery.desktop.in.h:1 +#: ../panel-plugin/battery.c:1330 ../panel-plugin/battery.desktop.in.h:1 msgid "Battery Monitor" msgstr "Batteriövervakare" -#: ../panel-plugin/battery.c:1415 +#: ../panel-plugin/battery.c:1337 msgid "Properties" -msgstr "" +msgstr "Egensk
[Xfce4-commits] I18n: Update translation sv (61%).
Updating branch refs/heads/master to 97a39d728bdb333bfd19dffba29a7b8f0ba00ad0 (commit) from 625ff2e3cc7036b4e1b0bf2a1939786d0a587a32 (commit) commit 97a39d728bdb333bfd19dffba29a7b8f0ba00ad0 Author: peterdenk Date: Fri Jan 24 18:31:17 2014 +0100 I18n: Update translation sv (61%). 24 translated messages, 15 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/sv.po | 113 -- 1 file changed, 51 insertions(+), 62 deletions(-) diff --git a/po/sv.po b/po/sv.po index 212a078..6380ad8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,25 +1,27 @@ -# Swedish translation for xfce4-cpufreq-plugin. -# Copyright (C) 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the xfce4-cpufreq-plugin package. -# Daniel Nylander , 2008. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Daniel Nylander , 2008 +# peterdenk , 2014 msgid "" msgstr "" -"Project-Id-Version: xfce4-cpufreq-plugin\n" +"Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-18 09:44+0200\n" -"PO-Revision-Date: 2009-12-16 17:29+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" -"Language: sv\n" +"POT-Creation-Date: 2013-08-30 00:31+0200\n" +"PO-Revision-Date: 2014-01-24 16:28+\n" +"Last-Translator: peterdenk \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../panel-plugin/xfce4-cpufreq-configure.c:78 msgid "Select font..." -msgstr "" +msgstr "Välj typsnitt..." #: ../panel-plugin/xfce4-cpufreq-configure.c:80 msgid "Select font family and size to use for the labels." @@ -27,16 +29,15 @@ msgstr "" #: ../panel-plugin/xfce4-cpufreq-configure.c:84 msgid "Right-click to revert to the default font." -msgstr "" +msgstr "Höger-klicka för att återgå till standardtypsnittet." #: ../panel-plugin/xfce4-cpufreq-configure.c:102 msgid "Select font" -msgstr "" +msgstr "Välj typsnitt" #: ../panel-plugin/xfce4-cpufreq-configure.c:188 -#, fuzzy msgid "Configure CPU Frequency Monitor" -msgstr "Övervakare för processorfrekvens" +msgstr "" #: ../panel-plugin/xfce4-cpufreq-configure.c:190 msgid "Configure the CPU frequency plugin" @@ -48,7 +49,7 @@ msgstr "" #: ../panel-plugin/xfce4-cpufreq-configure.c:223 msgid "_Update interval:" -msgstr "" +msgstr "_Uppdateringsintervall:" #: ../panel-plugin/xfce4-cpufreq-configure.c:241 msgid "Panel" @@ -56,23 +57,23 @@ msgstr "" #: ../panel-plugin/xfce4-cpufreq-configure.c:257 msgid "_Font:" -msgstr "" +msgstr "Typsnitt:" #: ../panel-plugin/xfce4-cpufreq-configure.c:275 msgid "_Display CPU:" -msgstr "" +msgstr "Visa CPU:" #: ../panel-plugin/xfce4-cpufreq-configure.c:290 msgid "min" -msgstr "" +msgstr "min" #: ../panel-plugin/xfce4-cpufreq-configure.c:291 msgid "avg" -msgstr "" +msgstr "snitt" #: ../panel-plugin/xfce4-cpufreq-configure.c:292 msgid "max" -msgstr "" +msgstr "max" #. check buttons for display widgets in panel #: ../panel-plugin/xfce4-cpufreq-configure.c:298 @@ -85,18 +86,17 @@ msgstr "" #: ../panel-plugin/xfce4-cpufreq-configure.c:308 msgid "Show CPU _icon" -msgstr "" +msgstr "Visa CPU-_ikon" -#: ../panel-plugin/xfce4-cpufreq-configure.c:313 -#, fuzzy +#: ../panel-plugin/xfce4-cpufreq-configure.c:315 msgid "Show CPU fre_quency" -msgstr "Övervakare för processorfrekvens" +msgstr "Visa CPU-hastighet" -#: ../panel-plugin/xfce4-cpufreq-configure.c:318 +#: ../panel-plugin/xfce4-cpufreq-configure.c:320 msgid "Show CPU _governor" msgstr "" -#: ../panel-plugin/xfce4-cpufreq-linux.c:465 +#: ../panel-plugin/xfce4-cpufreq-linux.c:485 msgid "" "Your system does not support cpufreq.\n" "The applet only shows the current cpu frequency" @@ -113,7 +113,7 @@ msgstr "" #: ../panel-plugin/xfce4-cpufreq-overview.c:94 msgid "Available frequencies:" -msgstr "" +msgstr "Tillgängliga hastigheter:" #: ../panel-plugin/xfce4-cpufreq-overview.c:155 msgid "Available governors:" @@ -125,72 +125,61 @@ msgstr "" #: ../panel-plugin/xfce4-cpufreq-overview.c:232 msgid "CPU Information" -msgstr "" +msgstr "CPU information" #: ../panel-plugin/xfce4-cpufreq-overview.c:239 msgid "An overview of all the CPUs in the system" -msgstr "" +msgstr "En översikt över alla CPU:er i systemet" #: ../panel-plugin/xfce4-cpufreq-plugin.c:60 msgid "current min" -msgstr "" +msgstr "aktuellt min" #: ../panel-plugin/xfce4-cpufreq-plugin.c:79 msgid "current avg" -msgstr "" +msgstr "aktuellt snitt" #: ../panel-plugin/xfce4-cp
[Xfce4-commits] I18n: Update translation ja (100%).
Updating branch refs/heads/master to d99bae1aefe118c086683519ac034965872e66d3 (commit) from 90c79d0ae3b5830825776c87588099c6785101e3 (commit) commit d99bae1aefe118c086683519ac034965872e66d3 Author: Masato HASHIMOTO Date: Fri Jan 24 18:31:01 2014 +0100 I18n: Update translation ja (100%). 291 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/ja.po | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/ja.po b/po/ja.po index ec04162..a177849 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-03 20:34+0200\n" -"PO-Revision-Date: 2013-12-02 22:12+\n" -"Last-Translator: hchenmisc \n" +"PO-Revision-Date: 2014-01-24 12:59+\n" +"Last-Translator: Masato HASHIMOTO \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/xfce/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #: ../xfburn/xfburn-global.h:28 msgid "Capacity:" -msgstr "容量:" +msgstr "容量:" #: ../xfburn/xfburn-global.h:29 msgid "addr:" @@ -30,11 +30,11 @@ msgstr "アドレス:" #: ../xfburn/xfburn-global.h:30 msgid "Time total:" -msgstr "統計時間:" +msgstr "合計時間:" #: ../xfburn/xfburn-global.h:32 msgid "length" -msgstr "" +msgstr "長さ" #: ../xfburn/xfburn-global.h:33 ../xfburn/xfburn-copy-cd-progress-dialog.c:93 msgid "Flushing cache..." @@ -42,19 +42,19 @@ msgstr "キャッシュをフラッシュしています..." #: ../xfburn/xfburn-global.h:34 msgid "Please insert a recordable disc and hit enter" -msgstr "記録可能なメディアを挿入して下さい。" +msgstr "記録可能なメディアを挿入して Enter を押して下さい" #: ../xfburn/xfburn-global.h:35 msgid "Cannot determine disc status - hit enter to try again." -msgstr "ディスクのステイタスを認識することができませんーやり直すにはENTERを押してください" +msgstr "メディアの状態を確定できません - Enter を押して再試行してください。" #: ../xfburn/xfburn-global.h:36 msgid "CD copying finished successfully." -msgstr "CDのコピーが成功しました。" +msgstr "CD のコピーが正常に終了しました。" #: ../xfburn/xfburn-global.h:42 msgid "Data composition" -msgstr "" +msgstr "データコンポジション" #: ../xfburn/xfburn-adding-progress.c:111 msgid "Adding files to the composition" @@ -211,7 +211,7 @@ msgstr "ダミーを書き出す(_D)" #: ../xfburn/xfburn-burn-image-dialog.c:221 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:207 msgid "Burn_Free" -msgstr "自由に焼く(_F)" +msgstr "BurnFree を使用する(_F)" #. create ISO ? #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:246 @@ -274,7 +274,7 @@ msgstr "ISO イメージ" #: ../xfburn/xfburn-burn-image-dialog.c:226 msgid "_Quit after success" -msgstr "" +msgstr "正常終了後にアプリケーションを終了する(_Q)" #: ../xfburn/xfburn-burn-image-dialog.c:236 msgid "_Burn image" @@ -956,7 +956,7 @@ msgstr "コンソールを参照してください" #: ../xfburn/xfburn-perform-burn.c:370 msgid "User Aborted" -msgstr "中止されました" +msgstr "中止しました" #: ../xfburn/xfburn-preferences-dialog.c:143 msgid "Preferences" @@ -1058,7 +1058,7 @@ msgstr "デバイスバッファー:" #: ../xfburn/xfburn-progress-dialog.c:374 msgid "Are you sure you want to abort?" -msgstr "" +msgstr "中止してもよろしいですか?" #: ../xfburn/xfburn-progress-dialog.c:502 #, c-format @@ -1254,7 +1254,7 @@ msgid "" "If an audio file is not recognized, make sure\n" "that you have the 'good','bad', and 'ugly'\n" "gstreamer plugin packages installed." -msgstr "GStreamer トランスコーダーはオーディオコンポジションを\n作成する際 GStreamer ライブラリを使用します。\n\n基本的に適切なプラグインがインストールされていればすべての\nオーディオファイルはサポートされているはずです。\nもし認識されないオーディオファイルがある時は、GStreamer\nの 'good'、'bad'、および 'ugly' プラグインがインストール\nされているかどうか確認してください。" +msgstr "GStreamer トランスコーダーは\nオーディオコンポジションを作成する際\nGStreamer ライブラリを使用します。\n\n基本的に適切なプラグインがインストール\nされていればすべてのオーディオファイルは\nサポートされているはずです。\nもし認識されないオーディオファイルがある\n時は、GStreamer の 'good'、'bad'、\nおよび 'ugly' プラグインがインストール\nされているかどうか確認してください。" #: ../xfburn/xfburn-transcoder-gst.c:791 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] I18n: Update translation zh_TW (100%).
Updating branch refs/heads/master to 86d9b897056d010d3fdb5a8f06fbf11f499d9bbe (commit) from 3a6912f6b978b7170361eb552c00154f257382f2 (commit) commit 86d9b897056d010d3fdb5a8f06fbf11f499d9bbe Author: Walter Cheuk Date: Fri Jan 24 12:31:59 2014 +0100 I18n: Update translation zh_TW (100%). 171 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/zh_TW.po | 89 +++ 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a267dc4..3b19b9f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,13 +7,14 @@ # Cheng-Chia Tseng , 2010 # Hydonsingore Cia , 2005 # umm , 2003 +# Walter Cheuk , 2013-2014 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-02 22:21+0200\n" -"PO-Revision-Date: 2013-11-19 14:14+\n" -"Last-Translator: Nick \n" +"POT-Creation-Date: 2013-12-26 18:31+0100\n" +"PO-Revision-Date: 2014-01-24 06:22+\n" +"Last-Translator: Walter Cheuk \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfce/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,29 +36,29 @@ msgstr "警告" msgid "None" msgstr "無" -#: ../settings-dialogs/tweaks-settings.c:463 +#: ../settings-dialogs/tweaks-settings.c:468 msgid "Session manager socket" msgstr "工作階段管理程式 socket" -#: ../settings-dialogs/tweaks-settings.c:463 +#: ../settings-dialogs/tweaks-settings.c:468 #: ../settings-dialogs/workspace-settings.c:381 #: ../settings-dialogs/xfwm4-settings.c:241 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings-dialogs/tweaks-settings.c:464 +#: ../settings-dialogs/tweaks-settings.c:469 #: ../settings-dialogs/workspace-settings.c:382 #: ../settings-dialogs/xfwm4-settings.c:243 msgid "Version information" msgstr "版本資訊" -#: ../settings-dialogs/tweaks-settings.c:482 +#: ../settings-dialogs/tweaks-settings.c:487 #: ../settings-dialogs/workspace-settings.c:399 #: ../settings-dialogs/xfwm4-settings.c:895 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:486 +#: ../settings-dialogs/tweaks-settings.c:491 #: ../settings-dialogs/workspace-settings.c:403 #: ../settings-dialogs/xfwm4-settings.c:899 #, c-format @@ -99,7 +100,7 @@ msgstr "視窗管理程式調校" #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2 msgid "Fine-tune window behaviour and effects" -msgstr "微調視窗視窗行為與效果" +msgstr "微調視窗視窗行為與特效" #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1 @@ -261,7 +262,7 @@ msgstr "距離(T):" #. Edge resistance #. Smart placement size #: ../settings-dialogs/xfwm4-dialog.glade.h:42 -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34 msgid "Small" msgstr "小 " @@ -328,7 +329,7 @@ msgstr "最大化視窗" #: ../settings-dialogs/xfwm4-settings.c:223 msgid "Fill window" -msgstr "填滿視窗視窗" +msgstr "填滿視窗" #: ../settings-dialogs/xfwm4-settings.c:224 msgid "Nothing" @@ -382,7 +383,7 @@ msgstr "這會將所有捷徑重設為其預設值。您真的想要這麼做嗎 msgid "" "S_kip windows that have \"skip pager\"\n" "or \"skip taskbar\" properties set" -msgstr "跳過屬性有設定「skip pager」或\n「skip taskbar」的視窗(_S)" +msgstr "跳過屬性有設定「skip pager」或\n「skip taskbar」的視窗(_K)" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5 msgid "_Include hidden (i.e. iconified) windows" @@ -445,121 +446,125 @@ msgid "Automatically _tile windows when moving toward the screen edge" msgstr "當朝螢幕邊緣移動時自動鋪展視窗(_R)" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21 -msgid "Notify of _urgency by making window's decoration blink" -msgstr "藉由讓視窗裝飾閃爍來通知緊急事件(_U)" - -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22 msgid "Use _edge resistance instead of window snapping" msgstr "使用邊緣抗拒取代視窗吸引(_E)" +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:22 +msgid "Notify of _urgency by making window's decoration blink" +msgstr "藉由讓視窗裝飾閃爍來通知緊急事件(_U)" + #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23 msgid "Keep urgent windows _blinking repeatedly" msgstr "讓緊急視窗保持閃爍(_B)" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24 +msgid "Use mouse wheel on title bar to ro_ll up the window" +msgstr "在標題列以滑鼠滾輪捲收視窗(_L)" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25 msgid "_Accessibility" msgstr "輔助功能(_A)" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26 msgid "Use the _mouse wheel on the desktop to switch workspaces" msgstr "在桌面上使用滑鼠滾輪以切換工作區(_M)" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:26 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:27 msgid "" "_Remember and recall previous workspace\n" "when switching via keyboard shortcuts" msgstr "透過鍵盤捷徑切換時,記住並召回\n先前的工作區(_R)" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:28 +#: ../se