[Xfce4-commits] Fix typos spotted by Jeff Bailes.

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 6ed8eb78359e47b12f5413625379e24d76c1df27 (commit)
   from 744514138a40df59ef6b95c0c16cc1cdbe7dae56 (commit)

commit 6ed8eb78359e47b12f5413625379e24d76c1df27
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 09:49:41 2009 +0100

Fix typos spotted by Jeff Bailes.

 lib/screenshooter-zimagez.c |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c
index 4c13ff1..b720a11 100644
--- a/lib/screenshooter-zimagez.c
+++ b/lib/screenshooter-zimagez.c
@@ -97,7 +97,7 @@ open_url_hook (SexyUrlLabel *url_label, gchar *url, gpointer 
user_data)
 
   if (!g_spawn_command_line_async (command, &error))
 {
-  TRACE ("An error occured when opening the URL");
+  TRACE ("An error occurred when opening the URL");
 
   screenshooter_error ("%s", error->message);
   g_error_free (error);
@@ -131,7 +131,7 @@ do_xmlrpc (SoupSession *session, const gchar *uri, const 
gchar *method,
 {
   err = g_error_new (SOUP_XMLRPC_FAULT,
  SOUP_XMLRPC_FAULT_APPLICATION_ERROR,
- _("An error occured when creating the XMLRPC"
+ _("An error occurred when creating the XMLRPC"
" request."));
   g_propagate_error (error, err);
 
@@ -150,7 +150,7 @@ do_xmlrpc (SoupSession *session, const gchar *uri, const 
gchar *method,
 
   err = g_error_new (SOUP_XMLRPC_FAULT,
  SOUP_XMLRPC_FAULT_TRANSPORT_ERROR,
- _("An error occured when transfering the data"
+ _("An error occurred when transferring the data"
" to ZimageZ."));
   g_propagate_error (error, err);
   g_object_unref (msg);
@@ -175,7 +175,7 @@ do_xmlrpc (SoupSession *session, const gchar *uri, const 
gchar *method,
 
   err = g_error_new (SOUP_XMLRPC_FAULT,
  SOUP_XMLRPC_FAULT_APPLICATION_ERROR,
- _("An error occured when parsing the response"
+ _("An error occurred when parsing the response"
" from ZimageZ."));
   g_propagate_error (error, err);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Add build support for Chinese documentation.

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 9f8fb53251de3837f6ffca5dc169b21830c7c7e0 (commit)
   from 53330c902b439604276236e78f9154863f6aa970 (commit)

commit 9f8fb53251de3837f6ffca5dc169b21830c7c7e0
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 10:16:31 2009 +0100

Add build support for Chinese documentation.

 Makefile.am|   19 ++
 configure.ac.in|1 +
 .../images/xfce4-screenshooter-dialog1.png |  Bin 27192 -> 27192 bytes
 .../images/xfce4-screenshooter-dialog2.png |  Bin 39947 -> 39947 bytes
 .../xfce4-screenshooter-zimagez-login-dialog.png   |  Bin 21581 -> 21581 bytes
 .../xfce4-screenshooter-zimagez-result-dialog.png  |  Bin 26345 -> 26345 bytes
 docs/manual/zh_CN/xfce4-screenshooter.html |1 +
 docs/manual/zh_CN/xfce4-screenshooter.xml.in   |  269 
 po-doc/LINGUAS |2 +-
 9 files changed, 291 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 19a6c18..8327f65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,6 +363,25 @@ trimages_DATA = \
docs/manual/tr/images/xfce4-screenshooter-zimagez-login-dialog.png \
docs/manual/tr/images/xfce4-screenshooter-zimagez-result-dialog.png
 
+
+# Siplified Chinese documentation
+zhcndocdir = $(datadir)/xfce4/doc/zh_CN
+zhcndoc_DATA = docs/manual/zh_CN/xfce4-screenshooter.html
+if MAINTAINER_MODE
+if ENABLE_XSLTPROC
+docs/manual/zh_CN/xfce4-screenshooter.html: 
docs/manual/zh_CN/xfce4-screenshooter.xml
+   $(XSLTPROC) -o docs/manual/zh_CN/ 
$(top_srcdir)/docs/manual/xfce-nochunk.xsl 
docs/manual/zh_CN/xfce4-screenshooter.xml
+endif
+endif
+
+zhcnimagesdir = $(datadir)/xfce4/doc/zh_CN/images
+zhcnimages_DATA = \
+   docs/manual/zh_CN/images/xfce4-screenshooter-dialog1.png \
+   docs/manual/zh_CN/images/xfce4-screenshooter-dialog2.png \
+   docs/manual/zh_CN/images/xfce4-screenshooter-zimagez-login-dialog.png \
+   docs/manual/zh_CN/images/xfce4-screenshooter-zimagez-result-dialog.png
+
+
 # Extra dist and distclean rules
 EXTRA_DIST = \
README  \
diff --git a/configure.ac.in b/configure.ac.in
index 844c5f0..5a504e3 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -99,6 +99,7 @@ docs/manual/id/xfce4-screenshooter.xml
 docs/manual/it/xfce4-screenshooter.xml
 docs/manual/ja/xfce4-screenshooter.xml
 docs/manual/tr/xfce4-screenshooter.xml
+docs/manual/zh_CN/xfce4-screenshooter.xml
 po/Makefile.in
 po-doc/Makefile
 ])
diff --git a/docs/manual/C/images/xfce4-screenshooter-dialog1.png 
b/docs/manual/zh_CN/images/xfce4-screenshooter-dialog1.png
similarity index 100%
copy from docs/manual/C/images/xfce4-screenshooter-dialog1.png
copy to docs/manual/zh_CN/images/xfce4-screenshooter-dialog1.png
diff --git a/docs/manual/C/images/xfce4-screenshooter-dialog2.png 
b/docs/manual/zh_CN/images/xfce4-screenshooter-dialog2.png
similarity index 100%
copy from docs/manual/C/images/xfce4-screenshooter-dialog2.png
copy to docs/manual/zh_CN/images/xfce4-screenshooter-dialog2.png
diff --git a/docs/manual/C/images/xfce4-screenshooter-zimagez-login-dialog.png 
b/docs/manual/zh_CN/images/xfce4-screenshooter-zimagez-login-dialog.png
similarity index 100%
copy from docs/manual/C/images/xfce4-screenshooter-zimagez-login-dialog.png
copy to docs/manual/zh_CN/images/xfce4-screenshooter-zimagez-login-dialog.png
diff --git a/docs/manual/C/images/xfce4-screenshooter-zimagez-result-dialog.png 
b/docs/manual/zh_CN/images/xfce4-screenshooter-zimagez-result-dialog.png
similarity index 100%
copy from docs/manual/C/images/xfce4-screenshooter-zimagez-result-dialog.png
copy to docs/manual/zh_CN/images/xfce4-screenshooter-zimagez-result-dialog.png
diff --git a/docs/manual/zh_CN/xfce4-screenshooter.html 
b/docs/manual/zh_CN/xfce4-screenshooter.html
new file mode 100644
index 000..b86c762
--- /dev/null
+++ b/docs/manual/zh_CN/xfce4-screenshooter.html
@@ -0,0 +1 @@
+Xfce4 
屏幕截图工具Xfce4 
屏幕截图工具J�r�me Guelfuccijero...@xfce.org>Sam Swiftrenm...@gmail.com>http://www.w3.org/TR/xhtml1/transitional"; 
class="releaseinfo">本手册介绍了版本为
 1.6.0.1git-53330c9 的 Xfce4 
屏幕截图工具。版权 � 2008, 2009 J�r�me 
Guelfucci版权 � 2009 Sam 
Swift版权 � 2009. HuntXu 
(hun...@live.cm)在自由软件基金会发布的
 GNU 
自由文档许可协议版本
 1.1 
或以后版本的条款约束下允许复制，分发和/或修改本文档，不要求保留特定内容、封面文本或者封底文本。许可协议全文可以通过以下链接找到:
 http://www.gnu.org/"; 
target="_top">自由软件基金会。February 2009目录Xfce4 
 >屏幕截图工具简介 class="sect1">href="#using-the-application">使用本程序 class="sect2">href="#user-interface">通过用户界面 class="sect2">href="#command-line">通过命令行 class="sect1">使用 Xfce 
 >面板插件class="sect2">href="#add">添加该插件class="sect2">href="#set">配置该插件class="sect2">href="#use">使用该插件 class="sect1" title="Xfce4 屏幕
 130;图工具简介">Xfce4 
屏幕截图工具简介本程序允许您截取整个屏幕、当前活动窗口或者一个自选区域的图像。您可以设置截图前的延时和截图之后所要执行的的动作，包括保存截图至一幅
 PNG 
图像文件，复制截图到剪贴板，使用另一程序打开截图，或者上传
 
;至免费的在线图像保存服务
 http://www.zimagez.com"; 
target="_top">ZimageZ。本程序同时提供一个
 Xfce 

[Xfce4-commits] l10n: Updates to Greek (el) translation

[Transifex]

Updating branch refs/heads/master
 to 6b5557c7a94bb1ce259306d5e586f901b4a548b0 (commit)
   from 6e10754143b10141562c407ea89fc03328bcc7ca (commit)

commit 6b5557c7a94bb1ce259306d5e586f901b4a548b0
Author: Mario Andonoudiou 
Date:   Sun Nov 29 10:33:27 2009 +

l10n: Updates to Greek (el) translation

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

 po/el.po |  419 +++---
 1 files changed, 237 insertions(+), 182 deletions(-)

diff --git a/po/el.po b/po/el.po
index 4180197..39ab16b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: orage 4.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-11 09:18+0200\n"
-"PO-Revision-Date: 2006-05-12 22:57+0200\n"
-"Last-Translator: Stavros Giannouris \n"
+"PO-Revision-Date: 2009-11-29 11:47+0200\n"
+"Last-Translator: Marios Andonoudiou \n"
 "Language-Team: Greek \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,15 +31,17 @@ msgid ""
 "%s\n"
 "click to modify clock"
 msgstr ""
+"%s\n"
+"κάντε κλικ για επεξεργασία του ρολογιού"
 
 #. trick to refresh clocks once
 #: ../globaltime/globaltime.c:358
 msgid "Ending time adjustment mode"
-msgstr ""
+msgstr "Εκκίνηση κατάστασης ρύθμισης ώρας"
 
 #: ../globaltime/globaltime.c:366
 msgid "Starting time adjustment mode"
-msgstr ""
+msgstr "Εκκίνηση κατάστασης ρύθμισης ώρας"
 
 #: ../globaltime/globaltime.c:381
 #, fuzzy
@@ -51,6 +53,8 @@ msgid ""
 "button 1 to change preferences \n"
 "button 2 to adjust time of clocks"
 msgstr ""
+"πλήκτρο 1 για αλλαγή προτιμήσεων \n"
+"πλήκτρο 2 για ρύθμιση της ώρας των ρολογιών"
 
 #: ../globaltime/globaltime.c:472
 msgid "adjust to change hour"
@@ -60,92 +64,99 @@ msgstr ""
 msgid "adjust to change minute"
 msgstr ""
 
-#: ../globaltime/gt_prefs.c:69 ../globaltime/gt_prefs.c:1077
+#: ../globaltime/gt_prefs.c:69
+#: ../globaltime/gt_prefs.c:1077
 #, fuzzy
 msgid "Standard"
 msgstr "Ημερολόγιο"
 
-#: ../globaltime/gt_prefs.c:71 ../src/appointment.c:2780
+#: ../globaltime/gt_prefs.c:71
+#: ../src/appointment.c:2780
 msgid "None"
 msgstr "Κανένα"
 
-#: ../globaltime/gt_prefs.c:84 ../globaltime/gt_prefs.c:1100
+#: ../globaltime/gt_prefs.c:84
+#: ../globaltime/gt_prefs.c:1100
 msgid "Equal"
-msgstr ""
+msgstr "Ίσο"
 
 #: ../globaltime/gt_prefs.c:86
 #, fuzzy
 msgid "Vary"
 msgstr "Ετήσια"
 
-#: ../globaltime/gt_prefs.c:267 ../globaltime/gt_prefs.c:268
+#: ../globaltime/gt_prefs.c:267
+#: ../globaltime/gt_prefs.c:268
 msgid "NEW"
-msgstr ""
+msgstr "ΝΕΟ"
 
 #: ../globaltime/gt_prefs.c:291
 msgid "NEW COPY"
-msgstr ""
+msgstr "ΝΕΟ ΑΝΤΙΓΡΑΦΟ"
 
 #: ../globaltime/gt_prefs.c:312
 msgid "Not possible to delete the last clock."
-msgstr ""
+msgstr "Αδύνατη η διαγραφή του τελευταίου ρολογιού."
 
-#: ../globaltime/gt_prefs.c:366 ../panel-plugin/oc_config.c:114
+#: ../globaltime/gt_prefs.c:366
+#: ../panel-plugin/oc_config.c:114
 msgid "Select timezone"
 msgstr "Επιλογή ζώνης ώρας"
 
 #: ../globaltime/gt_prefs.c:511
 msgid "update this clock"
-msgstr ""
+msgstr "ενημέρωσε αυτό το ρολόι"
 
-#: ../globaltime/gt_prefs.c:516 ../globaltime/gt_prefs.c:1033
+#: ../globaltime/gt_prefs.c:516
+#: ../globaltime/gt_prefs.c:1033
 msgid "add new empty clock"
-msgstr ""
+msgstr "πρόσθεσε νέο ρολόι"
 
 #: ../globaltime/gt_prefs.c:521
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "πρόσθεσε νέο ρολόι χρησιμοποιόντας αυτό το ρολόι ως πρότυπο"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "delete this clock"
-msgstr ""
+msgstr "διαγραφή του ρολογιού"
 
 #: ../globaltime/gt_prefs.c:534
 msgid "move this clock first"
-msgstr ""
+msgstr "μετακίνησε αυτό το ρολόι πρώτο"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock left"
-msgstr ""
+msgstr "μετακίνησε αυτό το ρολόι αριστερά"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock right"
-msgstr ""
+msgstr "μετακίνησε αυτό το ρολόι δεξιά"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock last"
-msgstr ""
+msgstr "μετακίνησε αυτό το ρολόι στο τέλος"
 
 #: ../globaltime/gt_prefs.c:557
 msgid "set the timezone of this clock to be local timezone"
-msgstr ""
+msgstr "όρισε ως τοπική ζώνη ώρας, αυτήν του ρολογιού"
 
-#: ../globaltime/gt_prefs.c:563 ../globaltime/gt_prefs.c:1041
+#: ../globaltime/gt_prefs.c:563
+#: ../globaltime/gt_prefs.c:1041
 msgid "close window and exit"
-msgstr ""
+msgstr "κλείσιμο παραθύρου και έξοδος"
 
 #: ../globaltime/gt_prefs.c:586
 msgid "Modify Clock "
-msgstr ""
+msgstr "Επεξεργασία Ρολογιού"
 
 #. ---HEADING---
 #: ../globaltime/gt_prefs.c:599
 msgid "Clock Parameters"
-msgstr ""
+msgstr "Παράμετροι Ρολογιού"
 
 #: ../globaltime/gt_prefs.c:603
 msgid "Name of the clock:"
-msgstr ""
+msgstr "Όνομα ρολογιού"
 
 #: ../globaltime/gt_prefs.c:609
 #, fuzzy
@@ -154,102 +165,119 @@ msgstr "Ρολόι orage"
 
 #: ../globaltime/gt_prefs.c:612
 msgid "Timezone of the clock:"
-msgstr ""
+msgstr "Ζώνη ώρας του ρολογι

[Xfce4-commits] l10n: Updates to Dutch (Flemish) (nl) translation

[Transifex]

Updating branch refs/heads/master
 to 3c23eb77a5b09052c8713acedf44db92f72c138a (commit)
   from 8a8d1a379a1e4b2e2631f6507496aa7c1c256ba2 (commit)

commit 3c23eb77a5b09052c8713acedf44db92f72c138a
Author: Vincent Tunru 
Date:   Sun Nov 29 10:42:33 2009 +

l10n: Updates to Dutch (Flemish) (nl) translation

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

 po/nl.po |  154 --
 1 files changed, 49 insertions(+), 105 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 726ca98..1c4321b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 09:53+0100\n"
-"PO-Revision-Date: 2009-11-28 21:20+0100\n"
+"PO-Revision-Date: 2009-11-29 11:42+0100\n"
 "Last-Translator: Vincent Tunru \n"
 "Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
@@ -27,15 +27,13 @@ msgid "Transfer"
 msgstr "Overdracht"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"De schermafdruk wordt "
-"overgedragen naar:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "De schermafdruk wordt 
overgedragen naar:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -52,15 +50,14 @@ msgstr "Voorkeuren"
 
 #: ../lib/screenshooter-dialogs.c:754
 msgid "Region to capture"
-msgstr ""
-"Gebied om een schermafdruk "
-"van te maken"
+msgstr "Gebied om een 
schermafdruk van te maken"
 
 #: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Volledig scherm"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Schermafdruk van het hele scherm maken"
@@ -69,7 +66,8 @@ msgstr "Schermafdruk van het hele scherm maken"
 msgid "Active window"
 msgstr "Actieve venster"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Actieve venster"
@@ -78,16 +76,11 @@ msgstr "Actieve venster"
 msgid "Select a region"
 msgstr "Selecteer een gebied"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Selecteer een gebied om een schermafdruk door te klikken op een hoek van het "
-"gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de "
-"andere hoek en laat de muisknop los."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Selecteer een gebied om een schermafdruk door te klikken op een hoek 
van het gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de 
andere hoek en laat de muisknop los."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -98,11 +91,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Muisaanwijzer weergeven op de schermafdruk"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Vertraging voor het maken van "
-"de schermafdruk"
+msgid "Delay before 
capturing"
+msgstr "Vertraging voor het 
maken van de schermafdruk"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -135,8 +125,7 @@ msgstr "Kopieer naar klembord"
 
 #: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr ""
-"Kopieer de schermafdruk naar het klembord zodat deze later geplakt kan worden"
+msgstr "Kopieer de schermafdruk naar het klembord zodat deze later geplakt kan 
worden"
 
 #: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
@@ -146,7 +135,8 @@ msgstr "Openen met:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Open de schermafdruk met de gegeven toepassing"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Toepassing om de schermafdruk te openen"
 
@@ -154,11 

[Xfce4-commits] l10n: Updates to Danish (da) translation

[Transifex]

Updating branch refs/heads/master
 to 726bd130b70543fe6bbbc804140c429579d7b848 (commit)
   from 3c23eb77a5b09052c8713acedf44db92f72c138a (commit)

commit 726bd130b70543fe6bbbc804140c429579d7b848
Author: Per Kongstad 
Date:   Sun Nov 29 10:48:08 2009 +

l10n: Updates to Danish (da) translation

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

 po/da.po |  155 --
 1 files changed, 49 insertions(+), 106 deletions(-)

diff --git a/po/da.po b/po/da.po
index 1f5bf44..7177d4c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.6.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 09:53+0100\n"
-"PO-Revision-Date: 2009-11-15 22:53+0100\n"
+"PO-Revision-Date: 2009-11-29 11:47+0100\n"
 "Last-Translator: Per Kongstad \n"
 "Language-Team: Danish \n"
 "MIME-Version: 1.0\n"
@@ -28,15 +28,13 @@ msgid "Transfer"
 msgstr "Overførsel"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"Skærmbilledet bliver overført "
-"til:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "Skærmbilledet bliver 
overført til:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -53,14 +51,14 @@ msgstr "Indstillinger"
 
 #: ../lib/screenshooter-dialogs.c:754
 msgid "Region to capture"
-msgstr ""
-"Område til kopiering"
+msgstr "Område til 
kopiering"
 
 #: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Hele skærmen"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tag et skærmbillede af hele skærmen"
@@ -69,7 +67,8 @@ msgstr "Tag et skærmbillede af hele skærmen"
 msgid "Active window"
 msgstr "Aktive vindue"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Tag et skærmbillede af det aktive vindue"
@@ -78,16 +77,11 @@ msgstr "Tag et skærmbillede af det aktive vindue"
 msgid "Select a region"
 msgstr "Markér et område"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Markér et område til kopiering ved at klikke et startpunkt på skærmen uden "
-"at slippe museknappen, og trække musen til slutpunkt af området, og derefter "
-"slippe museknappen."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Markér et område til kopiering ved at klikke et startpunkt på skærmen 
uden at slippe museknappen, og trække musen til slutpunkt af området, og 
derefter slippe museknappen."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -98,11 +92,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Vis musemarkøren på skærmbilledet"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Forsinkelse inden billede "
-"tages"
+msgid "Delay before 
capturing"
+msgstr "Forsinkelse inden 
billede tages"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -145,7 +136,8 @@ msgstr "Åbn med:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Åbn skærmbilledet med det valgte program"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Program til åbning af skærmbilledet"
 
@@ -153,7 +145,8 @@ msgstr "Program til åbning af skærmbilledet"
 msgid "Host on ZimageZ"
 msgstr "Host på ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
+#: ../lib/screenshooter-dialogs.c:1032
+#: ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "Host skærmbilledet på ZimageZ. en fri online billed-hosting-tjeneste"
 
@@ -166,17 +159,17 @@ msgid "Save screenshot as..."
 msgstr "Gem skærmbillede som..."
 
 #: ../lib/screenshoot

Fix a typo in a string (Enrico Tröger).

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to fcdeda39d5f851e92d85d15c36f371336462c0fb (commit)
   from 3f1d6c02c9ec04f40d8b85e65ff36009a4878240 (commit)

commit fcdeda39d5f851e92d85d15c36f371336462c0fb
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 11:50:11 2009 +0100

Fix a typo in a string (Enrico Tröger).

 lib/screenshooter-zimagez.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c
index df14736..7c24189 100644
--- a/lib/screenshooter-zimagez.c
+++ b/lib/screenshooter-zimagez.c
@@ -340,7 +340,7 @@ zimagez_upload_job (ScreenshooterJob *job, GValueArray 
*param_values, GError **e
 
   TRACE ("Ask the user to fill the information items.");
   screenshooter_job_ask_info (job, liststore,
-  _("Please file the following fields with your "
+  _("Please fill the following fields with your "
 "http://www.zimagez.com\";>ZimageZ \n"
 "user name, passsword and details about the 
screenshot."));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Add a comment for translators (Enrico Tröger).

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to a8edd459ccac9fae1502abb4a597156cc169df13 (commit)
   from 8a8d1a379a1e4b2e2631f6507496aa7c1c256ba2 (commit)

commit a8edd459ccac9fae1502abb4a597156cc169df13
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 11:48:55 2009 +0100

Add a comment for translators (Enrico Tröger).

 lib/screenshooter-zimagez.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c
index b720a11..df14736 100644
--- a/lib/screenshooter-zimagez.c
+++ b/lib/screenshooter-zimagez.c
@@ -225,6 +225,8 @@ zimagez_upload_job (ScreenshooterJob *job, GValueArray 
*param_values, GError **e
   const gchar *date = screenshooter_get_date (FALSE);
   const gchar *current_time = screenshooter_get_time ();
   const gchar *proxy_uri;
+  /* For translators: the first wildcard is the date, the second one the time,
+   * e.g. "Taken on 12/31/99, at 23:13:48". */
   gchar *comment = g_strdup_printf (_("Taken on %s, at %s"), date, 
current_time);
   gchar *data = NULL;
   gchar *encoded_password = NULL;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Show the tooltip on the correct widget (Enrico Tröger).

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to a9750d46a7c838d4c00b5c5cd649e98feffbd4b6 (commit)
   from fcdeda39d5f851e92d85d15c36f371336462c0fb (commit)

commit a9750d46a7c838d4c00b5c5cd649e98feffbd4b6
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 11:51:27 2009 +0100

Show the tooltip on the correct widget (Enrico Tröger).

 lib/screenshooter-zimagez.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/screenshooter-zimagez.c b/lib/screenshooter-zimagez.c
index 7c24189..3a3e60e 100644
--- a/lib/screenshooter-zimagez.c
+++ b/lib/screenshooter-zimagez.c
@@ -792,7 +792,7 @@ cb_ask_for_information (ScreenshooterJob *job,
 
   /* Create the comment entry */
   comment_entry = gtk_entry_new ();
-  gtk_widget_set_tooltip_text (title_entry,
+  gtk_widget_set_tooltip_text (comment_entry,
_("A comment on the screenshot, it will be used 
when"
  " displaying the screenshot on ZimageZ"));
   gtk_entry_set_activates_default (GTK_ENTRY (comment_entry), TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-screenshooter

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 45ccd5a8b9a6616fcd47021064e5a997ac4407dd (commit)
   from a9750d46a7c838d4c00b5c5cd649e98feffbd4b6 (commit)

commit 45ccd5a8b9a6616fcd47021064e5a997ac4407dd
Merge: a9750d46a7c838d4c00b5c5cd649e98feffbd4b6 
726bd130b70543fe6bbbc804140c429579d7b848
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 11:54:08 2009 +0100

Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-screenshooter

commit 726bd130b70543fe6bbbc804140c429579d7b848
Author: Per Kongstad 
Date:   Sun Nov 29 10:48:08 2009 +

l10n: Updates to Danish (da) translation

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

 po/da.po |  155 --
 1 files changed, 49 insertions(+), 106 deletions(-)

diff --git a/po/da.po b/po/da.po
index 1f5bf44..7177d4c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.6.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 09:53+0100\n"
-"PO-Revision-Date: 2009-11-15 22:53+0100\n"
+"PO-Revision-Date: 2009-11-29 11:47+0100\n"
 "Last-Translator: Per Kongstad \n"
 "Language-Team: Danish \n"
 "MIME-Version: 1.0\n"
@@ -28,15 +28,13 @@ msgid "Transfer"
 msgstr "Overførsel"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"Skærmbilledet bliver overført "
-"til:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "Skærmbilledet bliver 
overført til:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -53,14 +51,14 @@ msgstr "Indstillinger"
 
 #: ../lib/screenshooter-dialogs.c:754
 msgid "Region to capture"
-msgstr ""
-"Område til kopiering"
+msgstr "Område til 
kopiering"
 
 #: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Hele skærmen"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tag et skærmbillede af hele skærmen"
@@ -69,7 +67,8 @@ msgstr "Tag et skærmbillede af hele skærmen"
 msgid "Active window"
 msgstr "Aktive vindue"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Tag et skærmbillede af det aktive vindue"
@@ -78,16 +77,11 @@ msgstr "Tag et skærmbillede af det aktive vindue"
 msgid "Select a region"
 msgstr "Markér et område"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Markér et område til kopiering ved at klikke et startpunkt på skærmen uden "
-"at slippe museknappen, og trække musen til slutpunkt af området, og derefter "
-"slippe museknappen."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Markér et område til kopiering ved at klikke et startpunkt på skærmen 
uden at slippe museknappen, og trække musen til slutpunkt af området, og 
derefter slippe museknappen."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -98,11 +92,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Vis musemarkøren på skærmbilledet"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Forsinkelse inden billede "
-"tages"
+msgid "Delay before 
capturing"
+msgstr "Forsinkelse inden 
billede tages"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -145,7 +136,8 @@ msgstr "Åbn med:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Åbn skærmbilledet med det valgte program"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Program til åbning af skærmbilledet"
 
@@ -153,7 +145,8 @@ msgstr "Program til åbning af skærmbilledet"
 msgid "Host on ZimageZ"
 msgstr "Host på ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
+#: ../lib/screenshooter-dialogs.c:1032
+#: ../

Update German translation (Enrico Tröger).

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 658581022b311874c450c6b80f39bb0287a9733d (commit)
   from 45ccd5a8b9a6616fcd47021064e5a997ac4407dd (commit)

commit 658581022b311874c450c6b80f39bb0287a9733d
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 11:56:51 2009 +0100

Update German translation (Enrico Tröger).

 po/de.po |  180 -
 1 files changed, 94 insertions(+), 86 deletions(-)

diff --git a/po/de.po b/po/de.po
index db170ef..d84106f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,16 +1,16 @@
 # German translations for the xfce4-screenshooter-plugin package.
 # Copyright (C) 2006 Daniel Bobadilla Leal.
 # This file is distributed under the same license as the 
xfce4-screenshooter-plugin package.
-# Enrico Tröger , 2006, 2008.
+# Enrico Tröger , 2006, 2008-2009.
 # Fabian Nowak , 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-screenshooter-plugin 1.3.0\n"
+"Project-Id-Version: xfce4-screenshooter-plugin 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 09:53+0100\n"
-"PO-Revision-Date: 2009-04-14 23:34+0200\n"
-"Last-Translator: Fabian Nowak \n"
+"POT-Creation-Date: 2009-11-29 11:17+0100\n"
+"PO-Revision-Date: 2009-11-29 11:16+0100\n"
+"Last-Translator: Enrico Tröger \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -112,7 +112,7 @@ msgstr "Sekunden"
 
 #: ../lib/screenshooter-dialogs.c:917
 msgid "Action"
-msgstr ""
+msgstr "Aktion"
 
 #: ../lib/screenshooter-dialogs.c:945
 msgid "Action"
@@ -120,9 +120,8 @@ msgstr "Aktion"
 
 #. Save option radio button
 #: ../lib/screenshooter-dialogs.c:961
-#, fuzzy
 msgid "Save"
-msgstr "Speichern unter:"
+msgstr "Speichern"
 
 #: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
@@ -152,16 +151,15 @@ msgstr "Anwendung zum Öffnen des Bildschirmfotos"
 
 #: ../lib/screenshooter-dialogs.c:1028
 msgid "Host on ZimageZ"
-msgstr ""
+msgstr "Auf ZimageZ hochladen"
 
 #: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr ""
+msgstr "Auf ZimageZ hochladen, einem  kostenlosen Bilderdienst"
 
 #: ../lib/screenshooter-dialogs.c:1046
-#, fuzzy
 msgid "Preview"
-msgstr "Aktion"
+msgstr "Vorschau"
 
 #: ../lib/screenshooter-dialogs.c:1107
 msgid "Save screenshot as..."
@@ -170,199 +168,206 @@ msgstr "Speichere Bildschirmfoto als ..."
 #: ../lib/screenshooter-zimagez.c:134
 #, c-format
 msgid "An error occurred when creating the XMLRPC request."
-msgstr ""
+msgstr "Ein Fehler trat beim Erzeugen der XMLRPC-Anfrage auf."
 
 #: ../lib/screenshooter-zimagez.c:153
 #, c-format
 msgid "An error occurred when transferring the data to ZimageZ."
-msgstr ""
+msgstr "Ein Fehler trat beim Übertragen der Daten zu ZimageZ auf."
 
 #: ../lib/screenshooter-zimagez.c:178
 #, c-format
 msgid "An error occurred when parsing the response from ZimageZ."
-msgstr ""
+msgstr "Ein Fehler trat beim Lesen der Antwort von ZimageZ auf."
 
-#: ../lib/screenshooter-zimagez.c:228
+#. For translators: the first wildcard is the date, the second one the time,
+#. * e.g. "Taken on 12/31/99, at 23:13:48".
+#: ../lib/screenshooter-zimagez.c:230
 #, c-format
 msgid "Taken on %s, at %s"
-msgstr ""
+msgstr "Aufgenommen am %s, um %s"
 
 #. Start the user soup session
-#: ../lib/screenshooter-zimagez.c:295
+#: ../lib/screenshooter-zimagez.c:297
 msgid "Initialize the connection..."
-msgstr ""
+msgstr "Erstelle Verbindung..."
 
-#: ../lib/screenshooter-zimagez.c:341
+#: ../lib/screenshooter-zimagez.c:343
 msgid ""
-"Please file the following fields with your http://www.zimagez.com";
+"Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
+"Bitte füllen Sie die folgenden Felder mit Ihrem Benutzernamen und Passwort "
+"von \n"
+"http://www.zimagez.com\";>ZimageZ aus sowie mit den Details zum "
+"Bildschirmfoto."
 
-#: ../lib/screenshooter-zimagez.c:398
+#: ../lib/screenshooter-zimagez.c:400
 msgid "Check the user information..."
-msgstr ""
+msgstr "Benutzer-Informationen überprüfen..."
 
-#: ../lib/screenshooter-zimagez.c:405
-#, fuzzy
+#: ../lib/screenshooter-zimagez.c:407
 msgid ""
 "You "
 "must fill all the fields."
-msgstr "Aufnahmebereich"
+msgstr ""
+"Sie "
+"müssen alle Felder ausfüllen."
 
-#: ../lib/screenshooter-zimagez.c:419
+#: ../lib/screenshooter-zimagez.c:421
 msgid "Login on ZimageZ..."
-msgstr ""
+msgstr "Anmelden bei ZimageZ"
 
-#: ../lib/screenshooter-zimagez.c:459 ../lib/screenshooter-zimagez.c:610
+#: ../lib/screenshooter-zimagez.c:461 ../lib/screenshooter-zimagez.c:612
 msgid ""
 "An unexpected reply from ZimageZ was received. The upload of the screenshot "
 "failed."
 msgstr ""
+"Es wurde eine unerwartete Antwort von ZimageZ empfangen. Das Hochladen des "
+"Bildschirmfotos schlug fehl."
 
-#: ../lib/screenshooter-zimagez.c:498
-#, fuzzy
+#: ../lib/

[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-screenshooter

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 3f1d6c02c9ec04f40d8b85e65ff36009a4878240 (commit)
   from a8edd459ccac9fae1502abb4a597156cc169df13 (commit)

commit 3f1d6c02c9ec04f40d8b85e65ff36009a4878240
Merge: a8edd459ccac9fae1502abb4a597156cc169df13 
3c23eb77a5b09052c8713acedf44db92f72c138a
Author: Jérôme Guelfucci 
Date:   Sun Nov 29 11:49:26 2009 +0100

Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-screenshooter

commit 3c23eb77a5b09052c8713acedf44db92f72c138a
Author: Vincent Tunru 
Date:   Sun Nov 29 10:42:33 2009 +

l10n: Updates to Dutch (Flemish) (nl) translation

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

 po/nl.po |  154 --
 1 files changed, 49 insertions(+), 105 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 726ca98..1c4321b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: 1.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 09:53+0100\n"
-"PO-Revision-Date: 2009-11-28 21:20+0100\n"
+"PO-Revision-Date: 2009-11-29 11:42+0100\n"
 "Last-Translator: Vincent Tunru \n"
 "Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
@@ -27,15 +27,13 @@ msgid "Transfer"
 msgstr "Overdracht"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"De schermafdruk wordt "
-"overgedragen naar:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "De schermafdruk wordt 
overgedragen naar:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -52,15 +50,14 @@ msgstr "Voorkeuren"
 
 #: ../lib/screenshooter-dialogs.c:754
 msgid "Region to capture"
-msgstr ""
-"Gebied om een schermafdruk "
-"van te maken"
+msgstr "Gebied om een 
schermafdruk van te maken"
 
 #: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Volledig scherm"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Schermafdruk van het hele scherm maken"
@@ -69,7 +66,8 @@ msgstr "Schermafdruk van het hele scherm maken"
 msgid "Active window"
 msgstr "Actieve venster"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Actieve venster"
@@ -78,16 +76,11 @@ msgstr "Actieve venster"
 msgid "Select a region"
 msgstr "Selecteer een gebied"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Selecteer een gebied om een schermafdruk door te klikken op een hoek van het "
-"gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de "
-"andere hoek en laat de muisknop los."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Selecteer een gebied om een schermafdruk door te klikken op een hoek 
van het gebied zonder de muisknop zo te laten. Sleep vervolgens de muis naar de 
andere hoek en laat de muisknop los."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -98,11 +91,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Muisaanwijzer weergeven op de schermafdruk"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Vertraging voor het maken van "
-"de schermafdruk"
+msgid "Delay before 
capturing"
+msgstr "Vertraging voor het 
maken van de schermafdruk"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -135,8 +125,7 @@ msgstr "Kopieer naar klembord"
 
 #: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr ""
-"Kopieer de schermafdruk naar het klembord zodat deze later geplakt kan worden"
+msgstr "Kopieer de schermafdruk naar het klembord zodat deze later geplakt kan 
worden"
 
 #: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
@@ -146,7 +135,8 @@ msgstr "Openen met:"
 msgid "Open the screenshot with the chosen application"
 m

[Xfce4-commits] l10n: Updates to Chinese (China) (zh_CN) translation

[Transifex]

Updating branch refs/heads/master
 to c56ef912d5b766c4d7b1e916e3520b336ce7beb1 (commit)
   from 0879a8b4a6e615b544ba49d703a61cc321d9fd33 (commit)

commit c56ef912d5b766c4d7b1e916e3520b336ce7beb1
Author: Xu Meihong 
Date:   Sun Nov 29 11:04:29 2009 +

l10n: Updates to Chinese (China) (zh_CN) translation

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

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3f37f74..26d3318 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: xfce 4-screenshooter-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-29 14:26+0800\n"
+"PO-Revision-Date: 2009-11-29 19:06+0800\n"
 "Last-Translator: Hunt Xu \n"
 "Language-Team: Chinese (Simplified) \n"
 "MIME-Version: 1.0\n"
@@ -156,17 +156,17 @@ msgid "Save screenshot as..."
 msgstr "截图另存为..."
 
 #: ../lib/screenshooter-zimagez.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when creating the XMLRPC request."
 msgstr "创建 XMLRPC 请求时出现一个错误。"
 
 #: ../lib/screenshooter-zimagez.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when transferring the data to ZimageZ."
 msgstr "传送数据至 ZimageZ 时出现一个错误。"
 
 #: ../lib/screenshooter-zimagez.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when parsing the response from ZimageZ."
 msgstr "解析 ZimageZ 的响应时出现一个错误。"
 
@@ -183,7 +183,6 @@ msgid "Initialize the connection..."
 msgstr "初始化连接..."
 
 #: ../lib/screenshooter-zimagez.c:343
-#, fuzzy
 msgid ""
 "Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Chinese (China) (zh_CN) translation

[Transifex]

Updating branch refs/heads/master
 to f46bbbf86df199e8a4a31da49dcaa01a965c8742 (commit)
   from c56ef912d5b766c4d7b1e916e3520b336ce7beb1 (commit)

commit f46bbbf86df199e8a4a31da49dcaa01a965c8742
Author: Xu Meihong 
Date:   Sun Nov 29 11:18:49 2009 +

l10n: Updates to Chinese (China) (zh_CN) translation

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

 po/zh_CN.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 26d3318..e26f4db 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: xfce 4-screenshooter-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-29 19:06+0800\n"
+"PO-Revision-Date: 2009-11-29 19:20+0800\n"
 "Last-Translator: Hunt Xu \n"
 "Language-Team: Chinese (Simplified) \n"
 "MIME-Version: 1.0\n"
@@ -175,7 +175,7 @@ msgstr "解析 ZimageZ 的响应时出现一个错误。"
 #: ../lib/screenshooter-zimagez.c:230
 #, c-format
 msgid "Taken on %s, at %s"
-msgstr "截取 %s，在 %s"
+msgstr "截图日期 %s，时间 %s"
 
 #. Start the user soup session
 #: ../lib/screenshooter-zimagez.c:297
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Latvian (lv) translation

[Transifex]

Updating branch refs/heads/master
 to 1f3158d624ddec3c1a915030d7ede77170f5879b (commit)
   from f46bbbf86df199e8a4a31da49dcaa01a965c8742 (commit)

commit 1f3158d624ddec3c1a915030d7ede77170f5879b
Author: Rihards Prieditis 
Date:   Sun Nov 29 11:19:02 2009 +

l10n: Updates to Latvian (lv) translation

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

 po/lv.po |  162 ++
 1 files changed, 57 insertions(+), 105 deletions(-)

diff --git a/po/lv.po b/po/lv.po
index 0dd3895..01c9891 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,15 +9,14 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-10-21 13:36+0100\n"
-"Last-Translator: Rihards Prieditis \n"
+"PO-Revision-Date: 2009-11-29 11:18+0100\n"
+"Last-Translator: Rihards Priedītis \n"
 "Language-Team: Latvian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 
2);\n"
 
 #: ../lib/screenshooter-dialogs.c:478
 #, c-format
@@ -29,15 +28,13 @@ msgid "Transfer"
 msgstr "Pārsūtīt"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"Ekrāna kopija tiek pārsūtīta "
-"uz:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "Ekrāna kopija tiek 
pārsūtīta uz:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -60,7 +57,8 @@ msgstr "Ķeramais reģions
 msgid "Entire screen"
 msgstr "Visu ekrānu"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Uzņemt visa ekrāna ekrānkopiju"
@@ -69,7 +67,8 @@ msgstr "Uzņemt visa ekrāna ekrānkopiju"
 msgid "Active window"
 msgstr "Aktīvais logs"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Uzņemt aktīvā loga ekrānkopiju"
@@ -78,15 +77,11 @@ msgstr "Uzņemt aktīvā loga ekrānkopiju"
 msgid "Select a region"
 msgstr "Atlasīt reģionu"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Atlasīt reģionu kuru uzņemt. Klikšķiniet uz ekrāna neatlaižot peli un "
-"velciet peli līdz nākamajam reģiona stūrim, pēc tam atlaižiet peles pogu."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Atlasīt reģionu kuru uzņemt. Klikšķiniet uz ekrāna neatlaižot peli un 
velciet peli līdz nākamajam reģiona stūrim, pēc tam atlaižiet peles pogu."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -97,11 +92,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Attēlot peles kursoru ekrānkopijā"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Aizture pirms uzņemšanas"
+msgid "Delay before 
capturing"
+msgstr "Aizture pirms 
uzņemšanas"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -113,7 +105,7 @@ msgstr "sekundes"
 
 #: ../lib/screenshooter-dialogs.c:917
 msgid "Action"
-msgstr ""
+msgstr "Darbība"
 
 #: ../lib/screenshooter-dialogs.c:945
 msgid "Action"
@@ -121,9 +113,8 @@ msgstr "Darbības"
 
 #. Save option radio button
 #: ../lib/screenshooter-dialogs.c:961
-#, fuzzy
 msgid "Save"
-msgstr "Saglabāt iekš:"
+msgstr "Saglabāt"
 
 #: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
@@ -145,7 +136,8 @@ msgstr "Atvērt ar:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Atvērt ekrānkopiju ar izvēlēto lietotni"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgs

[Xfce4-commits] l10n: Updates to Japanese (ja) translation

[Transifex]

Updating branch refs/heads/master
 to 345ca9e815314a8d7c924257491cab3e00e3102f (commit)
   from 1f3158d624ddec3c1a915030d7ede77170f5879b (commit)

commit 345ca9e815314a8d7c924257491cab3e00e3102f
Author: Masato Hashimoto 
Date:   Sun Nov 29 11:20:02 2009 +

l10n: Updates to Japanese (ja) translation

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

 po/ja.po |  157 --
 1 files changed, 51 insertions(+), 106 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 84e182b..20f2daa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-screenshooter-plugin 1.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-11 23:22+0900\n"
+"POT-Creation-Date: 2009-11-29 20:18+0900\n"
+"PO-Revision-Date: 2009-11-29 20:19+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -28,15 +28,13 @@ msgid "Transfer"
 msgstr "転送"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"スクリーンショットの転送先:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "スクリーンショットの転送先:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -59,7 +57,8 @@ msgstr "撮影する領域
 msgid "Entire screen"
 msgstr "画面全体"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "画面全体のスクリーンショットを撮ります"
@@ -68,7 +67,8 @@ msgstr "画面全体のスクリーンショットを撮ります"
 msgid "Active window"
 msgstr "アクティブウィンドウ"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "アクティブウィンドウのスクリーンショットを撮ります"
@@ -77,15 +77,11 @@ msgstr "アクティブウィンドウのスクリーンショットを撮りま
 msgid "Select a region"
 msgstr "選択した領域"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"画面の一点をクリックおよびそこからドラッグし、マウスボタンを離したところまで"
-"の矩形領域を撮ります。"
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "画面の一点をクリックおよびそこからドラッグし、マウスボタンを離したところまでの矩形領域を撮ります。"
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -96,10 +92,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "スクリーンショットにマウスポインタを表示します"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"撮影するまでの遅延時間"
+msgid "Delay before 
capturing"
+msgstr "撮影するまでの遅延時間"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -132,9 +126,7 @@ msgstr "クリップボードにコピーする"
 
 #: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr ""
-"後で貼り付けることができるよう、クリップボードにスクリーンショットをコピーし"
-"ます。"
+msgstr "後で貼り付けることができるよう、クリップボードにスクリーンショットをコピーします。"
 
 #: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
@@ -144,7 +136,8 @@ msgstr "アプリケーションで開く:"
 msgid "Open the screenshot with the chosen application"
 msgstr "選択したアプリケーションでスクリーンショットを開きます"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "スクリーンショットを開くアプリケーションを設定します"
 
@@ -152,10 +145,10 @@ msgstr "スクリーンショットを開くアプリケーションを設定し
 msgid "Host on ZimageZ"
 msgstr "ZimageZ で公開する"
 
-#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
+#: ../lib/screenshooter-dialogs.c:1032
+#: ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
-msgstr ""
-"スクリーンショットをフリーのウェブホスティングサービス ZimageZ で公開します"
+msgstr "スクリーンショットをフリーのウェブホスティングサービス ZimageZ で公開します"
 
 #: ../lib/screenshooter-dialogs.c:1046
 msgid "Preview"
@@ -166,17 +159,17 @@ msgid "Save screenshot as..."
 msgstr "名前をつけてスクリーンショットを保存..."
 
 #: ../lib/screenshooter-zimagez.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when creating the XMLRPC request."
 msgstr "XMLRPC リクエストの生成中にエラーが発生しました。"
 
 #: ../lib/sc

[Xfce4-commits] l10n: Updates to English (United Kingdom) (en_GB) translation

[Transifex]

Updating branch refs/heads/master
 to 17bbcfbe6b386611d4700f7fc3cdfdef8a4f312e (commit)
   from 345ca9e815314a8d7c924257491cab3e00e3102f (commit)

commit 17bbcfbe6b386611d4700f7fc3cdfdef8a4f312e
Author: Jeff Bailes 
Date:   Sun Nov 29 11:31:13 2009 +

l10n: Updates to English (United Kingdom) (en_GB) translation

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

 po/en_GB.po |   11 +--
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 753ea3c..4c33f81 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-29 15:06+1100\n"
+"PO-Revision-Date: 2009-11-29 22:31+1100\n"
 "Last-Translator: Jeff Bailes \n"
 "Language-Team: English/GB \n"
 "MIME-Version: 1.0\n"
@@ -165,17 +165,17 @@ msgid "Save screenshot as..."
 msgstr "Save screenshot as..."
 
 #: ../lib/screenshooter-zimagez.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when creating the XMLRPC request."
 msgstr "An error occurred when creating the XMLRPC request."
 
 #: ../lib/screenshooter-zimagez.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when transferring the data to ZimageZ."
 msgstr "An error occurred when transferring the data to ZimageZ."
 
 #: ../lib/screenshooter-zimagez.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when parsing the response from ZimageZ."
 msgstr "An error occurred when parsing the response from ZimageZ."
 
@@ -192,13 +192,12 @@ msgid "Initialize the connection..."
 msgstr "Initialise the connection..."
 
 #: ../lib/screenshooter-zimagez.c:343
-#, fuzzy
 msgid ""
 "Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
 "user name, passsword and details about the screenshot."
 msgstr ""
-"Please file the following fields with your http://www.zimagez.com";
+"Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
 "user name, passsword and details about the screenshot."
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Russian (ru) translation

[Transifex]

Updating branch refs/heads/master
 to 63ab5332b0a6b9b9e60d588e413c008321f5e69a (commit)
   from 17bbcfbe6b386611d4700f7fc3cdfdef8a4f312e (commit)

commit 63ab5332b0a6b9b9e60d588e413c008321f5e69a
Author: Denis Koryavov 
Date:   Sun Nov 29 11:43:39 2009 +

l10n: Updates to Russian (ru) translation

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

 po/ru.po |7 +++
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 028bb26..605c565 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -169,17 +169,17 @@ msgid "Save screenshot as..."
 msgstr "Сохранить снимок как..."
 
 #: ../lib/screenshooter-zimagez.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when creating the XMLRPC request."
 msgstr "Произошла ошибка при создании запроса XMLRPC."
 
 #: ../lib/screenshooter-zimagez.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when transferring the data to ZimageZ."
 msgstr "Не удалось передать изображение на сервер ZimageZ."
 
 #: ../lib/screenshooter-zimagez.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when parsing the response from ZimageZ."
 msgstr "Произошла ошибка при разборе ответа от сервера ZimageZ."
 
@@ -196,7 +196,6 @@ msgid "Initialize the connection..."
 msgstr "Устанавливается соединение..."
 
 #: ../lib/screenshooter-zimagez.c:343
-#, fuzzy
 msgid ""
 "Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Catalan (Valencian) (ca) translation

[Transifex]

Updating branch refs/heads/master
 to 88b17e7064c55e6ae8590a74cecfe7b3f82ba475 (commit)
   from 63ab5332b0a6b9b9e60d588e413c008321f5e69a (commit)

commit 88b17e7064c55e6ae8590a74cecfe7b3f82ba475
Author: Carles Muñoz Gorriz 
Date:   Sun Nov 29 12:11:10 2009 +

l10n: Updates to Catalan (Valencian) (ca) translation

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

 po/ca.po |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 811fa4c..1bac786 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the
 # xfce4-screenshooter-plugin package.
 # Carles Muñoz Gorriz , 2006, 2008-2009.
+# Harald Servat , 2009.
 #
 #
 msgid ""
@@ -10,8 +11,8 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-24 14:59+0100\n"
-"Last-Translator: Harald Servat \n"
+"PO-Revision-Date: 2009-11-29 13:08+0100\n"
+"Last-Translator: Carles Muñoz Gorriz \n"
 "Language-Team: Catalan \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,17 +171,17 @@ msgid "Save screenshot as..."
 msgstr "Desa la captura com…"
 
 #: ../lib/screenshooter-zimagez.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when creating the XMLRPC request."
 msgstr "Hi ha hagut un error mentre es creava la petició XMLRPC."
 
 #: ../lib/screenshooter-zimagez.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when transferring the data to ZimageZ."
 msgstr "Hi ha hagut un error mentre es transferia les dades cap a ZimageZ."
 
 #: ../lib/screenshooter-zimagez.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when parsing the response from ZimageZ."
 msgstr "Hi ha hagut un error mentre s'analitzava la resposta de ZimageZ."
 
@@ -197,7 +198,6 @@ msgid "Initialize the connection..."
 msgstr "Inicialitza la connexió…"
 
 #: ../lib/screenshooter-zimagez.c:343
-#, fuzzy
 msgid ""
 "Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Don't capitalize bookmark addresses automatically on Hildon

[Christian Dywan]

Updating branch refs/heads/master
 to 7d89c3c3578a7ac4747c8793dba40b48f5631085 (commit)
   from 1d68dc9fb7a6f89f325e9c26d60f7ac4e8b7c0ad (commit)

commit 7d89c3c3578a7ac4747c8793dba40b48f5631085
Author: Christian Dywan 
Date:   Sat Nov 28 19:39:47 2009 +0100

Don't capitalize bookmark addresses automatically on Hildon

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 25d064a..964c1b7 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -742,6 +742,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* 
browser,
 gtk_size_group_add_widget (sizegroup, label);
 gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 entry_uri = gtk_entry_new ();
+#if HAVE_HILDON
+HildonGtkInputMode mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY 
(entry_uri));
+mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP;
+hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_uri), mode);
+#endif
 gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
 gtk_entry_set_text (GTK_ENTRY (entry_uri), katze_item_get_uri 
(bookmark));
 midori_browser_edit_bookmark_uri_changed_cb (GTK_ENTRY (entry_uri),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Implement and optimize for portrait mode support for Fremantle

[Christian Dywan]

Updating branch refs/heads/master
 to 1d68dc9fb7a6f89f325e9c26d60f7ac4e8b7c0ad (commit)
   from 11de65af920275d97c39e1f00eb768545c145395 (commit)

commit 1d68dc9fb7a6f89f325e9c26d60f7ac4e8b7c0ad
Author: Christian Dywan 
Date:   Fri Nov 27 23:42:07 2009 +0100

Implement and optimize for portrait mode support for Fremantle

Listen to accelerometer movement.
Hide tool items in portrait mode.
Omit Homepage and View Source from app menu.
Include Compact Add, View Source and Fullscreen in context menu.
Hide buttons in portrait mode in preferences.

 katze/katze-preferences.c |   30 ++--
 midori/midori-app.c   |   11 ++
 midori/midori-browser.c   |   83 
 midori/midori-view.c  |   14 ++--
 4 files changed, 123 insertions(+), 15 deletions(-)

diff --git a/katze/katze-preferences.c b/katze/katze-preferences.c
index f42f77d..91006cb 100644
--- a/katze/katze-preferences.c
+++ b/katze/katze-preferences.c
@@ -66,6 +66,19 @@ katze_preferences_response_cb (KatzePreferences* preferences,
 gtk_widget_destroy (GTK_WIDGET (preferences));
 }
 
+#ifdef HAVE_HILDON_2_2
+static void
+katze_preferences_size_request_cb (KatzePreferences* preferences,
+   GtkRequisition*   requisition)
+{
+GdkScreen* screen = gtk_widget_get_screen (GTK_WIDGET (preferences));
+if (gdk_screen_get_height (screen) > gdk_screen_get_width (screen))
+gtk_widget_hide (gtk_dialog_get_action_area (GTK_DIALOG 
(preferences)));
+else
+gtk_widget_show (gtk_dialog_get_action_area (GTK_DIALOG 
(preferences)));
+}
+#endif
+
 static void
 katze_preferences_init (KatzePreferences* preferences)
 {
@@ -94,9 +107,17 @@ katze_preferences_init (KatzePreferences* preferences)
 #endif
 NULL);
 #endif
+
 g_object_connect (preferences,
 "signal::response", katze_preferences_response_cb, NULL,
 NULL);
+
+#ifdef HAVE_HILDON_2_2
+katze_preferences_size_request_cb (preferences, NULL);
+g_object_connect (preferences,
+"signal::size-request", katze_preferences_size_request_cb, NULL,
+NULL);
+#endif
 }
 
 static void
@@ -168,7 +189,8 @@ katze_preferences_prepare (KatzePreferences* preferences)
 priv->sizegroup = NULL;
 priv->sizegroup2 = NULL;
 
-g_signal_connect (priv->scrolled, "destroy", G_CALLBACK 
(gtk_widget_destroyed), &priv->scrolled);
+g_signal_connect (priv->scrolled, "destroy",
+  G_CALLBACK (gtk_widget_destroyed), &priv->scrolled);
 #else
 priv->notebook = gtk_notebook_new ();
 gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
@@ -195,7 +217,8 @@ katze_preferences_prepare (KatzePreferences* preferences)
 priv->box = NULL;
 priv->hbox = NULL;
 
-g_signal_connect (priv->notebook, "destroy", G_CALLBACK 
(gtk_widget_destroyed), &priv->notebook);
+g_signal_connect (priv->notebook, "destroy",
+  G_CALLBACK (gtk_widget_destroyed), &priv->notebook);
 #endif
 
 #if HAVE_OSX
@@ -206,8 +229,7 @@ katze_preferences_prepare (KatzePreferences* preferences)
 gtk_button_set_image (GTK_BUTTON (button), icon);
 g_signal_connect (button, "clicked",
 G_CALLBACK (katze_preferences_help_clicked_cb), preferences);
-gtk_box_pack_end (GTK_BOX (hbox),
-button, FALSE, FALSE, 4);
+gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 4);
 gtk_box_pack_end (GTK_BOX (GTK_DIALOG (preferences)->action_area),
 hbox, FALSE, FALSE, 0);
 #endif
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 434e346..cb756e1 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -22,6 +22,11 @@
 
 #if HAVE_HILDON
 #include 
+#ifdef HAVE_HILDON_2_2
+#include 
+#include 
+#include 
+#endif
 typedef osso_context_t* MidoriAppInstance;
 #define MidoriAppInstanceNull NULL
 #elif HAVE_UNIQUE
@@ -642,6 +647,12 @@ midori_app_create_instance (MidoriApp*   app,
 osso_deinitialize (instance);
 return NULL;
 }
+
+#ifdef HAVE_HILDON_2_2
+if (OSSO_OK == osso_rpc_run_system (instance, MCE_SERVICE, 
MCE_REQUEST_PATH,
+MCE_REQUEST_IF, MCE_ACCELEROMETER_ENABLE_REQ, NULL, DBUS_TYPE_INVALID))
+/* Accelerometer enabled */;
+#endif
 #else
 GdkDisplay* display;
 gchar* display_name;
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 588ca57..25d064a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -38,6 +38,16 @@
 #include 
 #endif
 
+#ifdef HAVE_HILDON_2_2
+#include 
+#include 
+#include 
+#define MCE_SIGNAL_MATCH "type='signal'," \
+"sender='"MCE_SERVICE "',"\
+"path='"  MCE_SIGNAL_PATH "',"\
+"interface='" MCE_SIGNAL_IF   "'"
+#endif
+
 struct _MidoriBrowser
 {
 #if HAVE_HILDON
@@ -3029,8 +3039,6 @@ _action_compa

[Xfce4-commits] Omit Help in Adblock and Search Engines dialogues on Hildon

[Christian Dywan]

Updating branch refs/heads/master
 to 183878db8c38746caf9efdb3fdd5d347b746f222 (commit)
   from 7d89c3c3578a7ac4747c8793dba40b48f5631085 (commit)

commit 183878db8c38746caf9efdb3fdd5d347b746f222
Author: Christian Dywan 
Date:   Sat Nov 28 19:40:57 2009 +0100

Omit Help in Adblock and Search Engines dialogues on Hildon

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

diff --git a/extensions/adblock.c b/extensions/adblock.c
index b62ba05..878d60d 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -374,7 +374,9 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
 dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser),
 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
 #if !HAVE_OSX
+#if !HAVE_HILDON
 GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+#endif
 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 #endif
 NULL);
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 9305cb1..ba062c4 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -1216,7 +1216,9 @@ midori_search_action_get_dialog (MidoriSearchAction* 
search_action)
 toplevel ? GTK_WINDOW (toplevel) : NULL,
 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
 #if !HAVE_OSX
+#if !HAVE_HILDON
 GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+#endif
 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 #endif
 NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use a standard entry widget in the location on Hildon

[Christian Dywan]

Updating branch refs/heads/master
 to 206fee346bb0dee2043a48bbd849ebc126d8f107 (commit)
   from 04ebfb473318cfd6ce60a446b2fe78d2f7e85020 (commit)

commit 206fee346bb0dee2043a48bbd849ebc126d8f107
Author: Christian Dywan 
Date:   Sat Nov 28 19:43:59 2009 +0100

Use a standard entry widget in the location on Hildon

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

diff --git a/midori/midori-locationentry.c b/midori/midori-locationentry.c
index 3503168..cb42c67 100644
--- a/midori/midori-locationentry.c
+++ b/midori/midori-locationentry.c
@@ -381,12 +381,13 @@ midori_location_entry_init (MidoriLocationEntry* 
location_entry)
 
 location_entry->progress = 0.0;
 
-entry = gtk_icon_entry_new ();
 #if HAVE_HILDON
+entry = gtk_entry_new ();
 mode = hildon_gtk_entry_get_input_mode (GTK_ENTRY (entry));
 mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP;
 hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry), mode);
 #else
+entry = gtk_icon_entry_new ();
 gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
  GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FILE);
 gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (entry),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Adjust input mode of numeric property proxies on Hildon

[Christian Dywan]

Updating branch refs/heads/master
 to 35789798b104661cf7d6c154646baca554067538 (commit)
   from 206fee346bb0dee2043a48bbd849ebc126d8f107 (commit)

commit 35789798b104661cf7d6c154646baca554067538
Author: Christian Dywan 
Date:   Sat Nov 28 19:45:02 2009 +0100

Adjust input mode of numeric property proxies on Hildon

 katze/katze-utils.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 5f60042..452ed54 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -737,6 +737,10 @@ katze_property_proxy (gpointer object,
 widget = gtk_spin_button_new_with_range (
 G_PARAM_SPEC_INT (pspec)->minimum,
 G_PARAM_SPEC_INT (pspec)->maximum, 1);
+#if HAVE_HILDON
+hildon_gtk_entry_set_input_mode (GTK_ENTRY (widget),
+ HILDON_GTK_INPUT_MODE_NUMERIC);
+#endif
 /* Keep it narrow, 5 digits are usually fine */
 gtk_entry_set_width_chars (GTK_ENTRY (widget), 5);
 gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Position array menu freely to avoid a GTK+ bug on Hildon

[Christian Dywan]

Updating branch refs/heads/master
 to 04ebfb473318cfd6ce60a446b2fe78d2f7e85020 (commit)
   from 183878db8c38746caf9efdb3fdd5d347b746f222 (commit)

commit 04ebfb473318cfd6ce60a446b2fe78d2f7e85020
Author: Christian Dywan 
Date:   Sat Nov 28 19:42:43 2009 +0100

Position array menu freely to avoid a GTK+ bug on Hildon

 katze/katze-arrayaction.c |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c
index ca17aed..4b3cd1e 100644
--- a/katze/katze-arrayaction.c
+++ b/katze/katze-arrayaction.c
@@ -388,8 +388,14 @@ katze_array_action_proxy_clicked_cb (GtkWidget*
proxy,
 if (array == array_action->array)
 g_signal_emit (array_action, signals[POPULATE_POPUP], 0, menu);
 
+#if HAVE_HILDON
+/* Avoid a bug in GTK+ messing up the initial scrolling position */
+katze_widget_popup (NULL, GTK_MENU (menu),
+NULL, KATZE_MENU_POSITION_LEFT);
+#else
 katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu),
 NULL, KATZE_MENU_POSITION_LEFT);
+#endif
 }
 
 static GtkWidget*
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Replace Bookmarks with Tools in the Hildon toolbar layout

[Christian Dywan]

Updating branch refs/heads/master
 to 2ace79c85a789d016113bc026d30d37168a2b4f2 (commit)
   from 35789798b104661cf7d6c154646baca554067538 (commit)

commit 2ace79c85a789d016113bc026d30d37168a2b4f2
Author: Christian Dywan 
Date:   Sat Nov 28 19:50:56 2009 +0100

Replace Bookmarks with Tools in the Hildon toolbar layout

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 964c1b7..6066072 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -5493,7 +5493,7 @@ midori_browser_set_portrait_mode (MidoriBrowser* browser,
 else
 hildon_gtk_window_set_portrait_flags (GTK_WINDOW (browser),
   ~HILDON_PORTRAIT_MODE_REQUEST);
-_action_set_visible (browser, "Bookmarks", !portrait);
+_action_set_visible (browser, "Tools", !portrait);
 _action_set_visible (browser, "CompactAdd", !portrait);
 _action_set_visible (browser, "Back", !portrait);
 _action_set_visible (browser, "SourceView", !portrait);
@@ -6198,7 +6198,7 @@ _midori_browser_set_toolbar_items (MidoriBrowser* browser,
 GtkWidget* toolitem;
 
 #if HAVE_HILDON
-items = "Bookmarks,CompactAdd,ReloadStop,Location,Back,Fullscreen";
+items = "Tools,CompactAdd,ReloadStop,Location,Back,Fullscreen";
 #endif
 
 gtk_container_foreach (GTK_CONTAINER (browser->navigationbar),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Include config.h in KatzeArrayAction

[Christian Dywan]

Updating branch refs/heads/master
 to 84f8207c51e284c57a9f88392b4bde880f26d208 (commit)
   from 2ace79c85a789d016113bc026d30d37168a2b4f2 (commit)

commit 84f8207c51e284c57a9f88392b4bde880f26d208
Author: Christian Dywan 
Date:   Sat Nov 28 19:55:01 2009 +0100

Include config.h in KatzeArrayAction

 katze/katze-arrayaction.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c
index 4b3cd1e..53209b8 100644
--- a/katze/katze-arrayaction.c
+++ b/katze/katze-arrayaction.c
@@ -20,6 +20,10 @@
 #include 
 #include 
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 struct _KatzeArrayAction
 {
 GtkAction parent_instance;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use icon names for search engines directly instead of pixbufs

[Christian Dywan]

Updating branch refs/heads/master
 to 565e32599e362056cb8cd8be960d1c60aa258487 (commit)
   from 84f8207c51e284c57a9f88392b4bde880f26d208 (commit)

commit 565e32599e362056cb8cd8be960d1c60aa258487
Author: Christian Dywan 
Date:   Sat Nov 28 23:47:29 2009 +0100

Use icon names for search engines directly instead of pixbufs

 midori/gtkiconentry.h|1 +
 midori/midori-searchaction.c |   70 +
 midori/midori-view.c |   21 
 3 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index d34ff96..c214568 100644
--- a/midori/gtkiconentry.h
+++ b/midori/gtkiconentry.h
@@ -39,6 +39,7 @@ G_BEGIN_DECLS
 #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY
 #define gtk_icon_entry_new gtk_entry_new
 #define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock
+#define gtk_icon_entry_set_icon_from_icon_name 
gtk_entry_set_icon_from_icon_name
 
 void
 gtk_icon_entry_set_icon_from_pixbuf (GtkEntry*entry,
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index ba062c4..e324b19 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -407,9 +407,9 @@ midori_search_action_manage_activate_cb (GtkWidget* 
 menuitem,
 
 /* Private function, used by MidoriView */
 /* static */ GdkPixbuf*
-midori_search_action_get_icon (KatzeNet*  net,
-   KatzeItem* item,
-   GtkWidget* widget)
+midori_search_action_get_icon (KatzeItem*item,
+   GtkWidget*widget,
+   const gchar** icon_name)
 {
 const gchar* icon;
 
@@ -417,25 +417,21 @@ midori_search_action_get_icon (KatzeNet*  net,
 {
 GdkScreen* screen;
 GtkIconTheme* icon_theme;
-gint width, height;
-GdkPixbuf* pixbuf;
 
-if (G_UNLIKELY (!(screen = gtk_widget_get_screen (widget
-return gtk_widget_render_icon (widget, GTK_STOCK_FILE,
-   GTK_ICON_SIZE_MENU, NULL);
+screen = gtk_widget_get_screen (widget);
 icon_theme = gtk_icon_theme_get_for_screen (screen);
-gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
-GTK_ICON_SIZE_MENU, &width, &height);
-if ((pixbuf = gtk_icon_theme_load_icon (icon_theme, icon, MAX (width, 
height),
-   GTK_ICON_LOOKUP_USE_BUILTIN, NULL)))
-return pixbuf;
+if (gtk_icon_theme_has_icon (icon_theme, icon))
+*icon_name = icon;
+else
+*icon_name = GTK_STOCK_FILE;
+return NULL;
 }
 
 if ((icon = katze_item_get_uri (item)) && (g_strstr_len (icon, 8, "://")))
 return katze_load_cached_icon (icon, widget);
 
-return gtk_widget_render_icon (widget, GTK_STOCK_FILE,
-   GTK_ICON_SIZE_MENU, NULL);
+*icon_name = GTK_STOCK_FILE;
+return NULL;
 }
 
 static void
@@ -463,13 +459,20 @@ midori_search_action_icon_released_cb (GtkWidget* 
  entry,
 {
 do
 {
+const gchar* icon_name;
+
 menuitem = gtk_image_menu_item_new_with_label (
 katze_item_get_name (item));
 image = gtk_image_new ();
-icon = midori_search_action_get_icon (
-MIDORI_SEARCH_ACTION (action)->net, item, entry);
-gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon);
-g_object_unref (icon);
+icon = midori_search_action_get_icon (item, entry, &icon_name);
+if (icon)
+{
+gtk_image_set_from_pixbuf (GTK_IMAGE (image), icon);
+g_object_unref (icon);
+}
+else
+gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name,
+  GTK_ICON_SIZE_MENU);
 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), 
image);
 #if GTK_CHECK_VERSION (2, 16, 0)
 gtk_image_menu_item_set_always_show_image (
@@ -524,11 +527,19 @@ midori_search_action_set_entry_icon (MidoriSearchAction* 
search_action,
 
 if (search_action->current_item)
 {
-icon = midori_search_action_get_icon (search_action->net,
-search_action->current_item, entry);
-gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry),
- GTK_ICON_ENTRY_PRIMARY, icon);
-g_object_unref (icon);
+const gchar* icon_name;
+
+icon = midori_search_action_get_icon (search_action->current_item,
+  entry, &icon_name);
+if (icon)
+{
+gtk_icon_entry_set_icon_from_pixbuf (GTK_ICON_ENTRY (entry),
+ GTK_IC

[Xfce4-commits] Align app proxy icons, catch missing icons and respect should show

[Christian Dywan]

Updating branch refs/heads/master
 to a589c2a5bcf03fe9b6de2a2fc7f6e39f6c108628 (commit)
   from 5a3bd9e15f986a0404dd36c96b61e7b9f8514af9 (commit)

commit a589c2a5bcf03fe9b6de2a2fc7f6e39f6c108628
Author: Christian Dywan 
Date:   Sun Nov 29 14:06:52 2009 +0100

Align app proxy icons, catch missing icons and respect should show

 katze/katze-utils.c |   18 +-
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 452ed54..f5566c8 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -616,12 +616,16 @@ katze_property_proxy (gpointer object,
 GtkComboBox* combo;
 GList* apps;
 const gchar* app_type = &hint[12];
+gint icon_width = 16;
+gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL);
 
-model = gtk_list_store_new (3, G_TYPE_APP_INFO, G_TYPE_STRING, 
G_TYPE_STRING);
+model = gtk_list_store_new (4, G_TYPE_APP_INFO, G_TYPE_STRING,
+   G_TYPE_STRING, G_TYPE_INT);
 widget = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
 renderer = gtk_cell_renderer_pixbuf_new ();
 gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, FALSE);
 gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, 
"icon-name", 1);
+gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, 
"width", 3);
 renderer = gtk_cell_renderer_text_new ();
 gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE);
 gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (widget), renderer, 
"text", 2);
@@ -641,17 +645,21 @@ katze_property_proxy (gpointer object,
 GAppInfo* info;
 
 gtk_list_store_insert_with_values (model, &iter_none, 0,
-0, NULL, 1, NULL, 2, _("None"), -1);
+0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1);
 
 while ((info = g_list_nth_data (apps, i++)))
 {
 const gchar* name = g_app_info_get_name (info);
 GIcon* icon = g_app_info_get_icon (info);
-gchar* icon_name = g_icon_to_string (icon);
+gchar* icon_name;
 GtkTreeIter iter;
 
+if (!g_app_info_should_show (info))
+continue;
+
+icon_name = icon ? g_icon_to_string (icon) : NULL;
 gtk_list_store_insert_with_values (model, &iter, G_MAXINT,
-0, info, 1, icon_name, 2, name, -1);
+0, info, 1, icon_name, 2, name, 3, icon_width, -1);
 if (string && !strcmp (katze_app_info_get_commandline (info), 
string))
 gtk_combo_box_set_active_iter (combo, &iter);
 
@@ -661,7 +669,7 @@ katze_property_proxy (gpointer object,
 info = g_app_info_create_from_commandline ("",
 "", G_APP_INFO_CREATE_NONE, NULL);
 gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
-0, info, 1, NULL, 2, _("Custom..."), -1);
+0, info, 1, NULL, 2, _("Custom..."), 3, icon_width, -1);
 g_object_unref (info);
 
 if (gtk_combo_box_get_active (combo) == -1)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Refactor compact add and error message dialogues

[Christian Dywan]

Updating branch refs/heads/master
 to dd97edf8565148246435a6b36885b1d66906d9e3 (commit)
   from a589c2a5bcf03fe9b6de2a2fc7f6e39f6c108628 (commit)

commit dd97edf8565148246435a6b36885b1d66906d9e3
Author: Christian Dywan 
Date:   Sun Nov 29 14:08:52 2009 +0100

Refactor compact add and error message dialogues

 midori/midori-browser.c |   63 ++
 midori/sokoke.c |   39 +++-
 midori/sokoke.h |3 +-
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index c2e3fdb..8afd16a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2258,16 +2258,7 @@ midori_browser_subscribe_to_news_feed (MidoriBrowser* 
browser,
 if (browser->news_aggregator && *browser->news_aggregator)
 sokoke_spawn_program (browser->news_aggregator, uri, FALSE);
 else
-{
-GtkWidget* dialog = gtk_message_dialog_new (
-GTK_WINDOW (browser), 0, GTK_MESSAGE_INFO,
-GTK_BUTTONS_OK, "%s", _("New feed"));
-gtk_message_dialog_format_secondary_text (
-GTK_MESSAGE_DIALOG (dialog), "%s", uri);
-gtk_widget_show (dialog);
-g_signal_connect_swapped (dialog, "response",
-G_CALLBACK (gtk_widget_destroy), dialog);
-}
+sokoke_message_dialog (GTK_MESSAGE_INFO, _("New feed"), uri);
 }
 
 static void
@@ -2291,8 +2282,9 @@ _action_compact_add_activate (GtkAction* action,
 {
 GtkWidget* dialog;
 GtkBox* box;
-gchar* label = NULL;
-GtkWidget* button;
+const gchar* actions[] = { "BookmarkAdd", "AddSpeedDial",
+   "AddDesktopShortcut", "AddNewsFeed" };
+guint i;
 
 if (!GTK_WIDGET_VISIBLE (browser))
 return;
@@ -2302,30 +2294,25 @@ _action_compact_add_activate (GtkAction* action,
 "title", _("Add a new bookmark"), NULL);
 box = GTK_BOX (GTK_DIALOG (dialog)->vbox);
 
-action = _action_by_name (browser, "BookmarkAdd");
-katze_assign (label, katze_object_get_string (action, "label"));
-button = gtk_button_new_with_mnemonic (label);
-gtk_box_pack_start (box, button, TRUE, TRUE, 4);
-gtk_action_connect_proxy (action, button);
-action = _action_by_name (browser, "AddSpeedDial");
-katze_assign (label, katze_object_get_string (action, "label"));
-button = gtk_button_new_with_mnemonic (label);
-gtk_box_pack_start (box, button, TRUE, TRUE, 4);
-gtk_action_connect_proxy (action, button);
-action = _action_by_name (browser, "AddDesktopShortcut");
-katze_assign (label, katze_object_get_string (action, "label"));
-button = gtk_button_new_with_mnemonic (label);
-gtk_box_pack_start (box, button, TRUE, TRUE, 4);
-gtk_action_connect_proxy (action, button);
-action = _action_by_name (browser, "AddNewsFeed");
-katze_assign (label, katze_object_get_string (action, "label"));
-button = gtk_button_new_with_mnemonic (label);
-gtk_box_pack_start (box, button, TRUE, TRUE, 4);
-gtk_action_connect_proxy (action, button);
-
-g_free (label);
-
-gtk_dialog_run (GTK_DIALOG (dialog));
+for (i = 0; i < G_N_ELEMENTS (actions); i++)
+{
+gchar* label;
+GtkWidget* button;
+
+action = _action_by_name (browser, actions[i]);
+label = katze_object_get_string (action, "label");
+button = gtk_button_new_with_mnemonic (label);
+g_free (label);
+gtk_widget_set_name (button, "GtkButton-thumb");
+gtk_box_pack_start (box, button, TRUE, TRUE, 4);
+gtk_action_connect_proxy (action, button);
+g_signal_connect_swapped (button, "clicked",
+  G_CALLBACK (gtk_widget_destroy), dialog);
+}
+
+gtk_widget_show (dialog);
+g_signal_connect_swapped (dialog, "response",
+  G_CALLBACK (gtk_widget_destroy), dialog);
 }
 
 static void
@@ -3455,8 +3442,8 @@ _action_source_view_activate (GtkAction* action,
 {
 if (!sokoke_show_uri_with_mime_type (gtk_widget_get_screen (view),
 uri, "text/plain", gtk_get_current_event_time (), &error))
-sokoke_error_dialog (_("Could not run external program."),
-error ? error->message : "");
+sokoke_message_dialog (GTK_MESSAGE_ERROR,
+_("Could not run external program."), error ? 
error->message : "");
 if (error)
 g_error_free (error);
 g_free (text_editor);
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 373c52f..823662a 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -46,6 +46,7 @@
 
 #if HAVE_HILDON
 #include 
+#include 
 #include 
 #include 
 #endif
@@ -97,16 +98,23 @@ sokoke_js_script_eval (JSContextRef js_context,
 }
 
 void
-sokoke_error_dialog (const gchar* short_message,
- const gchar* d

[Xfce4-commits] Optionally open panels in standalone windows by default

[Christian Dywan]

Updating branch refs/heads/master
 to 5a65ed6253a2a33be6690d7db878e6e777de9a09 (commit)
   from 565e32599e362056cb8cd8be960d1c60aa258487 (commit)

commit 5a65ed6253a2a33be6690d7db878e6e777de9a09
Author: Christian Dywan 
Date:   Sat Nov 28 23:53:49 2009 +0100

Optionally open panels in standalone windows by default

 midori/midori-browser.c |   10 -
 midori/midori-panel.c   |   80 --
 midori/midori-preferences.c |6 +---
 midori/midori-websettings.c |   24 +
 4 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 6066072..c2e3fdb 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -6239,7 +6239,8 @@ _midori_browser_update_settings (MidoriBrowser* browser)
 gboolean remember_last_window_size;
 gint last_window_width, last_window_height;
 MidoriWindowState last_window_state;
-gboolean compact_sidepanel, show_panel_controls, right_align_sidepanel;
+gboolean compact_sidepanel, show_panel_controls;
+gboolean right_align_sidepanel, open_panels_in_windows;
 gint last_panel_position, last_panel_page;
 gboolean show_menubar, show_bookmarkbar;
 gboolean show_panel, show_transferbar;
@@ -6262,6 +6263,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
   "compact-sidepanel", &compact_sidepanel,
   "show-panel-controls", &show_panel_controls,
   "right-align-sidepanel", &right_align_sidepanel,
+  "open-panels-in-windows", &open_panels_in_windows,
   "last-panel-position", &last_panel_position,
   "last-panel-page", &last_panel_page,
   "show-menubar", &show_menubar,
@@ -6336,7 +6338,8 @@ _midori_browser_update_settings (MidoriBrowser* browser)
 
 g_object_set (browser->panel, "show-titles", !compact_sidepanel,
 "show-controls", show_panel_controls,
-"right-aligned", right_align_sidepanel, NULL);
+"right-aligned", right_align_sidepanel,
+"open-panels-in-windows", open_panels_in_windows, NULL);
 gtk_paned_set_position (GTK_PANED (gtk_widget_get_parent (browser->panel)),
 last_panel_position);
 /* The browser may not yet be visible, which means that we can't set the
@@ -6397,6 +6400,9 @@ midori_browser_settings_notify (MidoriWebSettings* 
web_settings,
 g_signal_handlers_unblock_by_func (browser->panel,
 midori_panel_notify_show_controls_cb, browser);
 }
+else if (name == g_intern_string ("open-panels-in-windows"))
+g_object_set (browser->panel, "open-panels-in-windows",
+  g_value_get_boolean (&value), NULL);
 else if (name == g_intern_string ("always-show-tabbar"))
 _toggle_tabbar_smartly (browser);
 else if (name == g_intern_string ("show-menubar"))
diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 02e2f3d..bb1af4e 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -43,6 +43,7 @@ struct _MidoriPanel
 gboolean show_titles;
 gboolean show_controls;
 gboolean right_aligned;
+gboolean open_panels_in_windows;
 };
 
 struct _MidoriPanelClass
@@ -67,6 +68,7 @@ enum
 PROP_SHOW_TITLES,
 PROP_SHOW_CONTROLS,
 PROP_RIGHT_ALIGNED,
+PROP_OPEN_PANELS_IN_WINDOWS,
 };
 
 enum {
@@ -237,6 +239,22 @@ midori_panel_class_init (MidoriPanelClass* class)
  "Whether the panel is aligned to the 
right",
  FALSE,
  G_PARAM_READWRITE | 
G_PARAM_STATIC_STRINGS));
+
+/**
+ * MidoriWebSettings:open-panels-in-windows:
+ *
+ * Whether to open panels in separate windows.
+ *
+ * Since: 0.2.2
+ */
+g_object_class_install_property (gobject_class,
+ PROP_OPEN_PANELS_IN_WINDOWS,
+ g_param_spec_boolean (
+ "open-panels-in-windows",
+ "Open panels in windows",
+"Whether to open panels in standalone windows by default",
+ FALSE,
+ G_PARAM_READWRITE | 
G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -266,6 +284,7 @@ midori_panel_detached_window_delete_event_cb (GtkWidget*   
window,
 GtkWidget* scrolled = g_object_get_data (G_OBJECT (window), "scrolled");
 GtkWidget* toolbar = g_object_get_data (G_OBJECT (scrolled), 
"panel-toolbar");
 GtkWidget* menuitem = g_object_get_data (G_OBJECT (scrolled), 
"panel-menuitem");
+GtkWidget* viewable = _midori_panel_child_for_scrolled (panel, scrolled);
 GtkToolItem* toolitem;
 gint n;
 
@@ -277,13 +296,9 @@ midori_panel_detached_window_delete_event_cb (GtkWidget*   
window,
 gtk_container_remove (GTK_CONTAINER (vbox), 

[Xfce4-commits] l10n: Updates to German (de) translation

[Transifex]

Updating branch refs/heads/master
 to 8f1b1629d4cb427b57829b1768258c08ce2f6a8e (commit)
   from dbe45dd2bb16d1afaa3dd46cc53e7fdfae240bb1 (commit)

commit 8f1b1629d4cb427b57829b1768258c08ce2f6a8e
Author: Christoph Wickert 
Date:   Sun Nov 29 13:51:33 2009 +

l10n: Updates to German (de) translation

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

 po/de.po |  159 --
 1 files changed, 93 insertions(+), 66 deletions(-)

diff --git a/po/de.po b/po/de.po
index 84ce7cb..2dcb066 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: parole master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-27 10:38+0100\n"
-"PO-Revision-Date: 2009-11-25 19:15+0100\n"
+"PO-Revision-Date: 2009-11-29 14:49+0100\n"
 "Last-Translator: Christoph Wickert \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgstr "Medien-Abspieler"
 msgid "Mute"
 msgstr "Stumm"
 
-#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:1093
+#: ../data/interfaces/parole.ui.h:10
+#: ../src/parole-player.c:1093
 #: ../src/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Nächstes Kapitel/Film"
@@ -63,8 +64,10 @@ msgstr "Nächstes Kapitel/Film"
 msgid "None"
 msgstr "Kein"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../src/parole-about.c:52 ../plugins/window-title/window-title-provider.c:58
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../src/parole-about.c:52
+#: ../plugins/window-title/window-title-provider.c:58
 msgid "Parole Media Player"
 msgstr "Parole Medien-Abspieler"
 
@@ -72,7 +75,8 @@ msgstr "Parole Medien-Abspieler"
 msgid "Plugins"
 msgstr "Erweiterungen"
 
-#: ../data/interfaces/parole.ui.h:14 ../src/parole-player.c:1105
+#: ../data/interfaces/parole.ui.h:14
+#: ../src/parole-player.c:1105
 #: ../src/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Vorheriges Kapitel/Film"
@@ -127,15 +131,15 @@ msgstr "_Ansicht"
 
 #: ../data/interfaces/mediachooser.ui.h:1
 msgid "Replace playlist with opened files"
-msgstr ""
+msgstr "Wiedergabeliste durch geöffnete Dateien ersetzen"
 
 #: ../data/interfaces/mediachooser.ui.h:2
 msgid "Scan folders recursively"
-msgstr ""
+msgstr "Ordner rekursiv durchsuchen"
 
 #: ../data/interfaces/mediachooser.ui.h:3
 msgid "Start playing opened files"
-msgstr ""
+msgstr "Geöffnete Dateien abspielen"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
@@ -234,18 +238,12 @@ msgid "Stop"
 msgstr "Stop"
 
 #: ../gst/parole-gst.c:1674
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Playbin-GStreamer-Plugin kann nicht geladen werden, überprüfen Sie Ihre "
-"GStreamer-Installation"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer 
installation"
+msgstr "Playbin-GStreamer-Plugin kann nicht geladen werden, überprüfen Sie 
Ihre GStreamer-Installation"
 
 #: ../gst/parole-gst.c:1690
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Video-GStreamer-Plugin kann nicht geladen werden, überprüfen Sie Ihre "
-"GStreamer-Installation"
+msgid "Unable to load video GStreamer plugin, check your GStreamer 
installation"
+msgstr "Video-GStreamer-Plugin kann nicht geladen werden, überprüfen Sie Ihre 
GStreamer-Installation"
 
 #: ../src/main.c:53
 #, c-format
@@ -274,11 +272,11 @@ msgstr "Eine neue Instanz öffnen"
 
 #: ../src/main.c:192
 msgid "Do not load plugins"
-msgstr ""
+msgstr "Keine Erweiterungen laden"
 
 #: ../src/main.c:193
 msgid "Set Audio-CD/VCD/DVD device path"
-msgstr ""
+msgstr "Pfad des Audio-CD/VCD/DVD Gerätes angeben"
 
 #: ../src/main.c:194
 msgid "Play or pause if already playing"
@@ -327,8 +325,7 @@ msgstr "Medien zum Abspielen"
 #: ../src/main.c:242
 #, c-format
 msgid "Parole is already running, use -i to open a new instance\n"
-msgstr ""
-"Parole läuft bereits, verwenden Sie -i, um eine neue Instanz zu öffnen\n"
+msgstr "Parole läuft bereits, verwenden Sie -i, um eine neue Instanz zu 
öffnen\n"
 
 #: ../src/parole-mediachooser.c:213
 msgid "Add media files"
@@ -348,10 +345,10 @@ msgstr "Erlaubnis verweigert"
 
 #: ../src/parole-medialist.c:445
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Unbekanntes Wiedergabelistenformat, bitte wählen Sie ein unterstütztes Format"
+msgstr "Unbekanntes Wiedergabelistenformat, bitte wählen Sie ein unterstütztes 
Format"
 
-#: ../src/parole-medialist.c:513 ../src/parole-player.c:1785
+#: ../src/parole-medialist.c:513
+#: ../src/parole-player.c:1785
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
@@ -395,14 +392,16 @@ msgstr "Medien-Stream ist nicht durchsuchbar"
 #.
 #. * Next chapter menu item
 #.
-#: ../src/parole-player.c:1093 ../src/parole-disc-menu.c:122
+#: ../src/parole-player.c:1093
+#: ../src/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Nachfolgender Tite

[Xfce4-commits] Don't prioritize key presses because that breaks inline find

[Christian Dywan]

Updating branch refs/heads/master
 to a7ca507b3a2ad8246fae380e84656f0debe57074 (commit)
   from dd97edf8565148246435a6b36885b1d66906d9e3 (commit)

commit a7ca507b3a2ad8246fae380e84656f0debe57074
Author: Christian Dywan 
Date:   Sun Nov 29 14:31:23 2009 +0100

Don't prioritize key presses because that breaks inline find

This 'breaks' using single character shortcuts in conjunction
with inline find, but we can live with that.

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8afd16a..2dc41e7 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1733,13 +1733,7 @@ midori_browser_key_press_event (GtkWidget*   widget,
 GdkEventKey* event)
 {
 GtkWindow* window = GTK_WINDOW (widget);
-GtkWidget* focus = gtk_window_get_focus (window);
 GtkWidgetClass* widget_class;
-gboolean priority = GTK_IS_EDITABLE (focus) || GTK_IS_TEXT_VIEW (focus)
- || WEBKIT_IS_WEB_VIEW (focus);
-
-if (priority && !event->state && gtk_window_propagate_key_event (window, 
event))
-return TRUE;
 
 if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
 if (sokoke_window_activate_key (window, event))
@@ -1752,7 +1746,7 @@ midori_browser_key_press_event (GtkWidget*   widget,
 if (sokoke_window_activate_key (window, event))
 return TRUE;
 
-if (!priority && event->state && gtk_window_propagate_key_event (window, 
event))
+if (event->state && gtk_window_propagate_key_event (window, event))
 return TRUE;
 
 widget_class = g_type_class_peek_static (g_type_parent (GTK_TYPE_WINDOW));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Build an invisible menubar in Hildon to retain hotkey functionality

[Christian Dywan]

Updating branch refs/heads/master
 to d9eb5dcec9d55cf39b718b59dcdee9291fb68f5c (commit)
   from a7ca507b3a2ad8246fae380e84656f0debe57074 (commit)

commit d9eb5dcec9d55cf39b718b59dcdee9291fb68f5c
Author: Christian Dywan 
Date:   Sun Nov 29 15:00:15 2009 +0100

Build an invisible menubar in Hildon to retain hotkey functionality

GtkUIManager requires existing proxies for hotkeys to work at all.

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 2dc41e7..f8a0ddf 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -5753,6 +5753,9 @@ midori_browser_init (MidoriBrowser* browser)
 g_object_unref (action);
 
 /* Create the menubar */
+browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar");
+gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0);
+gtk_widget_hide (browser->menubar);
 #if HAVE_HILDON
 #if HILDON_CHECK_VERSION (2, 2, 0)
 browser->menubar = hildon_app_menu_new ();
@@ -5766,9 +5769,6 @@ midori_browser_init (MidoriBrowser* browser)
 hildon_program_add_window (hildon_program_get_instance (),
HILDON_WINDOW (browser));
 #else
-browser->menubar = gtk_ui_manager_get_widget (ui_manager, "/menubar");
-gtk_box_pack_start (GTK_BOX (vbox), browser->menubar, FALSE, FALSE, 0);
-gtk_widget_hide (browser->menubar);
 g_signal_connect (browser->menubar, "button-press-event",
 G_CALLBACK (midori_browser_menu_button_press_event_cb), browser);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Enable Zoom and Fullscreen with hardware keys on Hildon

[Christian Dywan]

Updating branch refs/heads/master
 to 2973df0f9b76cac74cd516b05c62f802c2631272 (commit)
   from d9eb5dcec9d55cf39b718b59dcdee9291fb68f5c (commit)

commit 2973df0f9b76cac74cd516b05c62f802c2631272
Author: Christian Dywan 
Date:   Sun Nov 29 15:09:00 2009 +0100

Enable Zoom and Fullscreen with hardware keys on Hildon

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index f8a0ddf..de1f0e6 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -46,6 +46,8 @@
 "sender='"MCE_SERVICE "',"\
 "path='"  MCE_SIGNAL_PATH "',"\
 "interface='" MCE_SIGNAL_IF   "'"
+#include 
+#include 
 #endif
 
 struct _MidoriBrowser
@@ -4923,10 +4925,18 @@ static const GtkActionEntry entries[] = {
NULL, "r",
N_("Reload the current page"), G_CALLBACK (_action_reload_stop_activate) },
  { "ZoomIn", GTK_STOCK_ZOOM_IN,
+   #if HAVE_HILDON
+   NULL, "F7",
+   #else
NULL, "plus",
+   #endif
N_("Increase the zoom level"), G_CALLBACK (_action_zoom_in_activate) },
  { "ZoomOut", GTK_STOCK_ZOOM_OUT,
+   #if HAVE_HILDON
+   NULL, "F8",
+   #else
NULL, "minus",
+   #endif
N_("Decrease the zoom level"), G_CALLBACK (_action_zoom_out_activate) },
  { "ZoomNormal", GTK_STOCK_ZOOM_100,
NULL, "0",
@@ -4940,7 +4950,11 @@ static const GtkActionEntry entries[] = {
 N_("View the source code of the selection"),
 NULL/*G_CALLBACK (_action_selection_source_view_activate)*/ },
  { "Fullscreen", GTK_STOCK_FULLSCREEN,
+   #if HAVE_HILDON
+   NULL, "F6",
+   #else
NULL, "F11",
+   #endif
N_("Toggle fullscreen view"), G_CALLBACK (_action_fullscreen_activate) },
 
  { "Go", NULL, N_("_Go") },
@@ -5281,6 +5295,15 @@ midori_browser_realize_cb (GtkStyle*  style,
 {
 GdkScreen* screen;
 GtkIconTheme* icon_theme;
+#ifdef HAVE_HILDON_2_2
+/* hildon_gtk_window_enable_zoom_keys */
+guint32 set = 1;
+gdk_property_change (GTK_WIDGET (browser)->window,
+ gdk_atom_intern ("_HILDON_ZOOM_KEY_ATOM", FALSE),
+ gdk_x11_xatom_to_atom (XA_INTEGER),
+ 32, GDK_PROP_MODE_REPLACE,
+ (const guchar *) &set, 1);
+#endif
 
 screen = gtk_widget_get_screen (GTK_WIDGET (browser));
 if (screen)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Danish (da) translation

[Transifex]

Updating branch refs/heads/master
 to 2983637dbc29c198635a4880aa2eefd90a9ef447 (commit)
   from 88b17e7064c55e6ae8590a74cecfe7b3f82ba475 (commit)

commit 2983637dbc29c198635a4880aa2eefd90a9ef447
Author: Per Kongstad 
Date:   Sun Nov 29 15:42:02 2009 +

l10n: Updates to Danish (da) translation

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

 po/da.po |  148 +++---
 1 files changed, 45 insertions(+), 103 deletions(-)

diff --git a/po/da.po b/po/da.po
index ada5b8d..a9b1e9f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter 1.6.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-29 11:47+0100\n"
+"PO-Revision-Date: 2009-11-29 16:41+0100\n"
 "Last-Translator: Per Kongstad \n"
 "Language-Team: Danish \n"
 "MIME-Version: 1.0\n"
@@ -28,15 +28,13 @@ msgid "Transfer"
 msgstr "Overførsel"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"Skærmbilledet bliver overført "
-"til:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "Skærmbilledet bliver 
overført til:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -53,14 +51,14 @@ msgstr "Indstillinger"
 
 #: ../lib/screenshooter-dialogs.c:754
 msgid "Region to capture"
-msgstr ""
-"Område til kopiering"
+msgstr "Område til 
kopiering"
 
 #: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Hele skærmen"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tag et skærmbillede af hele skærmen"
@@ -69,7 +67,8 @@ msgstr "Tag et skærmbillede af hele skærmen"
 msgid "Active window"
 msgstr "Aktive vindue"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Tag et skærmbillede af det aktive vindue"
@@ -78,16 +77,11 @@ msgstr "Tag et skærmbillede af det aktive vindue"
 msgid "Select a region"
 msgstr "Markér et område"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Markér et område til kopiering ved at klikke et startpunkt på skærmen uden "
-"at slippe museknappen, og trække musen til slutpunkt af området, og derefter "
-"slippe museknappen."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Markér et område til kopiering ved at klikke et startpunkt på skærmen 
uden at slippe museknappen, og trække musen til slutpunkt af området, og 
derefter slippe museknappen."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -98,11 +92,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Vis musemarkøren på skærmbilledet"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Forsinkelse inden billede "
-"tages"
+msgid "Delay before 
capturing"
+msgstr "Forsinkelse inden 
billede tages"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -145,7 +136,8 @@ msgstr "Åbn med:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Åbn skærmbilledet med det valgte program"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Program til åbning af skærmbilledet"
 
@@ -153,7 +145,8 @@ msgstr "Program til åbning af skærmbilledet"
 msgid "Host on ZimageZ"
 msgstr "Host på ZimageZ"
 
-#: ../lib/screenshooter-dialogs.c:1032 ../src/main.c:80
+#: ../lib/screenshooter-dialogs.c:1032
+#: ../src/main.c:80
 msgid "Host the screenshot on ZimageZ, a free online image hosting service"
 msgstr "Host skærmbilledet på ZimageZ. en fri online billed-hosting-tjeneste"
 
@@ -193,14 +186,11 @@ msgid "Initialize the connection..."
 msgstr "Initiér forbindelsen..."
 
 #: ../lib/scre

[Xfce4-commits] l10n: Updates to French (fr) translation

[Transifex]

Updating branch refs/heads/master
 to 5bb3f73cedb66cfe0bd63d8a67ca2c16ddc17625 (commit)
   from 2983637dbc29c198635a4880aa2eefd90a9ef447 (commit)

commit 5bb3f73cedb66cfe0bd63d8a67ca2c16ddc17625
Author: Massonnet Mike 
Date:   Sun Nov 29 15:52:17 2009 +

l10n: Updates to French (fr) translation

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

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

diff --git a/po/fr.po b/po/fr.po
index c9dc503..ef802b5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -164,17 +164,17 @@ msgid "Save screenshot as..."
 msgstr "Enregistrer la capture d'écran sous..."
 
 #: ../lib/screenshooter-zimagez.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when creating the XMLRPC request."
-msgstr "\tUne erreur s'est produite lors de la création de la requête XMLRPC."
+msgstr "Une erreur s'est produite lors de la création de la requête XMLRPC."
 
 #: ../lib/screenshooter-zimagez.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when transferring the data to ZimageZ."
 msgstr "Une erreur s'est produite lors du transfert de données à ZimageZ."
 
 #: ../lib/screenshooter-zimagez.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "An error occurred when parsing the response from ZimageZ."
 msgstr "Une erreur s'est produite lors de l'analyse de la réponse de ZimageZ."
 
@@ -191,7 +191,6 @@ msgid "Initialize the connection..."
 msgstr "Initialisation de la connexion..."
 
 #: ../lib/screenshooter-zimagez.c:343
-#, fuzzy
 msgid ""
 "Please fill the following fields with your http://www.zimagez.com";
 "\">ZimageZ \n"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Danish (da) translation

[Transifex]

Updating branch refs/heads/master
 to 04c575a62f907c4540cb371cc17da6fe815af0c8 (commit)
   from 8f1b1629d4cb427b57829b1768258c08ce2f6a8e (commit)

commit 04c575a62f907c4540cb371cc17da6fe815af0c8
Author: Per Kongstad 
Date:   Sun Nov 29 15:52:37 2009 +

l10n: Updates to Danish (da) translation

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

 po/da.po |  169 ++---
 1 files changed, 94 insertions(+), 75 deletions(-)

diff --git a/po/da.po b/po/da.po
index 827b336..f94351d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: parole 0.1.90\n"
+"Project-Id-Version: parole 0.1.98\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-27 10:38+0100\n"
-"PO-Revision-Date: 2009-10-17 18:51+0100\n"
+"PO-Revision-Date: 2009-11-29 16:51+0100\n"
 "Last-Translator: Per Kongstad \n"
 "Language-Team: Danish \n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,8 @@ msgstr "Medieafspiller"
 msgid "Mute"
 msgstr "Slå lyd fra"
 
-#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:1093
+#: ../data/interfaces/parole.ui.h:10
+#: ../src/parole-player.c:1093
 #: ../src/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Næste kapitel"
@@ -63,8 +64,10 @@ msgstr "Næste kapitel"
 msgid "None"
 msgstr "Ingen"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../src/parole-about.c:52 ../plugins/window-title/window-title-provider.c:58
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../src/parole-about.c:52
+#: ../plugins/window-title/window-title-provider.c:58
 msgid "Parole Media Player"
 msgstr "Parole medieafspiller"
 
@@ -72,7 +75,8 @@ msgstr "Parole medieafspiller"
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: ../data/interfaces/parole.ui.h:14 ../src/parole-player.c:1105
+#: ../data/interfaces/parole.ui.h:14
+#: ../src/parole-player.c:1105
 #: ../src/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Tidligere kapitel"
@@ -127,15 +131,15 @@ msgstr "_Vis"
 
 #: ../data/interfaces/mediachooser.ui.h:1
 msgid "Replace playlist with opened files"
-msgstr ""
+msgstr "Erstat spilleliste med åbne filer"
 
 #: ../data/interfaces/mediachooser.ui.h:2
 msgid "Scan folders recursively"
-msgstr ""
+msgstr "Gennemsøg mapper rekursivt"
 
 #: ../data/interfaces/mediachooser.ui.h:3
 msgid "Start playing opened files"
-msgstr ""
+msgstr "Begynd at afspille åbne filer"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
@@ -234,18 +238,12 @@ msgid "Stop"
 msgstr "Stop"
 
 #: ../gst/parole-gst.c:1674
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Kunne ikke indlæse udvidelsesmodulet playbin GStreamer. Kontrollér din "
-"installation af GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer 
installation"
+msgstr "Kunne ikke indlæse udvidelsesmodulet playbin GStreamer. Kontrollér din 
installation af GStreamer"
 
 #: ../gst/parole-gst.c:1690
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"Kunne ikke indlæse udvidelsesmodulet video GStreamer. Kontrollér din "
-"installation af GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer 
installation"
+msgstr "Kunne ikke indlæse udvidelsesmodulet video GStreamer. Kontrollér din 
installation af GStreamer"
 
 #: ../src/main.c:53
 #, c-format
@@ -274,11 +272,11 @@ msgstr "Åbn en ny instans"
 
 #: ../src/main.c:192
 msgid "Do not load plugins"
-msgstr ""
+msgstr "Undlad at indlæse udvidelsesmoduler"
 
 #: ../src/main.c:193
 msgid "Set Audio-CD/VCD/DVD device path"
-msgstr ""
+msgstr "Indstil sti til lyd-cd/vcd/dvd"
 
 #: ../src/main.c:194
 msgid "Play or pause if already playing"
@@ -347,10 +345,10 @@ msgstr "Adgang nægtet"
 
 #: ../src/parole-medialist.c:445
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Ukendt format af spilleliste. Vælg et understøttet format til spilleliste"
+msgstr "Ukendt format af spilleliste. Vælg et understøttet format til 
spilleliste"
 
-#: ../src/parole-medialist.c:513 ../src/parole-player.c:1785
+#: ../src/parole-medialist.c:513
+#: ../src/parole-player.c:1785
 msgid "Playlist"
 msgstr "Spilleliste"
 
@@ -394,14 +392,16 @@ msgstr "Mediestrømmen er ikke søgbar"
 #.
 #. * Next chapter menu item
 #.
-#: ../src/parole-player.c:1093 ../src/parole-disc-menu.c:122
+#: ../src/parole-player.c:1093
+#: ../src/parole-disc-menu.c:122
 msgid "Next Track"
 msgstr "Næste spor"
 
 #.
 #. * Previous chapter menu item
 #.
-#: ../src/parole-player.c:1105 ../src/parole-disc-menu.c:123
+#: ../src/parole-player.c:1105
+#: ../src/parole-disc-menu.c:123
 msgid "Previous Track"
 msgstr "Forrige spor"
 
@@ -418,7 +418,8 @@ msgstr "Stoppet"
 msgid "Finished"
 msgstr "Afsluttet"
 
-#: ../src/parole-statusbar.c:114 ../src/parole-statusbar.c:124
+#: ../src/parole-statusbar.c:114
+#: ../src/parole

[Xfce4-commits] Reset XScreen saver counter on lid open.

[Ali Abdallah]

Updating branch refs/heads/devkit-power
 to 5de7fccd34753c63e355a070fe8e3e4d65023de9 (commit)
   from 24a8c20db4e41eaca593512d57b36936155695cd (commit)

commit 5de7fccd34753c63e355a070fe8e3e4d65023de9
Author: Ali Abdallah 
Date:   Sat Nov 21 13:47:50 2009 +0100

Reset XScreen saver counter on lid open.

 src/xfpm-dpms.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index c1e2f26..855f70f 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -312,6 +312,8 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
g_warning ("Cannot set Force DPMS level %d", level);
goto out;
}
+   if ( level == DPMSModeOn )
+   XResetScreenSaver (GDK_DISPLAY ());
XSync (GDK_DISPLAY (), FALSE);
 }
 else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix brightness notification feedback level.

[Ali Abdallah]

Updating branch refs/heads/devkit-power
 to 1a05f46a8bb24eff0d1af6b55cdf8001b1fea1a6 (commit)
   from e58f1477f7011a1f9d2e5a65d6c9aecf17e57e41 (commit)

commit 1a05f46a8bb24eff0d1af6b55cdf8001b1fea1a6
Author: Ali Abdallah 
Date:   Sun Nov 29 17:09:26 2009 +0100

Fix brightness notification feedback level.

 src/xfpm-backlight.c |   31 ---
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index da7aafe..f5e13c3 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -124,7 +124,6 @@ xfpm_backlight_show_notification (XfpmBacklight *backlight, 
gint level, gint max
 {
 gint i;
 gfloat value = 0;
-NotifyNotification *n;
 
 static const char *display_icon_name[] = 
 {
@@ -136,36 +135,38 @@ xfpm_backlight_show_notification (XfpmBacklight 
*backlight, gint level, gint max
NULL
 };
 
-if ( !backlight->priv->n )
+if ( backlight->priv->n == NULL )
 {
-   n = xfpm_notify_new_notification (backlight->priv->notify, 
- NULL, 
- NULL, 
- NULL, 
- 0, 
- XFPM_NOTIFY_NORMAL,
- NULL);
+   backlight->priv->n = xfpm_notify_new_notification 
(backlight->priv->notify, 
+  " ", 
+  "", 
+  NULL, 
+  0, 
+  XFPM_NOTIFY_NORMAL,
+  NULL);
 }
 
 value = (gfloat) 100 * level / max_level;
 
 i = (gint)value / 25;
 
-notify_notification_set_hint_int32  (n,
+if ( i > 4 || i < 0 )
+   return;
+
+notify_notification_set_hint_int32  (backlight->priv->n,
 "value",
 value);
 
-notify_notification_set_hint_string (n,
+notify_notification_set_hint_string (backlight->priv->n,
 "x-canonical-private-synchronous",
 "brightness");
-
-notify_notification_update (n,
+
+notify_notification_update (backlight->priv->n,
" ",
"",
display_icon_name[i]);

-notify_notification_show (n, NULL);
-backlight->priv->n = n;
+notify_notification_show (backlight->priv->n, NULL);
 }
 
 static gboolean
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Use EggIdletime.

[Ali Abdallah]

Updating branch refs/heads/devkit-power
 to 2153e95ad6388d0c6c7b2f2d5b2f84c42befadb9 (commit)
   from e350197a6ce92baa487ca8a3d40a90d873ed0edc (commit)

commit 2153e95ad6388d0c6c7b2f2d5b2f84c42befadb9
Author: Ali Abdallah 
Date:   Fri Nov 27 11:08:07 2009 +0100

Use EggIdletime.

 src/Makefile.am  |4 ++--
 src/egg-idletime.c   |2 +-
 src/xfpm-backlight.c |   20 ++--
 src/xfpm-manager.c   |   24 ++--
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index d999efd..8c4305f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,8 @@ xfce4_power_manager_SOURCES =   \
xfpm-disks.h\
xfpm-console-kit.c  \
xfpm-console-kit.h  \
-   xfpm-idle.c \
-   xfpm-idle.h \
+   egg-idletime.c  \
+   egg-idletime.h  \
xfpm-backlight.c\
xfpm-backlight.h\
xfpm-dpms.c \
diff --git a/src/egg-idletime.c b/src/egg-idletime.c
index ea5e6af..3cb8c7e 100644
--- a/src/egg-idletime.c
+++ b/src/egg-idletime.c
@@ -398,7 +398,7 @@ egg_idletime_init (EggIdletime *idletime)
 
/* gtk_init should do XSyncInitialize for us */
counters = XSyncListSystemCounters (idletime->priv->dpy, &ncounters);
-   for (i=0; i < ncounters && !idletime->priv->idle_counter; i++) {
+   for (i=0; i < (guint)ncounters && !idletime->priv->idle_counter; i++) {
if (strcmp(counters[i].name, "IDLETIME") == 0)
idletime->priv->idle_counter = counters[i].counter;
}
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index d09f34c..da7aafe 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -30,7 +30,7 @@
 #include 
 
 #include "xfpm-backlight.h"
-#include "xfpm-idle.h"
+#include "egg-idletime.h"
 #include "xfpm-notify.h"
 #include "xfpm-xfconf.h"
 #include "xfpm-dkp.h"
@@ -52,7 +52,7 @@ struct XfpmBacklightPrivate
 {
 XfpmBrightness *brightness;
 XfpmDkp*dkp;
-XfpmIdle   *idle;
+EggIdletime*idle;
 XfpmXfconf *conf;
 XfpmButton *button;
 XfpmNotify *notify;
@@ -281,7 +281,7 @@ out:
 
 
 static void
-xfpm_backlight_alarm_timeout_cb (XfpmIdle *idle, guint id, XfpmBacklight 
*backlight)
+xfpm_backlight_alarm_timeout_cb (EggIdletime *idle, guint id, XfpmBacklight 
*backlight)
 {
 backlight->priv->block = FALSE;
 
@@ -292,7 +292,7 @@ xfpm_backlight_alarm_timeout_cb (XfpmIdle *idle, guint id, 
XfpmBacklight *backli
 }
 
 static void
-xfpm_backlight_reset_cb (XfpmIdle *idle, XfpmBacklight *backlight)
+xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
 {
 if ( backlight->priv->dimmed)
 {
@@ -360,11 +360,11 @@ xfpm_backlight_brightness_on_ac_settings_changed 
(XfpmBacklight *backlight)
 
 if ( timeout_on_ac == ALARM_DISABLED )
 {
-   xfpm_idle_free_alarm (backlight->priv->idle, TIMEOUT_BRIGHTNESS_ON_AC );
+   egg_idletime_alarm_remove (backlight->priv->idle, 
TIMEOUT_BRIGHTNESS_ON_AC );
 }
 else
 {
-   xfpm_idle_set_alarm (backlight->priv->idle, TIMEOUT_BRIGHTNESS_ON_AC, 
timeout_on_ac * 1000);
+   egg_idletime_alarm_set (backlight->priv->idle, 
TIMEOUT_BRIGHTNESS_ON_AC, timeout_on_ac * 1000);
 }
 }
 
@@ -381,11 +381,11 @@ xfpm_backlight_brightness_on_battery_settings_changed 
(XfpmBacklight *backlight)
 
 if ( timeout_on_battery == ALARM_DISABLED )
 {
-   xfpm_idle_free_alarm (backlight->priv->idle, 
TIMEOUT_BRIGHTNESS_ON_BATTERY );
+   egg_idletime_alarm_remove (backlight->priv->idle, 
TIMEOUT_BRIGHTNESS_ON_BATTERY );
 }
 else
 {
-   xfpm_idle_set_alarm (backlight->priv->idle, 
TIMEOUT_BRIGHTNESS_ON_BATTERY, timeout_on_battery * 1000);
+   egg_idletime_alarm_set (backlight->priv->idle, 
TIMEOUT_BRIGHTNESS_ON_BATTERY, timeout_on_battery * 1000);
 } 
 }
 
@@ -440,7 +440,7 @@ xfpm_backlight_init (XfpmBacklight *backlight)
 }
 else
 {
-   backlight->priv->idle   = xfpm_idle_new ();
+   backlight->priv->idle   = egg_idletime_new ();
backlight->priv->conf   = xfpm_xfconf_new ();
backlight->priv->button = xfpm_button_new ();
backlight->priv->dkp= xfpm_dkp_get ();
@@ -450,7 +450,7 @@ xfpm_backlight_init (XfpmBacklight *backlight)
if ( xfpm_brightness_get_control (backlight->priv->brightness) == 
XFPM_BRIGHTNESS_CONTROL_HAL )
backlight->priv->brightness_in_hw = xfpm_brightness_in_hw 
(backlight->priv->brightness);
 #endif
-   g_signal_connect (backlight->priv->idle, "alarm-timeout",
+   g_signal_connect (backlight->priv->idle, "alarm-expired",
   G_CALLBACK (xfpm_backlight_alarm_timeout

[Xfce4-commits] Fix xrandr brightness support.

[Ali Abdallah]

Updating branch refs/heads/devkit-power
 to e58f1477f7011a1f9d2e5a65d6c9aecf17e57e41 (commit)
   from 2153e95ad6388d0c6c7b2f2d5b2f84c42befadb9 (commit)

commit e58f1477f7011a1f9d2e5a65d6c9aecf17e57e41
Author: Ali Abdallah 
Date:   Sun Nov 29 17:08:52 2009 +0100

Fix xrandr brightness support.

 common/xfpm-brightness.c |   89 +
 1 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
index b6f2a62..887aeb1 100644
--- a/common/xfpm-brightness.c
+++ b/common/xfpm-brightness.c
@@ -167,7 +167,7 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
 
 if ( !XRRQueryVersion (GDK_DISPLAY (), &major, &minor) )
 {
-   TRACE ("No XRANDR extension found");
+   g_warning ("No XRANDR extension found");
return FALSE;
 }
 
@@ -175,7 +175,7 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
 
 if (brightness->priv->backlight == None) 
 {
-   TRACE ("No outputs have backlight property");
+   g_warning ("No outputs have backlight property");
return FALSE;
 }

@@ -190,24 +190,26 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
 #else
 brightness->priv->resource = XRRGetScreenResources (GDK_DISPLAY (), 
window);
 #endif
-
+
 for ( i = 0; i < brightness->priv->resource->noutput; i++)
 {
info = XRRGetOutputInfo (GDK_DISPLAY (), brightness->priv->resource, 
brightness->priv->resource->outputs[i]);
-   
-   if ( !g_strcmp0 (info->name, "LVDS") )
+
+   if ( g_str_has_prefix (info->name, "LVDS") )
{
+   
if ( xfpm_brightness_xrand_get_limit (brightness, 
brightness->priv->resource->outputs[i], &min, &max) &&
 min != max )
{
ret = TRUE;
brightness->priv->output = 
brightness->priv->resource->outputs[i];
-   brightness->priv->step = max / 20;
+   brightness->priv->step =  max <= 20 ? 1 : max / 10;
}

}
XRRFreeOutputInfo (info);
 }
+
 return ret;
 }
 
@@ -215,28 +217,40 @@ static gboolean
 xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint *new_level)
 {
 gint hw_level;
-gboolean ret;
+gboolean ret = FALSE;
+gint set_level;
 
 ret = xfpm_brightness_xrandr_get_level (brightness, 
brightness->priv->output, &hw_level);
 
 if ( !ret )
return FALSE;
+
+if ( hw_level == brightness->priv->max_level )
+{
+   *new_level = brightness->priv->max_level;
+   return TRUE;
+}

-if ( hw_level + brightness->priv->step <= brightness->priv->max_level)
-   ret = xfpm_brightness_xrandr_set_level (brightness, 
brightness->priv->output, hw_level + brightness->priv->step);
-else
-   ret = xfpm_brightness_xrandr_set_level (brightness, 
brightness->priv->output, brightness->priv->max_level);
+set_level = MIN (hw_level + brightness->priv->step, 
brightness->priv->max_level );
+   
+g_warn_if_fail (xfpm_brightness_xrandr_set_level (brightness, 
brightness->priv->output, set_level));

 ret = xfpm_brightness_xrandr_get_level (brightness, 
brightness->priv->output, new_level);
 
 if ( !ret )
+{
+   g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
return FALSE;
+}

 /* Nothing changed in the hardware*/
 if ( *new_level == hw_level )
+{
+   g_warning ("xfpm_brightness_xrand_up did not change the hw level to 
%d", set_level);
return FALSE;
+}
 
-return ret;
+return TRUE;
 }
 
 static gboolean
@@ -244,28 +258,39 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, 
gint *new_level)
 {
 gint hw_level;
 gboolean ret;
+gint set_level;
 
 ret = xfpm_brightness_xrandr_get_level (brightness, 
brightness->priv->output, &hw_level);
 
 if ( !ret )
return FALSE;
 
-if ( hw_level - brightness->priv->step >= brightness->priv->min_level)
-   ret = xfpm_brightness_xrandr_set_level (brightness, 
brightness->priv->output, hw_level - brightness->priv->step);
-else
-   ret = xfpm_brightness_xrandr_set_level (brightness, 
brightness->priv->output, brightness->priv->min_level);
+if ( hw_level == brightness->priv->min_level )
+{
+   *new_level = brightness->priv->min_level;
+   return TRUE;
+}
+
+set_level = MAX (hw_level - brightness->priv->step, 
brightness->priv->min_level);
+
+g_warn_if_fail (xfpm_brightness_xrandr_set_level (brightness, 
brightness->priv->output, set_level));

 ret = xfpm_brightness_xrandr_get_level (brightness, 
brightness->priv->output, new_level);
 
 if ( !ret )
+{
+   g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
return FALSE;
+}
 
 /* Nothing changed in the hardware*/
 if (

[Xfce4-commits] Use desktop file in xfce_sm_clien

[Ali Abdallah]

Updating branch refs/heads/devkit-power
 to a867dcf2324c44bb2ce59c2b391e38ce8fde58df (commit)
   from 1a05f46a8bb24eff0d1af6b55cdf8001b1fea1a6 (commit)

commit a867dcf2324c44bb2ce59c2b391e38ce8fde58df
Author: Ali Abdallah 
Date:   Sun Nov 29 17:09:55 2009 +0100

Use desktop file in xfce_sm_clien

 src/Makefile.am|   35 ++-
 src/egg-idletime.c |8 
 src/xfpm-manager.c |2 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c4305f..46e507e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,33 +39,34 @@ xfce4_power_manager_SOURCES =   \
xfpm-errors.h
 
 xfce4_power_manager_CFLAGS =\
--I$(top_srcdir) \
+   -I$(top_srcdir) \
-I$(top_srcdir)/common  \
-I$(top_srcdir)/libdbus \
--DLOCALEDIR=\"$(localedir)\"\
--DG_LOG_DOMAIN=\"xfce4-power-manager\"  \
-$(GOBJECT_CFLAGS)   \
-$(GTHREAD_CFLAGS)   \
-$(DBUS_GLIB_CFLAGS) \
-$(LIBXFCE4UI_CFLAGS)\
-$(XFCONF_CFLAGS)\
-$(LIBNOTIFY_CFLAGS) \
+   -DLOCALEDIR=\"$(localedir)\"\
+   -DG_LOG_DOMAIN=\"xfce4-power-manager\"  \
+   -DSYSCONFDIR=\"$(sysconfdir)\"  \
+   $(GOBJECT_CFLAGS)   \
+   $(GTHREAD_CFLAGS)   \
+   $(DBUS_GLIB_CFLAGS) \
+   $(LIBXFCE4UI_CFLAGS)\
+   $(XFCONF_CFLAGS)\
+   $(LIBNOTIFY_CFLAGS) \
$(XRANDR_CFLAGS)\
$(POLKIT_CFLAGS)\
-$(DPMS_CFLAGS)  
+   $(DPMS_CFLAGS)  
 
 xfce4_power_manager_LDADD = \
$(top_builddir)/common/libxfpmcommon.la \
$(top_builddir)/libdbus/libxfpmdbus.la  \
-$(GOBJECT_LIBS) \
-$(GTHREAD_LIBS) \
-$(DBUS_GLIB_LIBS)   \
-$(LIBXFCE4UI_LIBS)  \
-$(XFCONF_LIBS)  \
-$(LIBNOTIFY_LIBS)   \
+   $(GOBJECT_LIBS) \
+   $(GTHREAD_LIBS) \
+   $(DBUS_GLIB_LIBS)   \
+   $(LIBXFCE4UI_LIBS)  \
+   $(XFCONF_LIBS)  \
+   $(LIBNOTIFY_LIBS)   \
$(XRANDR_LIBS)  \
$(POLKIT_LIBS)  \
-$(DPMS_LIBS)
+   $(DPMS_LIBS)
 
 manpagedir = $(mandir)/man1
 
diff --git a/src/egg-idletime.c b/src/egg-idletime.c
index 3cb8c7e..1d3e579 100644
--- a/src/egg-idletime.c
+++ b/src/egg-idletime.c
@@ -39,6 +39,14 @@ static void egg_idletime_finalize   (GObject   
*object);
 
 #define EGG_IDLETIME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
EGG_IDLETIME_TYPE, EggIdletimePrivate))
 
+/*
+ * Undef and use the function instead of the macro
+ * as the macro is buggy.
+ */
+#ifdef XSyncValueAdd
+#undef XSyncValueAdd
+#endif
+
 struct EggIdletimePrivate
 {
gint sync_event;
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 84ffda2..ee9f995 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -478,7 +478,7 @@ xfpm_manager_new (DBusGConnection *bus, const gchar 
*client_id)
 client_id,
 current_dir,
 restart_command,
-PACKAGE_NAME ".desktop");
+SYSCONFDIR 
"/xdg/autostart/" PACKAGE_NAME ".desktop");
 
 g_free (current_dir);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] sleep for 0.5 second when sleeping to allow the nm applet to disconnect properly

[Ali Abdallah]

Updating branch refs/heads/devkit-power
 to e350197a6ce92baa487ca8a3d40a90d873ed0edc (commit)
   from 5de7fccd34753c63e355a070fe8e3e4d65023de9 (commit)

commit e350197a6ce92baa487ca8a3d40a90d873ed0edc
Author: Ali Abdallah 
Date:   Fri Nov 27 11:06:42 2009 +0100

sleep for 0.5 second when sleeping to allow the nm applet to disconnect 
properly

 src/egg-idletime.c |  679 
 src/egg-idletime.h |   77 +
 src/xfpm-idle.c|  382 -
 src/xfpm-idle.h|   77 -
 src/xfpm-network-manager.c |3 +-
 5 files changed, 758 insertions(+), 460 deletions(-)

diff --git a/src/egg-idletime.c b/src/egg-idletime.c
new file mode 100644
index 000..ea5e6af
--- /dev/null
+++ b/src/egg-idletime.c
@@ -0,0 +1,679 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007-2009 Richard Hughes 
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include 
+#endif
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "egg-idletime.h"
+
+static void egg_idletime_finalize   (GObject   *object);
+
+#define EGG_IDLETIME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
EGG_IDLETIME_TYPE, EggIdletimePrivate))
+
+struct EggIdletimePrivate
+{
+   gint sync_event;
+   gboolean reset_set;
+   XSyncCounter idle_counter;
+   GPtrArray   *array;
+   Display *dpy;
+};
+
+typedef struct
+{
+   guintid;
+   XSyncValue   timeout;
+   XSyncAlarm   xalarm;
+   EggIdletime *idletime;
+} EggIdletimeAlarm;
+
+enum {
+   SIGNAL_ALARM_EXPIRED,
+   SIGNAL_RESET,
+   LAST_SIGNAL
+};
+
+typedef enum {
+   EGG_IDLETIME_ALARM_TYPE_POSITIVE,
+   EGG_IDLETIME_ALARM_TYPE_NEGATIVE,
+   EGG_IDLETIME_ALARM_TYPE_DISABLED
+} EggIdletimeAlarmType;
+
+static guint signals [LAST_SIGNAL] = { 0 };
+static gpointer egg_idletime_object = NULL;
+
+G_DEFINE_TYPE (EggIdletime, egg_idletime, G_TYPE_OBJECT)
+
+/**
+ * egg_idletime_xsyncvalue_to_int64:
+ */
+static gint64
+egg_idletime_xsyncvalue_to_int64 (XSyncValue value)
+{
+   return ((guint64) XSyncValueHigh32 (value)) << 32 | (guint64) 
XSyncValueLow32 (value);
+}
+
+/**
+ * egg_idletime_get_time:
+ */
+gint64
+egg_idletime_get_time (EggIdletime *idletime)
+{
+   XSyncValue value;
+   XSyncQueryCounter (idletime->priv->dpy, idletime->priv->idle_counter, 
&value);
+   return egg_idletime_xsyncvalue_to_int64 (value);
+}
+
+/**
+ * egg_idletime_xsync_alarm_set:
+ */
+static void
+egg_idletime_xsync_alarm_set (EggIdletime *idletime, EggIdletimeAlarm *alarm, 
EggIdletimeAlarmType alarm_type)
+{
+   XSyncAlarmAttributes attr;
+   XSyncValue delta;
+   unsigned int flags;
+   XSyncTestType test;
+
+   /* just remove it */
+   if (alarm_type == EGG_IDLETIME_ALARM_TYPE_DISABLED) {
+   if (alarm->xalarm) {
+   XSyncDestroyAlarm (idletime->priv->dpy, alarm->xalarm);
+   alarm->xalarm = None;
+   }
+   return;
+   }
+
+   /* which way do we do the test? */
+   if (alarm_type == EGG_IDLETIME_ALARM_TYPE_POSITIVE)
+   test = XSyncPositiveTransition;
+   else
+   test = XSyncNegativeTransition;
+
+   XSyncIntToValue (&delta, 0);
+
+   attr.trigger.counter = idletime->priv->idle_counter;
+   attr.trigger.value_type = XSyncAbsolute;
+   attr.trigger.test_type = test;
+   attr.trigger.wait_value = alarm->timeout;
+   attr.delta = delta;
+
+   flags = XSyncCACounter | XSyncCAValueType | XSyncCATestType | 
XSyncCAValue | XSyncCADelta;
+
+   if (alarm->xalarm)
+   XSyncChangeAlarm (idletime->priv->dpy, alarm->xalarm, flags, 
&attr);
+   else
+   alarm->xalarm = XSyncCreateAlarm (idletime->priv->dpy, flags, 
&attr);
+}
+
+/**
+ * egg_idletime_alarm_reset_all:
+ */
+void
+egg_idletime_alarm_reset_all (EggIdletime *idletime)
+{
+   guint i;
+   EggIdlet

[Xfce4-commits] Added .gitignore

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 861ecd7dbcf1aca9616e0a14d0f2bd66a7ca9c4c (commit)
   from 5cf43454157f3ebcaff789fde9b1cf0ae375e3d7 (commit)

commit 861ecd7dbcf1aca9616e0a14d0f2bd66a7ca9c4c
Author: Peter de Ridder 
Date:   Thu Aug 27 22:32:14 2009 +0200

Added .gitignore

 .gitignore |   31 +++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..b254331
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,31 @@
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.ac
+depcomp
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+mkinstalldirs
+stamp-h1
+.deps
+.libs
+po/Makefile.in.in
+po/POTFILES
+po/*gmo
+thunar-vcs-plugin/thunar-vcs-plugin.la
+thunar-vcs-plugin/thunar_vcs_plugin_la-*.lo
+tvp-git-helper/tvp-git-helper
+tvp-git-helper/tvp_git_helper-*.o
+tvp-svn-helper/tvp-svn-helper
+tvp-svn-helper/tvp_svn_helper-*.o
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Danish (da) translation

[Transifex]

Updating branch refs/heads/thunarx-2
 to 5cf43454157f3ebcaff789fde9b1cf0ae375e3d7 (commit)
   from e821cac59f3950e539097daa7d56c4dcb571505a (commit)

commit 5cf43454157f3ebcaff789fde9b1cf0ae375e3d7
Author: Per Kongstad 
Date:   Wed Aug 19 21:52:42 2009 +

l10n: Updates to Danish (da) translation

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

 po/da.po |  297 ++
 1 files changed, 182 insertions(+), 115 deletions(-)

diff --git a/po/da.po b/po/da.po
index 6a151f4..584830d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: thunar-svn-plugin 0.0.3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2009-05-01 13:18+0100\n"
+"PO-Revision-Date: 2009-08-19 23:52+0100\n"
 "Last-Translator: Per Kongstad \n"
 "Language-Team: Danish \n"
 "MIME-Version: 1.0\n"
@@ -20,22 +20,27 @@ msgstr ""
 
 #. append the svn submenu action
 #. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
+#: thunar-vcs-plugin/tvp-provider.c:455
+#: thunar-vcs-plugin/tvp-provider.c:496
 msgid "SVN"
 msgstr "SVN"
 
 #. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
+#: thunar-vcs-plugin/tvp-provider.c:462
+#: thunar-vcs-plugin/tvp-provider.c:503
 msgid "GIT"
-msgstr ""
+msgstr "GIT"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298
 msgid "Menu|Add"
 msgstr "Tilføj"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: tvp-svn-helper/main.c:246
+#: tvp-svn-helper/tsh-add.c:113
+#: tvp-svn-helper/tsh-add.c:126
+#: tvp-git-helper/main.c:98
+#: tvp-git-helper/tgh-add.c:113
 msgid "Add"
 msgstr "Tilføj"
 
@@ -45,8 +50,10 @@ msgid "Menu|Blame"
 msgstr "Vis ansvarlige"
 
 # http://svnbook.red-bean.com/en/1.0/re02.html
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: tvp-svn-helper/main.c:250
+#: tvp-svn-helper/main.c:254
+#: tvp-svn-helper/tsh-blame-dialog.c:133
 msgid "Blame"
 msgstr "Vis ansvarlige"
 
@@ -62,8 +69,10 @@ msgstr "Ændringsliste"
 msgid "Menu|Checkout"
 msgstr "Tjek ud"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: tvp-svn-helper/main.c:258
+#: tvp-svn-helper/tsh-checkout.c:98
+#: tvp-svn-helper/tsh-checkout.c:110
 msgid "Checkout"
 msgstr "Tjek ud"
 
@@ -71,7 +80,8 @@ msgstr "Tjek ud"
 msgid "Menu|Cleanup"
 msgstr "Oprydning"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
+#: thunar-vcs-plugin/tvp-svn-action.c:325
+#: tvp-svn-helper/main.c:262
 msgid "Cleanup"
 msgstr "Oprydning"
 
@@ -79,8 +89,10 @@ msgstr "Oprydning"
 msgid "Menu|Commit"
 msgstr "Integrér"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: tvp-svn-helper/main.c:266
+#: tvp-svn-helper/tsh-commit.c:127
+#: tvp-svn-helper/tsh-commit.c:140
 msgid "Commit"
 msgstr "Integrér"
 
@@ -88,7 +100,8 @@ msgstr "Integrér"
 msgid "Menu|Copy"
 msgstr "Kopiér"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
+#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: tvp-svn-helper/main.c:270
 #: tvp-svn-helper/tsh-copy.c:165
 msgid "Copy"
 msgstr "Kopiér"
@@ -97,8 +110,10 @@ msgstr "Kopiér"
 msgid "Menu|Delete"
 msgstr "Slet"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: tvp-svn-helper/main.c:274
+#: tvp-svn-helper/tsh-delete.c:127
+#: tvp-svn-helper/tsh-delete.c:140
 msgid "Delete"
 msgstr "Slet"
 
@@ -114,8 +129,10 @@ msgstr "Diff"
 msgid "Menu|Export"
 msgstr "Eksportér"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: tvp-svn-helper/main.c:278
+#: tvp-svn-helper/tsh-export.c:107
+#: tvp-svn-helper/tsh-export.c:125
 msgid "Export"
 msgstr "Eksportér"
 
@@ -123,8 +140,10 @@ msgstr "Eksportér"
 msgid "Menu|Import"
 msgstr "Importér"
 
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: tvp-svn-helper/main.c:282
+#: tvp-svn-helper/tsh-import.c:102
+#: tvp-svn-helper/tsh-import.c:120
 msgid "Import"
 msgstr "Importér"
 
@@ -140,8 +159,10 @@ msgstr "Info"
 msgid "Menu|

[Xfce4-commits] l10n: Updates to English (United Kingdom) (en_GB) translation

[Transifex]

Updating branch refs/heads/thunarx-2
 to c05c65399f1876559ec185684891ec7b249b5e15 (commit)
   from 5cf43454157f3ebcaff789fde9b1cf0ae375e3d7 (commit)

commit c05c65399f1876559ec185684891ec7b249b5e15
Author: Jeff Bailes 
Date:   Sun Aug 30 09:33:55 2009 +

l10n: Updates to English (United Kingdom) (en_GB) translation

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

 po/en_GB.po |  159 ++
 1 files changed, 60 insertions(+), 99 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 29b05fe..c052c64 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,14 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
+# en_GB translation for thunar-vcs-plugin
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
+# Jeff Bailes , 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: thunart-svn-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2008-05-10 13:15+1000\n"
+"PO-Revision-Date: 2009-08-30 19:33+1000\n"
 "Last-Translator: Jeff Bailes \n"
 "Language-Team: English/GB\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "SVN"
 #. append the git submenu action
 #: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
 msgid "GIT"
-msgstr ""
+msgstr "GIT"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298
 msgid "Menu|Add"
@@ -48,14 +48,12 @@ msgid "Blame"
 msgstr "Blame"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
 msgid "Menu|Changelist"
-msgstr "Checkout"
+msgstr "Changelist"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
 msgid "Changelist"
-msgstr "Changed"
+msgstr "Changelist"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:320
 msgid "Menu|Checkout"
@@ -171,15 +169,13 @@ msgid "Edit Properties"
 msgstr "Edit Properties"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406
-#, fuzzy
 msgid "Menu|Relocate"
-msgstr "Delete"
+msgstr "Relocate"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
 #: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
-#, fuzzy
 msgid "Relocate"
-msgstr "Replaced"
+msgstr "Relocate"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412
 msgid "Menu|Resolved"
@@ -292,36 +288,34 @@ msgid "Author:"
 msgstr "Author:"
 
 #: thunar-vcs-plugin/tvp-svn-property-page.c:203
-#, fuzzy
 msgid "Changelist:"
-msgstr "Changed"
+msgstr "Changelist:"
 
 #. Translators: Depth as in depth of recursion
 #: thunar-vcs-plugin/tvp-svn-property-page.c:216
 msgid "Depth:"
-msgstr ""
+msgstr "Depth:"
 
 #. Translators: svn recursion depth infotmation
 #. * Exclude should not apear client side
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:306
 msgid "Exclude"
-msgstr ""
+msgstr "Exclude"
 
 #. Translators: svn recursion depth infotmation
 #. * Empty depth means only this file/direcotry is checked out
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:312
 msgid "Empty"
-msgstr ""
+msgstr "Empty"
 
 #. Translators: svn recursion depth infotmation
 #. * Files depth means this file/direcotry and all of it's files are checked 
out
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:318
-#, fuzzy
 msgid "Files"
-msgstr "File"
+msgstr "Files"
 
 #. Translators: svn recursion depth infotmation
 #. * Immediates depth means this file/direcotry and all of it's files and 
subdirectories are checked out
@@ -336,14 +330,14 @@ msgstr "File"
 #: tvp-svn-helper/tsh-properties-dialog.c:229
 #: tvp-svn-helper/tsh-status-dialog.c:200
 msgid "Immediates"
-msgstr ""
+msgstr "Immediates"
 
 #. Translators: svn recursion depth infotmation
 #. * Infinity depth means this file/direcotry is checked out with full 
recursion
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:330
 msgid "Infinity"
-msgstr ""
+msgstr "Infinity"
 
 #: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
 msgid "Print version information"
@@ -354,14 +348,12 @@ msgid "Execute add action"
 msgstr "Execute add action"
 
 #: tvp-svn-helper/main.c:118
-#, fuzzy
 msgid "Execute blame action"
-msgstr "Execute move action"
+msgstr "Execute blame action"
 
 #: tvp-svn-helper/main.c:124
-#, fuzzy
 msgid "Execute changelist action"
-msgstr "Execute checkout action"
+msgstr "Execute changelist action"
 
 #: tvp-svn-helper/main.c:130
 msgid "Execute checkout action"
@@ -412,9 +404,8 @@ msgid "Execute resolved action"
 msgstr "Execute resolved action"
 
 #: tvp-svn-helper/main.c:202
-#, fuzzy
 msgid "Execute relocate action"
-msgstr "Execute delete action"
+msgstr "Execute relocate action"
 
 #: tvp-svn-helper/main.c:208
 msgid "Execute revert action"
@@ -425,9 +416,8 @@ msgid "Execute status action"
 msgstr "Execute status action"
 
 #: tvp-svn-helper/main.c:220
-#, fuzzy
 msgid "Execute switch action"
-msgstr "Execute commit action"
+msgstr "Execute switch action"
 
 #: tvp-svn-helper/main.c:226
 msgid "Execute unlock action"
@@ -442,14 +432,12 @@ msgid "Add Related Options:"
 msgstr "Add Related Options:"
 

[Xfce4-commits] l10n: Updates to Catalan (Valencian) (ca) translation

[Transifex]

Updating branch refs/heads/thunarx-2
 to 4f002d4645045c2de260c48cc0f305b910e1b6e8 (commit)
   from 0115351d469b585111e4178d0d3be0b8373856e3 (commit)

commit 4f002d4645045c2de260c48cc0f305b910e1b6e8
Author: Carles Muñoz Gorriz 
Date:   Sat Sep 5 13:28:45 2009 +

l10n: Updates to Catalan (Valencian) (ca) translation

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

 po/ca.po |  165 -
 1 files changed, 76 insertions(+), 89 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index e337653..5ad 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,13 +2,15 @@
 # Copyright (C) 2007 THE thunar-svn-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the thunar-svn-plugin 
package.
 # Harald Servat , 2009
+# Carles Muñoz Gorriz , 2009
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: thunar-svn-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-25 01:00+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Harald Servat \n"
+"Last-Translator: Carles Muñoz Gorriz \n"
 "Language-Team: Harald Servat \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +27,11 @@ msgstr "SVN"
 #. append the git submenu action
 #: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
 msgid "GIT"
-msgstr ""
+msgstr "GIT"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298
 msgid "Menu|Add"
-msgstr "Afegir"
+msgstr "Afegeix"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
 #: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
@@ -39,7 +41,7 @@ msgstr "Afegir"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:303
 msgid "Menu|Blame"
-msgstr "Culpar"
+msgstr "Culpa"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
 #: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
@@ -56,7 +58,7 @@ msgstr "Llista de canvis"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:320
 msgid "Menu|Checkout"
-msgstr "Obtenir"
+msgstr "Obté"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
 #: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
@@ -65,7 +67,7 @@ msgstr "Obtenir"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:325
 msgid "Menu|Cleanup"
-msgstr "Netejar"
+msgstr "Neteja"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
 msgid "Cleanup"
@@ -73,16 +75,16 @@ msgstr "Netejar"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:330
 msgid "Menu|Commit"
-msgstr "Confirmació"
+msgstr "Publica"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
 #: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
 msgid "Commit"
-msgstr "Confirmació"
+msgstr "Publicar"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:335
 msgid "Menu|Copy"
-msgstr "Copiar"
+msgstr "Copia"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
 #: tvp-svn-helper/tsh-copy.c:165
@@ -91,7 +93,7 @@ msgstr "Copiar"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:340
 msgid "Menu|Delete"
-msgstr "Esborrar"
+msgstr "Esborra"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
 #: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
@@ -108,7 +110,7 @@ msgstr "Diferències"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:350
 msgid "Menu|Export"
-msgstr "Exportar"
+msgstr "Exporta"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
 #: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
@@ -117,7 +119,7 @@ msgstr "Exportar"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:355
 msgid "Menu|Import"
-msgstr "Importar"
+msgstr "Importa"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
 #: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
@@ -134,7 +136,7 @@ msgstr "Informació"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:370
 msgid "Menu|Lock"
-msgstr "Bloquejar"
+msgstr "Bloqueja"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
 #: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
@@ -152,7 +154,7 @@ msgstr "Registre"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:390
 msgid "Menu|Move"
-msgstr "Moure"
+msgstr "Mou"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
 #: tvp-svn-helper/tsh-move.c:156
@@ -161,20 +163,20 @@ msgstr "Moure"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:401
 msgid "Menu|Edit Properties"
-msgstr "Editar propietats"
+msgstr "Edita les propietats"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:401
 msgid "Edit Properties"
-msgstr "Editar propietats"
+msgstr "Editar les propietats"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406
 msgid "Menu|Relocate"
-msgstr "Deslocalitzar"
+msgstr "Re-ubica"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
 #: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
 msgid "Relocate"
-msgstr "Deslocalitzar"
+msgstr "Re-ubicar"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412
 msgid "Menu|Resolved"
@@ -188,7 +190,7 @

[Xfce4-commits] * tvp-svn-helper/tsh-commit.c tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector. Using recursion info in file selection and commit comma

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 6962231135b468c9735e9decb32c9ff1be35340d (commit)
   from 861ecd7dbcf1aca9616e0a14d0f2bd66a7ca9c4c (commit)

commit 6962231135b468c9735e9decb32c9ff1be35340d
Author: Peter de Ridder 
Date:   Thu Aug 27 22:37:36 2009 +0200

* tvp-svn-helper/tsh-commit.c
  tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
  Using recursion info in file selection and commit command to be able
  to commit directory deletion.
* tvp-svn-helper/tsh-delete.c: Removed TSH_FILE_SELECTION_FLAG_MODIFIED
  flag.
* tvp-svn-helper/tsh-revert.c: Added
  TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.

 tvp-svn-helper/tsh-commit.c|   98 +++--
 tvp-svn-helper/tsh-delete.c|2 +-
 tvp-svn-helper/tsh-file-selection-dialog.c |  348 +++-
 tvp-svn-helper/tsh-file-selection-dialog.h |   18 +-
 tvp-svn-helper/tsh-revert.c|8 +-
 5 files changed, 390 insertions(+), 84 deletions(-)

diff --git a/tvp-svn-helper/tsh-commit.c b/tvp-svn-helper/tsh-commit.c
index 6a28913..1ae2032 100644
--- a/tvp-svn-helper/tsh-commit.c
+++ b/tvp-svn-helper/tsh-commit.c
@@ -57,40 +57,84 @@ static gpointer commit_thread (gpointer user_data)
   TshNotifyDialog *dialog = args->dialog;
   GSList *files = args->files;
   GSList *iter;
-  gint size;
+  GSList *delete = NULL;
+  //GSList *reverse_start = NULL, *reverse_end = NULL;
+  gint delete_size = 0;
+  gint size = 0;
+  gint size_indirect = 0;
+  gboolean recursive = TRUE;
   gchar *error_str;
   gchar *message;
   gchar buffer[256];
 
   g_free (args);
 
-  size = 0;
-
   subpool = svn_pool_create (pool);
 
-  for (iter = files; iter; iter = g_slist_next (iter))
+  for (iter = files; result && iter; iter = g_slist_next (iter))
   {
 TshFileInfo *info;
-size++;
+size_indirect++;
 
 info = iter->data;
-if (info->status == TSH_FILE_STATUS_UNVERSIONED && 
!(info->flags&TSH_FILE_INFO_INDIRECT))
+
+if (!(info->flags & TSH_FILE_INFO_INDIRECT))
 {
-  if ((err = svn_client_add4(info->path, 
(info->flags&TSH_FILE_INFO_RECURSIVE)?svn_depth_infinity:svn_depth_empty, 
FALSE, FALSE, FALSE, ctx, subpool)))
+  if (!(info->flags & TSH_FILE_INFO_RECURSIVE))
+recursive = FALSE;
+  size++;
+  switch (info->status)
   {
-error_str = tsh_strerror(err);
-gdk_threads_enter();
-tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
-gdk_threads_leave();
-g_free(error_str);
-
-svn_error_clear(err);
-result = FALSE;
-break;//FIXME: needed ??
+case TSH_FILE_STATUS_MISSING:
+  delete_size++;
+  delete = g_slist_prepend (delete, info);
+  break;
+case TSH_FILE_STATUS_UNVERSIONED:
+  if ((err = svn_client_add4(info->path, 
(info->flags&TSH_FILE_INFO_RECURSIVE)?svn_depth_infinity:svn_depth_empty, 
FALSE, FALSE, FALSE, ctx, subpool)))
+  {
+error_str = tsh_strerror(err);
+gdk_threads_enter();
+tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
+gdk_threads_leave();
+g_free(error_str);
+
+svn_error_clear(err);
+result = FALSE;//FIXME: needed ??
+  }
+  break;
+default:
+  break;
   }
 }
   }
 
+  if (result && delete_size)
+  {
+paths = apr_array_make (subpool, delete_size, sizeof (const char *));
+
+for (iter = delete; iter; iter = g_slist_next (iter))
+{
+  TshFileInfo *info = iter->data;
+  APR_ARRAY_PUSH (paths, const char *) = info->path;
+}
+
+if ((err = svn_client_delete3(NULL, paths, FALSE, FALSE, NULL, ctx, 
subpool)))
+{
+  svn_pool_destroy (subpool);
+
+  error_str = tsh_strerror(err);
+  gdk_threads_enter();
+  tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
+  gdk_threads_leave();
+  g_free(error_str);
+
+  svn_error_clear(err);
+  result = FALSE;//FIXME: needed ??
+}
+  }
+
+  g_slist_free (delete);
+
   svn_pool_destroy (subpool);
 
   /* check if an error occurred in add commands */
@@ -98,13 +142,29 @@ static gpointer commit_thread (gpointer user_data)
   {
 subpool = svn_pool_create (pool);
 
-if(size)
+if(recursive && size)
 {
   paths = apr_array_make (subpool, size, sizeof (const char *));
 
   for (iter = files; iter; iter = g_slist_next (iter))
   {
 TshFileInfo *info = iter->data;
+if (!(info->flags & TSH_FILE_INFO_INDIRECT))
+{
+  APR_ARRAY_PUSH (paths, const char *) = info->path;
+}
+  }
+}
+else if(size_indirect)
+{
+  /* Set recursive to false if it wasn't already, FIXME: needed?? */
+  recursive = FALSE;
+
+  paths = apr_array_make (subpool, size_indirect, sizeof (const char *));
+
+  for (iter = files; iter; iter = g_slist_next (iter))
+  {
+

[Xfce4-commits] Made project ready for release

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to ff3d8b861461414efc3ce272ac567e7059830e97 (commit)
   from 276f87c58df2a25a8e2f8503248412449d7440af (commit)

commit ff3d8b861461414efc3ce272ac567e7059830e97
Author: Peter de Ridder 
Date:   Sun Sep 27 16:18:09 2009 +0200

Made project ready for release

 NEWS|   17 -
 README  |   10 +-
 configure.ac.in |2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index c691bee..dc6561d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,22 @@
-0.0.3
+0.1.0
 =
+- The plugin is renamed to thunar-vcs-plugin.
+- All svn api functions are changed to both 1.5 and 1.6.
+- File selection dialog changed to work in more cases.
+- Limited git support added, but disabled.
+
+thunar-svn-plugin-0.0.3
+===
 - All svn api functions changed to the 1.5 svn api. libsvn version 1.5 or
   newer is now required.
 
-0.0.2
-=
+thunar-svn-plugin-0.0.2
+===
 - New Subversion actions have been added: switch, relocate, blame.
 - File selection dialog added for various Subversion actions.
 
-0.0.1
-=
+thunar-svn-plugin-0.0.1
+===
 - Initial release of the Thunar SVN Plugin. This version of the Subversion
   Plugin has suport for various Subversion action: add, checkout, cleanup,
   commit, copy, delete, export, import, lock, log, move, properties, resolved,
diff --git a/README b/README
index d5296f8..26eed33 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ About Thunar VCS Plugin
 ===
 
 The Thunar VCS Plugin adds Subversion actions to the context menu of thunar.
-This gives a VCS intergration to Thunar.
+This gives a VCS integration to Thunar.
 
 The current features are:
 - Most of the svn action: add, checkout, cleanup, commit, copy, delete,
@@ -35,10 +35,10 @@ The Thunar SVN Plugin depends on the following packages:
 Installation
 
 
-The file 'INSTALL' contains generic installation instructions. Make sure to
-run ./configure --prefix=$(pkg-config --variable prefix thunarx-1) so Thunar
-can find the plugin. For more information, visit the thunar-vcs-plugin website
-at http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
+The file 'INSTALL' contains generic installation instructions. To build the
+plugin xfce4-dev-tool version 4.7.2 or higher is required. For more
+information, visit the thunar-vcs-plugin website at
+http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
 
 
 How to report bugs?
diff --git a/configure.ac.in b/configure.ac.in
index 58236fd..11da6eb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -14,7 +14,7 @@ m4_define([tvp_version_major], [0])
 m4_define([tvp_version_minor], [1])
 m4_define([tvp_version_micro], [0])
 m4_define([tvp_version_build], [...@revision@])
-m4_define([tvp_version_tag], [git]) # Leave empty for releases
+m4_define([tvp_version_tag], []) # Leave empty for releases
 m4_define([tvp_version], 
[tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(),
 [], [], [tvp_version_tag()-tvp_version_build()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/thunar-plugins/thunar-vcs-plugin

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 0115351d469b585111e4178d0d3be0b8373856e3 (commit)
   from 6962231135b468c9735e9decb32c9ff1be35340d (commit)

commit 0115351d469b585111e4178d0d3be0b8373856e3
Merge: 6962231135b468c9735e9decb32c9ff1be35340d 
c05c65399f1876559ec185684891ec7b249b5e15
Author: Peter de Ridder 
Date:   Sun Aug 30 11:40:41 2009 +0200

Merge branch 'master' of 
ssh://git.xfce.org/git/thunar-plugins/thunar-vcs-plugin

commit c05c65399f1876559ec185684891ec7b249b5e15
Author: Jeff Bailes 
Date:   Sun Aug 30 09:33:55 2009 +

l10n: Updates to English (United Kingdom) (en_GB) translation

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

 po/en_GB.po |  159 ++
 1 files changed, 60 insertions(+), 99 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 29b05fe..c052c64 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,14 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
+# en_GB translation for thunar-vcs-plugin
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
+# Jeff Bailes , 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: thunart-svn-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2008-05-10 13:15+1000\n"
+"PO-Revision-Date: 2009-08-30 19:33+1000\n"
 "Last-Translator: Jeff Bailes \n"
 "Language-Team: English/GB\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr "SVN"
 #. append the git submenu action
 #: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
 msgid "GIT"
-msgstr ""
+msgstr "GIT"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298
 msgid "Menu|Add"
@@ -48,14 +48,12 @@ msgid "Blame"
 msgstr "Blame"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
 msgid "Menu|Changelist"
-msgstr "Checkout"
+msgstr "Changelist"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
 msgid "Changelist"
-msgstr "Changed"
+msgstr "Changelist"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:320
 msgid "Menu|Checkout"
@@ -171,15 +169,13 @@ msgid "Edit Properties"
 msgstr "Edit Properties"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406
-#, fuzzy
 msgid "Menu|Relocate"
-msgstr "Delete"
+msgstr "Relocate"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
 #: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
-#, fuzzy
 msgid "Relocate"
-msgstr "Replaced"
+msgstr "Relocate"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412
 msgid "Menu|Resolved"
@@ -292,36 +288,34 @@ msgid "Author:"
 msgstr "Author:"
 
 #: thunar-vcs-plugin/tvp-svn-property-page.c:203
-#, fuzzy
 msgid "Changelist:"
-msgstr "Changed"
+msgstr "Changelist:"
 
 #. Translators: Depth as in depth of recursion
 #: thunar-vcs-plugin/tvp-svn-property-page.c:216
 msgid "Depth:"
-msgstr ""
+msgstr "Depth:"
 
 #. Translators: svn recursion depth infotmation
 #. * Exclude should not apear client side
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:306
 msgid "Exclude"
-msgstr ""
+msgstr "Exclude"
 
 #. Translators: svn recursion depth infotmation
 #. * Empty depth means only this file/direcotry is checked out
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:312
 msgid "Empty"
-msgstr ""
+msgstr "Empty"
 
 #. Translators: svn recursion depth infotmation
 #. * Files depth means this file/direcotry and all of it's files are checked 
out
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:318
-#, fuzzy
 msgid "Files"
-msgstr "File"
+msgstr "Files"
 
 #. Translators: svn recursion depth infotmation
 #. * Immediates depth means this file/direcotry and all of it's files and 
subdirectories are checked out
@@ -336,14 +330,14 @@ msgstr "File"
 #: tvp-svn-helper/tsh-properties-dialog.c:229
 #: tvp-svn-helper/tsh-status-dialog.c:200
 msgid "Immediates"
-msgstr ""
+msgstr "Immediates"
 
 #. Translators: svn recursion depth infotmation
 #. * Infinity depth means this file/direcotry is checked out with full 
recursion
 #.
 #: thunar-vcs-plugin/tvp-svn-property-page.c:330
 msgid "Infinity"
-msgstr ""
+msgstr "Infinity"
 
 #: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
 msgid "Print version information"
@@ -354,14 +348,12 @@ msgid "Execute add action"
 msgstr "Execute add action"
 
 #: tvp-svn-helper/main.c:118
-#, fuzzy
 msgid "Execute blame action"
-msgstr "Execute move action"
+msgstr "Execute blame action"
 
 #: tvp-svn-helper/main.c:124
-#, fuzzy
 msgid "Execute changelist action"
-msgstr "Execute checkout action"
+msgstr "Execute changelist action"
 
 #: tvp-svn-helper/main.c:130
 msgid "Execute checkout action"
@@ -412,9 +404,8 @@ msgid "Execute resolved action"
 msgstr "Execute resolved action"
 
 #: tvp-svn-helper/main.c:202
-#, fuzzy
 msgid "Execute relocate action"
-msgstr "Execute delete action"
+msgstr "Execute relocate action"
 
 #: tvp-svn-helper/main.c:208
 msgid "Execute revert action"
@@ -425,9 +416,8 @@ msgid "Execute status action"
 msgstr "Execute status a

[Xfce4-commits] * autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of xfce4-dev-tools, now. * tvp-svn-help

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 62e7c3f1ac9edb49e7315fbf4eb4bb1cc3e6ef70 (commit)
   from 8d25653224e304889d941de8ed4ee6ad8b581c62 (commit)

commit 62e7c3f1ac9edb49e7315fbf4eb4bb1cc3e6ef70
Author: Peter de Ridder 
Date:   Sun Sep 27 13:14:53 2009 +0200

* autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
  version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
  xfce4-dev-tools, now.
* tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
  directory deletion.

 ChangeLog  |   90 +++-
 autogen.sh |   22 +---
 configure.ac.in|   69 -
 tvp-svn-helper/tsh-file-selection-dialog.c |7 +--
 4 files changed, 102 insertions(+), 86 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbfd09b..04e6ef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+2009-09-27 Peter de Ridder 
+
+   * autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
+ version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
+ xfce4-dev-tools, now.
+   * tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
+ directory deletion.
+
+2009-08-27 Peter de Ridder 
+
+   * tvp-svn-helper/tsh-commit.c
+ tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
+ Using recursion info in file selection and commit command to be able
+ to commit directory deletion.
+   * tvp-svn-helper/tsh-delete.c: Removed TSH_FILE_SELECTION_FLAG_MODIFIED
+ flag.
+   * tvp-svn-helper/tsh-revert.c: Added
+ TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.
+
+2009-07-27 Peter de Ridder 
+
+   * tvp-svn-helper/tsh-delete.c(delete_thread): Fixed segfault.
+   * tvp-svn-helper/tsh-file-selection-dialog.[ch]: Support for
+ unversioned directory trees.
+   * tvp-svn-helper/tsh-revert.c(revert_thread): Execute revert in
+ reverse directory order.
+   * tvp-svn-helper/tsh-add.c: Support for non-recursive add.
+   * tvp-svn-helper/tsh-log-dialog.c: Fixed 2 missing characters in last
+ commit.
+   * tvp-svn-helper/tsh-commit.c: Support adding unversioned files before
+ commiting. This fixes bug #3921.
+   
+2009-07-26 Peter de Ridder 
+
+   * thunar-vcs-plugin/tvp-svn-action.c: The add context menu item is now
+ visible on folder background menu too.
+   * tvp-svn-helper/tsh-{file-selection,log-message,log,status}-dialog.c:
+ The file lists are tree views now.
+   * tvp-svn-helper/tsh-tree-common.[ch]: Common routines to build a tree
+ view of files.
+   * tvp-svn-helper/tsh-common.c(tsh_log_func)
+ tvp-svn-helper/tsh-log-dialog.[ch]: Support has_children for log
+ entries.
+   * tvp-svn-helper/Makefile.am: tsh-tree-common.[ch] added.
+   
+2009-07-25 Peter de Ridder 
+
+   * thunar-vcs-plugin/tvp-svn-backend.c(tvp_svn_backend_init,
+ tvp_svn_backend_free): Changed the libsvn init. Not using
+ svn_cmdline_init anymore. This fixes bug #5106.
+   * thunar-vcs-plugin/tvp-svn-action.c(tvp_svn_action_create_menu_item):
+ Made the changelist menu item popup unimplemented.
+   * tvp-git-helper/tgh-{add,common}.c: Fixed system includes.
+   * configure.ac.in: Added check for 'sys/wait.h'.
+   * tvp-svn-helper/gtk*.[ch]: Removed the gtkfilechooser files from the
+ project.
+   * tvp-svn-helper/ths-log.c(log_thread): Fixed libsvn 1.5 support.
+   * tvp-svn-helper/tsh-common.c: Fixed compiler compatibility.
+   * tvp-svn-helper/tsh-resolved.c(resolved_thread): Added initializer
+ for posible uninintialized variable.
+   
+2009-07-10 Peter de Ridder 
+
+   * configure.ac.in: Added flags to disable subversion or git support.
+
+2009-06-28 Peter de Ridder 
+
+   * Renaming the thunar-svn-plugin to thunar-vcs-plugin.
+   * Added basic git support to the thunar-vcs-plugin.
+
+2009-06-28 Peter de Ridder 
+
+   * thunar-svn-plugin.c: Added add_subaction{,_u} to save alot of code
+ for adding items to the action menu.
+
+2009-04-30 Peter de Ridder 
+
+   * configure.ac.in: version incremented after release.
+   * thunar-svn-plugin tsp-svn-helper: changed functions to svn 1.6 api.
+
+2009-03-15 Peter de Ridder 
+
+   * Added comments about 1.5 recursion information for translators.
+
 2009-03-14 Peter de Ridder 
 
* === Released 0.0.3 ===
@@ -10,14 +94,14 @@
 2009-02-27 Peter de Ridder 
 
* thunar-svn-helper/tsh-{transfer,relocate}-dialog.c
-   thunar-svn-helper/Makefile: Removed gtkfilechooserentry which got
-   broken with the later version of gtk.
+ thunar-svn-helper/Makefile: Removed gtkfilechooserentry which got
+ broken with the later version of gtk.
* 

[Xfce4-commits] l10n: Updates to Latvian (lv) translation

[Transifex]

Updating branch refs/heads/thunarx-2
 to 4e256a0b2b6b6d50f504e4a8dcd3021b54afa817 (commit)
   from 4f002d4645045c2de260c48cc0f305b910e1b6e8 (commit)

commit 4e256a0b2b6b6d50f504e4a8dcd3021b54afa817
Author: Rihards Prieditis 
Date:   Fri Sep 18 20:18:11 2009 +

l10n: Updates to Latvian (lv) translation

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

 po/lv.po |  411 +-
 1 files changed, 191 insertions(+), 220 deletions(-)

diff --git a/po/lv.po b/po/lv.po
index 3afac05..edaf0fb 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,19 +1,23 @@
 # rench translations for hunar-svn-plugin package
 # Copyright (C) 2007 THE thunar-svn-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the thunar-svn-plugin 
package.
-# Rihards Prieditis , 2007.
 #
+# Rihards Prieditis , 2007.
+# Rihards Prieditis , 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: thunar-svn-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2007-11-15 21:18+0300\n"
-"Last-Translator: Rihards Priedītis \n"
-"Language-Team: Latvian \n"
+"PO-Revision-Date: 2009-09-18 21:17+0100\n"
+"Last-Translator: Rihards Prieditis \n"
+"Language-Team: Latvian \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #. append the svn submenu action
 #. Lets see if we are dealing with a working copy
@@ -24,11 +28,11 @@ msgstr "SVN"
 #. append the git submenu action
 #: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
 msgid "GIT"
-msgstr ""
+msgstr "GIT"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298
 msgid "Menu|Add"
-msgstr ""
+msgstr "Pievienot"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
 #: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
@@ -49,11 +53,11 @@ msgstr "Vainot"
 #: thunar-vcs-plugin/tvp-svn-action.c:315
 #, fuzzy
 msgid "Menu|Changelist"
-msgstr "Izrakstīt"
+msgstr "Izmaiņu saraksts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:315
 msgid "Changelist"
-msgstr ""
+msgstr "Izmaiņu saraksts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:320
 #, fuzzy
@@ -77,23 +81,23 @@ msgstr "Uzkopt"
 #: thunar-vcs-plugin/tvp-svn-action.c:330
 #, fuzzy
 msgid "Menu|Commit"
-msgstr "Apstiprināt"
+msgstr "Iesniegt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
 #: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
 msgid "Commit"
-msgstr "Apstiprināt"
+msgstr "Iesniegt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:335
 #, fuzzy
 msgid "Menu|Copy"
-msgstr "Pabeigts"
+msgstr "Kopēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
 #: tvp-svn-helper/tsh-copy.c:165
 #, fuzzy
 msgid "Copy"
-msgstr "Pabeigts"
+msgstr "Kopēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:340
 #, fuzzy
@@ -127,13 +131,13 @@ msgstr "Eksportēt"
 #: thunar-vcs-plugin/tvp-svn-action.c:355
 #, fuzzy
 msgid "Menu|Import"
-msgstr "SVN _Imports"
+msgstr "Imports"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
 #: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
 #, fuzzy
 msgid "Import"
-msgstr "SVN _Imports"
+msgstr "Imports"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:360
 #, fuzzy
@@ -156,7 +160,7 @@ msgstr "Slēgt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:375
 msgid "Menu|Log"
-msgstr ""
+msgstr "Reģistrēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
 #: tvp-svn-helper/tsh-log-dialog.c:201
@@ -165,52 +169,52 @@ msgstr "Reģistrēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:390
 msgid "Menu|Move"
-msgstr ""
+msgstr "Pārvietot"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
 #: tvp-svn-helper/tsh-move.c:156
 msgid "Move"
-msgstr ""
+msgstr "Pārvietot"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:401
 #, fuzzy
 msgid "Menu|Edit Properties"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rediģēt rekvizītus"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:401
 msgid "Edit Properties"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rediģēt rekvizītus"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406
 #, fuzzy
 msgid "Menu|Relocate"
-msgstr "Dzēst"
+msgstr "Atiedalīt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
 #: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
 msgid "Relocate"
-msgstr ""
+msgstr "Atiedalīt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412
 #, fuzzy
 msgid "Menu|Resolved"
-msgstr "Atpazīt"
+msgstr "Atrisināts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
 #: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
 #: tvp-svn-helper/tsh-resolved.c:126
 #, fuzzy
 msgid "Resolved"
-msgstr "Atpazīt"
+msgstr "Atrisināts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:417
 #, fuzzy
 msgid 

[Xfce4-commits] added intltool files to .gitignore

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 82a7acf341f1a774faa280cac6efe305deb83bbf (commit)
   from 663965cd50525ae2b7a43cd99cc09d50f2c27936 (commit)

commit 82a7acf341f1a774faa280cac6efe305deb83bbf
Author: Peter de Ridder 
Date:   Sun Sep 27 15:35:09 2009 +0200

added intltool files to .gitignore

 .gitignore |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index b254331..e3a21c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@ config.status
 config.sub
 configure
 configure.ac
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
 depcomp
 install-sh
 libtool
@@ -22,6 +25,7 @@ stamp-h1
 .libs
 po/Makefile.in.in
 po/POTFILES
+po/stamp-it
 po/*gmo
 thunar-vcs-plugin/thunar-vcs-plugin.la
 thunar-vcs-plugin/thunar_vcs_plugin_la-*.lo
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Latvian (lv) translation

[Transifex]

Updating branch refs/heads/thunarx-2
 to 8d25653224e304889d941de8ed4ee6ad8b581c62 (commit)
   from 4e256a0b2b6b6d50f504e4a8dcd3021b54afa817 (commit)

commit 8d25653224e304889d941de8ed4ee6ad8b581c62
Author: Rihards Prieditis 
Date:   Fri Sep 18 20:21:24 2009 +

l10n: Updates to Latvian (lv) translation

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

 po/lv.po |   72 +
 1 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/po/lv.po b/po/lv.po
index edaf0fb..a530e4f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: thunar-svn-plugin\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2009-09-18 21:17+0100\n"
+"PO-Revision-Date: 2009-09-18 21:21+0100\n"
 "Last-Translator: Rihards Prieditis \n"
 "Language-Team: Latvian \n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,6 @@ msgid "Add"
 msgstr "Pievienot"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:303
-#, fuzzy
 msgid "Menu|Blame"
 msgstr "Vainot"
 
@@ -51,7 +50,6 @@ msgid "Blame"
 msgstr "Vainot"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
 msgid "Menu|Changelist"
 msgstr "Izmaiņu saraksts"
 
@@ -60,7 +58,6 @@ msgid "Changelist"
 msgstr "Izmaiņu saraksts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:320
-#, fuzzy
 msgid "Menu|Checkout"
 msgstr "Izrakstīt"
 
@@ -70,7 +67,6 @@ msgid "Checkout"
 msgstr "Izrakstīt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:325
-#, fuzzy
 msgid "Menu|Cleanup"
 msgstr "Uzkopt"
 
@@ -79,7 +75,6 @@ msgid "Cleanup"
 msgstr "Uzkopt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:330
-#, fuzzy
 msgid "Menu|Commit"
 msgstr "Iesniegt"
 
@@ -89,18 +84,15 @@ msgid "Commit"
 msgstr "Iesniegt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:335
-#, fuzzy
 msgid "Menu|Copy"
 msgstr "Kopēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
 #: tvp-svn-helper/tsh-copy.c:165
-#, fuzzy
 msgid "Copy"
 msgstr "Kopēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:340
-#, fuzzy
 msgid "Menu|Delete"
 msgstr "Dzēst"
 
@@ -110,7 +102,6 @@ msgid "Delete"
 msgstr "Dzēst"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:345
-#, fuzzy
 msgid "Menu|Diff"
 msgstr "Atšķirība"
 
@@ -119,7 +110,6 @@ msgid "Diff"
 msgstr "Atšķirība"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:350
-#, fuzzy
 msgid "Menu|Export"
 msgstr "Eksportēt"
 
@@ -129,18 +119,15 @@ msgid "Export"
 msgstr "Eksportēt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:355
-#, fuzzy
 msgid "Menu|Import"
 msgstr "Imports"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
 #: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
-#, fuzzy
 msgid "Import"
 msgstr "Imports"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:360
-#, fuzzy
 msgid "Menu|Info"
 msgstr "Informācija"
 
@@ -149,7 +136,6 @@ msgid "Info"
 msgstr "Informācija"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:370
-#, fuzzy
 msgid "Menu|Lock"
 msgstr "Slēgt"
 
@@ -177,7 +163,6 @@ msgid "Move"
 msgstr "Pārvietot"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:401
-#, fuzzy
 msgid "Menu|Edit Properties"
 msgstr "Rediģēt rekvizītus"
 
@@ -186,7 +171,6 @@ msgid "Edit Properties"
 msgstr "Rediģēt rekvizītus"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:406
-#, fuzzy
 msgid "Menu|Relocate"
 msgstr "Atiedalīt"
 
@@ -196,19 +180,16 @@ msgid "Relocate"
 msgstr "Atiedalīt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412
-#, fuzzy
 msgid "Menu|Resolved"
 msgstr "Atrisināts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
 #: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
 #: tvp-svn-helper/tsh-resolved.c:126
-#, fuzzy
 msgid "Resolved"
 msgstr "Atrisināts"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:417
-#, fuzzy
 msgid "Menu|Resolve"
 msgstr "Atrisināt"
 
@@ -217,7 +198,6 @@ msgid "Resolve"
 msgstr "Atrisināt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:422
-#, fuzzy
 msgid "Menu|Revert"
 msgstr "Atgriezt"
 
@@ -227,7 +207,6 @@ msgid "Revert"
 msgstr "Atgriezt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:427
-#, fuzzy
 msgid "Menu|Status"
 msgstr "Status"
 
@@ -240,7 +219,6 @@ msgid "Status"
 msgstr "Status"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:432
-#, fuzzy
 msgid "Menu|Switch"
 msgstr "Pārslēgt"
 
@@ -250,7 +228,6 @@ msgid "Switch"
 msgstr "Pārslēgt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:437
-#, fuzzy
 msgid "Menu|Unlock"
 msgstr "Atslēgt"
 
@@ -260,7 +237,6 @@ msgid "Unlock"
 msgstr "Atslēgt"
 
 #: thunar-vcs-plugin/tvp-svn-action.c:442
-#, fuzzy
 msgid "Menu|Update"
 msgstr "Atjaunot"
 
@@ -294,12 +270,10 @@ msgid "Unknown"
 msgstr "Nezināms"
 
 #: thunar-vcs-plugin/tvp-svn-property-page.c:131
-#, fuzzy
 msgid "Revision:"
 msgstr "Revīzija:"
 
 #: thunar-vcs-plugin/tvp-svn-property-page.c:143
-#, fuzzy
 msgid "Repository:"
 msgstr "Repozitorijs:"
 
@@ -372,17 +346,14 @@ msgid "Print version information"
 msgstr "Izdrukāt versijas informāciju"
 
 #: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
-#, fuzzy
 msgid "Execute add action"
 msg

[Xfce4-commits] Post commit git tag added.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 6f7451158345cf3745df63ae0f4450e9cff78757 (commit)
   from aaaf95912f9d69ab2eb58a1991eb69a08c9f3b5d (commit)

commit 6f7451158345cf3745df63ae0f4450e9cff78757
Author: Peter de Ridder 
Date:   Sat Oct 24 14:49:34 2009 +0200

Post commit git tag added.

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

diff --git a/configure.ac.in b/configure.ac.in
index fd1b70f..2c60c3b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -14,7 +14,7 @@ m4_define([tvp_version_major], [0])
 m4_define([tvp_version_minor], [1])
 m4_define([tvp_version_micro], [1])
 m4_define([tvp_version_build], [...@revision@])
-m4_define([tvp_version_tag], []) # Leave empty for releases
+m4_define([tvp_version_tag], [git]) # Leave empty for releases
 m4_define([tvp_version], 
[tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(),
 [], [], [tvp_version_tag()-tvp_version_build()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * thunar-vcs-plugin/tvp-provider.c thunar-vcs-plugin/tvp-git-action.[ch]: Added extra flags to tvp_git_action_new. * thunar-vcs-plugin/yvp-{svn, git}-acti

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 956d4903bccd42425a79ae546d0ae2dabdff1317 (commit)
   from 134427c074ba04a2e94390e7f6be105921d978d0 (commit)

commit 956d4903bccd42425a79ae546d0ae2dabdff1317
Author: Peter de Ridder 
Date:   Sun Oct 11 23:21:15 2009 +0200

* thunar-vcs-plugin/tvp-provider.c
  thunar-vcs-plugin/tvp-git-action.[ch]: Added extra flags to
  tvp_git_action_new.
* thunar-vcs-plugin/yvp-{svn,git}-action.c: Only show menu items if they
  are implemented.

 thunar-vcs-plugin/tvp-git-action.c |   15 +++
 thunar-vcs-plugin/tvp-git-action.h |2 ++
 thunar-vcs-plugin/tvp-provider.c   |   36 
 thunar-vcs-plugin/tvp-svn-action.c |5 +++--
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-git-action.c 
b/thunar-vcs-plugin/tvp-git-action.c
index 57bfe31..f0b32c5 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -139,7 +139,9 @@ tvp_git_action_new (const gchar *name,
 const gchar *label,
 GList *files,
 GtkWidget *window,
-gboolean is_parent)
+gboolean is_parent,
+gboolean is_direcotry,
+gboolean is_file)
 {
   GtkAction *action;
 
@@ -223,8 +225,9 @@ add_subaction_u (GtkMenuShell *menu, const gchar *name, 
const gchar *text, const
 subitem = gtk_action_create_menu_item (subaction);
 g_object_get (G_OBJECT (subaction), "tooltip", &tooltip, NULL);
 gtk_widget_set_tooltip_text(subitem, tooltip);
-gtk_menu_shell_append (menu, subitem);
-gtk_widget_show(subitem);
+//gtk_menu_shell_append (menu, subitem);
+//gtk_widget_show(subitem);
+gtk_widget_unref (subitem);
 }
 
 
@@ -233,6 +236,7 @@ tvp_git_action_create_menu_item (GtkAction *action)
 {
 GtkWidget *item;
 GtkWidget *menu;
+TvpGitAction *tvp_action = TVP_GIT_ACTION (action);
 
 item = GTK_ACTION_CLASS(tvp_git_action_parent_class)->create_menu_item 
(action);
 
@@ -241,9 +245,11 @@ tvp_git_action_create_menu_item (GtkAction *action)
 
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::add", Q_("Menu|Add"), 
_("Add"), GTK_STOCK_ADD, "--add");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::bisect", Q_("Menu|Bisect"), 
_("Bisect"), NULL, _("Bisect"));
+  if(tvp_action->property.is_parent)
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::branch", 
Q_("Menu|Branch"), _("Branch"), NULL, "--branch");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::checkout", 
Q_("Menu|Checkout"), _("Checkout"), GTK_STOCK_CONNECT, _("Checkout"));
-add_subaction_u(GTK_MENU_SHELL(menu), "tvp::clone", Q_("Menu|Clone"), 
_("Clone"), GTK_STOCK_COPY, _("Clone"));
+  if(tvp_action->property.is_parent)
+add_subaction (action, GTK_MENU_SHELL(menu), "tvp::clone", 
Q_("Menu|Clone"), _("Clone"), GTK_STOCK_COPY, "--clone");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::commit", Q_("Menu|Commit"), 
_("Commit"), GTK_STOCK_APPLY, _("Commit"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::diff", Q_("Menu|Diff"), 
_("Diff"), GTK_STOCK_FIND_AND_REPLACE, _("Diff"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::fetch", Q_("Menu|Fetch"), 
_("Fetch"), NULL, _("Fetch"));
@@ -258,6 +264,7 @@ tvp_git_action_create_menu_item (GtkAction *action)
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::reset", 
Q_("Menu|Reset"), _("Reset"), GTK_STOCK_UNDO, "--reset");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::remove", Q_("Menu|Remove"), 
_("Remove"), GTK_STOCK_DELETE, _("Remove"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::show", Q_("Menu|Show"), 
_("Show"), NULL, _("Show"));
+  if(tvp_action->property.is_parent)
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::status", 
Q_("Menu|Status"), _("Status"), GTK_STOCK_DIALOG_INFO, "--status");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::tag", Q_("Menu|Tag"), 
_("Tag"), NULL, _("Tag"));
 
diff --git a/thunar-vcs-plugin/tvp-git-action.h 
b/thunar-vcs-plugin/tvp-git-action.h
index d6a16ee..a016249 100644
--- a/thunar-vcs-plugin/tvp-git-action.h
+++ b/thunar-vcs-plugin/tvp-git-action.h
@@ -42,6 +42,8 @@ GtkAction *tvp_git_action_new   (const gchar*,
  const gchar*,
  GList *,
  GtkWidget *,
+ gboolean,
+ gboolean,
  gboolean) G_GNUC_MALLOC 
G_GNUC_INTERNAL;
 
 G_END_DECLS;
diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index 13560ac..ac77ffc 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -386,19 +386,25 @@ tvp_provider_get_file_actions (ThunarxMenuProvider 
*menu_provider,
 {
   GList  *actions = NULL;
   GtkAction  *action;
-#ifdef HAVE_SUBVERSION
   ThunarVfsPathScheme scheme;
   ThunarVfsInfo  *info

[Xfce4-commits] * tvp-{svn, git}-helper/main.c: Added xfce_textdomain to correctly init translations. * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 4331a369bea25840216c1dea26786077697fc4bd (commit)
   from ff3d8b861461414efc3ce272ac567e7059830e97 (commit)

commit 4331a369bea25840216c1dea26786077697fc4bd
Author: Peter de Ridder 
Date:   Tue Sep 29 23:36:56 2009 +0200

* tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
  translations.
* tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty
  string before translations, otherwise the po header will be returned.
* */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS
  overriding.

 ChangeLog |   18 ++
 thunar-vcs-plugin/Makefile.am |   20 +---
 tvp-git-helper/Makefile.am|3 ++-
 tvp-git-helper/main.c |3 +++
 tvp-svn-helper/Makefile.am|3 ++-
 tvp-svn-helper/main.c |3 +++
 tvp-svn-helper/tsh-common.c   |4 +++-
 7 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 615a8a5..5751442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,22 @@
 2009-09-27 Peter de Ridder 
-   * Made Thuner VCS Plugin compile with --enable-debug=full.
-   * Updated the po files.
+
+   * tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
+ translations.
+   * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty
+ string before translations, otherwise the po header will be
+ returned.
+   * */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS
+ overriding.
 
 2009-09-27 Peter de Ridder 
 
+   * Made Thuner VCS Plugin compile with --enable-debug=full.
+   * Updated the po files.
* autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
  version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
  xfce4-dev-tools, now.
* tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
  directory deletion.
-
-2009-08-27 Peter de Ridder 
-
* tvp-svn-helper/tsh-commit.c
  tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
  Using recursion info in file selection and commit command to be able
@@ -20,9 +25,6 @@
  flag.
* tvp-svn-helper/tsh-revert.c: Added
  TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.
-
-2009-07-27 Peter de Ridder 
-
* tvp-svn-helper/tsh-delete.c(delete_thread): Fixed segfault.
* tvp-svn-helper/tsh-file-selection-dialog.[ch]: Support for
  unversioned directory trees.
diff --git a/thunar-vcs-plugin/Makefile.am b/thunar-vcs-plugin/Makefile.am
index a2a396f..e09ef29 100644
--- a/thunar-vcs-plugin/Makefile.am
+++ b/thunar-vcs-plugin/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS =  \
-I$(top_builddir)   \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"thunar-vcs-plugin\"\
@@ -31,18 +31,24 @@ thunar_vcs_plugin_la_SOURCES += 
\
tvp-git-action.h
 endif
 
+thunar_vcs_plugin_la_CPPFLAGS =
\
+   $(AM_CPPFLAGS)
+if HAVE_SUBVERSION
+thunar_vcs_plugin_la_CPPFLAGS +=   \
+   -DTVP_SVN_HELPER=\"$(libexecdir)/tvp-svn-helper\"
+endif
+if HAVE_GIT
+thunar_vcs_plugin_la_CPPFLAGS +=   \
+   -DTVP_GIT_HELPER=\"$(libexecdir)/tvp-git-helper\"
+endif
+
 thunar_vcs_plugin_la_CFLAGS =  \
$(PLATFORM_CFLAGS)  \
$(THUNARX_CFLAGS)   \
$(THUNAR_VFS_CFLAGS)
 if HAVE_SUBVERSION
 thunar_vcs_plugin_la_CFLAGS += \
-   $(APR_CFLAGS)   \
-   -DTVP_SVN_HELPER=\"$(libexecdir)/tvp-svn-helper\"
-endif
-if HAVE_GIT
-thunar_vcs_plugin_la_CFLAGS += \
-   -DTVP_GIT_HELPER=\"$(libexecdir)/tvp-git-helper\"
+   $(APR_CFLAGS)
 endif
 
 thunar_vcs_plugin_la_LDFLAGS = \
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index e275391..ee231f3 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -36,7 +36,8 @@ tvp_git_helper_SOURCES =  
\
tgh-status-dialog.c
 
 tvp_git_helper_CPPFLAGS =  \
-   -DG_LOG_DOMAIN=\"tvp-git-helper\"
+   -DG_LOG_DOMAIN=\"tvp-git-helper\"   \
+   $(AM_CPPFLAGS)
 
 tvp_git_helper_CFLAGS =   

[Xfce4-commits] * tvp-git-helper/tgh-clone.c: Fixed a memory leak. * tvp-git-helper/tgh-log-dialog.c: Removed expander column. * tvp-svn-helper/tsh-log-dialog.c: Changed

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 06d7670fea400a2856d9c6beb510c5d3e7d02f45 (commit)
   from 8f4ba0b888e20c4045f1d252c531c093e8a7b690 (commit)

commit 06d7670fea400a2856d9c6beb510c5d3e7d02f45
Author: Peter de Ridder 
Date:   Sun Oct 25 00:49:36 2009 +0200

* tvp-git-helper/tgh-clone.c: Fixed a memory leak.
* tvp-git-helper/tgh-log-dialog.c: Removed expander column.
* tvp-svn-helper/tsh-log-dialog.c: Changed "File" to "Path".
* tvp-svn-helper/tsh-properties-dialog.c: Swapped signal emit and tree
  clear order.

 tvp-git-helper/tgh-clone.c |5 -
 tvp-git-helper/tgh-log-dialog.c|4 +---
 tvp-svn-helper/tsh-log-dialog.c|2 +-
 tvp-svn-helper/tsh-properties-dialog.c |8 
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tvp-git-helper/tgh-clone.c b/tvp-git-helper/tgh-clone.c
index 945ce8a..76ccfd5 100644
--- a/tvp-git-helper/tgh-clone.c
+++ b/tvp-git-helper/tgh-clone.c
@@ -71,7 +71,7 @@ static gboolean clone_spawn (GtkWidget *dialog, gchar 
*repository, gchar *path,
   GIOChannel *chan_err;
   TghOutputParser *parser;
   gchar **argv;
-  struct exit_args *args = g_new(struct exit_args, 1);
+  struct exit_args *args;
 
   argv = g_new(gchar*, 6);
 
@@ -84,11 +84,14 @@ static gboolean clone_spawn (GtkWidget *dialog, gchar 
*repository, gchar *path,
 
   if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | 
G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
   {
+g_free (argv);
 return FALSE;
   }
+  g_free (argv);
 
   parser = tgh_error_parser_new(GTK_WIDGET(dialog));
 
+  args = g_new(struct exit_args, 1);
   args->parser = parser;
   args->dialog = dialog;
 
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index 62e4bd3..f7938c9 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -106,7 +106,6 @@ tgh_log_dialog_init (TghLogDialog *dialog)
   GtkWidget *vpane;
   GtkCellRenderer *renderer;
   GtkTreeModel *model;
-  gint n_columns;
 
   pane = gtk_vpaned_new ();
 
@@ -191,11 +190,10 @@ tgh_log_dialog_init (TghLogDialog *dialog)
   NULL);
 
   renderer = gtk_cell_renderer_text_new ();
-  n_columns = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW 
(file_view),
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
   -1, _("File"),
   renderer, "text",
   FILE_COLUMN_FILE, NULL);
-  gtk_tree_view_set_expander_column (GTK_TREE_VIEW (file_view), 
gtk_tree_view_get_column (GTK_TREE_VIEW (file_view), n_columns - 1));
 
   model = GTK_TREE_MODEL (gtk_list_store_new (FILE_COLUMN_COUNT, 
G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING));
 
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index 62f5d0c..6878f94 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -183,7 +183,7 @@ tsh_log_dialog_init (TshLogDialog *dialog)

   renderer = gtk_cell_renderer_text_new ();
   n_columns = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW 
(file_view),
-   -1, _("File"),
+   -1, _("Path"),
renderer, "text",
FILE_COLUMN_FILE, 
NULL);
   gtk_tree_view_set_expander_column (GTK_TREE_VIEW (file_view), 
gtk_tree_view_get_column (GTK_TREE_VIEW (file_view), n_columns - 1));
diff --git a/tvp-svn-helper/tsh-properties-dialog.c 
b/tvp-svn-helper/tsh-properties-dialog.c
index 3f456c8..f61642e 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -552,11 +552,11 @@ set_clicked (GtkButton *button, gpointer user_data)

gtk_widget_hide (dialog->close);
gtk_widget_show (dialog->cancel);
-
-  g_signal_emit (dialog, signals[SIGNAL_SET], 0);
   
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
   gtk_list_store_clear (GTK_LIST_STORE (model));
+
+  g_signal_emit (dialog, signals[SIGNAL_SET], 0);
 }
 
 static void
@@ -567,10 +567,10 @@ delete_clicked (GtkButton *button, gpointer user_data)

gtk_widget_hide (dialog->close);
gtk_widget_show (dialog->cancel);
-
-  g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
   
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
   gtk_list_store_clear (GTK_LIST_STORE (model));
+
+  g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * tvp-git-helper/main.c tvp-git-helper/tgh-clone.[ch] tvp-git-helper/tgh-transfer-dialog.[ch]: Added clone action. * tvp-git-helper/tgh-{add, branch, rese

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 134427c074ba04a2e94390e7f6be105921d978d0 (commit)
   from bf9e5ebcc8e25bcad1e4032b6e711bb9c79bf71f (commit)

commit 134427c074ba04a2e94390e7f6be105921d978d0
Author: Peter de Ridder 
Date:   Sun Oct 11 23:17:25 2009 +0200

* tvp-git-helper/main.c tvp-git-helper/tgh-clone.[ch]
  tvp-git-helper/tgh-transfer-dialog.[ch]: Added clone action.
* tvp-git-helper/tgh-{add,branch,reset,status}.[ch]: Cleaned the code a
  bit.

 tvp-git-helper/Makefile.am  |6 +-
 tvp-git-helper/main.c   |   17 ++
 tvp-git-helper/tgh-add.c|2 +
 tvp-git-helper/tgh-branch.c |   10 +-
 tvp-git-helper/{tgh-add.c => tgh-clone.c}   |   41 ++---
 tvp-git-helper/{tgh-reset.h => tgh-clone.h} |8 +-
 tvp-git-helper/tgh-reset.c  |2 +
 tvp-git-helper/tgh-status.c |   10 +-
 tvp-git-helper/tgh-transfer-dialog.c|  228 +++
 tvp-git-helper/tgh-transfer-dialog.h|   50 ++
 10 files changed, 329 insertions(+), 45 deletions(-)

diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index ee231f3..8b3a59c 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -18,6 +18,8 @@ tvp_git_helper_SOURCES =  
\
tgh-add.c   \
tgh-branch.h\
tgh-branch.c\
+   tgh-clone.h \
+   tgh-clone.c \
tgh-common.h\
tgh-common.c\
tgh-reset.h \
@@ -33,7 +35,9 @@ tvp_git_helper_SOURCES =  
\
tgh-reset-dialog.h  \
tgh-reset-dialog.c  \
tgh-status-dialog.h \
-   tgh-status-dialog.c
+   tgh-status-dialog.c \
+   tgh-transfer-dialog.h   \
+   tgh-transfer-dialog.c
 
 tvp_git_helper_CPPFLAGS =  \
-DG_LOG_DOMAIN=\"tvp-git-helper\"   \
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index a5d083a..d770ae0 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -32,6 +32,7 @@
 
 #include "tgh-add.h"
 #include "tgh-branch.h"
+#include "tgh-clone.h"
 #include "tgh-reset.h"
 #include "tgh-status.h"
 
@@ -53,6 +54,7 @@ int main (int argc, char *argv[])
   gboolean print_version = FALSE;
   gboolean add = FALSE;
   gboolean branch = FALSE;
+  gboolean clone = FALSE;
   gboolean reset = FALSE;
   gboolean status = FALSE;
   gchar **files = NULL;
@@ -80,6 +82,12 @@ int main (int argc, char *argv[])
 { NULL, '\0', 0, 0, NULL, NULL, NULL }
   };
 
+  GOptionEntry clone_options_table[] =
+  {
+{ "clone", '\0', 0, G_OPTION_ARG_NONE, &clone, N_("Execute clone action"), 
NULL },
+{ NULL, '\0', 0, 0, NULL, NULL, NULL }
+  };
+
   GOptionEntry reset_options_table[] =
   {
 { "reset", '\0', 0, G_OPTION_ARG_NONE, &reset, N_("Execute reset action"), 
NULL },
@@ -108,6 +116,10 @@ int main (int argc, char *argv[])
   g_option_group_add_entries(option_group, branch_options_table);
   g_option_context_add_group(option_context, option_group);
 
+  option_group = g_option_group_new("clone", N_("Clone Related Options:"), 
N_("Clone"), NULL, NULL);
+  g_option_group_add_entries(option_group, clone_options_table);
+  g_option_context_add_group(option_context, option_group);
+
   option_group = g_option_group_new("reset", N_("Reset Related Options:"), 
N_("Reset"), NULL, NULL);
   g_option_group_add_entries(option_group, reset_options_table);
   g_option_context_add_group(option_context, option_group);
@@ -138,6 +150,11 @@ int main (int argc, char *argv[])
 has_child = tgh_branch(files, &pid);
   }
 
+  if(clone)
+  {
+has_child = tgh_clone(files, &pid);
+  }
+
   if(reset)
   {
 has_child = tgh_reset(files, &pid);
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index a106bca..dda5190 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -90,8 +90,10 @@ static gboolean add_spawn (GtkWidget *dialog, gchar **files, 
GPid *pid)
 
   if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | 
G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
   {
+g_free (argv);
 return FALSE;
   }
+  g_free (argv);
 
   parser = tgh_error_parser_new(GTK_WIDGET(dialog));
 
d

[Xfce4-commits] * tvp-git-helper/tgh-{add, reset}.c: Made chdir work correct. * tvp-git-helper/tgh-file-selection-dialog.[ch]: Don't use input files for git call since th

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 93e8e9f94d7e43f9cb927fd0a6e25ae69c662b9e (commit)
   from 5782267e5a5790db8521f9a671cd514b693fe582 (commit)

commit 93e8e9f94d7e43f9cb927fd0a6e25ae69c662b9e
Author: Peter de Ridder 
Date:   Wed Oct 14 23:03:49 2009 +0200

* tvp-git-helper/tgh-{add,reset}.c: Made chdir work correct.
* tvp-git-helper/tgh-file-selection-dialog.[ch]: Don't use input files
  for git call since this gives the wrong results.

 tvp-git-helper/tgh-add.c   |   14 +-
 tvp-git-helper/tgh-file-selection-dialog.c |   24 +---
 tvp-git-helper/tgh-file-selection-dialog.h |1 -
 tvp-git-helper/tgh-reset.c |   14 +-
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index dda5190..4b57046 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -112,7 +112,19 @@ gboolean tgh_add (gchar **files, GPid *pid)
 {
   GtkWidget *dialog;
 
-  dialog = tgh_file_selection_dialog_new (_("Add"), NULL, 0, files, 
TGH_FILE_SELECTION_FLAG_MODIFIED|TGH_FILE_SELECTION_FLAG_UNTRACKED);
+  if (files)
+if (chdir(files[0]))
+{
+  gchar *dirname = g_dirname (files[0]);
+  if (chdir(dirname))
+  {
+g_free (dirname);
+return FALSE;
+  }
+  g_free (dirname);
+}
+
+  dialog = tgh_file_selection_dialog_new (_("Add"), NULL, 0, 
TGH_FILE_SELECTION_FLAG_MODIFIED|TGH_FILE_SELECTION_FLAG_UNTRACKED);
   if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
   {
 gtk_widget_destroy (dialog);
diff --git a/tvp-git-helper/tgh-file-selection-dialog.c 
b/tvp-git-helper/tgh-file-selection-dialog.c
index 0a954e5..387708c 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.c
+++ b/tvp-git-helper/tgh-file-selection-dialog.c
@@ -54,6 +54,8 @@ struct _TghFileSelectionDialogClass
 
 G_DEFINE_TYPE (TghFileSelectionDialog, tgh_file_selection_dialog, 
GTK_TYPE_DIALOG)
 
+static gchar *argv[] = {"git", "status", NULL};
+
 static void
 tgh_file_selection_dialog_class_init (TghFileSelectionDialogClass *klass)
 {
@@ -141,11 +143,8 @@ static TghOutputParser* status_parser_new (GtkWidget 
*dialog)
 }
 
 GtkWidget*
-tgh_file_selection_dialog_new (const gchar *title, GtkWindow *parent, 
GtkDialogFlags flags, gchar **files, TghFileSelectionFlags selection_flags)
+tgh_file_selection_dialog_new (const gchar *title, GtkWindow *parent, 
GtkDialogFlags flags, TghFileSelectionFlags selection_flags)
 {
-  gsize length;
-  gint i;
-  gchar **argv;
   GPid pid;
   gint fd_out, fd_err;
   GError *error = NULL;
@@ -171,21 +170,6 @@ tgh_file_selection_dialog_new (const gchar *title, 
GtkWindow *parent, GtkDialogF
 
   dialog->flags = selection_flags;
 
-  length = 3;
-  if(files)
-length += g_strv_length(files);
-
-  argv = g_new(gchar*, length);
-
-  argv[0] = "git";
-  argv[1] = "status";
-  argv[length-1] = NULL;
-
-  i = 2;
-  if(files)
-while(*files)
-  argv[i++] = *files++;
-
   if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | 
G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, NULL, &fd_out, &fd_err, &error))
   {
 return FALSE;
@@ -295,6 +279,8 @@ status_parser_func(StatusParser *parser, gchar *line)
   break;
   }
 
+  g_debug ("%s, %d", line, add);
+
   if (add)
   {
 GtkTreeModel *model;
diff --git a/tvp-git-helper/tgh-file-selection-dialog.h 
b/tvp-git-helper/tgh-file-selection-dialog.h
index cb2ec9d..98b7b98 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.h
+++ b/tvp-git-helper/tgh-file-selection-dialog.h
@@ -45,7 +45,6 @@ GType  tgh_file_selection_dialog_get_type   (void) 
G_GNUC_CONST G_GNUC_INTER
 GtkWidget* tgh_file_selection_dialog_new(const gchar *title,
  GtkWindow *parent,
  GtkDialogFlags flags,
- gchar **files,
  TghFileSelectionFlags 
selection_flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
 
 gchar**tgh_file_selection_dialog_get_files  (TghFileSelectionDialog 
*dialog);
diff --git a/tvp-git-helper/tgh-reset.c b/tvp-git-helper/tgh-reset.c
index 8b0bdc7..6daa82f 100644
--- a/tvp-git-helper/tgh-reset.c
+++ b/tvp-git-helper/tgh-reset.c
@@ -124,7 +124,19 @@ gboolean tgh_reset (gchar **files, GPid *pid)
 {
   GtkWidget *dialog;
 
-  dialog = tgh_file_selection_dialog_new (_("Reset"), NULL, 0, files, 
TGH_FILE_SELECTION_FLAG_ADDED);
+  if (files)
+if (chdir(files[0]))
+{
+  gchar *dirname = g_dirname (files[0]);
+  if (chdir(dirname))
+  {
+g_free (dirname);
+return FALSE;
+  }
+  g_free (dirname);
+}
+
+  dialog = tgh_file_selection_dialog_new (_("Reset"), NULL, 0, 
TGH_FILE_SELECTION_FLAG_ADDED);
   if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
   {
 gtk_widget_destroy (dialog);

[Xfce4-commits] * thunar-vcs-lpugin/tvp-git-action.c tvp-git-helper/Makefile.am tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch] tvp-git-helper/tgh-log{-dialog, }.[ch

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to ce00efd125e8de3f51d7625d67aed6a31d252bc8 (commit)
   from 956d4903bccd42425a79ae546d0ae2dabdff1317 (commit)

commit ce00efd125e8de3f51d7625d67aed6a31d252bc8
Author: Peter de Ridder 
Date:   Wed Oct 14 22:13:28 2009 +0200

* thunar-vcs-lpugin/tvp-git-action.c tvp-git-helper/Makefile.am
  tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch]
  tvp-git-helper/tgh-log{-dialog,}.[ch]: Added log action.

 thunar-vcs-plugin/tvp-git-action.c |2 +-
 tvp-git-helper/Makefile.am |4 +
 tvp-git-helper/main.c  |   17 ++
 tvp-git-helper/tgh-common.c|  112 
 tvp-git-helper/tgh-common.h|2 +
 tvp-git-helper/tgh-log-dialog.c|  382 
 tvp-git-helper/tgh-log-dialog.h|   64 +
 tvp-git-helper/{tgh-branch.c => tgh-log.c} |   66 --
 tvp-git-helper/{tgh-add.h => tgh-log.h}|8 +-
 9 files changed, 633 insertions(+), 24 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-git-action.c 
b/thunar-vcs-plugin/tvp-git-action.c
index f0b32c5..792e545 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -255,7 +255,7 @@ tvp_git_action_create_menu_item (GtkAction *action)
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::fetch", Q_("Menu|Fetch"), 
_("Fetch"), NULL, _("Fetch"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::grep", Q_("Menu|Grep"), 
_("Grep"), NULL, _("Grep"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::init", Q_("Menu|Init"), 
_("Init"), NULL, _("Init"));
-add_subaction_u(GTK_MENU_SHELL(menu), "tvp::log", Q_("Menu|Log"), 
_("Log"), GTK_STOCK_INDEX, _("Log"));
+  add_subaction (action, GTK_MENU_SHELL(menu), "tvp::log", Q_("Menu|Log"), 
_("Log"), GTK_STOCK_INDEX, "--log");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::merge", Q_("Menu|Merge"), 
_("Merge"), NULL, _("Merge"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::move", Q_("Menu|Move"), 
_("Move"), GTK_STOCK_DND_MULTIPLE, _("Move"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::pull", Q_("Menu|Pull"), 
_("Pull"), NULL, _("Pull"));
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index 8b3a59c..838b0ca 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -22,6 +22,8 @@ tvp_git_helper_SOURCES =  
\
tgh-clone.c \
tgh-common.h\
tgh-common.c\
+   tgh-log.h   \
+   tgh-log.c   \
tgh-reset.h \
tgh-reset.c \
tgh-status.h\
@@ -32,6 +34,8 @@ tvp_git_helper_SOURCES =  
\
tgh-branch-dialog.c \
tgh-file-selection-dialog.h \
tgh-file-selection-dialog.c \
+   tgh-log-dialog.h\
+   tgh-log-dialog.c\
tgh-reset-dialog.h  \
tgh-reset-dialog.c  \
tgh-status-dialog.h \
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index d770ae0..6824ded 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -33,6 +33,7 @@
 #include "tgh-add.h"
 #include "tgh-branch.h"
 #include "tgh-clone.h"
+#include "tgh-log.h"
 #include "tgh-reset.h"
 #include "tgh-status.h"
 
@@ -55,6 +56,7 @@ int main (int argc, char *argv[])
   gboolean add = FALSE;
   gboolean branch = FALSE;
   gboolean clone = FALSE;
+  gboolean log = FALSE;
   gboolean reset = FALSE;
   gboolean status = FALSE;
   gchar **files = NULL;
@@ -88,6 +90,12 @@ int main (int argc, char *argv[])
 { NULL, '\0', 0, 0, NULL, NULL, NULL }
   };
 
+  GOptionEntry log_options_table[] =
+  {
+{ "log", '\0', 0, G_OPTION_ARG_NONE, &log, N_("Execute log action"), NULL 
},
+{ NULL, '\0', 0, 0, NULL, NULL, NULL }
+  };
+
   GOptionEntry reset_options_table[] =
   {
 { "reset", '\0', 0, G_OPTION_ARG_NONE, &reset, N_("Execute reset action"), 
NULL },
@@ -120,6 +128,10 @@ int main (int argc, char *argv[])
   g_option_group_add_entries(option_group, clone_options_table);
   g_option_context_add_group(option_context, option_group);
 
+  option_group = g_option_group_new("log", N_("Log Related Options:"), 
N_("Log"), NULL, NULL);
+  g_option_group_add_entries(option_group, l

[Xfce4-commits] * tvp-git-helper/tgh-reset{, -dialog}.[ch]: Replaced the reset dialog by message boxes.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 4ec787eadf9705d7b66af44f83aaf78df17f4383 (commit)
   from 93e8e9f94d7e43f9cb927fd0a6e25ae69c662b9e (commit)

commit 4ec787eadf9705d7b66af44f83aaf78df17f4383
Author: Peter de Ridder 
Date:   Fri Oct 23 14:58:34 2009 +0200

* tvp-git-helper/tgh-reset{,-dialog}.[ch]: Replaced the reset dialog by
  message boxes.

 tvp-git-helper/Makefile.am|2 -
 tvp-git-helper/tgh-reset-dialog.c |  186 -
 tvp-git-helper/tgh-reset-dialog.h |   50 --
 tvp-git-helper/tgh-reset.c|   79 ++--
 4 files changed, 31 insertions(+), 286 deletions(-)

diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index 838b0ca..96717b6 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -36,8 +36,6 @@ tvp_git_helper_SOURCES =  
\
tgh-file-selection-dialog.c \
tgh-log-dialog.h\
tgh-log-dialog.c\
-   tgh-reset-dialog.h  \
-   tgh-reset-dialog.c  \
tgh-status-dialog.h \
tgh-status-dialog.c \
tgh-transfer-dialog.h   \
diff --git a/tvp-git-helper/tgh-reset-dialog.c 
b/tvp-git-helper/tgh-reset-dialog.c
deleted file mode 100644
index 73c7049..000
--- a/tvp-git-helper/tgh-reset-dialog.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * Copyright (c) 2006 Peter de Ridder 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include "tgh-reset-dialog.h"
-
-static void cancel_clicked (GtkButton*, gpointer);
-
-struct _TghResetDialog
-{
-  GtkDialog dialog;
-
-  GtkWidget *tree_view;
-  GtkWidget *close;
-  GtkWidget *cancel;
-};
-
-struct _TghResetDialogClass
-{
-  GtkDialogClass dialog_class;
-};
-
-G_DEFINE_TYPE (TghResetDialog, tgh_reset_dialog, GTK_TYPE_DIALOG)
-
-enum {
-  SIGNAL_CANCEL = 0,
-  SIGNAL_COUNT
-};
-
-static guint signals[SIGNAL_COUNT];
-
-static void
-tgh_reset_dialog_class_init (TghResetDialogClass *klass)
-{
-  signals[SIGNAL_CANCEL] = g_signal_new("cancel-clicked",
-G_OBJECT_CLASS_TYPE (klass),
-G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-0, NULL, NULL,
-g_cclosure_marshal_VOID__VOID,
-G_TYPE_NONE, 0);
-}
-
-enum {
-  COLUMN_PATH = 0,
-  COLUMN_STAT,
-  COLUMN_COUNT
-};
-
-static void
-tgh_reset_dialog_init (TghResetDialog *dialog)
-{
-  GtkWidget *button;
-  GtkWidget *tree_view;
-  GtkWidget *scroll_window;
-  GtkCellRenderer *renderer;
-  GtkTreeModel *model;
-
-  scroll_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), 
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-  dialog->tree_view = tree_view = gtk_tree_view_new ();
-  
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-   -1, _("Path"),
-   renderer, "text",
-   COLUMN_PATH, NULL);
-  
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-   -1, _("Status"),
-   renderer, "text",
-   COLUMN_STAT, NULL);
-
-  model = GTK_TREE_MODEL (gtk_list_store_new (COLUMN_COUNT, G_TYPE_STRING, 
G_TYPE_STRING));
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
-
-  g_object_unref (model);
-
-  gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, 
TRUE, TRUE, 0);
-  gtk_widget_show (tree_view);
-  gtk_widget_show (scroll_window);
-
-  gtk_window_set_title (GTK_WINDOW (dialog), _("Reset"));
-
-  dialog->close = button = gtk_dialog_add_button (G

[Xfce4-commits] * tvp-git-helper/tgh-add.c tvp-git-helper/tgh-common.[ch] tvp-git-helper/tgh-notify-dialog.[ch]: Added notify dialog to make add more verbose. * tvp-git-h

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 2cf5cf3a3bea075b4ff2db4218925874183d28e0 (commit)
   from 4ec787eadf9705d7b66af44f83aaf78df17f4383 (commit)

commit 2cf5cf3a3bea075b4ff2db4218925874183d28e0
Author: Peter de Ridder 
Date:   Fri Oct 23 15:26:33 2009 +0200

* tvp-git-helper/tgh-add.c tvp-git-helper/tgh-common.[ch]
  tvp-git-helper/tgh-notify-dialog.[ch]: Added notify dialog to make add
  more verbose.
* tvp-git-helper/tgh-common.c
  tvp-git-helper/tgh-file-selection-dialog.c: Improved status output
  parsing.

 tvp-git-helper/Makefile.am |2 +
 tvp-git-helper/tgh-add.c   |   56 
 tvp-git-helper/tgh-common.c|   72 --
 tvp-git-helper/tgh-common.h|2 +
 tvp-git-helper/tgh-file-selection-dialog.c |   26 +++---
 .../{tgh-status-dialog.c => tgh-notify-dialog.c}   |  102 +++-
 tvp-git-helper/tgh-notify-dialog.h |   50 ++
 7 files changed, 182 insertions(+), 128 deletions(-)

diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index 96717b6..b3b56a9 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -36,6 +36,8 @@ tvp_git_helper_SOURCES =  
\
tgh-file-selection-dialog.c \
tgh-log-dialog.h\
tgh-log-dialog.c\
+   tgh-notify-dialog.h \
+   tgh-notify-dialog.c \
tgh-status-dialog.h \
tgh-status-dialog.c \
tgh-transfer-dialog.h   \
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index 4b57046..f55816d 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -38,57 +38,36 @@
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
 #include "tgh-file-selection-dialog.h"
+#include "tgh-notify-dialog.h"
 
 #include "tgh-add.h"
 
-struct exit_args
-{
-  TghOutputParser *parser;
-  GtkWidget *dialog;
-};
-
-static void child_exit(GPid pid, gint status, gpointer user_data)
-{
-  struct exit_args *args = user_data;
-
-  gtk_widget_destroy(args->dialog);
-
-  if(WEXITSTATUS(status) <= 1)
-  {
-GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, 
GTK_BUTTONS_CLOSE, _("Add finished"));
-tgh_dialog_start(GTK_DIALOG(dialog), TRUE);
-  }
-
-  tgh_child_exit(pid, status, args->parser);
-
-  g_free(args);
-}
-
 static gboolean add_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
 {
   GError *error = NULL;
-  gint fd_err;
-  GIOChannel *chan_err;
+  gint fd_out, fd_err;
+  GIOChannel *chan_out, *chan_err;
   TghOutputParser *parser;
   gsize length;
   gint i;
   gchar **argv;
-  struct exit_args *args = g_new(struct exit_args, 1);
 
-  length = 3;
+  length = 5;
   length += g_strv_length(files);
 
   argv = g_new(gchar*, length);
 
   argv[0] = "git";
   argv[1] = "add";
+  argv[2] = "-v";
+  argv[3] = "--";
   argv[length-1] = NULL;
 
-  i = 2;
+  i = 4;
   while(*files)
 argv[i++] = *files++;
 
-  if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | 
G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+  if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | 
G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
   {
 g_free (argv);
 return FALSE;
@@ -97,12 +76,11 @@ static gboolean add_spawn (GtkWidget *dialog, gchar 
**files, GPid *pid)
 
   parser = tgh_error_parser_new(GTK_WIDGET(dialog));
 
-  args->parser = parser;
-  args->dialog = dialog;
-
-  g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+  g_child_watch_add(*pid, (GChildWatchFunc)tgh_child_exit, parser);
 
+  chan_out = g_io_channel_unix_new(fd_out);
   chan_err = g_io_channel_unix_new(fd_err);
+  g_io_add_watch(chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, 
tgh_notify_parser_new(GTK_WIDGET(dialog)));
   g_io_add_watch(chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, 
parser);
 
   return TRUE;
@@ -125,7 +103,7 @@ gboolean tgh_add (gchar **files, GPid *pid)
 }
 
   dialog = tgh_file_selection_dialog_new (_("Add"), NULL, 0, 
TGH_FILE_SELECTION_FLAG_MODIFIED|TGH_FILE_SELECTION_FLAG_UNTRACKED);
-  if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
   {
 gtk_widget_destroy (dialog);
 return FALSE;
@@ -134,13 +112,13 @@ gboolean tgh_add (gchar **files, GPid *pid)
   files = tgh_file_selection_dialog_get_files (TGH_FILE_SELECTION_DIALOG 
(dialog));
   gtk_widget_destroy (dialog);
 
-  if(!files)
+  if (!files)
 r

[Xfce4-commits] === Released 0.1.1 ===

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to aaaf95912f9d69ab2eb58a1991eb69a08c9f3b5d (commit)
   from e0fc3205d378548e06f08112b24b7d80de2a17d0 (commit)

commit aaaf95912f9d69ab2eb58a1991eb69a08c9f3b5d
Author: Peter de Ridder 
Date:   Fri Oct 23 21:15:01 2009 +0200

=== Released 0.1.1 ===

 ChangeLog   |   37 +
 NEWS|6 ++
 README  |   21 ++---
 configure.ac.in |4 ++--
 4 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a569386..dbb90b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+2009-10-23 Peter de Ridder 
+
+   * === Released 0.1.1 ===
+   * tvp-git-helper/tgh-clone.c: Added -- to the argument list.
+   * po/*: Updated po files.
+   * tvp-git-helper/tgh-add.c tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-notify-dialog.[ch]: Added notify dialog to make add
+ more verbose.
+   * tvp-git-helper/tgh-common.c
+ tvp-git-helper/tgh-file-selection-dialog.c: Improved status output
+ parsing.
+   * tvp-git-helper/tgh-reset{,-dialog}.[ch]: Replaced the reset dialog by
+ message boxes.
+
+2009-10-14 Peter de Ridder 
+
+   * tvp-git-helper/tgh-{add,reset}.c: Made chdir work correct.
+   * tvp-git-helper/tgh-file-selection-dialog.[ch]: Don't use input files
+ for git call since this gives the wrong results.
+   * po/POTFILES.in: added git helper files.
+   * po/thunar-vcs-plugin.pot po/*.po: updated po files.
+   * thunar-vcs-lpugin/tvp-git-action.c tvp-git-helper/Makefile.am
+ tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-log{-dialog,}.[ch]: Added log action.
+
+2009-10-11 Peter de Ridder 
+
+   * thunar-vcs-plugin/tvp-provider.c
+ thunar-vcs-plugin/tvp-git-action.[ch]: Added extra flags to
+ tvp_git_action_new.
+   * thunar-vcs-plugin/yvp-{svn,git}-action.c: Only show menu items if they
+ are implemented.
+   * tvp-git-helper/main.c tvp-git-helper/tgh-clone.[ch]
+ tvp-git-helper/tgh-transfer-dialog.[ch]: Added clone action.
+   * tvp-git-helper/tgh-{add,branch,reset,status}.[ch]: Cleaned the code a
+ bit.
+
 2009-09-29 Peter de Ridder 
 
* tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
diff --git a/NEWS b/NEWS
index dc6561d..11f0055 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+0.1.1
+=
+- Unimplemented options are hidden in menu.
+- Problems with text domain for translations fixed.
+- More git support added.
+
 0.1.0
 =
 - The plugin is renamed to thunar-vcs-plugin.
diff --git a/README b/README
index 26eed33..7ec4cd4 100644
--- a/README
+++ b/README
@@ -5,32 +5,39 @@ The Thunar VCS Plugin adds Subversion actions to the context 
menu of thunar.
 This gives a VCS integration to Thunar.
 
 The current features are:
-- Most of the svn action: add, checkout, cleanup, commit, copy, delete,
-  export, import, lock, log, move, properties, resolved, revert, status,
-  unlock, update.
+- Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
+  export, import, lock, log, move, properties, relocate, resolved, revert,
+  status, switch, unlock, update.
 - Subversion info in file properties dialog.
+- Limmited git support: add, branch, clone, log, reset, status.
 
 
 Usage
 =
 
 In the thunar file/folder view right click on a file ore folder and the
-context menu pops up showing the SVN submenu. Choose the appropriate action.
+context menu pops up showing the SVN and GIT submenu. Choose the appropriate
+action.
 
 
 Required packages
 =
 
-The Thunar SVN Plugin depends on the following packages:
+The Thunar VCS Plugin depends on the following packages:
 - Thunar
 - Thunar-VFS 0.4.0 or higher
 - Thunarx 0.4.0 or higher
-- libsvn 1.5 or higher
-- libapr 0.9.7 or higher
 - gtk 2.6.0 or higher
 - glib 2.6.0 or higher
 - gobject 2.6.0 or higher
 
+For svn support it requires the following packages:
+- libsvn 1.5 or higher
+- libapr 0.9.7 or higher
+
+For git support it requires the following packages:
+- git
+
 
 Installation
 
diff --git a/configure.ac.in b/configure.ac.in
index 58236fd..fd1b70f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,9 +12,9 @@ dnl *** Version information ***
 dnl ***
 m4_define([tvp_version_major], [0])
 m4_define([tvp_version_minor], [1])
-m4_define([tvp_version_micro], [0])
+m4_define([tvp_version_micro], [1])
 m4_define([tvp_version_build], [...@revision@])
-m4_define([tvp_version_tag], [git]) # Leave empty for releases
+m4_define([tvp_version_tag], []) # Leave empty for releases
 m4_define([tvp_version], 
[tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(),
 [], [], [tvp_version_tag()-tvp_version_build()])])
 
 dnl ***
___

[Xfce4-commits] * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch] tvp-git-helper/tgh-clean{, -dialog}.[ch]: Added clean action.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 308bd813b02dc820e6a5857d8c765afd13120222 (commit)
   from ef4219bf85cd30b554dab08ba8e3d6730b51304b (commit)

commit 308bd813b02dc820e6a5857d8c765afd13120222
Author: Peter de Ridder 
Date:   Sun Oct 25 23:07:25 2009 +0100

* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
  tvp-git-helper/tgh-common.[ch]
  tvp-git-helper/tgh-clean{,-dialog}.[ch]: Added clean action.

 README  |3 +-
 thunar-vcs-plugin/tvp-git-action.c  |1 +
 tvp-git-helper/Makefile.am  |4 +
 tvp-git-helper/main.c   |   17 +++
 tvp-git-helper/tgh-clean-dialog.c   |  171 +++
 tvp-git-helper/tgh-clean-dialog.h   |   58 +
 tvp-git-helper/{tgh-add.c => tgh-clean.c}   |   77 
 tvp-git-helper/{tgh-clone.h => tgh-clean.h} |8 +-
 tvp-git-helper/tgh-common.c |   86 +-
 tvp-git-helper/tgh-common.h |2 +
 10 files changed, 389 insertions(+), 38 deletions(-)

diff --git a/README b/README
index 5ec7ec6..f74b1cc 100644
--- a/README
+++ b/README
@@ -9,7 +9,8 @@ The current features are:
   export, import, lock, log, move, properties, relocate, resolved, revert,
   status, switch, unlock, update.
 - Subversion info in file properties dialog.
-- Limmited git support: add, blame, branch, clone, log, reset, stash, status.
+- Limmited git support: add, blame, branch, clean, clone, log, reset, stash,
+  status.
 
 
 Usage
diff --git a/thunar-vcs-plugin/tvp-git-action.c 
b/thunar-vcs-plugin/tvp-git-action.c
index ce1edba..59d58a4 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -268,6 +268,7 @@ tvp_git_action_create_menu_item (GtkAction *action)
   if(tvp_action->property.is_parent)
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::branch", 
Q_("Menu|Branch"), _("Branch"), NULL, "--branch");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::checkout", 
Q_("Menu|Checkout"), _("Checkout"), GTK_STOCK_CONNECT, _("Checkout"));
+  add_subaction (action, GTK_MENU_SHELL(menu), "tvp::clean", Q_("Menu|Clean"), 
_("Clean"), GTK_STOCK_CLEAR, "--clean");
   if(tvp_action->property.is_parent)
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::clone", 
Q_("Menu|Clone"), _("Clone"), GTK_STOCK_COPY, "--clone");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::commit", Q_("Menu|Commit"), 
_("Commit"), GTK_STOCK_APPLY, _("Commit"));
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index 12a1932..1957d9c 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -20,6 +20,8 @@ tvp_git_helper_SOURCES =  
\
tgh-blame.c \
tgh-branch.h\
tgh-branch.c\
+   tgh-clean.h \
+   tgh-clean.c \
tgh-clone.h \
tgh-clone.c \
tgh-common.h\
@@ -38,6 +40,8 @@ tvp_git_helper_SOURCES =  
\
tgh-blame-dialog.c  \
tgh-branch-dialog.h \
tgh-branch-dialog.c \
+   tgh-clean-dialog.h  \
+   tgh-clean-dialog.c  \
tgh-file-selection-dialog.h \
tgh-file-selection-dialog.c \
tgh-log-dialog.h\
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index c1e6458..0690662 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -34,6 +34,7 @@
 #include "tgh-blame.h"
 #include "tgh-branch.h"
 #include "tgh-clone.h"
+#include "tgh-clean.h"
 #include "tgh-log.h"
 #include "tgh-reset.h"
 #include "tgh-stash.h"
@@ -58,6 +59,7 @@ int main (int argc, char *argv[])
   gboolean add = FALSE;
   gboolean blame = FALSE;
   gboolean branch = FALSE;
+  gboolean clean = FALSE;
   gboolean clone = FALSE;
   gboolean log = FALSE;
   gboolean reset = FALSE;
@@ -94,6 +96,12 @@ int main (int argc, char *argv[])
 { NULL, '\0', 0, 0, NULL, NULL, NULL }
   };
 
+  GOptionEntry clean_options_table[] =
+  {
+{ "clean", '\0', 0, G_OPTION_ARG_NONE, &clean, N_("Execute clean action"), 
NULL },
+{ NULL, '\0', 0, 0, NULL, NULL, NULL }
+  };
+
   GOptionEntry clone_options_table[] =
   {
 { "clone", '\0', 0, G_OPTION_ARG_N

[Xfce4-commits] * icons/: Added git icons and 16x16 subversion icon.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 3aa180a79c07d4855f6c779ac951d047dc164b10 (commit)
   from 6f7451158345cf3745df63ae0f4450e9cff78757 (commit)

commit 3aa180a79c07d4855f6c779ac951d047dc164b10
Author: Peter de Ridder 
Date:   Sat Oct 24 14:50:14 2009 +0200

* icons/: Added git icons and 16x16 subversion icon.

 icons/16x16/Makefile.am|9 +
 icons/16x16/git.png|  Bin 0 -> 149 bytes
 icons/16x16/subversion.png |  Bin 0 -> 613 bytes
 icons/24x24/Makefile.am|2 ++
 icons/24x24/git.png|  Bin 0 -> 253 bytes
 icons/48x48/Makefile.am|2 ++
 icons/48x48/git.png|  Bin 0 -> 342 bytes
 7 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 2b7081f..0a8ad3a 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,8 +1,9 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA =   \
+   git.png \
+   subversion.png
 
 EXTRA_DIST =   \
-   $(apps_DATA)
+   $(icons_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/16x16/git.png b/icons/16x16/git.png
new file mode 100644
index 000..884b0f5
Binary files /dev/null and b/icons/16x16/git.png differ
diff --git a/icons/16x16/subversion.png b/icons/16x16/subversion.png
new file mode 100644
index 000..5967393
Binary files /dev/null and b/icons/16x16/subversion.png differ
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index 0b67da7..c3cae5f 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/24x24/apps
 icons_DATA =   \
+   git.png \
subversion.png
 
 EXTRA_DIST =   \
$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/24x24/git.png b/icons/24x24/git.png
new file mode 100644
index 000..4cbd8b1
Binary files /dev/null and b/icons/24x24/git.png differ
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 795c901..0a8ad3a 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,7 +1,9 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =   \
+   git.png \
subversion.png
 
 EXTRA_DIST =   \
$(icons_DATA)
 
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/48x48/git.png b/icons/48x48/git.png
new file mode 100644
index 000..9993381
Binary files /dev/null and b/icons/48x48/git.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch] tvp-git-helper/tgh-stash{, -dialog}.[ch]: Added stash action.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 8f4ba0b888e20c4045f1d252c531c093e8a7b690 (commit)
   from 3aa180a79c07d4855f6c779ac951d047dc164b10 (commit)

commit 8f4ba0b888e20c4045f1d252c531c093e8a7b690
Author: Peter de Ridder 
Date:   Sun Oct 25 00:45:40 2009 +0200

* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
  tvp-git-helper/tgh-common.[ch]
  tvp-git-helper/tgh-stash{,-dialog}.[ch]: Added stash action.

 thunar-vcs-plugin/tvp-git-action.c|2 +
 tvp-git-helper/Makefile.am|4 +
 tvp-git-helper/main.c |   17 +
 tvp-git-helper/tgh-common.c   |   78 
 tvp-git-helper/tgh-common.h   |   13 +-
 tvp-git-helper/tgh-stash-dialog.c |  618 +
 tvp-git-helper/tgh-stash-dialog.h |   55 +++
 tvp-git-helper/tgh-stash.c|  377 ++
 tvp-git-helper/{tgh-log.h => tgh-stash.h} |8 +-
 9 files changed, 1163 insertions(+), 9 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-git-action.c 
b/thunar-vcs-plugin/tvp-git-action.c
index 792e545..c0d6022 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -265,6 +265,8 @@ tvp_git_action_create_menu_item (GtkAction *action)
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::remove", Q_("Menu|Remove"), 
_("Remove"), GTK_STOCK_DELETE, _("Remove"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::show", Q_("Menu|Show"), 
_("Show"), NULL, _("Show"));
   if(tvp_action->property.is_parent)
+add_subaction (action, GTK_MENU_SHELL(menu), "tvp::stash", 
Q_("Menu|Stash"), _("Stash"), GTK_STOCK_SAVE, "--stash");
+  if(tvp_action->property.is_parent)
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::status", 
Q_("Menu|Status"), _("Status"), GTK_STOCK_DIALOG_INFO, "--status");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::tag", Q_("Menu|Tag"), 
_("Tag"), NULL, _("Tag"));
 
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index b3b56a9..ada3794 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -26,6 +26,8 @@ tvp_git_helper_SOURCES =  
\
tgh-log.c   \
tgh-reset.h \
tgh-reset.c \
+   tgh-stash.h \
+   tgh-stash.c \
tgh-status.h\
tgh-status.c\
tgh-dialog-common.h \
@@ -38,6 +40,8 @@ tvp_git_helper_SOURCES =  
\
tgh-log-dialog.c\
tgh-notify-dialog.h \
tgh-notify-dialog.c \
+   tgh-stash-dialog.h  \
+   tgh-stash-dialog.c  \
tgh-status-dialog.h \
tgh-status-dialog.c \
tgh-transfer-dialog.h   \
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index 6824ded..3313699 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -35,6 +35,7 @@
 #include "tgh-clone.h"
 #include "tgh-log.h"
 #include "tgh-reset.h"
+#include "tgh-stash.h"
 #include "tgh-status.h"
 
 static GPid pid;
@@ -58,6 +59,7 @@ int main (int argc, char *argv[])
   gboolean clone = FALSE;
   gboolean log = FALSE;
   gboolean reset = FALSE;
+  gboolean stash = FALSE;
   gboolean status = FALSE;
   gchar **files = NULL;
   GError *error = NULL;
@@ -102,6 +104,12 @@ int main (int argc, char *argv[])
 { NULL, '\0', 0, 0, NULL, NULL, NULL }
   };
 
+  GOptionEntry stash_options_table[] =
+  {
+{ "stash", '\0', 0, G_OPTION_ARG_NONE, &stash, N_("Execute stash action"), 
NULL },
+{ NULL, '\0', 0, 0, NULL, NULL, NULL }
+  };
+
   GOptionEntry status_options_table[] =
   {
 { "status", '\0', 0, G_OPTION_ARG_NONE, &status, N_("Execute status 
action"), NULL },
@@ -136,6 +144,10 @@ int main (int argc, char *argv[])
   g_option_group_add_entries(option_group, reset_options_table);
   g_option_context_add_group(option_context, option_group);
 
+  option_group = g_option_group_new("stash", N_("Stash Related Options:"), 
N_("Stash"), NULL, NULL);
+  g_option_group_add_entries(option_group, stash_options_table);
+  g_option_context_add_group(option_context, option_group);
+
   option_group = g_option_group_new("status", N_("Status Related Options:"), 
N_("Status"), NULL, NULL);
   g_option_group_add_entries(

[Xfce4-commits] * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch] tvp-git-helper/tgh-blame{, -dialog}.[ch]: Added blame action.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to ef4219bf85cd30b554dab08ba8e3d6730b51304b (commit)
   from 76ce9ffac4c45b6990b605bde754a36c73ef73aa (commit)

commit ef4219bf85cd30b554dab08ba8e3d6730b51304b
Author: Peter de Ridder 
Date:   Sun Oct 25 14:38:00 2009 +0100

* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
  tvp-git-helper/tgh-common.[ch]
  tvp-git-helper/tgh-blame{,-dialog}.[ch]: Added blame action.

 ChangeLog  |3 +
 README |2 +-
 thunar-vcs-plugin/tvp-git-action.c |   20 
 tvp-git-helper/Makefile.am |4 +
 tvp-git-helper/main.c  |   17 +++
 .../{tgh-notify-dialog.c => tgh-blame-dialog.c}|  103 
 tvp-git-helper/tgh-blame-dialog.h  |   53 ++
 tvp-git-helper/tgh-blame.c |   95 ++
 tvp-git-helper/{tgh-log.h => tgh-blame.h}  |8 +-
 tvp-git-helper/tgh-common.c|   63 
 tvp-git-helper/tgh-common.h|2 +
 11 files changed, 323 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8de9565..31a0089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-25 Peter de Ridder 
 
+   * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
+ tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-blame{,-dialog}.[ch]: Added blame action.
* tvp-git-helper/tgh-clone.c: Fixed a memory leak.
* tvp-git-helper/tgh-log-dialog.c: Removed expander column.
* tvp-svn-helper/tsh-log-dialog.c: Changed "File" to "Path".
diff --git a/README b/README
index 3404d57..5ec7ec6 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ The current features are:
   export, import, lock, log, move, properties, relocate, resolved, revert,
   status, switch, unlock, update.
 - Subversion info in file properties dialog.
-- Limmited git support: add, branch, clone, log, reset, stash, status.
+- Limmited git support: add, blame, branch, clone, log, reset, stash, status.
 
 
 Usage
diff --git a/thunar-vcs-plugin/tvp-git-action.c 
b/thunar-vcs-plugin/tvp-git-action.c
index c0d6022..ce1edba 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -55,6 +55,8 @@ struct _TvpGitAction
 
 struct {
 unsigned is_parent : 1;
+unsigned is_directory : 1;
+unsigned is_file : 1;
 } property;
 
 GList *files;
@@ -65,6 +67,8 @@ struct _TvpGitAction
 
 enum {
 PROPERTY_IS_PARENT = 1,
+PROPERTY_IS_DIRECTORY,
+PROPERTY_IS_FILE
 };
 
 
@@ -116,6 +120,12 @@ tvp_git_action_class_init (TvpGitActionClass *klass)
 g_object_class_install_property (gobject_class, PROPERTY_IS_PARENT,
 g_param_spec_boolean ("is-parent", "", "", FALSE, 
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
 
+g_object_class_install_property (gobject_class, PROPERTY_IS_DIRECTORY,
+g_param_spec_boolean ("is-directory", "", "", FALSE, 
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+g_object_class_install_property (gobject_class, PROPERTY_IS_FILE,
+g_param_spec_boolean ("is-file", "", "", FALSE, 
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
 action_signal[SIGNAL_NEW_PROCESS] = g_signal_new("new-process", 
G_OBJECT_CLASS_TYPE(gobject_class), G_SIGNAL_RUN_FIRST,
 0, NULL, NULL, tsh_cclosure_marshal_VOID__POINTER_STRING, 
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_STRING);
 
@@ -153,6 +163,8 @@ tvp_git_action_new (const gchar *name,
 "name", name,
 "label", label,
 "is-parent", is_parent,
+"is-directory", is_direcotry,
+"is-file", is_file,
 #if !GTK_CHECK_VERSION(2,9,0)
 "stock-id", "git",
 #else
@@ -188,6 +200,12 @@ tvp_git_action_set_property (GObject *object, guint 
property_id, const GValue *v
 case PROPERTY_IS_PARENT:
 TVP_GIT_ACTION (object)->property.is_parent = g_value_get_boolean 
(value)?1:0;
 break;
+case PROPERTY_IS_DIRECTORY:
+TVP_GIT_ACTION (object)->property.is_directory = 
g_value_get_boolean (value)?1:0;
+break;
+case PROPERTY_IS_FILE:
+TVP_GIT_ACTION (object)->property.is_file = g_value_get_boolean 
(value)?1:0;
+break;
 default:
 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 break;
@@ -245,6 +263,8 @@ tvp_git_action_create_menu_item (GtkAction *action)
 
 add_subaction (action, GTK_MENU_SHELL(menu), "tvp::add", Q_("Menu|Add"), 
_("Add"), GTK_STOCK_ADD, "--add");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::bisect", Q_("Menu|Bisect"), 
_("Bisect"), NULL, _("Bisect"));
+  if (tvp_action->property.is_file)
+add_subaction (action, GTK_MENU_SHELL (menu), "tvp::blame", 
Q_("Menu|Blame"), _("Blame"), GTK_

[Xfce4-commits] * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c tvp-git-helper/tgh-move.[ch]: Added move action. * tvp-git-helper/tgh-common.c: Correctly exit

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 7ad4d3df2c23f6acc2679f6f7da6c3dda390a880 (commit)
   from 6caa3f0f37898d4b01ee892c9b437e872ea810bc (commit)

commit 7ad4d3df2c23f6acc2679f6f7da6c3dda390a880
Author: Peter de Ridder 
Date:   Sat Nov 7 18:18:13 2009 +0100

* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
  tvp-git-helper/tgh-move.[ch]: Added move action.
* tvp-git-helper/tgh-common.c: Correctly exit the helper if no parent
  was given for an error dialog.

 thunar-vcs-plugin/tvp-git-action.c |3 +-
 tvp-git-helper/Makefile.am |2 +
 tvp-git-helper/main.c  |   17 ++
 tvp-git-helper/tgh-common.c|2 +-
 tvp-git-helper/{tgh-reset.c => tgh-move.c} |   83 +++
 tvp-git-helper/{tgh-log.h => tgh-move.h}   |8 +-
 6 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-git-action.c 
b/thunar-vcs-plugin/tvp-git-action.c
index 59d58a4..ab38395 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -278,7 +278,8 @@ tvp_git_action_create_menu_item (GtkAction *action)
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::init", Q_("Menu|Init"), 
_("Init"), NULL, _("Init"));
   add_subaction (action, GTK_MENU_SHELL(menu), "tvp::log", Q_("Menu|Log"), 
_("Log"), GTK_STOCK_INDEX, "--log");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::merge", Q_("Menu|Merge"), 
_("Merge"), NULL, _("Merge"));
-add_subaction_u(GTK_MENU_SHELL(menu), "tvp::move", Q_("Menu|Move"), 
_("Move"), GTK_STOCK_DND_MULTIPLE, _("Move"));
+  if(!tvp_action->property.is_parent)
+add_subaction (action, GTK_MENU_SHELL(menu), "tvp::move", Q_("Menu|Move"), 
_("Move"), GTK_STOCK_DND_MULTIPLE, "--move");
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::pull", Q_("Menu|Pull"), 
_("Pull"), NULL, _("Pull"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::push", Q_("Menu|Push"), 
_("Push"), NULL, _("Push"));
 add_subaction_u(GTK_MENU_SHELL(menu), "tvp::rebase", Q_("Menu|Rebase"), 
_("Rebase"), NULL, _("Rebase"));
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index 1957d9c..475f01f 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -28,6 +28,8 @@ tvp_git_helper_SOURCES =  
\
tgh-common.c\
tgh-log.h   \
tgh-log.c   \
+   tgh-move.h  \
+   tgh-move.c  \
tgh-reset.h \
tgh-reset.c \
tgh-stash.h \
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index 0690662..3a8ed52 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -36,6 +36,7 @@
 #include "tgh-clone.h"
 #include "tgh-clean.h"
 #include "tgh-log.h"
+#include "tgh-move.h"
 #include "tgh-reset.h"
 #include "tgh-stash.h"
 #include "tgh-status.h"
@@ -62,6 +63,7 @@ int main (int argc, char *argv[])
   gboolean clean = FALSE;
   gboolean clone = FALSE;
   gboolean log = FALSE;
+  gboolean move = FALSE;
   gboolean reset = FALSE;
   gboolean stash = FALSE;
   gboolean status = FALSE;
@@ -114,6 +116,12 @@ int main (int argc, char *argv[])
 { NULL, '\0', 0, 0, NULL, NULL, NULL }
   };
 
+  GOptionEntry move_options_table[] =
+  {
+{ "move", '\0', 0, G_OPTION_ARG_NONE, &move, N_("Execute move action"), 
NULL },
+{ NULL, '\0', 0, 0, NULL, NULL, NULL }
+  };
+
   GOptionEntry reset_options_table[] =
   {
 { "reset", '\0', 0, G_OPTION_ARG_NONE, &reset, N_("Execute reset action"), 
NULL },
@@ -164,6 +172,10 @@ int main (int argc, char *argv[])
   g_option_group_add_entries(option_group, log_options_table);
   g_option_context_add_group(option_context, option_group);
 
+  option_group = g_option_group_new("move", N_("Move Related Options:"), 
N_("Move"), NULL, NULL);
+  g_option_group_add_entries(option_group, move_options_table);
+  g_option_context_add_group(option_context, option_group);
+
   option_group = g_option_group_new("reset", N_("Reset Related Options:"), 
N_("Reset"), NULL, NULL);
   g_option_group_add_entries(option_group, reset_options_table);
   g_option_context_add_group(option_context, option_group);
@@ -218,6 +230,11 @@ int main (int argc, char *argv[])
 has_child = tgh_log(files, &pid);
   }
 
+  if(move)
+  {
+has_child = tgh_move(files, &pid);
+  }
+
   if(reset)
   {
 has_child = tgh_reset(files, &pid);
diff --git a/tvp-git-helper/tgh-common.c b/tvp-git-helper/tgh-common.c
index 8daddac..62fd1d0 100644
--- a/tvp-git-helper/tgh-common.c
+++ b/tvp-git-helper/tgh-common.c
@@ -79,7 +79,7 @@ cr

[Xfce4-commits] * tvp-svn-helper/tsh-file-selection-dialog.c(get_parent_status): Fixed possible infinite loop. Fixing bug #5916.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to bed4c03df78c5dc02e7c61b8a3314ffa6e1dac46 (commit)
   from f1bd85694a7ad630c3d36ffde87bc62def6da6de (commit)

commit bed4c03df78c5dc02e7c61b8a3314ffa6e1dac46
Author: Peter de Ridder 
Date:   Mon Nov 2 20:57:06 2009 +0100

* tvp-svn-helper/tsh-file-selection-dialog.c(get_parent_status): Fixed
  possible infinite loop. Fixing bug #5916.

 tvp-svn-helper/tsh-file-selection-dialog.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tvp-svn-helper/tsh-file-selection-dialog.c 
b/tvp-svn-helper/tsh-file-selection-dialog.c
index 9636dab..917b5e7 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.c
+++ b/tvp-svn-helper/tsh-file-selection-dialog.c
@@ -307,6 +307,8 @@ get_parent_status(GtkTreeModel *model, GtkTreeIter *iter)
   status = parent_status;
   break;
 }
+
+child = parent;
   }
 
   return status;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * tvp-git-helper/tgh-{add, blame, clean, log, reset}.c: Changed deprecated g_dirname in g_path_get_dirname. * tvp-git-helper/tgh-reset.c: Don't pass dialo

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to b1c4e4b22ccce35cc2f9000663155de542aa5b7f (commit)
   from 7ad4d3df2c23f6acc2679f6f7da6c3dda390a880 (commit)

commit b1c4e4b22ccce35cc2f9000663155de542aa5b7f
Author: Peter de Ridder 
Date:   Sat Nov 7 18:25:49 2009 +0100

* tvp-git-helper/tgh-{add,blame,clean,log,reset}.c: Changed deprecated
  g_dirname in g_path_get_dirname.
* tvp-git-helper/tgh-reset.c: Don't pass dialog as parent for the error
  dialog.

 tvp-git-helper/tgh-add.c   |2 +-
 tvp-git-helper/tgh-blame.c |2 +-
 tvp-git-helper/tgh-clean.c |2 +-
 tvp-git-helper/tgh-log.c   |2 +-
 tvp-git-helper/tgh-reset.c |4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index f55816d..76dd80c 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -93,7 +93,7 @@ gboolean tgh_add (gchar **files, GPid *pid)
   if (files)
 if (chdir(files[0]))
 {
-  gchar *dirname = g_dirname (files[0]);
+  gchar *dirname = g_path_get_dirname (files[0]);
   if (chdir(dirname))
   {
 g_free (dirname);
diff --git a/tvp-git-helper/tgh-blame.c b/tvp-git-helper/tgh-blame.c
index af4c6dd..61b3b2e 100644
--- a/tvp-git-helper/tgh-blame.c
+++ b/tvp-git-helper/tgh-blame.c
@@ -77,7 +77,7 @@ gboolean tgh_blame (gchar **files, GPid *pid)
 
   if (chdir(files[0]))
   {
-gchar *dirname = g_dirname (files[0]);
+gchar *dirname = g_path_get_dirname (files[0]);
 if (chdir(dirname))
 {
   g_free (dirname);
diff --git a/tvp-git-helper/tgh-clean.c b/tvp-git-helper/tgh-clean.c
index ca1fa53..632ee5c 100644
--- a/tvp-git-helper/tgh-clean.c
+++ b/tvp-git-helper/tgh-clean.c
@@ -116,7 +116,7 @@ gboolean tgh_clean (gchar **files, GPid *pid)
   if (files)
 if (chdir(files[0]))
 {
-  gchar *dirname = g_dirname (files[0]);
+  gchar *dirname = g_path_get_dirname (files[0]);
   if (chdir(dirname))
   {
 g_free (dirname);
diff --git a/tvp-git-helper/tgh-log.c b/tvp-git-helper/tgh-log.c
index a3a7727..f9d1918 100644
--- a/tvp-git-helper/tgh-log.c
+++ b/tvp-git-helper/tgh-log.c
@@ -103,7 +103,7 @@ gboolean tgh_log (gchar **files, GPid *pid)
   if (files)
 if (chdir(files[0]))
 {
-  gchar *dirname = g_dirname (files[0]);
+  gchar *dirname = g_path_get_dirname (files[0]);
   if (chdir(dirname))
   {
 g_free (dirname);
diff --git a/tvp-git-helper/tgh-reset.c b/tvp-git-helper/tgh-reset.c
index 7a4414d..0bd1e7f 100644
--- a/tvp-git-helper/tgh-reset.c
+++ b/tvp-git-helper/tgh-reset.c
@@ -89,7 +89,7 @@ static gboolean reset_spawn (GtkWidget *dialog, gchar 
**files, GPid *pid)
   }
   g_free (argv);
 
-  parser = tgh_error_parser_new(GTK_WIDGET(dialog));
+  parser = tgh_error_parser_new(NULL);
 
   args = g_new(struct exit_args, 1);
   args->parser = parser;
@@ -110,7 +110,7 @@ gboolean tgh_reset (gchar **files, GPid *pid)
   if (files)
 if (chdir(files[0]))
 {
-  gchar *dirname = g_dirname (files[0]);
+  gchar *dirname = g_path_get_dirname (files[0]);
   if (chdir(dirname))
   {
 g_free (dirname);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * README: Added move to the list.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 2872d1eaf3f1777aafb1ea48bf36b5040be7ee3d (commit)
   from eb5a842fb8901bc8b5098d761e7deccd2e741df6 (commit)

commit 2872d1eaf3f1777aafb1ea48bf36b5040be7ee3d
Author: Peter de Ridder 
Date:   Sun Nov 8 17:24:04 2009 +0100

* README: Added move to the list.

 README |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index f74b1cc..63a2363 100644
--- a/README
+++ b/README
@@ -9,8 +9,8 @@ The current features are:
   export, import, lock, log, move, properties, relocate, resolved, revert,
   status, switch, unlock, update.
 - Subversion info in file properties dialog.
-- Limmited git support: add, blame, branch, clean, clone, log, reset, stash,
-  status.
+- Basic git support: add, blame, branch, clean, clone, log, move, reset,
+  stash, status.
 
 
 Usage
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * thunar-vcs-plugin/tvp-provider.c tvp-git-helper/*.c: Ported git helper to thunarx-2.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 00643afda39561a1ba7665c4a78b7fa0127104de (commit)
   from d71f86ea9cc5ae53b9727c4d7ac756ca5c2c14ca (commit)

commit 00643afda39561a1ba7665c4a78b7fa0127104de
Author: Peter de Ridder 
Date:   Sun Nov 29 11:44:37 2009 +0100

* thunar-vcs-plugin/tvp-provider.c tvp-git-helper/*.c: Ported git helper
  to thunarx-2.

 thunar-vcs-plugin/tvp-provider.c |   12 
 tvp-git-helper/tgh-blame-dialog.c|2 +-
 tvp-git-helper/tgh-blame.c   |2 +-
 tvp-git-helper/tgh-clean-dialog.c|2 +-
 tvp-git-helper/tgh-clean.c   |2 +-
 tvp-git-helper/tgh-clone.c   |2 +-
 tvp-git-helper/tgh-log-dialog.c  |2 +-
 tvp-git-helper/tgh-log.c |2 +-
 tvp-git-helper/tgh-move.c|2 +-
 tvp-git-helper/tgh-stash-dialog.c|2 +-
 tvp-git-helper/tgh-stash.c   |2 +-
 tvp-git-helper/tgh-transfer-dialog.c |2 +-
 12 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index 2119b42..139a95f 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -388,6 +388,8 @@ tvp_provider_get_file_actions (ThunarxMenuProvider 
*menu_provider,
 {
   GList  *actions = NULL;
   GtkAction  *action;
+  GList  *lp;
+  gint   n_files = 0;
 #ifdef HAVE_SUBVERSION
   gchar  *scheme;
   gbooleanparent_wc = FALSE;
@@ -470,13 +472,15 @@ tvp_provider_get_file_actions (ThunarxMenuProvider 
*menu_provider,
   for (lp = files; lp != NULL; lp = lp->next, ++n_files)
   {
 /* check if the file is a local file */
-info = thunarx_file_info_get_vfs_info (lp->data);
-scheme = thunar_vfs_path_get_scheme (info->path);
-thunar_vfs_info_unref (info);
+scheme = thunarx_file_info_get_uri_scheme (lp->data);
 
 /* unable to handle non-local files */
-if (G_UNLIKELY (scheme != THUNAR_VFS_PATH_SCHEME_FILE))
+if (G_UNLIKELY (strcmp (scheme, "file")))
+{
+  g_free (scheme);
   return NULL;
+}
+g_free (scheme);
 
 if (thunarx_file_info_is_directory (lp->data))
 {
diff --git a/tvp-git-helper/tgh-blame-dialog.c 
b/tvp-git-helper/tgh-blame-dialog.c
index 24adf64..aaae2e5 100644
--- a/tvp-git-helper/tgh-blame-dialog.c
+++ b/tvp-git-helper/tgh-blame-dialog.c
@@ -21,7 +21,7 @@
 #include 
 #endif
 
-#include 
+#include 
 #include 
 
 #include "tgh-common.h"
diff --git a/tvp-git-helper/tgh-blame.c b/tvp-git-helper/tgh-blame.c
index 61b3b2e..bce7762 100644
--- a/tvp-git-helper/tgh-blame.c
+++ b/tvp-git-helper/tgh-blame.c
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-clean-dialog.c 
b/tvp-git-helper/tgh-clean-dialog.c
index 24c2f6c..3c85b1e 100644
--- a/tvp-git-helper/tgh-clean-dialog.c
+++ b/tvp-git-helper/tgh-clean-dialog.c
@@ -21,7 +21,7 @@
 #include 
 #endif
 
-#include 
+#include 
 #include 
 
 #include "tgh-clean-dialog.h"
diff --git a/tvp-git-helper/tgh-clean.c b/tvp-git-helper/tgh-clean.c
index 632ee5c..899e958 100644
--- a/tvp-git-helper/tgh-clean.c
+++ b/tvp-git-helper/tgh-clean.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-clone.c b/tvp-git-helper/tgh-clone.c
index 76ccfd5..b863363 100644
--- a/tvp-git-helper/tgh-clone.c
+++ b/tvp-git-helper/tgh-clone.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index f7938c9..012e38d 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -21,7 +21,7 @@
 #include 
 #endif
 
-#include 
+#include 
 #include 
 
 #include "tgh-common.h"
diff --git a/tvp-git-helper/tgh-log.c b/tvp-git-helper/tgh-log.c
index f9d1918..29825fb 100644
--- a/tvp-git-helper/tgh-log.c
+++ b/tvp-git-helper/tgh-log.c
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-move.c b/tvp-git-helper/tgh-move.c
index 9b8cd6b..64a3fbd 100644
--- a/tvp-git-helper/tgh-move.c
+++ b/tvp-git-helper/tgh-move.c
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-stash-dialog.c 
b/tvp-git-helper/tgh-stash-dialog.c
index d51a804..d62048f 100644
--- a/tvp-git-helper/tgh-stash-dialog.c
+++ b/tvp-git-helper/tgh-stash-dialog.c
@@ -21,7 +21,7 @@
 #include 
 #endif
 
-#include 
+#include 
 #include 
 
 #include "tgh-common.h"
diff --git a/tvp-git-helper/tgh-stash.c b/tvp-git-helper/tgh-stash.c
index ee87cd9..821d549 100644
--- a/tvp-git-helper/tgh-stash.c
+++ b/tvp-git-helper/tgh-stash.c
@@ -25,7 +25,7 @@

[Xfce4-commits] * Changelog: Updated.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 6132b287a5f479fd62fcbac18973b3103304e6df (commit)
   from 3c282e44a9ef6fa4b105ab9e0669fc2ced8f20bb (commit)

commit 6132b287a5f479fd62fcbac18973b3103304e6df
Author: Peter de Ridder 
Date:   Sat Nov 7 18:31:17 2009 +0100

* Changelog: Updated.

 ChangeLog |   16 
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9873029..b255b6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-07 Peter de Ridder 
+
+   * tvp-git-helper/tgh-{add,blame,clean,log,reset}.c: Changed deprecated
+ g_dirname in g_path_get_dirname.
+   * tvp-git-helper/tgh-reset.c: Don't pass dialog as parent for the
+ error dialog.
+   * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
+ tvp-git-helper/tgh-move.[ch]: Added move action.
+   * tvp-git-helper/tgh-common.c: Correctly exit the helper if no parent
+ was given for an error dialog.
+
+2009-11-02 Peter de Ridder 
+
+   * tvp-svn-helper/tsh-file-selection-dialog.c(get_parent_status): Fixed
+ possible infinite loop. Fixing bug #5916.
+
 2009-10-25 Peter de Ridder 
 
* tvp-svn-helper/tvp-properties-dialog.c
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] * thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled. * tvp-git-helper/tgh-{add, move, reset}.c: Fixed WEXITSTATUS includes.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to b569d3b43feb8572c5c0ff46016e41f29912106a (commit)
   from 6132b287a5f479fd62fcbac18973b3103304e6df (commit)

commit b569d3b43feb8572c5c0ff46016e41f29912106a
Author: Peter de Ridder 
Date:   Sun Nov 8 17:00:18 2009 +0100

* thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled.
* tvp-git-helper/tgh-{add,move,reset}.c: Fixed WEXITSTATUS includes.

 thunar-vcs-plugin/tvp-provider.c |4 +++-
 tvp-git-helper/tgh-add.c |8 
 tvp-git-helper/tgh-move.c|9 -
 tvp-git-helper/tgh-reset.c   |8 
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index ac77ffc..cc46ccd 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -303,6 +303,7 @@ tvp_get_parent_status (ThunarxFileInfo *file_info)
 
 
 
+#ifdef HAVE_SUBVERSION
 static gint
 tvp_compare_filename (const gchar *uri1, const gchar *uri2)
 {
@@ -343,6 +344,7 @@ tvp_compare_filename (const gchar *uri1, const gchar *uri2)
 
   return result;
 }
+#endif
 
 
 
@@ -389,13 +391,13 @@ tvp_provider_get_file_actions (ThunarxMenuProvider 
*menu_provider,
   ThunarVfsPathScheme scheme;
   ThunarVfsInfo  *info;
   GList  *lp;
+  gintn_files = 0;
 #ifdef HAVE_SUBVERSION
   gbooleanparent_wc = FALSE;
   gbooleandirectory_is_wc = FALSE;
   gbooleandirectory_is_not_wc = FALSE;
   gbooleanfile_is_vc = FALSE;
   gbooleanfile_is_not_vc = FALSE;
-  gintn_files = 0;
   GSList *file_status;
   GSList *iter;
 #endif
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index 76dd80c..1ac5351 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -22,14 +22,6 @@
 #include 
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include 
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#include 
-#endif
-
 #include 
 #include 
 
diff --git a/tvp-git-helper/tgh-move.c b/tvp-git-helper/tgh-move.c
index 0e89843..9b8cd6b 100644
--- a/tvp-git-helper/tgh-move.c
+++ b/tvp-git-helper/tgh-move.c
@@ -22,9 +22,16 @@
 #include 
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include 
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include 
+#endif
+
 #include 
 #include 
-#include 
 
 #include 
 
diff --git a/tvp-git-helper/tgh-reset.c b/tvp-git-helper/tgh-reset.c
index 0bd1e7f..10300dc 100644
--- a/tvp-git-helper/tgh-reset.c
+++ b/tvp-git-helper/tgh-reset.c
@@ -22,6 +22,14 @@
 #include 
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include 
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include 
+#endif
+
 #include 
 #include 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] === Released 0.1.2 ===

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to 5cb0f3949e615bb81a048101cb48db95a2db4c1f (commit)
   from d1bc519d3ea05fd8e738da42c1a60477536f94ec (commit)

commit 5cb0f3949e615bb81a048101cb48db95a2db4c1f
Author: Peter de Ridder 
Date:   Sun Nov 8 17:10:40 2009 +0100

=== Released 0.1.2 ===

 ChangeLog   |6 ++
 NEWS|7 ++-
 configure.ac.in |   10 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b255b6f..8aed218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-08 Peter de Ridder 
+
+   * === Released 0.1.2 ===
+   * thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled.
+   * tvp-git-helper/tgh-{add,move,reset}.c: Fixed WEXITSTATUS includes.
+
 2009-11-07 Peter de Ridder 
 
* tvp-git-helper/tgh-{add,blame,clean,log,reset}.c: Changed deprecated
diff --git a/NEWS b/NEWS
index 11f0055..872964d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+0.1.2
+=
+- More git actions are added: blame, clean, move and stash.
+- Git icon added.
+
 0.1.1
 =
 - Unimplemented options are hidden in menu.
@@ -18,7 +23,7 @@ thunar-svn-plugin-0.0.3
 
 thunar-svn-plugin-0.0.2
 ===
-- New Subversion actions have been added: switch, relocate, blame.
+- New Subversion actions are added: switch, relocate, blame.
 - File selection dialog added for various Subversion actions.
 
 thunar-svn-plugin-0.0.1
diff --git a/configure.ac.in b/configure.ac.in
index 2c60c3b..1052513 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,9 +12,9 @@ dnl *** Version information ***
 dnl ***
 m4_define([tvp_version_major], [0])
 m4_define([tvp_version_minor], [1])
-m4_define([tvp_version_micro], [1])
+m4_define([tvp_version_micro], [2])
 m4_define([tvp_version_build], [...@revision@])
-m4_define([tvp_version_tag], [git]) # Leave empty for releases
+m4_define([tvp_version_tag], []) # Leave empty for releases
 m4_define([tvp_version], 
[tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(),
 [], [], [tvp_version_tag()-tvp_version_build()])])
 
 dnl ***
@@ -99,9 +99,9 @@ fi
 AM_CONDITIONAL([HAVE_SUBVERSION], [test x"$found_subversion" = x"yes"])
 
 AC_ARG_ENABLE([git], 
-AC_HELP_STRING([--enable-git], [Enable git])
-AC_HELP_STRING([--disable-git], [Disable git (default)]),
-[check_for_git=$enableval], [check_for_git=no])
+AC_HELP_STRING([--enable-git], [Enable git (default)])
+AC_HELP_STRING([--disable-git], [Disable git]),
+[check_for_git=$enableval], [check_for_git=yes])
 AC_MSG_CHECKING([for optional package git])
 if test x"$check_for_git" = x"yes"; then
 found_git=yes
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Post release git tag added.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
 to eb5a842fb8901bc8b5098d761e7deccd2e741df6 (commit)
   from 5cb0f3949e615bb81a048101cb48db95a2db4c1f (commit)

commit eb5a842fb8901bc8b5098d761e7deccd2e741df6
Author: Peter de Ridder 
Date:   Sun Nov 8 17:15:36 2009 +0100

Post release git tag added.

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

diff --git a/configure.ac.in b/configure.ac.in
index 1052513..8d60852 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -14,7 +14,7 @@ m4_define([tvp_version_major], [0])
 m4_define([tvp_version_minor], [1])
 m4_define([tvp_version_micro], [2])
 m4_define([tvp_version_build], [...@revision@])
-m4_define([tvp_version_tag], []) # Leave empty for releases
+m4_define([tvp_version_tag], [git]) # Leave empty for releases
 m4_define([tvp_version], 
[tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(),
 [], [], [tvp_version_tag()-tvp_version_build()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Don't use gdk_window_is_destroyed.

[Jérôme Guelfucci]

Updating branch refs/heads/master
 to 5ba91403503e95598575f4e76226117fdf2c742e (commit)
   from 5bb3f73cedb66cfe0bd63d8a67ca2c16ddc17625 (commit)

commit 5ba91403503e95598575f4e76226117fdf2c742e
Author: Jérôme Guelfucci 
Date:   Mon Nov 30 00:18:28 2009 +0100

Don't use gdk_window_is_destroyed.

 lib/screenshooter-capture.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/screenshooter-capture.c b/lib/screenshooter-capture.c
index 1d0644c..c377bec 100644
--- a/lib/screenshooter-capture.c
+++ b/lib/screenshooter-capture.c
@@ -90,7 +90,7 @@ static GdkWindow
   *needs_unref = FALSE;
   *border = FALSE;
 }
-  else if (G_UNLIKELY (gdk_window_is_destroyed (window)))
+  else if (G_UNLIKELY (GDK_WINDOW_DESTROYED (window)))
 {
   TRACE ("The active window is destroyed, fallback to the root window.");
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Portuguese (pt) translation

[Transifex]

Updating branch refs/heads/master
 to a80fe3fa76f5d90272b5e13b99d0da8e605d3f0d (commit)
   from 5ba91403503e95598575f4e76226117fdf2c742e (commit)

commit a80fe3fa76f5d90272b5e13b99d0da8e605d3f0d
Author: Sergio Marques 
Date:   Mon Nov 30 00:46:28 2009 +

l10n: Updates to Portuguese (pt) translation

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

 po/pt.po |  208 +++---
 1 files changed, 77 insertions(+), 131 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index a7888e6..f396e50 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,16 +6,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-screenshooter\n"
+"Project-Id-Version: xfce4-screenshooter 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-06-12 17:23+0100\n"
-"Last-Translator: Nuno Miguel \n"
+"PO-Revision-Date: 2009-11-29 14:14-\n"
+"Last-Translator: Sergio Marques \n"
 "Language-Team: \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"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: PORTUGAL\n"
 
 #: ../lib/screenshooter-dialogs.c:478
 #, c-format
@@ -27,15 +29,13 @@ msgid "Transfer"
 msgstr "Transferir"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"A captura de ecrã está a ser "
-"transferida para:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "A captura de ecrã está 
a ser transferida para:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -58,7 +58,8 @@ msgstr "Zona a 
capturar"
 msgid "Entire screen"
 msgstr "Ecrã inteiro"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Tirar uma captura de todo o ecrã"
@@ -67,25 +68,21 @@ msgstr "Tirar uma captura de todo o ecrã"
 msgid "Active window"
 msgstr "Janela activa"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
-msgstr "Fazer uma captura da janela activa"
+msgstr "Tirar uma captura da janela activa"
 
 #: ../lib/screenshooter-dialogs.c:804
 msgid "Select a region"
-msgstr "Seleccionar uma zona"
+msgstr "Seleccione uma zona"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Seleccione uma zona para capturar ao clicar num ponto do ecrã sem libertar o "
-"botão do rato, arrastando o rato para outro canto da zona e libertando o "
-"botão do rato."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Seleccione a zona para capturar clicando num ponto do ecrã e, sem 
libertar o botão do rato arraste-o para o outro canto da zona libertando então 
aí o botão do rato."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -93,14 +90,11 @@ msgstr "Capturar o ponteiro do rato"
 
 #: ../lib/screenshooter-dialogs.c:824
 msgid "Display the mouse pointer on the screenshot"
-msgstr "Mostrar o ponteiro do rato na captura"
+msgstr "Apresentar o ponteiro do rato na captura"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Atraso antes de capturar"
+msgid "Delay before 
capturing"
+msgstr "Atraso antes de 
capturar"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -111,9 +105,8 @@ msgid "seconds"
 msgstr "segundos"
 
 #: ../lib/screenshooter-dialogs.c:917
-#, fuzzy
 msgid "Action"
-msgstr "Aplicação:"
+msgstr "Acção"
 
 #: ../lib/screenshooter-dialogs.c:945
 msgid "Action"
@@ -121,9 +114,8 @@ msgstr "Acção"
 
 #. Save option radio button
 #: ../lib/screenshooter-dialogs.c:961
-#, fuzzy
 msgid "Save"
-msgstr "Gravar em:"
+msgstr "Gravar"
 
 #: ../lib/screenshooter-dialogs.c:966
 msgid "Save the screenshot to a PNG file"
@@ -135,8 +127,7 @@ msgstr "Copiar para a área de transfer

[Xfce4-commits] l10n: Updates to Spanish (Castilian) (es) translation

[Transifex]

Updating branch refs/heads/master
 to 1e27442c4877b579f33f0279029aae687a63a2aa (commit)
   from a80fe3fa76f5d90272b5e13b99d0da8e605d3f0d (commit)

commit 1e27442c4877b579f33f0279029aae687a63a2aa
Author: Ignacio Velasco 
Date:   Mon Nov 30 01:59:59 2009 +

l10n: Updates to Spanish (Castilian) (es) translation

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

 po/es.po |  157 --
 1 files changed, 50 insertions(+), 107 deletions(-)

diff --git a/po/es.po b/po/es.po
index 8cf2fca..c5878ae 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-15 18:46-0300\n"
+"PO-Revision-Date: 2009-11-29 22:59-0300\n"
 "Last-Translator: elega \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
@@ -29,15 +29,13 @@ msgid "Transfer"
 msgstr "Transferencia"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"La captura de pantalla está "
-"siendo transfirienda a:"
+msgid "The screenshot is being 
transferred to:"
+msgstr "La captura de pantalla 
está siendo transfirienda a:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -60,7 +58,8 @@ msgstr "Zona a 
capturar"
 msgid "Entire screen"
 msgstr "Toda la pantalla"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Realizar una captura de toda la pantalla"
@@ -69,7 +68,8 @@ msgstr "Realizar una captura de toda la pantalla"
 msgid "Active window"
 msgstr "Ventana activa"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Hacer una captura de pantalla de la ventana activa"
@@ -78,16 +78,11 @@ msgstr "Hacer una captura de pantalla de la ventana activa"
 msgid "Select a region"
 msgstr "Seleccionar una región"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Seleccione una zona para ser capturada haciendo clic en un punto de la "
-"pantalla sin soltar el botón del ratón, arrastrando el ratón a la otra "
-"esquina de la zona y soltando el botón del ratón."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Seleccione una zona para ser capturada haciendo clic en un punto de la 
pantalla sin soltar el botón del ratón, arrastrando el ratón a la otra esquina 
de la zona y soltando el botón del ratón."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -98,11 +93,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Mostrar el puntero del ratón en la captura de pantalla"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Demora antes de capturar"
+msgid "Delay before 
capturing"
+msgstr "Demora antes de 
capturar"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -135,8 +127,7 @@ msgstr "Copiar al portapapeles"
 
 #: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr ""
-"Copiar la captura de pantalla al portapapeles para poder ser pegada después"
+msgstr "Copiar la captura de pantalla al portapapeles para poder ser pegada 
después"
 
 #: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
@@ -146,7 +137,8 @@ msgstr "Abrir con:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Abrir la captura de pantalla con la aplicación elegida"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Aplicación para abrir la captura de pantalla"
 
@@ -154,11 +146,10 @@ msgstr "Aplicación para abrir la captura de pantalla"
 msgid "Host on ZimageZ"
 msgstr "Alojar en ZimageZ"
 
-#: ../lib/

[Xfce4-commits] l10n: Updates to Spanish (Castilian) (es) translation

[Transifex]

Updating branch refs/heads/master
 to 95aeb93718458a4a00cdf2c245835a914b02c36c (commit)
   from 04c575a62f907c4540cb371cc17da6fe815af0c8 (commit)

commit 95aeb93718458a4a00cdf2c245835a914b02c36c
Author: Ignacio Velasco 
Date:   Mon Nov 30 02:19:37 2009 +

l10n: Updates to Spanish (Castilian) (es) translation

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

 po/es.po |  169 ++---
 1 files changed, 94 insertions(+), 75 deletions(-)

diff --git a/po/es.po b/po/es.po
index 0a21653..617fa27 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-27 10:38+0100\n"
-"PO-Revision-Date: 2009-10-15 17:09-0300\n"
+"PO-Revision-Date: 2009-11-29 23:18-0300\n"
 "Last-Translator: elega \n"
 "Language-Team: LANGUAGE \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,8 @@ msgstr "Reproductor de medios"
 msgid "Mute"
 msgstr "Silencio"
 
-#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:1093
+#: ../data/interfaces/parole.ui.h:10
+#: ../src/parole-player.c:1093
 #: ../src/parole-disc-menu.c:113
 msgid "Next Chapter"
 msgstr "Capítulo suguiente"
@@ -60,8 +61,10 @@ msgstr "Capítulo suguiente"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../data/interfaces/parole.ui.h:12 ../data/desktop/parole.desktop.in.in.h:1
-#: ../src/parole-about.c:52 ../plugins/window-title/window-title-provider.c:58
+#: ../data/interfaces/parole.ui.h:12
+#: ../data/desktop/parole.desktop.in.in.h:1
+#: ../src/parole-about.c:52
+#: ../plugins/window-title/window-title-provider.c:58
 msgid "Parole Media Player"
 msgstr "Reproductor de medios Parole"
 
@@ -69,7 +72,8 @@ msgstr "Reproductor de medios Parole"
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../data/interfaces/parole.ui.h:14 ../src/parole-player.c:1105
+#: ../data/interfaces/parole.ui.h:14
+#: ../src/parole-player.c:1105
 #: ../src/parole-disc-menu.c:114
 msgid "Previous Chapter"
 msgstr "Capítulo anterior"
@@ -124,15 +128,15 @@ msgstr "_Ver"
 
 #: ../data/interfaces/mediachooser.ui.h:1
 msgid "Replace playlist with opened files"
-msgstr ""
+msgstr "Reemplazar la lista de reproducción con los archivos abiertos"
 
 #: ../data/interfaces/mediachooser.ui.h:2
 msgid "Scan folders recursively"
-msgstr ""
+msgstr "Explorar carpetas recursivamente"
 
 #: ../data/interfaces/mediachooser.ui.h:3
 msgid "Start playing opened files"
-msgstr ""
+msgstr "Comenzar a reproducir los archivos abiertos"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
@@ -231,18 +235,12 @@ msgid "Stop"
 msgstr "Detener"
 
 #: ../gst/parole-gst.c:1674
-msgid ""
-"Unable to load playbin GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"No se puede cargar el complemento playbin GStreamer, compruebe su "
-"instalación de GStreamer"
+msgid "Unable to load playbin GStreamer plugin, check your GStreamer 
installation"
+msgstr "No se puede cargar el complemento playbin GStreamer, compruebe su 
instalación de GStreamer"
 
 #: ../gst/parole-gst.c:1690
-msgid ""
-"Unable to load video GStreamer plugin, check your GStreamer installation"
-msgstr ""
-"No se puede cargar el complemento de vídeo GStreamer, compruebe su "
-"instalación de GStreamer"
+msgid "Unable to load video GStreamer plugin, check your GStreamer 
installation"
+msgstr "No se puede cargar el complemento de vídeo GStreamer, compruebe su 
instalación de GStreamer"
 
 #: ../src/main.c:53
 #, c-format
@@ -271,11 +269,11 @@ msgstr "Abrir una nueva instancia"
 
 #: ../src/main.c:192
 msgid "Do not load plugins"
-msgstr ""
+msgstr "No cargar complementos"
 
 #: ../src/main.c:193
 msgid "Set Audio-CD/VCD/DVD device path"
-msgstr ""
+msgstr "Establecer ruta de dispositivo Audio-CD/VCD/DVD"
 
 #: ../src/main.c:194
 msgid "Play or pause if already playing"
@@ -324,8 +322,7 @@ msgstr "Medios a reproducir"
 #: ../src/main.c:242
 #, c-format
 msgid "Parole is already running, use -i to open a new instance\n"
-msgstr ""
-"Parole ya se está ejecutando, utilice -i para abrir una nueva instancia\n"
+msgstr "Parole ya se está ejecutando, utilice -i para abrir una nueva 
instancia\n"
 
 #: ../src/parole-mediachooser.c:213
 msgid "Add media files"
@@ -345,11 +342,10 @@ msgstr "Permiso denegado"
 
 #: ../src/parole-medialist.c:445
 msgid "Unknown playlist format, Please select a support playlist format"
-msgstr ""
-"Formato de lista de reproducción desconocido, por favor seleccione un "
-"formato soportado de lista de reproducción"
+msgstr "Formato de lista de reproducción desconocido, por favor seleccione un 
formato soportado de lista de reproducción"
 
-#: ../src/parole-medialist.c:513 ../src/parole-player.c:1785
+#: ../src/parole-medialist.c:513
+#: ../src/parole-player.c:1785
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
@@ -393,14 +389,16 @@ msgstr "Stream de medios no se puede buscar"
 #.
 #. * Next chapter menu item
 #.
-#: ../src/parole-player.c:1093 ../src/parole-disc-menu.c:122

[Xfce4-commits] l10n: Updates to Russian (ru) translation

[Transifex]

Updating branch refs/heads/master
 to da00762b12f515fb6d0f169d583af364efe860c8 (commit)
   from 217c183458d2273a6c7383d8861f41b631f25f0e (commit)

commit da00762b12f515fb6d0f169d583af364efe860c8
Author: Aleksandr Ponomarenko 
Date:   Mon Nov 30 02:47:43 2009 +

l10n: Updates to Russian (ru) translation

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

 po/ru.po |  165 --
 1 files changed, 53 insertions(+), 112 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 605c565..d6f575a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: xfce4-screenshooter\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-29 11:58+0100\n"
-"PO-Revision-Date: 2009-11-26 21:35+0300\n"
-"Last-Translator: Denis Koryavov \n"
+"PO-Revision-Date: 2009-11-30 08:47+0600\n"
+"Last-Translator: Urmas \n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,15 +26,13 @@ msgid "Transfer"
 msgstr "Перенести"
 
 #: ../lib/screenshooter-dialogs.c:581
-msgid ""
-"The screenshot is being "
-"transferred to:"
-msgstr ""
-"Снимок экрана был перемещен в:"
-""
+msgid "The screenshot is being 
transferred to:"
+msgstr "Снимок экрана будет 
перемещен в:"
 
-#: ../lib/screenshooter-dialogs.c:697 ../lib/screenshooter-dialogs.c:714
-#: ../lib/screenshooter-dialogs.c:905 ../lib/screenshooter-utils.c:64
+#: ../lib/screenshooter-dialogs.c:697
+#: ../lib/screenshooter-dialogs.c:714
+#: ../lib/screenshooter-dialogs.c:905
+#: ../lib/screenshooter-utils.c:64
 #: ../lib/screenshooter-utils.c:96
 #: ../src/xfce4-screenshooter.desktop.in.in.h:1
 #: ../panel-plugin/screenshooter.desktop.in.in.h:1
@@ -51,14 +49,14 @@ msgstr "Параметры"
 
 #: ../lib/screenshooter-dialogs.c:754
 msgid "Region to capture"
-msgstr ""
-"Область для захвата"
+msgstr "Область для 
захвата"
 
 #: ../lib/screenshooter-dialogs.c:774
 msgid "Entire screen"
 msgstr "Весь экран"
 
-#: ../lib/screenshooter-dialogs.c:781 ../src/main.c:53
+#: ../lib/screenshooter-dialogs.c:781
+#: ../src/main.c:53
 #: ../panel-plugin/screenshooter-plugin.c:308
 msgid "Take a screenshot of the entire screen"
 msgstr "Сделать снимок всего экрана"
@@ -67,7 +65,8 @@ msgstr "Сделать снимок всего экрана"
 msgid "Active window"
 msgstr "Активное окно"
 
-#: ../lib/screenshooter-dialogs.c:796 ../src/main.c:90
+#: ../lib/screenshooter-dialogs.c:796
+#: ../src/main.c:90
 #: ../panel-plugin/screenshooter-plugin.c:313
 msgid "Take a screenshot of the active window"
 msgstr "Сделать снимок активного окна"
@@ -76,16 +75,11 @@ msgstr "Сделать снимок активного окна"
 msgid "Select a region"
 msgstr "Выделить область"
 
-#: ../lib/screenshooter-dialogs.c:809 ../src/main.c:68
+#: ../lib/screenshooter-dialogs.c:809
+#: ../src/main.c:68
 #: ../panel-plugin/screenshooter-plugin.c:318
-msgid ""
-"Select a region to be captured by clicking a point of the screen without "
-"releasing the mouse button, dragging your mouse to the other corner of the "
-"region, and releasing the mouse button."
-msgstr ""
-"Укажите область экрана, которая будет захвачена. С помощью левой кнопки мыши "
-"укажите верхний угол захватываемой области, и, не отпуская кнопки мыши, "
-"укажите нижний угол. Отпустите кнопку мыши."
+msgid "Select a region to be captured by clicking a point of the screen 
without releasing the mouse button, dragging your mouse to the other corner of 
the region, and releasing the mouse button."
+msgstr "Укажите область экрана, которая будет захвачена. С помощью левой 
кнопки мыши укажите верхний угол захватываемой области, и, не отпуская кнопки 
мыши, укажите нижний угол. Отпустите кнопку мыши."
 
 #: ../lib/screenshooter-dialogs.c:819
 msgid "Capture the mouse pointer"
@@ -96,11 +90,8 @@ msgid "Display the mouse pointer on the screenshot"
 msgstr "Отображать курсор мыши на снимке экрана"
 
 #: ../lib/screenshooter-dialogs.c:840
-msgid ""
-"Delay before capturing"
-msgstr ""
-"Задержка перед выполнением "
-"снимка"
+msgid "Delay before 
capturing"
+msgstr "Задержка перед 
выполнением снимка"
 
 #: ../lib/screenshooter-dialogs.c:862
 msgid "Delay in seconds before the screenshot is taken"
@@ -133,8 +124,7 @@ msgstr "Копировать в буфер обмена"
 
 #: ../lib/screenshooter-dialogs.c:977
 msgid "Copy the screenshot to the clipboard so that it can be pasted later"
-msgstr ""
-"Копировать снимок экрана в буфер обмена для использования его в дальнейшем"
+msgstr "Копировать снимок экрана в буфер обмена для использования его в 
дальнейшем"
 
 #: ../lib/screenshooter-dialogs.c:994
 msgid "Open with:"
@@ -144,7 +134,8 @@ msgstr "Открыть с помощью:"
 msgid "Open the screenshot with the chosen application"
 msgstr "Открыть снимок экрана с помощью выбранного приложения"
 
-#: ../lib/screenshooter-dialogs.c:1018 ../src/main.c:63
+#: ../lib/screenshooter-dialogs.c:1018
+#: ../src/main.c:63
 msgid "Application to open the screenshot"
 msgstr "Приложение для просмотра снимков э

[Xfce4-commits] l10n: Updates to Chinese (China) (zh_CN) translation

[Transifex]

Updating branch refs/heads/master
 to 5b1e54ad7aad9a1712a96fd66217e89786f6c2ef (commit)
   from 95aeb93718458a4a00cdf2c245835a914b02c36c (commit)

commit 5b1e54ad7aad9a1712a96fd66217e89786f6c2ef
Author: Xu Meihong 
Date:   Mon Nov 30 03:44:15 2009 +

l10n: Updates to Chinese (China) (zh_CN) translation

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

 po/zh_CN.po |   36 
 1 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a03db9d..27c6ed1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Parole\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-11-27 10:38+0100\n"
-"PO-Revision-Date: 2009-11-17 14:09+0800\n"
+"PO-Revision-Date: 2009-11-30 11:46+0800\n"
 "Last-Translator: Hunt Xu \n"
 "Language-Team: Chinese (simplified) \n"
 "MIME-Version: 1.0\n"
@@ -127,15 +127,15 @@ msgstr "查看(_V)"
 
 #: ../data/interfaces/mediachooser.ui.h:1
 msgid "Replace playlist with opened files"
-msgstr ""
+msgstr "使用所打开的文件替换播放列表"
 
 #: ../data/interfaces/mediachooser.ui.h:2
 msgid "Scan folders recursively"
-msgstr ""
+msgstr "递归扫描文件夹"
 
 #: ../data/interfaces/mediachooser.ui.h:3
 msgid "Start playing opened files"
-msgstr ""
+msgstr "开始播放所打开的文件"
 
 #: ../data/interfaces/plugins.ui.h:1
 msgid "Author:"
@@ -270,11 +270,11 @@ msgstr "打开一个新的 Parole 实例"
 
 #: ../src/main.c:192
 msgid "Do not load plugins"
-msgstr ""
+msgstr "不加载插件"
 
 #: ../src/main.c:193
 msgid "Set Audio-CD/VCD/DVD device path"
-msgstr ""
+msgstr "设置 Audio-CD/VCD/DVD 设备路径"
 
 #: ../src/main.c:194
 msgid "Play or pause if already playing"
@@ -669,9 +669,8 @@ msgid "Read media properties"
 msgstr "读取媒体信息"
 
 #: ../plugins/properties/stream-properties.desktop.in.h:2
-#, fuzzy
 msgid "Stream Properties"
-msgstr "属性"
+msgstr "流媒体属性"
 
 #: ../plugins/tray/tray-provider.c:243
 msgid "Playing:"
@@ -718,54 +717,51 @@ msgid "Tray icon"
 msgstr "托盘图标"
 
 #: ../plugins/window-title/window-title.desktop.in.h:1
-#, fuzzy
 msgid "Set the main window name to the current playing media name."
 msgstr "设置主窗口名为当前正在播放的媒体名称。"
 
 #: ../plugins/window-title/window-title.desktop.in.h:2
-#, fuzzy
 msgid "Window Title"
 msgstr "窗口标题"
 
 #: ../plugins/power-manager/power-manager.desktop.in.h:1
 msgid "Inhibit Power Manager from suspending the machine while playing DVD."
-msgstr ""
+msgstr "播放 DVD 时禁止电源管理器挂起系统。"
 
 #: ../plugins/power-manager/power-manager.desktop.in.h:2
 msgid "Power Manager Plugin"
-msgstr ""
+msgstr "电源管理器插件"
 
 #: ../browser-plugin/media-plugin/main.c:72
 msgid "socket"
-msgstr ""
+msgstr "套接字"
 
 #: ../browser-plugin/media-plugin/main.c:72
 msgid "SOCKET ID"
-msgstr ""
+msgstr "套接字 ID"
 
 #: ../browser-plugin/media-plugin/main.c:73
-#, fuzzy
 msgid "url to play"
-msgstr "要播放的媒体"
+msgstr "要播放的 url"
 
 #: ../browser-plugin/media-plugin/main.c:73
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: ../browser-plugin/media-plugin/parole-plugin-player.c:135
 msgid "Leave fullscreen"
-msgstr ""
+msgstr "退出全屏"
 
 #: ../browser-plugin/media-plugin/parole-plugin-player.c:140
 msgid "Fullscreen"
-msgstr ""
+msgstr "全屏播放"
 
 #.
 #. * Copy url
 #.
 #: ../browser-plugin/media-plugin/parole-plugin-player.c:426
 msgid "Copy url"
-msgstr ""
+msgstr "复制 url"
 
 #~ msgid "Enabled"
 #~ msgstr "启用"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits