[Xfce4-commits] xfdesktop:xfce-4.10 l10n: Updated Arabic (ar) translation to 99%

2012-11-08 Thread Transifex
Updating branch refs/heads/xfce-4.10
 to f356700a8ba788576127a7d351d286a899a4f2d7 (commit)
   from 84a5b2a862a28f119061a6512d84fef90291c765 (commit)

commit f356700a8ba788576127a7d351d286a899a4f2d7
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Nov 8 10:49:10 2012 +0100

l10n: Updated Arabic (ar) translation to 99%

New status: 212 messages complete with 1 fuzzy and 0 untranslated.

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

 po/ar.po |  250 -
 1 files changed, 131 insertions(+), 119 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 22283a0..3f4c4bc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,31 +2,33 @@
 # Arabic translations for xfdesktop package.
 # Copyright (C) 2003-2006 The Xfce development team.
 # This file is distributed under the same license as the xfdesktop package.
-# 
 # Saleh Alhathal hathal...@hotmail.com, 2004.
 # Khaled Hosny khaledho...@eglug.org, 2007.
 # Ahmed Mansour 911fr...@gmail.com,  2007.
 # Mohamed Magdy mohamed@gmail.com,  2007.
 # Anas Husseini linux.a...@gmail.com, 2007.
 # كريم أولاد الشلحة herr.linu...@gmail.com, 2011-2012.
+# محمد الحرقان malh...@gmail.com, 2012.
 msgid 
 msgstr 
 Project-Id-Version: ar\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-01 16:03+\n
-PO-Revision-Date: 2011-03-23 20:49-\n
-Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
-Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n
+POT-Creation-Date: 2012-11-08 09:12+\n
+PO-Revision-Date: 2012-11-08 12:48+0300\n
+Last-Translator: محمد الحرقان malh...@gmail.com\n
+Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
+Language: ar\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: ar\n
-Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n=3  
n=10 ? 2 : 3\n
+Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 
+ n%100=10 ? 3 : n%100=11 ? 4 : 5;\n
+X-Generator: Virtaal 0.7.1\n
 
 #: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200
 #, c-format
 msgid Backdrop list file is not valid
-msgstr إسم قائمة الخلفيات غير سليمة
+msgstr إسم قائمة الخلفيات غير سليم
 
 #. no need to escape markup; it's already done for us
 #: ../settings/main.c:166
@@ -60,7 +62,7 @@ msgstr أجهزة قابلة للإزالة
 msgid Cannot create backdrop list \%s\
 msgstr لا يمكن إنشاء قائمة الخلفيات \%s\
 
-#: ../settings/main.c:489 ../settings/main.c:862
+#: ../settings/main.c:489 ../settings/main.c:875
 msgid Backdrop List Error
 msgstr خطأ في قائمة الخلفيات
 
@@ -72,99 +74,99 @@ msgstr إنشاء/تحميل قائمة الخلفيات
 #, c-format
 msgid 
 File \%s\ is not a valid backdrop list file.  Do you wish to overwrite it?
-msgstr الملف \%s\ ليس قائمة خلفيات سليمة.  هل ترغب في الكتابة فوقه?
+msgstr الملف \%s\ ليس قائمة خلفيات سليمة.  هل ترغب في الكتابة فوقه؟
 
 #: ../settings/main.c:543
 msgid Invalid List File
-msgstr قائمة الملفات غير سليم
+msgstr قائمة الملفات غير سليمة
 
 #: ../settings/main.c:546
 msgid Overwriting the file will cause its contents to be lost.
-msgstr كتابة فوق الملف سوف يؤدي إلى فقدان البيانات
+msgstr كتابة فوق الملف ستؤدي لفقدان البيانات.
 
 #: ../settings/main.c:548
 msgid Replace
 msgstr إستبدال
 
-#: ../settings/main.c:858
+#: ../settings/main.c:871
 #, c-format
 msgid Failed to write backdrop list to \%s\
 msgstr فشل كتابة قائمة الخلفيات في \%s\
 
-#: ../settings/main.c:885
+#: ../settings/main.c:898
 msgid Add Image File(s)
-msgstr أضف ملف(ات) الصور
+msgstr أضف ملف(s) الصور
 
-#: ../settings/main.c:894
+#: ../settings/main.c:907
 msgid Image files
 msgstr ملفات صور
 
-#: ../settings/main.c:899
+#: ../settings/main.c:912
 msgid All files
 msgstr كل الملفات
 
-#: ../settings/main.c:1356
+#: ../settings/main.c:1376
 #, c-format
 msgid Screen %d, Monitor %d (%s)
 msgstr الشاشة %d, المراقب %d (%s)
 
-#: ../settings/main.c:1360
+#: ../settings/main.c:1380
 #, c-format
 msgid Screen %d, Monitor %d
 msgstr الشاشة %d, المراقب %d
 
-#: ../settings/main.c:1363
+#: ../settings/main.c:1383
 #, c-format
 msgid Screen %d
 msgstr الشاشة %d
 
-#: ../settings/main.c:1368
+#: ../settings/main.c:1388
 #, c-format
 msgid Monitor %d (%s)
-msgstr المراقب  %d (%s)
+msgstr المراقب %d (%s)
 
-#: ../settings/main.c:1372
+#: ../settings/main.c:1392
 #, c-format
 msgid Monitor %d
-msgstr المراقب  %d
+msgstr المراقب %d
 
-#: ../settings/main.c:1631
+#: ../settings/main.c:1651
 msgid Settings manager socket
 msgstr مقبس مدير الإعدادات
 
-#: ../settings/main.c:1631
+#: ../settings/main.c:1651
 msgid SOCKET ID
-msgstr مقبس المعرف
+msgstr مُعرف المقبس
 
-#: ../settings/main.c:1632
+#: ../settings/main.c:1652
 msgid Version information
 msgstr معلومات الإصدار
 
-#: ../settings/main.c:1649
+#: ../settings/main.c:1669
 #, c-format
 msgid Type '%s --help' for usage.
-msgstr أكتب '%s --help' لإستعمال.
+msgstr اكتب '%s --help' لدليل المستخدم.
 
-#: ../settings/main.c:1661
+#: 

[Xfce4-commits] xfdesktop:xfce-4.10 l10n: Updated Arabic (ar) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/xfce-4.10
 to 21a7c6fa3d032c5273dbd147d2956cf05b897ea2 (commit)
   from f356700a8ba788576127a7d351d286a899a4f2d7 (commit)

commit 21a7c6fa3d032c5273dbd147d2956cf05b897ea2
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Nov 8 10:58:57 2012 +0100

l10n: Updated Arabic (ar) translation to 100%

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

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

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

diff --git a/po/ar.po b/po/ar.po
index 3f4c4bc..5cec50a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -14,7 +14,7 @@ msgstr 
 Project-Id-Version: ar\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2012-11-08 09:12+\n
-PO-Revision-Date: 2012-11-08 12:48+0300\n
+PO-Revision-Date: 2012-11-08 12:59+0300\n
 Last-Translator: محمد الحرقان malh...@gmail.com\n
 Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
 Language: ar\n
@@ -1030,7 +1030,6 @@ msgid _Mount Volume
 msgstr _وصل الجزء
 
 #: ../src/xfdesktop-window-icon.c:208
-#, fuzzy
 msgid _Window Actions
 msgstr _قائمة النوافذ
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-power-manager:xfce-4.10 l10n: Updated Arabic (ar) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/xfce-4.10
 to 218bfd75070920162fa8a50393a7f1da7d874235 (commit)
   from dd3b7565d704b51f302f94ef5cbf7295d0dfd22e (commit)

commit 218bfd75070920162fa8a50393a7f1da7d874235
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Nov 8 11:31:18 2012 +0100

l10n: Updated Arabic (ar) translation to 100%

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

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

 po/ar.po |  418 +++--
 1 files changed, 185 insertions(+), 233 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 5fe8409..5fd913c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
-#
+# محمد الحرقان malh...@gmail.com, 2012.
 msgid 
 msgstr 
 Project-Id-Version: xfce4-power-manager\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-08-08 22:07+\n
-PO-Revision-Date: 2011-08-09 04:15-\n
-Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
-Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n
+POT-Creation-Date: 2012-11-08 07:33+\n
+PO-Revision-Date: 2012-11-08 13:24+0300\n
+Last-Translator: محمد الحرقان malh...@gmail.com\n
+Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
+Language: ar\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
-Plural-Forms: nplurals=2; plural=1;\n
+Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 
+ n%100=10 ? 3 : n%100=11 ? 4 : 5;\n
+X-Generator: Virtaal 0.7.1\n
 X-Poedit-Language: Arabic\n
 X-Poedit-Country: Morocco\n
 
@@ -44,17 +46,13 @@ msgstr إجراءات
 
 #: ../data/interfaces/xfpm-settings.ui.h:7
 msgid Consider the computer on low power at:
-msgstr إعتبار الحاسوب يستهلك طاقة قليلة عنذ:
+msgstr إعتبار الحاسوب يعمل على طاقة منخفضة عند:
 
 #. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:8
-#: ../settings/xfpm-settings.c:817
-#: ../settings/xfpm-settings.c:885
-#: ../settings/xfpm-settings.c:1034
-#: ../settings/xfpm-settings.c:1211
-#: ../settings/xfpm-settings.c:1268
-#: ../settings/xfpm-settings.c:1320
-#: ../src/xfpm-power.c:484
+#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:820
+#: ../settings/xfpm-settings.c:888 ../settings/xfpm-settings.c:1037
+#: ../settings/xfpm-settings.c:1214 ../settings/xfpm-settings.c:1271
+#: ../settings/xfpm-settings.c:1323 ../src/xfpm-power.c:484
 #: ../src/xfpm-power.c:779
 msgid Hibernate
 msgstr إسبات
@@ -65,24 +63,20 @@ msgstr مستوى:
 
 #: ../data/interfaces/xfpm-settings.ui.h:10
 msgid Lock screen when going for suspend/hibernate
-msgstr قفل الشاشة عند الذهاب للتعليق / إسبات
+msgstr قفل الشاشة عند الذهاب للتعليق/الإسبات
 
-#: ../data/interfaces/xfpm-settings.ui.h:11
-#: ../src/xfpm-power-common.c:132
+#: ../data/interfaces/xfpm-settings.ui.h:11 ../src/xfpm-power-common.c:132
 msgid Monitor
 msgstr مراقب
 
 #: ../data/interfaces/xfpm-settings.ui.h:12
 msgid Monitor power management control
-msgstr متحطم في إدارة مراقب الطاقة
-
-#: ../data/interfaces/xfpm-settings.ui.h:13
-#: ../settings/xfpm-settings.c:806
-#: ../settings/xfpm-settings.c:874
-#: ../settings/xfpm-settings.c:1023
-#: ../settings/xfpm-settings.c:1200
-#: ../settings/xfpm-settings.c:1257
-#: ../settings/xfpm-settings.c:1309
+msgstr متحكم في إدارة مراقب الطاقة
+
+#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:809
+#: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026
+#: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260
+#: ../settings/xfpm-settings.c:1312
 msgid Nothing
 msgstr لا شيء
 
@@ -96,11 +90,11 @@ msgstr يفضل توفير الطاقة على حساب الأداء
 
 #: ../data/interfaces/xfpm-settings.ui.h:16
 msgid Put display to sleep when computer is inactive for:
-msgstr ضع العرض على وضع النوم عندما يكون الكمبيوتر غير نشط لمدة :
+msgstr ضع العرض بوضع النوم عندما يكون الكمبيوتر غير نشط لمدة:
 
 #: ../data/interfaces/xfpm-settings.ui.h:17
 msgid Put the computer to sleep when inactive for:
-msgstr ضع الكمبيوتر على وضع النوم عندما يكون غير نشط لمدة:
+msgstr ضع الكمبيوتر بوضع النوم عندما يكون غير نشط لمدة:
 
 #: ../data/interfaces/xfpm-settings.ui.h:18
 msgid Reduce screen brightness when computer is inactive for:
@@ -112,7 +106,7 @@ msgstr تعيين وضع النوم وخمول الكمبيوتر:
 
 #: ../data/interfaces/xfpm-settings.ui.h:20
 msgid Set monitor sleep mode:
-msgstr ضبط مراقبة وضع السكون :
+msgstr ضبط مراقبة وضع السكون:
 
 #: ../data/interfaces/xfpm-settings.ui.h:21
 msgid Show notifications to notify about the battery state
@@ -127,54 +121,48 @@ msgid Standby
 msgstr الإستعداد
 
 #. Suspend menu option
-#: ../data/interfaces/xfpm-settings.ui.h:24
-#: ../settings/xfpm-settings.c:811
-#: ../settings/xfpm-settings.c:879
-#: ../settings/xfpm-settings.c:1028
-#: 

[Xfce4-commits] xfwm4:xfce-4.10 l10n: Updated Arabic (ar) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/xfce-4.10
 to 848400fb8bb61b37baf8cd0097bb7a70d1e7c8f2 (commit)
   from bb4e119ca651589a1bcd66142b3dd3f67cdd65df (commit)

commit 848400fb8bb61b37baf8cd0097bb7a70d1e7c8f2
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Nov 8 11:58:54 2012 +0100

l10n: Updated Arabic (ar) translation to 100%

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

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

 po/ar.po |   68 +++---
 1 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 4f17ac4..4c1cb9c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,8 +12,8 @@ msgid 
 msgstr 
 Project-Id-Version: xfwm4\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-10-04 09:39+\n
-PO-Revision-Date: 2012-10-04 12:59+0300\n
+POT-Creation-Date: 2012-11-08 09:36+\n
+PO-Revision-Date: 2012-11-08 13:57+0300\n
 Last-Translator: محمد الحرقان malh...@gmail.com\n
 Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
 Language: ar\n
@@ -32,7 +32,7 @@ msgid 
 This window might be busy and is not responding.\n
 Do you want to terminate the application?
 msgstr 
-قد تكون هذه النافذة معطوبة ولا تستجيب.\n
+قد تكون هذه النافذة مشغولة ولا تستجيب.\n
 هل تريد إنهاء هذا التطبيق؟
 
 #: ../helper-dialog/helper-dialog.c:89
@@ -51,7 +51,7 @@ msgstr مقبس مدير الجلسة
 #: ../settings-dialogs/workspace-settings.c:381
 #: ../settings-dialogs/xfwm4-settings.c:315
 msgid SOCKET ID
-msgstr مقبس المعرف
+msgstr مُعرف المقبس
 
 #: ../settings-dialogs/tweaks-settings.c:455
 #: ../settings-dialogs/workspace-settings.c:382
@@ -74,7 +74,7 @@ msgid 
 Try %s --help to see a full list of available command line options.\n
 msgstr 
 %s: %s\n
-جرب %s --help لمشاهدة قائمة كاملة بأوامر خيارات المتوفرة.\n
+جرب %s --help لمشاهدة قائمة كاملة بخيارات سطر الأوامر المتوفرة.\n
 
 #: ../settings-dialogs/workspace-settings.c:74
 #: ../settings-dialogs/workspace-settings.c:89
@@ -109,12 +109,12 @@ msgstr تهذيب سلوك و تأتيرات النافذة
 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:36
 msgid Window Manager Tweaks
-msgstr تضبيطات لمدير النوافذ
+msgstr تعديلات لمدير النوافذ
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1
 msgid Configure layout, names and margins
-msgstr إعداد التخطيطة أسماء و الهوامش
+msgstr إعداد التخطيط والأسماء والهوامش
 
 #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:2
 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:5
@@ -127,15 +127,15 @@ msgstr bصندوق التحريك و التحجيم/b
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:2
 msgid bButton layout/b
-msgstr bزر التصميم/b
+msgstr bتخطيط الزر/b
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:3
 msgid bDouble click _action/b
-msgstr bإخرا_ء الضغط المزدوج/b
+msgstr bإجرا_ء الضغط المزدوج/b
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:4
 msgid bFocus model/b
-msgstr bنموذج التركيز/b
+msgstr bنمط التركيز/b
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:5
 msgid bNew window focus/b
@@ -233,7 +233,7 @@ msgstr الم_سافة:
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:32
 msgid Focus follows _mouse
-msgstr النركيز يتبع الفأرة
+msgstr التركيز يتبع الفأرة
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:33
 msgid Hidden
@@ -285,11 +285,11 @@ msgstr ثبِّت
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:45
 msgid The action to perform when the title-bar is double-clicked
-msgstr الإجراء الذي سينفّذ عند النقر المزدوج على شريط العنوان
+msgstr إجراء النقر المزدوج على شريط العنوان
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:46
 msgid The window title cannot be removed
-msgstr عنوان النافذة ، لا يمكن حذفه
+msgstr عنوان النافذة لا يمكن حذفه
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:47
 msgid Title
@@ -297,11 +297,11 @@ msgstr العنوان
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:49
 msgid Wrap workspaces when _dragging a window off the screen
-msgstr صفف مساحات العمل عند سحب نافذة _خارج حدود الشاشة
+msgstr صف مساحات العمل عند سحب نافذة _خارج حدود الشاشة
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:50
 msgid Wrap workspaces when the _pointer reaches the screen edge
-msgstr صفِّف مساحات العمل عند سحب نافذة خارج حدود الشاشة
+msgstr صف مساحات العمل عند سحب نافذة خارج حدود الشاشة
 
 #: ../settings-dialogs/xfwm4-dialog.glade.h:51
 msgid _Delay before window receives focus:
@@ -376,7 +376,7 @@ msgstr تحت
 
 #: ../settings-dialogs/xfwm4-settings.c:241
 msgid Cancel
-msgstr الغي
+msgstr الغاء
 
 #: ../settings-dialogs/xfwm4-settings.c:242
 msgid Cycle windows
@@ -616,7 +616,7 @@ msgstr أضف مساحة عمل
 
 #: ../settings-dialogs/xfwm4-settings.c:305
 msgid Add adjacent workspace
