[Xfce4-commits] xfce4-weather-plugin:master Fix Ukrainian (uk) translation file.

[Harald Judt]

Updating branch refs/heads/master
 to 3b990467c41898200575f2e2443ebc19f90b36ab (commit)
   from 7488e03c34523bf60d32f566225f06120d6d1707 (commit)

commit 3b990467c41898200575f2e2443ebc19f90b36ab
Author: Harald Judt h.j...@gmx.at
Date:   Wed Jan 30 20:53:42 2013 +0100

Fix Ukrainian (uk) translation file.

The recently committed file breaks compilation.

 po/uk.po |5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index a69b61e..832c879 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1586,10 +1586,9 @@ msgstr 
 \t\t
 
 #: ../panel-plugin/weather-summary.c:532
+#, fuzzy
 msgid The Norwegian Meteorological Institute
-msgstr 
-\n
-Дані надано Норвезьким інститутом метеорології\n
+msgstr Дані надано Норвезьким інститутом метеорології
 
 #: ../panel-plugin/weather-summary.c:584
 #, c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Polish (pl) translation to 94%

[Transifex]

Updating branch refs/heads/master
 to 51546104edb4fa2e20b4db85eec91d27cdae791c (commit)
   from 3b990467c41898200575f2e2443ebc19f90b36ab (commit)

commit 51546104edb4fa2e20b4db85eec91d27cdae791c
Author: Piotr Sokół pso...@jabster.pl
Date:   Fri Feb 1 10:47:12 2013 +0100

l10n: Updated Polish (pl) translation to 94%

New status: 301 messages complete with 1 fuzzy and 17 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pl.po |   24 ++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index bf6c0be..59ba5ae 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: xfce4-weather-plugin 0.8.3\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-29 11:33+0100\n
-PO-Revision-Date: 2013-01-30 11:16+0100\n
+PO-Revision-Date: 2013-02-01 10:45+0100\n
 Last-Translator: Piotr Sokół pso...@jabster.pl\n
 Language-Team: polski \n
 Language: \n
@@ -87,6 +87,11 @@ msgid 
 working within a few month. Please file a bug on https://bugzilla.xfce.org 
 if no one else has done so yet.
 msgstr 
+Interfejs sunrise API serwisu met.no odebrał komunikat informujący, że 
+bieżąca wersja usługi sieciowej jest przestarzała. Aplet wymaga wprowadzenia 
+zmian, aby móc używać nowej wersji usługi. W przeciwnym razie wtyczka 
+przestanie działać w przeciągu najbliższego czasu. Proszę zgłosić błąd na 
+stronie https://bugzilla.xfce.org, jeśli nie został on jeszcze odnotowany.
 
 #: panel-plugin/weather.c:466
 msgid Error parsing astronomical data!
@@ -108,6 +113,12 @@ msgid 
 will stop working within a few month. Please file a bug on https://bugzilla.;
 xfce.org if no one else has done so yet.
 msgstr 
+Interfejs LocationforecastLTS API serwisu met.no odebrał komunikat 
+informujący, że bieżąca wersja usługi sieciowej jest przestarzała. Aplet 
+wymaga wprowadzenia zmian, aby móc używać nowej wersji usługi. W przeciwnym 
+razie wtyczka przestanie działać w przeciągu najbliższego czasu. Proszę 
+zgłosić błąd na stronie https://bugzilla.xfce.org, jeśli nie został on 
+jeszcze odnotowany.
 
 #: panel-plugin/weather.c:535
 msgid Error parsing weather data!
@@ -502,18 +513,22 @@ msgstr 
 #: panel-plugin/weather-config.c:696
 msgid Wind speeds in TV or in the news are often provided in km/h.
 msgstr 
+Wypisuje wskazania prędkości wiatru w kilometrach na godzinę. Jednostka 
+często stosowana w telewizyjnych komunikatach pogodowych.
 
 #: panel-plugin/weather-config.c:700
 msgid 
 Miles per hour is an imperial unit of speed expressing the number of statute 
 miles covered in one hour.
-msgstr 
+msgstr Wypisuje wskazania prędkości wiatru w milach angielskich na godzinę.
 
 #: panel-plugin/weather-config.c:704
 msgid 
 Meter per second is ithe/i unit typically used by meteorologists to 
 denote wind speeds.
 msgstr 
+Wypisuje wskazania prędkości wiatru w metrach na sekundę. Jednostka 
+zazwyczaj używana w meteorologii.
 
 #: panel-plugin/weather-config.c:708
 msgid 
@@ -561,6 +576,11 @@ msgid 
 industry is one of the few areas where the foot is widely used outside the 
 English-speaking world.
 msgstr 
+Wypisuje wskazania wysokości bezwzględnej w stopach. Jednostka długości 
+używana w brytyjskim systemie miar jak i systemie miar Stanów Zjednoczonych. 
+Jedna stopa wynosi 0,3048 m i dzieli się dokładnie na 12 cali. Jednym z 
+nielicznych przykładów używania tej jednostki poza krajami anglojęzycznymi 
+jest pomiar wysokości w awiacji.
 
 #: panel-plugin/weather-config.c:831
 msgid 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-terminal:master l10n: Updated Chinese (China) (zh_CN) translation to 93%

[Transifex]

Updating branch refs/heads/master
 to 86272a8c25ab5942b19a647e0b1e46a7decba6c6 (commit)
   from 88fe2fc3ed296793f0dace003b59ff5641c756f0 (commit)

commit 86272a8c25ab5942b19a647e0b1e46a7decba6c6
Author: 玉堂 白鹤 yjwork.x...@gmail.com
Date:   Fri Feb 1 10:52:07 2013 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 93%

New status: 264 messages complete with 0 fuzzies and 18 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |  284 +++
 1 files changed, 110 insertions(+), 174 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5646aba..eed7464 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,19 +4,20 @@
 # the Xfce's terminal package.
 # Hunt Xu hun...@live.cn, 2009.
 # Chipong Luo chipong@yahoo.com, 2011, 2012.
-# 
+# 玉堂白鹤 yjwork.x...@gmail.com,2013.
+#
 msgid 
 msgstr 
 Project-Id-Version: terminal\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-01-23 05:42+\n
-PO-Revision-Date: 2009-12-23 11:25+0800\n
-Last-Translator: Chipong Luo chipong@yahoo.com\n
+POT-Creation-Date: 2013-01-31 06:18+\n
+PO-Revision-Date: 2013-02-01 17:50+0800\n
+Last-Translator: 玉堂白鹤 yjwork.x...@gmail.com\n
 Language-Team: Chinese (Simplified) xfce-i18n...@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
 Plural-Forms: nplurals=1; plural=0;\n
 
 #: ../colorschemes/black-on-white.theme.in.h:1
@@ -61,13 +62,15 @@ msgstr 一般选项
 
 #. parameter of --default-display
 #. parameter of --display
-#: ../terminal/main.c:111 ../terminal/main.c:137
+#: ../terminal/main.c:111
+#: ../terminal/main.c:137
 msgid display
 msgstr 显示
 
 #. parameter of --default-working-directory
 #. parameter of --working-directory
-#: ../terminal/main.c:113 ../terminal/main.c:128
+#: ../terminal/main.c:113
+#: ../terminal/main.c:128
 msgid directory
 msgstr 目录
 
@@ -118,7 +121,8 @@ msgstr 图标
 msgid See the %s man page for full explanation of the options above.
 msgstr 参看 %s 手册获取以上选项的完整解释。
 
-#: ../terminal/main.c:180 ../xfce4-terminal.desktop.in.h:2
+#: ../terminal/main.c:180
+#: ../xfce4-terminal.desktop.in.h:2
 msgid Xfce Terminal
 msgstr Xfce 终端
 
@@ -234,37 +238,27 @@ msgstr 显示不匹配
 
 #: ../terminal/terminal-options.c:212
 #, c-format
-msgid 
-Option \--default-display\ requires specifying the default X display as 
-its parameter
+msgid Option \--default-display\ requires specifying the default X display 
as its parameter
 msgstr 选项 “--default-display” 需要指定默认的 X 显示作为其参数
 
 #: ../terminal/terminal-options.c:228
 #, c-format
-msgid 
-Option \--default-working-directory\ requires specifying the default 
-working directory as its parameter
+msgid Option \--default-working-directory\ requires specifying the default 
working directory as its parameter
 msgstr 选项 “--default-working-directory” 需要指定默认的工作目录作为其参数
 
 #: ../terminal/terminal-options.c:245
 #, c-format
-msgid 
-Option \--execute/-x\ requires specifying the command to run on the rest 
-of the command line
+msgid Option \--execute/-x\ requires specifying the command to run on the 
rest of the command line
 msgstr 选项 “--execute/-x” 需要指定在命令行结尾处要运行的命令
 
 #: ../terminal/terminal-options.c:262
 #, c-format
-msgid 
-Option \--command/-e\ requires specifying the command to run as its 
-parameter
+msgid Option \--command/-e\ requires specifying the command to run as its 
parameter
 msgstr 选项 “--command/-e” 需要指定要运行的命令作为其参数
 
 #: ../terminal/terminal-options.c:279
 #, c-format
-msgid 
-Option \--working-directory\ requires specifying the working directory as 
-its parameter
+msgid Option \--working-directory\ requires specifying the working 
directory as its parameter
 msgstr 选项 “--working-directory” 需要指定工作目录作为其参数
 
 #: ../terminal/terminal-options.c:294
@@ -274,15 +268,12 @@ msgstr 选项 “--title/-T” 需要指定标题作为其参数
 
 #: ../terminal/terminal-options.c:313
 #, c-format
-msgid 
-Option \--display\ requires specifying the X display as its parameters
+msgid Option \--display\ requires specifying the X display as its 
parameters
 msgstr 选项 “--display” 需要指定 X 显示作为其参数
 
 #: ../terminal/terminal-options.c:328
 #, c-format
-msgid 
-Option \--geometry\ requires specifying the window geometry as its 
-parameter
+msgid Option \--geometry\ requires specifying the window geometry as its 
parameter
 msgstr 选项 “--geometry” 需要指定窗口几何属性作为其参数
 
 #: ../terminal/terminal-options.c:343
@@ -291,23 +282,18 @@ msgid Option \--role\ requires specifying the window 
role as its parameter
 msgstr 选项 “--role” 需要指定窗口识别码作为其参数
 
 #: ../terminal/terminal-options.c:358
-#, fuzzy, c-format
-msgid 
-Option \--sm-client-id\ requires specifying the unique session id as its 
-parameter
-msgstr 选项 “--startup-id” 需要指定启动 id 作为其参数
+#, c-format
+msgid Option \--sm-client-id\ requires specifying the unique session id as 
its parameter
+msgstr 
 
 #: ../terminal/terminal-options.c:373
 #, c-format
-msgid 
-Option \--startup-id\ 

[Xfce4-commits] xfce4-terminal:master l10n: Updated Chinese (China) (zh_CN) translation to 93%

[Transifex]

Updating branch refs/heads/master
 to bd69eafe9570473ecc919b0223b725364fcc1082 (commit)
   from 86272a8c25ab5942b19a647e0b1e46a7decba6c6 (commit)

commit bd69eafe9570473ecc919b0223b725364fcc1082
Author: 玉堂 白鹤 yjwork.x...@gmail.com
Date:   Fri Feb 1 10:54:16 2013 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 93%

New status: 264 messages complete with 0 fuzzies and 18 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   28 ++--
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index eed7464..791f908 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 # Hunt Xu hun...@live.cn, 2009.
 # Chipong Luo chipong@yahoo.com, 2011, 2012.
 # 玉堂白鹤 yjwork.x...@gmail.com,2013.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: terminal\n
@@ -14,10 +14,10 @@ msgstr 
 PO-Revision-Date: 2013-02-01 17:50+0800\n
 Last-Translator: 玉堂白鹤 yjwork.x...@gmail.com\n
 Language-Team: Chinese (Simplified) xfce-i18n...@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
 Plural-Forms: nplurals=1; plural=0;\n
 
 #: ../colorschemes/black-on-white.theme.in.h:1
@@ -62,15 +62,13 @@ msgstr 一般选项
 
 #. parameter of --default-display
 #. parameter of --display
-#: ../terminal/main.c:111
-#: ../terminal/main.c:137
+#: ../terminal/main.c:111 ../terminal/main.c:137
 msgid display
 msgstr 显示
 
 #. parameter of --default-working-directory
 #. parameter of --working-directory
-#: ../terminal/main.c:113
-#: ../terminal/main.c:128
+#: ../terminal/main.c:113 ../terminal/main.c:128
 msgid directory
 msgstr 目录
 
@@ -121,8 +119,7 @@ msgstr 图标
 msgid See the %s man page for full explanation of the options above.
 msgstr 参看 %s 手册获取以上选项的完整解释。
 
-#: ../terminal/main.c:180
-#: ../xfce4-terminal.desktop.in.h:2
+#: ../terminal/main.c:180 ../xfce4-terminal.desktop.in.h:2
 msgid Xfce Terminal
 msgstr Xfce 终端
 
@@ -317,8 +314,7 @@ msgstr 载入预设...
 msgid Terminal
 msgstr Terminal 终端
 
