[Xfce4-commits] xfwm4:master Keep window fully visible on screen on size request
Updating branch refs/heads/master
to a517c44802e790408f2cca4d5865ab7f4ebfca0a (commit)
from cc0b60c771bad7045b856a1987544dc5f73083f5 (commit)
commit a517c44802e790408f2cca4d5865ab7f4ebfca0a
Author: Olivier Fourdan four...@xfce.org
Date: Mon May 2 10:21:38 2011 +0200
Keep window fully visible on screen on size request
src/client.c | 15 ++-
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/client.c b/src/client.c
index f17e885..98f803d 100644
--- a/src/client.c
+++ b/src/client.c
@@ -853,14 +853,19 @@ clientMoveResizeWindow (Client * c, XWindowChanges * wc,
unsigned long mask)
}
flags |= CFG_REQUEST;
}
-if (mask (CWWidth | CWHeight))
+if (mask (CWX | CWY | CWWidth | CWHeight) == (CWWidth | CWHeight))
{
-flags |= CFG_KEEP_VISIBLE;
+/*
+ * The client is resizing its window, but did not specify a
+ * position, make sure the window remains fully visible in that
+ * case so that the user does not have to relocate the window
+ */
+flags |= CFG_CONSTRAINED | CFG_KEEP_VISIBLE;
}
/*
- Let's say that if the client performs a XRaiseWindow, we show the
window if focus
- stealing prevention is not activated, otherwise we just set the
demands attention
- flag...
+ * Let's say that if the client performs a XRaiseWindow, we show the
window if focus
+ * stealing prevention is not activated, otherwise we just set the
demands attention
+ * flag...
*/
if ((mask CWStackMode) (wc-stack_mode == Above) (wc-sibling ==
None) !(c-type WINDOW_TYPE_DONT_FOCUS))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:master Fix logic in previous commit
Updating branch refs/heads/master
to 3fdb3ef440ae74957c870d7a64edf5a273fdddf7 (commit)
from a517c44802e790408f2cca4d5865ab7f4ebfca0a (commit)
commit 3fdb3ef440ae74957c870d7a64edf5a273fdddf7
Author: Olivier Fourdan four...@xfce.org
Date: Mon May 2 11:09:44 2011 +0200
Fix logic in previous commit
src/client.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/client.c b/src/client.c
index 98f803d..6fe0715 100644
--- a/src/client.c
+++ b/src/client.c
@@ -853,7 +853,7 @@ clientMoveResizeWindow (Client * c, XWindowChanges * wc,
unsigned long mask)
}
flags |= CFG_REQUEST;
}
-if (mask (CWX | CWY | CWWidth | CWHeight) == (CWWidth | CWHeight))
+if ((mask (CWWidth | CWHeight)) !(mask (CWX | CWY)))
{
/*
* The client is resizing its window, but did not specify a
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-session:master l10n: Updated Croatian (hr) translation to 99%
Updating branch refs/heads/master to 5f1fd98ad808b9f0e7042bf71d9aa05845560c0d (commit) from d535f0c8e8d61094cd8c9d4a421fc74f70a73633 (commit) commit 5f1fd98ad808b9f0e7042bf71d9aa05845560c0d Author: Ivica Kolić ik...@yahoo.com Date: Mon May 2 11:30:55 2011 +0200 l10n: Updated Croatian (hr) translation to 99% New status: 226 messages complete with 0 fuzzies and 2 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 396 - 1 files changed, 182 insertions(+), 214 deletions(-) diff --git a/po/hr.po b/po/hr.po index 968b728..2047052 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,16 +7,15 @@ msgid msgstr Project-Id-Version: xfce4-session 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:35+0100\n +POT-Creation-Date: 2011-05-02 04:12+\n PO-Revision-Date: 2010-05-25 22:47+0200\n Last-Translator: Petar Koretićpetar.kore...@gmail.com \n Language-Team: Croatian \n -Language: hr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Language: hr\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n #: ../engines/balou/balou-theme.c:110 msgid No description given @@ -146,7 +145,7 @@ msgid _Suspend msgstr _Suspenzija #: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 +#: ../panel-plugin/xfsm-logout-plugin.c:135 ../xfce4-session/shutdown.c:599 msgid _Hibernate msgstr _Hibrnacija @@ -224,117 +223,137 @@ msgstr Xfclock4 se ne može pokrenuti msgid Close Session msgstr Zatvori prijavu -#: ../settings/main.c:42 +#: ../settings/main.c:43 msgid Settings manager socket msgstr Socket upravljanja postavkama -#: ../settings/main.c:42 +#: ../settings/main.c:43 msgid SOCKET ID msgstr SOCKET ID -#: ../settings/main.c:43 +#: ../settings/main.c:44 msgid Version information msgstr Informacija o verziji -#: ../settings/main.c:73 +#: ../settings/main.c:74 #, c-format msgid Type '%s --help' for usage. msgstr '%s --help' za pomoć -#: ../settings/main.c:85 ../xfce4-session/main.c:226 +#: ../settings/main.c:86 ../xfce4-session/main.c:219 msgid The Xfce development team. All rights reserved. msgstr Xfce razvojni tim.Sva prava pridržana. -#: ../settings/main.c:86 ../xfce4-session/main.c:232 +#: ../settings/main.c:87 ../xfce4-session/main.c:225 #, c-format msgid Please report bugs to %s. msgstr Prijavite probleme %s. -#: ../settings/main.c:95 ../xfce4-session/main.c:238 ../xfce4-tips/main.c:270 +#: ../settings/main.c:96 ../xfce4-session/main.c:231 msgid Unable to contact settings server msgstr Ne mogu se spojiti na server za postavke -#: ../settings/main.c:114 +#: ../settings/main.c:115 msgid Unable to create user interface from embedded definition data msgstr Ne mogu napraviti korisničko sučelje iz sadržanih podataka -#: ../settings/main.c:127 +#: ../settings/main.c:128 msgid _Application Autostart msgstr _Samopokretanje aplikacija -#: ../settings/session-editor.c:60 +#: ../settings/session-editor.c:61 msgid If running msgstr Ako je pokrenuti -#: ../settings/session-editor.c:61 +#: ../settings/session-editor.c:62 msgid Always msgstr Uvijek -#: ../settings/session-editor.c:62 +#: ../settings/session-editor.c:63 msgid Immediately msgstr Odmah -#: ../settings/session-editor.c:63 +#: ../settings/session-editor.c:64 msgid Never msgstr Nikada -#: ../settings/session-editor.c:128 +#: ../settings/session-editor.c:129 msgid Session Save Error msgstr Greška spremanja sesije -#: ../settings/session-editor.c:129 +#: ../settings/session-editor.c:130 msgid Unable to save the session msgstr Ne mogu spremiti sesiju -#: ../settings/session-editor.c:184 +#: ../settings/session-editor.c:170 +msgid Clear sessions +msgstr Očisti sesije + +#: ../settings/session-editor.c:171 +msgid Are you sure you want to empty the session cache? +msgstr Jeste li sigurni da želite isprazniti međuspremnik sesije? + +#: ../settings/session-editor.c:172 +msgid The saved states of your applications will not be restored during your next login. +msgstr + +#: ../settings/session-editor.c:174 +msgid _Proceed +msgstr _Nastavi + +#: ../settings/session-editor.c:212 +msgid You might need to delete some files manually in +msgstr Možda ćete trebati obrisati neke datoteke ručno u + +#: ../settings/session-editor.c:216 +msgid All Xfce cache files could not be cleared +msgstr Ne mogu biti izbrisane sve datoteke Xfce međuspremnika + +#: ../settings/session-editor.c:250 #, c-format msgid Are you sure you want to terminate \%s\? msgstr Jeste li sigurni da želite prekinuti \%s\? -#: ../settings/session-editor.c:187 ../settings/session-editor.c:215 +#: ../settings/session-editor.c:253
[Xfce4-commits] xfdesktop:master l10n: Updated Croatian (hr) translation to 86%
Updating branch refs/heads/master to a8cadbc5cb34126ebab36486791ad9ed393b4535 (commit) from d9c5cf1b95082c7b0b25fc7a8917acd3436c48f0 (commit) commit a8cadbc5cb34126ebab36486791ad9ed393b4535 Author: Ivica Kolić ik...@yahoo.com Date: Mon May 2 11:41:43 2011 +0200 l10n: Updated Croatian (hr) translation to 86% New status: 173 messages complete with 0 fuzzies and 26 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 328 -- 1 files changed, 148 insertions(+), 180 deletions(-) diff --git a/po/hr.po b/po/hr.po index 2a7a5b0..9908eef 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,16 +7,15 @@ msgid msgstr Project-Id-Version: xfdesktop\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:44+0100\n +POT-Creation-Date: 2011-05-02 04:13+\n PO-Revision-Date: 2010-05-27 22:41+0200\n Last-Translator: Ivica Kolićik...@yahoo.com \n Language-Team: Croatian hr\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Language: \n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 #, c-format @@ -24,7 +23,7 @@ msgid Backdrop list file is not valid msgstr Pozadinska lista nije valjana #. no need to escape markup; it's already done for us -#: ../settings/main.c:162 +#: ../settings/main.c:163 #, c-format msgid %s\n @@ -33,127 +32,126 @@ msgstr %s\n iVeličina: %dx%d/i -#: ../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 Početna -#: ../settings/main.c:274 +#: ../settings/main.c:291 msgid Filesystem msgstr Datotečni sustav -#: ../settings/main.c:276 +#: ../settings/main.c:293 msgid Trash msgstr Smeće -#: ../settings/main.c:278 +#: ../settings/main.c:295 msgid Removable Devices msgstr Uklonjivi uređaji -#: ../settings/main.c:458 +#: ../settings/main.c:475 #, c-format msgid Cannot create backdrop list \%s\ msgstr Ne mogu kreirati pozadinsku listu \%s\ -#: ../settings/main.c:462 ../settings/main.c:779 +#: ../settings/main.c:479 ../settings/main.c:802 msgid Backdrop List Error msgstr Greška Pozadinske Liste -#: ../settings/main.c:487 +#: ../settings/main.c:504 msgid Create/Load Backdrop List msgstr Napravi/Učitaj Pozadinsku Listu -#: ../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? +msgid File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? msgstr Datoteka \%s\ nije valjana pozadinska lista. Želite li je zamjeniti? -#: ../settings/main.c:516 +#: ../settings/main.c:533 msgid Invalid List File msgstr Nevaljana Datoteka -#: ../settings/main.c:519 +#: ../settings/main.c:536 msgid Overwriting the file will cause its contents to be lost. msgstr Zamjena datoteke će izbrisati sav sadržaj. -#: ../settings/main.c:521 +#: ../settings/main.c:538 msgid Replace msgstr Zamjeni -#: ../settings/main.c:775 +#: ../settings/main.c:798 #, c-format msgid Failed to write backdrop list to \%s\ msgstr Neuspješno kreiranje pozadinske liste \%s\ -#: ../settings/main.c:802 +#: ../settings/main.c:825 msgid Add Image File(s) msgstr Dodaj datoteke slike(a) -#: ../settings/main.c:811 +#: ../settings/main.c:834 msgid Image files msgstr Datoteke slika -#: ../settings/main.c:816 +#: ../settings/main.c:839 msgid All files msgstr Sve datoteke -#: ../settings/main.c:1248 +#: ../settings/main.c:1271 #, c-format msgid Screen %d, Monitor %d (%s) msgstr Zaslon %d, Monitor %d (%s) -#: ../settings/main.c:1252 +#: ../settings/main.c:1275 #, c-format msgid Screen %d, Monitor %d msgstr Zaslon %d, Monitor %d -#: ../settings/main.c:1255 +#: ../settings/main.c:1278 #, c-format msgid Screen %d msgstr Zaslon %d -#: ../settings/main.c:1260 +#: ../settings/main.c:1283 #, c-format msgid Monitor %d (%s) msgstr Monitor %d (%s) -#: ../settings/main.c:1264 +#: ../settings/main.c:1287 #, c-format msgid Monitor %d msgstr Monitor %d -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid Settings manager socket msgstr Socket upravitelja postavkama -#: ../settings/main.c:1477 +#: ../settings/main.c:1500 msgid SOCKET ID msgstr SOCKET ID -#: ../settings/main.c:1478 +#: ../settings/main.c:1501 msgid Version information msgstr Informacija o verziji -#: ../settings/main.c:1498 +#: ../settings/main.c:1521 #, c-format msgid Type '%s --help' for usage. msgstr Upiši '%s -help' za upotrebu. -#: ../settings/main.c:1510 +#:
[Xfce4-commits] xfmpc:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 639346b7765470ddf4e111cf914a2bd78c0b3f5f (commit) from 7f5dfd8e19293ffe5010cf34362389bc202dcc48 (commit) commit 639346b7765470ddf4e111cf914a2bd78c0b3f5f Author: Chipong Luo chipon...@yahoo.com Date: Mon May 2 15:18:49 2011 +0200 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 | 12 +--- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 6b33c40..5b7f2ac 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Hunt Xu hun...@live.cn, 2009. -# +# msgid msgstr Project-Id-Version: xfmpc\n @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-12-13 20:28+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (simplified) xfce-i...@xfce.org\n -Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: zh_CN\n #: ../src/dbbrowser.c:873 msgid Replace @@ -35,11 +35,11 @@ msgstr 随机播放 #: ../src/extended-interface.c:322 msgid Single Mode -msgstr +msgstr 单曲模式 #: ../src/extended-interface.c:325 msgid Consume -msgstr +msgstr 消耗 #: ../src/extended-interface.c:433 ../xfmpc.desktop.in.h:2 msgid MPD client written in GTK+ for Xfce @@ -117,9 +117,7 @@ msgid Use _default system settings msgstr 使用系统默认设置(_D) #: ../src/preferences-dialog.c:367 -msgid -If checked, Xfmpc will try to read the environment variables MPD_HOST and -MPD_PORT otherwise it will use localhost +msgid If checked, Xfmpc will try to read the environment variables MPD_HOST and MPD_PORT otherwise it will use localhost msgstr 选中此项，Xfmpc将尝试读取环境变量MPD_HOST和MPD_PORT，否则使用本地主机 #: ../src/preferences-dialog.c:377 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 01ad43f51d0c8f8865a2b28f669e5c047237ac1b (commit) from cecd84579706e3d32e6149325d0dd4a61b5898ff (commit) commit 01ad43f51d0c8f8865a2b28f669e5c047237ac1b Author: Dmitrij Smirnov ot...@igus.lv Date: Mon May 2 17:03:59 2011 +0200 l10n: Updated Russian (ru) translation to 100% New status: 19 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 29 - 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5352e78..61c7cd7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid msgstr Project-Id-Version: xfce4-genmon-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-10 21:29+0200\n +POT-Creation-Date: 2011-05-02 10:06+\n PO-Revision-Date: \n Last-Translator: Andriy Kovtun kovtu...@yandex.ru\n Language-Team: Russian xfce4-...@xfce.org\n @@ -14,11 +14,21 @@ msgstr X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: Rusian Federation\n +#: ../panel-plugin/cmdspawn.c:174 +#, c-format +msgid Error in command \%s\ +msgstr Ошибка в команде \%s\ + +#: ../panel-plugin/cmdspawn.c:177 ../panel-plugin/main.c:105 +msgid Xfce Panel +msgstr Панель Xfce + #: ../panel-plugin/config_gui.c:87 msgid About... msgstr О программе... -#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:644 +#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:677 +#: ../panel-plugin/genmon.desktop.in.in.h:1 msgid Generic Monitor msgstr Общий монитор @@ -62,7 +72,12 @@ msgstr Нажмите для изменения шрифта msgid (Default font) msgstr (Шрифт по умолчанию) -#: ../panel-plugin/main.c:569 +#: ../panel-plugin/main.c:104 +#, c-format +msgid Could not run \%s\ +msgstr Не удалось запустить \%s\ + +#: ../panel-plugin/main.c:602 #, c-format msgid %s %s - Generic Monitor\n @@ -77,10 +92,14 @@ msgstr (c) 2004 Roger Seguin roger_seg...@msn.com\n (c) 2006 Julien Devemy jujuc...@gmail.com -#: ../panel-plugin/main.c:587 +#: ../panel-plugin/main.c:620 msgid Font Selection msgstr Выбор шрифта -#: ../panel-plugin/main.c:632 +#: ../panel-plugin/main.c:665 msgid Configuration msgstr Конфигурация + +#: ../panel-plugin/genmon.desktop.in.in.h:2 +msgid Show output of a command. +msgstr Показывать вывод команды ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-timer-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to ea0b8406cdf0475276b62c74731b9ad467bb228a (commit) from 7b44bf41610088089b848e15b70262d81fb1a45c (commit) commit ea0b8406cdf0475276b62c74731b9ad467bb228a Author: Dmitrij Smirnov ot...@igus.lv Date: Mon May 2 17:06:12 2011 +0200 l10n: Updated Russian (ru) translation to 100% New status: 32 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 95e91ff..995e1c7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -35,9 +35,7 @@ msgstr осталось %dс msgid Beeep! :) \n Time is up! -msgstr -Бииип! :) \n -Время вышло! +msgstr Время вышло #: ../src/xfcetimer.c:424 msgid Stop timer @@ -59,7 +57,7 @@ msgstr %dч %dм %dс #: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558 #, c-format msgid %dm %ds -msgstr %dч %dс +msgstr %dм %dс #: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-timer-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to beba9497efd1852f545e428e9c29c500a2d5def8 (commit) from ea0b8406cdf0475276b62c74731b9ad467bb228a (commit) commit beba9497efd1852f545e428e9c29c500a2d5def8 Author: Dmitrij Smirnov ot...@igus.lv Date: Mon May 2 17:08:45 2011 +0200 l10n: Updated Russian (ru) translation to 100% New status: 32 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 995e1c7..95538ab 100644 --- a/po/ru.po +++ b/po/ru.po @@ -139,9 +139,7 @@ msgstr msgid Countdown period /\n Alarm time -msgstr -Обратный отсчет /\n -Время срабатывания +msgstr Период срабатывания #: ../src/xfcetimer.c:1214 msgid Alarm command ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-sensors-plugin:master don't convert the GPU value at all, only clip after 1 digit
Updating branch refs/heads/master
to a339539f2705f04feac7694674be5ef46bdeaf4c (commit)
from 0b90d89f78a218eeefc94179f5787a0a209be3f5 (commit)
commit a339539f2705f04feac7694674be5ef46bdeaf4c
Author: Fabian Nowak timyst...@arcor.de
Date: Mon May 2 19:30:14 2011 +0200
don't convert the GPU value at all, only clip after 1 digit
lib/nvidia.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/nvidia.c b/lib/nvidia.c
index 25ad34f..47961f9 100644
--- a/lib/nvidia.c
+++ b/lib/nvidia.c
@@ -123,7 +123,7 @@ void refresh_nvidia (gpointer chip_feature, gpointer data) {
if (value == ZERO_KELVIN) return;
g_free (cf - formatted_value);
- cf - formatted_value = g_strdup_printf(_(%ld °C), (long int) value);
+ cf - formatted_value = g_strdup_printf(_(%.1f °C), value);
cf - raw_value = value;
TRACE (leaves refresh_nvidia);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-sensors-plugin:master convert double to long int for formatted output
Updating branch refs/heads/master
to 0b90d89f78a218eeefc94179f5787a0a209be3f5 (commit)
from 5c19d716bc7f94f5341b31cb49cef5e33971837a (commit)
commit 0b90d89f78a218eeefc94179f5787a0a209be3f5
Author: Fabian Nowak timyst...@arcor.de
Date: Mon May 2 19:28:36 2011 +0200
convert double to long int for formatted output
lib/nvidia.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/nvidia.c b/lib/nvidia.c
index bae4885..25ad34f 100644
--- a/lib/nvidia.c
+++ b/lib/nvidia.c
@@ -123,7 +123,7 @@ void refresh_nvidia (gpointer chip_feature, gpointer data) {
if (value == ZERO_KELVIN) return;
g_free (cf - formatted_value);
- cf - formatted_value = g_strdup_printf(_(%ld °C), value);
+ cf - formatted_value = g_strdup_printf(_(%ld °C), (long int) value);
cf - raw_value = value;
TRACE (leaves refresh_nvidia);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-sensors-plugin:master - apply several patches from bug reports - copyright years - make enable-debug compile again
Updating branch refs/heads/master
to 6df0bc03dfdad6cbb096958d6fad132da80d03bd (commit)
from a339539f2705f04feac7694674be5ef46bdeaf4c (commit)
commit 6df0bc03dfdad6cbb096958d6fad132da80d03bd
Author: Fabian timyst...@arcor.de
Date: Mon May 2 22:12:35 2011 +0200
- apply several patches from bug reports
- copyright years
- make enable-debug compile again
TODO |2 ++
configure.in.in|9 ++---
lib/libxfce4sensors-1.0.pc.in |2 +-
lib/middlelayer.c |2 ++
lib/sensors-interface-common.c |3 ++-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/TODO b/TODO
index 71f0cae..35dd861 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
TODO
==
+- adjust RPM spec file to check for libxfce4ui etc.? or does checking for the
panel suffice?
+
- Use notfication messages when alert is on; when maximum is reached.
- fix error: doesn't find all sensors when newly adding plugin to panel -
sensors library problem?
diff --git a/configure.in.in b/configure.in.in
index c91f784..a87bcdb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -3,8 +3,8 @@ dnl configure.in.in
dnl
dnl xfce4-sensors-plugin - Sensors plugin for xfce4-panel
dnl
-dnl 2003,2004 Benedikt Meurer be...@xfce.org
-dnl 2007 Benedikt Meurer be...@xfce.org, Fabian Nowak timyst...@arcor.de
+dnl 2003,2004, 2007 Benedikt Meurer be...@xfce.org
+dnl 2007-2011 Fabian Nowak timyst...@arcor.de
dnl
m4_define([libxfce4sensors_verinfo], [1:0:1])
@@ -36,7 +36,10 @@ dnl Check for basic programs
AC_PROG_CC
AC_PROG_LD
AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+dnl AC_PROG_LIBTOOL
AC_PROG_INTLTOOL
dnl
diff --git a/lib/libxfce4sensors-1.0.pc.in b/lib/libxfce4sensors-1.0.pc.in
index 74f52e9..d004839 100644
--- a/lib/libxfce4sensors-1.0.pc.in
+++ b/lib/libxfce4sensors-1.0.pc.in
@@ -9,7 +9,7 @@ datarootdir=@datarootdir@
Name: libxfce4sensors
Description: Library for the Xfce 4 Sensors Plugin and Viewer
-Requires: libxfce4util-1.0 libxfcegui4-1.0
+Requires: libxfce4util-1.0 libxfce4ui-1
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lxfce4sensors
Cflags: -I${includedir}/xfce4/
diff --git a/lib/middlelayer.c b/lib/middlelayer.c
index baab393..cf2e281 100644
--- a/lib/middlelayer.c
+++ b/lib/middlelayer.c
@@ -181,7 +181,9 @@ int
sensor_get_value (t_chip *chip, int number, double *value, gboolean
*suppressmessage)
{
t_chipfeature *feature;
+ #ifdef HAVE_HDDTEMP
gboolean *suppress = suppressmessage;
+ #endif
/* TRACE (enters sensor_get_value %d, number); */
g_assert (chip!=NULL);
diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c
index b3e2234..f3480d8 100644
--- a/lib/sensors-interface-common.c
+++ b/lib/sensors-interface-common.c
@@ -43,7 +43,7 @@ sensors_new (XfcePanelPlugin *plugin, gchar
*plugin_config_file)
TRACE (enters sensors_new);
-sensors = g_new (t_sensors, 1);
+sensors = g_new0 (t_sensors, 1);
sensors-plugin_config_file = plugin_config_file; /* important as we check
against NULL frequently */
/* init xfce sensors stuff width default values */
@@ -69,6 +69,7 @@ sensors_new (XfcePanelPlugin *plugin, gchar
*plugin_config_file)
chipfeature-address = 0;
chip-sensorId = g_strdup(_(No sensors found!));
+chip-description = g_strdup(_(No sensors found!));
chip-num_features = 1;
chipfeature-color = g_strdup(#00);
/* g_free (chipfeature-name); */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-sensors-plugin:master remove libxfce4util from the configuration as it is handled by ui or panel anyway
Updating branch refs/heads/master to 8c058f5c4f28a33ee6c76aefec34f59ac1c5a619 (commit) from 6df0bc03dfdad6cbb096958d6fad132da80d03bd (commit) commit 8c058f5c4f28a33ee6c76aefec34f59ac1c5a619 Author: Fabian timyst...@arcor.de Date: Mon May 2 22:31:18 2011 +0200 remove libxfce4util from the configuration as it is handled by ui or panel anyway configure.in.in |5 + lib/Makefile.am | 34 +- src/Makefile.am |2 -- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/configure.in.in b/configure.in.in index a87bcdb..3bd6121 100644 --- a/configure.in.in +++ b/configure.in.in @@ -249,9 +249,6 @@ AC_SUBST([NVIDIA_LIBS]) fi - - - AM_CONDITIONAL([HAVE_ACPI], [test x$enable_procacpi = xyes]) AM_CONDITIONAL([HAVE_SYSFS_ACPI], [test x$enable_sysfsacpi = xyes]) AM_CONDITIONAL([HAVE_NVIDIA], [test x$enable_xnvctrl = xyes]) @@ -345,7 +342,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], dnl ** dnl *** Check for Xfce packages *** dnl ** -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) +dnl XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.6.0]) dnl configure the panel plugin diff --git a/lib/Makefile.am b/lib/Makefile.am index aec2224..25febc7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - INCLUDES = \ -I$(top_srcdir)/include @@ -38,16 +36,10 @@ libxfce4sensors_la_SOURCES = \ $(ACPI_SOURCES) \ $(NVIDIA_SOURCES) -# configuration.h \ -# sensors-plugin.h \ -# types.h \ -# middlelayer.h - libxfce4sensors_la_CFLAGS = \ @PLATFORM_CFLAGS@ \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ @LIBXFCE4UI_CFLAGS@ \ - @LIBXFCE4UTIL_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ \ @LIBSENSORS_CFLAGS@ @@ -59,11 +51,6 @@ if HAVE_LIBNOTIFY libxfce4sensors_la_CFLAGS += @LIBNOTIFY_CFLAGS@ endif -# @GTK_CFLAGS@ -# @GLIB_CFLAGS@ -# @LIBXFCE4UTIL_CFLAGS@ -# @LIBXFCEGUI4_CFLAGS@ - libxfce4sensors_la_LDFLAGS = \ -export-dynamic \ -export-symbols-regex ^[^_].* \ @@ -71,20 +58,12 @@ libxfce4sensors_la_LDFLAGS = \ # @PLATFORM_LDFLAGS@ -# -export-dynamic \ -# -avoid-version \ -# -module - libxfce4sensors_la_LIBADD = \ - @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCE4UI_LIBS@ \ + @LIBXFCE4UI_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \ @LIBSENSORS_LDFLAGS@ \ @LIBM@ -#@GTK_LIBS@
[Xfce4-commits] xfce4-settings:xfce-4.8 l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/xfce-4.8 to 39dde4d2c7253cf79fe7d2b6ea04ac2cfe1cc047 (commit) from fbf927fdedf6ba7286b607fa6b6842d7e723d90b (commit) commit 39dde4d2c7253cf79fe7d2b6ea04ac2cfe1cc047 Author: Chipong Luo chipon...@yahoo.com Date: Tue May 3 06:47:29 2011 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 264 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 199 --- 1 files changed, 66 insertions(+), 133 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index d58558e..f323d54 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,19 +4,18 @@ # Chris K. Zhang plut...@gmail.com, 2009. # Aron Xu aronmala...@163.com, 2009. # Hunt Xu hun...@live.cn, 2009, 2010. -#: ../xfsettingsd/main.c:127 msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:16+0100\n +POT-Creation-Date: 2011-05-03 04:29+\n PO-Revision-Date: 2010-11-27 21:48+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Simplified Chinese i18n-x...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid Acceleration _profile: @@ -80,9 +79,7 @@ msgid The amount of time, in milliseconds, required between keystrokes msgstr 两次按键的间隔（毫秒） #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16 -msgid -The amount of time, in milliseconds, that must elapse before a keystroke -will be accepted +msgid The amount of time, in milliseconds, that must elapse before a keystroke will be accepted msgstr 按键只在按后过这么长时间（毫秒）才被接受 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17 @@ -98,9 +95,7 @@ msgid The time, in milliseconds, between repeated motion events msgstr 重复光标移动事件的间隔（毫秒） #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 -msgid -The time, in milliseconds, between the initial key press and first repeated -motion event +msgid The time, in milliseconds, between the initial key press and first repeated motion event msgstr 从按键到开始重复的时间间隔（毫秒） #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 @@ -108,15 +103,11 @@ msgid The time, in milliseconds, to get to maximum speed msgstr 到达最快速度所用时间（毫秒） #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 -msgid -To help prevent accidental keystrokes, slow keys requires that a key is held -for a certain minimum amount of time before the keystroke will be accepted +msgid To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted msgstr 使用慢速按键可防止错按，一个键只在被按了一定时间之后才被接受。 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 -msgid -To help prevent accidental multiple keystrokes, bounce keys imposes a -minimum delay between keystrokes +msgid To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes msgstr 使用反弹按键可防止意外重复，两次按键间隔必须超过最小延迟 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 @@ -132,32 +123,23 @@ msgid Use slow _keys msgstr 使用慢速按键(_K) #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27 -msgid -When selected, modifier keys (such as Control, Alt, and Shift) do not need -to be held down (they can be pressed and then released) when multiple keys -would normally need to be pressed at the same time +msgid When selected, modifier keys (such as Control, Alt, and Shift) do not need to be held down (they can be pressed and then released) when multiple keys would normally need to be pressed at the same time msgstr 选择该选项后，使用修饰键（比如 Ctrl，Alt，以及 Shift）时不需要一直按下，可\n 以按了再放开，然后按所修饰的键。这样就不需要同时按下多个键。 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:28 -msgid -When selected, modifier keys (such as Control, Alt, and Shift) will remain -locked in the pressed state until pressed again +msgid When selected, modifier keys (such as Control, Alt, and Shift) will remain locked in the pressed state until pressed again msgstr 选择该选项后，修饰键（比如 Ctrl，Alt，以及 Shift）按过之后会一直保持，直到\n 再按一次。 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:29 -msgid -When selected, the \sticky keys\ feature will be disabled if two keys are -pressed simultaneously +msgid When selected, the \sticky keys\ feature will be disabled if two keys are pressed simultaneously msgstr 选择该选项后，如果同时按下两个键“黏性按键”功能会暂时取消 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:30 -msgid -When selected, the mouse pointer can be controlled using the keyboard number -pad +msgid When selected, the mouse pointer can be controlled using the keyboard number pad msgstr 选择该选项后，可以用数字小键盘控制鼠标光标 #:
[Xfce4-commits] xfwm4:xfce-4.8 l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/xfce-4.8 to 85f6c0b6127c1c2b5fa9f2cdbea8935b3d31ee1f (commit) from 03069b415610622d73e302641a03595691081c7f (commit) commit 85f6c0b6127c1c2b5fa9f2cdbea8935b3d31ee1f Author: Chipong Luo chipon...@yahoo.com Date: Tue May 3 06:50:23 2011 +0200 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 | 131 +- 1 files changed, 12 insertions(+), 119 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9f45e1d..21ff366 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10,14 +10,14 @@ msgid msgstr Project-Id-Version: xfwm4 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-01-16 17:27+0100\n +POT-Creation-Date: 2011-05-03 04:33+\n PO-Revision-Date: 2010-11-27 21:12+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Simplified Chinese xfce-i...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../helper-dialog/helper-dialog.c:84 msgid @@ -625,9 +625,7 @@ 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 @@ -820,8 +818,7 @@ 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 @@ -845,19 +842,19 @@ msgstr %s: 段错误 #: ../src/main.c:534 msgid Fork to the background -msgstr +msgstr 转入后台 #: ../src/main.c:536 msgid Fork to the background (not supported) -msgstr +msgstr 装入后台（不支持） #: ../src/main.c:539 msgid Set the compositor mode -msgstr +msgstr 设置排版模式 #: ../src/main.c:541 msgid Set the compositor mode (not supported) -msgstr +msgstr 设置排版模式（不支持) #: ../src/main.c:543 msgid Replace the existing window manager @@ -1015,7 +1012,6 @@ msgstr 无法启动帮助对话框：%s\n #~ msgid Resistance|iWide/i #~ msgstr i强/i -#, fuzzy #~ msgid Window Manager #~ msgstr 窗口管理器 @@ -1049,11 +1045,9 @@ msgstr 无法启动帮助对话框：%s\n #~ msgid Bottom : #~ msgstr 底部: -#, fuzzy #~ msgid Bring window on current workspace #~ msgstr 移动窗口至当前工作区 -#, fuzzy #~ msgid Do nothing #~ msgstr 不做任何动作 @@ -1063,144 +1057,108 @@ msgstr 无法启动帮助对话框：%s\n #~ msgid Place window in the center #~ msgstr 放置窗口至中间 -#, fuzzy -#~ msgid -#~ Skip windows that have \skip pager\ or \skip taskbar\ properties set +#~ msgid Skip windows that have \skip pager\ or \skip taskbar\ properties set #~ msgstr 跳过有 \skip pager\ 或者 \skip taskbar\属性设置的窗口 -#, fuzzy #~ msgid Include hidden (i.e. iconified) windows #~ msgstr 包含隐藏(如图标化)窗口 -#, fuzzy #~ msgid Cycle through windows from all workspaces #~ msgstr 在所有工作区的窗口间循环 -#, fuzzy #~ msgid Cycling #~ msgstr 循环 -#, fuzzy #~ msgid Activate focus stealing prevention #~ msgstr 激活预防偷窃焦点 -#, fuzzy #~ msgid Honor the standard ICCCM focus hint #~ msgstr 启用 ICCCM 焦点提示标准 -#, fuzzy #~ msgid Focus #~ msgstr 焦点 -#, fuzzy #~ msgid Key used to grab and move windows #~ msgstr 用来捕获和移动窗口的按键 -#, fuzzy #~ msgid Raise windows when any mouse button is pressed #~ msgstr 按下任意鼠标键时提升窗口 -#, fuzzy #~ msgid Hide frame of windows when maximized #~ msgstr 最大化时隐藏窗口边框 -#, fuzzy #~ msgid Restore original size of maximized windows when moving #~ msgstr 移动窗口时恢复最大化窗口原始大小 -#, fuzzy #~ msgid Use edge resistance instead of windows snapping #~ msgstr 使用边缘阻力取代窗口吸附 -#, fuzzy #~ msgid Accessibility #~ msgstr 辅助性 #~ msgid Switch workspaces using the mouse wheel over the desktop #~ msgstr 在桌面使用鼠标滚轮切换工作区 -#, fuzzy -#~ msgid -#~ Remember and recall previous workspace when switching via keyboard -#~ shortcuts +#~ msgid Remember and recall previous workspace when switching via keyboard shortcuts #~ msgstr 由键盘快捷键切换时记住并恢复先前的工作区 -#, fuzzy #~ msgid Wrap workspaces depending on the actual desktop layout #~ msgstr 以实际桌面版面决定工作区回绕 -#, fuzzy #~ msgid Wrap workspaces when the first or last workspace is reached #~ msgstr 到达第一或最后一个工作区时回绕工作区 -#, fuzzy #~ msgid Minimum size of windows to trigger smart placement #~ msgstr 触发智能定位最小窗口大小 -#, fuzzy #~ msgid Size|Small #~ msgstr 小 -#, fuzzy #~ msgid Size|Large #~ msgstr 大 #~ msgid Default positionning of windows without smart placement: #~ msgstr 默认窗口大小： -#, fuzzy #~ msgid Placement #~ msgstr 定位 -#, fuzzy #~ msgid Enable display compositing #~ msgstr 允许混合显示 -#, fuzzy #~ msgid Display