-msgstr أضف مساحة عمل محادية
+msgstr أضف مساحة عمل محاذية
 
 #: ../settings-dialogs/xfwm4-settings.c:306
 msgid Delete last workspace
@@ -650,14 +650,14 @@ msgstr لا يمكن إنشاء حوار الإعدادات.
 #: 

[Xfce4-commits] garcon:xfce-4.10 l10n: Updated Arabic (ar) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/xfce-4.10
 to 98861cd60359d03dc10ca466d8eda5bc6ec8a0b5 (commit)
   from cc8d9b4e339470dc2aea0f864a475f1f667da0ab (commit)

commit 98861cd60359d03dc10ca466d8eda5bc6ec8a0b5
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Nov 8 12:06:37 2012 +0100

l10n: Updated Arabic (ar) translation to 100%

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

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

 po/ar.po |   22 --
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index 09c0567..6eacbd5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
-# 
+# محمد الحرقان malh...@gmail.com, 2012.
 msgid 
 msgstr 
 Project-Id-Version: Garcon\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-01-24 21:12+\n
-PO-Revision-Date: 2011-08-24 02:24-\n
-Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
-Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n
+POT-Creation-Date: 2012-11-08 09:51+\n
+PO-Revision-Date: 2012-11-08 14:06+0300\n
+Last-Translator: محمد الحرقان malh...@gmail.com\n
+Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
+Language: ar\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: ar\n
+Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 
+ n%100=10 ? 3 : n%100=11 ? 4 : 5;\n
+X-Generator: Virtaal 0.7.1\n
 X-Poedit-Language: Arabic\n
 X-Poedit-Country: MOROCCO\n
 
@@ -133,17 +135,17 @@ msgstr أدوات النظام
 #: ../garcon/garcon-menu.c:706
 #, c-format
 msgid File \%s\ not found
-msgstr لم بتم العثور على الملف \%s\
+msgstr لم يتم العثور على الملف \%s\
 
 #: ../garcon/garcon-menu-parser.c:280
 #, c-format
 msgid Could not load menu file data from %s: %s
-msgstr لا يمكن تحميل ملف قائمة البيانات من %s: %s
+msgstr لا يمكن تحميل ملف بيانات القائمة من %s: %s
 
 #: ../garcon/garcon-menu-parser.c:287
 #, c-format
 msgid Could not load menu file data from %s
-msgstr لا يمكن تحميل ملف قائمة البيانات من %s
+msgstr لا يمكن تحميل ملف بيانات القائمة من %s
 
 #~ msgid Network
 #~ msgstr شبكة
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] libxfce4ui:xfce-4.10 l10n: Updated Arabic (ar) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/xfce-4.10
 to aa468aa269acc653f7b991248bf3dbda17a6af77 (commit)
   from d1ad2f75489fbc33c22a910d2ee27d570ca96c41 (commit)

commit aa468aa269acc653f7b991248bf3dbda17a6af77
Author: محمد الحرقان malh...@gmail.com
Date:   Thu Nov 8 12:26:32 2012 +0100

l10n: Updated Arabic (ar) translation to 100%

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

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

 po/ar.po |  102 ++---
 1 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index ee7d73f..b97e208 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
-# 
+# محمد الحرقان malh...@gmail.com, 2012.
 msgid 
 msgstr 
 Project-Id-Version: libxcfe4ui\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-01-09 20:18+\n
-PO-Revision-Date: 2011-08-24 02:20-\n
-Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
-Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n
+POT-Creation-Date: 2012-11-08 10:00+\n
+PO-Revision-Date: 2012-11-08 14:26+0300\n
+Last-Translator: محمد الحرقان malh...@gmail.com\n
+Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n;
+Language: ar\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: ar\n
+Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 
+ n%100=10 ? 3 : n%100=11 ? 4 : 5;\n
+X-Generator: Virtaal 0.7.1\n
 X-Poedit-Language: Arabic\n
 X-Poedit-Country: MOROCCO\n
 
@@ -102,15 +104,13 @@ msgstr مدير الجلسة لم يقم بإرجاع معرف عميل صال
 msgid 
 Working directory \%s\ does not exist. It won't be used when spawning \%s
 \.
-msgstr مسار العمل \%s\ غير موجود. ولن يستخدم عنذ توليد \%s\.
+msgstr مسار العمل \%s\ غير موجود. ولن يستخدم عند توليد \%s\.
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:52
 msgid 
 This shortcut is already being used for another window manager action. Which 
 action do you want to use?
-msgstr 
-هذا الإختصار يستخدم حاليا من طرف مدير عمل النوافذ أخر. أي واحد تريد 
-الإستعمال؟
+msgstr هذا الإختصار يستخدمه مدير عمل نوافذ أخر. أي واحد تريد استعماله؟
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:53
 #: ../libxfce4kbd-private/xfce-shortcuts.c:56
@@ -122,7 +122,7 @@ msgstr إستعمال '%s'
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:53
 msgid Keep the other one
-msgstr الحفاظ على واحد أخر
+msgstr الحفاظ على الأخر
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:55
 #: ../libxfce4kbd-private/xfce-shortcuts.c:58
@@ -130,7 +130,7 @@ msgstr الحفاظ على واحد أخر
 msgid 
 This shortcut is already being used for the command '%s'. Which action do 
 you want to use?
-msgstr هذا الإختصار يستعمل حاليا من طرف الأمر '%s'. أي واحد تريد الإستعمال؟
+msgstr هذا الإختصار يستعمله الأمر '%s'. أي واحد تريد الإستعمال؟
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:56
 #: ../libxfce4kbd-private/xfce-shortcuts.c:59
@@ -142,8 +142,7 @@ msgstr الحفاظ على '%s'
 msgid 
 This shortcut is already being used by a window manager action. Which action 
 do you want to use?
-msgstr 
-هذا الإختصار يستخدم حاليا من طرف مدير عمل النوافذ. أي واحد تريد الإستعمال؟
+msgstr هذا الإختصار يستخدمه مدير عمل النوافذ. أي واحد تريد إستعماله؟
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:62
 msgid Keep the window manager action
@@ -152,15 +151,15 @@ msgstr الحفاظ على مدير النوافذ نشط
 #: ../libxfce4kbd-private/xfce-shortcuts.c:95
 #, c-format
 msgid Conflicting actions for %s
-msgstr تعارض الإجراءات لي %s
+msgstr تعارض إجراءات %s
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:128
 msgid This shortcut is already being used for something else.
-msgstr هذا الإختصار يستخدم حاليا لشيئ أخر
+msgstr هذا الإختصار يستخدم حاليا لشيئ أخر.
 
 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204
 msgid Window Manager Action Shortcut
-msgstr إختصار لإجراءات مدير النوافذ
+msgstr إختصارات إجراءات مدير النوافذ
 
 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:205
 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:215
@@ -185,7 +184,7 @@ msgstr الإختصار:
 
 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:300
 msgid Could not grab the keyboard.
-msgstr لا يمكن إنتزاع لوحة المفايح
+msgstr لا يمكن الاستيلاء على لوحة المفايح.
 
 #: ../glade/libxfce4ui.xml.in.h:1
 msgid Subtitle
@@ -193,7 +192,7 @@ msgstr عنوان فرعي
 
 #: ../glade/libxfce4ui.xml.in.h:2
 msgid Titled Dialog
-msgstr حوار معنون
+msgstr عنوان الحوار
 
 #: ../glade/libxfce4ui.xml.in.h:3
 msgid Xfce 4 Widgets
@@ -219,7 +218,7 @@ msgstr شريط
 msgid 
 Program launchers, window buttons, applications menu, workspace switcher and 
 more.
-msgstr مطلق البرامج, أزرار النافذة. قائمة التطبيقات, مبدل مساحات العمل وأكثر.
+msgstr مطلق البرامج, أزرار النافذة، قائمة التطبيقات, مبدل مساحات العمل وأكثر.
 
 #: ../xfce4-about/main.c:79
 

[Xfce4-commits] xfce4-settings:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/master
 to 43b8c7fc09497a0c25506224a785d2e2020ad72b (commit)
   from a78d9e682234462d0a95963b768c73e8eb64f2ac (commit)

commit 43b8c7fc09497a0c25506224a785d2e2020ad72b
Author: Pjotr vertaalt pjotrverta...@gmail.com
Date:   Thu Nov 8 14:56:55 2012 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 100%

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

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

 po/nl.po |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 6959337..0468e48 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-07 10:36+\n
+POT-Creation-Date: 2012-11-08 13:21+\n
 PO-Revision-Date: 2011-09-08 22:32+0200\n
 Last-Translator: Pjotr\n
 Language-Team: Dutch (Flemish)\n
@@ -834,8 +834,8 @@ msgid Cursor
 msgstr Aanwijzer
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
-msgid Define _shortcuts for la_unching applications:
-msgstr Sneltoetsen kiezen voor het starten van toepassingen:
+msgid Define shortcuts for la_unching applications:
+msgstr Bepaal sneltoetsen voor het starten van toepassingen:
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%

2012-11-08 Thread Transifex
Updating branch refs/heads/master
 to 82ab3a355a4b7eff6cffa57ca5a8e8622feb2d31 (commit)
   from 43b8c7fc09497a0c25506224a785d2e2020ad72b (commit)