-#: ../terminal/terminal-screen.c:396
-#: ../terminal/terminal-screen.c:681
+#: ../terminal/terminal-screen.c:396 ../terminal/terminal-screen.c:681
 #: ../terminal/terminal-screen.c:1826
 msgid Untitled
 msgstr 无标题
@@ -328,8 +324,7 @@ msgstr 无标题
 msgid Unable to determine your login shell.
 msgstr 未能确定您的登录 shell。
 
-#: ../terminal/terminal-screen.c:1525
-#: ../terminal/terminal-screen.c:1554
+#: ../terminal/terminal-screen.c:1525 ../terminal/terminal-screen.c:1554
 msgid Failed to execute child
 msgstr 无法执行子进程
 
@@ -369,8 +364,7 @@ msgstr 匹配整个单词(_E)
 msgid _Wrap around
 msgstr 回绕模式（_W）
 
-#: ../terminal/terminal-util.c:79
-#: ../xfce4-terminal-default-apps.xml.in.in.h:1
+#: ../terminal/terminal-util.c:79 ../xfce4-terminal-default-apps.xml.in.in.h:1
 msgid Xfce Terminal Emulator
 msgstr Xfce 终端模拟器
 
@@ -462,13 +456,11 @@ msgstr 打开新的终端窗口
 msgid _Detach Tab
 msgstr 分离标签(_D)
 
-#: ../terminal/terminal-window.c:200
-#: ../terminal/terminal-window.c:510
+#: ../terminal/terminal-window.c:200 ../terminal/terminal-window.c:510
 msgid Close T_ab
 msgstr 关闭标签(_A)
 
-#: ../terminal/terminal-window.c:201
-#: ../terminal/terminal-window.c:514
+#: ../terminal/terminal-window.c:201 ../terminal/terminal-window.c:514
 msgid Close _Window
 msgstr 关闭窗口(_W)
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-terminal:master l10n: Updated Chinese (China) (zh_CN) translation to 93%

[Transifex]

Updating branch refs/heads/master
 to 670b9831866a731a7461fe3a4980670120c2d5c3 (commit)
   from bd69eafe9570473ecc919b0223b725364fcc1082 (commit)

commit 670b9831866a731a7461fe3a4980670120c2d5c3
Author: 玉堂 白鹤 yjwork.x...@gmail.com
Date:   Fri Feb 1 10:59:08 2013 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 93%

New status: 264 messages complete with 0 fuzzies and 18 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |   33 +
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 791f908..e32c01b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,19 +5,19 @@
 # Hunt Xu hun...@live.cn, 2009.
 # Chipong Luo chipong@yahoo.com, 2011, 2012.
 # 玉堂白鹤 yjwork.x...@gmail.com,2013.
-# 
+#
 msgid 
 msgstr 
 Project-Id-Version: terminal\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-31 06:18+\n
-PO-Revision-Date: 2013-02-01 17:50+0800\n
+PO-Revision-Date: 2013-02-01 17:57+0800\n
 Last-Translator: 玉堂白鹤 yjwork.x...@gmail.com\n
 Language-Team: Chinese (Simplified) xfce-i18n...@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
 Plural-Forms: nplurals=1; plural=0;\n
 
 #: ../colorschemes/black-on-white.theme.in.h:1
@@ -62,13 +62,15 @@ msgstr 一般选项
 
 #. parameter of --default-display
 #. parameter of --display
-#: ../terminal/main.c:111 ../terminal/main.c:137
+#: ../terminal/main.c:111
+#: ../terminal/main.c:137
 msgid display
 msgstr 显示
 
 #. parameter of --default-working-directory
 #. parameter of --working-directory
-#: ../terminal/main.c:113 ../terminal/main.c:128
+#: ../terminal/main.c:113
+#: ../terminal/main.c:128
 msgid directory
 msgstr 目录
 
@@ -119,7 +121,8 @@ msgstr 图标
 msgid See the %s man page for full explanation of the options above.
 msgstr 参看 %s 手册获取以上选项的完整解释。
 
-#: ../terminal/main.c:180 ../xfce4-terminal.desktop.in.h:2
+#: ../terminal/main.c:180
+#: ../xfce4-terminal.desktop.in.h:2
 msgid Xfce Terminal
 msgstr Xfce 终端
 
@@ -314,7 +317,8 @@ msgstr 载入预设...
 msgid Terminal
 msgstr Terminal 终端
 
-#: ../terminal/terminal-screen.c:396 ../terminal/terminal-screen.c:681
+#: ../terminal/terminal-screen.c:396
+#: ../terminal/terminal-screen.c:681
 #: ../terminal/terminal-screen.c:1826
 msgid Untitled
 msgstr 无标题
@@ -324,7 +328,8 @@ msgstr 无标题
 msgid Unable to determine your login shell.
 msgstr 未能确定您的登录 shell。
 
-#: ../terminal/terminal-screen.c:1525 ../terminal/terminal-screen.c:1554
+#: ../terminal/terminal-screen.c:1525
+#: ../terminal/terminal-screen.c:1554
 msgid Failed to execute child
 msgstr 无法执行子进程
 
@@ -364,7 +369,8 @@ msgstr 匹配整个单词(_E)
 msgid _Wrap around
 msgstr 回绕模式（_W）
 
-#: ../terminal/terminal-util.c:79 ../xfce4-terminal-default-apps.xml.in.in.h:1
+#: ../terminal/terminal-util.c:79
+#: ../xfce4-terminal-default-apps.xml.in.in.h:1
 msgid Xfce Terminal Emulator
 msgstr Xfce 终端模拟器
 
@@ -373,7 +379,8 @@ msgid translator-credits
 msgstr 
 Hunt Xu hun...@live.cn, 2009.\n
 Chipong Luo chipong@yahoo.com, 2011, 2012.\n
-xiaohao qingh...@foxmail.com, 2012.玉堂白鹤 yjwork.x...@gmail.com,2013.
+xiaohao qingh...@foxmail.com, 2012.\n
+玉堂白鹤 yjwork.x...@gmail.com,2013.
 
 #: ../terminal/terminal-util.c:89
 msgid Visit Terminal website
@@ -456,11 +463,13 @@ msgstr 打开新的终端窗口
 msgid _Detach Tab
 msgstr 分离标签(_D)
 
-#: ../terminal/terminal-window.c:200 ../terminal/terminal-window.c:510
+#: ../terminal/terminal-window.c:200
+#: ../terminal/terminal-window.c:510
 msgid Close T_ab
 msgstr 关闭标签(_A)
 
-#: ../terminal/terminal-window.c:201 ../terminal/terminal-window.c:514
+#: ../terminal/terminal-window.c:201
+#: ../terminal/terminal-window.c:514
 msgid Close _Window
 msgstr 关闭窗口(_W)
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] orage|orage-4.8.4 Creating annotated tag orage-4.8.4

[Juha]

Updating annotated tag refs/tags/orage-4.8.4
 as new annotated tag
 to 06768510471128efd77fdd15c5cb067df660d510 (tag)
   succeeds orage-4.8.3-145-g2f3fa41
  tagged by Juha j...@xfce.org
 on 2013-02-01 11:07 +0100

Juha (1):
  Release 4.8.4!

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] orage:master 4.8.4.0 After release version reset

[Juha]

Updating branch refs/heads/master
 to bf7da8662252521f2dcd60dc7d9baa615379917d (commit)
   from 94cc6faf80df8e017567a2b67710d92dac9c4050 (commit)

commit bf7da8662252521f2dcd60dc7d9baa615379917d
Author: Juha j...@xfce.org
Date:   Fri Feb 1 12:14:48 2013 +0200

4.8.4.0 After release version reset

Release done. Resetting version back to git type.

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index ba4a2c2..7f8f730 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto j...@xfce.org
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.4])
+m4_define([orage_version], [4.8.4.0-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfdesktop:master l10n: Updated Chinese (China) (zh_CN) translation to 97%

[Transifex]

Updating branch refs/heads/master
 to ef136889f33f6c5c94ad2759f4cfe6774485650d (commit)
   from 513ae81b53fbedeeaec79e2e9d54473510714e78 (commit)

commit ef136889f33f6c5c94ad2759f4cfe6774485650d
Author: 玉堂 白鹤 yjwork.x...@gmail.com
Date:   Fri Feb 1 13:39:01 2013 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 97%

New status: 174 messages complete with 0 fuzzies and 5 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_CN.po |  546 ---
 1 files changed, 261 insertions(+), 285 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c05f501..1981e76 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,28 +8,23 @@
 # Aron Xu aronmala...@163.com, 2009.
 # Hunt Xu hun...@live.cn, 2009, 2010.
 # Chipong Luo chipong@yahoo.com, 2011, 2012.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfdesktop\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-23 00:36+\n
+POT-Creation-Date: 2013-02-01 07:30+\n
 PO-Revision-Date: 2010-11-27 22:17+0800\n
 Last-Translator: Chipong Luo chipong@yahoo.com\n
 Language-Team: Chinese (Simplified) xfce-i18n...@xfce.org\n
-Language: zh_CN\n
 MIME-Version: 1.1\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: zh_CN\n
 Plural-Forms: nplurals=1; plural=0;\n
 
-#: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
-#, c-format
-msgid Backdrop list file is not valid
-msgstr 背景列表文件无效
-
 #. no need to escape markup; it's already done for us
-#: ../settings/main.c:166
+#: ../settings/main.c:151
 #, c-format
 msgid 
 %s\n
@@ -38,127 +33,72 @@ msgstr 
 %s\n
 i大小：%dx%d/i
 
-#: ../settings/main.c:299 ../src/xfdesktop-special-file-icon.c:271
+#: ../settings/main.c:263 ../src/xfdesktop-special-file-icon.c:271
 #: ../src/xfdesktop-special-file-icon.c:434
 msgid Home
 msgstr 主文件夹
 
-#: ../settings/main.c:301
+#: ../settings/main.c:265
 msgid Filesystem
 msgstr 文件系统
 
-#: ../settings/main.c:303
+#: ../settings/main.c:267
 msgid Trash
 msgstr 回收站
 
-#: ../settings/main.c:305
+#: ../settings/main.c:269
 msgid Removable Devices
 msgstr 可移动设备
 
-#: ../settings/main.c:485
+#: ../settings/main.c:454
 #, c-format
-msgid Cannot create backdrop list \%s\
-msgstr 未能创建背景列表 “%s”
-
-#: ../settings/main.c:489 ../settings/main.c:862
-msgid Backdrop List Error
-msgstr 背景列表错误
-
-#: ../settings/main.c:514
-msgid Create/Load Backdrop List
-msgstr 创建/载入背景列表
-
-#: ../settings/main.c:538
-#, c-format
-msgid 
-File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr “%s” 不是有效的背景列表文件。您想要改写它吗？
-
-#: ../settings/main.c:543
-msgid Invalid List File
-msgstr 无效的列表文件
-
-#: ../settings/main.c:546
-msgid Overwriting the file will cause its contents to be lost.
-msgstr 改写文件会导致其内容丢失。
-
-#: ../settings/main.c:548
-msgid Replace
-msgstr 替换
+msgid Wallpaper for %s on Monitor %d (%s)
+msgstr 
 
-#: ../settings/main.c:858
+#: ../settings/main.c:458
 #, c-format
-msgid Failed to write backdrop list to \%s\
-msgstr 无法将背景列表写入 “%s”。
+msgid Wallpaper for %s on Monitor %d
+msgstr 
 
-#: ../settings/main.c:885
-msgid Add Image File(s)
-msgstr 添加图片文件
+#: ../settings/main.c:862
+msgid Spanning screens
+msgstr 
 
-#: ../settings/main.c:894
+#: ../settings/main.c:1011
 msgid Image files
 msgstr 图片文件
 
-#: ../settings/main.c:899
-msgid All files
-msgstr 所有文件
-
-#: ../settings/main.c:1363
-#, c-format
-msgid Screen %d, Monitor %d (%s)
-msgstr 屏幕 %d，显示器 %d(%s)
-
-#: ../settings/main.c:1367
-#, c-format
-msgid Screen %d, Monitor %d
-msgstr 屏幕 %d，显示器 %d
-
-#: ../settings/main.c:1370
-#, c-format
-msgid Screen %d
-msgstr 屏幕 %d
-
-#: ../settings/main.c:1375
-#, c-format
-msgid Monitor %d (%s)
-msgstr 显示器 %d(%s)
-
-#: ../settings/main.c:1379
-#, c-format
-msgid Monitor %d
-msgstr 显示器 %d
-
-#: ../settings/main.c:1638
+#: ../settings/main.c:
 msgid Settings manager socket
 msgstr 设置管理器套接字
 
-#: ../settings/main.c:1638
+#: ../settings/main.c:
 msgid SOCKET ID
 msgstr 套接字 ID
 
-#: ../settings/main.c:1639
+#: ../settings/main.c:1112
 msgid Version information
 msgstr 版本信息
 
-#: ../settings/main.c:1656
+#: ../settings/main.c:1129
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr 输入 ‘%s --help’ 获取用法。
 
-#: ../settings/main.c:1668
+#: ../settings/main.c:1141
 msgid The Xfce development team. All rights reserved.
 msgstr Xfce 开发团队。保留所有权利。
 
-#: ../settings/main.c:1669
+#: ../settings/main.c:1142
 #, c-format
 msgid Please report bugs to %s.
 msgstr 请向 %s 报告缺陷。
 
-#: ../settings/main.c:1676
+#: ../settings/main.c:1149
 msgid Desktop Settings
 msgstr 桌面设置
 
-#: ../settings/main.c:1678
+#: ../settings/main.c:1151
 msgid Unable to contact settings server
 msgstr 未能与设置服务器联系
 
@@ -171,179 +111,81 @@ msgid Set desktop background and menu and icon 
behaviour
 msgstr 设置桌面背景、菜单和图标行为
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1
-msgid bAdjustments/b
-msgstr b调整/b
+msgid Add an image to the list
+msgstr 将图片添加入列表
 
 #: 

[Xfce4-commits] xfdesktop:master l10n: Updated Chinese (China) (zh_CN) translation to 97%

[Transifex]

Updating branch refs/heads/master
 to 252135a61f74902ca549006cc87f647ac837bde6 (commit)
   from ef136889f33f6c5c94ad2759f4cfe6774485650d (commit)

commit 252135a61f74902ca549006cc87f647ac837bde6
Author: 玉堂 白鹤 yjwork.x...@gmail.com
Date:   Fri Feb 1 13:45:21 2013 +0100

l10n: Updated Chinese (China) (zh_CN) translation to 97%

New status: 175 messages complete with 0 fuzzies and 4 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 1981e76..761f49a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -185,7 +185,7 @@ msgstr 更改背景(以分钟)(_C)：
 
 #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18
 msgid _Random Order
-msgstr 
+msgstr 随机排序
 
 #: ../settings/xfdesktop-settings-ui.glade.h:1
 msgid bAppearance/b
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-clipman-plugin:master l10n: Updated Serbian (sr) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 21fcde7aca13b629b17fbe4f9c3c107456e2faff (commit)
   from 0919c61485d4320ea3cb87bf862aa6f91124d60d (commit)

commit 21fcde7aca13b629b17fbe4f9c3c107456e2faff
Author: Саша Петровић salepetron...@gmail.com
Date:   Fri Feb 1 14:27:20 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 62 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index b0a85a6..7055a78 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,16 +6,15 @@ msgid 
 msgstr 
 Project-Id-Version: master\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-06-19 06:24+\n
+POT-Creation-Date: 2013-02-01 10:03+\n
 PO-Revision-Date: 2012-07-05 08:27+0200\n
 Last-Translator: salepetronije salepetron...@gmail.com\n
 Language-Team: српски xfce-i...@xfce.org\n
-Language: sr\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: sr\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
 
 #: ../panel-plugin/xfce4-clipman.desktop.in.h:1
 #: ../panel-plugin/xfce4-clipman-plugin.desktop.in.h:1
@@ -319,4 +318,4 @@ msgstr Саша Петровић salepetron...@gmail.com
 
 #: ../panel-plugin/plugin.c:360
 msgid Unable to open the settings dialog
-msgstr Не могу да отворим прозорче подешавања
+msgstr Нисам успео отворим прозорче подешавања
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] orage:master 4.9.0.0: Fixed Bug 9249 1 Flag show wrong for hourly recurrence

[Juha]

Updating branch refs/heads/master
 to 63f351bc49a58dd3c18aa1399279a3db9690b889 (commit)
   from bf7da8662252521f2dcd60dc7d9baa615379917d (commit)

commit 63f351bc49a58dd3c18aa1399279a3db9690b889
Author: Juha j...@xfce.org
Date:   Fri Feb 1 15:36:58 2013 +0200

4.9.0.0: Fixed Bug 9249 1 Flag show wrong for hourly recurrence

Added hourly recurrency to the flags and to the tooltip.
Also fixed alarm to correctly show if it is set and if it is persistent.

 configure.in.in  |8 
 src/event-list.c |   13 -
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 7f8f730..5ea2e00 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,11 +9,11 @@ dnl Written for Xfce by Juha Kautto j...@xfce.org
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.4.0-git])
+m4_define([orage_version], [4.9.0.0-git])
 
-m4_define([gtk_minimum_version], [2.10.0])
-m4_define([xfce_minimum_version], [4.6.0])
-m4_define([dbus_minimum_version], [0.34])
+m4_define([gtk_minimum_version], [2.14.0])
+m4_define([xfce_minimum_version], [4.8.0])
+m4_define([dbus_minimum_version], [0.1])
 m4_define([notify_minimum_version], [0.3.2])
 m4_define([intltool_minimum_version], [0.31])
 m4_define([libical_minimum_version], [0.43])
diff --git a/src/event-list.c b/src/event-list.c
index b63c66a..1969bd3 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -373,9 +373,10 @@ static void add_el_row(el_win *el, xfical_appt *appt, char 
*par)
 guint   len = 50;
 
 stime = format_time(el, appt, par);
-if (appt-alarmtime != 0)
-if (appt-sound != NULL)
-flags[0] = 'S';
+if (appt-display_alarm_orage || appt-display_alarm_notify 
+||  appt-sound_alarm || appt-procedure_alarm)
+if (appt-alarm_persistent)
+flags[0] = 'P';
 else
 flags[0] = 'A';
 else
@@ -391,8 +392,10 @@ static void add_el_row(el_win *el, xfical_appt *appt, char 
*par)
 flags[1] = 'M';
 else if (appt-freq == XFICAL_FREQ_YEARLY)
 flags[1] = 'Y';
+else if (appt-freq == XFICAL_FREQ_HOURLY)
+flags[1] = 'H';
 else
-flags[1] = 'n';
+flags[1] = '?';
 
 if (appt-availability != 0)
 flags[2] = 'B';
@@ -1320,7 +1323,7 @@ static void build_event_list(el_win *el)
 gtk_tree_view_append_column(GTK_TREE_VIEW(el-TreeView), col);
 gtk_tree_view_column_set_visible(col, FALSE);
 
-gtk_tooltips_set_tip(el-Tooltips, el-TreeView, _(Double click line to 
edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=visual Alarm 
S=also Sound alarm\n\t 2. Recurrence: n=no recurrence\n\t\t D=Daily W=Weekly 
M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located in 
file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event 
T=Todo J=Journal), NULL);
+gtk_tooltips_set_tip(el-Tooltips, el-TreeView, _(Double click line to 
edit it.\n\nFlags in order:\n\t 1. Alarm: n=no alarm\n\t\t A=Alarm is set 
P=Persistent alarm is set\n\t 2. Recurrence: n=no recurrence\n\t\t H=Hourly 
D=Daily W=Weekly M=Monthly Y=Yearly\n\t 3. Type: f=free B=Busy\n\t 4. Located 
in file:\n\t\tO=Orage A=Archive F=Foreign\n\t 5. Appointment type:\n\t\tE=Event 
T=Todo J=Journal), NULL);
 
 g_signal_connect(el-TreeView, row-activated,
 G_CALLBACK(editEvent), el);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Fix forecasts only being reported for up to 3 days (bug #9781).

[Harald Judt]

Updating branch refs/heads/master
 to 96982f5d60998702a510c8bc3d655bf6636552c0 (commit)
   from 3b990467c41898200575f2e2443ebc19f90b36ab (commit)

commit 96982f5d60998702a510c8bc3d655bf6636552c0
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 15:25:28 2013 +0100

Fix forecasts only being reported for up to 3 days (bug #9781).

The new code doesn't work quite well for some timezones, resulting in 
missing
forecasts. This patch fixes this.

What's more, these changes will make it also easier to calculate min/max
temperatures for a day, which will be a possible future feature.

 panel-plugin/weather-data.c|  226 ---
 panel-plugin/weather-data.h|6 +-
 panel-plugin/weather-summary.c |   10 ++-
 3 files changed, 198 insertions(+), 44 deletions(-)

diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index e0bb803..645e349 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -32,6 +32,11 @@
 #define NIGHT_TIME_START 21
 #define NIGHT_TIME_END 5
 
+/* interval used for searching raw data relevant to a day */
+#define DAY_START 3
+#define DAY_END 33
+#define DAYTIME_LEN 6
+
 /* If some value is not present or cannot be computed, return this instead */
 #define INVALID_VALUE -
 
@@ -170,7 +175,7 @@ calc_apparent_temperature(const xml_location *loc,
 
 return 13.12 + 0.6215 * temp - 11.37 * pow(windspeed, 0.16)
 + 0.3965 * temp * pow(windspeed, 0.16);
- }
+}
 
 if (temp = 26.7 || (night_time  temp = 22.0)) {
 /* humidity needs to be higher than 40% for a valid result */
@@ -991,7 +996,7 @@ find_point_data(const xml_weather *wd,
 
 /* add point data if within limits */
 diff = difftime(timeslice-end, point_t);
-if (diff  0) {   /* before point_t */
+if (diff = 0) {  /* before point_t */
 diff *= -1;
 if (diff  min_diff || diff  max_diff)
 continue;
@@ -1056,63 +1061,202 @@ make_current_conditions(xml_weather *wd,
 }
 
 
-static time_t
-get_daytime(int day,
-daytime dt)
+/*
+ * Get all point data relevant for a given day.
+ */
+GArray *
+get_point_data_for_day(xml_weather *wd,
+   int day)
 {
-struct tm point_tm;
-time_t point_t;
+GArray *found;
+xml_time *timeslice;
+struct tm day_tm;
+time_t day_t;
+gint i;
 
-/* initialize times to the current day */
-time(point_t);
-point_tm = *localtime(point_t);
+/* calculate 00:00 for the requested day */
+time(day_t);
+day_tm = *localtime(day_t);
+day_tm.tm_mday += day;
+day_tm.tm_hour = day_tm.tm_min = day_tm.tm_sec = 0;
+day_tm.tm_isdst = -1;
+day_t = mktime(day_tm);
+
+/* loop over weather data and pick relevant point data */
+found = g_array_new(FALSE, TRUE, sizeof(xml_time *));
+g_assert(found != NULL);
+if (G_UNLIKELY(found == NULL))
+return NULL;
 
-/* calculate daytime for the requested day */
-point_tm.tm_mday += day;
-point_tm.tm_min = point_tm.tm_sec = 0;
-point_tm.tm_isdst = -1;
-switch (dt) {
-case MORNING:
-point_tm.tm_hour = 9;
-break;
-case AFTERNOON:
-point_tm.tm_hour = 15;
-break;
-case EVENING:
-point_tm.tm_hour = 21;
-break;
-case NIGHT:
-point_tm.tm_hour = 27;
-break;
+weather_debug(Checking %d timeslices for point data relevant to day %d.,
+  wd-timeslices-len, day);
+for (i = 0; i  wd-timeslices-len; i++) {
+timeslice = g_array_index(wd-timeslices, xml_time *, i);
+
+/* look only for point data, not intervals */
+if (G_UNLIKELY(timeslice == NULL) || timeslice_is_interval(timeslice))
+continue;
+
+if (difftime(timeslice-start, day_t) = DAY_START * 3600 
+difftime(timeslice-end, day_t) = DAY_END * 3600) {
+weather_dump(weather_dump_timeslice, timeslice);
+g_array_append_val(found, timeslice);
+}
 }
-point_t = mktime(point_tm);
-return point_t;
+g_array_sort(found, (GCompareFunc) xml_time_compare);
+weather_debug(Found %d timeslices for day %d., found-len, day);
+return found;
 }
 
 
 /*
- * Get forecast data for a given daytime for the day (today + day).
+ * Return forecast data for a given daytime, using the data provided.
  */
 xml_time *
 make_forecast_data(xml_weather *wd,
-   int day,
+   GArray *daydata,
+   gint day,
daytime dt)
 {
-point_data_results *found = NULL;
-xml_time *interval = NULL;
-time_t point_t;
+xml_time *ts1, *ts2, *interval = NULL;
+struct tm point_tm, start_tm, end_tm;
+time_t point_t, start_t, end_t;
+gint min, max, point, i, j;
 
 g_assert(wd != NULL);
 if (G_UNLIKELY(wd == NULL))
 return NULL;
 

[Xfce4-commits] xfce4-weather-plugin:master Modify symbol only for current conditions.

[Harald Judt]

Updating branch refs/heads/master
 to e06203e457818903ffdd7ae8e57f7a50f0850f32 (commit)
   from 96982f5d60998702a510c8bc3d655bf6636552c0 (commit)

commit e06203e457818903ffdd7ae8e57f7a50f0850f32
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 15:42:49 2013 +0100

Modify symbol only for current conditions.

Except for fog, leave the symbols on the forecast tab untouched and stay
true to the original data. The difference in interval data and point data
should be clear to the user. Only for the current weather it makes sense
to change the symbol, and maybe more work on calculating the symbol will
be spent for future versions.

 panel-plugin/weather-data.c |   32 +++-
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index 645e349..403c72d 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -565,7 +565,8 @@ wind_dir_name_by_deg(gchar *degrees, gboolean long_name)
 
 
 static void
-calculate_symbol(xml_time *timeslice)
+calculate_symbol(xml_time *timeslice,
+ gboolean current_conditions)
 {
 xml_location *loc;
 gdouble fog, cloudiness, precipitation;
@@ -580,14 +581,18 @@ calculate_symbol(xml_time *timeslice)
 if (precipitation  0)
 return;
 
-cloudiness =
-string_to_double(loc-clouds_percent[CLOUDS_PERC_CLOUDINESS], 0);
-if (cloudiness = 90)
-loc-symbol_id = SYMBOL_CLOUD;
-else if (cloudiness = 30)
-loc-symbol_id = SYMBOL_PARTLYCLOUD;
-else if (cloudiness = 1.0 / 8.0)
-loc-symbol_id = SYMBOL_LIGHTCLOUD;
+/* do some modifications only if we're making a timeslice for
+   current conditions */
+if (current_conditions) {
+cloudiness =
+string_to_double(loc-clouds_percent[CLOUDS_PERC_CLOUDINESS], 0);
+if (cloudiness = 90)
+loc-symbol_id = SYMBOL_CLOUD;
+else if (cloudiness = 30)
+loc-symbol_id = SYMBOL_PARTLYCLOUD;
+else if (cloudiness = 1.0 / 8.0)
+loc-symbol_id = SYMBOL_LIGHTCLOUD;
+}
 
 fog = string_to_double(loc-fog_percent, 0);
 if (fog = 80)
@@ -669,7 +674,8 @@ interpolate_gchar_value(gchar *value_start,
 static xml_time *
 make_combined_timeslice(xml_weather *wd,
 const xml_time *interval,
-const time_t *between_t)
+const time_t *between_t,
+gboolean current_conditions)
 {
 xml_time *comb, *start, *end;
 gboolean ipol = (between_t != NULL) ? TRUE : FALSE;
@@ -744,7 +750,7 @@ make_combined_timeslice(xml_weather *wd,
 comb-location-symbol_id = interval-location-symbol_id;
 comb-location-symbol = g_strdup(interval-location-symbol);
 
-calculate_symbol(comb);
+calculate_symbol(comb, current_conditions);
 return comb;
 }
 
@@ -1057,7 +1063,7 @@ make_current_conditions(xml_weather *wd,
 if (interval == NULL)
 return NULL;
 
-return make_combined_timeslice(wd, interval, now_t);
+return make_combined_timeslice(wd, interval, now_t, TRUE);
 }
 
 
@@ -1255,7 +1261,7 @@ make_forecast_data(xml_weather *wd,
 continue;
 
 weather_debug(returning valid interval);
-return make_combined_timeslice(wd, interval, point_t);
+return make_combined_timeslice(wd, interval, point_t, FALSE);
 }
 }
 return NULL;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Revert Config dialog: Remove timezone-related code (UI only).

[Harald Judt]

Updating branch refs/heads/master
 to 22f612278466f00a95f2b41d093c04568fd0897b (commit)
   from e06203e457818903ffdd7ae8e57f7a50f0850f32 (commit)

commit 22f612278466f00a95f2b41d093c04568fd0897b
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 15:50:36 2013 +0100

Revert Config dialog: Remove timezone-related code (UI only).

This reverts commit 0e4a2bee11fb3ac73f65ee2e75704cd47bce1f63.

Conflicts:
panel-plugin/weather.c

 panel-plugin/weather-config.c |   51 ++--
 panel-plugin/weather-debug.c  |2 +
 panel-plugin/weather.c|   20 ++-
 3 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 9c83d50..e7097d6 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -272,7 +272,7 @@ cb_lookup_timezone(SoupSession *session,
 
 
 static void
-lookup_altitude(const gpointer user_data)
+lookup_altitude_timezone(const gpointer user_data)
 {
 xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
 gchar *url, *latstr, *lonstr;
@@ -292,6 +292,13 @@ lookup_altitude(const gpointer user_data)
cb_lookup_altitude, user_data);
 g_free(url);
 
+/* lookup timezone */
+url = g_strdup_printf(http://www.earthtools.org/timezone/%s/%s;,
+  latstr, lonstr);
+weather_http_queue_request(dialog-pd-session, url,
+   cb_lookup_timezone, user_data);
+g_free(url);
+
 g_free(lonstr);
 g_free(latstr);
 }
@@ -312,7 +319,7 @@ auto_locate_cb(const gchar *loc_name,
   string_to_double(lat, 0));
 gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog-spin_lon),
   string_to_double(lon, 0));
-lookup_altitude(user_data);
+lookup_altitude_timezone(user_data);
 } else
 gtk_entry_set_text(GTK_ENTRY(dialog-text_loc_name), _(Unset));
 setup_units(dialog, units);
@@ -359,7 +366,7 @@ cb_findlocation(GtkButton *button,
 }
 free_search_dialog(sdialog);
 
-lookup_altitude(user_data);
+lookup_altitude_timezone(user_data);
 gtk_widget_set_sensitive(GTK_WIDGET(button), TRUE);
 
 return FALSE;
@@ -452,6 +459,17 @@ spin_alt_value_changed(const GtkWidget *spin,
 }
 
 
+static void
+spin_timezone_value_changed(const GtkWidget *spin,
+gpointer user_data)
+{
+xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
+
+dialog-pd-timezone =
+gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
+}
+
+
 static GtkWidget *
 create_location_page(xfceweather_dialog *dialog)
 {
@@ -504,7 +522,7 @@ create_location_page(xfceweather_dialog *dialog)
 SET_TOOLTIP(dialog-spin_lat,
 _(Latitude specifies the north-south position of a point on 
   the Earth's surface. If you change this value manually, 
-  you should provide the correct altitude too.));
+  you need to provide altitude and timezone manually too.));
 label = gtk_label_new(°);
 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -518,7 +536,7 @@ create_location_page(xfceweather_dialog *dialog)
 SET_TOOLTIP(dialog-spin_lon,
 _(Longitude specifies the east-west position of a point on 
   the Earth's surface. If you change this value manually, 
-  you should provide the correct altitude too.));
+  you need to provide altitude and timezone manually too.));
 label = gtk_label_new(°);
 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
@@ -547,13 +565,28 @@ create_location_page(xfceweather_dialog *dialog)
 gtk_box_pack_start(GTK_BOX(hbox), dialog-label_alt_unit, FALSE, FALSE, 0);
 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, BORDER);
 
-/* instructions for correction of altitude */
+/* timezone */
+hbox = gtk_hbox_new(FALSE, BORDER);
+ADD_LABEL(_(_Timezone:), sg_label);
+ADD_SPIN(dialog-spin_timezone, -25, 25, 0.5,
+ dialog-pd-timezone, 1, sg_spin);
+SET_TOOLTIP
+(dialog-spin_timezone,
+ _(If the chosen location is not in your current timezone, this 
+   value which is auto-detected using the EarthTools web service 
+   will be used for correcting the time differences. Please adjust 
+   it manually to accomodate for daylight summer time or if it 
+   is not correct.));
+gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, BORDER);
+
+/* instructions for correction of altitude and timezone */
 hbox = gtk_hbox_new(FALSE, BORDER);
 label = gtk_label_new(NULL);
 gtk_label_set_markup
 (GTK_LABEL(label),
- _(\n\n\n\niPlease 

[Xfce4-commits] xfce4-weather-plugin:master Do not cache timezone.

[Harald Judt]

Updating branch refs/heads/master
 to bdb0324514f225eba8d23961ed401af922f108a4 (commit)
   from 22f612278466f00a95f2b41d093c04568fd0897b (commit)

commit bdb0324514f225eba8d23961ed401af922f108a4
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 15:53:10 2013 +0100

Do not cache timezone.

The times stored in the cache file are all UTC, so caching this value is 
useless.

 panel-plugin/weather.c |9 ++---
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 30ba298..6ffe5d6 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -989,9 +989,6 @@ write_cache_file(plugin_data *data)
 CACHE_APPEND(lon=%s\n, data-lon);
 g_string_append_printf(out, msl=%d\n, data-msl);
 g_string_append_printf(out, timeslices=%d\n, wd-timeslices-len);
-value = double_to_string(data-timezone, %.1f);
-CACHE_APPEND(timezone=%s\n, value);
-g_free(value);
 if (G_LIKELY(data-weather_update)) {
 value = format_date(data-weather_update-last, date_format, FALSE);
 CACHE_APPEND(last_weather_download=%s\n, value);
@@ -1095,7 +1092,7 @@ read_cache_file(plugin_data *data)
 struct tm cache_date_tm;
 gchar *file, *locname = NULL, *lat = NULL, *lon = NULL, *group = NULL;
 gchar *timestring;
-gdouble timezone, diff;
+gdouble diff;
 gint msl, num_timeslices = 0, i, j;
 
 g_assert(data != NULL);
@@ -1137,12 +1134,10 @@ read_cache_file(plugin_data *data)
 }
 msl = g_key_file_get_integer(keyfile, group, msl, err);
 if (!err)
-timezone = g_key_file_get_double(keyfile, group, timezone, err);
-if (!err)
 num_timeslices = g_key_file_get_integer(keyfile, group,
 timeslices, err);
 if (err || strcmp(lat, data-lat) || strcmp(lon, data-lon) ||
-msl != data-msl || timezone != data-timezone || num_timeslices  1) {
+msl != data-msl || num_timeslices  1) {
 CACHE_FREE_VARS();
 weather_debug(The required values are not present in the cache file 
   or do not match the current plugin data. Reading 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Config dialog: Make timezone a string and use GeoNames to detect it.

[Harald Judt]

Updating branch refs/heads/master
 to 8f7c31f3de85c8a973be2ca3d93eb963de0ef3c3 (commit)
   from bdb0324514f225eba8d23961ed401af922f108a4 (commit)

commit 8f7c31f3de85c8a973be2ca3d93eb963de0ef3c3
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 17:05:18 2013 +0100

Config dialog: Make timezone a string and use GeoNames to detect it.

GeoNames provides the timezoneId string that can be used to set the TZ
environment variable. This makes it much easier to fix the timezone problems
and saves us from all those tricky timezone calculation issues.

 panel-plugin/weather-config.c  |   65 +---
 panel-plugin/weather-config.h  |2 +-
 panel-plugin/weather-debug.c   |   20 
 panel-plugin/weather-parsers.c |   38 +++---
 panel-plugin/weather-parsers.h |9 ++
 panel-plugin/weather.c |   16 -
 panel-plugin/weather.h |2 +-
 7 files changed, 79 insertions(+), 73 deletions(-)

diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index e7097d6..eac0fd0 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -35,6 +35,7 @@
 #define OPTIONS_N 15
 #define BORDER 4
 #define LOC_NAME_MAX_LEN 50
+#define TIMEZONE_MAX_LEN 40
 
 #define ADD_PAGE(homogenous)\
 palign = gtk_alignment_new(0.5, 0.5, 1, 1); \
@@ -77,8 +78,8 @@
 g_signal_connect(G_OBJECT(button), clicked,   \
  G_CALLBACK(cb_func), dialog);
 
-#define SET_TOOLTIP(widget, text)   \
-gtk_widget_set_tooltip_text(GTK_WIDGET(widget), text);
+#define SET_TOOLTIP(widget, markup) \
+gtk_widget_set_tooltip_markup(GTK_WIDGET(widget), markup);
 
 #define TEXT_UNKNOWN(text) (text ? text : -)
 
@@ -255,19 +256,17 @@ cb_lookup_timezone(SoupSession *session,
 {
 xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
 xml_timezone *timezone;
-gdouble tz;
 
 timezone = (xml_timezone *)
 parse_xml_document(msg, (XmlParseFunc) parse_timezone);
 weather_dump(weather_dump_timezone, timezone);
 
 if (timezone) {
-tz = string_to_double(timezone-offset, -);
-if (tz != -)
-gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog-spin_timezone),
-  tz);
+gtk_entry_set_text(GTK_ENTRY(dialog-text_timezone),
+   timezone-timezone_id);
 xml_timezone_free(timezone);
-}
+} else
+gtk_entry_set_text(GTK_ENTRY(dialog-text_timezone), );
 }
 
 
@@ -293,8 +292,9 @@ lookup_altitude_timezone(const gpointer user_data)
 g_free(url);
 
 /* lookup timezone */
-url = g_strdup_printf(http://www.earthtools.org/timezone/%s/%s;,
-  latstr, lonstr);
+url = g_strdup_printf(http://api.geonames.org;
+  /timezone?lat=%slng=%susername=%s,
+  latstr, lonstr, GEONAMES_USERNAME);
 weather_http_queue_request(dialog-pd-session, url,
cb_lookup_timezone, user_data);
 g_free(url);
@@ -460,20 +460,21 @@ spin_alt_value_changed(const GtkWidget *spin,
 
 
 static void
-spin_timezone_value_changed(const GtkWidget *spin,
+text_timezone_changed(const GtkWidget *entry,
 gpointer user_data)
 {
 xfceweather_dialog *dialog = (xfceweather_dialog *) user_data;
 
-dialog-pd-timezone =
-gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
+if (dialog-pd-timezone)
+g_free(dialog-pd-timezone);
+dialog-pd-timezone = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
 }
 
 
 static GtkWidget *
 create_location_page(xfceweather_dialog *dialog)
 {
-GtkWidget *palign, *page, *hbox, *vbox, *label, *image;
+GtkWidget *palign, *page, *hbox, *vbox, *label, *image, *sep;
 GtkWidget *button_loc_change;
 GtkSizeGroup *sg_label, *sg_spin;
 
@@ -568,16 +569,32 @@ create_location_page(xfceweather_dialog *dialog)
 /* timezone */
 hbox = gtk_hbox_new(FALSE, BORDER);
 ADD_LABEL(_(_Timezone:), sg_label);
-ADD_SPIN(dialog-spin_timezone, -25, 25, 0.5,
- dialog-pd-timezone, 1, sg_spin);
+dialog-text_timezone = gtk_entry_new();
+gtk_entry_set_max_length(GTK_ENTRY(dialog-text_timezone),
+ LOC_NAME_MAX_LEN);
+gtk_label_set_mnemonic_widget(GTK_LABEL(label),
+  GTK_WIDGET(dialog-text_timezone));
 SET_TOOLTIP
-(dialog-spin_timezone,
- _(If the chosen location is not in your current timezone, this 
-   value which is auto-detected using the EarthTools web service 
-   will be used for correcting the time differences. Please adjust 
-   it manually to accomodate for daylight summer time or if it 
-   is not correct.));
+

[Xfce4-commits] xfce4-weather-plugin:master Save initial timezone for later usage.

[Harald Judt]

Updating branch refs/heads/master
 to 7c3beeff528b524d3c524ff69b660ef12ca592b3 (commit)
   from 8f7c31f3de85c8a973be2ca3d93eb963de0ef3c3 (commit)

commit 7c3beeff528b524d3c524ff69b660ef12ca592b3
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 17:36:22 2013 +0100

Save initial timezone for later usage.

Check if the TZ environment variable is set and save its value.
We might need to restore it later, in case the user doesn't provide
a valid timezone or leaves the timezone field in the config dialog empty.

 panel-plugin/weather-debug.c |2 ++
 panel-plugin/weather.c   |5 +
 panel-plugin/weather.h   |1 +
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/weather-debug.c b/panel-plugin/weather-debug.c
index a075ca3..6ced8c0 100644
--- a/panel-plugin/weather-debug.c
+++ b/panel-plugin/weather-debug.c
@@ -425,6 +425,7 @@ weather_dump_plugindata(const plugin_data *data)
  longitude: %s\n
  msl: %d\n
  timezone: %s\n
+ initial timezone: %s\n
  night time: %s\n
  \n
  icon theme dir: %s\n
@@ -459,6 +460,7 @@ weather_dump_plugindata(const plugin_data *data)
data-lon,
data-msl,
data-timezone,
+   data-timezone_initial,
YESNO(data-night_time),
(data-icon_theme) ? (data-icon_theme-dir) : NULL,
data-tooltip_style,
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 694447a..12360f1 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -1763,6 +1763,7 @@ xfceweather_free(XfcePanelPlugin *plugin,
 g_free(data-location_name);
 g_free(data-scrollbox_font);
 g_free(data-timezone);
+g_free(data-timezone_initial);
 
 /* free update infos */
 g_slice_free(update_info, data-weather_update);
@@ -1923,6 +1924,10 @@ weather_construct(XfcePanelPlugin *plugin)
 
 xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
 data = xfceweather_create_control(plugin);
+
+/* save initial timezone so we can reset it later */
+data-timezone_initial = g_strdup(g_getenv(TZ));
+
 xfceweather_read_config(plugin, data);
 read_cache_file(data);
 scrollbox_set_visible(data);
diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
index 317960a..e8250e8 100644
--- a/panel-plugin/weather.h
+++ b/panel-plugin/weather.h
@@ -99,6 +99,7 @@ typedef struct {
 gchar *lon;
 gint msl;
 gchar *timezone;
+gchar *timezone_initial;
 gint cache_file_max_age;
 gboolean night_time;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Use timezone provided in config dialog.

[Harald Judt]

Updating branch refs/heads/master
 to 12cfe8cb47126c869b5efd0a760f9f44b0b9c7ae (commit)
   from 7c3beeff528b524d3c524ff69b660ef12ca592b3 (commit)

commit 12cfe8cb47126c869b5efd0a760f9f44b0b9c7ae
Author: Harald Judt h.j...@gmx.at
Date:   Thu Jan 31 18:12:35 2013 +0100

Use timezone provided in config dialog.

If the timezone entry is empty, use the initial timezone, else use
the timezone provided. If it is an invalid entry, then most likely
UTC will be used, but that may depend on the system.

 panel-plugin/weather-config.c |1 +
 panel-plugin/weather.c|   19 +++
 panel-plugin/weather.h|2 ++
 3 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index eac0fd0..5145467 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -468,6 +468,7 @@ text_timezone_changed(const GtkWidget *entry,
 if (dialog-pd-timezone)
 g_free(dialog-pd-timezone);
 dialog-pd-timezone = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+schedule_delayed_data_update(dialog);
 }
 
 
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 12360f1..9db161d 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -261,6 +261,20 @@ get_tooltip_icon_size(plugin_data *data)
 
 
 void
+update_timezone(plugin_data *data)
+{
+if (data-timezone  strlen(data-timezone)  0)
+g_setenv(TZ, data-timezone, TRUE);
+else {
+if (data-timezone_initial  strlen(data-timezone_initial)  0)
+g_setenv(TZ, data-timezone_initial, TRUE);
+else
+g_unsetenv(TZ);
+}
+}
+
+
+void
 update_icon(plugin_data *data)
 {
 GdkPixbuf *icon;
@@ -1289,6 +1303,10 @@ update_weatherdata_with_reset(plugin_data *data, 
gboolean clear)
 data-update_timer = 0;
 }
 
+/* set location timezone */
+if (clear)
+update_timezone(data);
+
 /* reset update times */
 init_update_infos(data);
 
@@ -1929,6 +1947,7 @@ weather_construct(XfcePanelPlugin *plugin)
 data-timezone_initial = g_strdup(g_getenv(TZ));
 
 xfceweather_read_config(plugin, data);
+update_timezone(data);
 read_cache_file(data);
 scrollbox_set_visible(data);
 gtk_scrollbox_set_fontname(GTK_SCROLLBOX(data-scrollbox),
diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
index e8250e8..5b5e084 100644
--- a/panel-plugin/weather.h
+++ b/panel-plugin/weather.h
@@ -127,6 +127,8 @@ void forecast_click(GtkWidget *widget,
 
 gchar *get_cache_directory(void);
 
+void update_timezone(plugin_data *data);
+
 void update_icon(plugin_data *data);
 
 void update_scrollbox(plugin_data *data,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Summary window: Print current time at the location next to the name.

[Harald Judt]

Updating branch refs/heads/master
 to 9ddb59e8eff39ac7cde3df61bf13b9097bea1434 (commit)
   from 12cfe8cb47126c869b5efd0a760f9f44b0b9c7ae (commit)

commit 9ddb59e8eff39ac7cde3df61bf13b9097bea1434
Author: Harald Judt h.j...@gmx.at
Date:   Fri Feb 1 14:12:05 2013 +0100

Summary window: Print current time at the location next to the name.

Now the plugin can be used as a world clock too ;-)

 panel-plugin/weather-summary.c |   45 +++
 panel-plugin/weather-summary.h |2 +
 panel-plugin/weather.c |   10 
 panel-plugin/weather.h |1 +
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index b03da45..67ff2c1 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -29,7 +29,6 @@
 #include weather-translate.h
 #include weather-icon.h
 
-
 static gboolean
 lnk_clicked(GtkTextTag *tag,
 GObject *obj,
@@ -980,13 +979,50 @@ cb_notebook_page_switched(GtkNotebook *notebook,
 }
 
 
+gboolean
+update_summary_subtitle(plugin_data *data)
+{
+time_t now_t;
+GTimeVal now;
+gchar *title, *date;
+guint update_interval;
+gint64 now_ms;
+
+if (data-summary_update_timer) {
+g_source_remove(data-update_timer);
+data-summary_update_timer = 0;
+}
+
+if (G_UNLIKELY(data-location_name == NULL) ||
+G_UNLIKELY(data-summary_window == NULL))
+return FALSE;
+
+time(now_t);
+date = format_date(now_t, %Y-%m-%d %H:%M:%S %Z, TRUE);
+title = g_strdup_printf(%s\n%s, data-location_name, date);
+g_free(date);
+xfce_titled_dialog_set_subtitle(XFCE_TITLED_DIALOG(data-summary_window),
+title);
+g_free(title);
+
+/* compute and schedule the next update */
+g_get_current_time(now);
+now_ms = ((gint64) now.tv_sec * 1000) + ((gint64) now.tv_usec / 1000);
+update_interval = 1000 - (now_ms % 1000) + 1;
+data-summary_update_timer =
+g_timeout_add(update_interval, (GSourceFunc) update_summary_subtitle,
+  data);
+return FALSE;
+}
+
+
 GtkWidget *
 create_summary_window(plugin_data *data)
 {
 GtkWidget *window, *notebook, *vbox, *hbox, *label;
-gchar *title, *symbol;
 GdkPixbuf *icon;
 xml_time *conditions;
+gchar *title, *symbol;
 
 conditions = get_current_conditions(data-weatherdata);
 window = xfce_titled_dialog_new_with_buttons(_(Weather Report),
@@ -994,12 +1030,11 @@ create_summary_window(plugin_data *data)
  GTK_DIALOG_NO_SEPARATOR,
  GTK_STOCK_CLOSE,
  GTK_RESPONSE_ACCEPT, NULL);
-if (data-location_name != NULL) {
-title = g_strdup_printf(%s, data-location_name);
+if (G_LIKELY(data-location_name != NULL)) {
+title = g_strdup_printf(%s\n, data-location_name);
 xfce_titled_dialog_set_subtitle(XFCE_TITLED_DIALOG(window), title);
 g_free(title);
 }
-
 vbox = gtk_vbox_new(FALSE, 0);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)-vbox), vbox, TRUE, TRUE, 0);
 
diff --git a/panel-plugin/weather-summary.h b/panel-plugin/weather-summary.h
index 5434fa2..6b06429 100644
--- a/panel-plugin/weather-summary.h
+++ b/panel-plugin/weather-summary.h
@@ -23,6 +23,8 @@ G_BEGIN_DECLS
 
 GtkWidget *create_summary_window(plugin_data *data);
 
+gboolean update_summary_subtitle(plugin_data *data);
+
 void summary_details_free(summary_details *sum);
 
 G_END_DECLS
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 9db161d..9739ee2 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -1353,6 +1353,12 @@ close_summary(GtkWidget *widget,
 data-summary_details = NULL;
 data-summary_window = NULL;
 
+/* deactivate the summary window update timer */
+if (data-summary_update_timer) {
+g_source_remove(data-update_timer);
+data-summary_update_timer = 0;
+}
+
 /* sync toggle button state */
 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data-button), FALSE);
 }
@@ -1371,6 +1377,10 @@ forecast_click(GtkWidget *widget,
 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data-button), TRUE);
 
 data-summary_window = create_summary_window(data);
+
+/* start the summary window subtitle update timer */
+update_summary_subtitle(data);
+
 g_signal_connect(G_OBJECT(data-summary_window), destroy,
  G_CALLBACK(close_summary), data);
 gtk_widget_show_all(data-summary_window);
diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
index 5b5e084..d0da2ca 100644
--- a/panel-plugin/weather.h
+++ b/panel-plugin/weather.h
@@ -84,6 +84,7 @@ typedef struct {
 time_t next_wakeup;
 gchar *next_wakeup_reason;
 guint update_timer;
+guint 

[Xfce4-commits] xfce4-weather-plugin:master Remove unused variables from set_orientation/set_mode code.

[Harald Judt]

Updating branch refs/heads/master
 to c62d44df2bfdbb2234649722b19b57592552f32e (commit)
   from 4283fc699837378a1e7fca878da5c07d8f71ce24 (commit)

commit c62d44df2bfdbb2234649722b19b57592552f32e
Author: Harald Judt h.j...@gmx.at
Date:   Fri Feb 1 16:08:02 2013 +0100

Remove unused variables from set_orientation/set_mode code.

 panel-plugin/weather.c |4 
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 9739ee2..00f1264 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -1835,8 +1835,6 @@ xfceweather_set_mode(XfcePanelPlugin *panel,
  XfcePanelPluginMode mode,
  plugin_data *data)
 {
-GtkWidget *parent = gtk_widget_get_parent(data-vbox_center_scrollbox);
-
 data-panel_orientation = xfce_panel_plugin_get_mode(panel);
 data-orientation = (mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL)
 ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
@@ -1877,8 +1875,6 @@ xfceweather_set_orientation(XfcePanelPlugin *panel,
 GtkOrientation orientation,
 plugin_data *data)
 {
-GtkWidget *parent = gtk_widget_get_parent(data-vbox_center_scrollbox);
-
 data-orientation = GTK_ORIENTATION_HORIZONTAL;
 data-panel_orientation = orientation;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Summary window: Add credits for GeoNames.

[Harald Judt]

Updating branch refs/heads/master
 to 4283fc699837378a1e7fca878da5c07d8f71ce24 (commit)
   from 9ddb59e8eff39ac7cde3df61bf13b9097bea1434 (commit)

commit 4283fc699837378a1e7fca878da5c07d8f71ce24
Author: Harald Judt h.j...@gmx.at
Date:   Fri Feb 1 09:30:06 2013 +0100

Summary window: Add credits for GeoNames.

 panel-plugin/weather-summary.c |   28 +---
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 67ff2c1..06679ba 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -319,7 +319,7 @@ create_summary_tab(plugin_data *data)
 {
 GtkTextBuffer *buffer;
 GtkTextIter iter;
-GtkTextTag *btag, *ltag0, *ltag1, *ltag2;
+GtkTextTag *btag, *ltag_img, *ltag_metno, *ltag_wiki, *ltag_geonames;
 GtkWidget *view, *frame, *scrolled, *icon;
 GtkAdjustment *adj;
 GdkColor lnk_color;
@@ -521,19 +521,25 @@ create_summary_tab(plugin_data *data)
 
 /* credits */
 gdk_color_parse(#ff, lnk_color);
-ltag0 = gtk_text_buffer_create_tag(buffer, lnk0,
-   foreground-gdk, lnk_color, NULL);
-ltag1 = gtk_text_buffer_create_tag(buffer, lnk1,
-   foreground-gdk, lnk_color, NULL);
-ltag2 = gtk_text_buffer_create_tag(buffer, lnk2,
-   foreground-gdk, lnk_color, NULL);
+ltag_img = gtk_text_buffer_create_tag(buffer, lnk0, foreground-gdk,
+  lnk_color, NULL);
+ltag_metno = gtk_text_buffer_create_tag(buffer, lnk1, foreground-gdk,
+lnk_color, NULL);
+ltag_wiki = gtk_text_buffer_create_tag(buffer, lnk2, foreground-gdk,
+   lnk_color, NULL);
+ltag_geonames = gtk_text_buffer_create_tag(buffer, lnk3,
+   foreground-gdk,
+   lnk_color, NULL);
 APPEND_BTEXT(_(\nCredits\n));
 APPEND_LINK_ITEM(_(\tEncyclopedic information partly taken from\n\t\t),
- _(Wikipedia), http://wikipedia.org;, ltag2);
+ _(Wikipedia), http://wikipedia.org;, ltag_wiki);
+APPEND_LINK_ITEM(_(\n\tElevation and timezone data provided by\n\t\t),
+ _(GeoNames),
+ http://geonames.org/;, ltag_geonames);
 APPEND_LINK_ITEM(_(\n\tWeather and astronomical data from\n\t\t),
  _(The Norwegian Meteorological Institute),
- http://met.no/;, ltag1);
-g_object_set_data_full(G_OBJECT(ltag0), url,   /* url for image */
+ http://met.no/;, ltag_metno);
+g_object_set_data_full(G_OBJECT(ltag_img), url,   /* url for image */
g_strdup(http://met.no;), g_free);
 
 g_signal_connect(G_OBJECT(view), motion-notify-event,
@@ -558,7 +564,7 @@ create_summary_tab(plugin_data *data)
 g_signal_connect(G_OBJECT(view), size_allocate,
  G_CALLBACK(view_size_allocate_cb), sum);
 g_signal_connect(G_OBJECT(sum-icon_ebox), button-release-event,
- G_CALLBACK(icon_clicked), ltag0);
+ G_CALLBACK(icon_clicked), ltag_img);
 g_signal_connect(G_OBJECT(sum-icon_ebox), enter-notify-event,
  G_CALLBACK(icon_motion_notify), sum);
 g_signal_connect(G_OBJECT(sum-icon_ebox), motion-notify-event,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Update README, NEWS and TODO.

[Harald Judt]

Updating branch refs/heads/master
 to bf102201e958c2896595a2d78522a0dc657ad217 (commit)
   from c62d44df2bfdbb2234649722b19b57592552f32e (commit)

commit bf102201e958c2896595a2d78522a0dc657ad217
Author: Harald Judt h.j...@gmx.at
Date:   Fri Feb 1 10:10:57 2013 +0100

Update README, NEWS and TODO.

 NEWS   |9 +
 README |   16 +++-
 TODO   |   12 ++--
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/NEWS b/NEWS
index 00cc775..21f4bb1 100644
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,15 @@
   location. In short, only data for the end of the current interval
   will be shown as earlier data is not provided by the forecast
   service.
+- Fix/work around timezone problems by /moving/ the plugin into
+  another timezone. This makes the plugin show local times of the
+  chosen location and probably fixes other bugs that might occur
+  when the user changes the timezone (bug #9524).
 - Add a proper About dialog (bug #9379).
+- Use panel toggle button instead of an event box as the main plugin
+  container, to indicate whether forecast window is open or closed,
+  and to give better UI feedback for the user. This is similar to
+  other plugins like the datetime plugin.
 - Remove info button from summary window.
 - Remove forecast entry from plugin context menu (bug #9319).
 - Remember last selected tab in config and summary windows. However,
@@ -108,6 +116,7 @@
   easier discernable.
 - New icon theme: Liquid Dark, a variation of the liquid icon theme
   better suited for dark panels.
+- Improvements for translators of RTL languages.
 - Use GArrays for storing timeslices and glib data structures in many
   other places to improve portability and maintenance.
 - Rewrite and refactor most code, fixing and protecting against
diff --git a/README b/README
index b310a61..db3c0d0 100644
--- a/README
+++ b/README
@@ -61,13 +61,13 @@ INFORMATION FOR PACKAGE MAINTAINERS AND DISTRIBUTORS
 ==
 If you're going to distribute this package, please be so kind and set
 the GEONAMES_USERNAME configure option for the GeoNames web service
-which is used for altitude detection. GeoNames requires you to
-register an account and limits requests on a per-hour and per-day
-basis to prevent misuse of their service. There are no other
+which is used for altitude and timezone detection. GeoNames requires
+you to register an account and limits requests on a per-hour and
+per-day basis to prevent misuse of their service. There are no other
 restrictions and registration is free, uncomplicated and takes less
 than a minute (http://www.geonames.org/export/web-services.html).
-Performing these steps will ensure the altitude detection continues
-to work for all users of the plugin.
+Performing these steps will ensure automatic altitude and timezone
+detection are kept operational for all users of the plugin.
 
 
 MET.NO API DOCUMENTATION
@@ -222,6 +222,12 @@ There is other useful documentation available on this 
topic, try this
 wiki page for a start:
 https://wiki.xfce.org/translations/translation_guidance_in_xfce
 
+TRANSLATORS, PLEASE MAKE SURE YOU CHECK YOUR FILE FOR ERRORS BEFORE
+UPLOADING IT! Otherwise, it will break compilation of the plugin. It
+is easy to do this with the following command (where file.po is the po
+file of your language):
+msgfmt -c --check-accelerators=_ -v -o /dev/null file.po
+
 This plugin provides a lot of descriptions via the tooltips in the
 config dialog. These aim to give short, but interesting explanations
 for the various units and available values. While the conventions
diff --git a/TODO b/TODO
index 032fd33..4b949a6 100644
--- a/TODO
+++ b/TODO
@@ -4,28 +4,19 @@ categories, but not prioritized or mandatory.
 Maintenance and optimizing stuff
 ==
 * Use upower for power saving mode (e.g. stop scrollbox animations).
-* Use the Xfce hvbox (maybe, need to check).
-* Search for alternative to tabs used for aligning in tooltips and
-  details tab. Using tabs doesn't work for users of bigger font sizes
-  or different fonts. PangoLayout has a set tabs function, perhaps
-  that could be of help here.
 
 Data
 ==
 * Use HTTP status codes to warn in time about API changes.
   - already reported in panel output, maybe in details tab too?
 * Use XML next run to schedule data downloads.
-* Rewrite all time-related stuff to be in GMT. Then recalculate the
-  times for the destination timezone. glib provides tools for this,
-  but only beginning with 2.26. Code for determining the timezone of
-  a location is already implemented but temporarily deactivated.
 * Use openweathermap.org for live/historical data when it is a bit
   more developed. Maybe check it again in a year or so, or wait until
   other (open) providers pop up. For the time being, met.no should be
   

[Xfce4-commits] xfce4-weather-plugin:master Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-weather-plugin

[Harald Judt]

Updating branch refs/heads/master
 to bc850d71e9b4527631b32d967756f796dfd8fb8e (commit)
   from bf102201e958c2896595a2d78522a0dc657ad217 (commit)

commit bc850d71e9b4527631b32d967756f796dfd8fb8e
Merge: bf10220 5154610
Author: Harald Judt h.j...@gmx.at
Date:   Fri Feb 1 16:17:48 2013 +0100

Merge branch 'master' of 
git://git.xfce.org/panel-plugins/xfce4-weather-plugin

commit 51546104edb4fa2e20b4db85eec91d27cdae791c
Author: Piotr Sokół pso...@jabster.pl
Date:   Fri Feb 1 10:47:12 2013 +0100

l10n: Updated Polish (pl) translation to 94%

New status: 301 messages complete with 1 fuzzy and 17 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pl.po |   24 ++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index bf6c0be..59ba5ae 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: xfce4-weather-plugin 0.8.3\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-29 11:33+0100\n
-PO-Revision-Date: 2013-01-30 11:16+0100\n
+PO-Revision-Date: 2013-02-01 10:45+0100\n
 Last-Translator: Piotr Sokół pso...@jabster.pl\n
 Language-Team: polski \n
 Language: \n
@@ -87,6 +87,11 @@ msgid 
 working within a few month. Please file a bug on https://bugzilla.xfce.org 
 if no one else has done so yet.
 msgstr 
+Interfejs sunrise API serwisu met.no odebrał komunikat informujący, że 
+bieżąca wersja usługi sieciowej jest przestarzała. Aplet wymaga wprowadzenia 
+zmian, aby móc używać nowej wersji usługi. W przeciwnym razie wtyczka 
+przestanie działać w przeciągu najbliższego czasu. Proszę zgłosić błąd na 
+stronie https://bugzilla.xfce.org, jeśli nie został on jeszcze odnotowany.
 
 #: panel-plugin/weather.c:466
 msgid Error parsing astronomical data!
@@ -108,6 +113,12 @@ msgid 
 will stop working within a few month. Please file a bug on https://bugzilla.;
 xfce.org if no one else has done so yet.
 msgstr 
+Interfejs LocationforecastLTS API serwisu met.no odebrał komunikat 
+informujący, że bieżąca wersja usługi sieciowej jest przestarzała. Aplet 
+wymaga wprowadzenia zmian, aby móc używać nowej wersji usługi. W przeciwnym 
+razie wtyczka przestanie działać w przeciągu najbliższego czasu. Proszę 
+zgłosić błąd na stronie https://bugzilla.xfce.org, jeśli nie został on 
+jeszcze odnotowany.
 
 #: panel-plugin/weather.c:535
 msgid Error parsing weather data!
@@ -502,18 +513,22 @@ msgstr 
 #: panel-plugin/weather-config.c:696
 msgid Wind speeds in TV or in the news are often provided in km/h.
 msgstr 
+Wypisuje wskazania prędkości wiatru w kilometrach na godzinę. Jednostka 
+często stosowana w telewizyjnych komunikatach pogodowych.
 
 #: panel-plugin/weather-config.c:700
 msgid 
 Miles per hour is an imperial unit of speed expressing the number of statute 
 miles covered in one hour.
-msgstr 
+msgstr Wypisuje wskazania prędkości wiatru w milach angielskich na godzinę.
 
 #: panel-plugin/weather-config.c:704
 msgid 
 Meter per second is ithe/i unit typically used by meteorologists to 
 denote wind speeds.
 msgstr 
+Wypisuje wskazania prędkości wiatru w metrach na sekundę. Jednostka 
+zazwyczaj używana w meteorologii.
 
 #: panel-plugin/weather-config.c:708
 msgid 
@@ -561,6 +576,11 @@ msgid 
 industry is one of the few areas where the foot is widely used outside the 
 English-speaking world.
 msgstr 
+Wypisuje wskazania wysokości bezwzględnej w stopach. Jednostka długości 
+używana w brytyjskim systemie miar jak i systemie miar Stanów Zjednoczonych. 
+Jedna stopa wynosi 0,3048 m i dzieli się dokładnie na 12 cali. Jednym z 
+nielicznych przykładów używania tej jednostki poza krajami anglojęzycznymi 
+jest pomiar wysokości w awiacji.
 
 #: panel-plugin/weather-config.c:831
 msgid 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated German (de) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 8855332364cd581ce792cd2dce057d492b4c08fa (commit)
   from c1ed26e3fadc7344f545991d2224878f91228e17 (commit)

commit 8855332364cd581ce792cd2dce057d492b4c08fa
Author: Harald Judt h.j...@gmx.at
Date:   Fri Feb 1 16:25:56 2013 +0100

l10n: Updated German (de) translation to 100%

New status: 324 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/de.po |   35 ---
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/po/de.po b/po/de.po
index 8cccd9c..f6aadbd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-weather-plugin 0.6.0\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-02-01 16:19+0100\n
-PO-Revision-Date: 2013-01-28 23:57+0100\n
+POT-Creation-Date: 2013-02-01 16:24+0100\n
+PO-Revision-Date: 2013-02-01 16:21+0100\n
 Last-Translator: Harald Judt h.j...@gmx.at\n
 Language-Team: German xfce-i...@xfce.org\n
 Language: de\n
@@ -353,10 +353,9 @@ msgstr Suche nach einem Ort und erkenne seine Koordinaten 
automatisch.
 
 #: ../panel-plugin/weather-config.c:521
 msgid Latitud_e:
-msgstr _Breitengrad
+msgstr _Breitengrad:
 
 #: ../panel-plugin/weather-config.c:525
-#, fuzzy
 msgid 
 Latitude specifies the north-south position of a point on the Earth's 
 surface. If you change this value manually, you need to provide altitude and 
@@ -364,14 +363,13 @@ msgid 
 msgstr 
 Der Breitengrad gibt die Nord-Süd Position eines Punktes auf der 
 Erdoberfläche an. Wenn Sie diesen Wert manuell ändern, sollten Sie auch die 
-korrekte Höhenlage angeben.
+korrekte Höhenlage und die Zeitzone angeben.
 
 #: ../panel-plugin/weather-config.c:535
 msgid L_ongitude:
 msgstr _Längengrad:
 
 #: ../panel-plugin/weather-config.c:539
-#, fuzzy
 msgid 
 Longitude specifies the east-west position of a point on the Earth's 
 surface. If you change this value manually, you need to provide altitude and 
@@ -379,7 +377,7 @@ msgid 
 msgstr 
 Der Längengrad gibt die Ost-West Position eines Punktes auf der 
 Erdoberfläche an. Wenn Sie diesen Wert manuell ändern, sollten Sie auch die 
-korrekte Höhenlage angeben.
+korrekte Höhenlage und die Zeitzone angeben.
 
 #: ../panel-plugin/weather-config.c:549 ../panel-plugin/weather-config.c:1000
 msgid Altitu_de:
@@ -416,7 +414,7 @@ msgstr 
 
 #: ../panel-plugin/weather-config.c:572
 msgid _Timezone:
-msgstr 
+msgstr _Zeitzone:
 
 #: ../panel-plugin/weather-config.c:580
 msgid 
@@ -427,19 +425,23 @@ msgid 
 Leave this field empty to use the timezone set by your system. Invalid 
 entries will cause the use of UTC time, but may also depend on your system.
 msgstr 
+Wenn sich der gewählte Ort nicht in der gegenwärtigen Zeitzone befindet, ist 
+es notwendig, das Plugin in diese andere Zeitzone zu iversetzen/i, damit 
+die Zeiten richtig angezeigt werden. Wenn die richtige Zeitzone nicht über 
+das GeoNames Webservice automatisch ermittelt werden konnte, korrigieren Sie 
+den Eintrag bitte manuell.\n
+Lassen Sie das Feld leer, um die vom System vorgegebene Zeitzone zu 
+verwenden. Ein ungültiger Eintrag bewirkt normalerweise die Verwendung von 
+UTC-Zeit, dies ist aber möglicherweise abhängig vom System.
 
 #: ../panel-plugin/weather-config.c:605
-#, fuzzy
 msgid 
 iPlease change location name to your liking and correct\n
 altitude and timezone if they are not auto-detected correctly./i
 msgstr 
-\n
-\n
-\n
-\n
 iBitte ändern Sie die Bezeichnung nach Belieben und\n
-korrigieren Sie bei Bedarf die automatisch erkannte Höhenlage./i
+korrigieren Sie bei Bedarf die automatisch erkannte Höhenlage\n
+und Zeitzone./i
 
 #: ../panel-plugin/weather-config.c:630
 msgid 
@@ -1860,10 +1862,13 @@ msgid 
 \tElevation and timezone data provided by\n
 \t\t
 msgstr 
+\n
+\tHöhenlage- und Zeitzonendaten zur Verfügung gestellt von\n
+\t\t
 
 #: ../panel-plugin/weather-summary.c:537
 msgid GeoNames
-msgstr 
+msgstr GeoNames
 
 #: ../panel-plugin/weather-summary.c:539
 msgid 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Don't use granite_widgets_about_dialog_new

[Christian Dywan]

Updating branch refs/heads/master
 to cf4029aef4fd9416467cb07c9ef2e31e10bfc414 (commit)
   from 378ab74670a4e12dd59854efb42d25a4c30757ae (commit)

commit cf4029aef4fd9416467cb07c9ef2e31e10bfc414
Author: Christian Dywan christ...@twotoasts.de
Date:   Fri Feb 1 18:01:01 2013 +0100

Don't use granite_widgets_about_dialog_new

 midori/midori-browser.c |   24 
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 725fc6a..b229e9e 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2468,14 +2468,6 @@ _action_add_news_feed_activate (GtkAction* action,
 }
 
 static void
-_action_compact_add_response_cb (GtkWidget* dialog,
- gint   response,
- gpointer   data)
-{
-gtk_widget_destroy (dialog);
-}
-
-static void
 _action_compact_add_activate (GtkAction* action,
   MidoriBrowser* browser)
 {
@@ -2510,8 +2502,8 @@ _action_compact_add_activate (GtkAction* action,
 }
 
 gtk_widget_show (dialog);
-g_signal_connect (dialog, response,
-  G_CALLBACK (_action_compact_add_response_cb), 
NULL);
+g_signal_connect_swapped (dialog, response,
+  G_CALLBACK (gtk_widget_destroy), dialog);
 }
 
 static void
@@ -4726,16 +4718,21 @@ _action_about_activate (GtkAction* action,
 #endif
 #ifdef HAVE_GRANITE
 gchar* docs = midori_browser_get_docs (FALSE);
-granite_widgets_show_about_dialog (GTK_WINDOW (browser),
+/* Avoid granite_widgets_show_about_dialog for invalid memory and crashes 
*/
+/* FIXME: granite: should return GtkWidget* like GTK+ */
+GtkWidget* dialog = (GtkWidget*)granite_widgets_about_dialog_new ();
+g_object_set (dialog,
 translate, https://translations.xfce.org/projects/p/midori/;,
 bug, PACKAGE_BUGREPORT,
 help, docs,
 copyright, 2007-2012 Christian Dywan,
 #else
-gtk_show_about_dialog (GTK_WINDOW (browser),
+GtkWidget* dialog = gtk_about_dialog_new ();
+g_object_set (dialog,
 wrap-license, TRUE,
 copyright, Copyright © 2007-2012 Christian Dywan,
 #endif
+transient-for, browser,
 logo-icon-name, gtk_window_get_icon_name (GTK_WINDOW (browser)),
 program-name, PACKAGE_NAME,
 version, PACKAGE_VERSION,
@@ -4751,6 +4748,9 @@ _action_about_activate (GtkAction* action,
 #ifdef HAVE_GRANITE
 g_free (docs);
 #endif
+gtk_widget_show (dialog);
+g_signal_connect_swapped (dialog, response,
+  G_CALLBACK (gtk_widget_destroy), dialog);
 }
 
 static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] midori:master Don't shadow icon_name in midori_search_action_set_entry_icon

[Christian Dywan]

Updating branch refs/heads/master
 to 453a38b93dc710f4895270bf38f525aa0942fb5f (commit)
   from cf4029aef4fd9416467cb07c9ef2e31e10bfc414 (commit)

commit 453a38b93dc710f4895270bf38f525aa0942fb5f
Author: Paweł Forysiuk tuxa...@o2.pl
Date:   Fri Feb 1 18:05:43 2013 +0100

Don't shadow icon_name in midori_search_action_set_entry_icon

 midori/midori-searchaction.c |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 2381f95..7cdee9a 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -486,8 +486,6 @@ midori_search_action_set_entry_icon (MidoriSearchAction* 
search_action,
 
 if (search_action-current_item)
 {
-const gchar* icon_name;
-
 if ((icon = katze_item_get_pixbuf (search_action-current_item, 
entry)))
 {
 gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (entry), 
GTK_ENTRY_ICON_PRIMARY, icon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Portuguese (pt) translation to None%

[Transifex]

Updating branch refs/heads/master
 to 626ef4a9f32d725594492755326a81c6640046cb (commit)
   from 8855332364cd581ce792cd2dce057d492b4c08fa (commit)

commit 626ef4a9f32d725594492755326a81c6640046cb
Author: Sergio Marques smarque...@gmail.com
Date:   Sat Feb 2 01:09:41 2013 +0100

l10n: Updated Portuguese (pt) translation to None%

New status: 0 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  129 +-
 1 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 989e800..eb62bf2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Nuno Miguel nu...@netcabo.pt, 2007.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: weather-plugin\n
@@ -11,12 +11,12 @@ msgstr 
 PO-Revision-Date: 2013-01-22 10:08-\n
 Last-Translator: Sérgio Marques smarque...@gmail.com\n
 Language-Team: \n
-Language: pt_PT\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=2; plural=(n  1);\n
+Language: pt_PT\n
 X-Generator: Poedit 1.5.4\n
+Plural-Forms: nplurals=2; plural=(n  1);\n
 
 #. TRANSLATORS: Keep in sync with labeloptions in weather-config.c
 #: ../panel-plugin/weather.c:116
@@ -166,10 +166,9 @@ msgstr Hoje, o sol não se põe.
 msgid The sun rises at %s and sets at %s.
 msgstr O sol nasce às %s e põe-se às %s.
 
-#.
 #. * TRANSLATORS: This is the simple tooltip. For a bigger challenge,
 #. * look at the verbose tooltip style further below ;-)
-#.
+#. 
 #: ../panel-plugin/weather.c:1563
 #, c-format
 msgid 
@@ -189,7 +188,6 @@ msgstr 
 bPressão:/b %s\n
 bHumidade:/b %s\n
 
-#.
 #. * TRANSLATORS: Re-arrange and align at will, optionally using
 #. * abbreviations for labels if desired or necessary. Just take
 #. * into account the possible size constraints, the centered
@@ -197,7 +195,7 @@ msgstr 
 #. * be changed easily - and try to make it compact and look
 #. * good! The missing space after %son the ... is intentional,
 #. * it is included in the %s.
-#.
+#. 
 #: ../panel-plugin/weather.c:1587
 #, c-format
 msgid 
@@ -236,11 +234,9 @@ msgid Show weather conditions and forecasts
 msgstr Mostrar condições meteorológicas e previsões
 
 #: ../panel-plugin/weather.c:1927
-#, fuzzy
 msgid Copyright (c) 2003-2013\n
-msgstr Direitos de autor (c) 2003-2012\n
+msgstr Direitos de autor (c) 2003-2013\n
 
-#.
 #. * TRANSLATORS: The abbreviations in parentheses will be shown in
 #. * the scrollbox together with the values. Keep them in sync with
 #. * those in make_label() in weather.c. Some of them may be
@@ -248,7 +244,7 @@ msgstr Direitos de autor (c) 2003-2012\n
 #. * read that up somewhere and decide whether you want to use them
 #. * or not. In general, though, you should just try to choose
 #. * letter(s) that make sense and don't use up too much space.
-#.
+#. 
 #: ../panel-plugin/weather-config.c:96
 msgid Temperature (T)
 msgstr Temperatura (T)
@@ -420,7 +416,6 @@ msgid 
 msgstr 
 
 #: ../panel-plugin/weather-config.c:605
-#, fuzzy
 msgid 
 iPlease change location name to your liking and correct\n
 altitude and timezone if they are not auto-detected correctly./i
@@ -562,11 +557,10 @@ msgid 
 English-speaking world.
 msgstr 
 
-#.
 #. * TRANSLATORS: The Summer Simmer Index is similar to the heat
 #. * index, but usually used at night because of its better accuracy
 #. * at that time.
-#.
+#. 
 #: ../panel-plugin/weather-config.c:882
 msgid 
 Used in North America, wind chill will be reported for low temperatures and 
@@ -613,7 +607,6 @@ msgid _Temperature:
 msgstr _Temperatura:
 
 #: ../panel-plugin/weather-config.c:954
-#, fuzzy
 msgid Celsius (°C)
 msgstr Celsius (°C)
 
@@ -622,9 +615,8 @@ msgid Fahrenheit (°F)
 msgstr Fahrenheit (°F)
 
 #: ../panel-plugin/weather-config.c:960
-#, fuzzy
 msgid Barometric _pressure:
-msgstr Pressão barométrica
+msgstr _Pressão barométrica
 
 #: ../panel-plugin/weather-config.c:963
 msgid Hectopascals (hPa)
@@ -796,9 +788,8 @@ msgid Days in rows
 msgstr Dias em linhas
 
 #: ../panel-plugin/weather-config.c:1218
-#, fuzzy
 msgid _Number of forecast days:
-msgstr N.º de dias da previsão:
+msgstr _N.º de dias da previsão:
 
 #: ../panel-plugin/weather-config.c:1223
 #, c-format
@@ -1036,9 +1027,8 @@ msgstr 
 
 #. values to show at once (multiple lines)
 #: ../panel-plugin/weather-config.c:1740
-#, fuzzy
 msgid Li_nes:
-msgstr L_inhas:
+msgstr Li_nhas:
 
 #: ../panel-plugin/weather-config.c:1746
 msgid 
@@ -1073,9 +1063,8 @@ msgstr 
 redefinir a cor do texto da caixa.
 
 #: ../panel-plugin/weather-config.c:1795
-#, fuzzy
 msgid Labels to d_isplay
-msgstr Campos a e_xibir
+msgstr Campos a ex_ibir
 
 #: ../panel-plugin/weather-config.c:1798
 msgid 
@@ -,7 +1100,6 @@ msgstr 
 
 #. button move up
 #: 

[Xfce4-commits] midori:master Use g_signal_connect_swapped with gtk_widget_destroy

[Christian Dywan]

Updating branch refs/heads/master
 to 3611f1ba163e6be2c879fe4cd7cc7c6e02ce3d0e (commit)
   from 453a38b93dc710f4895270bf38f525aa0942fb5f (commit)

commit 3611f1ba163e6be2c879fe4cd7cc7c6e02ce3d0e
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Feb 2 02:00:48 2013 +0100

Use g_signal_connect_swapped with gtk_widget_destroy

 extensions/adblock.c |   12 ++--
 extensions/feed-panel/main.c |   12 ++--
 extensions/shortcuts.c   |   12 ++--
 midori/midori-searchaction.c |   12 ++--
 midori/midori-view.c |   12 ++--
 midori/sokoke.c  |   12 ++--
 6 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 97a7b93..395dd7b 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -452,14 +452,6 @@ adblock_activate_link_cb (GtkWidget*   label,
 }
 #endif
 
-static void
-adblock_preferences_response_cb (GtkWidget* dialog,
- gint   response,
- gpointer   data)
-{
-gtk_widget_destroy (dialog);
-}
-
 static GtkWidget*
 adblock_get_preferences_dialog (MidoriExtension* extension)
 {
@@ -508,8 +500,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
GTK_RESPONSE_HELP, FALSE);
 sokoke_widget_get_text_size (dialog, M, width, height);
 gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1);
-g_signal_connect (dialog, response,
-  G_CALLBACK (adblock_preferences_response_cb), NULL);
+g_signal_connect_swapped (dialog, response,
+  G_CALLBACK (gtk_widget_destroy), dialog);
 /* TODO: We need mnemonics */
 if ((xfce_heading = sokoke_xfce_header_new (
 gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title)))
diff --git a/extensions/feed-panel/main.c b/extensions/feed-panel/main.c
index bff7bd9..7d8b89e 100644
--- a/extensions/feed-panel/main.c
+++ b/extensions/feed-panel/main.c
@@ -101,14 +101,6 @@ feed_deactivate_cb (MidoriExtension* extension,
 }
 }
 
-static void
-feed_dialog_response_cb (GtkWidget* dialog,
- gint   response,
- gpointer   data)
-{
-gtk_widget_destroy (dialog);
-}
-
 static KatzeArray*
 feed_add_item (KatzeArray*  feeds,
const gchar* uri)
@@ -130,8 +122,8 @@ feed_add_item (KatzeArray*  feeds,
 _(Feed '%s' already exists), uri);
 gtk_window_set_title (GTK_WINDOW (dialog), EXTENSION_NAME);
 gtk_widget_show (dialog);
-g_signal_connect (dialog, response,
-G_CALLBACK (feed_dialog_response_cb), NULL);
+g_signal_connect_swapped (dialog, response,
+G_CALLBACK (gtk_widget_destroy), dialog);
 
 }
 else
diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c
index b4cb042..d2ad909 100644
--- a/extensions/shortcuts.c
+++ b/extensions/shortcuts.c
@@ -137,14 +137,6 @@ shortcuts_hotkey_for_action (GtkAction*   action,
 return FALSE;
 }
 
-static void
-shortcuts_preferences_response_cb (GtkWidget* dialog,
-   gint   response,
-   gpointer   data)
-{
-gtk_widget_destroy (dialog);
-}
-
 static GtkWidget*
 shortcuts_get_preferences_dialog (MidoriExtension* extension)
 {
@@ -183,8 +175,8 @@ shortcuts_get_preferences_dialog (MidoriExtension* 
extension)
 gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
 sokoke_widget_get_text_size (dialog, M, width, height);
 gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, height * 24);
-g_signal_connect (dialog, response,
-  G_CALLBACK (shortcuts_preferences_response_cb), NULL);
+g_signal_connect_swapped (dialog, response,
+G_CALLBACK (gtk_widget_destroy), dialog);
 
 dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 if ((xfce_heading = sokoke_xfce_header_new (
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 7cdee9a..82fa2bf 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -1364,14 +1364,6 @@ midori_search_action_treeview_destroy_cb (GtkWidget* 
 treeview,
 }
 }
 
-static void
-midori_search_action_dialog_respnse_cb (GtkWidget* dialog,
-gint   response,
-gpointer   data)
-{
-gtk_widget_destroy (dialog);
-}
-
 /**
  * midori_search_action_get_dialog:
  * @search_action: a #MidoriSearchAction
@@ -1435,8 +1427,8 @@ midori_search_action_get_dialog (MidoriSearchAction* 
search_action)
GTK_RESPONSE_HELP, FALSE);
 sokoke_widget_get_text_size (dialog, M, width, height);
 gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1);
-

[Xfce4-commits] midori:master Notify page re-ordering adding/ removing Granite tabs

[Christian Dywan]

Updating branch refs/heads/master
 to 996998f3fa9f43b4a920630ad66ce9727fb4b2ce (commit)
   from 3611f1ba163e6be2c879fe4cd7cc7c6e02ce3d0e (commit)

commit 996998f3fa9f43b4a920630ad66ce9727fb4b2ce
Author: Corentin Noël tin...@mailoo.org
Date:   Sat Feb 2 02:03:33 2013 +0100

Notify page re-ordering adding/ removing Granite tabs

Fixes: https://bugs.launchpad.net/midori/+bug/1082786

 midori/midori-browser.c |   14 +-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index b229e9e..987176a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4972,12 +4972,17 @@ midori_browser_notebook_tab_added_cb (GtkWidget*
 notebook,
   GraniteWidgetsTab* tab,
   MidoriBrowser* browser)
 {
+gint n = granite_widgets_dynamic_notebook_get_tab_position (
+GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), tab);
+midori_browser_set_current_page (browser, n);
 GtkWidget* view = midori_view_new_with_item (NULL, browser-settings);
 midori_view_set_tab (MIDORI_VIEW (view), tab);
 midori_browser_connect_tab (browser, view);
+midori_view_set_uri (MIDORI_VIEW (view), );
 /* FIXME: signal add-tab */
 _midori_browser_update_actions (browser);
-midori_view_set_uri (MIDORI_VIEW (view), );
+midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook),
+MIDORI_VIEW (view), n, browser);
 }
 
 static gboolean
@@ -4988,6 +4993,13 @@ midori_browser_notebook_tab_removed_cb (GtkWidget*   
  notebook,
 MidoriView* view = MIDORI_VIEW (granite_widgets_tab_get_page (tab));
 if (midori_browser_tab_connected (browser, MIDORI_VIEW (view)))
 midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
+
+GraniteWidgetsTab* new_tab = granite_widgets_dynamic_notebook_get_current (
+GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook));
+gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (
+GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook), new_tab);
+midori_browser_switched_tab (browser, granite_widgets_tab_get_page (tab),
+MIDORI_VIEW (granite_widgets_tab_get_page (new_tab)), new_pos);
 return TRUE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

midori:master Override GTK_STOCK_SAVE_AS in context menu to add …

[Christian Dywan]

Updating branch refs/heads/master
 to 6f71ae2a811a6bfaeddb7be7234117e658cd1fc5 (commit)
   from 996998f3fa9f43b4a920630ad66ce9727fb4b2ce (commit)

commit 6f71ae2a811a6bfaeddb7be7234117e658cd1fc5
Author: Christian Dywan christ...@twotoasts.de
Date:   Sat Feb 2 02:36:54 2013 +0100

Override GTK_STOCK_SAVE_AS in context menu to add …

Fixes: https://bugs.launchpad.net/midori/+bug/1108432

 midori/midori-view.c |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index e0de4ff..4de318e 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2474,11 +2474,10 @@ midori_view_populate_popup (MidoriView* view,
 G_CALLBACK (midori_web_view_menu_link_copy_activate_cb), widget);
 
 if (!midori_view_always_same_tab (view-link_uri))
-{
-midori_view_insert_menu_item (menu_shell, -1,
-NULL, GTK_STOCK_SAVE_AS,
-G_CALLBACK (midori_web_view_menu_save_activate_cb), widget);
-}
+/* GTK_STOCK_SAVE_AS is lacking the underline */
+midori_view_insert_menu_item (menu_shell, -1,
+_(Save _As…), GTK_STOCK_SAVE_AS,
+G_CALLBACK (midori_web_view_menu_save_activate_cb), widget);
 }
 
 if (is_image)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 28fb38b898371852e436cb08f6ed0824a11a1d73 (commit)
   from 5866ee49ded917e4439f15e732edcbb1862517d4 (commit)

commit 28fb38b898371852e436cb08f6ed0824a11a1d73
Author: Rafael Ferreira rafael.f...@gmail.com
Date:   Sat Feb 2 05:33:57 2013 +0100

l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%

New status: 324 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt_BR.po |   59 +++
 1 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 42769d3..6b433cb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgstr 
 Project-Id-Version: xfce4-weather-plugin (XFCE 4.4 Goodies)\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-02-01 16:19+0100\n
-PO-Revision-Date: 2013-01-28 10:07-0300\n
+PO-Revision-Date: 2013-02-02 02:33-0300\n
 Last-Translator: Rafael Ferreira rafael.f...@gmail.com\n
 Language-Team: Brazilian Portuguese ldp...@bazar2.conectiva.com.br\n
 Language: pt_BR\n
@@ -357,30 +357,28 @@ msgid Latitud_e:
 msgstr Latitud_e:
 
 #: ../panel-plugin/weather-config.c:525
-#, fuzzy
 msgid 
 Latitude specifies the north-south position of a point on the Earth's 
 surface. If you change this value manually, you need to provide altitude and 
 timezone manually too.
 msgstr 
 A latitude especifica a posição norte-sul de um ponto da superfície da 
-Terra. Se você alterar esse valor manualmente, você deveria fornecer a 
-altitude correta também.
+Terra. Se você alterar esse valor manualmente, você deve fornecer a altitude 
+e fuso horário manualmente também.
 
 #: ../panel-plugin/weather-config.c:535
 msgid L_ongitude:
 msgstr L_ongitude:
 
 #: ../panel-plugin/weather-config.c:539
-#, fuzzy
 msgid 
 Longitude specifies the east-west position of a point on the Earth's 
 surface. If you change this value manually, you need to provide altitude and 
 timezone manually too.
 msgstr 
 A longitude especifica a posição leste-oeste de um ponto da superfície da 
-Terra. Se você alterar esse valor manualmente, você deveria fornecer a 
-altitude correta também.
+Terra. Se você alterar esse valor manualmente, você deve fornecer a altitude 
+e fuso horário manualmente também.
 
 #: ../panel-plugin/weather-config.c:549 ../panel-plugin/weather-config.c:1000
 msgid Altitu_de:
@@ -418,7 +416,7 @@ msgstr 
 
 #: ../panel-plugin/weather-config.c:572
 msgid _Timezone:
-msgstr 
+msgstr Fuso _horário:
 
 #: ../panel-plugin/weather-config.c:580
 msgid 
@@ -429,20 +427,23 @@ msgid 
 Leave this field empty to use the timezone set by your system. Invalid 
 entries will cause the use of UTC time, but may also depend on your system.
 msgstr 
+Se a localização escolhida não estiver no seu fuso horário atual, então é 
+necessário icolocar/i o plugin naquele outro fuso horário para que os 
+horários sejam mostrados corretamente. O fuso horário apropriado será 
+detectado automaticamente via serviço web GeoNames, mas você pode querer 
+corrigi-lo, se necessário.\n
+Deixe este campo em branco para usar o fuso horário definido pelo seu 
+sistema. Entradas inválidas vão causar o uso do horário UTC, mas também pode 
+depender do seu sistema.
 
 #: ../panel-plugin/weather-config.c:605
-#, fuzzy
 msgid 
 iPlease change location name to your liking and correct\n
 altitude and timezone if they are not auto-detected correctly./i
 msgstr 
-\n
-\n
-\n
-\n
 iPor favor, altere o nome da localização de seu interesse e\n
-revise a altitude se não tiver sido detectada automaticamente de forma 
-correta./i
+a altitude e o fuso horário corretos, se não tiver sido detectada\n
+automaticamente de forma correta./i
 
 #: ../panel-plugin/weather-config.c:630
 msgid 
@@ -527,7 +528,6 @@ msgstr 
 polegada em 32  °F (0 °C) na aceleração padrão da gravidade.
 
 #: ../panel-plugin/weather-config.c:704
-#, fuzzy
 msgid 
 The pound per square inch is a unit of pressure based on avoirdupois units 
 (a system of weights based on a pound of 16 ounces) and defined as the 
@@ -537,11 +537,11 @@ msgid 
 Colonies.
 msgstr 
 A libra por polegada quadrada é uma unidade de pressão baseada em unidades 
-de avoirdupois (um sistema de pesos baseado em uma libra de 16 onças) e a 
-pressão resultante de uma força de uma libra-força aplicada a uma área de 
-uma polegada quadrada. Ela é usada nos Estados Unidos e em graus variados na 
-vida cotidiana do Canadá, no Reino Unido e talvez em algumas ex-colônias 
-britânicas.
+de avoirdupois (um sistema de pesos baseado em uma libra de 16 onças) e é 
+definida como a pressão resultante de uma força de uma libra-força aplicada 
+a uma área de uma polegada quadrada. Ela é usada nos Estados Unidos e em 
+graus variados na vida cotidiana do Canadá, no Reino Unido e talvez em 
+algumas ex-colônias britânicas.
 
 #: ../panel-plugin/weather-config.c:713
 msgid 
@@ -1118,7 +1118,6 @@ msgstr 
 suficiente,