[Xfce4-commits] xfwm4:master l10n: Updated Icelandic (is) translation to 56%
Updating branch refs/heads/master to e7a11f3ff5480795cd0e2f02e10122ef70a2c775 (commit) from e24e349efa52a721d9ec1f8c6f3498f6e713a669 (commit) commit e7a11f3ff5480795cd0e2f02e10122ef70a2c775 Author: Sveinn í Felli svei...@nett.is Date: Wed Dec 7 09:02:03 2011 +0100 l10n: Updated Icelandic (is) translation to 56% New status: 130 messages complete with 0 fuzzies and 100 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po | 184 +- 1 files changed, 51 insertions(+), 133 deletions(-) diff --git a/po/is.po b/po/is.po index 9f5cb21..f343fce 100644 --- a/po/is.po +++ b/po/is.po @@ -1,17 +1,17 @@ -# translation of xfwm4.master.untitled.po to Icelandic -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# translation of is.po to Icelandic +# Copyright (C) 2011 Free Software Foundation # This file is distributed under the same license as the PACKAGE package. # # Sveinn í Felli svei...@nett.is, 2011. msgid msgstr -Project-Id-Version: xfwm4.master.untitled\n +Project-Id-Version: is\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2011-12-03 06:30+\n -PO-Revision-Date: 2011-12-03 08:16+\n +PO-Revision-Date: 2011-12-07 08:01+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic translation-team...@lists.sourceforge.net\n -Language: \n +Language: is\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -158,7 +158,7 @@ msgstr #: ../settings-dialogs/xfwm4-dialog.glade.h:13 msgid b_Theme/b -msgstr +msgstr bÞe_ma/b #. Raise focus delay #: ../settings-dialogs/xfwm4-dialog.glade.h:15 @@ -200,7 +200,7 @@ msgstr #: ../settings-dialogs/xfwm4-dialog.glade.h:26 msgid Clic_k to focus -msgstr +msgstr Smella til að vir_kja #: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout @@ -216,7 +216,7 @@ msgstr #: ../settings-dialogs/xfwm4-dialog.glade.h:31 msgid Dis_tance: -msgstr +msgstr Vega_lengd: #: ../settings-dialogs/xfwm4-dialog.glade.h:32 msgid Focus follows _mouse @@ -268,7 +268,7 @@ msgstr #: ../settings-dialogs/xfwm4-dialog.glade.h:44 msgid Stick -msgstr Klístra +msgstr Líma #: ../settings-dialogs/xfwm4-dialog.glade.h:45 msgid The action to perform when the title-bar is double-clicked @@ -301,87 +301,77 @@ msgstr #: ../settings-dialogs/xfwm4-dialog.glade.h:53 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:42 msgid _Focus -msgstr +msgstr _Virkni #: ../settings-dialogs/xfwm4-dialog.glade.h:54 -#, fuzzy msgid _Reset to Defaults -msgstr _Endurheimta upprunalegar stillingar +msgstr Endu_rheimta upprunaleg gildi #: ../settings-dialogs/xfwm4-dialog.glade.h:55 msgid _Style -msgstr +msgstr _Stíll #: ../settings-dialogs/xfwm4-settings.c:220 #: ../settings-dialogs/xfwm4-settings.c:253 msgid Shade window -msgstr +msgstr Skyggja glugga #: ../settings-dialogs/xfwm4-settings.c:221 #: ../settings-dialogs/xfwm4-settings.c:250 -#, fuzzy msgid Hide window msgstr Fela glugga #: ../settings-dialogs/xfwm4-settings.c:222 #: ../settings-dialogs/xfwm4-settings.c:249 -#, fuzzy msgid Maximize window msgstr Hámarka glugga #: ../settings-dialogs/xfwm4-settings.c:223 #: ../settings-dialogs/xfwm4-settings.c:258 msgid Fill window -msgstr +msgstr Fylla glugga #: ../settings-dialogs/xfwm4-settings.c:224 -#, fuzzy msgid Nothing msgstr Ekkert #: ../settings-dialogs/xfwm4-settings.c:229 #: ../settings-dialogs/xfwm4-settings.c:239 -#, fuzzy msgid Left msgstr Vinstri #: ../settings-dialogs/xfwm4-settings.c:230 -#, fuzzy msgid Center -msgstr Miðjað +msgstr Miðja #: ../settings-dialogs/xfwm4-settings.c:231 #: ../settings-dialogs/xfwm4-settings.c:240 -#, fuzzy msgid Right msgstr Hægri #: ../settings-dialogs/xfwm4-settings.c:236 msgid Window operations menu -msgstr +msgstr Aðgerðavalmynd glugga #: ../settings-dialogs/xfwm4-settings.c:237 -#, fuzzy msgid Up msgstr Upp #: ../settings-dialogs/xfwm4-settings.c:238 -#, fuzzy msgid Down msgstr Niður #: ../settings-dialogs/xfwm4-settings.c:241 -#, fuzzy msgid Cancel msgstr Hætta við #: ../settings-dialogs/xfwm4-settings.c:242 msgid Cycle windows -msgstr +msgstr Fletta í gegnum glugga #: ../settings-dialogs/xfwm4-settings.c:243 msgid Cycle windows (Reverse) -msgstr +msgstr Fletta í gegnum glugga (afturábak) #: ../settings-dialogs/xfwm4-settings.c:244 msgid Switch window for same application @@ -389,56 +379,51 @@ msgstr #: ../settings-dialogs/xfwm4-settings.c:245 msgid Switch application -msgstr +msgstr Skipta um forrit #: ../settings-dialogs/xfwm4-settings.c:246 -#, fuzzy msgid Close window msgstr Loka glugga #: ../settings-dialogs/xfwm4-settings.c:247 -#, fuzzy msgid Maximize window horizontally msgstr Hámarka glugga lárétt #: ../settings-dialogs/xfwm4-settings.c:248 -#, fuzzy msgid Maximize window vertically
[Xfce4-commits] xfce4-panel:xfce-4.8 l10n: Updated Icelandic (is) translation to 81%
Updating branch refs/heads/xfce-4.8 to 0754442204ebe11962b528173712fb902a59ec99 (commit) from 158f61ee34ed7335b9085428846a9653f3ea9603 (commit) commit 0754442204ebe11962b528173712fb902a59ec99 Author: Kristófer Arnþórsson kristoferarnth...@gmail.com Date: Wed Dec 7 09:28:18 2011 +0100 l10n: Updated Icelandic (is) translation to 81% New status: 283 messages complete with 0 fuzzies and 64 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po | 341 +- 1 files changed, 180 insertions(+), 161 deletions(-) diff --git a/po/is.po b/po/is.po index 8276e46..3fafbf7 100644 --- a/po/is.po +++ b/po/is.po @@ -1,71 +1,72 @@ # translation of is.po to Icelandic # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Sveinn í Felli svei...@nett.is, 2010, 2011. msgid msgstr Project-Id-Version: is\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:01+0100\n +POT-Creation-Date: 2011-12-07 06:09+\n PO-Revision-Date: 2011-12-03 13:28+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic translation-team...@lists.sourceforge.net\n -Language: is\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: is\n X-Generator: KBabel 1.11.4\n Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n #: ../panel-desktop-handler.desktop.in.h:1 -msgid Add a new launcher to the panel based on the information of this desktop file -msgstr +msgid +Add a new launcher to the panel based on the information of this desktop file +msgstr Bæta við nýjum ræsi að þessari skjástiku, byggt á upplýsingum frá þessari skjáborðs skrá #: ../panel-desktop-handler.desktop.in.h:2 msgid Create Launcher on the panel -msgstr +msgstr Búa til ræsi á skjástiku #: ../panel-preferences.desktop.in.h:1 msgid Customize the panel -msgstr +msgstr Sérsníða skjástiku #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2263 #: ../migrate/main.c:84 msgid Panel msgstr Spjald -#: ../common/panel-utils.c:155 +#: ../common/panel-utils.c:157 msgid _Read Online msgstr _Lesa á netinu -#: ../common/panel-utils.c:156 +#: ../common/panel-utils.c:158 msgid You can read the user manual online. This manual may however not exactly match your panel version. -msgstr +msgstr Þú getur lesið notenda handbókina á netinu. Þessi handbók gæti hins vegar ekki passað við skjástiku útgáfuna þína. -#: ../common/panel-utils.c:158 +#: ../common/panel-utils.c:160 msgid The user manual is not installed on your computer -msgstr +msgstr Notenda handbókin er ekki uppsett í tölvunni þinni #. display an error message to the user -#: ../common/panel-utils.c:171 +#: ../common/panel-utils.c:175 msgid Failed to open the documentation browser -msgstr +msgstr Mistókst að opna skjala vafran #. I18N: %s is the name of the plugin #: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? -msgstr +msgstr Ertu viss að þú viljir fjarlægja \%s\? #: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. -msgstr +msgstr Ef þú fjarlægir hlut frá skjástiku, verður það endanlega eytt. #. move item #: ../libxfce4panel/xfce-panel-plugin.c:1054 @@ -74,56 +75,60 @@ msgstr _Flytja #: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l -msgstr +msgstr Skjá_stika #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2275 msgid Add _New Items... msgstr Bæta við _nýjum atriðum... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2286 msgid Panel Pr_eferences... msgstr _Kjörstillingar spjalds... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2302 msgid Log _Out msgstr _Skrá út -#: ../panel/main.c:78 +#: ../panel/main.c:79 msgid Show the 'Panel Preferences' dialog msgstr -#: ../panel/main.c:78 ../panel/main.c:79 +#: ../panel/main.c:79 ../panel/main.c:80 msgid PANEL-NUMBER -msgstr +msgstr SKJÁSTIKU-TALA -#: ../panel/main.c:79 +#: ../panel/main.c:80 msgid Show the 'Add New Items' dialog -msgstr +msgstr Sýna 'Bæta Við Nýjum Hlut' gluggann -#: ../panel/main.c:80 +#: ../panel/main.c:81 msgid Save the panel configuration -msgstr +msgstr Vist skjástiku stillingar -#: ../panel/main.c:81
[Xfce4-commits] xfce4-panel:xfce-4.8 l10n: Updated Icelandic (is) translation to 82%
Updating branch refs/heads/xfce-4.8 to 3c517e41da836133ad2c5ffc50a68fab57e4ba92 (commit) from 0754442204ebe11962b528173712fb902a59ec99 (commit) commit 3c517e41da836133ad2c5ffc50a68fab57e4ba92 Author: Kristófer Arnþórsson kristoferarnth...@gmail.com Date: Wed Dec 7 09:46:20 2011 +0100 l10n: Updated Icelandic (is) translation to 82% New status: 286 messages complete with 0 fuzzies and 61 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/is.po b/po/is.po index 3fafbf7..3e55e16 100644 --- a/po/is.po +++ b/po/is.po @@ -15,8 +15,8 @@ msgstr Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n Language: is\n -X-Generator: KBabel 1.11.4\n Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n +X-Generator: KBabel 1.11.4\n #: ../panel-desktop-handler.desktop.in.h:1 msgid @@ -94,7 +94,7 @@ msgstr _Skrá út #: ../panel/main.c:79 msgid Show the 'Panel Preferences' dialog -msgstr +msgstr Sýna 'Skjástiku stillingar' gluggann #: ../panel/main.c:79 ../panel/main.c:80 msgid PANEL-NUMBER @@ -345,7 +345,7 @@ msgstr #: ../panel/panel-preferences-dialog.glade.h:1 msgid A_utomatically increase the length -msgstr +msgstr S_jálfkrafa stækka lengdina #: ../panel/panel-preferences-dialog.glade.h:2 msgid Add a new panel @@ -860,7 +860,7 @@ msgstr Sýna ra_mma. #: ../plugins/clock/clock-dialog.glade.h:17 msgid Show _inactive dots -msgstr +msgstr Sýna _óvirka punkta #: ../plugins/clock/clock-dialog.glade.h:18 msgid Show gri_d ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:xfce-4.8 l10n: Updated Icelandic (is) translation to 87%
Updating branch refs/heads/xfce-4.8 to 51bba0b9221c691bd3b60d01f9f92fda8904c6a2 (commit) from 954012c5548c72a0da6c41fcbbda413edec80a63 (commit) commit 51bba0b9221c691bd3b60d01f9f92fda8904c6a2 Author: Kristófer Arnþórsson kristoferarnth...@gmail.com Date: Wed Dec 7 10:01:08 2011 +0100 l10n: Updated Icelandic (is) translation to 87% New status: 174 messages complete with 1 fuzzy and 24 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po | 75 ++--- 1 files changed, 42 insertions(+), 33 deletions(-) diff --git a/po/is.po b/po/is.po index d89af8d..9dea0b5 100644 --- a/po/is.po +++ b/po/is.po @@ -5,7 +5,7 @@ msgid msgstr Project-Id-Version: is\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-11-29 11:06+\n +POT-Creation-Date: 2011-12-07 08:15+\n PO-Revision-Date: 2011-12-01 09:17+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic translation-team...@lists.sourceforge.net\n @@ -63,7 +63,8 @@ msgstr #: ../settings/main.c:528 #, c-format -msgid File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? +msgid +File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? msgstr #: ../settings/main.c:533 @@ -72,7 +73,7 @@ msgstr Ógild listaskrá #: ../settings/main.c:536 msgid Overwriting the file will cause its contents to be lost. -msgstr +msgstr Ef þú skrifar yfir skránna mun innihald hennar vera óaðgengilegt. #: ../settings/main.c:538 msgid Replace @@ -125,8 +126,9 @@ msgid Settings manager socket msgstr #: ../settings/main.c:1500 +#, fuzzy msgid SOCKET ID -msgstr +msgstr SOCKET ID #: ../settings/main.c:1501 msgid Version information @@ -219,15 +221,15 @@ msgstr Mynda_listi #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:14 msgid Increase or decrease the brightness of the final image -msgstr +msgstr Bæta við eða af birtustigi seinustu myndarinnar #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:15 msgid Increase or decrease the color saturation of the final image -msgstr +msgstr Bæta við eða af litmettun seinustu myndarinnar #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:16 msgid Remove the selected image(s) from the list -msgstr +msgstr Fjarlægja vald(ar) mynd(ir) frá lista #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 msgid Sa_turation: @@ -260,12 +262,13 @@ msgid Specifies the \right\ or \bottom\ color of the gradient msgstr #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 -msgid Specifies the solid color, or the \left\ or \top\ color of the gradient +msgid +Specifies the solid color, or the \left\ or \top\ color of the gradient msgstr #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 msgid Specify how the image will be resized to fit the screen -msgstr +msgstr Veldu hvernig mynd verður endurstækkuð til að passa á skjá #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid Specify the style of the color drawn behind the backdrop image @@ -298,7 +301,7 @@ msgstr Lóðréttur litstigull #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:32 #: ../settings/xfdesktop-settings-ui.glade.h:40 msgid Zoomed -msgstr +msgstr Aðdráttur #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 msgid _None @@ -402,19 +405,19 @@ msgstr Sýna tákn _forrita í valmynd #: ../settings/xfdesktop-settings-ui.glade.h:28 msgid Show _window list menu on desktop middle click -msgstr +msgstr Sýna _glugga lista valmynd á skjáborði miðju músarsmell #: ../settings/xfdesktop-settings-ui.glade.h:29 msgid Show applications menu on _desktop right click -msgstr +msgstr Sýna forrita valmynd á _skjáborðs hægri músarsmell #: ../settings/xfdesktop-settings-ui.glade.h:30 msgid Show s_ticky windows only in active workspace -msgstr +msgstr Sýna l_ímda glugga aðeins á virkum vinnusvæðum #: ../settings/xfdesktop-settings-ui.glade.h:31 msgid Show workspace _names in list -msgstr +msgstr Sýna _nöfn vinnusvæða á lista #: ../settings/xfdesktop-settings-ui.glade.h:33 msgid @@ -424,11 +427,11 @@ msgstr #: ../settings/xfdesktop-settings-ui.glade.h:37 msgid Use _submenus for the windows in each workspace -msgstr +msgstr Nota _undirvalmyndir fyrir glugga í hverju vinnusvæði #: ../settings/xfdesktop-settings-ui.glade.h:38 msgid Use custom _font size: -msgstr +msgstr Nota sjálfgefna _letur stærð: #: ../settings/xfdesktop-settings-ui.glade.h:41 msgid _Background @@ -456,7 +459,7 @@ msgstr Birta útgáfuupplýsingar #: ../src/main.c:239 msgid Reload all settings, refresh image list -msgstr +msgstr Endurhlaða allar stillingar, endurnýja myndar lista #: ../src/main.c:240 msgid Pop up the menu (at the current mouse position) @@ -576,7 +579,8 @@ msgid Desktop Folder Error msgstr Villa í skjáborðsmöppu #:
[Xfce4-commits] xfwm4:xfce-4.8 l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/xfce-4.8 to a2e2fa776f95a0f2850620604a2c876603ca3dee (commit) from b69e9ff399da2994f454b34edf0af14b564c9d39 (commit) commit a2e2fa776f95a0f2850620604a2c876603ca3dee Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 10:41:51 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/zh_CN.po | 86 +-- 1 files changed, 46 insertions(+), 40 deletions(-) diff --git a/doc/manual/po/zh_CN.po b/doc/manual/po/zh_CN.po index ff98e86..5cc7014 100644 --- a/doc/manual/po/zh_CN.po +++ b/doc/manual/po/zh_CN.po @@ -1054,9 +1054,9 @@ msgid to click somewhere on its decorations (title bar, borders or corners) to raise it. msgstr -在点击窗口内任何地方时，如果您要窗口越过其它窗口，选择此选项。如果 -没有选中此选项，您必须点击窗口修饰(标题栏、边界或拐角)的某个地方来 -提升它。 +如果您要在点击窗口框架内任一地方时其越过其它窗口， +选择此项。如果没有选中此项，您只得点击窗口修饰 +(标题栏、边框或拐角)的某个地方来提升它。 #: xfwm4.xml:701(title) msgid Advanced settings @@ -1081,8 +1081,9 @@ msgid which this effect will be applied can be specified with the \Distance\ slider. msgstr -您能选择在窗口边界移动时，要被其它窗口边界，或屏幕边缘吸引的窗口 -边界。此作用可以影响的距离可以用 “距离” 滑块来指定。 +在窗口移动时，您可以选择让它附着在其它窗口的边框或 +附着在屏幕的边缘。此作用可以影响的距离可以用 “距离” +滑块来指定。 #: xfwm4.xml:731(term) msgid Wrap workspaces @@ -1095,9 +1096,9 @@ msgid the same behaviour while dragging a window. You can specify the screen edges resistance using the corresponding slider. msgstr -如果在鼠标指针碰到屏幕边缘时，您要切换到下一个工作区，选择第一个 -选项。如果在拖拽窗口时您要相同的行为，选择第二个选项。您可以使用 -相应的滑块指定屏幕最小距离。 +在鼠标指针碰到屏幕边缘时，如果您要切换到下一工作区， +选择第一项。在拖动窗口时，如果您要相同的行为，选择 +第二项。您可以使用相应的滑块指定屏幕边缘阻距。 #: xfwm4.xml:742(term) msgid Opaque move and resize @@ -1109,8 +1110,8 @@ msgid not, when you move or resize it (not displaying the content will save some system resources). msgstr -两个选项让您选择窗口内容是否显示，如果您移动或调整了它的大小 -(不显示内容会节省一些系统资源)。 +两个选项让您选择在您移动或调整窗口的大小时它的内容 +是否出现(不显示内容会节省一些系统资源)。 #: xfwm4.xml:751(term) msgid Double click action @@ -1122,8 +1123,8 @@ msgid click on the title bar of a window : shade window, hide window, maximize window or none. msgstr -选择在您双击窗口标题栏时窗口管理器必须使用的行为：折叠窗口、 -隐藏窗口、最大化窗口或无 +选择在您双击窗口标题栏时窗口管理器必须使用的行为： +折叠窗口、隐藏窗口、最大化窗口或无。 #: xfwm4.xml:766(title) msgid Managing workspaces @@ -1138,11 +1139,11 @@ msgid manager dialog/ulink. The dialog contains two tab folders where you can change workspace settings and desktop margins. msgstr -application@PACKAGE_NAME@/application 也管理工作区。有一特殊的设置对话框用来更改 -工作区属性。您可以从 ulink url=\xfce-mcs-manager.html#manager-dialog\ -type=\http\设置管理器对话框/ulink 中选择 emphasis工作区和边缘/emphasis 来 -启动此特殊的设置对话框。此对话框包含两个标签文件夹，您可以在此 -更改工作区设置和桌面边缘。 +application@PACKAGE_NAME@/application 也管理工作区。有一特殊的设置对话框 +用来更改工作区属性。您可以从 ulink url=\xfce-mcs-manager. +html#manager-dialog\ type=\http\设置管理器对话框/ulink +中选择 emphasis工作区和边缘/emphasis 启动它。此对话框包含两个 +您可以更改工作区设置和桌面边缘的标签文件夹。 #: xfwm4.xml:778(title) msgid Workspaces settings @@ -1177,9 +1178,9 @@ msgid that will then appear. When it's done, click the \Apply\ button, or just press the Enter key, to return to the list. msgstr -此地显示工作区列表。如果您要编辑其中的某个工作区的名称，点击工作区 -编号并在出现的对话框中填写。之后，点击 “应用” 按钮，或仅按回车键， -返回原列表。 +此区域显示可用工作区的列表。如果您要编辑其中某个的 +名称，点击它的编号并填写出现的对话框中的空栏。做完后， +点击 “应用” 按钮，或就按回车键，返回原列表。 #: xfwm4.xml:823(title) msgid Workspaces margins @@ -1200,9 +1201,10 @@ msgid type=\http\settings manager dialog/ulink and choose the tab labelled \Margins\. msgstr -要打开工作区边缘对话框，在 ulink url=\xfce-mcs-manager.html#manager --dialog\ type=\http\设置管理器对话框/ulink 中点击标有 “工作区和边缘” -的按钮并选择标有 “边缘” 的标签。 +要打开工作区边缘对话框，在 ulink url=\xfce-mcs-manager. +html#manager-dialog\ type=\http\设置管理器对话框/ulink +中点击标有 “工作区和边缘” 的按钮并选择标有 “边缘” +的标签。 #: xfwm4.xml:846(para) msgid @@ -1211,9 +1213,9 @@ msgid and bottom). Use this feature, for example, if you do not want maximized windows to overlap panel or iconbox frames. msgstr -边缘是最大化窗口不能遮盖的的屏幕边上的区域。您可以调整，以像素， -所有边缘(左、右、上和下)的大小。使用此功能，比如，如果您不想 -最大化窗口与面板或图标框边框重叠。 +边缘是已最大化的窗口不能遮盖的的屏幕边界的区域。您可以 +以像素调整所有边缘(左、右、上和下)的大小。使用此功能， +比如，如果您不想已最大化的窗口与面板或图标框边框重叠。 #: xfwm4.xml:857(title) msgid About application@PACKAGE_NAME@/application @@ -1225,10 +1227,10 @@ msgid (emailfour...@xfce.org/email). To find more information, please visit the ulink url=\http://www.xfce.org\; type=\http\Xfce web site/ulink. msgstr -application@PACKAGE_NAME@/application 由 Olivier Fourdan -(emailfour...@xfce.org/email) 编写。要查询更多信息， -请访问 ulink url=\http://www.xfce.org\; -type=\http\Xfce web site/ulink 。 +Olivier Fourdan application@PACKAGE_NAME@/application 由 +(emailfour...@xfce.org/email)撰写。 +要查找更多信息，请访问 +ulink url=\http://www.xfce.org\; type=\http\Xfce web site/ulink。 #: xfwm4.xml:864(para) msgid @@ -1236,9 +1238,10 @@ msgid manual, use the bug tracking system at ulink url=\http://bugzilla.xfce.org/; \ type=\http\http://bugzilla.xfce.org//ulink. msgstr -对于本应用程序或本手册，要报告缺陷或提出建议，使用缺陷追踪系统 -ulink
[Xfce4-commits] xfwm4:xfce-4.8 l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/xfce-4.8 to b8a2a33735d3db500193329247ffc63acfeb132c (commit) from a2e2fa776f95a0f2850620604a2c876603ca3dee (commit) commit b8a2a33735d3db500193329247ffc63acfeb132c Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 10:50:29 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/zh_CN.po |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/doc/manual/po/zh_CN.po b/doc/manual/po/zh_CN.po index 5cc7014..7bfdb81 100644 --- a/doc/manual/po/zh_CN.po +++ b/doc/manual/po/zh_CN.po @@ -463,7 +463,9 @@ msgstr msgid To \unhide\ a window, you will have to select its name or its icon in one of those Xfce 4 components : -msgstr 要 “显示” 窗口，您必须在那些 Xfce 4 组件之一中选择它的名称或图标： +msgstr +要 “取消隐藏” 窗口，您只得在那些 Xfce 4 组件中选择 +某个的名称或图标： #: xfwm4.xml:294(application) msgid xftaskbar4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4util:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 7de9be81a938baccdfd342095a25cf5f9bf45ef5 (commit) from effdd82fa9e30a75e70b10694460806dbd412ad7 (commit) commit 7de9be81a938baccdfd342095a25cf5f9bf45ef5 Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 11:00:00 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 7 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f199f8d..8e460ac 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: libxfce4util\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-11-25 15:14+\n +POT-Creation-Date: 2011-12-07 09:21+\n PO-Revision-Date: 2009-12-19 01:47+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n @@ -61,7 +61,7 @@ msgstr 不对因使用本软件而导致的任何直接的、间接的、偶发\n 的、特别的、可模仿的或后续的损害(包括、但不限于，\n 替代性物品的采购或售后服务；或物品、数据或利润\n -损失；或业务终止)负责，无论此损害依据何种责任理论， +损失；或业务终止)负责，无论此损害依据何种责任理论，\n 无论是以合同、以严格赔偿责任还是以侵权(包括疏忽或\n 其它)形式而产生，即使作者已被告知有此损害的可能性。\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfconf:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 0cdacc1ea0eb0cff1c6fc3ec7989ac3c31e01826 (commit) from 3aedf44f7597e3202884bfd3aa38972ce61b0f6d (commit) commit 0cdacc1ea0eb0cff1c6fc3ec7989ac3c31e01826 Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 11:12:37 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 67 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 18 -- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index eb23862..b6a08de 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: Xfconf\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-12-06 01:33+\n +POT-Creation-Date: 2011-12-07 08:03+\n PO-Revision-Date: 2009-10-20 23:13+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n @@ -100,9 +100,9 @@ msgid Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', '-', '' and '', as well as '/' as a separator msgstr -属性名称只能包含 ASCII 字符 A 至 Z、 -a 至 z、0 至 9、_、-、 或 ，此外 ‘/’ -用作分隔符 +属性名称只能包含 ASCII 字符 A 至 Z、a +至 z、0 至 9、_、-、 或 ，此外 ‘/’ 用 +作分隔符 #: ../xfconfd/xfconf-backend.c:135 #, c-format @@ -125,16 +125,15 @@ msgid Channel names can only include the ASCII characters A-Z, a-z, 0-9, '_', and '-' msgstr -频道名只能包含 ASCII 字符 A 至 Z、 -a 至 z、0 至 9、‘_’或 ‘-’ +频道名只能包含 ASCII 字符 A 至 Z、a +至 z、0 至 9、‘_’或 ‘-’ #: ../xfconfd/xfconf-backend.c:398 #, c-format msgid The property name can only be empty or \/\ if a recursive reset was specified -msgstr -只有当指定递归重置后属性名才能为空或 “/” +msgstr 只有当指定递归重置后属性名才能为空或 “/” #: ../xfconfd/main.c:134 msgid Prints the xfconfd version. @@ -324,8 +323,7 @@ msgstr 未能确定值的类型 #: ../xfconf-query/main.c:441 msgid A value type must be specified to change an array into a single value -msgstr -把数组更改为单一值时必须指定值的类型 +msgstr 把数组更改为单一值时必须指定值的类型 #: ../xfconf-query/main.c:451 ../xfconf-query/main.c:512 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to de14ac726461cce66248650aff2f12670aeeb163 (commit) from bfdc2d5f0fb7c3ad21988dae9f8da9cd0b865650 (commit) commit de14ac726461cce66248650aff2f12670aeeb163 Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 14:09:02 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 209 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f46e869..c224ac3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -920,7 +920,7 @@ msgid framework msgstr 启动 GNOME 服务，比如 gnome-keyring 和 GNOME -辅助框架 +辅助功能框架 #: ../settings/xfce4-session-settings.glade.h:30 msgid Start KDE services, such as \kdeinit,\ DCOP, and ARTS ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:xfce-4.8 l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/xfce-4.8 to 8a6a1a6e10f8cc551c3696d1674c1f2e692e2565 (commit) from b8a2a33735d3db500193329247ffc63acfeb132c (commit) commit 8a6a1a6e10f8cc551c3696d1674c1f2e692e2565 Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 14:52:52 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 229 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 70 +++--- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index a2a0dee..cdffcc4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,7 +11,7 @@ msgid msgstr Project-Id-Version: xfwm4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-06-18 04:34+\n +POT-Creation-Date: 2011-12-06 08:21+\n PO-Revision-Date: 2010-11-27 21:12+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Simplified Chinese xfce-i...@xfce.org\n @@ -116,7 +116,7 @@ msgstr 工作区 #: ../settings-dialogs/xfwm4-dialog.glade.h:1 msgid bBox move and resize/b -msgstr b视窗移动及调整大小/b +msgstr b窗口移动和调整大小/b #: ../settings-dialogs/xfwm4-dialog.glade.h:2 msgid bButton layout/b @@ -429,7 +429,7 @@ msgstr 竖直填充窗口 #: ../settings-dialogs/xfwm4-settings.c:260 msgid Toggle above -msgstr 切换至上面 +msgstr 切换以上 #: ../settings-dialogs/xfwm4-settings.c:261 msgid Toggle fullscreen @@ -666,7 +666,7 @@ msgstr 循环切换(_Y) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12 msgid Cycle _through windows on all workspaces -msgstr 在所有工作区的窗口间循环切换(_T) +msgstr 在所有工作区的窗口间循环(_T) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13 msgid Display _fullscreen overlay windows directly @@ -678,7 +678,7 @@ msgstr 无动作(_N) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16 msgid Hide _frame of windows when maximized -msgstr 最大化时隐藏窗口边框(_F) +msgstr 最大化时隐藏窗口框架(_F) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:17 msgid Honor _standard ICCCM focus hint @@ -734,15 +734,15 @@ msgstr 在弹出窗口下显示阴影(_U) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30 msgid Switch to win_dow's workspace -msgstr 切换至窗口所在的工作区(_D) +msgstr 切换至窗口的工作区(_D) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31 msgid Under the mouse _pointer -msgstr 在当前鼠标指针下(_P) +msgstr 在鼠标光标下(_P) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:32 msgid Use _edge resistance instead of window snapping -msgstr 使用边界阻距取代窗口吸附(_E) +msgstr 使用边界阻距而不是窗口吸附(_E) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:33 msgid Use the _mouse wheel on the desktop to switch workspaces @@ -750,11 +750,11 @@ msgstr 在桌面上使用鼠标滚轮切换工作区(_M) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:34 msgid When a window raises itself: -msgstr 当某个窗口提升自己时： +msgstr 窗口提升自己时： #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36 msgid Wrap workspaces depending on the actual desktop _layout -msgstr 以实际桌面布局决定工作区回绕(_l) +msgstr 回绕以实际桌面布局决定工作区回绕(_l) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:37 msgid Wrap workspaces when the _first or the last workspace is reached @@ -766,7 +766,7 @@ msgstr 辅助功能(_A) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:39 msgid _Bring window on current workspace -msgstr 移动窗口至当前工作区(_B) +msgstr 窗口放在当前工作区(_B) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:40 msgid _Draw frame around selected windows while cycling @@ -774,7 +774,7 @@ msgstr 循环窗口时显示窗口边框(_D) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:41 msgid _Enable display compositing -msgstr 允许显示合成(_E) +msgstr 启用显示合成(_E) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43 msgid _Include hidden (i.e. iconified) windows @@ -782,11 +782,11 @@ msgstr 包含隐藏(如图标化)窗口(_I) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:44 msgid _Minimum size of windows to trigger smart placement: -msgstr 最小窗口大小以触发智能定位(_M)： +msgstr 最小窗口大小以触发智能放置(_M)： #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45 msgid _Placement -msgstr 定位(_P) +msgstr 放置(_P) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46 msgid _Raise windows when any mouse button is pressed @@ -802,7 +802,8 @@ msgstr 键盘快捷键切换时记住并恢复先前的工作区(_R) msgid _Skip windows that have \skip pager\\n or \skip taskbar\ properties set -msgstr 跳过属性设置有 “跳过页面” \n +msgstr +跳过属性设置有 “跳过页面” \n 或 “跳过任务栏” 的窗口(_S) #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 @@ -832,7 +833,7 @@ msgstr 名称(_N)： #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:8 msgid _Number of workspaces: -msgstr 工作区数目(_N)： +msgstr 工作区编号(_N)： #. TRANSLATORS: (on %s) is like running on the name of the other host #: ../src/client.c:184 @@ -840,40 +841,35 @@ msgstr 工作区数目(_N)： msgid %s (on %s) msgstr %s (于 %s) -#: ../src/main.c:140 -#, c-format -msgid %s: Segmentation fault -msgstr %s: 段错误 - -#: ../src/main.c:534 +#: ../src/main.c:548 msgid Fork to the background msgstr 转入后台 -#: ../src/main.c:536 +#: ../src/main.c:550 msgid Fork to the background
[Xfce4-commits] xfwm4:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 4ac4738fdc6b8361ed0ef83d0e85af41059b859c (commit) from bb98bb215afed3afbbda559a22e696245c03bf0e (commit) commit 4ac4738fdc6b8361ed0ef83d0e85af41059b859c Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 15:02:39 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 199 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). doc/manual/po/zh_CN.po | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/manual/po/zh_CN.po b/doc/manual/po/zh_CN.po index a596d8b..fa4f782 100644 --- a/doc/manual/po/zh_CN.po +++ b/doc/manual/po/zh_CN.po @@ -270,7 +270,7 @@ msgid To obtain more details about focus options, please refer to the ulink url= \#focus\corresponding section/ulink below. msgstr -如果您要窗口接受键盘和鼠标输入，您需要给此窗口焦点。 +如果您要窗口接收键盘和鼠标输入，您需要给此窗口焦点。 窗口修饰颜色会依照焦点更改。要获得有关焦点选项的详情， 请参考以下的 ulink url=\#focus\相关章节/ulink。 @@ -287,7 +287,7 @@ msgstr 按住 Alt 然后重复按 Tab 直至到达您要聚焦的窗口。 如果您使用它，您会看到一个小的显示应用程序名、它的 图标和窗口标题的弹出窗口。且 application@PACKAGE_NAME@/application -会突出显示将获取焦点的窗口的轮廓。 +会突出显示将接收焦点的窗口的轮廓。 #. para #. If you want the panel, and apps that do not appear in the taskbar, @@ -604,7 +604,7 @@ msgid opening the window menu and selecting the \always on top\ item. msgstr 通过打开窗口菜单并选择 “总是最前” 条目，您能使窗口 -框架总是停留在其它窗口上。 +框架总是停留在所有其它窗口上。 #: xfwm4.xml:357(para) msgid @@ -809,7 +809,7 @@ msgid the left, center or right. msgstr 无论按钮布局如何，您可以在标题栏内选择标题的对齐，选择 -以下某个简单选项：靠左、居中或靠右对齐。 +以下某个简单选项：左、中或右对齐。 #: xfwm4.xml:507(term) msgid Button layout @@ -892,7 +892,7 @@ msgstr 粘滞窗口：Alt + F10 #: xfwm4.xml:563(para) msgid Cycle windows focus : Alt + Tab -msgstr 轮换窗口焦点：Alt + Tab +msgstr 循环窗口焦点：Alt + Tab #: xfwm4.xml:564(para) msgid Move window : Control + Shift + Alt + Arrow (up, down, left, or right) @@ -1038,7 +1038,7 @@ msgstr #: xfwm4.xml:665(term) msgid New window focus -msgstr 新建窗口焦点 +msgstr 聚焦新窗口 #: xfwm4.xml:667(para) msgid ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 4b830c5ef87bade9d4d81979bc62398388bb3565 (commit) from 4ac4738fdc6b8361ed0ef83d0e85af41059b859c (commit) commit 4b830c5ef87bade9d4d81979bc62398388bb3565 Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 15:06:48 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 268 ++- 1 files changed, 138 insertions(+), 130 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index afd416a..25025b5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -26,7 +26,7 @@ msgid Do you want to terminate the application? msgstr 这个窗口可能正忙且无响应。\n -您要中止该程序吗？ +您要中止此应用程序吗？ #: ../helper-dialog/helper-dialog.c:89 msgid Warning @@ -66,8 +66,9 @@ msgid %s: %s\n Try %s --help to see a full list of available command line options.\n msgstr -%s: %s\n -输入 %s --help 获得一份详细的可用命令行参数列表。\n +%s：%s\n +输入 %s --help 参看可用命令行选项的\n +完整列表。\n #: ../settings-dialogs/workspace-settings.c:73 #: ../settings-dialogs/workspace-settings.c:88 @@ -87,7 +88,7 @@ msgstr 设置管理器套接字 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-dialog.glade.h:29 msgid Configure window behavior and shortcuts -msgstr 配置窗口行为及快捷方式 +msgstr 配置窗口行为和快捷方式 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-dialog.glade.h:48 @@ -97,7 +98,7 @@ msgstr 窗口管理器 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:15 msgid Fine-tune window behaviour and effects -msgstr 微调窗口行为及效果 +msgstr 微调窗口行为和效果 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:35 @@ -107,7 +108,7 @@ msgstr 窗口管理器调整 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5 msgid Set number and names of workspaces -msgstr 设置工作区数目： +msgstr 设置工作区数目和名称： #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:6 @@ -116,7 +117,7 @@ msgstr 工作区 #: ../settings-dialogs/xfwm4-dialog.glade.h:1 msgid bBox move and resize/b -msgstr b移动及调整大小时显示窗口内容/b +msgstr b窗口移动和调整大小/b #: ../settings-dialogs/xfwm4-dialog.glade.h:2 msgid bButton layout/b @@ -124,15 +125,15 @@ msgstr b按钮布局/b #: ../settings-dialogs/xfwm4-dialog.glade.h:3 msgid bDouble click _action/b -msgstr b双击执行动作(_a)/b +msgstr b双击动作(_A)/b #: ../settings-dialogs/xfwm4-dialog.glade.h:4 msgid bFocus model/b -msgstr b焦点获取模式/b +msgstr b焦点模式/b #: ../settings-dialogs/xfwm4-dialog.glade.h:5 msgid bNew window focus/b -msgstr b新窗口获取焦点/b +msgstr b聚焦新窗口/b #: ../settings-dialogs/xfwm4-dialog.glade.h:6 msgid bRaise on click/b @@ -140,19 +141,19 @@ msgstr b点击时提升/b #: ../settings-dialogs/xfwm4-dialog.glade.h:7 msgid bRaise on focus/b -msgstr b获得焦点时置顶/b +msgstr b聚焦时提升/b #: ../settings-dialogs/xfwm4-dialog.glade.h:8 msgid bTitle _alignment/b -msgstr b标题对齐方式(_a)/b +msgstr b标题的对齐(_A)/b #: ../settings-dialogs/xfwm4-dialog.glade.h:9 msgid bTitle fon_t/b -msgstr b标题字体(_t)/b +msgstr b标题字体(_T)/b #: ../settings-dialogs/xfwm4-dialog.glade.h:10 msgid bWindow _shortcuts/b -msgstr b窗口快捷键(_s)/b +msgstr b窗口快捷键(_S)/b #: ../settings-dialogs/xfwm4-dialog.glade.h:11 msgid bWindows snapping/b @@ -160,7 +161,7 @@ msgstr b窗口吸附/b #: ../settings-dialogs/xfwm4-dialog.glade.h:12 msgid bWrap workspaces/b -msgstr b工作区回绕/b +msgstr b回绕工作区/b #: ../settings-dialogs/xfwm4-dialog.glade.h:13 msgid b_Theme/b @@ -194,23 +195,23 @@ msgstr 激活 #: ../settings-dialogs/xfwm4-dialog.glade.h:23 msgid Ad_vanced -msgstr 高级(_v) +msgstr 高级(_V) #: ../settings-dialogs/xfwm4-dialog.glade.h:24 msgid Automatically _raise windows when they receive focus -msgstr 当窗口获得焦点时自动将该窗口置顶(_r) +msgstr 当窗口接收焦点时自动提升它们(_R) #: ../settings-dialogs/xfwm4-dialog.glade.h:25 msgid Automatically give focus to _newly created windows -msgstr 自动为新建立窗口获取焦点(_n) +msgstr 自动聚焦新创建的窗口(_N) #: ../settings-dialogs/xfwm4-dialog.glade.h:26 msgid Clic_k to focus -msgstr 点击获取焦点(_k) +msgstr 点击聚焦(_K) #: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout -msgstr 点击并拖拽按钮来改变布局 +msgstr 点击并拖动按钮来改变布局 #: ../settings-dialogs/xfwm4-dialog.glade.h:28 msgid Close @@ -218,15 +219,15 @@ msgstr 关闭 #: ../settings-dialogs/xfwm4-dialog.glade.h:30 msgid Delay _before raising focused window: -msgstr 置顶焦点所在窗口前的延时(_b)： +msgstr 提升已聚焦窗口前的延时(_B)： #: ../settings-dialogs/xfwm4-dialog.glade.h:31 msgid Dis_tance: -msgstr 距离(_t)： +msgstr 距离(_T)： #: ../settings-dialogs/xfwm4-dialog.glade.h:32 msgid Focus follows _mouse -msgstr 焦点跟随鼠标(_m) +msgstr 焦点跟随鼠标(_M) #: ../settings-dialogs/xfwm4-dialog.glade.h:33 msgid Hidden @@ -234,15 +235,15 @@ msgstr 隐藏 #:
[Xfce4-commits] thunar-media-tags-plugin:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 71cfd8e6000db9ce21b8da9c233ad0d9d71bb2dc (commit) from 4d6ecacaa649488d1dc70c77d465b390f9d022a9 (commit) commit 71cfd8e6000db9ce21b8da9c233ad0d9d71bb2dc Author: Chipong Luo chipon...@yahoo.com Date: Wed Dec 7 15:36:05 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 58 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 129 +- 1 files changed, 82 insertions(+), 47 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 0bb373b..4427ef2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: thunar-media-tags-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-11 11:38+0200\n +POT-Creation-Date: 2011-12-07 10:18+\n PO-Revision-Date: 2008-12-04 16:51+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n @@ -17,7 +17,7 @@ msgstr Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: ../thunar-plugin/tag-renamer.c:59 +#: ../thunar-plugin/tag-renamer.c:59 ../thunar-plugin/tag-renamer.c:657 msgid Title msgstr 标题 @@ -45,185 +45,220 @@ msgstr 音轨.艺术家-标题 msgid Artist - Track - Title msgstr 艺术家-音轨-标题 +#: ../thunar-plugin/tag-renamer.c:67 +msgid Custom +msgstr 自定义 + +#. Custom format +#: ../thunar-plugin/tag-renamer.c:243 +msgid Cust_om format: +msgstr 自定义格式(_O)： + #. Format label -#: ../thunar-plugin/tag-renamer.c:223 +#: ../thunar-plugin/tag-renamer.c:271 msgid _Format: msgstr 格式(_F)： -#: ../thunar-plugin/tag-renamer.c:246 +#: ../thunar-plugin/tag-renamer.c:312 msgid _Underscores msgstr 下划线(_U) -#: ../thunar-plugin/tag-renamer.c:248 +#: ../thunar-plugin/tag-renamer.c:314 msgid Activating this option will replace all spaces in the target filename with underscores. msgstr 激活此选项将会用下划线代替目标文件名中的所有空格 -#: ../thunar-plugin/tag-renamer.c:253 +#: ../thunar-plugin/tag-renamer.c:319 msgid _Lowercase msgstr 小写字母(_L) -#: ../thunar-plugin/tag-renamer.c:255 +#: ../thunar-plugin/tag-renamer.c:321 msgid If you activate this, the resulting filename will only contain lowercase letters. msgstr 激活此项将使文件名中只包含小写字母 -#: ../thunar-plugin/tag-renamer.c:264 ../thunar-plugin/tag-renamer.c:702 -#: ../thunar-plugin/audio-tags-page.c:183 +#: ../thunar-plugin/tag-renamer.c:464 ../thunar-plugin/audio-tags-page.c:182 msgid Unknown Artist msgstr 未知艺术家 -#: ../thunar-plugin/tag-renamer.c:265 ../thunar-plugin/tag-renamer.c:750 -#: ../thunar-plugin/audio-tags-page.c:209 +#: ../thunar-plugin/tag-renamer.c:472 ../thunar-plugin/audio-tags-page.c:208 msgid Unknown Title msgstr 未知标题 #. Edit tags action -#: ../thunar-plugin/tag-renamer.c:523 +#: ../thunar-plugin/tag-renamer.c:627 msgid Edit _Tags msgstr 编辑标签(_T) -#: ../thunar-plugin/tag-renamer.c:523 +#: ../thunar-plugin/tag-renamer.c:627 msgid Edit ID3/OGG tags of this file. msgstr 编辑此文件的 ID3/OGG 标签 -#: ../thunar-plugin/tag-renamer.c:545 +#: ../thunar-plugin/tag-renamer.c:646 +msgid Tag Help +msgstr 标签帮助 + +#: ../thunar-plugin/tag-renamer.c:657 +msgid Artist +msgstr 艺术家 + +#: ../thunar-plugin/tag-renamer.c:658 +msgid Album +msgstr 专辑 + +#: ../thunar-plugin/tag-renamer.c:658 +msgid Genre +msgstr 流派 + +#: ../thunar-plugin/tag-renamer.c:659 +msgid Track number +msgstr 音轨编号 + +#: ../thunar-plugin/tag-renamer.c:659 +msgid Year +msgstr 年份 + +#: ../thunar-plugin/tag-renamer.c:660 +msgid Comment +msgstr 注释 + +#: ../thunar-plugin/tag-renamer.c:717 msgid Audio Tags msgstr 音频标签 -#: ../thunar-plugin/audio-tags-page.c:196 +#: ../thunar-plugin/audio-tags-page.c:195 msgid Unknown Album msgstr 未知专辑 -#: ../thunar-plugin/audio-tags-page.c:305 +#: ../thunar-plugin/audio-tags-page.c:328 msgid bTrack:/b msgstr b音轨：/b -#: ../thunar-plugin/audio-tags-page.c:320 +#: ../thunar-plugin/audio-tags-page.c:343 msgid Enter the track number here. msgstr 在这里输入音轨编号。 -#: ../thunar-plugin/audio-tags-page.c:328 +#: ../thunar-plugin/audio-tags-page.c:351 msgid bYear:/b msgstr b年份：/b -#: ../thunar-plugin/audio-tags-page.c:343 +#: ../thunar-plugin/audio-tags-page.c:366 msgid Enter the release year here. msgstr 在这里输入发行年份。 -#: ../thunar-plugin/audio-tags-page.c:351 +#: ../thunar-plugin/audio-tags-page.c:374 msgid bArtist:/b msgstr b艺术家：/b -#: ../thunar-plugin/audio-tags-page.c:358 +#: ../thunar-plugin/audio-tags-page.c:381 msgid Enter the name of the artist or author of this file here. msgstr 在这里输入艺术家或此文件作者姓名。 -#: ../thunar-plugin/audio-tags-page.c:366 +#: ../thunar-plugin/audio-tags-page.c:389 msgid bTitle:/b msgstr b标题：/b -#: ../thunar-plugin/audio-tags-page.c:373 +#: ../thunar-plugin/audio-tags-page.c:396 msgid Enter the song title here. msgstr 在这里输入歌曲标题。 -#: ../thunar-plugin/audio-tags-page.c:380 +#: ../thunar-plugin/audio-tags-page.c:403 msgid bAlbum:/b msgstr b专辑名：/b
[Xfce4-commits] xfdesktop:master l10n: Updated Icelandic (is) translation to 2%
Updating branch refs/heads/master to be4613689f914ad4b43e01f30bf64c683c91ddae (commit) from 0cce88b1e572d0bae3d16115007791ea5307fdac (commit) commit be4613689f914ad4b43e01f30bf64c683c91ddae Author: Theódór S. Andrésson husg...@gmail.com Date: Wed Dec 7 17:18:28 2011 +0100 l10n: Updated Icelandic (is) translation to 2% New status: 4 messages complete with 21 fuzzies and 174 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po | 243 ++ 1 files changed, 119 insertions(+), 124 deletions(-) diff --git a/po/is.po b/po/is.po index 8cfb668..4137f17 100644 --- a/po/is.po +++ b/po/is.po @@ -4,14 +4,14 @@ msgid msgstr Project-Id-Version: xfdesktop.master.xfdesktop\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:44+0100\n +POT-Creation-Date: 2011-12-07 14:15+\n PO-Revision-Date: 2010-05-03 09:51+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic rg...@rglug.org\n -Language: is\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: is\n X-Generator: KBabel 1.11.4\n #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 @@ -20,135 +20,135 @@ msgid Backdrop list file is not valid msgstr #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid %s\n iSize: %dx%d/i msgstr -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:289 ../src/xfdesktop-special-file-icon.c:256 +#: ../src/xfdesktop-special-file-icon.c:419 msgid Home -msgstr +msgstr Heim -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid Filesystem -msgstr +msgstr Skráakerfi -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid Trash -msgstr +msgstr Rusl -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid Removable Devices msgstr -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid Cannot create backdrop list \%s\ msgstr -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid Backdrop List Error msgstr -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid Create/Load Backdrop List msgstr -#: ../settings/main.c:511 +#: ../settings/main.c:528 #, c-format msgid File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? msgstr -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid Invalid List File msgstr -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid Overwriting the file will cause its contents to be lost. msgstr -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid Replace msgstr -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid Failed to write backdrop list to \%s\ msgstr -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid Add Image File(s) msgstr -#: ../settings/main.c:811 +#: ../settings/main.c:834 #, fuzzy msgid Image files msgstr Myndir -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid All files msgstr -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid Screen %d, Monitor %d (%s) msgstr -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid Screen %d, Monitor %d msgstr -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid Screen %d msgstr -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid Monitor %d (%s) msgstr -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid Monitor %d msgstr -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid Settings manager socket msgstr -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid SOCKET ID msgstr -#: ../settings/main.c:1478 +#: ../settings/main.c:1501 msgid Version information msgstr -#: ../settings/main.c:1498 +#: ../settings/main.c:1521 #, c-format msgid Type '%s --help' for usage. msgstr -#: ../settings/main.c:1510 +#: ../settings/main.c:1533 msgid The Xfce development team. All rights reserved. msgstr -#: ../settings/main.c:1511 +#: ../settings/main.c:1534 #, c-format msgid Please report bugs to %s. msgstr -#: ../settings/main.c:1518 +#: ../settings/main.c:1541 msgid Desktop Settings msgstr Skjáborðsstillingar -#: ../settings/main.c:1520 +#: ../settings/main.c:1543 msgid Unable to contact settings server msgstr @@ -342,7 +342,7 @@ msgstr msgid Control msgstr -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:729 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:738 #, fuzzy msgid Desktop msgstr Skjáborðsvalmynd @@ -534,46 +534,46 @@ msgstr msgid _Applications msgstr -#: ../src/windowlist.c:235 +#:
[Xfce4-commits] midori:master Skip window_object_cleared in non-http-frames
Updating branch refs/heads/master
to 312d321ff993fbe0c705c87aa713f4bbb716a5ed (commit)
from 6e32883b6809dde039b99f5e5a25a715795e25c6 (commit)
commit 312d321ff993fbe0c705c87aa713f4bbb716a5ed
Author: Alexander Butenko a.bute...@gmail.com
Date: Fri Dec 2 19:53:30 2011 -0400
Skip window_object_cleared in non-http-frames
extensions/adblock.c |4 ++--
extensions/addons.c |5 +
extensions/formhistory.c |6 ++
midori/midori-view.c |6 ++
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 21481e5..3248f66 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -926,9 +926,9 @@ adblock_window_object_cleared_cb (WebKitWebView* web_view,
{
const char *page_uri;
-page_uri = webkit_web_view_get_uri (web_view);
+page_uri = webkit_web_frame_get_uri (web_frame);
/* Don't add adblock css into speeddial and about: pages */
-if (midori_uri_is_blank (page_uri))
+if (!midori_uri_is_http (page_uri))
return;
g_free (sokoke_js_script_eval (js_context, blockscript, NULL));
diff --git a/extensions/addons.c b/extensions/addons.c
index b98899b..8aa60e3 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -1471,6 +1471,11 @@ addons_context_ready_cb (WebKitWebView* web_view,
GSList* scripts, *styles;
struct AddonElement* script, *style;
struct AddonsList* scripts_list, *styles_list;
+const gchar* page_uri;
+
+page_uri = webkit_web_frame_get_uri (web_frame);
+if (!midori_uri_is_http (page_uri))
+return;
/* Not a main frame! Abort */
if (web_frame != webkit_web_view_get_main_frame (web_view))
diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 8b20aa1..d7a0c6e 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -255,6 +255,12 @@ formhistory_window_object_cleared_cb (WebKitWebView*
web_view,
JSObjectRef js_window)
{
gchar* script;
+const gchar* page_uri;
+
+page_uri = webkit_web_frame_get_uri (web_frame);
+if (!midori_uri_is_http (page_uri))
+return;
+
script = formhistory_build_js ();
sokoke_js_script_eval (js_context, script, NULL);
g_free (script);
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 1d4d628..000a4da 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2944,6 +2944,12 @@ webkit_web_view_window_object_cleared_cb (GtkWidget*
web_view,
JSObjectRef js_window,
MidoriView* view)
{
+const gchar* page_uri;
+
+page_uri = webkit_web_frame_get_uri (web_frame);
+if (!midori_uri_is_http (page_uri))
+return;
+
if (katze_object_get_boolean (view-settings, enable-private-browsing))
{
/* Mask language, architecture, no plugin list */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Remove conext-ready signal from browser and view
Updating branch refs/heads/master
to 42387e9b8ba64a1dff6cff8c4d741a206ebbfe81 (commit)
from 312d321ff993fbe0c705c87aa713f4bbb716a5ed (commit)
commit 42387e9b8ba64a1dff6cff8c4d741a206ebbfe81
Author: Alexander Butenko a.bute...@gmail.com
Date: Fri Dec 2 20:04:14 2011 -0400
Remove conext-ready signal from browser and view
midori/midori-browser.c | 22 --
midori/midori-view.c| 14 --
2 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8677b91..0b6d5e3 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -141,7 +141,6 @@ enum
REMOVE_TAB,
MOVE_TAB,
ACTIVATE_ACTION,
-CONTEXT_READY,
ADD_DOWNLOAD,
SEND_NOTIFICATION,
POPULATE_TOOL_MENU,
@@ -548,14 +547,6 @@ midori_view_notify_progress_cb (GtkWidget* view,
}
static void
-midori_view_context_ready_cb (GtkWidget* view,
- JSContextRef js_context,
- MidoriBrowser* browser)
-{
-g_signal_emit (browser, signals[CONTEXT_READY], 0, js_context);
-}
-
-static void
midori_view_notify_uri_cb (GtkWidget* widget,
GParamSpec*pspec,
MidoriBrowser* browser)
@@ -1548,8 +1539,6 @@ _midori_browser_add_tab (MidoriBrowser* browser,
midori_view_notify_load_status_cb, browser,
signal::notify::progress,
midori_view_notify_progress_cb, browser,
- signal::context-ready,
- midori_view_context_ready_cb, browser,
signal::notify::uri,
midori_view_notify_uri_cb, browser,
signal::notify::title,
@@ -1836,17 +1825,6 @@ midori_browser_class_init (MidoriBrowserClass* class)
G_TYPE_NONE, 1,
G_TYPE_STRING);
-signals[CONTEXT_READY] = g_signal_new (
-context-ready,
-G_TYPE_FROM_CLASS (class),
-(GSignalFlags)(G_SIGNAL_RUN_LAST),
-0,
-0,
-NULL,
-g_cclosure_marshal_VOID__POINTER,
-G_TYPE_NONE, 1,
-G_TYPE_POINTER);
-
/**
* MidoriBrowser::add-download:
* @browser: the object on which the signal is emitted
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 000a4da..fd3b56a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -168,7 +168,6 @@ enum
enum {
ACTIVATE_ACTION,
CONSOLE_MESSAGE,
-CONTEXT_READY,
ATTACH_INSPECTOR,
DETACH_INSPECTOR,
NEW_TAB,
@@ -248,17 +247,6 @@ midori_view_class_init (MidoriViewClass* class)
G_TYPE_INT,
G_TYPE_STRING);
-signals[CONTEXT_READY] = g_signal_new (
-context-ready,
-G_TYPE_FROM_CLASS (class),
-(GSignalFlags)(G_SIGNAL_RUN_LAST),
-0,
-0,
-NULL,
-g_cclosure_marshal_VOID__POINTER,
-G_TYPE_NONE, 1,
-G_TYPE_POINTER);
-
signals[ATTACH_INSPECTOR] = g_signal_new (
attach-inspector,
G_TYPE_FROM_CLASS (class),
@@ -2967,8 +2955,6 @@ webkit_web_view_window_object_cleared_cb (GtkWidget*
web_view,
NULL);
g_free (result);
}
-
-g_signal_emit (view, signals[CONTEXT_READY], 0, js_context);
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Optimize private element hider algorithm
Updating branch refs/heads/master
to 98f2e3b572dead2a22a63a1227ec13e88d611e18 (commit)
from 42387e9b8ba64a1dff6cff8c4d741a206ebbfe81 (commit)
commit 98f2e3b572dead2a22a63a1227ec13e88d611e18
Author: Alexander Butenko a.bute...@gmail.com
Date: Mon Dec 5 20:24:08 2011 -0400
Optimize private element hider algorithm
extensions/adblock.c | 30 +++---
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 3248f66..1b8e75e 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -61,14 +61,21 @@ adblock_build_js (const gchar* private)
function () {
if (document.getElementById('madblock'))
return;
- var URL = location.href;
+// Get just domain name from URL
+ var URL = location.href.match(/:\\/\\/(.[^/]+)/)[1];
var sites = new Array(); %s;
var public = '.madblockplaceholder ';
- for (var i in sites) {
- if (URL.indexOf(i) != -1 sites[i] ){
- public += ', .'+sites[i];
- break;
- }}
+// Split domain into subdomain parts
+ var subdomains = URL.split ('.');
+ var hostname = subdomains [subdomains.length - 1];
+ var i = subdomains.length - 2;
+// Check if any of subdomains do have blocking rules
+ while (i = 0) {
+ hostname = subdomains [i] + '.' + hostname;
+ if (sites [hostname])
+ public += ', ' + sites [hostname];
+ i--;
+ }
public += ' {display: none !important}';
var mystyle = document.createElement('style');
mystyle.setAttribute('type', 'text/css');
@@ -1218,8 +1225,17 @@ adblock_frame_add_private (const gchar* line,
domains = g_strsplit (data[0], ,, -1);
for (i = 0; domains[i]; i++)
{
+gchar* domain;
+
+domain = domains[i];
+/* Ignore Firefox-specific option */
+if (!g_strcmp0 (domain, ~pregecko2))
+continue;
+/* strip ~ from domain */
+if (domain[0] == '~')
+domain++;
g_string_append_printf (blockcssprivate, ;sites['%s']+=',%s',
-g_strstrip (domains[i]), data[1]);
+g_strstrip (domain), data[1]);
}
g_strfreev (domains);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 85f7bf22de6fa59c3a509a144d8fa2348493c24c (commit) from 53af2f0491e1feed3d4f8e8374d3afd91b736115 (commit) commit 85f7bf22de6fa59c3a509a144d8fa2348493c24c Author: Yarema aka Knedlyk yupad...@gmail.com Date: Wed Dec 7 23:00:10 2011 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 800 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/uk.po b/po/uk.po index cb90a25..a09fa5b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,7 +2,7 @@ # Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the orage package. # Maxim V. Dziumanenko m...@mylinux.com.ua. -# +# # Dmitry Nikitin luckas...@mail.ru, 2008. msgid msgstr @@ -521,7 +521,7 @@ msgstr Налаштування Orage #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid %A %d %B %Y/%V msgstr %A %d %B %Y/%V @@ -1781,7 +1781,7 @@ msgid Never msgstr Ніколи #: ../src/mainbox.c:450 ../src/mainbox.c:457 -#, fuzzy, c-format +#, c-format msgid Title: %s\n Location: %s\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:xfce-4.8 l10n: Updated Icelandic (is) translation to 100%
Updating branch refs/heads/xfce-4.8 to 58d42eebc742d98e0d6f2db78430064a4d5012aa (commit) from e725f1adebc1d6871ed633ed3269d813039d5376 (commit) commit 58d42eebc742d98e0d6f2db78430064a4d5012aa Author: Sveinn í Felli svei...@nett.is Date: Wed Dec 7 23:01:22 2011 +0100 l10n: Updated Icelandic (is) translation to 100% New status: 31 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po | 35 ++- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/po/is.po b/po/is.po index 9c3898c..8fca0f2 100644 --- a/po/is.po +++ b/po/is.po @@ -1,20 +1,20 @@ -# translation of libxfce4ui.master.untitled.po to Icelandic +# translation of libxfce4ui.xfce-4-8.is.po to Icelandic # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Sveinn í Felli svei...@nett.is, 2010. +# +# Sveinn í Felli svei...@nett.is, 2010, 2011. msgid msgstr -Project-Id-Version: libxfce4ui.master.untitled\n +Project-Id-Version: libxfce4ui.xfce-4-8.is\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-12-01 20:21+\n -PO-Revision-Date: 2010-05-03 12:32+\n +POT-Creation-Date: 2011-12-07 21:30+\n +PO-Revision-Date: 2011-12-07 21:59+\n Last-Translator: Sveinn í Felli svei...@nett.is\n -Language-Team: Icelandic rg...@rglug.org\n +Language-Team: Icelandic translation-team...@lists.sourceforge.net\n +Language: is\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: is\n Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n X-Generator: KBabel 1.11.4\n @@ -36,7 +36,7 @@ msgstr Spurning #: ../libxfce4ui/xfce-sm-client.c:1401 msgid Session management client ID -msgstr +msgstr Biðlaraauðkenni í setustýringu #: ../libxfce4ui/xfce-sm-client.c:1401 msgid ID @@ -57,12 +57,12 @@ msgstr Sýna valkosti setustýringar #: ../libxfce4ui/xfce-sm-client.c:1589 #, c-format msgid Failed to connect to the session manager: %s -msgstr +msgstr Mistókst að tengjast setustýringu: %s #: ../libxfce4ui/xfce-sm-client.c:1596 #, c-format msgid Session manager did not return a valid client id -msgstr +msgstr Setustýringin gaf ekki gilt biðlaraauðkenni #. print warning for user #: ../libxfce4ui/xfce-spawn.c:407 @@ -70,13 +70,13 @@ msgstr msgid Working directory \%s\ does not exist. It won't be used when spawning \%s \. -msgstr +msgstr Vinnumappan \%s\ er ekki til. Hún verður ekki notuð við gerð \%s\. #: ../libxfce4kbd-private/xfce-shortcuts.c:52 msgid This shortcut is already being used for another window manager action. Which action do you want to use? -msgstr +msgstr Þessi flýtilykill er þegar í notkun fyrir aðra gluggastjóraaðgerð. Hvora aðgerðina viltu nota? #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #: ../libxfce4kbd-private/xfce-shortcuts.c:56 @@ -110,16 +110,16 @@ msgstr Halda '%s' msgid This shortcut is already being used by a window manager action. Which action do you want to use? -msgstr +msgstr Þessi flýtilykill er þegar í notkun fyrir gluggastjóraaðgerð. Hvora aðgerðina viltu nota? #: ../libxfce4kbd-private/xfce-shortcuts.c:62 msgid Keep the window manager action -msgstr +msgstr Halda gluggastjóraaðgerð #: ../libxfce4kbd-private/xfce-shortcuts.c:95 #, c-format msgid Conflicting actions for %s -msgstr +msgstr Árekstrar milli aðgerða fyrir %s #: ../libxfce4kbd-private/xfce-shortcuts.c:128 msgid This shortcut is already being used for something else. @@ -127,7 +127,7 @@ msgstr Þessi flýtileið er nú þegar í notkun fyrir eitthvað annað. #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:207 msgid Window Manager Action Shortcut -msgstr +msgstr Flýtilykill fyrir gluggastjóraaðgerð #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:208 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:218 @@ -165,3 +165,4 @@ msgstr Titla Dálkur #: ../glade/libxfce4ui.xml.in.h:3 msgid Xfce 4 Widgets msgstr XFCE 4 græjur + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce-utils:xfce-4.8 l10n: Updated Icelandic (is) translation to 77%
Updating branch refs/heads/xfce-4.8 to 05c5210f9e28180b71f4352ec7e242b8d6ca4311 (commit) from 9d5c476cee5d8b58c80437180b6ec06a5bfc468b (commit) commit 05c5210f9e28180b71f4352ec7e242b8d6ca4311 Author: Sveinn í Felli svei...@nett.is Date: Wed Dec 7 23:10:01 2011 +0100 l10n: Updated Icelandic (is) translation to 77% New status: 56 messages complete with 0 fuzzies and 16 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/is.po | 26 +++--- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/po/is.po b/po/is.po index 9629561..59f8e55 100644 --- a/po/is.po +++ b/po/is.po @@ -2,20 +2,20 @@ # translation of xfce-utils to Icelandic # Copyright (C) 2011 Free Software Foundation # This file is distributed under the same license as the xfce package. -# +# # Sveinn í Felli svei...@nett.is, 2011. msgid msgstr Project-Id-Version: xfce-utils.xfce-4-8.untitled\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-12-01 18:39+\n -PO-Revision-Date: 2011-12-01 15:35+\n +POT-Creation-Date: 2011-12-07 20:09+\n +PO-Revision-Date: 2011-12-07 22:08+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic translation-team...@lists.sourceforge.net\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: \n X-Generator: KBabel 1.11.4\n Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n @@ -53,7 +53,7 @@ msgstr #: ../xfce4-about/main.c:84 msgid File Manager -msgstr +msgstr Skráastjóri #: ../xfce4-about/main.c:85 msgid @@ -89,7 +89,9 @@ msgstr Forritaleit msgid Shows the applications installed on your system in categories, so you can quickly find and launch them. -msgstr Sýna uppsett forrit í kerfinu þínu í flokkum, þannig að þú getur fundið þau hraðar og keyrt þau. +msgstr +Sýna uppsett forrit í kerfinu þínu í flokkum, þannig að þú getur fundið þau +hraðar og keyrt þau. #: ../xfce4-about/main.c:104 msgid Utilities and Scripts @@ -101,7 +103,7 @@ msgstr #: ../xfce4-about/main.c:108 msgid Settings Daemon -msgstr +msgstr Stillingamiðlari #: ../xfce4-about/main.c:109 msgid D-Bus-based configuration storage system. @@ -141,7 +143,8 @@ msgid If you know of anyone missing from this list; don't hesitate and file a bug on http://bugzilla.xfce.org . msgstr -Ef þú veist um einhvern sem vantar á þennan lista; ekki hika við að senda það sem villu á \r\n +Ef þú veist um einhvern sem vantar á þennan lista; ekki hika við að senda +það sem villu á \r\n http://bugzilla.xfce.org . #: ../xfce4-about/main.c:270 @@ -178,7 +181,7 @@ msgstr Skrifaðu inn '%s --help' fyrir nytsamlegar upplýsingar. #: ../xfce4-about/main.c:452 msgid Unable to initialize GTK+. -msgstr +msgstr Tókst ekki að frumstilla GTK+. #: ../xfce4-about/main.c:461 msgid The Xfce development team. All rights reserved. @@ -286,11 +289,11 @@ msgstr Notkunarskilmálar #. we don't support daemon mode #: ../xfrun/xfrun.c:48 msgid Daemon Mode -msgstr +msgstr Miðlarahamur #: ../xfrun/xfrun.c:50 msgid Daemon mode is not supported. -msgstr +msgstr Miðlarahamur er ekki studdur. #: ../xfrun/xfrun.c:51 msgid Xfrun must be compiled with D-BUS support to enable daemon mode. @@ -359,3 +362,4 @@ msgstr Hjálp #: ../scripts/xfhelp4.desktop.in.h:2 msgid Help using Xfce msgstr Hjálp við notkun Xfce + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Introduce and use midori_view_new_with_item
Updating branch refs/heads/master
to 614365427971fc76eb88905b6f0c6626076374bb (commit)
from 98f2e3b572dead2a22a63a1227ec13e88d611e18 (commit)
commit 614365427971fc76eb88905b6f0c6626076374bb
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Dec 7 21:27:38 2011 +0100
Introduce and use midori_view_new_with_item
katze/katze-item.c | 14 ++
midori/midori-browser.c | 28 ++--
midori/midori-view.c| 36 +++-
midori/midori-view.h|5 +
4 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/katze/katze-item.c b/katze/katze-item.c
index e56bc47..1d3a3ee 100644
--- a/katze/katze-item.c
+++ b/katze/katze-item.c
@@ -707,6 +707,8 @@ katze_item_set_parent (KatzeItem* item,
* Note that subclass specific features will only
* be preserved if the class implements it.
*
+ * Since 0.4.3 meta data is copied.
+ *
* Return value: a new #KatzeItem
*
* Since: 0.1.3
@@ -715,6 +717,9 @@ KatzeItem*
katze_item_copy (KatzeItem* item)
{
KatzeItem* copy;
+GHashTableIter iter;
+const gchar* key;
+const gchar* value;
KatzeItemClass* class;
g_return_val_if_fail (KATZE_IS_ITEM (item), NULL);
@@ -727,6 +732,15 @@ katze_item_copy (KatzeItem* item)
added, item-added,
parent, item-parent,
NULL);
+
+g_hash_table_iter_init (iter, item-metadata);
+while (g_hash_table_iter_next (iter, (void*)key, (void*)value))
+{
+if (g_str_has_prefix (key, midori:))
+key = key[7];
+g_hash_table_insert (copy-metadata, g_strdup (key), g_strdup (value));
+}
+
class = KATZE_ITEM_GET_CLASS (item);
return class-copy ? class-copy (copy) : copy;
}
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0b6d5e3..fa96a55 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3418,12 +3418,10 @@ _action_source_view_activate (GtkAction* action,
source_uri = g_filename_to_uri (filename, NULL, NULL);
g_free (filename);
-source = midori_view_new (NULL);
-midori_view_set_settings (MIDORI_VIEW (source), browser-settings);
+source = midori_view_new_with_title (NULL, browser-settings, FALSE);
source_view = midori_view_get_web_view (MIDORI_VIEW (source));
webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (source_view),
TRUE);
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (source_view), source_uri);
-gtk_widget_show (source);
midori_browser_add_tab (browser, source);
}
else
@@ -7053,27 +7051,15 @@ midori_browser_add_item (MidoriBrowser* browser,
KatzeItem* item)
{
const gchar* uri;
-const gchar* title;
GtkWidget* view;
gint page;
-KatzeItem* proxy_item;
-GList* keys;
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
g_return_val_if_fail (KATZE_IS_ITEM (item), -1);
uri = katze_item_get_uri (item);
-if (!uri)
-uri = about:blank;
-title = katze_item_get_name (item);
-view = midori_view_new_with_title (title, browser-settings,
+view = midori_view_new_with_item (item, browser-settings,
g_object_get_data (G_OBJECT (item), midori-view-append) ? TRUE :
FALSE);
-
-proxy_item = midori_view_get_proxy_item (MIDORI_VIEW (view));
-
-if (katze_item_get_meta_boolean (item, dont-write-history))
-katze_item_set_meta_integer (proxy_item, dont-write-history, 1);
-
page = midori_browser_add_tab (browser, view);
/* Blank pages should not be delayed */
@@ -7088,16 +7074,6 @@ midori_browser_add_item (MidoriBrowser* browser,
else
midori_view_set_uri (MIDORI_VIEW (view), uri);
-proxy_item = midori_view_get_proxy_item (MIDORI_VIEW (view));
-if ((keys = katze_item_get_meta_keys (item)))
-{
-guint i = 0;
-const gchar* key;
-while ((key = g_list_nth_data (keys, i++)))
-katze_item_set_meta_string (proxy_item, key,
-katze_item_get_meta_string (item, key));
-g_list_free (keys);
-}
return page;
}
diff --git a/midori/midori-view.c b/midori/midori-view.c
index fd3b56a..f25ce47 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3251,7 +3251,6 @@ _midori_view_set_settings (MidoriView*view,
/**
* midori_view_new_with_title:
- * @uri: an URI string, or %NULL
* @title: a title, or %NULL
* @settings: a #MidoriWebSettings, or %NULL
* @append: if %TRUE, the view should be appended
@@ -3268,11 +3267,35 @@ midori_view_new_with_title (const gchar* title,
MidoriWebSettings* settings,
gboolean append)
{
-MidoriView* view = g_object_new (MIDORI_TYPE_VIEW, title, title, NULL);
+KatzeItem* item = katze_item_new ();
+item-name = g_strdup (title);
+return midori_view_new_with_item (item,
[Xfce4-commits] midori:master Introduce helper for correctly restoring tabs
Updating branch refs/heads/master
to e698ba33800bf3461ede2d6f9cf39e80313da965 (commit)
from 614365427971fc76eb88905b6f0c6626076374bb (commit)
commit e698ba33800bf3461ede2d6f9cf39e80313da965
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Dec 7 22:31:13 2011 +0100
Introduce helper for correctly restoring tabs
We need to ensure a reference on the item.
midori/midori-browser.c | 31 +++
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index fa96a55..38b326f 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2817,6 +2817,19 @@ _action_trash_populate_popup (GtkAction* action,
gtk_widget_show (menuitem);
}
+static gint
+midori_browser_restore_tab (MidoriBrowser* browser,
+KatzeItem* item)
+{
+gint n;
+
+g_object_ref (item);
+katze_array_remove_item (browser-trash, item);
+n = midori_browser_add_item (browser, item);
+g_object_unref (item);
+return n;
+}
+
static gboolean
_action_trash_activate_item_alt (GtkAction* action,
KatzeItem* item,
@@ -2825,17 +2838,13 @@ _action_trash_activate_item_alt (GtkAction* action,
{
if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
{
-guint n;
-katze_array_remove_item (browser-trash, item);
-n = midori_browser_add_item (browser, item);
-midori_browser_set_current_page_smartly (browser, n);
+midori_browser_set_current_page_smartly (browser,
+midori_browser_restore_tab (browser, item));
}
else if (button == 1)
{
-guint n;
-katze_array_remove_item (browser-trash, item);
-n = midori_browser_add_item (browser, item);
-midori_browser_set_current_page (browser, n);
+midori_browser_set_current_page (browser,
+midori_browser_restore_tab (browser, item));
}
return TRUE;
@@ -5107,7 +5116,6 @@ _action_undo_tab_close_activate (GtkAction* action,
{
guint last;
KatzeItem* item;
-guint n;
if (!browser-trash)
return;
@@ -5115,9 +5123,8 @@ _action_undo_tab_close_activate (GtkAction* action,
/* Reopen the most recent trash item */
last = katze_array_get_length (browser-trash) - 1;
item = katze_array_get_nth_item (browser-trash, last);
-katze_array_remove_item (browser-trash, item);
-n = midori_browser_add_item (browser, item);
-midori_browser_set_current_page (browser, n);
+midori_browser_set_current_page (browser,
+midori_browser_restore_tab (browser, item));
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Avoid counting total pages when not necessary
Updating branch refs/heads/master
to ef9e5b6e6cd5568c7c28c2db7b8eebff66619f93 (commit)
from e698ba33800bf3461ede2d6f9cf39e80313da965 (commit)
commit ef9e5b6e6cd5568c7c28c2db7b8eebff66619f93
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Dec 7 22:42:06 2011 +0100
Avoid counting total pages when not necessary
midori/midori-browser.c | 29 -
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 38b326f..0a8eb71 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -250,34 +250,33 @@ midori_browser_is_fullscreen (MidoriBrowser* browser)
return state GDK_WINDOW_STATE_FULLSCREEN;
}
-static void
+static gboolean
_toggle_tabbar_smartly (MidoriBrowser* browser,
gboolean ignore_fullscreen)
{
+gboolean has_tabs =
+gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser-notebook), 1) !=
NULL;
gboolean show_tabs =
browser-show_tabs
(!midori_browser_is_fullscreen (browser) || ignore_fullscreen)
- (gtk_notebook_get_nth_page (GTK_NOTEBOOK (browser-notebook), 1)
+ (has_tabs
|| katze_object_get_boolean (browser-settings, always-show-tabbar));
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser-notebook), show_tabs);
gtk_notebook_set_show_border (GTK_NOTEBOOK (browser-notebook), show_tabs);
+return has_tabs;
}
static void
_midori_browser_update_actions (MidoriBrowser* browser)
{
-guint n;
-gboolean trash_empty;
-
-_toggle_tabbar_smartly (browser, FALSE);
-n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser-notebook));
-_action_set_sensitive (browser, TabPrevious, n 1);
-_action_set_sensitive (browser, TabNext, n 1);
+gboolean has_tabs = _toggle_tabbar_smartly (browser, FALSE);
+_action_set_sensitive (browser, TabPrevious, has_tabs);
+_action_set_sensitive (browser, TabNext, has_tabs);
if (browser-trash)
{
-trash_empty = katze_array_is_empty (browser-trash);
+gboolean trash_empty = katze_array_is_empty (browser-trash);
_action_set_sensitive (browser, UndoTabClose, !trash_empty);
_action_set_sensitive (browser, Trash, !trash_empty);
}
@@ -1577,15 +1576,11 @@ _midori_browser_add_tab (MidoriBrowser* browser,
katze_object_get_boolean (browser-settings,
open-tabs-next-to-current))
{
n = gtk_notebook_get_current_page (notebook) + 1;
-gtk_notebook_insert_page (notebook, view, tab_label, n);
-katze_array_move_item (browser-proxy_array, item, n);
}
else
-{
-gtk_notebook_append_page (notebook, view, tab_label);
-katze_array_move_item (browser-proxy_array, item,
- gtk_notebook_get_n_pages (notebook));
-}
+n = -1;
+gtk_notebook_insert_page (notebook, view, tab_label, n);
+katze_array_move_item (browser-proxy_array, item, n);
gtk_notebook_set_tab_reorderable (notebook, view, TRUE);
gtk_notebook_set_tab_detachable (notebook, view, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Avoid extra loop for adding delay to all items
Updating branch refs/heads/master
to 9888ad610d4285d1306155a032c3537a1917dd91 (commit)
from ef9e5b6e6cd5568c7c28c2db7b8eebff66619f93 (commit)
commit 9888ad610d4285d1306155a032c3537a1917dd91
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Dec 7 23:01:50 2011 +0100
Avoid extra loop for adding delay to all items
midori/main.c | 17 +++--
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index bdfe414..14de34a 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -596,17 +596,6 @@ midori_bookmarks_import (const gchar* filename,
}
static void
-midori_session_add_delay (KatzeArray* session)
-{
-KatzeItem* item;
-KATZE_ARRAY_FOREACH_ITEM (item, session)
-{
-if (katze_item_get_meta_integer (item, delay) == -1)
-katze_item_set_meta_integer (item, delay, 1);
-}
-}
-
-static void
settings_notify_cb (MidoriWebSettings* settings,
GParamSpec*pspec,
MidoriApp* app)
@@ -1406,14 +1395,14 @@ midori_load_session (gpointer data)
g_object_unref (item);
}
-if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES)
-midori_session_add_delay (_session);
-
session = midori_browser_get_proxy_array (browser);
KATZE_ARRAY_FOREACH_ITEM (item, _session)
{
g_object_set_data (G_OBJECT (item), midori-view-append, (void*)1);
katze_item_set_meta_integer (item, dont-write-history, 1);
+if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES
+ katze_item_get_meta_integer (item, delay) == -1)
+katze_item_set_meta_integer (item, delay, 1);
midori_browser_add_item (browser, item);
}
current = katze_item_get_meta_integer (KATZE_ITEM (_session), current);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Avoid setting the same URI on the item given
Updating branch refs/heads/master
to c44f76abb95d0e61248244f657f52b7e8ece (commit)
from 64f9028eea326942a0492ea787290292fae24c3f (commit)
commit c44f76abb95d0e61248244f657f52b7e8ece
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Dec 7 23:19:32 2011 +0100
Avoid setting the same URI on the item given
midori/midori-browser.c | 10 --
midori/midori-view.c| 11 ++-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index b82bd2b..71a5476 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -7080,16 +7080,14 @@ gint
midori_browser_add_uri (MidoriBrowser* browser,
const gchar* uri)
{
-GtkWidget* view;
-gint n;
+KatzeItem* item;
g_return_val_if_fail (MIDORI_IS_BROWSER (browser), -1);
g_return_val_if_fail (uri != NULL, -1);
-view = midori_view_new_with_title (NULL, browser-settings, FALSE);
-n = midori_browser_add_tab (browser, view);
-midori_view_set_uri (MIDORI_VIEW (view), uri);
-return n;
+item = katze_item_new ();
+item-uri = g_strdup (uri);
+return midori_browser_add_item (browser, item);
}
/**
diff --git a/midori/midori-view.c b/midori/midori-view.c
index f55910d..7be958a 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3841,7 +3841,6 @@ midori_view_set_uri (MidoriView* view,
#endif
katze_assign (view-uri, g_strdup ());
-katze_item_set_uri (view-item, );
if (speeddial_markup == NULL)
speeddial_markup = prepare_speed_dial_html (view, TRUE);
@@ -3955,9 +3954,9 @@ midori_view_set_uri (MidoriView* view,
webkit_web_view_load_html_string (
WEBKIT_WEB_VIEW (view-web_view), data, view-uri);
g_free (data);
-katze_item_set_uri (view-item, uri);
+if (strcmp (view-item-uri, view-uri))
+katze_item_set_uri (view-item, view-uri);
g_object_notify (G_OBJECT (view), uri);
-return;
}
else if (katze_item_get_meta_integer (view-item, delay) 0)
{
@@ -3969,7 +3968,8 @@ midori_view_set_uri (MidoriView* view,
_(Loading delayed either due to a recent crash or startup
preferences.),
_(Load Page),
NULL);
-katze_item_set_uri (view-item, uri);
+if (strcmp (view-item-uri, uri))
+katze_item_set_uri (view-item, uri);
g_object_notify (G_OBJECT (view), uri);
}
else if (g_str_has_prefix (uri, javascript:))
@@ -3992,7 +3992,8 @@ midori_view_set_uri (MidoriView* view,
else
{
katze_assign (view-uri, midori_uri_format_for_display (uri));
-katze_item_set_uri (view-item, uri);
+if (strcmp (view-item-uri, view-uri))
+katze_item_set_uri (view-item, view-uri);
g_object_notify (G_OBJECT (view), uri);
webkit_web_view_open (WEBKIT_WEB_VIEW (view-web_view), uri);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Manually building actions is a huge speedup
Updating branch refs/heads/master
to 652e392192c3b0bb5a4838aee63604fa0b090aac (commit)
from c44f76abb95d0e61248244f657f52b7e8ece (commit)
commit 652e392192c3b0bb5a4838aee63604fa0b090aac
Author: Christian Dywan christ...@twotoasts.de
Date: Thu Dec 8 02:55:25 2011 +0100
Manually building actions is a huge speedup
midori/midori-browser.c | 58 +-
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 71a5476..ea06528 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -5800,6 +5800,56 @@ midori_browser_mce_filter_cb (DBusConnection* connection,
#endif
static void
+midori_browser_add_actions (MidoriBrowser* browser)
+{
+/* 0,053 versus 0,002 compared to gtk_action_group_add_ API */
+guint i;
+GSList* group = NULL;
+for (i = 0; i G_N_ELEMENTS (entries); i++)
+{
+GtkActionEntry entry = entries[i];
+GtkAction* action = gtk_action_new (entry.name,
+_(entry.label), _(entry.tooltip), entry.stock_id);
+if (entry.callback)
+g_signal_connect (action, activate, entry.callback, browser);
+gtk_action_group_add_action_with_accel (browser-action_group,
+GTK_ACTION (action), entry.accelerator);
+}
+for (i = 0; i G_N_ELEMENTS (toggle_entries); i++)
+{
+GtkToggleActionEntry entry = toggle_entries[i];
+GtkToggleAction* action = gtk_toggle_action_new (entry.name,
+_(entry.label), _(entry.tooltip), entry.stock_id);
+if (entry.is_active)
+gtk_toggle_action_set_active (action, TRUE);
+if (entry.callback)
+g_signal_connect (action, activate, entry.callback, browser);
+gtk_action_group_add_action_with_accel (browser-action_group,
+GTK_ACTION (action), entry.accelerator);
+}
+for (i = 0; i G_N_ELEMENTS (encoding_entries); i++)
+{
+GtkRadioActionEntry entry = encoding_entries[i];
+GtkRadioAction* action = gtk_radio_action_new (entry.name,
+_(entry.label), _(entry.tooltip), entry.stock_id, entry.value);
+if (i == 0)
+{
+group = gtk_radio_action_get_group (action);
+gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+g_signal_connect (action, changed,
+G_CALLBACK (_action_view_encoding_activate), browser);
+}
+else
+{
+gtk_radio_action_set_group (action, group);
+group = gtk_radio_action_get_group (action);
+}
+gtk_action_group_add_action_with_accel (browser-action_group,
+GTK_ACTION (action), entry.accelerator);
+}
+}
+
+static void
midori_browser_init (MidoriBrowser* browser)
{
GtkWidget* vbox;
@@ -5846,13 +5896,7 @@ midori_browser_init (MidoriBrowser* browser)
/* Let us see some ui manager magic */
browser-action_group = gtk_action_group_new (Browser);
gtk_action_group_set_translation_domain (browser-action_group,
GETTEXT_PACKAGE);
-gtk_action_group_add_actions (browser-action_group,
- entries, entries_n, browser);
-gtk_action_group_add_toggle_actions (browser-action_group,
-toggle_entries, toggle_entries_n, browser);
-gtk_action_group_add_radio_actions (browser-action_group,
-encoding_entries, encoding_entries_n, 0,
-G_CALLBACK (_action_view_encoding_activate), browser);
+midori_browser_add_actions (browser);
ui_manager = gtk_ui_manager_new ();
accel_group = gtk_ui_manager_get_accel_group (ui_manager);
gtk_window_add_accel_group (GTK_WINDOW (browser), accel_group);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:xfce-4.8 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%
Updating branch refs/heads/xfce-4.8 to 4138bff25ff2b26c6e60bb6366312f859516ef6c (commit) from 8a6a1a6e10f8cc551c3696d1674c1f2e692e2565 (commit) commit 4138bff25ff2b26c6e60bb6366312f859516ef6c Author: Ruei-Yuan Lu rueiyuan...@gmail.com Date: Thu Dec 8 04:17:27 2011 +0100 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% New status: 229 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 6a90681..379c73a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,19 +5,19 @@ # Ambrose Li a...@ada.dhs.org, 2004. # Hydonsingore Cia hydonsing...@educities.edu.tw, 2005. # Cheng-Chia Tseng pswo10...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: xfwm4 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-30 05:19+\n +POT-Creation-Date: 2011-12-08 03:03+\n PO-Revision-Date: 2011-10-30 15:34+0800\n Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n Language-Team: Chinese (traditional) zh-l...@linux.org.tw\n -Language: zh_TW\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: zh_TW\n #: ../helper-dialog/helper-dialog.c:84 msgid @@ -125,7 +125,7 @@ msgstr b按鈕配置/b #: ../settings-dialogs/xfwm4-dialog.glade.h:3 msgid bDouble click _action/b -msgstr 雙擊執行動作(_A)/b +msgstr b雙擊執行動作(_A)/b #: ../settings-dialogs/xfwm4-dialog.glade.h:4 msgid bFocus model/b @@ -636,7 +636,9 @@ msgid Reset to Defaults msgstr 重設為預設值 #: ../settings-dialogs/xfwm4-settings.c:1871 -msgid This will reset all shortcuts to their default values. Do you really want to do this? +msgid +This will reset all shortcuts to their default values. Do you really want to +do this? msgstr 這會將所有捷徑重設為其預設值。您真的想要這麼做嗎？ #. Smart placement size @@ -833,7 +835,8 @@ msgid Change workspace name msgstr 變更工作區名稱 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4 -msgid Margins are areas on the edges of the screen where no window will be placed +msgid +Margins are areas on the edges of the screen where no window will be placed msgstr 邊緣是螢幕邊上不能放置視窗的區域 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%
Updating branch refs/heads/master to 16f0e5b841e5e58d18f649065e6d1c3636b88008 (commit) from 4b830c5ef87bade9d4d81979bc62398388bb3565 (commit) commit 16f0e5b841e5e58d18f649065e6d1c3636b88008 Author: Ruei-Yuan Lu rueiyuan...@gmail.com Date: Thu Dec 8 07:10:08 2011 +0100 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% New status: 230 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 497d2fc..f2f0a21 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,19 +5,19 @@ # Ambrose Li a...@ada.dhs.org, 2004. # Hydonsingore Cia hydonsing...@educities.edu.tw, 2005. # Cheng-Chia Tseng pswo10...@gmail.com, 2010. -# +# msgid msgstr Project-Id-Version: xfwm4 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-11-12 23:09+\n +POT-Creation-Date: 2011-12-08 02:57+\n PO-Revision-Date: 2011-11-13 10:15+0800\n Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n Language-Team: Chinese (traditional) zh-l...@linux.org.tw\n -Language: zh_TW\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: zh_TW\n #: ../helper-dialog/helper-dialog.c:84 msgid @@ -125,7 +125,7 @@ msgstr b按鈕配置/b #: ../settings-dialogs/xfwm4-dialog.glade.h:3 msgid bDouble click _action/b -msgstr 雙擊執行動作(_A)/b +msgstr b雙擊執行動作(_A)/b #: ../settings-dialogs/xfwm4-dialog.glade.h:4 msgid bFocus model/b @@ -640,7 +640,9 @@ msgid Reset to Defaults msgstr 重設為預設值 #: ../settings-dialogs/xfwm4-settings.c:1872 -msgid This will reset all shortcuts to their default values. Do you really want to do this? +msgid +This will reset all shortcuts to their default values. Do you really want to +do this? msgstr 這會將所有捷徑重設為其預設值。您真的想要這麼做嗎？ #. Smart placement size @@ -837,7 +839,8 @@ msgid Change workspace name msgstr 變更工作區名稱 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:4 -msgid Margins are areas on the edges of the screen where no window will be placed +msgid +Margins are areas on the edges of the screen where no window will be placed msgstr 邊緣是螢幕邊上不能放置視窗的區域 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:7 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%
Updating branch refs/heads/master to c183fe6664ea6f27b3dcae5a84950ab4384a6f14 (commit) from e74388e73c1f0e1fd4806d17c06c0a10e330c168 (commit) commit c183fe6664ea6f27b3dcae5a84950ab4384a6f14 Author: Ruei-Yuan Lu rueiyuan...@gmail.com Date: Thu Dec 8 07:43:36 2011 +0100 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100% New status: 116 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index c79d014..5f22e83 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -14,10 +14,10 @@ msgstr MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +X-Poedit-Country: TAIWAN\n Language: \n X-Poedit-Language: Chinese\n X-Poedit-SourceCharset: utf-8\n -X-Poedit-Country: TAIWAN\n #: ../thunar-volman/main.c:59 msgid The syfs path of the newly added device @@ -99,7 +99,9 @@ msgid A photo card has been detected msgstr 已偵測到一張相片記憶卡 #: ../thunar-volman/tvm-block-device.c:275 -msgid There are photos on the card. Would you like to add these photos to your album? +msgid +There are photos on the card. Would you like to add these photos to your +album? msgstr 在記憶卡中找到相片。您要將這些相片加入您的相簿嗎？ #. prompt the user to execute the file @@ -243,7 +245,7 @@ msgstr 偵測到平板 #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid A graphics tablet was detected -msgstr 已偵測到一塊數位繪圖版 +msgstr 已偵測到一塊數位繪圖板 #: ../thunar-volman/tvm-input-device.c:110 msgid input-mouse ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] orage:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 61%
Updating branch refs/heads/master to ecab488185c7e64084a901ac334deb594e06af39 (commit) from 85f7bf22de6fa59c3a509a144d8fa2348493c24c (commit) commit ecab488185c7e64084a901ac334deb594e06af39 Author: Ruei-Yuan Lu rueiyuan...@gmail.com Date: Thu Dec 8 08:12:45 2011 +0100 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 61% New status: 495 messages complete with 75 fuzzies and 230 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po | 73 +++--- 1 files changed, 24 insertions(+), 49 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3d624b5..1e3ffb1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ # Ambrose Li a...@ada.dhs.org, 2004. # Hydonsingore Cia hydonsing...@educities.edu.tw, 2005. # Cosmo Chene cosmo...@gmail.com, 2006 -# +# msgid msgstr Project-Id-Version: orage 4.3.90.2\n @@ -105,7 +105,7 @@ msgstr #: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042 msgid close window and exit -msgstr +msgstr 關閉視窗並離開 #: ../globaltime/gt_prefs.c:590 #, fuzzy @@ -309,15 +309,15 @@ msgstr #: ../globaltime/timezone_selection.c:159 #: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171 -#, fuzzy, c-format +#, c-format msgid %d hour -msgstr 小時 +msgstr %d 時 #: ../globaltime/timezone_selection.c:161 #: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173 -#, fuzzy, c-format +#, c-format msgid %d mins -msgstr 分鐘 +msgstr %d 分 #: ../globaltime/timezone_selection.c:167 #: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179 @@ -362,7 +362,7 @@ msgstr #: ../globaltime/timezone_selection.c:269 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281 msgid Country -msgstr +msgstr 國家 #. We are actually setting the g_par parameter. In other words #. we are setting the global default timezone for Orage. This is @@ -476,7 +476,7 @@ msgstr 請輸入任一可用的·strftime·函數參數 #. Tooltip hint #: ../panel-plugin/oc_config.c:401 msgid Tooltip: -msgstr +msgstr 工具提示: #. special timing for SUSPEND/HIBERNATE #: ../panel-plugin/oc_config.c:411 @@ -513,9 +513,8 @@ msgstr \t%X = 本地時間\t\t\t%x = 本地日期 #: ../panel-plugin/oc_config.c:457 -#, fuzzy msgid Orage clock Preferences -msgstr Orage 偏好設定 +msgstr Orage 時鐘偏好設定 #. no lines yet #. TRANSLATORS: Use format characters from strftime(3) @@ -526,7 +525,7 @@ msgstr Orage 偏好設定 #. * %B : full month name #. * %Y : four digit year #. * %V : ISO week number -#. +#. #: ../panel-plugin/xfce4-orageclock-plugin.c:627 msgid %A %d %B %Y/%V msgstr %Y %B %d %A/%V @@ -536,9 +535,8 @@ msgid Maintainer msgstr #: ../src/about-xfcalendar.c:47 -#, fuzzy msgid Manage your time with Orage -msgstr 使用 XFce4 為您管理時間 +msgstr 使用 Orage 為您管理時間 #. if (gtk_toggle_button_get_active( #. GTK_TOGGLE_BUTTON(apptw-Type_journal_rb))) @@ -1451,14 +1449,13 @@ msgid Orage appointment UIDs separated by commas. msgstr #: ../src/interface.c:1076 -#, fuzzy msgid Archive msgstr 封存檔案 #: ../src/interface.c:1084 -#, fuzzy, c-format +#, c-format msgid Archive now (threshold: %d months) -msgstr 封存門檻 +msgstr 立即封存 (門檻: %d 個月) #: ../src/interface.c:1094 msgid You can change archive threshold in parameters @@ -1762,9 +1759,8 @@ msgid bEvents for %s - %s:/b msgstr #: ../src/parameters.c:522 -#, fuzzy msgid Main settings -msgstr 月曆偏好設定 +msgstr 主要設定 #: ../src/parameters.c:528 msgid Timezone @@ -1775,9 +1771,8 @@ msgid You should always define your local timezone. msgstr #: ../src/parameters.c:552 -#, fuzzy msgid Archive threshold (months) -msgstr 封存門檻 +msgstr 封存門檻 (月) #: ../src/parameters.c:562 msgid (0 = no archiving) @@ -1789,36 +1784,31 @@ msgstr #: ../src/parameters.c:574 msgid Sound command -msgstr +msgstr 音效命令 #: ../src/parameters.c:589 msgid This command is given to shell to make sound in alarms. msgstr #: ../src/parameters.c:605 -#, fuzzy msgid Display settings -msgstr 已顯示 +msgstr 外觀設定 #: ../src/parameters.c:613 -#, fuzzy msgid Calendar main window -msgstr 月曆視窗 +msgstr 月曆主視窗 #: ../src/parameters.c:618 -#, fuzzy msgid Show borders -msgstr 顯示框格(_F) +msgstr 顯示邊框 #: ../src/parameters.c:625 -#, fuzzy msgid Show menu -msgstr 顯示框格(_F) +msgstr 顯示選單 #: ../src/parameters.c:632 -#, fuzzy msgid Show month and year -msgstr 在頁面切換器中顯示 +msgstr 顯示月和年 #: ../src/parameters.c:639 #, fuzzy @@ -1826,9 +1816,8 @@ msgid Show day names msgstr 顯示框格(_F) #: ../src/parameters.c:646 -#, fuzzy msgid Show week numbers -msgstr 顯示框格(_F) +msgstr 顯示第幾週 #: ../src/parameters.c:653 #, fuzzy @@ -1845,12 +1834,11 @@ msgstr #: ../src/parameters.c:676 msgid Show on all desktops -msgstr +msgstr 在所有桌面中顯示 #: ../src/parameters.c:683 -#, fuzzy msgid Keep on top -msgstr 設定時區為: +msgstr 顯示在最上層 #: ../src/parameters.c:690 msgid Show in taskbar @@ -3619,18 +3607,15 @@ msgstr 月曆 #~ msgid Display #~ msgstr 顯示 -#,