commit 82ab3a355a4b7eff6cffa57ca5a8e8622feb2d31
Author: Sergio Marques smarque...@gmail.com
Date:   Thu Nov 8 15:03:52 2012 +0100

l10n: Updated Portuguese (pt) translation to 100%

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

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

 po/pt.po |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 48d8861..4145b55 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,17 +7,17 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-07 10:36+\n
+POT-Creation-Date: 2012-11-08 13:21+\n
 PO-Revision-Date: 2012-04-27 15:49+0100\n
 Last-Translator: Nuno Miguel nunom...@gmail.com\n
 Language-Team: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-X-Poedit-Country: PORTUGAL\n
 Language: pt\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 X-Poedit-Language: Portuguese\n
+X-Poedit-Country: PORTUGAL\n
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1
 msgid Acceleration _profile:
@@ -828,8 +828,8 @@ msgid Cursor
 msgstr Cursor
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7
-msgid Define _shortcuts for la_unching applications:
-msgstr Definir atalho_s para iniciar as aplicações:
+msgid Define shortcuts for la_unching applications:
+msgstr Definir _atalhos para iniciar as aplicações:
 
 #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8
 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-session:xfce-4.10 Handle multiple interactive session save (bug #5379).

2012-11-08 Thread Jérôme Guelfucci
Updating branch refs/heads/xfce-4.10
 to 6cb3937aa9cf0c9905a77d0bc2b5be8cc2536e44 (commit)
   from e4adcaf8a0321c39b59db4b6d2dbd20e77804e5d (commit)

commit 6cb3937aa9cf0c9905a77d0bc2b5be8cc2536e44
Author: Dimitar Zhekov hams...@mbox.contact.bg
Date:   Thu Aug 30 22:52:14 2012 +0200

Handle multiple interactive session save (bug #5379).

Additionnaly, we now use SmSaveGlobal on log out / shutdown without
session save which avoids data loss. Previously clients would not save
anything on log out without session save.

Based on original work by Chris Bainbridge (chris.bainbri...@gmail.com).

 xfce4-session/xfsm-manager.c |   81 -
 1 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index bf6a446..35811c5 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -98,6 +98,7 @@ struct _XfsmManager
 
   XfsmShutdownType  shutdown_type;
   XfsmShutdown *shutdown_helper;
+  gboolean  save_session;
 
   gboolean session_chooser;
   gchar   *session_name;
@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager)
   manager-failsafe_mode = TRUE;
   manager-shutdown_type = XFSM_SHUTDOWN_LOGOUT;
   manager-shutdown_helper = xfsm_shutdown_get ();
+  manager-save_session = TRUE;
 
   manager-pending_properties = g_queue_new ();
   manager-starting_properties = g_queue_new ();
@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager,
   XfsmClient *cl = lp-data;
   if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
 {
-  xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT);
+  /* a client is already interacting, so new client has to wait */
+  xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT);
+  xfsm_manager_cancel_client_save_timeout(manager, client);
   return;
 }
 }
@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager 
*manager,
 }
 }
 
-  if (!shutdown || shutdown_save)
+  /* don't save the session if shutting down without save */
+  manager-save_session = !shutdown || shutdown_save;
+
+  if (save_type == SmSaveBoth  !manager-save_session)
 {
-  xfsm_manager_set_state (manager,
-  shutdown
-  ? XFSM_MANAGER_SHUTDOWN
-  : XFSM_MANAGER_CHECKPOINT);
+  /* saving the session, so clients should
+   * (prompt to) save the user data only */
+  save_type = SmSaveGlobal;
+}
 
-  /* handle legacy applications first! */
-  xfsm_legacy_perform_session_save ();
+  xfsm_manager_set_state (manager,
+  shutdown
+  ? XFSM_MANAGER_SHUTDOWN
+  : XFSM_MANAGER_CHECKPOINT);
 
-  for (lp = g_queue_peek_nth_link (manager-running_clients, 0);
-   lp;
-   lp = lp-next)
-{
-  XfsmClient *client = lp-data;
-  XfsmProperties *properties = xfsm_client_get_properties (client);
-  const gchar *program;
+  /* handle legacy applications first! */
+  if (manager-save_session)
+  xfsm_legacy_perform_session_save ();
 
-  /* xterm's session management is broken, so we won't
-   * send a SAVE YOURSELF to xterms */
-  program = xfsm_properties_get_string (properties, SmProgram);
-  if (program != NULL  strcasecmp (program, xterm) == 0)
-continue;
+  for (lp = g_queue_peek_nth_link (manager-running_clients, 0);
+   lp;
+   lp = lp-next)
+{
+  XfsmClient *client = lp-data;
+  XfsmProperties *properties = xfsm_client_get_properties (client);
+  const gchar *program;
 
-  if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-{
-  SmsSaveYourself (xfsm_client_get_sms_connection (client), 
save_type, shutdown,
-   interact_style, fast);
-}
+  /* xterm's session management is broken, so we won't
+   * send a SAVE YOURSELF to xterms */
+  program = xfsm_properties_get_string (properties, SmProgram);
+  if (program != NULL  strcasecmp (program, xterm) == 0)
+continue;
 
-  xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-  xfsm_manager_start_client_save_timeout (manager, client);
+  if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
+{
+  SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, 
shutdown,
+   interact_style, fast);
 }
-}
-  else
-{
-  /* shutdown session without saving */
-  xfsm_manager_perform_shutdown (manager);
+
+  xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
+  xfsm_manager_start_client_save_timeout (manager, client);
 }
 }
 
@@ 

[Xfce4-commits] xfce4-session:xfce-4.8 Handle multiple interactive session save (bug #5379).

2012-11-08 Thread Jérôme Guelfucci
Updating branch refs/heads/xfce-4.8
 to cec1b90a752794091032994865e79062d6ce3e6f (commit)
   from f0795f6f12f3370617c9f99b0f61755c67e43743 (commit)

commit cec1b90a752794091032994865e79062d6ce3e6f
Author: Dimitar Zhekov hams...@mbox.contact.bg
Date:   Thu Nov 8 18:04:47 2012 +0100

Handle multiple interactive session save (bug #5379).

Additionnaly, we now use SmSaveGlobal on log out / shutdown without
session save which avoids data loss. Previously clients would not save
anything on log out without session save.

Based on original work by Chris Bainbridge (chris.bainbri...@gmail.com).

 xfce4-session/xfsm-manager.c |   81 -
 1 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index 3078d6a..92ae8e3 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -96,6 +96,7 @@ struct _XfsmManager
 
   XfsmManagerState state;
   XfsmShutdownType shutdown_type;
+  gboolean save_session;
 
   gboolean session_chooser;
   gchar   *session_name;
@@ -225,6 +226,7 @@ xfsm_manager_init (XfsmManager *manager)
   manager-session_chooser = FALSE;
   manager-failsafe_mode = TRUE;
   manager-shutdown_type = XFSM_SHUTDOWN_LOGOUT;
+  manager-save_session = TRUE;
 
   manager-pending_properties = g_queue_new ();
   manager-starting_properties = g_queue_new ();
@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *manager,
   XfsmClient *cl = lp-data;
   if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
 {
-  xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT);
+  /* a client is already interacting, so new client has to wait */
+  xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT);
+  xfsm_manager_cancel_client_save_timeout(manager, client);
   return;
 }
 }
@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmManager 
*manager,
 }
 #endif
 
-  if (!shutdown || shutdown_save)
+  /* don't save the session if shutting down without save */
+  manager-save_session = !shutdown || shutdown_save;
+
+  if (save_type == SmSaveBoth  !manager-save_session)
 {
-  xfsm_manager_set_state (manager,
-  shutdown
-  ? XFSM_MANAGER_SHUTDOWN
-  : XFSM_MANAGER_CHECKPOINT);
+  /* saving the session, so clients should
+   * (prompt to) save the user data only */
+  save_type = SmSaveGlobal;
+}
 
-  /* handle legacy applications first! */
+  xfsm_manager_set_state (manager,
+  shutdown
+  ? XFSM_MANAGER_SHUTDOWN
+  : XFSM_MANAGER_CHECKPOINT);
+  
+  /* handle legacy applications first! */
+  if (manager-save_session)
   xfsm_legacy_perform_session_save ();
 
-  for (lp = g_queue_peek_nth_link (manager-running_clients, 0);
-   lp;
-   lp = lp-next)
-{
-  XfsmClient *client = lp-data;
-  XfsmProperties *properties = xfsm_client_get_properties (client);
-  const gchar *program;
-
-  /* xterm's session management is broken, so we won't
-   * send a SAVE YOURSELF to xterms */
-  program = xfsm_properties_get_string (properties, SmProgram);
-  if (program != NULL  strcasecmp (program, xterm) == 0)
-continue;
+  for (lp = g_queue_peek_nth_link (manager-running_clients, 0);
+   lp;
+   lp = lp-next)
+{
+  XfsmClient *client = lp-data;
+  XfsmProperties *properties = xfsm_client_get_properties (client);
+  const gchar *program;
 
-  if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
-{
-  SmsSaveYourself (xfsm_client_get_sms_connection (client), 
save_type, shutdown,
-   interact_style, fast);
-}
+  /* xterm's session management is broken, so we won't
+   * send a SAVE YOURSELF to xterms */
+  program = xfsm_properties_get_string (properties, SmProgram);
+  if (program != NULL  strcasecmp (program, xterm) == 0)
+continue;
 
-  xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
-  xfsm_manager_start_client_save_timeout (manager, client);
+  if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
+{
+  SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, 
shutdown,
+   interact_style, fast);
 }
-}
-  else
-{
-  /* shutdown session without saving */
-  xfsm_manager_perform_shutdown (manager);
+
+  xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
+  xfsm_manager_start_client_save_timeout (manager, client);
 }
 }
 
@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager,
   

[Xfce4-commits] thunar:master Trigger callback function when opening unmounted locations (bug #9447).

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to fa11bfe6069e5fdce5367894b764b732f3d883fa (commit)
   from d174464325c991ab261c909b133f4f934cd68dc2 (commit)

commit fa11bfe6069e5fdce5367894b764b732f3d883fa
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 20:37:35 2012 +0100

Trigger callback function when opening unmounted locations (bug #9447).

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

diff --git a/thunar/thunar-browser.c b/thunar/thunar-browser.c
index a608518..9813936 100644
--- a/thunar/thunar-browser.c
+++ b/thunar/thunar-browser.c
@@ -445,7 +445,7 @@ thunar_browser_poke_file_internal (ThunarBrowser
*browser,
   target = thunar_file_get_target_location (file);
 
   poke_data = thunar_browser_poke_file_data_new (browser, location, source,
- file, func, NULL, 
user_data);
+ file, func, 
location_func, user_data);
 
   thunar_file_get_async (target, NULL,
  thunar_browser_poke_shortcut_file_finish,
@@ -460,7 +460,7 @@ thunar_browser_poke_file_internal (ThunarBrowser
*browser,
   target = thunar_file_get_target_location (file);
 
   poke_data = thunar_browser_poke_file_data_new (browser, location, 
source,
- file, func, NULL, 
user_data);
+ file, func, 
location_func, user_data);
 
   thunar_file_get_async (target, NULL,
  thunar_browser_poke_mountable_file_finish,
@@ -471,7 +471,7 @@ thunar_browser_poke_file_internal (ThunarBrowser
*browser,
   else
 {
   poke_data = thunar_browser_poke_file_data_new (browser, location, 
source,
- file, func, NULL, 
user_data);
+ file, func, 
location_func, user_data);
 
   mount_operation = thunar_browser_mount_operation_new (widget);
 
@@ -486,7 +486,7 @@ thunar_browser_poke_file_internal (ThunarBrowser
*browser,
   else if (!thunar_file_is_mounted (file))
 {
   poke_data = thunar_browser_poke_file_data_new (browser, location, source,
- file, func, NULL, 
user_data);
+ file, func, 
location_func, user_data);
 
   mount_operation = thunar_browser_mount_operation_new (widget);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Remove user directories and add bookmarks in go menu.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to d174464325c991ab261c909b133f4f934cd68dc2 (commit)
   from c7a5a8dfb5379995af90b819fcffe2b8dad0ab7b (commit)

commit d174464325c991ab261c909b133f4f934cd68dc2
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 20:36:46 2012 +0100

Remove user directories and add bookmarks in go menu.

 icons/16x16/Makefile.am|3 +-
 icons/16x16/stock_thunar-templates.png |  Bin 478 - 0 bytes
 thunar/thunar-gio-extensions.c |   16 -
 thunar/thunar-gio-extensions.h |3 +-
 thunar/thunar-misc-jobs.c  |   21 +-
 thunar/thunar-private.h|   14 -
 thunar/thunar-shortcuts-model.c|  137 +++-
 thunar/thunar-stock.c  |   16 +-
 thunar/thunar-stock.h  |7 -
 thunar/thunar-util.c   |   63 
 thunar/thunar-util.h   |   11 +-
 thunar/thunar-window-ui.xml|   13 +-
 thunar/thunar-window.c |  595 +---
 13 files changed, 473 insertions(+), 426 deletions(-)

diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index d91ac9e..9a205eb 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -8,8 +8,7 @@ stockdir = $(datadir)/icons/hicolor/16x16/stock/navigation
 stock_DATA =   \
stock_folder-copy.png   \
stock_folder-move.png   \
-   stock_thunar-shortcuts.png  \
-   stock_thunar-templates.png
+   stock_thunar-shortcuts.png
 
 EXTRA_DIST =   \
$(apps_DATA)\
diff --git a/icons/16x16/stock_thunar-templates.png 
b/icons/16x16/stock_thunar-templates.png
deleted file mode 100644
index 367f761..000
Binary files a/icons/16x16/stock_thunar-templates.png and /dev/null differ
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index b4da684..939aa6d 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -71,22 +71,6 @@ thunar_g_file_new_for_desktop (void)
 
 
 
-GFile *
-thunar_g_file_new_for_user_special_dir (GUserDirectory dir)
-{
-  const gchar *path;
-
-  _thunar_return_val_if_fail (dir  G_USER_N_DIRECTORIES, NULL);
-
-  path = g_get_user_special_dir (dir);
-  if (path == NULL)
-path = xfce_get_homedir ();
-
-  return g_file_new_for_path (path);
-}
-
-
-
 gboolean
 thunar_g_file_is_root (GFile *file)
 {
diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
index f27832e..4efbef0 100644
--- a/thunar/thunar-gio-extensions.h
+++ b/thunar/thunar-gio-extensions.h
@@ -29,8 +29,7 @@ GFile*thunar_g_file_new_for_home (void);
 GFile*thunar_g_file_new_for_root (void);
 GFile*thunar_g_file_new_for_trash(void);
 GFile*thunar_g_file_new_for_desktop  (void);
-GFile*thunar_g_file_new_for_user_special_dir (GUserDirectorydir);
-  
+
 gboolean  thunar_g_file_is_root  (GFile*file);
 gboolean  thunar_g_file_is_trashed   (GFile*file);
 gboolean  thunar_g_file_is_home  (GFile*file);
diff --git a/thunar/thunar-misc-jobs.c b/thunar/thunar-misc-jobs.c
index 1f1c981..eddc2e1 100644
--- a/thunar/thunar-misc-jobs.c
+++ b/thunar/thunar-misc-jobs.c
@@ -37,13 +37,14 @@ _thunar_misc_jobs_load_templates (ThunarJob  *job,
   GArray *param_values,
   GError**error)
 {
-  ThunarFile *file;
-  GtkWidget  *menu;
-  GFile  *home_dir;
-  GFile  *templates_dir;
-  GList  *files = NULL;
-  GList  *lp;
-  GList  *paths = NULL;
+  ThunarFile  *file;
+  GtkWidget   *menu;
+  GFile   *home_dir;
+  GFile   *templates_dir;
+  GList   *files = NULL;
+  GList   *lp;
+  GList   *paths = NULL;
+  const gchar *path;
 
   _thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE);
   _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -53,7 +54,11 @@ _thunar_misc_jobs_load_templates (ThunarJob  *job,
   g_object_set_data (G_OBJECT (job), menu, menu);
 
   home_dir = thunar_g_file_new_for_home ();
-  templates_dir = thunar_g_file_new_for_user_special_dir 
(G_USER_DIRECTORY_TEMPLATES);
+  path = g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES);
+  if (G_LIKELY (path != NULL))
+templates_dir = g_file_new_for_path (path);
+  else
+templates_dir = g_file_resolve_relative_path (home_dir, Templates);
 
   if (G_LIKELY (!g_file_equal (templates_dir, home_dir)))
 {
diff --git a/thunar/thunar-private.h b/thunar/thunar-private.h
index b6c58e2..6fbe31a 100644
--- 

[Xfce4-commits] thunar:master Don't add a bookmark to the same location twice.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to 574c7dfa31dbe24e0f907945e21f411408a69b03 (commit)
   from fa11bfe6069e5fdce5367894b764b732f3d883fa (commit)

commit 574c7dfa31dbe24e0f907945e21f411408a69b03
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 20:43:42 2012 +0100

Don't add a bookmark to the same location twice.

This avoids action-name collision and its not really usefull
either.

 thunar/thunar-window.c |   27 +++
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 04d3e41..211f6a5 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1975,18 +1975,21 @@ thunar_window_bookmark_merge_line (GFile   
*file_path,
 
   if (G_LIKELY (action != NULL))
 {
-  /* connect action */
-  g_signal_connect (G_OBJECT (action), activate, G_CALLBACK 
(thunar_window_action_open_bookmark), window);
-
-  /* insert the bookmark in the group */
-  gtk_action_group_add_action_with_accel (window-bookmark_action_group, 
action, NULL);
-
-  /* add the action to the UI manager */
-  gtk_ui_manager_add_ui (window-ui_manager,
- window-bookmark_items_actions_merge_id,
- path,
- unique_name, unique_name,
- GTK_UI_MANAGER_MENUITEM, FALSE);
+  if (gtk_action_group_get_action (window-bookmark_action_group, 
unique_name) == NULL)
+{
+  /* connect action */
+  g_signal_connect (G_OBJECT (action), activate, G_CALLBACK 
(thunar_window_action_open_bookmark), window);
+
+  /* insert the bookmark in the group */
+  gtk_action_group_add_action_with_accel 
(window-bookmark_action_group, action, NULL);
+
+  /* add the action to the UI manager */
+  gtk_ui_manager_add_ui (window-ui_manager,
+ window-bookmark_items_actions_merge_id,
+ path,
+ unique_name, unique_name,
+ GTK_UI_MANAGER_MENUITEM, FALSE);
+}
 
   g_object_unref (action);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] xfce4-settings:master Re-enable the internal display when the external one is disconnected

2012-11-08 Thread Simon Steinbeiss
Updating branch refs/heads/master
 to dbd76eb58bd9d7a55de753daa5572ef24867d924 (commit)
   from 82ab3a355a4b7eff6cffa57ca5a8e8622feb2d31 (commit)

commit dbd76eb58bd9d7a55de753daa5572ef24867d924
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date:   Thu Nov 8 20:15:42 2012 +0100

Re-enable the internal display when the external one is disconnected

(and add the possibility to start xfce4-display-settings --minimal when a 
new
display is connected)

Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at

 xfsettingsd/displays.c |  583 +++-
 1 files changed, 373 insertions(+), 210 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index e53c49f..3497804 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -32,6 +32,7 @@
 #include gdk/gdkx.h
 #include gtk/gtk.h
 #include xfconf/xfconf.h
+#include libxfce4ui/libxfce4ui.h
 
 #include X11/extensions/Xrandr.h
 
@@ -48,10 +49,25 @@
 #undef HAS_RANDR_ONE_POINT_THREE
 #endif
 
+/* Xfconf properties */
+#define APPLY_SCHEME_PROP   /Schemes/Apply
+#define DEFAULT_SCHEME_NAME Default
+#define OUTPUT_FMT  /%s/%s
+#define PRIMARY_PROPOUTPUT_FMT /Primary
+#define ACTIVE_PROP OUTPUT_FMT /Active
+#define ROTATION_PROP   OUTPUT_FMT /Rotation
+#define REFLECTION_PROP OUTPUT_FMT /Reflection
+#define RESOLUTION_PROP OUTPUT_FMT /Resolution
+#define RRATE_PROP  OUTPUT_FMT /RefreshRate
+#define POSX_PROP   OUTPUT_FMT /Position/X
+#define POSY_PROP   OUTPUT_FMT /Position/Y
+#define NOTIFY_PROP /Notify
+
 
 
 /* wrappers to avoid querying too often */
-typedef struct _XfceRRCrtc XfceRRCrtc;
+typedef struct _XfceRRCrtc   XfceRRCrtc;
+typedef struct _XfceRROutput XfceRROutput;
 
 
 
@@ -65,13 +81,15 @@ static void 
xfce_displays_helper_set_screen_size(Xfc
 static gboolean xfce_displays_helper_load_from_xfconf   
(XfceDisplaysHelper  *helper,
  
const gchar *scheme,
  
GHashTable  *saved_outputs,
- 
RROutput output);
+ 
XfceRROutput*output);
+static GPtrArray   *xfce_displays_helper_list_outputs   
(XfceDisplaysHelper  *helper);
+static void xfce_displays_helper_free_output
(XfceRROutput*output);
 static GPtrArray   *xfce_displays_helper_list_crtcs 
(XfceDisplaysHelper  *helper);
 static XfceRRCrtc  *xfce_displays_helper_find_crtc_by_id
(XfceDisplaysHelper  *helper,
  
RRCrtc   id);
 static void xfce_displays_helper_free_crtc  
(XfceRRCrtc  *crtc);
 static XfceRRCrtc  *xfce_displays_helper_find_usable_crtc   
(XfceDisplaysHelper  *helper,
- 
RROutput output);
+ 
XfceRROutput*output);
 static void xfce_displays_helper_get_topleftmost_pos
(XfceRRCrtc  *crtc,
  
XfceDisplaysHelper  *helper);
 static void xfce_displays_helper_normalize_crtc 
(XfceRRCrtc  *crtc,
@@ -83,7 +101,7 @@ static void 
xfce_displays_helper_workaround_crtc_size   (Xfc
 static void xfce_displays_helper_apply_crtc 
(XfceRRCrtc  *crtc,
  
XfceDisplaysHelper  *helper);
 static void xfce_displays_helper_set_outputs
(XfceRRCrtc  *crtc,
- 
RROutput output);
+ 
XfceRROutput*output);
 static void xfce_displays_helper_apply_all  
(XfceDisplaysHelper  *helper);
 static void xfce_displays_helper_channel_apply  
(XfceDisplaysHelper  *helper,
  
const gchar *scheme);
@@ -91,11 +109,9 @@ static void 
xfce_displays_helper_channel_property_changed   (Xfc
  

[Xfce4-commits] thunar:master Also watch the bookmark files.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to 877b8ea466ab74b2386af92b1ffe707c97a749a2 (commit)
   from 574c7dfa31dbe24e0f907945e21f411408a69b03 (commit)

commit 877b8ea466ab74b2386af92b1ffe707c97a749a2
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 21:03:42 2012 +0100

Also watch the bookmark files.

 thunar/thunar-window.c |   47 +--
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 211f6a5..a7db93d 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1883,14 +1883,9 @@ thunar_window_merge_custom_preferences (ThunarWindow 
*window)
 
 
 static void
-thunar_window_bookmark_changed (GFileMonitor  *monitor,
-GFile *file,
-GFile *other_file,
-GFileMonitorEvent  event_type,
-ThunarWindow  *window)
+thunar_window_bookmark_changed (ThunarWindow *window)
 {
   _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
-  _thunar_return_if_fail (window-bookmark_monitor == monitor);
 
   if (window-bookmark_reload_idle_id == 0)
 window-bookmark_reload_idle_id = g_idle_add 
(thunar_window_bookmark_merge, window);
@@ -1899,6 +1894,26 @@ thunar_window_bookmark_changed (GFileMonitor  
*monitor,
 
 
 static void
+thunar_window_bookmark_release_file (gpointer data)
+{
+  ThunarFile *file = THUNAR_FILE (data);
+
+  /* stop watching */
+  thunar_file_unwatch (file);
+
+  /* disconnect changed and destroy signals */
+  g_signal_handlers_disconnect_matched (file,
+G_SIGNAL_MATCH_FUNC, 0,
+0, NULL,
+G_CALLBACK 
(thunar_window_bookmark_changed),
+NULL);
+
+  g_object_unref (file);
+}
+
+
+
+static void
 thunar_window_bookmark_merge_line (GFile   *file_path,
const gchar *name,
gint line_num,
@@ -1944,7 +1959,16 @@ thunar_window_bookmark_merge_line (GFile   
*file_path,
 name = thunar_file_get_display_name (file);
 
   action = gtk_action_new (unique_name, name, tooltip, 
GTK_STOCK_DIRECTORY);
-  g_object_set_data_full (G_OBJECT (action), I_(thunar-file), file, 
g_object_unref);
+  g_object_set_data_full (G_OBJECT (action), I_(thunar-file), file,
+  thunar_window_bookmark_release_file);
+
+  /* watch the file */
+  thunar_file_watch (file);
+
+  g_signal_connect_swapped (G_OBJECT (file), destroy,
+G_CALLBACK 
(thunar_window_bookmark_changed), window);
+  g_signal_connect_swapped (G_OBJECT (file), changed,
+G_CALLBACK 
(thunar_window_bookmark_changed), window);
 }
   else
 {
@@ -2012,7 +2036,10 @@ thunar_window_bookmark_merge (gpointer user_data)
 
   /* remove old actions */
   if (window-bookmark_items_actions_merge_id != 0)
-gtk_ui_manager_remove_ui (window-ui_manager, 
window-bookmark_items_actions_merge_id);
+{
+  gtk_ui_manager_remove_ui (window-ui_manager, 
window-bookmark_items_actions_merge_id);
+  gtk_ui_manager_ensure_update (window-ui_manager);
+}
 
   /* drop old bookmarks action group */
   if (window-bookmark_action_group != NULL)
@@ -2031,8 +2058,8 @@ thunar_window_bookmark_merge (gpointer user_data)
   window-bookmark_monitor = g_file_monitor_file (window-bookmark_file, 
G_FILE_MONITOR_NONE, NULL, NULL);
   if (G_LIKELY (window-bookmark_monitor != NULL))
 {
-  g_signal_connect (window-bookmark_monitor, changed,
-G_CALLBACK (thunar_window_bookmark_changed), 
window);
+  g_signal_connect_swapped (window-bookmark_monitor, changed,
+G_CALLBACK 
(thunar_window_bookmark_changed), window);
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Use stock home icons for ~.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to 331aaee90d111555e4da5fa7f5be52cc5cfb3bd6 (commit)
   from 877b8ea466ab74b2386af92b1ffe707c97a749a2 (commit)

commit 331aaee90d111555e4da5fa7f5be52cc5cfb3bd6
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 21:15:28 2012 +0100

Use stock home icons for ~.

 thunar/thunar-file.c|3 +++
 thunar/thunar-shortcuts-model.c |1 +
 thunar/thunar-stock.c   |1 -
 thunar/thunar-stock.h   |1 -
 thunar/thunar-window.c  |2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 9f4fe72..f82571b 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3324,6 +3324,9 @@ thunar_file_get_icon_name (const ThunarFile   *file,
   return g_strdup (drive-harddisk);
 }
 
+  if (thunar_file_is_home (file))
+return g_strdup (GTK_STOCK_HOME);
+
   if (file-info == NULL)
 return NULL;
 
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index 51cce29..bbdf396 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -885,6 +885,7 @@ thunar_shortcuts_model_shortcut_places 
(ThunarShortcutsModel *model)
   shortcut = g_slice_new0 (ThunarShortcut);
   shortcut-group = THUNAR_SHORTCUT_GROUP_PLACES_DEFAULT;
   shortcut-file = file;
+  shortcut-gicon = g_themed_icon_new (GTK_STOCK_HOME);
   shortcut-sort_id = 0;
   shortcut-hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
   thunar_shortcuts_model_add_shortcut (model, shortcut);
diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
index e6ad229..48b0e89 100644
--- a/thunar/thunar-stock.c
+++ b/thunar/thunar-stock.c
@@ -46,7 +46,6 @@ typedef struct
 static const ThunarStockIcon thunar_stock_icons[] =
 {
   { THUNAR_STOCK_DESKTOP, user-desktop },
-  { THUNAR_STOCK_HOME,go-home },
   { THUNAR_STOCK_SHORTCUTS,   stock_thunar-shortcuts },
   { THUNAR_STOCK_TEMPLATES,   text-x-generic-template },
   { THUNAR_STOCK_TRASH_EMPTY, user-trash,   },
diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
index 8a68dd1..036ee3c 100644
--- a/thunar/thunar-stock.h
+++ b/thunar/thunar-stock.h
@@ -23,7 +23,6 @@
 G_BEGIN_DECLS;
 
 #define THUNAR_STOCK_DESKTOP  thunar-desktop  /* see ThunarLauncher 
*/
-#define THUNAR_STOCK_HOME thunar-home /* see ThunarWindow */
 #define THUNAR_STOCK_SHORTCUTSthunar-shortcuts/* see 
ThunarShortcutsPane */
 #define THUNAR_STOCK_TEMPLATESthunar-templates/* see ThunarWindow */
 #define THUNAR_STOCK_TRASH_EMPTY  thunar-trash/* see 
ThunarTrashAction */
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index a7db93d..aaf9674 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -352,7 +352,7 @@ static GtkActionEntry action_entries[] =
   { zoom-reset, GTK_STOCK_ZOOM_100, N_ (Normal Si_ze), control0, N_ 
(Show the contents at the normal size), G_CALLBACK 
(thunar_window_action_zoom_reset), },
   { go-menu, NULL, N_ (_Go), NULL, },
   { open-parent, GTK_STOCK_GO_UP, N_ (Open _Parent), altUp, N_ (Open 
the parent folder), G_CALLBACK (thunar_window_action_go_up), },
-  { open-home, THUNAR_STOCK_HOME, N_ (_Home), altHome, N_ (Go to the 
home folder), G_CALLBACK (thunar_window_action_open_home), },
+  { open-home, GTK_STOCK_HOME, N_ (_Home), altHome, N_ (Go to the 
home folder), G_CALLBACK (thunar_window_action_open_home), },
   { open-desktop, THUNAR_STOCK_DESKTOP, Desktop, NULL, N_ (Go to the 
desktop folder), G_CALLBACK (thunar_window_action_open_desktop), },
   { open-file-system, GTK_STOCK_HARDDISK, N_ (File System), NULL, N_ 
(Browse the file system), G_CALLBACK (thunar_window_action_open_file_system), 
},
   { open-network, GTK_STOCK_NETWORK, N_(B_rowse Network), NULL, N_ 
(Browse local network connections), G_CALLBACK 
(thunar_window_action_open_network), },
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Do not freeze on new files outsize this directory (bug #9468).

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to a8019e2b5a90bdc63ae4e2784baa9429e806a521 (commit)
   from 331aaee90d111555e4da5fa7f5be52cc5cfb3bd6 (commit)

commit a8019e2b5a90bdc63ae4e2784baa9429e806a521
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 21:28:48 2012 +0100

Do not freeze on new files outsize this directory (bug #9468).

The ThunarFile was never loaded because it was not created,
so check if the new files belong to this directory,
else do no try to reload later.

Was easy to reproduce to dnd into a folder.

 thunar/thunar-gio-extensions.h |1 -
 thunar/thunar-standard-view.c  |   14 --
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
index 4efbef0..d29b963 100644
--- a/thunar/thunar-gio-extensions.h
+++ b/thunar/thunar-gio-extensions.h
@@ -62,7 +62,6 @@ GType thunar_g_file_list_get_type   (void);
 
 GList*thunar_g_file_list_new_from_string(const gchar   
*string);
 gchar   **thunar_g_file_list_to_stringv (GList *list);
-gchar*thunar_g_file_list_to_string  (GList *list);
 
 /* deep copy jobs for GLists */
 #define   thunar_g_file_list_append(list,object)g_list_append (list, 
g_object_ref (G_OBJECT (object)))
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index acb3283..e2050eb 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -2802,6 +2802,8 @@ thunar_standard_view_new_files (ThunarStandardView 
*standard_view,
   GList *file_list = NULL;
   GList *lp;
   GtkWidget *source_view;
+  GFile *parent_file;
+  gboolean   belongs_here;
 
   _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
 
@@ -2820,12 +2822,18 @@ thunar_standard_view_new_files (ThunarStandardView 
*standard_view,
 }
   else if (G_LIKELY (path_list != NULL))
 {
+  /* to check if we should reload */
+  parent_file = thunar_file_get_file 
(standard_view-priv-current_directory);
+  belongs_here = FALSE;
+
   /* determine the files for the paths */
   for (lp = path_list; lp != NULL; lp = lp-next)
 {
   file = thunar_file_cache_lookup (lp-data);
   if (G_LIKELY (file != NULL))
 file_list = g_list_prepend (file_list, file);
+  else if (!belongs_here  g_file_has_parent (lp-data, parent_file))
+belongs_here = TRUE;
 }
 
   /* check if we have any new files here */
@@ -2840,9 +2848,11 @@ thunar_standard_view_new_files (ThunarStandardView 
*standard_view,
   /* grab the focus to the view widget */
   gtk_widget_grab_focus (GTK_BIN (standard_view)-child);
 }
-  else
+  else if (belongs_here)
 {
-  /* thunar files are not created yet, try again later */
+  /* thunar files are not created yet, try again later because we know
+   * some of them belong in this directory, so eventually they
+   * will get a ThunarFile */
   standard_view-priv-new_files_path_list = thunar_g_file_list_copy 
(path_list);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Fix typo in metadata code.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to 7e3fd7003c33ad55a0ef5ffe9a18041c6b55d10b (commit)
   from a8019e2b5a90bdc63ae4e2784baa9429e806a521 (commit)

commit 7e3fd7003c33ad55a0ef5ffe9a18041c6b55d10b
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 21:32:36 2012 +0100

Fix typo in metadata code.

 thunar/thunar-file.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index f82571b..7a40739 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -718,7 +718,7 @@ thunar_file_set_emblem_names_ready (GObject  
*source_object,
   g_warning (Failed to set metadata: %s, error-message);
   g_error_free (error);
 
-  g_file_info_remove_attribute (file-info, metadata:emblems);
+  g_file_info_remove_attribute (file-info, metadata::emblems);
 }
 
   thunar_file_changed (file);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Drop home icons and optimize check.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to c031e7b0887961e2cb718b58c3bc6e65b2a9abc3 (commit)
   from 7e3fd7003c33ad55a0ef5ffe9a18041c6b55d10b (commit)

commit c031e7b0887961e2cb718b58c3bc6e65b2a9abc3
Author: Nick Schermer n...@xfce.org
Date:   Thu Nov 8 23:37:04 2012 +0100

Drop home icons and optimize check.

Checking for home was too expensive. Also reorder the
checks to we do less checking for is_root.

 thunar/thunar-file.c |   11 +++
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 7a40739..1682475 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3317,15 +3317,10 @@ thunar_file_get_icon_name (const ThunarFile   *file,
   _thunar_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
 
   /* the system root folder has a special icon */
-  if (thunar_file_is_root (file) 
+  if (thunar_file_is_directory (file)
thunar_file_is_local (file)
-   thunar_file_is_directory (file))
-{
-  return g_strdup (drive-harddisk);
-}
-
-  if (thunar_file_is_home (file))
-return g_strdup (GTK_STOCK_HOME);
+   thunar_file_is_root (file))
+return g_strdup (drive-harddisk);
 
   if (file-info == NULL)
 return NULL;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master Some more optimizations in icon name loading.

2012-11-08 Thread Nick Schermer
Updating branch refs/heads/master
 to d73e6ef1dfce5efc1f42965ebe5d54bf9b74acbf (commit)
   from c031e7b0887961e2cb718b58c3bc6e65b2a9abc3 (commit)

commit d73e6ef1dfce5efc1f42965ebe5d54bf9b74acbf
Author: Nick Schermer n...@xfce.org
Date:   Fri Nov 9 00:00:20 2012 +0100

Some more optimizations in icon name loading.

Only peek the GIcon names and less string checking.

 thunar/thunar-file.c |   35 ---
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 1682475..50db469 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3307,11 +3307,11 @@ thunar_file_get_icon_name (const ThunarFile   *file,
ThunarFileIconState icon_state,
GtkIconTheme   *icon_theme)
 {
-  GFile  *icon_file;
-  GIcon  *icon;
-  gchar **themed_icon_names;
-  gchar  *icon_name = NULL;
-  ginti;
+  GFile   *icon_file;
+  GIcon   *icon;
+  const gchar * const *names;
+  gchar   *icon_name = NULL;
+  gint i;
 
   _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
   _thunar_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
@@ -3331,13 +3331,17 @@ thunar_file_get_icon_name (const ThunarFile   *file,
 {
   if (G_IS_THEMED_ICON (icon))
 {
-  g_object_get (icon, names, themed_icon_names, NULL);
-
-  for (i = 0; icon_name == NULL  themed_icon_names[i] != NULL; ++i)
-if (gtk_icon_theme_has_icon (icon_theme, themed_icon_names[i]))
-  icon_name = g_strdup (themed_icon_names[i]);
-
-  g_strfreev (themed_icon_names);
+  names = g_themed_icon_get_names (G_THEMED_ICON (icon));
+  if (G_LIKELY (names != NULL))
+{
+  for (i = 0; names[i] != NULL; ++i)
+if (names[i] != NULL
+ gtk_icon_theme_has_icon (icon_theme, names[i]))
+  {
+icon_name = g_strdup (names[i]);
+break;
+  }
+}
 }
   else if (G_IS_FILE_ICON (icon))
 {
@@ -3366,9 +3370,10 @@ thunar_file_get_icon_name (const ThunarFile   *file,
 }
 
   /* check if we have an accept icon for the icon we found */
-  if (icon_name != NULL 
-   (g_str_equal (icon_name, inode-directory) 
-  || g_str_equal (icon_name, folder)))
+  if (icon_name != NULL
+   icon_state != THUNAR_FILE_ICON_STATE_DEFAULT
+   (strcmp (icon_name, inode-directory) == 0
+  || strcmp (icon_name, folder) == 0))
 {
   if (icon_state == THUNAR_FILE_ICON_STATE_DROP)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits


[Xfce4-commits] thunar:master l10n: Updated Croatian (hr) translation to 87%

2012-11-08 Thread Transifex
Updating branch refs/heads/master
 to 3aeb2bd4e9d6740ad3ceee8c3a9bb064494424f0 (commit)
   from d73e6ef1dfce5efc1f42965ebe5d54bf9b74acbf (commit)

commit 3aeb2bd4e9d6740ad3ceee8c3a9bb064494424f0
Author: Ivica  Kolić ik...@yahoo.com
Date:   Fri Nov 9 00:22:42 2012 +0100

l10n: Updated Croatian (hr) translation to 87%

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

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

 po/hr.po |  406 +++---
 1 files changed, 205 insertions(+), 201 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index a27ca1b..e12d03e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: Thunar\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-06 21:24+\n
+POT-Creation-Date: 2012-11-08 21:33+\n
 PO-Revision-Date: 2010-06-17 01:51+0200\n
 Last-Translator: Ivica Kolićik...@yahoo.com \n
 Language-Team: Croatian petar.kore...@gmail.com\n
@@ -137,8 +137,8 @@ msgstr Neuspješno izvršavanje radnje
 #: ../thunar/thunar-application.c:1113 ../thunar/thunar-application.c:1239
 #: ../thunar/thunar-launcher.c:1097 ../thunar/thunar-location-entry.c:402
 #: ../thunar/thunar-location-entry.c:430
-#: ../thunar/thunar-shortcuts-view.c:1616
-#: ../thunar/thunar-shortcuts-view.c:1644 ../thunar/thunar-window.c:2088
+#: ../thunar/thunar-shortcuts-view.c:1614
+#: ../thunar/thunar-shortcuts-view.c:1642 ../thunar/thunar-window.c:2169
 #, c-format
 msgid Failed to open \%s\
 msgstr Neuspješno otvaranje \%s\
@@ -252,8 +252,8 @@ msgstr Uklonite sve datoteke i mape iz smeća?
 #. append the Empty Trash menu action
 #. prepare the menu item
 #: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-shortcuts-view.c:1176 ../thunar/thunar-tree-view.c:1176
-#: ../thunar/thunar-window.c:340 ../plugins/thunar-tpa/thunar-tpa.c:189
+#: ../thunar/thunar-shortcuts-view.c:1174 ../thunar/thunar-tree-view.c:1176
+#: ../thunar/thunar-window.c:339 ../plugins/thunar-tpa/thunar-tpa.c:189
 msgid _Empty Trash
 msgstr _Isprazni smeće
 
@@ -284,7 +284,7 @@ msgstr Nije moguće vratiti \%s\
 msgid Restoring files...
 msgstr Vraćanje datoteka...
 
-#: ../thunar/thunar-chooser-button.c:309 ../thunar/thunar-chooser-dialog.c:467
+#: ../thunar/thunar-chooser-button.c:309 ../thunar/thunar-chooser-dialog.c:465
 #, c-format
 msgid Failed to set default application for \%s\
 msgstr Ne mogu postaviti zadani program za  \%s\
@@ -309,11 +309,11 @@ msgid Open With
 msgstr Otvori pomoću
 
 #. create the Custom command expand
-#: ../thunar/thunar-chooser-dialog.c:259
+#: ../thunar/thunar-chooser-dialog.c:257
 msgid Use a _custom command:
 msgstr Koristi _prolagođenu naredbu
 
-#: ../thunar/thunar-chooser-dialog.c:260
+#: ../thunar/thunar-chooser-dialog.c:258
 msgid 
 Use a custom command for an application that is not available from the above 
 application list.
@@ -322,38 +322,38 @@ msgstr 
 aplikacija
 
 #. create the Custom command button
-#: ../thunar/thunar-chooser-dialog.c:279
+#: ../thunar/thunar-chooser-dialog.c:277
 msgid _Browse...
 msgstr _Pregledaj
 
 #. create the Use as default for this kind of file button
-#: ../thunar/thunar-chooser-dialog.c:285
+#: ../thunar/thunar-chooser-dialog.c:283
 msgid Use as _default for this kind of file
 msgstr Koristi kao _zadano za ovu vrstu datoteka
 
 #. display an error to the user
-#: ../thunar/thunar-chooser-dialog.c:440
+#: ../thunar/thunar-chooser-dialog.c:438
 #, c-format
 msgid Failed to add new application \%s\
 msgstr Nisam uspio dodati novi program \%s\
 
-#: ../thunar/thunar-chooser-dialog.c:495
+#: ../thunar/thunar-chooser-dialog.c:493
 #, c-format
 msgid Failed to execute application \%s\
 msgstr Nisam uspio izvršiti program \%s\
 
 #. append the Remove Launcher item
-#: ../thunar/thunar-chooser-dialog.c:567
+#: ../thunar/thunar-chooser-dialog.c:565
 msgid _Remove Launcher
 msgstr _Ukloni pokretač
 
 #. update the header label
-#: ../thunar/thunar-chooser-dialog.c:650
+#: ../thunar/thunar-chooser-dialog.c:648
 #, c-format
 msgid Open i%s/i and other files of type \%s\ with:
 msgstr Otvori i%s/i i ostale tipove \%s\ sa:
 
-#: ../thunar/thunar-chooser-dialog.c:658
+#: ../thunar/thunar-chooser-dialog.c:656
 #, c-format
 msgid 
 Browse the file system to select an application to open files of type \%s\.
@@ -361,7 +361,7 @@ msgstr 
 Pretraži datotečni sustav i odaberi aplikaciju za otvaranje datoteka tipa 
 \%s\.
 
-#: ../thunar/thunar-chooser-dialog.c:664
+#: ../thunar/thunar-chooser-dialog.c:662
 #, c-format
 msgid 
 Change the default application for files of type \%s\ to the selected 
@@ -370,12 +370,12 @@ msgstr 
 Promjeni automatski zadanu aplikaciju za datoteke tipa  \%s\ na odabranu 
 aplikaciju.
 
-#: ../thunar/thunar-chooser-dialog.c:710
+#: ../thunar/thunar-chooser-dialog.c:708
 #, c-format
 msgid Are you sure that you want to remove \%s\?
 msgstr Jeste li sigurni da želite ukloniti \%s\?
 
-#: