[Xfce4-commits] xfce4-indicator-plugin:master l10n: Updated Turkish (tr) translation to 100%
Updating branch refs/heads/master to 9bdb3cfe0f5038b8c2db1854ec7e4c9da931a9cd (commit) from d6aa05bf812d0d73aa593a3e958e4f3f6b1681f1 (commit) commit 9bdb3cfe0f5038b8c2db1854ec7e4c9da931a9cd Author: Utku Berberoğlu utku.ber...@gmail.com Date: Sun Feb 19 12:14:35 2012 +0100 l10n: Updated Turkish (tr) translation to 100% New status: 3 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/tr.po |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index b0a37b4..2aa153d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-15 16:21+\n +POT-Creation-Date: 2012-02-19 09:30+\n PO-Revision-Date: 2011-09-16 00:25+0300\n Last-Translator: Alper Tekinalp alper.tekin...@gmail.com\n Language-Team: Turkish\n @@ -24,7 +24,7 @@ msgstr Gösterge Yok #: ../panel-plugin/indicator.desktop.in.in.h:1 msgid An indicator of something that needs your attention on the desktop -msgstr +msgstr Masaüstünde ilgilenmenizi gerektiren şeyleri gösteren bir göstergedir. #: ../panel-plugin/indicator.desktop.in.in.h:2 msgid Indicator Plugin ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Arabic (ar) translation to 75%
Updating branch refs/heads/master to cb1fe30f6876e4d473af3ecda46aeeb56af8c676 (commit) from 621c03ad62bab573dfa24f1ece44f235f74aed66 (commit) commit cb1fe30f6876e4d473af3ecda46aeeb56af8c676 Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Sun Feb 19 13:35:25 2012 +0100 l10n: Updated Arabic (ar) translation to 75% New status: 515 messages complete with 0 fuzzies and 165 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 1b1d8f2..238ee3c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11,7 +11,7 @@ msgstr Project-Id-Version: thunar\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-02-19 08:03+\n -PO-Revision-Date: 2012-02-19 11:56-\n +PO-Revision-Date: 2012-02-19 12:34-\n Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n Language: ar\n @@ -1169,7 +1169,7 @@ msgstr[3] msgid %d item msgid_plural %d items msgstr[0] عنصر %d -msgstr[1] عنuseصر %d +msgstr[1] عناصر %d msgstr[2] عناصر %d msgstr[3] عناصر %d @@ -1196,7 +1196,7 @@ msgstr #: ../thunar/thunar-list-model.c:2364 #, c-format msgid \%s\ (%s) %s -msgstr +msgstr \%s\ (%s) %s #. TRANSLATORS: Try to come up with a short translation of Original Path (which is the path #. * where the trashed file/folder was located before it was moved to the trash), otherwise the ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Arabic (ar) translation to 79%
Updating branch refs/heads/master to 8c2c02bf59a4d4d0eaae8df218acedd75e0568d2 (commit) from cb1fe30f6876e4d473af3ecda46aeeb56af8c676 (commit) commit 8c2c02bf59a4d4d0eaae8df218acedd75e0568d2 Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Sun Feb 19 14:00:23 2012 +0100 l10n: Updated Arabic (ar) translation to 79% New status: 540 messages complete with 0 fuzzies and 140 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 77 ++--- 1 files changed, 43 insertions(+), 34 deletions(-) diff --git a/po/ar.po b/po/ar.po index 238ee3c..409ef60 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,20 +6,22 @@ # Arabic translation for thunar # Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006 # This file is distributed under the same license as the thunar package. +# كريم أولاد الشلحة herr.linu...@gmail.com, 2012. msgid msgstr Project-Id-Version: thunar\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-02-19 08:03+\n -PO-Revision-Date: 2012-02-19 12:34-\n +PO-Revision-Date: 2012-02-19 12:59+\n Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n -Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n +Language-Team: Arabic Xfce Translation Team\n Language: ar\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n=3 n=10 ? 2 : 3\n -X-Generator: KBabel 1.11.4\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.0\n X-Poedit-Language: Arabic\n X-Poedit-Country: Morocco\n @@ -1038,6 +1040,8 @@ msgstr[0] إفتح في %d نافذة جديدة msgstr[1] إفتح في %d نافذة جديدة msgstr[2] إفتح في %d نوافذ جديدة msgstr[3] إفتح في \d%\ نوافذ جديدة +msgstr[4] +msgstr[5] #: ../thunar/thunar-launcher.c:780 #, c-format @@ -1530,18 +1534,18 @@ msgstr التاريخ #: ../thunar/thunar-preferences-dialog.c:299 #: ../plugins/thunar-sbr/thunar-sbr-date-renamer.c:216 msgid _Format: -msgstr +msgstr ال_صيغة: #. #. Side Pane #. #: ../thunar/thunar-preferences-dialog.c:320 msgid Side Pane -msgstr +msgstr الشريط الجانبي #: ../thunar/thunar-preferences-dialog.c:330 msgid Shortcuts Pane -msgstr +msgstr شريط الإختصارات #: ../thunar/thunar-preferences-dialog.c:342 msgid _Icon Size: @@ -1584,7 +1588,7 @@ msgstr كبير جدا #: ../thunar/thunar-preferences-dialog.c:361 msgid Show Icon _Emblems -msgstr +msgstr عرض أيقونة ال_شعارات #: ../thunar/thunar-preferences-dialog.c:363 msgid Select this option to display icon emblems in the shortcuts pane for all folders for which emblems have been defined in the folders properties dialog. @@ -1592,7 +1596,7 @@ msgstr #: ../thunar/thunar-preferences-dialog.c:372 msgid Tree Pane -msgstr +msgstr شجرة الشريط #: ../thunar/thunar-preferences-dialog.c:384 msgid Icon _Size: @@ -1600,7 +1604,7 @@ msgstr حج_م الأيقونة: #: ../thunar/thunar-preferences-dialog.c:403 msgid Show Icon E_mblems -msgstr +msgstr عرض أيقونة ال_شعارات #: ../thunar/thunar-preferences-dialog.c:405 msgid Select this option to display icon emblems in the tree pane for all folders for which emblems have been defined in the folders properties dialog. @@ -1615,7 +1619,7 @@ msgstr السلوك #: ../thunar/thunar-preferences-dialog.c:424 msgid Navigation -msgstr +msgstr تصفح #: ../thunar/thunar-preferences-dialog.c:436 msgid _Single click to activate items @@ -1625,7 +1629,8 @@ msgstr _نقرة واحدة لتفعيل العناصر msgid Specify the d_elay before an item gets selected\n when the mouse pointer is paused over it: -msgstr إختر المدة الزم_نية التي بعدها يتم تفعيل العنصر الذي توجد فوقه مؤشر الفأرة: +msgstr +إختر المدة الزم_نية التي بعدها يتم تفعيل العنصر الذي توجد فوقه مؤشر الفأرة: #: ../thunar/thunar-preferences-dialog.c:468 msgid When single-click activation is enabled, pausing the mouse pointer over an item will automatically select that item after the chosen delay. You can disable this behavior by moving the slider to the left-most position. This behavior may be useful when single clicks activate items, and you want only to select the item without activating it. @@ -1656,7 +1661,7 @@ msgstr متقدم #: ../thunar/thunar-preferences-dialog.c:524 msgid Folder Permissions -msgstr +msgstr صلاحيات المجلد #: ../thunar/thunar-preferences-dialog.c:536 msgid @@ -1671,11 +1676,11 @@ msgstr إسأل كل مرة #: ../thunar/thunar-preferences-dialog.c:545 msgid Apply to Folder Only -msgstr +msgstr تطبيق على المجلد فقط #: ../thunar/thunar-preferences-dialog.c:546 msgid Apply to Folder and Contents -msgstr +msgstr تطبيق على المجلد و المحتويات #: ../thunar/thunar-preferences-dialog.c:556 msgid Volume Management @@ -1684,7 +1689,7 @@ msgstr مدير الأقراص #. add check button to enable/disable auto mounting #:
[Xfce4-commits] thunar:master l10n: Updated Arabic (ar) translation to 82%
Updating branch refs/heads/master to 16e2a31641e684d28ad1df12a572c3193cf102cc (commit) from 8c2c02bf59a4d4d0eaae8df218acedd75e0568d2 (commit) commit 16e2a31641e684d28ad1df12a572c3193cf102cc Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Sun Feb 19 14:23:48 2012 +0100 l10n: Updated Arabic (ar) translation to 82% New status: 564 messages complete with 0 fuzzies and 116 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 304 ++ 1 files changed, 126 insertions(+), 178 deletions(-) diff --git a/po/ar.po b/po/ar.po index 409ef60..b482401 100644 --- a/po/ar.po +++ b/po/ar.po @@ -15,15 +15,14 @@ msgstr PO-Revision-Date: 2012-02-19 12:59+\n Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n Language-Team: Arabic Xfce Translation Team\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=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-Poedit-Country: Morocco\n +Language: ar\n X-Generator: Virtaal 0.7.0\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-Poedit-Language: Arabic\n -X-Poedit-Country: Morocco\n #: ../thunar/main.c:62 msgid Open the bulk rename dialog @@ -141,13 +140,10 @@ msgid Failed to launch operation msgstr فشل في تنفيذ العملية #. tell the user that we were unable to launch the file specified -#: ../thunar/thunar-application.c:1048 -#: ../thunar/thunar-application.c:1174 -#: ../thunar/thunar-launcher.c:1046 -#: ../thunar/thunar-location-entry.c:394 +#: ../thunar/thunar-application.c:1048 ../thunar/thunar-application.c:1174 +#: ../thunar/thunar-launcher.c:1046 ../thunar/thunar-location-entry.c:394 #: ../thunar/thunar-location-entry.c:422 -#: ../thunar/thunar-shortcuts-view.c:1277 -#: ../thunar/thunar-window.c:1509 +#: ../thunar/thunar-shortcuts-view.c:1277 ../thunar/thunar-window.c:1509 #, c-format msgid Failed to open \%s\ msgstr فشل في فتح \%s\ @@ -160,23 +156,20 @@ msgstr فشل في فتح \%s\: %s #. display an error message #: ../thunar/thunar-application.c:1242 #: ../thunar/thunar-properties-dialog.c:646 -#: ../thunar/thunar-standard-view.c:2265 -#: ../thunar/thunar-tree-view.c:1672 +#: ../thunar/thunar-standard-view.c:2265 ../thunar/thunar-tree-view.c:1672 #, c-format msgid Failed to rename \%s\ msgstr فشل في تغيير إسم \%s\ #: ../thunar/thunar-application.c:1344 #: ../thunar/thunar-location-buttons.c:1285 -#: ../thunar/thunar-standard-view.c:1886 -#: ../thunar/thunar-tree-view.c:1569 +#: ../thunar/thunar-standard-view.c:1886 ../thunar/thunar-tree-view.c:1569 msgid New Folder msgstr مجلد جديد #: ../thunar/thunar-application.c:1345 #: ../thunar/thunar-location-buttons.c:1286 -#: ../thunar/thunar-standard-view.c:1887 -#: ../thunar/thunar-tree-view.c:1570 +#: ../thunar/thunar-standard-view.c:1887 ../thunar/thunar-tree-view.c:1570 msgid Create New Folder msgstr أنشئ مجلد جديد @@ -189,8 +182,7 @@ msgid Create New File msgstr أنشئ ملف جديد #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1408 -#: ../thunar/thunar-standard-view.c:1932 +#: ../thunar/thunar-application.c:1408 ../thunar/thunar-standard-view.c:1932 #, c-format msgid Create Document from template \%s\ msgstr أنشئ مستند من النموذج \%s\ @@ -232,9 +224,17 @@ msgid_plural Are you sure that you want to permanently\n delete the %u selected files? msgstr[0] +هل انت متاكد من أنك تريد حذف\n +الملف المحددة نهائيا؟ msgstr[1] +هل انت متاكد من أنك تريد حذف\n +الملفات المحددة نهائيا؟ msgstr[2] +هل انت متاكد من أنك تريد حذف\n +الملفات المحددة نهائيا؟ msgstr[3] +هل انت متاكد من أنك تريد حذف\n +الملفات المحددة نهائيا؟ #: ../thunar/thunar-application.c:1726 msgid If you delete a file, it is permanently lost. @@ -262,12 +262,9 @@ msgstr حذف كل الملفات والمجلدات في المهملات؟ #. append the Empty Trash menu action #. prepare the menu item -#: ../thunar/thunar-application.c:1894 -#: ../thunar/thunar-location-buttons.c:171 -#: ../thunar/thunar-shortcuts-view.c:875 -#: ../thunar/thunar-tree-view.c:1145 -#: ../thunar/thunar-window.c:297 -#: ../plugins/thunar-tpa/thunar-tpa.c:177 +#: ../thunar/thunar-application.c:1894 ../thunar/thunar-location-buttons.c:171 +#: ../thunar/thunar-shortcuts-view.c:875 ../thunar/thunar-tree-view.c:1145 +#: ../thunar/thunar-window.c:297 ../plugins/thunar-tpa/thunar-tpa.c:177 msgid _Empty Trash msgstr أفرغ س_لة المهملات @@ -294,8 +291,7 @@ msgstr لا يمكن الإستعادة \%s\ msgid Restoring files... msgstr إستعادة الملفات... -#: ../thunar/thunar-chooser-button.c:309 -#: ../thunar/thunar-chooser-dialog.c:464 +#: ../thunar/thunar-chooser-button.c:309 ../thunar/thunar-chooser-dialog.c:464 #, c-format msgid Failed to set default application for \%s\ msgstr فشل تحديد التطبيق الإفتراضي لـ \%s\ @@ -313,8 +309,7
[Xfce4-commits] xfce4-screenshooter:master Add a clipboard CLI option (bug #8483).
Updating branch refs/heads/master
to 0f1e8cc275d97a6a63955ebb10362ad73f6dd95a (commit)
from 3ed26722a54d45cf66649b68b06dc33a13af (commit)
commit 0f1e8cc275d97a6a63955ebb10362ad73f6dd95a
Author: Tom Hope tjlh...@gmail.com
Date: Sun Feb 19 14:41:28 2012 +0100
Add a clipboard CLI option (bug #8483).
src/main.c | 35 +++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main.c b/src/main.c
index 1ae982e..a0759fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,7 @@ gboolean region = FALSE;
gboolean fullscreen = FALSE;
gboolean mouse = FALSE;
gboolean upload = FALSE;
+gboolean clipboard = FALSE;
gchar *screenshot_dir;
gchar *application;
gint delay = 0;
@@ -44,6 +45,11 @@ gint delay = 0;
static GOptionEntry entries[] =
{
{
+clipboard, 'c', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, clipboard,
+N_(Copy the screenshot to the clipboard),
+NULL
+ },
+ {
delay, 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, delay,
N_(Delay in seconds before taking the screenshot),
NULL
@@ -196,6 +202,13 @@ int main (int argc, char **argv)
g_free (sd);
return EXIT_FAILURE;
}
+ else if (upload clipboard)
+{
+ g_printerr (conflict_error, upload, clipboard);
+
+ g_free (sd);
+ return EXIT_FAILURE;
+}
else if ((application != NULL) (screenshot_dir != NULL))
{
g_printerr (conflict_error, open, save);
@@ -203,6 +216,20 @@ int main (int argc, char **argv)
g_free (sd);
return EXIT_FAILURE;
}
+ else if ((application != NULL) clipboard)
+{
+ g_printerr (conflict_error, open, clipboard);
+
+ g_free (sd);
+ return EXIT_FAILURE;
+}
+ else if ((screenshot_dir != NULL) clipboard)
+{
+ g_printerr (conflict_error, save, clipboard);
+
+ g_free (sd);
+ return EXIT_FAILURE;
+}
/* Warn that action options, mouse and delay will be ignored in
* non-cli mode */
@@ -212,6 +239,8 @@ int main (int argc, char **argv)
g_printerr (ignore_error, save);
if (upload !(fullscreen || window || region))
g_printerr (ignore_error, upload);
+ if (clipboard !(fullscreen || window || region))
+g_printerr (ignore_error, clipboard);
if (delay !(fullscreen || window || region))
g_printerr (ignore_error, delay);
if (mouse !(fullscreen || window || region))
@@ -276,6 +305,12 @@ int main (int argc, char **argv)
sd-action = UPLOAD;
sd-action_specified = TRUE;
}
+ else if (clipboard)
+{
+ sd-app = g_strdup (none);
+ sd-action = CLIPBOARD;
+ sd-action_specified = TRUE;
+}
else
{
sd-app = g_strdup (none);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-screenshooter:master Update NEWS.
Updating branch refs/heads/master to 5082d16fb0fd6386ba49fe75e6369dc6e21e25ed (commit) from 0f1e8cc275d97a6a63955ebb10362ad73f6dd95a (commit) commit 5082d16fb0fd6386ba49fe75e6369dc6e21e25ed Author: Jérôme Guelfucci jero...@xfce.org Date: Sun Feb 19 14:43:04 2012 +0100 Update NEWS. NEWS |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 95104b6..35ba056 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ * Enhancements: - Adapting the panel plugin to xfce4-panel 4.9+. Andrzej. +- Add a clipboard CLI option (bug #8483). Tom Hope. * Bugs fixed: - Fix crash with some window managers (bug #8080). Bruno Ramos. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-screenshooter:master Update the man page.
Updating branch refs/heads/master to 5dbf237351c790d248739138a30915610068fd28 (commit) from 5082d16fb0fd6386ba49fe75e6369dc6e21e25ed (commit) commit 5dbf237351c790d248739138a30915610068fd28 Author: Jérôme Guelfucci jero...@xfce.org Date: Sun Feb 19 14:56:18 2012 +0100 Update the man page. Add the new clipboard CLI option, fix some incorrect descriptions and group the options in a logical order. xfce4-screenshooter.1 | 43 +++ 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/xfce4-screenshooter.1 b/xfce4-screenshooter.1 index a54427d..2b85c8f 100644 --- a/xfce4-screenshooter.1 +++ b/xfce4-screenshooter.1 @@ -1,5 +1,5 @@ -.\ DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH XFCE4-SCREENSHOOTER 1 June 2008 xfce4-screenshooter 1.6.0 User Commands +.\ DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.5. +.TH XFCE4-SCREENSHOOTER 1 February 2012 xfce4-screenshooter 1.8.1 User Commands .SH NAME xfce4-screenshooter \- application to take screenshots .SH DESCRIPTION @@ -8,7 +8,7 @@ xfce4-screenshooter \- application to take screenshots xfce4\-screenshooter [OPTION...] .SS Help Options: .TP -\-?, \fB\-\-help\fR +\fB\-h\fR, \fB\-\-help\fR Show help options .TP \fB\-\-help\-all\fR @@ -18,34 +18,37 @@ Show all help options Show GTK+ Options .SS Application Options: .TP -\fB\-V\fR, \fB\-\-version\fR -Version information +\fB\-s\fR, \fB\-\-save\fR +Directory where the screenshot will be saved .TP -\fB\-w\fR, \fB\-\-window\fR -Take a screenshot of the active window +\fB\-u\fR, \fB\-\-upload\fR +Host the screenshot on ZimageZ, a free online image hosting service .TP -\fB\-f\fR, \fB\-\-fullscreen\fR -Take a screenshot of the entire screen +\fB\-c\fR, \fB\-\-clipboard\fR +Copy the screenshot to the clipboard .TP -\fB\-r\fR, \fB\-\-region\fR -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. +\fB\-o\fR, \fB\-\-open\fR +Application to open the screenshot .TP \fB\-d\fR, \fB\-\-delay\fR Delay in seconds before taking the screenshot .TP \fB\-m\fR, \fB\-\-mouse\fR -Do not display the mouse on the screenshot +Display the mouse on the screenshot .TP -\fB\-s\fR, \fB\-\-save\fR -Directory where the screenshot will be saved +\fB\-f\fR, \fB\-\-fullscreen\fR +Take a screenshot of the entire screen .TP -\fB\-o\fR, \fB\-\-open\fR -Application to open the screenshot +\fB\-r\fR, \fB\-\-region\fR +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. .TP -\fB\-u\fR, \fB\-\-upload\fR -Host the screenshot on ZimageZ, a free online image hosting service +\fB\-w\fR, \fB\-\-window\fR +Take a screenshot of the active window +.TP +\fB\-V\fR, \fB\-\-version\fR +Version information .TP \fB\-\-display\fR=\fIDISPLAY\fR X display to use ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Arabic (ar) translation to 85%
Updating branch refs/heads/master to 537f32f24498a9de9a72dffd1c8a6a8b4e237a30 (commit) from 16e2a31641e684d28ad1df12a572c3193cf102cc (commit) commit 537f32f24498a9de9a72dffd1c8a6a8b4e237a30 Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Sun Feb 19 15:04:11 2012 +0100 l10n: Updated Arabic (ar) translation to 85% New status: 579 messages complete with 0 fuzzies and 101 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 54 -- 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/po/ar.po b/po/ar.po index b482401..6c636fb 100644 --- a/po/ar.po +++ b/po/ar.po @@ -320,7 +320,7 @@ msgstr إستعمل امر مخ_صص: #: ../thunar/thunar-chooser-dialog.c:257 msgid Use a custom command for an application that is not available from the above application list. -msgstr إستعمل أمر مخصص لتطبيق غير متوفر في قائمة التطبيقات أعلاه. +msgstr إستعمل أمر مخصص لتطبيق غير متوفر في لائحة التطبيقات أعلاه. #. create the Custom command button #: ../thunar/thunar-chooser-dialog.c:276 @@ -442,7 +442,7 @@ msgstr ﻻ يوجد شئ في الحافظة إلصاقه #: ../thunar/thunar-column-editor.c:122 msgid Configure Columns in the Detailed List View -msgstr إعداد اأعمدة في قائمة العرض المفصلة +msgstr إعداد أعمدة في لائحة العرض المفصلة #: ../thunar/thunar-column-editor.c:140 msgid Visible Columns @@ -455,7 +455,7 @@ msgid detailed list view. msgstr حدد ترتيب المعلومات التي سيتم\n -إظهارها في قائمة العرض المفصلة. +إظهارها في لائحة العرض المفصلة. #. create the Move Up button #: ../thunar/thunar-column-editor.c:194 @@ -578,7 +578,7 @@ msgstr إعداد الأعمد_ة... #: ../thunar/thunar-details-view.c:129 msgid Configure the columns in the detailed list view -msgstr إعداد أعمدة في قائمة العرض المفصلة +msgstr إعداد أعمدة في لائحة العرض المفصلة #: ../thunar/thunar-details-view.c:386 msgid Detailed directory listing @@ -1011,11 +1011,9 @@ msgstr[3] فتح %d نوافذ جديدة msgid Open in %d New Window msgid_plural Open in %d New Windows msgstr[0] إفتح في %d نافذة جديدة -msgstr[1] إفتح في %d نافذة جديدة +msgstr[1] إفتح في %d نوافذ جديدة msgstr[2] إفتح في %d نوافذ جديدة -msgstr[3] إفتح في \d%\ نوافذ جديدة -msgstr[4] -msgstr[5] +msgstr[3] إفتح في %d نوافذ جديدة #: ../thunar/thunar-launcher.c:780 #, c-format @@ -1458,11 +1456,11 @@ msgstr أظهر الايقونة #: ../thunar/thunar-preferences-dialog.c:237 msgid Detailed List View -msgstr عرض قائمة مفصلة +msgstr عرض لائحة مفصلة #: ../thunar/thunar-preferences-dialog.c:238 msgid Compact List View -msgstr عرض قائمة مدمجة +msgstr عرض لائحة مدمجة #: ../thunar/thunar-preferences-dialog.c:239 msgid Last Active View @@ -1680,8 +1678,6 @@ msgstr[0] عملية ملف %d قيد التشغيل msgstr[1] %d عمليات ملف قيد التشغيل msgstr[2] %d عمليات ملف قيد التشغيل msgstr[3] %d عمليات ملف قيد التشغيل -msgstr[4] %d عمليات ملف قيد التشغيل -msgstr[5] %d عمليات ملف قيد التشغيل #: ../thunar/thunar-progress-view.c:327 msgid Cancelling... @@ -2020,8 +2016,6 @@ msgstr[0] msgstr[1] msgstr[2] msgstr[3] -msgstr[4] -msgstr[5] #: ../thunar/thunar-standard-view.c:358 msgid Folder Context Menu @@ -2474,19 +2468,19 @@ msgstr أظهر الملفات المخبأة في هذه النافذة #: ../thunar/thunar-window.c:330 msgid _Pathbar Style -msgstr +msgstr نم_ط شريط المسار #: ../thunar/thunar-window.c:330 msgid Modern approach with buttons that correspond to folders -msgstr +msgstr نهج حديث بأزرار توافق المجلدات #: ../thunar/thunar-window.c:331 msgid _Toolbar Style -msgstr +msgstr شريط ال_أدوات #: ../thunar/thunar-window.c:331 msgid Traditional approach with location bar and navigation buttons -msgstr +msgstr نهج تقليدي بشريط موقع و أزرار التصفح #: ../thunar/thunar-window.c:332 msgid _Shortcuts @@ -2494,7 +2488,7 @@ msgstr _إختصارات #: ../thunar/thunar-window.c:332 msgid Toggles the visibility of the shortcuts pane -msgstr +msgstr تبديل رؤية شريط الإختصارات #: ../thunar/thunar-window.c:333 msgid _Tree @@ -2502,15 +2496,15 @@ msgstr _شجرة #: ../thunar/thunar-window.c:333 msgid Toggles the visibility of the tree pane -msgstr +msgstr تبديل رؤية شجرة الشريط #: ../thunar/thunar-window.c:334 msgid St_atusbar -msgstr +msgstr شريط الح_الة #: ../thunar/thunar-window.c:334 msgid Change the visibility of this window's statusbar -msgstr +msgstr تغيير رؤية شريط حالة النوافذ #. * add view options #. @@ -2520,7 +2514,7 @@ msgstr أظهر على شكل أيقونات #: ../thunar/thunar-window.c:735 msgid Display folder content in an icon view -msgstr +msgstr عرض محتويات المجلد في أيقونة عرض #: ../thunar/thunar-window.c:742 msgid View as _Detailed List @@ -2528,29 +2522,29 @@ msgstr أظهر في لائحة مفصلة #: ../thunar/thunar-window.c:742 msgid Display folder content in a detailed list view -msgstr +msgstr عرض محتويات المجلد في لائحة عرض مفصلة #: ../thunar/thunar-window.c:749 msgid View as _Compact List -msgstr +msgstr أظهر في لائحة مدمجة #: ../thunar/thunar-window.c:749
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Release 2.99.1!
Updating branch refs/heads/peter/gtk3 to 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 (commit) from c51477618af859df685ff356aaa7cea858a00308 (commit) commit 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 Author: Peter de Ridder pe...@xfce.org Date: Fri Feb 10 22:49:37 2012 +0100 Release 2.99.1! NEWS|6 ++ configure.in.in |4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d09486d..ae30134 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +2.99.1 +== +- Changed rendering of GtkSpinButton. +- Pixel align checkboxes in the Gtk+-3.0 engine. +- Link against libm (bug #6253). + 2.99.0 == - Added Gtk+-3.0 theming engine. diff --git a/configure.in.in b/configure.in.in index b6d2125..1041601 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,10 +7,10 @@ dnl *** Version information *** dnl *** m4_define([gtk_xfce_engine_version_major], [2]) m4_define([gtk_xfce_engine_version_minor], [99]) -m4_define([gtk_xfce_engine_version_micro], [0]) +m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], [git]) +m4_define([gtk_xfce_engine_version_tag], []) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Post release tag bump.
Updating branch refs/heads/peter/gtk3 to 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit) from 853ae5f266bb3c6ff7c6164d66d3853d238d62b5 (commit) commit 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d Author: Peter de Ridder pe...@xfce.org Date: Fri Feb 10 23:04:49 2012 +0100 Post release tag bump. configure.in.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in.in b/configure.in.in index 1041601..7e87fef 100644 --- a/configure.in.in +++ b/configure.in.in @@ -10,7 +10,7 @@ m4_define([gtk_xfce_engine_version_minor], [99]) m4_define([gtk_xfce_engine_version_micro], [1]) m4_define([gtk_xfce_engine_version_nano], []) dnl leave this empty to have no nano version m4_define([gtk_xfce_engine_version_build], [@REVISION@]) -m4_define([gtk_xfce_engine_version_tag], []) +m4_define([gtk_xfce_engine_version_tag], [git]) m4_define([gtk_xfce_engine_version], [gtk_xfce_engine_version_major().gtk_xfce_engine_version_minor().gtk_xfce_engine_version_micro()ifelse(gtk_xfce_engine_version_nano(), [], [], [.gtk_xfce_engine_version_nano()])ifelse(gtk_xfce_engine_version_tag(), [git], [gtk_xfce_engine_version_tag()-gtk_xfce_engine_version_build()], [gtk_xfce_engine_version_tag()])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Don't use menubar style border for menubar items
Updating branch refs/heads/peter/gtk3
to 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit)
from 3aeb697454a1ca3a1a8e34bf9d6b5168e672b36d (commit)
commit 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2
Author: Peter de Ridder pe...@xfce.org
Date: Sun Feb 19 13:50:28 2012 +0100
Don't use menubar style border for menubar items
gtk-3.0/xfce_engine.c |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gtk-3.0/xfce_engine.c b/gtk-3.0/xfce_engine.c
index 123977a..ce25dca 100644
--- a/gtk-3.0/xfce_engine.c
+++ b/gtk-3.0/xfce_engine.c
@@ -681,7 +681,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t
* cr, gdouble x, gdo
cairo_stroke(cr);
}
}
-else if (gtk_theming_engine_has_class(engine,
GTK_STYLE_CLASS_MENUBAR))
+else if (gtk_theming_engine_has_class(engine,
GTK_STYLE_CLASS_MENUBAR)
+ !gtk_theming_engine_has_class(engine,
GTK_STYLE_CLASS_MENUITEM))
{
if ((xt 1) (yt 1))
{
@@ -884,7 +885,8 @@ static void render_frame(GtkThemingEngine * engine, cairo_t
* cr, gdouble x, gdo
{
/* Do nothing */
}
-else if (gtk_theming_engine_has_class(engine,
GTK_STYLE_CLASS_MENUBAR))
+else if (gtk_theming_engine_has_class(engine,
GTK_STYLE_CLASS_MENUBAR)
+ !gtk_theming_engine_has_class(engine,
GTK_STYLE_CLASS_MENUITEM))
{
if ((xt 1) (yt 1))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] gtk-xfce-engine:peter/gtk3 Improved menu theming
Updating branch refs/heads/peter/gtk3
to 3986032f9ebdde4d6c8d4df65bc1446495da0ce2 (commit)
from 6cbd8df67974cb12c2b9baa2ff6bbd50260b94c2 (commit)
commit 3986032f9ebdde4d6c8d4df65bc1446495da0ce2
Author: Peter de Ridder pe...@xfce.org
Date: Sun Feb 19 15:26:41 2012 +0100
Improved menu theming
themes/b5/gtk-3.0/gtk.css|9 -
themes/basic/gtk-3.0/gtk.css |4
themes/cadmium/gtk-3.0/gtk.css |9 +++--
themes/curve/gtk-3.0/gtk.css | 10 +++---
themes/dawn/gtk-3.0/gtk.css |7 +--
themes/dusk/gtk-3.0/gtk.css |7 +--
themes/kde2/gtk-3.0/gtk.css |5 -
themes/kolors/gtk-3.0/gtk.css|9 -
themes/light/gtk-3.0/gtk.css |8 +++-
themes/orange/gtk-3.0/gtk.css| 14 ++
themes/redmondxp/gtk-3.0/gtk.css | 34 --
themes/saltlake/gtk-3.0/gtk.css |3 +++
themes/smooth/gtk-3.0/gtk.css|8 +++-
themes/stellar/gtk-3.0/gtk.css |5 ++---
themes/winter/gtk-3.0/gtk.css| 12 +---
themes/xfce-4.0/gtk-3.0/gtk.css |8 ++--
themes/xfce-4.2/gtk-3.0/gtk.css | 12
themes/xfce-4.4/gtk-3.0/gtk.css |9 ++---
themes/xfce-4.6/gtk-3.0/gtk.css | 20 ++--
themes/xfce/gtk-3.0/gtk.css | 20 ++--
20 files changed, 138 insertions(+), 75 deletions(-)
diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css
index 6b386e7..e3984ac 100644
--- a/themes/b5/gtk-3.0/gtk.css
+++ b/themes/b5/gtk-3.0/gtk.css
@@ -34,7 +34,6 @@
-GtkWidget-focus-padding : 0;
-GtkCheckButton-indicator-size : 15;
-GtkMenuBar-shadow-type : out;
--GtkMenuItem-selected-shadow-type: out;
-GtkRange-slider-width : 11;
-GtkRange-stepper-size : 11;
-GtkRange-stepper-spacing: 0;
@@ -295,6 +294,14 @@ GtkCalendar:selected {
border-color: @fg_selected;
}
+.menuitem {
+border-width: 2 2;
+}
+
+.menuitem:hover {
+border-style: outset;
+}
+
.slider {
color: #525051;
diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css
index a9850ae..9c8ed0d 100644
--- a/themes/basic/gtk-3.0/gtk.css
+++ b/themes/basic/gtk-3.0/gtk.css
@@ -43,6 +43,10 @@
background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#4B6983, 1.0)), to(shade(#4B6983, 1.1)));
}
+.menuitem {
+border-width: 0 0;
+}
+
.scrollbar, .scale {
border-width: 2 2;
}
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css
index eed815c..e1aa2d3 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/cadmium/gtk-3.0/gtk.css
@@ -318,7 +318,7 @@ GtkCalendar:selected {
background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
}
-.dock:hover, .menubar:hover, .toolbar:hover {
+.dock:hover, .toolbar:hover {
background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(@bg_prelight, 1.05)), to(shade(@bg_prelight, 0.95)));
}
@@ -348,7 +348,12 @@ GtkCalendar:selected {
}
.menuitem {
-border-width: 1 2;
+border-width: 1 1;
+background-image: none;
+}
+
+.menuitem:hover {
+border-style: solid;
}
.slider.vertical, .progressbar.vertical {
diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css
index c80e03e..26b1679 100644
--- a/themes/curve/gtk-3.0/gtk.css
+++ b/themes/curve/gtk-3.0/gtk.css
@@ -33,7 +33,6 @@
-GtkWidget-focus-padding : 0;
-GtkCheckButton-indicator-size : 15;
-GtkMenuBar-shadow-type : out;
--GtkMenuItem-selected-shadow-type: out;
-GtkRange-slider-width : 15;
-GtkRange-stepper-size : 15;
-GtkRange-stepper-spacing: 0;
@@ -319,7 +318,7 @@ GtkCalendar:selected {
border-color: @fg_selected;
}
-.dock:hover, .menubar:hover, .toolbar:hover {
+.dock:hover .toolbar:hover {
color: #ff;
background-color: #4464ac;
border-color: darker(#4464ac);
@@ -341,8 +340,13 @@ GtkCalendar:selected {
.menuitem:hover {
color: #ff;
-background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.0)));
+background-image: -gtk-gradient(linear, left top, left bottom,
from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.8)));
border-color: darker(#4464ac);
+border-style: outset;
+}
+
+.menuitem *:hover {
+color: #ff;
}
.menuitem:selected {
diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css
index 980f24c..9b40227 100644
--- a/themes/dawn/gtk-3.0/gtk.css
+++ b/themes/dawn/gtk-3.0/gtk.css
@@ -36,7 +36,6 @@
-GtkCheckButton-indicator-size : 12;
-GtkMenuBar-internal-padding : 4;
-GtkMenuBar-shadow-type : out;
--GtkMenuItem-selected-shadow-type: etched-in;
-GtkPaned-handle-size : 7;
[Xfce4-commits] xfce4-settings:master l10n: Updated Arabic (ar) translation to 100%
Updating branch refs/heads/master to 4659ae40c9cfe9c8fe7eebfd0898e9c2bbcd38c9 (commit) from 23d82b73d9d3c857f9ae8298a5d7e92abc22f53b (commit) commit 4659ae40c9cfe9c8fe7eebfd0898e9c2bbcd38c9 Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Sun Feb 19 15:40:22 2012 +0100 l10n: Updated Arabic (ar) translation to 100% New status: 330 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/ar.po b/po/ar.po index 952e49d..2cf4483 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid msgstr Project-Id-Version: Xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-07 19:30+\n +POT-Creation-Date: 2012-02-19 10:39+\n PO-Revision-Date: 2012-01-30 16:42+0300\n Last-Translator: mohammad malh...@gmail.com\n Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n; @@ -885,12 +885,12 @@ msgstr مغاير msgid Shortcut command may not be empty. msgstr يجب لا يكون الأمر اختصار فارغاً. -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:965 -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:966 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:968 msgid Reset to Defaults msgstr إعادة تعيين كإفتراضي -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:967 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:969 msgid This will reset all shortcuts to their default values. Do you really want to do this? @@ -898,12 +898,12 @@ msgstr وهذا سيعيد تعيين كافة الاختصارات إلى قيمها الافتراضية. هل تريد حقا للقيام بهذا؟ -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1032 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1042 msgid The system defaults will be restored next time you log in. msgstr سيتم استعادة الإعدادات الافتراضية النظام عند تسجيل الدخول المرة القادمة. -#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1034 +#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1044 msgid Warning msgstr تحذير @@ -1460,7 +1460,7 @@ msgstr تحرير الخصائص #: ../xfce4-settings-editor/xfce4-settings-editor.desktop.in.h:1 msgid Graphical settings editor for Xfconf -msgstr محرر إعدادات رسومي لـXfce 4 +msgstr محرر إعدادات رسومي لـإكسفس4 #: ../xfsettingsd/accessibility.c:390 msgid Sticky keys are enabled ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-embed-plugin:master l10n: upload of arabic catalog
Updating branch refs/heads/master
to 4555fe78389c285b6a011abaeb45551e52b85bd0 (commit)
from ff4ccde04e4d2615289e4bf9f37b177e5b63aec3 (commit)
commit 4555fe78389c285b6a011abaeb45551e52b85bd0
Author: كريم أولاد الشلحة herr.linu...@gmail.com
Date: Sun Feb 19 16:13:39 2012 +0100
l10n: upload of arabic catalog
New status: 27 messages complete with 0 fuzzies and 3 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{zh_CN.po = ar.po} | 98 ++--
1 files changed, 45 insertions(+), 53 deletions(-)
diff --git a/po/zh_CN.po b/po/ar.po
similarity index 61%
copy from po/zh_CN.po
copy to po/ar.po
index 147cf50..1beb535 100644
--- a/po/zh_CN.po
+++ b/po/ar.po
@@ -1,61 +1,62 @@
-# Simplified Chinese translations for
-# the xfce4-embed-plugin package.
-# This file is distributed under the same license as
-# the xfce4-embed-plugin package.
-# Chipong Luo chipong@yahoo.com, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# كريم أولاد الشلحة herr.linu...@gmail.com, 2012.
msgid
msgstr
-Project-Id-Version: xfce4-embed-plugin\n
+Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-02-17 04:39+\n
-PO-Revision-Date: 2012-02-16 17:29+0600\n
-Last-Translator: Chipong Luo chipong@yahoo.com\n
-Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n
-Language: zh_CN\n
+POT-Creation-Date: 2012-02-19 09:18+\n
+PO-Revision-Date: 2012-02-19 15:12+\n
+Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
+Language-Team: Arabic Xfce Translation Team\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=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.0\n
#: ../panel-plugin/embed.c:48
msgid Embed
-msgstr 嵌入
+msgstr مضمّن
#. pop out menu item, not shown by default
#: ../panel-plugin/embed.c:244
msgid Pop _Out
-msgstr 弹出(_O)
+msgstr
#. embed menu item, shown by default.
#: ../panel-plugin/embed.c:249
msgid _Embed
-msgstr 嵌入(_E)
+msgstr م_ضمّن
#. focus menu item, not shown by default
#: ../panel-plugin/embed.c:255
msgid _Focus
-msgstr 聚焦(_F)
+msgstr البؤ_رة
#: ../panel-plugin/embed-dialogs.c:51
#, c-format
msgid Unable to open the following url: %s
-msgstr 未能打开以下 url：%s
+msgstr غير قادر على فتح عنوان url التالي: %s
#: ../panel-plugin/embed-dialogs.c:100
msgid Input is valid
-msgstr 输入有效
+msgstr إدخال سليم
#: ../panel-plugin/embed-dialogs.c:105
msgid Input is invalid
-msgstr 输入无效
+msgstr إدخال غير سليم
#: ../panel-plugin/embed-dialogs.c:317 ../panel-plugin/embed.desktop.in.h:1
msgid Embed Plugin
-msgstr 嵌入插件
+msgstr ملحق التضمّين
#: ../panel-plugin/embed-dialogs.c:326
msgid Application Launching
-msgstr 应用程序启动
+msgstr غطلاق التطبيق
#: ../panel-plugin/embed-dialogs.c:328
#, c-format
@@ -65,9 +66,6 @@ msgid
that matches the below criteria, or it can use the socket ID passed\n
to it (%s) to embed itself automatically.
msgstr
-如果未发现窗口(或没有标准），可以选择启动的命令。\n
-命令要么带来与以下标准匹配的窗口，要么使用传送给\n
-它(%s)用来自动嵌入其自身的套接字 ID。
#: ../panel-plugin/embed-dialogs.c:336
#, c-format
@@ -75,12 +73,12 @@ msgid
Leave blank to not launch anything\n
%s expands to the socket ID
msgstr
-留空不启动任何东西\n
-%s 扩展为套接字 ID
+أتركه خاليا لعدم إطلاق أي شيء\n
+%s توسيع إلى مقود المعرف
#: ../panel-plugin/embed-dialogs.c:339
msgid L_aunch command
-msgstr 启动命令(_A)
+msgstr أطلق الامر
#. poll_delay
#. No UI element. Generally polling is unnecessary, unless you have a very
@@ -88,97 +86,91 @@ msgstr 启动命令(_A)
#. * identifiable when it is mapped.
#: ../panel-plugin/embed-dialogs.c:348
msgid Selection Criteria
-msgstr 选择标准
+msgstr حدد المعايير
#: ../panel-plugin/embed-dialogs.c:350
msgid
The window to embed must match all of the non-blank criteria.\n
Leave everything blank to rely on a launch command with socket ID.
msgstr
-要嵌入的窗口必须与所有非空的标准匹配。\n
-留空一切以便依靠带套接字的启动命令。
#: ../panel-plugin/embed-dialogs.c:354
msgid _Process name
-msgstr 进程名称(_P)
+msgstr إسم الع_ملية
#: ../panel-plugin/embed-dialogs.c:355
msgid
Match the window's application's process name\n
Leave blank if it is not a criterion
msgstr
-匹配此窗口的应用程序的进程名称\n
-如果它不是一个标准则留空
+تطابق إسم النوافذ تطبيق الإجراء\n
+تركه خاليا غن لم يكن معيارا
#: ../panel-plugin/embed-dialogs.c:361
msgid _Window class
-msgstr 窗口等级(_W)
+msgstr ص_نف النافذة
#: ../panel-plugin/embed-dialogs.c:362
msgid
Match the window's class\n
Leave blank if it is not a criterion
msgstr
-匹配窗口等级\n
-如果它不是一个标准则留空
+تطابق صنف النوافذ\n
+تركه خاليا غن لم يكن معيارا
#: ../panel-plugin/embed-dialogs.c:368
msgid Window _title
-msgstr 窗口标题(_T)
+msgstr عن_وان النافذة
#: ../panel-plugin/embed-dialogs.c:369
msgid
Match the window's title using a REGEX\n
[Xfce4-commits] midori:master Optimize cookies loading
Updating branch refs/heads/master
to 69f7e176ab2eda55a605107dbb40f22b0da87280 (commit)
from cd4928ebd7d9286644b983f788392537f72cfa81 (commit)
commit 69f7e176ab2eda55a605107dbb40f22b0da87280
Author: Alexander Butenko a.bute...@gmail.com
Date: Thu Feb 16 15:32:09 2012 -0400
Optimize cookies loading
katze/katze-http-cookies-sqlite.c | 115 ++---
1 files changed, 68 insertions(+), 47 deletions(-)
diff --git a/katze/katze-http-cookies-sqlite.c
b/katze/katze-http-cookies-sqlite.c
index be3202e..4a7e1bf 100644
--- a/katze/katze-http-cookies-sqlite.c
+++ b/katze/katze-http-cookies-sqlite.c
@@ -84,15 +84,13 @@ try_create_table (sqlite3 *db)
static void
exec_query_with_try_create_table (sqlite3*db,
- const char* sql,
- int
(*callback)(void*,int,char**,char**),
- void*argument)
+ const char* sql)
{
char *error = NULL;
gboolean try_create = TRUE;
try_exec:
-if (sqlite3_exec (db, sql, callback, argument, error)) {
+if (sqlite3_exec (db, sql, NULL, NULL, error)) {
if (try_create) {
try_create = FALSE;
try_create_table (db);
@@ -106,45 +104,6 @@ try_exec:
}
}
-static int
-callback (void *data, int argc, char **argv, char **colname)
-{
-SoupCookie *cookie = NULL;
-SoupCookieJar *jar = SOUP_COOKIE_JAR (data);
-
-char *name, *value, *host, *path;
-gint64 expire_time;
-time_t now;
-int max_age;
-gboolean http_only = FALSE, secure = FALSE;
-
-now = time (NULL);
-
-name = argv[COL_NAME];
-value = argv[COL_VALUE];
-host = argv[COL_HOST];
-path = argv[COL_PATH];
-expire_time = g_ascii_strtoull (argv[COL_EXPIRY], NULL, 10);
-
-if (now = expire_time)
-return 0;
-max_age = (expire_time - now = G_MAXINT ? expire_time - now : G_MAXINT);
-
-http_only = (g_strcmp0 (argv[COL_HTTP_ONLY], 1) == 0);
-secure = (g_strcmp0 (argv[COL_SECURE], 1) == 0);
-
-cookie = soup_cookie_new (name, value, host, path, max_age);
-
-if (secure)
-soup_cookie_set_secure (cookie, TRUE);
-if (http_only)
-soup_cookie_set_http_only (cookie, TRUE);
-
-soup_cookie_jar_add_cookie (jar, cookie);
-
-return 0;
-}
-
/* Follows sqlite3 convention; returns TRUE on error */
static gboolean
katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies)
@@ -157,23 +116,85 @@ katze_http_cookies_sqlite_open_db
(KatzeHttpCookiesSqlite* http_cookies)
return TRUE;
}
-if (sqlite3_exec (http_cookies-db, PRAGMA synchronous = OFF; PRAGMA
secure_delete = 1;, NULL, NULL, error)) {
+if (sqlite3_exec (http_cookies-db, PRAGMA secure_delete = 1;,
+NULL, NULL, error)) {
g_warning (Failed to execute query: %s, error);
sqlite3_free (error);
}
+sqlite3_exec (http_cookies-db,
+PRAGMA count_changes = OFF; PRAGMA synchronous = OFF;
+PRAGMA temp_store = MEMORY; PRAGMA journal_mode = TRUNCATE;,
+NULL, NULL, error);
+
return FALSE;
}
static void
katze_http_cookies_sqlite_load (KatzeHttpCookiesSqlite* http_cookies)
{
+const char *name, *value, *host, *path;
+sqlite3_stmt* stmt;
+SoupCookie *cookie = NULL;
+gint64 expire_time;
+time_t now;
+int max_age;
+gboolean http_only = FALSE, secure = FALSE;
+char *query;
+int result;
+
if (http_cookies-db == NULL) {
if (katze_http_cookies_sqlite_open_db (http_cookies))
return;
}
-exec_query_with_try_create_table (http_cookies-db, QUERY_ALL, callback,
http_cookies-jar);
+sqlite3_prepare_v2 (http_cookies-db, QUERY_ALL, strlen (QUERY_ALL) + 1,
stmt, NULL);
+result = sqlite3_step (stmt);
+if (result != SQLITE_ROW)
+{
+if (result == SQLITE_ERROR)
+g_print (_(Failed to load cookies\n));
+sqlite3_reset (stmt);
+return;
+}
+
+while (result == SQLITE_ROW)
+{
+now = time (NULL);
+name = (const char*)sqlite3_column_text (stmt, COL_NAME);
+value = (const char*)sqlite3_column_text (stmt, COL_VALUE);
+host = (const char*)sqlite3_column_text (stmt, COL_HOST);
+path = (const char*)sqlite3_column_text (stmt, COL_PATH);
+expire_time = sqlite3_column_int64 (stmt,COL_EXPIRY);
+secure = sqlite3_column_int (stmt, COL_SECURE);
+http_only = sqlite3_column_int (stmt, COL_HTTP_ONLY);
+
+if (now = expire_time)
+{
+/* Cookie expired, remove it from database */
+query = sqlite3_mprintf (QUERY_DELETE, name, host);
+exec_query_with_try_create_table (http_cookies-db, query);
+sqlite3_free (query);
+result = sqlite3_step (stmt);
+continue;
+}
+max_age = (expire_time - now = G_MAXINT ?
[Xfce4-commits] midori:master Speeddial CSS speedup
Updating branch refs/heads/master
to 29d6de3c6e39c72ad72d1503ec84dca7cbff9860 (commit)
from 69f7e176ab2eda55a605107dbb40f22b0da87280 (commit)
commit 29d6de3c6e39c72ad72d1503ec84dca7cbff9860
Author: Alexander Butenko a.bute...@gmail.com
Date: Wed Feb 15 11:34:07 2012 -0400
Speeddial CSS speedup
data/speeddial-head.html | 13 -
katze/katze-http-cookies-sqlite.c |4 ++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/data/speeddial-head.html b/data/speeddial-head.html
index 053cbc7..7e7f217 100644
--- a/data/speeddial-head.html
+++ b/data/speeddial-head.html
@@ -55,10 +55,7 @@
width: 85%;
height: 75%;
margin: auto;
--webkit-box-shadow: 0 4px 18px rgba(0,0,0,.3), 0 0 2px #fff inset;
-background-image: -webkit-gradient(
-linear, center top, center bottom,
-from(#f6f6f6), to(#e3e3e3));
+-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.3), 0 0 0px #fff inset;
border: 1px solid #bcbcbc;
border-bottom-color: #a0a0a0;
position: relative;
@@ -75,9 +72,15 @@
div.shortcut .preview.new .add {
display: block;
height: 100%;
-width: 50%;
+width: 100%;
margin: 0 auto;
cursor: pointer;
+-webkit-box-shadow: 0 2px 5px rgba(0,0,0,.3), 0 0 0px #fff inset;
+background-image: -webkit-gradient(
+linear, center top, center bottom,
+from(#f6f6f6), to(#e3e3e3));
+background-repeat: repeat-x;
+-webkit-border-radius: 3px;
}
.title {
diff --git a/katze/katze-http-cookies-sqlite.c
b/katze/katze-http-cookies-sqlite.c
index 4a7e1bf..4066407 100644
--- a/katze/katze-http-cookies-sqlite.c
+++ b/katze/katze-http-cookies-sqlite.c
@@ -123,8 +123,8 @@ katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite*
http_cookies)
}
sqlite3_exec (http_cookies-db,
-PRAGMA count_changes = OFF; PRAGMA synchronous = OFF;
-PRAGMA temp_store = MEMORY; PRAGMA journal_mode = TRUNCATE;,
+/* PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY */
+PRAGMA count_changes = OFF; PRAGMA journal_mode = TRUNCATE;,
NULL, NULL, error);
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master When removing bookmarks, folder must not be NULL
Updating branch refs/heads/master
to 62f0ef746c182ba6b0d61fd1199e8ac0a4ff759d (commit)
from 69c319d62a6369f5ad6c14111beb76ab4733dd40 (commit)
commit 62f0ef746c182ba6b0d61fd1199e8ac0a4ff759d
Author: Vincent Cappe vca...@gmail.com
Date: Sun Feb 19 17:44:15 2012 +0100
When removing bookmarks, folder must not be NULL
If folder is NULL, we end up with (NULL) in sqlite.
Modified patch to use katze_str_non_null.
Fixes: https://bugs.launchpad.net/midori/+bug/926914
katze/katze-utils.h | 14 ++
midori/main.c|4 ++--
midori/midori-searchaction.c | 16 +---
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/katze/katze-utils.h b/katze/katze-utils.h
index 9363776..274aebb 100644
--- a/katze/katze-utils.h
+++ b/katze/katze-utils.h
@@ -58,6 +58,20 @@ G_BEGIN_DECLS
**/
#define katze_strv_assign(lvalue, rvalue) lvalue = (g_strfreev (lvalue),
rvalue)
+/**
+ * katze_str_non_null:
+ * @str: a string, or %NULL
+ *
+ * Returns if @str is %NULL.
+ *
+ * Since: 0.4.4
+ **/
+static inline const gchar*
+katze_str_non_null (const gchar* str)
+{
+return str ? str : ;
+}
+
GtkWidget*
katze_property_proxy(gpointer object,
const gchar* property,
diff --git a/midori/main.c b/midori/main.c
index e1b53a5..51a913f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -531,14 +531,14 @@ midori_bookmarks_remove_item_cb (KatzeArray* array,
DELETE FROM bookmarks WHERE uri = '%q'
AND folder = '%q',
katze_item_get_uri (item),
-katze_item_get_meta_string (item, folder));
+katze_str_non_null (katze_item_get_meta_string (item, folder)));
else
sqlcmd = sqlite3_mprintf (
DELETE FROM bookmarks WHERE title = '%q'
AND folder = '%q',
katze_item_get_name (item),
-katze_item_get_meta_string (item, folder));
+katze_str_non_null (katze_item_get_meta_string (item, folder)));
if (sqlite3_exec (db, sqlcmd, NULL, NULL, errmsg) != SQLITE_OK)
{
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index c4a9712..bc814d9 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -877,12 +877,6 @@ midori_search_action_editor_name_changed_cb (GtkWidget*
entry,
GTK_RESPONSE_ACCEPT, text *text);
}
-static inline const gchar*
-STR_NON_NULL (const gchar* string)
-{
-return string ? string : ;
-}
-
static void
midori_search_action_get_editor (MidoriSearchAction* search_action,
gbooleannew_engine)
@@ -943,7 +937,7 @@ midori_search_action_get_editor (MidoriSearchAction*
search_action,
gtk_entry_set_activates_default (GTK_ENTRY (entry_name), TRUE);
if (!new_engine)
gtk_entry_set_text (GTK_ENTRY (entry_name),
-STR_NON_NULL (katze_item_get_name (item)));
+katze_str_non_null (katze_item_get_name (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
@@ -957,7 +951,7 @@ midori_search_action_get_editor (MidoriSearchAction*
search_action,
gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE);
if (!new_engine)
gtk_entry_set_text (GTK_ENTRY (entry_description)
- , STR_NON_NULL (katze_item_get_text (item)));
+ , katze_str_non_null (katze_item_get_text (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
@@ -977,7 +971,7 @@ midori_search_action_get_editor (MidoriSearchAction*
search_action,
gtk_entry_set_activates_default (GTK_ENTRY (entry_uri), TRUE);
if (!new_engine)
gtk_entry_set_text (GTK_ENTRY (entry_uri)
- , STR_NON_NULL (katze_item_get_uri (item)));
+ , katze_str_non_null (katze_item_get_uri (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
@@ -991,7 +985,7 @@ midori_search_action_get_editor (MidoriSearchAction*
search_action,
gtk_entry_set_activates_default (GTK_ENTRY (entry_icon), TRUE);
if (!new_engine)
gtk_entry_set_text (GTK_ENTRY (entry_icon)
- , STR_NON_NULL (katze_item_get_icon (item)));
+ , katze_str_non_null (katze_item_get_icon (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_icon, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
gtk_widget_show_all (hbox);
@@ -1005,7 +999,7 @@ midori_search_action_get_editor (MidoriSearchAction*
search_action,
gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE);
if (!new_engine)
[Xfce4-commits] midori:master Remove bogus widget_destroyed callback in Shortcuts
Updating branch refs/heads/master to 63d7df5a0acef44b593cd90ee509a1be6cc7e3d4 (commit) from d2aa1919aaad244c666d61cf68045f779bb4e670 (commit) commit 63d7df5a0acef44b593cd90ee509a1be6cc7e3d4 Author: Christian Dywan christ...@twotoasts.de Date: Sun Feb 19 18:45:56 2012 +0100 Remove bogus widget_destroyed callback in Shortcuts Fixes: https://bugs.launchpad.net/midori/+bug/933082 extensions/shortcuts.c |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/extensions/shortcuts.c b/extensions/shortcuts.c index 552f169..b4cb042 100644 --- a/extensions/shortcuts.c +++ b/extensions/shortcuts.c @@ -180,8 +180,6 @@ shortcuts_get_preferences_dialog (MidoriExtension* extension) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, #endif NULL); -g_signal_connect (dialog, destroy, - G_CALLBACK (gtk_widget_destroyed), dialog); gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); sokoke_widget_get_text_size (dialog, M, width, height); gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, height * 24); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master l10n: Updated Turkish (tr) translation to 100%
Updating branch refs/heads/master to e4b30fba14b5e8b04ca301d9f9a39b86352d907a (commit) from 64ee1bde7a304b2801aa90879f95c459486ed6d3 (commit) commit e4b30fba14b5e8b04ca301d9f9a39b86352d907a Author: Ayhan YALÇINSOY ayhanyalcin...@gmail.com Date: Sun Feb 19 19:04:28 2012 +0100 l10n: Updated Turkish (tr) translation to 100% New status: 142 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/tr.po | 87 -- 1 files changed, 45 insertions(+), 42 deletions(-) diff --git a/po/tr.po b/po/tr.po index 3080e16..419f55e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,23 +2,26 @@ # German translations for ristretto package. # Copyright (C) 2007 Stephan Arts step...@xfce.org # This file is distributed under the same license as the ristretto package. -# +# +# # Onur Küçük o...@pardus.org.tr, 2008. # Gökmen Görgen gkmng...@gmail.com, 2008. -# +# Ayhan YALÇINSOY ayhanyalcin...@gmail.com, 2012. msgid msgstr Project-Id-Version: tr\n Report-Msgid-Bugs-To: xfce-i...@xfce.org\n POT-Creation-Date: 2012-02-18 08:18+\n -PO-Revision-Date: 2008-11-16 02:31+0200\n -Last-Translator: Gökmen Görgen gkmng...@gmail.com\n -Language-Team: Turkish\n +PO-Revision-Date: 2012-02-19 20:08+0200\n +Last-Translator: Ayhan YALÇINSOY ayhanyalcin...@gmail.com\n +Language-Team: Turkish kde-i18n-...@kde.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n Language: \n -X-Generator: KBabel 1.11.4\n +X-Generator: Lokalize 1.2\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10 +=4 (n%10010 || n%100=20) ? 1 : 2);\n #: ../src/main.c:61 msgid Version information @@ -34,10 +37,10 @@ msgstr Slayt gösterisini başlat #: ../src/main.c:77 msgid Show settings dialog -msgstr Ayar penceresini göster +msgstr Ayarlar iletişim kutusunu göster #: ../src/main.c:105 -#, fuzzy, c-format +#, c-format msgid %s: %s\n \n @@ -45,7 +48,8 @@ msgid available command line options.\n msgstr %s: %s\n -Komutsatırı parametrelerini görmek için %s --help komutunu kullanınız.\n +Komut satırı parametrelerini görmek için %s\n + --help komutunu kullanınız.\n #: ../src/main_window.c:53 ../ristretto.desktop.in.h:1 msgid Image Viewer @@ -118,9 +122,8 @@ msgid Delete this image from disk msgstr Bu resim diskten sil #: ../src/main_window.c:339 -#, fuzzy msgid _Clear private data -msgstr _Özel veriyi temizle +msgstr Kişisel verileri _temizle #: ../src/main_window.c:340 msgid _Preferences @@ -145,9 +148,8 @@ msgstr Duvar Kağıdı olarak _belirle #. Zoom submenu #: ../src/main_window.c:347 -#, fuzzy msgid _Zoom -msgstr _Yakınlaşma +msgstr _Yakınlaştır #: ../src/main_window.c:348 msgid Zoom _In @@ -231,12 +233,11 @@ msgstr _Boyut #: ../src/main_window.c:377 msgid Thumbnail Bar _Position -msgstr +msgstr Küçük resim çubuğu _Konumu #: ../src/main_window.c:378 -#, fuzzy msgid Thumbnail _Size -msgstr _Önizleme Gösterici +msgstr Küçük resim _boyutu #. Misc #: ../src/main_window.c:380 @@ -255,7 +256,6 @@ msgstr _Dolaşma Araç Çubuğunu Göster #. Toggle visibility of the thumbnailbar #: ../src/main_window.c:392 -#, fuzzy msgid Show _Thumbnail Bar msgstr _Küçük resim çubuğunu göster @@ -287,20 +287,19 @@ msgstr Alt #: ../src/main_window.c:416 msgid Very Small -msgstr Çok Küçük +msgstr Çok küçük #: ../src/main_window.c:417 msgid Smaller -msgstr Daha Küçük +msgstr Daha küçük #: ../src/main_window.c:418 msgid Small msgstr Küçük #: ../src/main_window.c:419 -#, fuzzy msgid Normal -msgstr _Normal Boyut +msgstr _Normal #: ../src/main_window.c:420 msgid Large @@ -308,7 +307,7 @@ msgstr Büyük #: ../src/main_window.c:421 msgid Larger -msgstr Daha Büyük +msgstr Daha büyük #: ../src/main_window.c:422 msgid Very Large @@ -350,7 +349,7 @@ msgstr Boş #: ../src/main_window.c:2086 msgid Choose 'set wallpaper' method -msgstr +msgstr 'Duvar kağıdı ayarla' yöntemini seçin #: ../src/main_window.c:2101 ../src/preferences_dialog.c:349 msgid @@ -358,6 +357,9 @@ msgid This setting determines the method iRistretto/i will use\n to configure the desktop wallpaper. msgstr +Masaüstünüzü yöneten geçerli sistemi yapılandırın.\n +Bu ayar iRistretto/inun masaüstü duvar kağıdınızı\n +yapılandırması için kullanılacağı yöntemini tanımlar. #: ../src/main_window.c:2126 ../src/preferences_dialog.c:373 msgid None @@ -383,7 +385,8 @@ msgstr Ristretto, Xfce masaüstü ortamı için bir resim göstericidir. msgid translator-credits msgstr Onur Küçük o...@pardus.org.tr\n -Gökmen Görgen gkmng...@gmail.com +Gökmen Görgen gkmng...@gmail.com \n +Ayhan YALÇINSOY ayhanyalcin...@gmail.com #: ../src/main_window.c:2897 msgid Open image @@ -416,11 +419,11 @@ msgstr Diskinizden '%s' resmini silmek istediğinizden emin misiniz? #: ../src/privacy_dialog.c:151 msgid Time range to clear: -msgstr +msgstr
[Xfce4-commits] midori:master Get rid of exec_query_with_try_create_table
Updating branch refs/heads/master
to c6b15ff4dcac0b432f081d45e8eb8d85354fc239 (commit)
from 63d7df5a0acef44b593cd90ee509a1be6cc7e3d4 (commit)
commit c6b15ff4dcac0b432f081d45e8eb8d85354fc239
Author: Alexander Butenko a.bute...@gmail.com
Date: Sun Feb 19 20:08:16 2012 +0100
Get rid of exec_query_with_try_create_table
katze/katze-http-cookies-sqlite.c | 46 +++-
1 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/katze/katze-http-cookies-sqlite.c
b/katze/katze-http-cookies-sqlite.c
index 4066407..d97dc32 100644
--- a/katze/katze-http-cookies-sqlite.c
+++ b/katze/katze-http-cookies-sqlite.c
@@ -27,7 +27,7 @@
#include sqlite3.h
#define QUERY_ALL SELECT id, name, value, host, path, expiry, lastAccessed,
isSecure, isHttpOnly FROM moz_cookies;
-#define CREATE_TABLE CREATE TABLE moz_cookies (id INTEGER PRIMARY KEY, name
TEXT, value TEXT, host TEXT, path TEXT,expiry INTEGER, lastAccessed INTEGER,
isSecure INTEGER, isHttpOnly INTEGER)
+#define CREATE_TABLE CREATE TABLE IF NOT EXISTS moz_cookies (id INTEGER
PRIMARY KEY, name TEXT, value TEXT, host TEXT, path TEXT,expiry INTEGER,
lastAccessed INTEGER, isSecure INTEGER, isHttpOnly INTEGER)
#define QUERY_INSERT INSERT INTO moz_cookies VALUES(NULL, %Q, %Q, %Q, %Q, %d,
NULL, %d, %d);
#define QUERY_DELETE DELETE FROM moz_cookies WHERE name=%Q AND host=%Q;
@@ -71,39 +71,6 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookiesSqlite,
katze_http_cookies_sqlite, G_TY
Copyright (C) 2009 Collabora Ltd.
Mostly copied from libSoup 2.30, coding style retained */
-static void
-try_create_table (sqlite3 *db)
-{
-char *error = NULL;
-
-if (sqlite3_exec (db, CREATE_TABLE, NULL, NULL, error)) {
-g_warning (Failed to execute query: %s, error);
-sqlite3_free (error);
-}
-}
-
-static void
-exec_query_with_try_create_table (sqlite3*db,
- const char* sql)
-{
-char *error = NULL;
-gboolean try_create = TRUE;
-
-try_exec:
-if (sqlite3_exec (db, sql, NULL, NULL, error)) {
-if (try_create) {
-try_create = FALSE;
-try_create_table (db);
-sqlite3_free (error);
-error = NULL;
-goto try_exec;
-} else {
-g_warning (Failed to execute query: %s, error);
-sqlite3_free (error);
-}
-}
-}
-
/* Follows sqlite3 convention; returns TRUE on error */
static gboolean
katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies)
@@ -116,6 +83,11 @@ katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite*
http_cookies)
return TRUE;
}
+if (sqlite3_exec (http_cookies-db, CREATE_TABLE, NULL, NULL, error)) {
+g_warning (Failed to execute query: %s, error);
+sqlite3_free (error);
+}
+
if (sqlite3_exec (http_cookies-db, PRAGMA secure_delete = 1;,
NULL, NULL, error)) {
g_warning (Failed to execute query: %s, error);
@@ -173,7 +145,7 @@ katze_http_cookies_sqlite_load (KatzeHttpCookiesSqlite*
http_cookies)
{
/* Cookie expired, remove it from database */
query = sqlite3_mprintf (QUERY_DELETE, name, host);
-exec_query_with_try_create_table (http_cookies-db, query);
+sqlite3_exec (http_cookies-db, QUERY_DELETE, NULL, NULL, NULL);
sqlite3_free (query);
result = sqlite3_step (stmt);
continue;
@@ -241,7 +213,7 @@ katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar*
jar,
query = sqlite3_mprintf (QUERY_DELETE,
old_cookie-name,
old_cookie-domain);
-exec_query_with_try_create_table (http_cookies-db, query);
+sqlite3_exec (http_cookies-db, query, NULL, NULL, NULL);
sqlite3_free (query);
}
@@ -255,7 +227,7 @@ katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar*
jar,
expires,
new_cookie-secure,
new_cookie-http_only);
-exec_query_with_try_create_table (http_cookies-db, query);
+sqlite3_exec (http_cookies-db, query, NULL, NULL, NULL);
sqlite3_free (query);
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Drop OpenSSL support from socket code
Updating branch refs/heads/master
to d2fe0791e1e50e285d9b68862742e7151775eaef (commit)
from c6b15ff4dcac0b432f081d45e8eb8d85354fc239 (commit)
commit d2fe0791e1e50e285d9b68862742e7151775eaef
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Feb 19 20:21:37 2012 +0100
Drop OpenSSL support from socket code
midori/socket.c | 223 --
midori/socket.h | 20 -
midori/wscript_build |2 +-
wscript |2 -
4 files changed, 1 insertions(+), 246 deletions(-)
diff --git a/midori/socket.c b/midori/socket.c
index 2971834..73b5cfd 100644
--- a/midori/socket.c
+++ b/midori/socket.c
@@ -54,9 +54,6 @@
#endif
#include socket.h
-#if USE_SSL
-# include openssl/ssl.h
-#endif
#ifdef G_ENABLE_DEBUG
# define debug_print g_debug
@@ -562,10 +559,6 @@ gboolean sock_has_read_data(SockInfo *sock)
#ifdef G_OS_WIN32
gulong val;
-#if USE_SSL
- if (sock-ssl)
- return TRUE;
-#endif
if (ioctlsocket(sock-sock, FIONREAD, val) 0) {
g_warning(sock_has_read_data(): ioctlsocket() failed: %d\n,
WSAGetLastError());
@@ -595,22 +588,6 @@ static gboolean sock_check(GSource *source)
fd_set fds;
GIOCondition condition = sock-condition;
-#if USE_SSL
- if (sock-ssl) {
- if (condition G_IO_IN) {
- if (SSL_pending(sock-ssl) 0)
- return TRUE;
- if (SSL_want_write(sock-ssl))
- condition |= G_IO_OUT;
- }
-
- if (condition G_IO_OUT) {
- if (SSL_want_read(sock-ssl))
- condition |= G_IO_IN;
- }
- }
-#endif
-
FD_ZERO(fds);
FD_SET(sock-sock, fds);
@@ -647,19 +624,6 @@ guint sock_add_watch(SockInfo *sock, GIOCondition
condition, SockFunc func,
sock-callback = func;
sock-condition = condition;
sock-data = data;
-
-#if USE_SSL
- if (sock-ssl) {
- GSource *source;
-
- source = g_source_new(sock_watch_funcs, sizeof(SockSource));
- ((SockSource *)source)-sock = sock;
- g_source_set_priority(source, G_PRIORITY_DEFAULT);
- g_source_set_can_recurse(source, FALSE);
- return g_source_attach(source, NULL);
- }
-#endif
-
return g_io_add_watch(sock-sock_ch, condition, sock_watch_cb, sock);
}
@@ -1375,10 +1339,6 @@ gint sock_read(SockInfo *sock, gchar *buf, gint len)
{
g_return_val_if_fail(sock != NULL, -1);
-#if USE_SSL
- if (sock-ssl)
- return ssl_read(sock-ssl, buf, len);
-#endif
return fd_read(sock-sock, buf, len);
}
@@ -1394,44 +1354,10 @@ gint fd_read(gint fd, gchar *buf, gint len)
#endif
}
-#if USE_SSL
-gint ssl_read(SSL *ssl, gchar *buf, gint len)
-{
- gint err, ret;
-
- if (SSL_pending(ssl) == 0) {
- if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) 0)
- return -1;
- }
-
- ret = SSL_read(ssl, buf, len);
-
- switch ((err = SSL_get_error(ssl, ret))) {
- case SSL_ERROR_NONE:
- return ret;
- case SSL_ERROR_WANT_READ:
- case SSL_ERROR_WANT_WRITE:
- errno = EAGAIN;
- return -1;
- case SSL_ERROR_ZERO_RETURN:
- return 0;
- default:
- g_warning(SSL_read() returned error %d, ret = %d\n, err, ret);
- if (ret == 0)
- return 0;
- return -1;
- }
-}
-#endif
-
gint sock_write(SockInfo *sock, const gchar *buf, gint len)
{
g_return_val_if_fail(sock != NULL, -1);
-#if USE_SSL
- if (sock-ssl)
- return ssl_write(sock-ssl, buf, len);
-#endif
return fd_write(sock-sock, buf, len);
}
@@ -1459,34 +1385,10 @@ gint fd_write(gint fd, const gchar *buf, gint len)
#endif
}
-#if USE_SSL
-gint ssl_write(SSL *ssl, const gchar *buf, gint len)
-{
- gint ret;
-
- ret = SSL_write(ssl, buf, len);
-
- switch (SSL_get_error(ssl, ret)) {
- case SSL_ERROR_NONE:
- return ret;
- case SSL_ERROR_WANT_READ:
- case SSL_ERROR_WANT_WRITE:
- errno = EAGAIN;
- return -1;
- default:
- return -1;
- }
-}
-#endif
-
gint sock_write_all(SockInfo *sock, const gchar *buf, gint len)
{
g_return_val_if_fail(sock != NULL, -1);
-#if USE_SSL
- if (sock-ssl)
- return ssl_write_all(sock-ssl, buf, len);
-#endif
return fd_write_all(sock-sock, buf, len);
}
@@ -1506,24 +1408,6 @@ gint fd_write_all(gint fd, const gchar *buf, gint len)
return wrlen;
}
-#if USE_SSL
-gint ssl_write_all(SSL *ssl, const gchar *buf, gint len)
-{
- gint n, wrlen = 0;
-
- while (len) {
- n =
[Xfce4-commits] orage:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to ebde3e58f66ac407b32df37173249a387807ba60 (commit) from b404cb57889397d04be7f0aa0899a5ff4c2a7155 (commit) commit ebde3e58f66ac407b32df37173249a387807ba60 Author: Michal Várady miko.v...@gmail.com Date: Sun Feb 19 21:11:09 2012 +0100 l10n: Updated Czech (cs) translation to 100% New status: 801 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 68 +++--- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/po/cs.po b/po/cs.po index f0940e5..3b8ab22 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgstr Project-Id-Version: orage 4.3.90.2\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-01-03 14:00+0200\n -PO-Revision-Date: 2012-01-09 00:53+0100\n +PO-Revision-Date: 2012-02-19 21:09+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech translation-team...@lists.sourceforge.net\n Language: cs\n @@ -428,7 +428,7 @@ msgstr UTC #: ../src/timezone_selection.c:330 #: ../src/timezone_selection.c:384 msgid floating -msgstr plovoucí +msgstr nezávislý na čas. pásmu #: ../globaltime/globaltime.desktop.in.h:1 #: ../src/tray_icon.c:500 @@ -441,7 +441,7 @@ msgstr Globální čas aplikace Orage #: ../globaltime/globaltime.desktop.in.h:3 msgid Show clocks from different countries -msgstr Zobrazovat čas jiných zemí +msgstr Zobrazit čas jiných zemí #: ../panel-plugin/oc_config.c:224 msgid Appearance @@ -450,7 +450,7 @@ msgstr Vzhled #. show frame #: ../panel-plugin/oc_config.c:229 msgid Show _frame -msgstr Zobrazovat _rámeček +msgstr Zobrazit _rámeček #. foreground color #: ../panel-plugin/oc_config.c:239 @@ -568,7 +568,7 @@ msgstr Konec #: ../src/appointment.c:333 msgid Due -msgstr Kvůli +msgstr Termín dokončení #: ../src/appointment.c:493 #: ../src/mainbox.c:783 @@ -669,7 +669,7 @@ msgstr D_uplikovat #: ../src/appointment.c:2589 msgid Save -msgstr Ulož_it +msgstr Uložit #: ../src/appointment.c:2591 msgid Save and close @@ -709,7 +709,7 @@ msgstr Typ #: ../src/appointment.c:2633 #: ../src/event-list.c:1165 msgid Event -msgstr Událost +msgstr Události #: ../src/appointment.c:2636 msgid @@ -729,7 +729,7 @@ msgid Something that you should do sometime. For example:\n Wash your car or test new version of Orage. msgstr -Něco, co byste měli udělat. Například:\n +Něco, co byste měli v budoucnu udělat. Například:\n Umyjte si auto nebo otestujte novou verzi aplikace Orage. #: ../src/appointment.c:2645 @@ -767,7 +767,7 @@ msgstr Nastavit #: ../src/appointment.c:2718 msgid Duration -msgstr Trvání +msgstr Délka #: ../src/appointment.c:2722 #: ../src/appointment.c:2912 @@ -847,19 +847,19 @@ msgstr #: ../src/appointment.c:2895 msgid Before Start -msgstr Před zahájením +msgstr před zahájením #: ../src/appointment.c:2895 msgid Before End -msgstr Před ukončením +msgstr před ukončením #: ../src/appointment.c:2896 msgid After Start -msgstr Po začátku +msgstr po zahájení #: ../src/appointment.c:2896 msgid After End -msgstr Po ukončení +msgstr po ukončení #: ../src/appointment.c:2903 msgid Alarm @@ -878,7 +878,7 @@ msgid 3) after Todo start msgstr Kdy chcete být upozorněni:\n - 1) před začátkem události\n + 1) před zahájením události\n 2) před dokončením úkolu\n 3) po dokončení úkolu @@ -974,7 +974,7 @@ msgid \tST appointment start time\n \tET appointment end time msgstr -Je nutné vložit všechny escape znaky ručně.\n +Všechny escape znaky je nutné vložit ručně.\n Tento řetězec bude předán shellu ke zpracování.\n Za běhu budou nahrazeny tyto speciální příkazy:\n \tT titulek schůzky\n @@ -1252,7 +1252,7 @@ msgstr Neznámá #: ../src/day-view.c:704 msgidNumber of days to show -msgstrPočet zobrazovaných dní +msgstrPočet zobrazených dní #: ../src/day-view.c:935 msgid Orage - day view @@ -1290,11 +1290,11 @@ msgstr Najít #: ../src/event-list.c:1137 msgid Dayview -msgstr Přehled dne +msgstr Přehled více dnů #: ../src/event-list.c:1170 msgid Extra days to show -msgstr Dny navíc pro zobrazení +msgstr Zobrazit položky pro tento počet následujících dní #: ../src/event-list.c:1201 msgid Journal entries starting from: @@ -1746,17 +1746,17 @@ msgstr --toggle (-t) \t\tpřepne aplikaci orage do viditelného nebo neviditeln #: ../src/main.c:312 #, c-format msgid --add-foreign (-a) file [RW] \tadd a foreign file\n -msgstr --add-foreign (-a) soubor [RW] \tpřidá externí soubor\n +msgstr --add-foreign (-a) soubor [RW] přidá externí soubor\n #: ../src/main.c:313 #, c-format msgid --remove-foreign (-r) file \tremove a foreign file\n -msgstr --remove-foreign (-r) soubor \todebere externí soubor\n +msgstr --remove-foreign (-r) soubor odebere externí soubor\n #: ../src/main.c:314 #, c-format msgid --export (-e) file [appointment...] \texport appointments
[Xfce4-commits] xfce4-appfinder:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to 190a688d04335c6c05114d3efd5e72aa2436ddfd (commit) from f5f8148030713ca041b4a4f9f2dfdeb24d066641 (commit) commit 190a688d04335c6c05114d3efd5e72aa2436ddfd Author: Michal Várady miko.v...@gmail.com Date: Sun Feb 19 21:31:46 2012 +0100 l10n: Updated Czech (cs) translation to 100% New status: 65 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 42 ++ 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/po/cs.po b/po/cs.po index bba0cb4..ec9c5b6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-appfinder 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-01 20:54+\n +POT-Creation-Date: 2012-02-19 20:24+\n PO-Revision-Date: 2012-01-02 01:05+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech translation-team...@lists.sourceforge.net\n @@ -52,29 +52,28 @@ msgstr Aplikace nemá žádný příkaz msgid Commands History msgstr Historie příkazů -#: ../src/appfinder-preferences.c:210 +#: ../src/appfinder-preferences.c:217 msgid C_lear msgstr _Vymazat -#: ../src/appfinder-preferences.c:211 +#: ../src/appfinder-preferences.c:218 msgid This will permanently clear the custom command history. msgstr Tato akce trvale vymaže historii vlastních příkazů. -#: ../src/appfinder-preferences.c:212 +#: ../src/appfinder-preferences.c:219 msgid Are you sure you want to clear the command history? msgstr Opravdu chcete vymazat historii příkazů? -#: ../src/appfinder-preferences.c:322 +#: ../src/appfinder-preferences.c:329 msgid The custom action will be deleted permanently. msgstr Vlastní akce bude trvale smazána. -#: ../src/appfinder-preferences.c:323 +#: ../src/appfinder-preferences.c:330 #, c-format msgid Are you sure you want to delete pattern \%s\? msgstr Opravdu chcete vymazat vzorek \%s\? -#: ../src/appfinder-window.c:216 -#: ../src/main.c:429 +#: ../src/appfinder-window.c:216 ../src/main.c:429 #: ../src/appfinder-preferences.glade.h:4 #: ../data/xfce4-appfinder.desktop.in.h:1 msgid Application Finder @@ -89,8 +88,11 @@ msgid Failed to launch desktop item editor msgstr Spuštění editoru položek plochy se nezdařilo. #: ../src/appfinder-window.c:788 -msgid This will permanently remove the custom desktop file from your home directory. -msgstr Tato akce trvale odebere upravený soubor plochy z vašeho domovského adresáře. +msgid +This will permanently remove the custom desktop file from your home +directory. +msgstr +Tato akce trvale odebere upravený soubor plochy z vašeho domovského adresáře. #: ../src/appfinder-window.c:789 #, c-format @@ -105,11 +107,14 @@ msgstr Odebrání souboru plochy se nezdařilo #. * second with Hidden=true #: ../src/appfinder-window.c:832 #, c-format -msgid To unhide the item you have to manually remove the desktop file from \%s\ or open the file in the same directory and remove the line \%s\. -msgstr Skrytou položku odkryjte ručním odebráním souboru plochy z adresáře \%s\ nebo otevřete soubor ve stejném adresáři a odeberte řádek \%s\. +msgid +To unhide the item you have to manually remove the desktop file from \%s\ +or open the file in the same directory and remove the line \%s\. +msgstr +Skrytou položku odkryjte ručním odebráním souboru plochy z adresáře \%s\ +nebo otevřete soubor ve stejném adresáři a odeberte řádek \%s\. -#: ../src/appfinder-window.c:837 -#: ../src/appfinder-window.c:922 +#: ../src/appfinder-window.c:837 ../src/appfinder-window.c:922 msgid _Hide msgstr _Skrýt @@ -203,8 +208,13 @@ msgstr Historie #: ../src/appfinder-preferences.glade.h:13 #, no-c-format -msgid If the type is set to prefix, %s will be replaced with the string after the pattern, %S with the complete entry text. For regular expressions you can use \\0 and \\num. -msgstr Pokud je typ nastaven na předponu, %s se nahradí řetězcem po vzorku a %S kompletním vstupním textem. Regulární výrazy použijte pomocí \\0 a \\num. +msgid +If the type is set to prefix, %s will be replaced with the string after the +pattern, %S with the complete entry text. For regular expressions you can +use \\0 and \\num. +msgstr +Pokud je typ nastaven na předponu, %s se nahradí řetězcem po vzorku a %S +kompletním vstupním textem. Regulární výrazy použijte pomocí \\0 a \\num. #: ../src/appfinder-preferences.glade.h:14 msgid Ite_m icon size: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Modified xfdesktop_icon_view_drag_drop to allow all selected files to drag and drop. Fixes Bug #5025
Updating branch refs/heads/eric/bugzilla-patches
to 578732b85aee34d0d48b4c16ac9ef398b644a9fc (commit)
from 600504bab2c3067515e225136afa765a6e93e6bb (commit)
commit 578732b85aee34d0d48b4c16ac9ef398b644a9fc
Author: Eric Koegel eric.koe...@gmail.com
Date: Sat Nov 19 13:38:56 2011 +0300
Modified xfdesktop_icon_view_drag_drop to allow all selected files to drag
and drop. Fixes Bug #5025
src/xfdesktop-icon-view.c | 45 -
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index 071ca90..e37fd68 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -1356,6 +1356,7 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
GdkAtom target = GDK_NONE;
XfdesktopIcon *icon;
guint16 old_row, old_col, row, col;
+GList *l;
XfdesktopIcon *icon_on_dest = NULL;
TRACE(entering: (%d,%d), x, y);
@@ -1375,7 +1376,6 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
if(target == gdk_atom_intern(XFDESKTOP_ICON, FALSE)) {
if(icon_on_dest) {
-GList *l;
gboolean ret = FALSE;
for(l = icon_view-priv-selected_icons; l; l = l-next) {
@@ -1395,10 +1395,20 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
icon = icon_view-priv-cursor;
g_return_val_if_fail(icon, FALSE);
-/* clear out old position */
-xfdesktop_icon_view_invalidate_icon(icon_view, icon, FALSE);
-if(xfdesktop_icon_get_position(icon, old_row, old_col))
-xfdesktop_grid_set_position_free(icon_view, old_row, old_col);
+/* 1: Remove all the icons that are going to be moved from
+ *the desktop. That's in case the icons being moved
+ *want to rearrange themselves there.
+ * 2: We need to move the icon that's being dragged since the
+ *user explicitly wants to drop it in that spot.
+ * 3: We just append all the other icons in any spot that's
+ *open. */
+for(l = icon_view-priv-selected_icons; l; l = l-next) {
+/* clear out old position */
+xfdesktop_icon_view_invalidate_icon(icon_view, l-data, FALSE);
+if(xfdesktop_icon_get_position(l-data, old_row, old_col))
+xfdesktop_grid_set_position_free(icon_view, old_row, old_col);
+}
+
/* set new position */
xfdesktop_icon_set_position(icon, row, col);
xfdesktop_grid_unset_position_free(icon_view, icon);
@@ -1406,6 +1416,31 @@ xfdesktop_icon_view_drag_drop(GtkWidget *widget,
/* clear out old extents, if any */
/* FIXME: is this right? */
xfdesktop_icon_view_invalidate_icon(icon_view, icon, TRUE);
+
+/* Now that we have moved the icon the user selected,
+ * append all the other selected icons after it. */
+for(l = icon_view-priv-selected_icons; l; l = l-next) {
+if(l-data == icon)
+continue;
+
+/* Find the next available spot for an icon */
+do {
+if(row + 1 = icon_view-priv-nrows) {
+++col;
+row = 0;
+} else {
+++row;
+}
+} while(!xfdesktop_grid_is_free_position(icon_view, row, col));
+
+/* set new position */
+xfdesktop_icon_set_position(l-data, row, col);
+xfdesktop_grid_unset_position_free(icon_view, l-data);
+
+/* clear out old extents, if any */
+/* FIXME: is this right? */
+xfdesktop_icon_view_invalidate_icon(icon_view, l-data, TRUE);
+}
DBG(drag succeeded);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Fix for moving files instead of copy when src isn't writable
Updating branch refs/heads/eric/bugzilla-patches
to dba89439ee41f3cc793b44d9dc3630e3238228db (commit)
from 578732b85aee34d0d48b4c16ac9ef398b644a9fc (commit)
commit dba89439ee41f3cc793b44d9dc3630e3238228db
Author: Eric Koegel eric.koe...@gmail.com
Date: Sun Feb 19 09:32:01 2012 +0300
Fix for moving files instead of copy when src isn't writable
Fixed a bug where a user drags and drops a file from a folder on the
same filesystem as the desktop but the src isn't writable by the user
so they can't delete the src file. The user will still see an error
message if they explicitly try to move the file via the right click
drag and drop menu.
src/xfdesktop-file-icon-manager.c | 13 +
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index 4a19539..2deb0a1 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -3097,18 +3097,20 @@
xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
/* If the user didn't pick whether to copy or move via
* a GDK_ACTION_ASK then determine if we should move/copy
- * by checking if the files are on the same file system.
+ * by checking if the files are on the same filesystem
+ * and are writable by the user.
*/
if(user_selected_action == FALSE) {
GFileInfo *src_info, *dest_info;
const gchar *src_name, *dest_name;
+
dest_info = g_file_query_info(base_dest_file,
-
G_FILE_ATTRIBUTE_ID_FILESYSTEM,
+
XFDESKTOP_FILE_INFO_NAMESPACE,
G_FILE_QUERY_INFO_NONE,
NULL,
NULL);
src_info = g_file_query_info(file_list-data,
-
G_FILE_ATTRIBUTE_ID_FILESYSTEM,
+ XFDESKTOP_FILE_INFO_NAMESPACE,
G_FILE_QUERY_INFO_NONE,
NULL,
NULL);
@@ -3119,7 +3121,10 @@
xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
src_name = g_file_info_get_attribute_string(src_info,
G_FILE_ATTRIBUTE_ID_FILESYSTEM);
-if(g_strcmp0(src_name, dest_name) == 0) {
+if((g_strcmp0(src_name, dest_name) == 0)
+g_file_info_get_attribute_boolean(src_info,
+G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
+{
copy_only = FALSE;
context-action = GDK_ACTION_MOVE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Fix typos in the README file
Updating branch refs/heads/eric/bugzilla-patches
to fc683b2be9893f61bc4ab7b9a8bcfb6a940fbd3a (commit)
from dba89439ee41f3cc793b44d9dc3630e3238228db (commit)
commit fc683b2be9893f61bc4ab7b9a8bcfb6a940fbd3a
Author: Eric Koegel eric.koe...@gmail.com
Date: Wed Feb 8 09:14:13 2012 +0300
Fix typos in the README file
README |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README b/README
index ad68c54..3ade158 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for xfdesktop version 4.5
+README for xfdesktop
WHAT IS IT?
@@ -40,7 +40,7 @@ You'd want to add something like this to your ~/.gtkrc-2.0
file:
style xfdesktop-icon-view {
XfdesktopIconView::label-alpha = 75
XfdesktopIconView::selected-label-alpha = 100
-XfdesktopIconVIew::ellipsize-icon-labels = 1
+XfdesktopIconView::ellipsize-icon-labels = 1
XfdesktopIconView::tooltip-size = 128
XfdesktopIconView::shadow-x-offset = 1
@@ -50,7 +50,7 @@ style xfdesktop-icon-view {
XfdesktopIconView::selected-shadow-y-offset = 2
XfdesktopIconView::selected-shadow-color = #00ff00
-XfdesktopIconVIew::cell-spacing = 6
+XfdesktopIconView::cell-spacing = 6
XfdesktopIconView::cell-padding = 6
XfdesktopIconView::cell-text-width-proportion = 2.5
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Stretch background across all monitors setting
Updating branch refs/heads/eric/bugzilla-patches
to 9cf3b10cf57a6e5f9a07536ef6056ce321abbc90 (commit)
from 0af2c17f9ff3f3a64da7bc3f07ce06cf6bb107fc (commit)
commit 9cf3b10cf57a6e5f9a07536ef6056ce321abbc90
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Feb 9 16:48:12 2012 +0300
Stretch background across all monitors setting
Added a 'Stretch background across all monitors.' checkbox to the
xfdesktop-settings app. It will only be visible on the first monitor tab and
only when multiple monitors are present. Bug 5690
settings/main.c| 19 +++
.../xfdesktop-settings-appearance-frame-ui.glade | 16
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/settings/main.c b/settings/main.c
index 9442f30..62bcbff 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -107,6 +107,8 @@ typedef struct
GtkWidget *backdrop_cycle_spinbox;
GtkWidget *backdrop_cycle_chkbox;
+
+GtkWidget *chk_xinerama_stretch;
} AppearancePanel;
typedef struct
@@ -1460,6 +1462,23 @@ xfdesktop_settings_dialog_add_screens(GtkBuilder
*main_gxml,
g_signal_connect(G_OBJECT(panel-btn_newlist), clicked,
G_CALLBACK(newlist_button_clicked), panel);
+panel-chk_xinerama_stretch =
GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
+
chk_xinerama_stretch));
+
+/* The first monitor has the option of doing the xinerama-stretch,
+ * but only if there's multiple monitors attached. Make it
invisible
+ * in all other cases.
+ */
+if(j == 0 nmonitors 1) {
+g_snprintf(buf, sizeof(buf),
/backdrop/screen%d/xinerama-stretch,
+ i);
+xfconf_g_property_bind(channel, buf, G_TYPE_BOOLEAN,
+G_OBJECT(panel-chk_xinerama_stretch),
active);
+gtk_widget_set_sensitive(panel-chk_xinerama_stretch, TRUE);
+} else {
+gtk_widget_hide(panel-chk_xinerama_stretch);
+}
+
panel-backdrop_cycle_chkbox =
GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
chk_cycle_backdrop));
panel-backdrop_cycle_spinbox =
GTK_WIDGET(gtk_builder_get_object(appearance_gxml,
diff --git a/settings/xfdesktop-settings-appearance-frame-ui.glade
b/settings/xfdesktop-settings-appearance-frame-ui.glade
index caf55fc..a397d94 100644
--- a/settings/xfdesktop-settings-appearance-frame-ui.glade
+++ b/settings/xfdesktop-settings-appearance-frame-ui.glade
@@ -576,6 +576,22 @@
property name=position2/property
/packing
/child
+ child
+object class=GtkCheckButton id=chk_xinerama_stretch
+ property name=visibleTrue/property
+ property name=sensitiveFalse/property
+ property name=can_focusTrue/property
+ property name=eventsGDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK/property
+ property name=label translatable=yesSt_retch this background
across all monitors./property
+ property name=tooltip-text translatable=yesWhen multiple
monitors are present, select this option to stretch the current background over
all of them./property
+ property name=use_underlineTrue/property
+ property name=draw_indicatorTrue/property
+/object
+packing
+ property name=expandFalse/property
+ property name=position3/property
+/packing
+ /child
/object
/child
/object
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Always use gdk_screen_get_monitor_geometry
Updating branch refs/heads/eric/bugzilla-patches
to c72329f0c4efa0b8cb062cf55e06026b23e1ac0a (commit)
from 9cf3b10cf57a6e5f9a07536ef6056ce321abbc90 (commit)
commit c72329f0c4efa0b8cb062cf55e06026b23e1ac0a
Author: Eric Koegel eric.koe...@gmail.com
Date: Wed Feb 8 11:18:19 2012 +0300
Always use gdk_screen_get_monitor_geometry
Drop the single monitor code in backdrop_changed_cb and instead
use gdk_screen_get_monitor_geometry since a single montior can
have an offset.
src/xfce-desktop.c |8 +---
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index df90f5d..da6f959 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -336,13 +336,7 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer
user_data)
if(!pix)
return;
-if(desktop-priv-nbackdrops == 1) {
-/* single monitor */
-rect.x = rect.y = 0;
-rect.width = gdk_screen_get_width(gscreen);
-rect.height = gdk_screen_get_height(gscreen);
-} else
-gdk_screen_get_monitor_geometry(gscreen, monitor, rect);
+gdk_screen_get_monitor_geometry(gscreen, monitor, rect);
gdk_draw_pixbuf(GDK_DRAWABLE(pmap), GTK_WIDGET(desktop)-style-black_gc,
pix, 0, 0, rect.x, rect.y,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Single click option to open items on desktop
Updating branch refs/heads/eric/bugzilla-patches to bab7bc4b9af228f5e1b313ebd83f1cfd655dde10 (commit) from ddc632474a7b4522fd84c5bbb599bf53103dbc07 (commit) commit bab7bc4b9af228f5e1b313ebd83f1cfd655dde10 Author: Eric Koegel eric.koe...@gmail.com Date: Sat Feb 11 12:50:09 2012 +0300 Single click option to open items on desktop This patch adds support to launch items from a single click based on an xfconf property /desktop-icons/single-click. Also adds a checkbox to xfdesktop-settings. Bug 1797. Code for changing the cursor to a hand when hovering over items was provided by Lionel Le Folgoc lio...@lefolgoc.net doc/README.xfconf|1 + settings/main.c |9 ++- settings/xfdesktop-settings-ui.glade | 10 +++ src/xfdesktop-icon-view.c| 136 ++ 4 files changed, 155 insertions(+), 1 deletions(-) diff --git a/doc/README.xfconf b/doc/README.xfconf index 3832521..74bf96e 100644 --- a/doc/README.xfconf +++ b/doc/README.xfconf @@ -37,6 +37,7 @@ property is listd after the name. use-custom-font-size bool font-size uint icon-size uint +single-click bool show-thumbnails bool file-icons show-filesystem bool diff --git a/settings/main.c b/settings/main.c index 62bcbff..554f802 100644 --- a/settings/main.c +++ b/settings/main.c @@ -70,6 +70,7 @@ #define DESKTOP_ICONS_ICON_SIZE_PROP /desktop-icons/icon-size #define DESKTOP_ICONS_FONT_SIZE_PROP /desktop-icons/font-size #define DESKTOP_ICONS_CUSTOM_FONT_SIZE_PROP /desktop-icons/use-custom-font-size +#define DESKTOP_ICONS_SINGLE_CLICK_PROP /desktop-icons/single-click #define DESKTOP_ICONS_SHOW_THUMBNAILS_PROP /desktop-icons/show-thumbnails #define DESKTOP_ICONS_SHOW_HOME /desktop-icons/file-icons/show-home #define DESKTOP_ICONS_SHOW_TRASH /desktop-icons/file-icons/show-trash @@ -1291,7 +1292,7 @@ xfdesktop_settings_dialog_add_screens(GtkBuilder *main_gxml, gint i, j, nmonitors, nscreens; GtkWidget *appearance_container, *chk_custom_font_size, *spin_font_size, *color_style_widget, *w, *box, - *spin_icon_size, *chk_show_thumbnails; + *spin_icon_size, *chk_show_thumbnails, *chk_single_click; appearance_container = GTK_WIDGET(gtk_builder_get_object(main_gxml, notebook_screens)); @@ -1311,6 +1312,9 @@ xfdesktop_settings_dialog_add_screens(GtkBuilder *main_gxml, chk_custom_font_size)); spin_font_size = GTK_WIDGET(gtk_builder_get_object(main_gxml, spin_font_size)); +chk_single_click = GTK_WIDGET(gtk_builder_get_object(main_gxml, + chk_single_click)); + g_signal_connect(G_OBJECT(chk_custom_font_size), toggled, G_CALLBACK(cb_xfdesktop_chk_custom_font_size_toggled), spin_font_size); @@ -1603,6 +1607,9 @@ xfdesktop_settings_dialog_add_screens(GtkBuilder *main_gxml, xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_THUMBNAILS_PROP, G_TYPE_BOOLEAN, G_OBJECT(chk_show_thumbnails), active); +xfconf_g_property_bind(channel, DESKTOP_ICONS_SINGLE_CLICK_PROP, + G_TYPE_BOOLEAN, G_OBJECT(chk_single_click), + active); setup_special_icon_list(main_gxml, channel); } diff --git a/settings/xfdesktop-settings-ui.glade b/settings/xfdesktop-settings-ui.glade index 5fcc836..eef177e 100644 --- a/settings/xfdesktop-settings-ui.glade +++ b/settings/xfdesktop-settings-ui.glade @@ -696,6 +696,16 @@ /object /child child + object class=GtkCheckButton id=chk_single_click +property name=visibleTrue/property +property name=can_focusTrue/property +property name=eventsGDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK/property +property name=label translatable=yesSingle _click to activate items/property +property name=use_underlineTrue/property +property name=draw_indicatorTrue/property + /object +/child +child object class=GtkHBox id=hbox9 property name=visibleTrue/property property name=eventsGDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
[Xfce4-commits] xfdesktop:eric/bugzilla-patches Require libexo update min requirements in readme
Updating branch refs/heads/eric/bugzilla-patches
to 95a5f72c444ff26777831fdffcffe64015324c4c (commit)
from bab7bc4b9af228f5e1b313ebd83f1cfd655dde10 (commit)
commit 95a5f72c444ff26777831fdffcffe64015324c4c
Author: Eric Koegel eric.koe...@gmail.com
Date: Sun Feb 19 23:29:17 2012 +0300
Require libexo update min requirements in readme
README| 16 +---
configure.ac.in |5 +++--
settings/main.c |5 -
src/xfdesktop-file-utils.c|2 --
src/xfdesktop-icon-view.c | 24 +---
src/xfdesktop-regular-file-icon.c |2 --
src/xfdesktop-volume-icon.c |4
7 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/README b/README
index 3ade158..987d7b1 100644
--- a/README
+++ b/README
@@ -17,14 +17,16 @@ MINIMUM REQUIREMENTS
* intltool 0.34
-* GTK+ 2.10.0
-* libxfce4util 4.5.0svn-r26490
-* libxfcegui4 4.5.2svn-r27035
-* libwnck 2.12.0
-* libxfce4menu 0.1.0svn-r26507 (optional; required for apps menu)
-* libthunar-vfs 0.8.0 (optional; required for file icons)
+* GTK+ 2.14.0
+* libxfce4util 4.8
+* libxfce4ui 4.9
+* libwnck 2.22
+* libexo 0.6
+* xfconf 4.8
+* garcon 0.1.2 (optional; required for apps menu)
+* thunar 1.2 (optional; required for file icons)
* dbus-glib 0.34 (optional; required for file icons)
-* libexo 0.3.2 (optional)
+* tumbler 1.6 (optional; enables thumbnail previews for file icons)
HIDDEN CUSTOMISATIONS
diff --git a/configure.ac.in b/configure.ac.in
index b22e8dc..ca0277f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -145,8 +145,9 @@ dnl calls AM_CONDITIONAL(), which cannot be in an 'if' block
XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-2], [thunar_minimum_version],
[thunarx],
[Thunar's extension mechanism, to add external features to the desktop
icon implementation])
-XDT_CHECK_OPTIONAL_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version], [exo],
-[libexo, for nifty icon effects])
+
+dnl LIBEXO is required if file icons are enabled
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
AC_ARG_ENABLE([desktop-menu],
diff --git a/settings/main.c b/settings/main.c
index 554f802..c6fbaad 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -46,10 +46,7 @@
#include libxfce4util/libxfce4util.h
#include xfconf/xfconf.h
#include libxfce4ui/libxfce4ui.h
-
-#ifdef HAVE_LIBEXO
#include exo/exo.h
-#endif
#include xfdesktop-common.h
#include xfdesktop-settings-ui.h
@@ -897,9 +894,7 @@ add_file_button_clicked(GtkWidget *button,
(GtkFileFilterFunc)gtk_true, NULL, NULL);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
-#ifdef HAVE_LIBEXO
exo_gtk_file_chooser_add_thumbnail_preview(GTK_FILE_CHOOSER(chooser));
-#endif
if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
GSList *filenames =
gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(chooser));
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 75bf0ce..5b015fd 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -570,13 +570,11 @@ xfdesktop_file_utils_get_icon(const gchar
*custom_icon_name,
}
}
-#ifdef HAVE_LIBEXO
if(opacity != 100) {
GdkPixbuf *tmp = exo_gdk_pixbuf_lucent(pix, opacity);
g_object_unref(G_OBJECT(pix));
pix = tmp;
}
-#endif
return pix;
}
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index d7dfdc4..868ba41 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -39,12 +39,7 @@
#include gdk/gdkx.h
#include gdk/gdkkeysyms.h
#include gtk/gtk.h
-
-#ifdef HAVE_LIBEXO
#include exo/exo.h
-#else
-#define I_(str) g_intern_static_string(str)
-#endif
#include xfdesktop-icon-view.h
#include xfdesktop-file-icon-manager.h
@@ -262,10 +257,10 @@ static void
xfdesktop_icon_view_invalidate_icon(XfdesktopIconView *icon_view,
gboolean recalc_extents);
static void xfdesktop_icon_view_icon_changed(XfdesktopIcon *icon,
gpointer user_data);
-#ifdef HAVE_LIBEXO
+
static void xfdesktop_icon_view_invalidate_icon_pixbuf(XfdesktopIconView
*icon_view,
XfdesktopIcon *icon);
-#endif
+
static void xfdesktop_icon_view_paint_icon(XfdesktopIconView *icon_view,
XfdesktopIcon *icon,
GdkRectangle *area);
@@ -1210,9 +1205,8 @@ xfdesktop_icon_view_motion_notify(GtkWidget *widget,
{
icon = icon_view-priv-item_under_pointer;
icon_view-priv-item_under_pointer = NULL;
-#ifdef HAVE_LIBEXO
+
xfdesktop_icon_view_invalidate_icon_pixbuf(icon_view, icon);
-#endif
}
} else {
[Xfce4-commits] midori:master Consider focus when toggling clear button
Updating branch refs/heads/master
to bbbfa0d677654b032c5c590fa415008ededcb710 (commit)
from d2fe0791e1e50e285d9b68862742e7151775eaef (commit)
commit bbbfa0d677654b032c5c590fa415008ededcb710
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Feb 19 21:53:58 2012 +0100
Consider focus when toggling clear button
Fixes: https://bugs.launchpad.net/midori/+bug/934083
katze/gtk3-compat.c | 15 +++
katze/gtk3-compat.h |4 +++-
midori/sokoke.c | 38 +++---
3 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/katze/gtk3-compat.c b/katze/gtk3-compat.c
index 0c0a436..8be8091 100644
--- a/katze/gtk3-compat.c
+++ b/katze/gtk3-compat.c
@@ -27,9 +27,9 @@ sokoke_on_entry_focus_in_event (GtkEntry* entry,
g_object_get_data (G_OBJECT (entry), sokoke_has_default));
if (has_default)
{
-gtk_entry_set_text (entry, );
g_object_set_data (G_OBJECT (entry), sokoke_has_default,
GINT_TO_POINTER (0));
+gtk_entry_set_text (entry, );
sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
PANGO_STYLE_NORMAL);
}
@@ -46,9 +46,9 @@ sokoke_on_entry_focus_out_event (GtkEntry* entry,
{
const gchar* default_text = (const gchar*)g_object_get_data (
G_OBJECT (entry), sokoke_default_text);
-gtk_entry_set_text (entry, default_text);
g_object_set_data (G_OBJECT (entry),
sokoke_has_default, GINT_TO_POINTER (1));
+gtk_entry_set_text (entry, default_text);
sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
PANGO_STYLE_ITALIC);
}
@@ -73,6 +73,9 @@ gtk_entry_set_placeholder_text (GtkEntry*entry,
/* Note: The default text initially overwrites any previous text */
gchar* old_value = g_object_get_data (G_OBJECT (entry),
sokoke_default_text);
+g_object_set_data (G_OBJECT (entry), sokoke_default_text,
+ (gpointer)default_text);
+
if (!old_value)
{
g_object_set_data (G_OBJECT (entry), sokoke_has_default,
@@ -98,8 +101,12 @@ gtk_entry_set_placeholder_text (GtkEntry*entry,
PANGO_STYLE_ITALIC);
}
}
-g_object_set_data (G_OBJECT (entry), sokoke_default_text,
- (gpointer)default_text);
+}
+
+const gchar*
+gtk_entry_get_placeholder_text (GtkEntry* entry)
+{
+return g_object_get_data (G_OBJECT (entry), sokoke_default_text);
}
#endif
diff --git a/katze/gtk3-compat.h b/katze/gtk3-compat.h
index fddfe97..70bc5c3 100644
--- a/katze/gtk3-compat.h
+++ b/katze/gtk3-compat.h
@@ -89,8 +89,10 @@ G_BEGIN_DECLS
#if !GTK_CHECK_VERSION (3, 2, 0) defined (HAVE_HILDON_2_2)
#define gtk_entry_set_placeholder_text
hildon_gtk_entry_set_placeholder_text
+#define gtk_entry_get_placeholder_text
hildon_gtk_entry_get_placeholder_text
#elif !GTK_CHECK_VERSION (3, 2, 0)
-#define gtk_entry_set_placeholder_text sokoke_entry_set_default_text
+void gtk_entry_set_placeholder_text (GtkEntry* entry, const gchar* text);
+const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry);
#endif
#if !GTK_CHECK_VERSION(2, 12, 0)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index e60087b..3db12aa 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1731,18 +1731,40 @@ midori_download_prepare_tooltip_text (WebKitDownload*
download)
return g_string_free (tooltip, FALSE);
}
+static gboolean
+sokoke_entry_has_placeholder_text (GtkEntry* entry)
+{
+const gchar* text = gtk_entry_get_text (entry);
+const gchar* hint = gtk_entry_get_placeholder_text (entry);
+if (!gtk_widget_has_focus (GTK_WIDGET (entry))
+ hint != NULL
+ (text == NULL || !strcmp (text, hint)))
+return TRUE;
+return FALSE;
+}
+
static void
sokoke_entry_changed_cb (GtkEditable* editable,
GtkEntry*entry)
{
-const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry));
-gboolean visible = text *text;
+const gchar* text = gtk_entry_get_text (entry);
+gboolean visible = text *text
+ ! sokoke_entry_has_placeholder_text (entry);
gtk_icon_entry_set_icon_from_stock (
GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_SECONDARY,
visible ? GTK_STOCK_CLEAR : NULL);
}
+static gboolean
+sokoke_entry_focus_out_event_cb (GtkEditable* editable,
+ GdkEventFocus* event,
+ GtkEntry* entry)
+{
+sokoke_entry_changed_cb (editable, entry);
+return FALSE;
+}
+
static void
sokoke_entry_icon_released_cb (GtkEntry*entry,
GtkIconEntryPosition icon_pos,
@@ -1769,17 +1791,27 @@ sokoke_entry_set_clear_button_visible
[Xfce4-commits] xfce4-power-manager:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to 3623d1acd59a89173543a34a65675811e6cce28f (commit) from 5aa7fee2307f7ae826b0d9cf475f4dd9ce1e50b1 (commit) commit 3623d1acd59a89173543a34a65675811e6cce28f Author: Michal Várady miko.v...@gmail.com Date: Sun Feb 19 22:09:15 2012 +0100 l10n: Updated Czech (cs) translation to 100% New status: 211 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/cs.po b/po/cs.po index d97f896..e16c505 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,8 +7,8 @@ msgid msgstr Project-Id-Version: xfce 4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-01 22:21+\n -PO-Revision-Date: 2012-01-02 02:07+0100\n +POT-Creation-Date: 2012-02-19 16:00+\n +PO-Revision-Date: 2012-02-19 22:08+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech\n Language: \n @@ -474,11 +474,11 @@ msgstr Baterie #: ../src/xfpm-power-common.c:124 #: ../src/xfpm-battery.c:824 msgid UPS -msgstr Záložní zdroj napájení UPS +msgstr Záložní zdroj UPS #: ../src/xfpm-power-common.c:126 msgid Line power -msgstr Síťové napájení +msgstr Elektrická síť #: ../src/xfpm-power-common.c:128 msgid Mouse ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to 895f0cf4e2a1d81deb300a10ca140fbb6d6a66b6 (commit) from 3623d1acd59a89173543a34a65675811e6cce28f (commit) commit 895f0cf4e2a1d81deb300a10ca140fbb6d6a66b6 Author: Michal Várady miko.v...@gmail.com Date: Sun Feb 19 22:13:39 2012 +0100 l10n: Updated Czech (cs) translation to 100% New status: 211 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index e16c505..1e23b92 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: xfce 4-power-manager\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-02-19 16:00+\n -PO-Revision-Date: 2012-02-19 22:08+0100\n +PO-Revision-Date: 2012-02-19 22:10+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech\n Language: \n @@ -956,7 +956,7 @@ msgstr Bezdrátový adaptér Intel #: ../src/xfpm-power-info.c:218 #, c-format msgid Timer %s -msgstr Odpočet času %s +msgstr Časovač %s #. TRANSLATORS: this is a task that's woken up from sleeping #: ../src/xfpm-power-info.c:221 @@ -1009,7 +1009,7 @@ msgstr Místní přerušení #. TRANSLATORS: interrupts when a task gets moved from one core to another #: ../src/xfpm-power-info.c:248 msgid Rescheduling interrupts -msgstr Opětovné naplánování přerušení +msgstr Přeplánováná přerušení #: ../src/xfpm-power-info.c:331 msgid Attribute ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master l10n: Updated Czech (cs) translation to 100%
Updating branch refs/heads/master to 336f107353d6af642fc433be510a914b5afcacf9 (commit) from 93a1d86208c03df476681c3b2f9a10d73b9f2f19 (commit) commit 336f107353d6af642fc433be510a914b5afcacf9 Author: Michal Várady miko.v...@gmail.com Date: Sun Feb 19 22:27:18 2012 +0100 l10n: Updated Czech (cs) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/cs.po | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/cs.po b/po/cs.po index 27e2000..34beccc 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,8 +7,8 @@ msgid msgstr Project-Id-Version: xfce 4-i18-goodies\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-21 19:18+\n -PO-Revision-Date: 2012-01-22 01:42+0100\n +POT-Creation-Date: 2012-02-19 20:00+\n +PO-Revision-Date: 2012-02-19 22:27+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech\n Language: \n @@ -48,7 +48,7 @@ msgstr Prosíme, abyste chyby hlásili na adresu %s. #: ../thunar-volman/main.c:174 #, c-format msgid There is no device with the sysfs path \%s\ -msgstr Neexistuje zažízení s cestou sysfs \%s\ +msgstr Neexistuje zařízení s cestou sysfs \%s\ #: ../thunar-volman/main.c:186 #, c-format @@ -272,7 +272,7 @@ msgstr Vypálit disk _DVD #: ../thunar-volman/tvm-run.c:200 msgid Blank CD inserted -msgstr Vložen prázdný disk CD. +msgstr Vložen prázdný disk CD #: ../thunar-volman/tvm-run.c:201 msgid You have inserted a blank CD. @@ -306,7 +306,7 @@ msgstr Byl nalezen fotoaparát #: ../thunar-volman/tvm-usb-device.c:71 msgid Printer detected -msgstr Nalezena tirkárna +msgstr Nalezena tiskárna #: ../thunar-volman/tvm-usb-device.c:72 msgid A USB printer was detected ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Move data source saving into MidoriView
Updating branch refs/heads/master
to f549824b6601386d9118637f59d0b6b6bed6c770 (commit)
from bbbfa0d677654b032c5c590fa415008ededcb710 (commit)
commit f549824b6601386d9118637f59d0b6b6bed6c770
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Feb 19 22:43:38 2012 +0100
Move data source saving into MidoriView
midori/midori-browser.c | 135 +++---
midori/midori-view.c| 103
midori/midori-view.h|5 ++
3 files changed, 117 insertions(+), 126 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 1a17445..eaeac38 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -37,10 +37,6 @@
#include unistd.h
#endif
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
-
#ifdef HAVE_HILDON_2_2
#include dbus/dbus.h
#include mce/mode-names.h
@@ -991,14 +987,9 @@ midori_browser_prepare_download (MidoriBrowser* browser,
return TRUE;
}
-static gchar*
-midori_browser_save_source (const gchar* uri,
-const gchar* data,
-const size_t len,
-const gchar* outfile);
-
static void
midori_browser_save_uri (MidoriBrowser* browser,
+ MidoriView*view,
const gchar* uri)
{
static gchar* last_dir = NULL;
@@ -1007,7 +998,6 @@ midori_browser_save_uri (MidoriBrowser* browser,
gchar* filename;
gchar* dirname;
gchar* last_slash;
-gchar* folder;
if (!gtk_widget_get_visible (GTK_WIDGET (browser)))
return;
@@ -1045,24 +1035,11 @@ midori_browser_save_uri (MidoriBrowser* browser,
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
-GtkWidget* view;
-GtkWidget* web_view;
-WebKitWebDataSource *data_source;
-WebKitWebFrame *frame;
-const GString *data;
-
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER
(dialog));
-view = midori_browser_get_current_tab (browser);
-web_view = midori_view_get_web_view (MIDORI_VIEW (view));
-frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
-data_source = webkit_web_frame_get_data_source (frame);
-data = webkit_web_data_source_get_data (data_source);
-if (data)
-midori_browser_save_source (uri, data-str, data-len, filename);
+midori_view_save_source (view, uri, filename);
-g_free (last_dir);
-last_dir = folder;
+katze_assign (last_dir,
+gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
}
gtk_widget_destroy (dialog);
}
@@ -1072,10 +1049,8 @@ midori_view_save_as_cb (GtkWidget* menuitem,
const gchar* uri,
GtkWidget* view)
{
-MidoriBrowser* browser;
-
-browser = midori_browser_get_for_widget (menuitem);
-midori_browser_save_uri (browser, uri);
+MidoriBrowser* browser = midori_browser_get_for_widget (view);
+midori_browser_save_uri (browser, MIDORI_VIEW (view), uri);
}
static gchar*
@@ -2371,7 +2346,8 @@ static void
_action_save_as_activate (GtkAction* action,
MidoriBrowser* browser)
{
-midori_browser_save_uri (browser, midori_browser_get_current_uri
(browser));
+GtkWidget* view = midori_browser_get_current_tab (browser);
+midori_browser_save_uri (browser, MIDORI_VIEW (view), NULL);
}
static void
@@ -3365,112 +3341,19 @@ _action_view_encoding_activate (GtkAction* action,
}
}
-static gchar*
-midori_browser_get_uri_extension (const gchar* uri)
-{
-gchar* slash;
-gchar* period;
-gchar* ext_end;
-
-/* Find the last slash in the URI and search for the last period
- *after* the last slash. This is not completely accurate
- but should cover most (simple) URIs */
-slash = strrchr (uri, '/');
-/* Huh, URI without slashes? */
-if (!slash)
-return NULL;
-
-ext_end = period = strrchr (slash, '.');
-if (!period)
- return NULL;
-
-/* Skip the period */
-ext_end++;
-/* If *ext_end is 0 here, the URI ended with a period, so skip */
-if (!*ext_end)
- return NULL;
-
-/* Find the end of the extension */
-while (*ext_end g_ascii_isalnum (*ext_end))
-ext_end++;
-
-*ext_end = 0;
-return g_strdup (period);
-}
-
-static gchar*
-midori_browser_save_source (const gchar* uri,
-const gchar* data,
-const size_t len,
-const gchar* outfile)
-{
-gchar* unique_filename;
-gint fd;
-FILE* fp;
-size_t ret;
-
-if (!outfile)
-{
-gchar* filename;
-gchar* extension;
-
-extension =
[Xfce4-commits] midori:master Fix warnings in midori_location_action_set_security_hint
Updating branch refs/heads/master
to 5643728994df2b98da822149c515001f793bd294 (commit)
from b20a1e7efd101df88f562c24f8fa40c2175bc1d9 (commit)
commit 5643728994df2b98da822149c515001f793bd294
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Feb 19 22:58:54 2012 +0100
Fix warnings in midori_location_action_set_security_hint
midori/midori-locationaction.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index f725032..0e9bcaa 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1655,16 +1655,20 @@ midori_location_action_set_security_hint
(MidoriLocationAction* location_action,
for (; proxies != NULL; proxies = g_slist_next (proxies))
if (GTK_IS_TOOL_ITEM (proxies-data))
{
+#if !GTK_CHECK_VERSION (3, 0, 0)
const gchar* bg_color = NULL;
const gchar* fg_color = NULL;
+#endif
GtkWidget* entry = midori_location_action_entry_for_proxy
(proxies-data);
GdkScreen* screen = gtk_widget_get_screen (entry);
GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
if (hint == MIDORI_SECURITY_UNKNOWN)
{
+#if !GTK_CHECK_VERSION (3, 0, 0)
bg_color = #ef7070;
fg_color = #000;
+#endif
#if !HAVE_HILDON
if (gtk_icon_theme_has_icon (icon_theme,
channel-insecure-symbolic))
gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
@@ -1681,8 +1685,10 @@ midori_location_action_set_security_hint
(MidoriLocationAction* location_action,
}
else if (hint == MIDORI_SECURITY_TRUSTED)
{
+#if !GTK_CHECK_VERSION (3, 0, 0)
bg_color = #d1eeb9;
fg_color = #000;
+#endif
#if !HAVE_HILDON
if (gtk_icon_theme_has_icon (icon_theme,
channel-secure-symbolic))
gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] garcon:master Use applications-science icon for education directory.
Updating branch refs/heads/master to 6ddc4b984723e902f6903eb644856aae48ab3ed6 (commit) from 8755acc9ea228bcf8e32def589659151bd43c111 (commit) commit 6ddc4b984723e902f6903eb644856aae48ab3ed6 Author: Nick Schermer n...@xfce.org Date: Sun Feb 19 23:11:11 2012 +0100 Use applications-science icon for education directory. data/xfce/xfce-education.directory.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/xfce/xfce-education.directory.in b/data/xfce/xfce-education.directory.in index 3b2885d..344af5f 100644 --- a/data/xfce/xfce-education.directory.in +++ b/data/xfce/xfce-education.directory.in @@ -1,6 +1,6 @@ [Desktop Entry] Version=1.0 Type=Directory -Icon=applications-education +Icon=applications-science _Name=Education _Comment=Educational software ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Remove password openssl-based encryption support
Updating branch refs/heads/master
to af9ec62b25c7181c6bd5cb755dca9aab5d3701e5 (commit)
from 5643728994df2b98da822149c515001f793bd294 (commit)
commit af9ec62b25c7181c6bd5cb755dca9aab5d3701e5
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Feb 19 23:18:41 2012 +0100
Remove password openssl-based encryption support
extensions/formhistory/formhistory-crypt.c| 77 -
extensions/formhistory/formhistory-crypt.h| 27 -
extensions/formhistory/formhistory-frontend.h |8 ++-
extensions/formhistory/formhistory.c | 47 ---
4 files changed, 32 insertions(+), 127 deletions(-)
diff --git a/extensions/formhistory/formhistory-crypt.c
b/extensions/formhistory/formhistory-crypt.c
deleted file mode 100644
index 3c968c0..000
--- a/extensions/formhistory/formhistory-crypt.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- Copyright (C) 2009-2012 Alexander Butenko a.bute...@gmail.com
- Copyright (C) 2009-2012 Christian Dywan christ...@twotoasts.de
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-*/
-#include string.h
-#include openssl/bio.h
-#include openssl/evp.h
-#include openssl/rand.h
-#include glib.h
-#define BUF_SIZE 256
-
-typedef unsigned char uc;
-
-const char *iv =12345678;
-
-gchar*
-formhistory_encrypt (const gchar* input,
- const gchar* key)
-{
-int outlen=0, auxlen=0;
-EVP_CIPHER_CTX ctx;
-size_t inputSize;
-char buff[BUF_SIZE];
-
-if (!input)
-return NULL;
-
-inputSize = strlen (input);
-memset (buff[0], '\0', BUF_SIZE);
-
-EVP_CIPHER_CTX_init (ctx);
-EVP_EncryptInit (ctx, EVP_bf_cbc (), (unsigned char*)key, (unsigned
char*)iv);
-
-if (EVP_EncryptUpdate (ctx, (uc*)buff, outlen, (uc*)input, inputSize)
!= 1)
-return NULL;
-if (EVP_EncryptFinal (ctx, (uc*)buff + outlen, auxlen) != 1)
-return NULL;
-
-outlen += auxlen;
-EVP_CIPHER_CTX_cleanup (ctx);
-return g_base64_encode ((const guchar*)buff, outlen);
-}
-
-gchar*
-formhistory_decrypt (const gchar* b64input,
- const gchar* key)
-{
-int outlen=0, auxlen=0;
-EVP_CIPHER_CTX ctx;
-char buff[BUF_SIZE];
-guchar* input;
-size_t inputSize;
-
-if (!b64input)
-return NULL;
-
-input = g_base64_decode (b64input, inputSize);
-memset (buff, 0, BUF_SIZE);
-
-EVP_CIPHER_CTX_init ( ctx);
-EVP_DecryptInit ( ctx, EVP_bf_cbc(), (unsigned char*)key, (uc*)iv);
-
-if (EVP_DecryptUpdate ( ctx, (uc*)buff, outlen, (uc*)input, inputSize)
!= 1)
-return NULL;
-if (EVP_DecryptFinal ( ctx, (uc*)buff + outlen, auxlen) != 1)
-return NULL;
-
-outlen += auxlen;
-g_free (input);
-EVP_CIPHER_CTX_cleanup (ctx);
-return g_strndup (buff, outlen);
-}
diff --git a/extensions/formhistory/formhistory-crypt.h
b/extensions/formhistory/formhistory-crypt.h
deleted file mode 100644
index 0aada77..000
--- a/extensions/formhistory/formhistory-crypt.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright (C) 2009-2012 Alexander Butenko a.bute...@gmail.com
- Copyright (C) 2009-2012 Christian Dywan christ...@twotoasts.de
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-*/
-
-#ifndef __FORMHISTORY_CRYPT_H__
-#define __FORMHISTORY_CRYPT_H__
-
-typedef struct
-{
-gchar* domain;
-gchar* form_data;
-FormHistoryPriv* priv;
-} FormhistoryPasswordEntry;
-
-gchar*
-formhistory_encrypt (const gchar* input, const gchar* key);
-
-gchar*
-formhistory_decrypt (const gchar* b64input, const char* key);
-
-#endif
diff --git a/extensions/formhistory/formhistory-frontend.h
b/extensions/formhistory/formhistory-frontend.h
index c483e84..378ae65 100644
--- a/extensions/formhistory/formhistory-frontend.h
+++ b/extensions/formhistory/formhistory-frontend.h
@@ -41,9 +41,15 @@ typedef struct
#endif
gchar* master_password;
int master_password_canceled;
-int password_manager_enabled;
} FormHistoryPriv;
+typedef struct
+{
+gchar* domain;
+gchar* form_data;
+FormHistoryPriv* priv;
+} FormhistoryPasswordEntry;
+
FormHistoryPriv*
formhistory_private_new ();
diff --git a/extensions/formhistory/formhistory.c
b/extensions/formhistory/formhistory.c
index f7a4910..90d6185 100644
--- a/extensions/formhistory/formhistory.c
+++ b/extensions/formhistory/formhistory.c
@@ -11,7 +11,6 @@
#define MINCHARS 2
#define GTK_RESPONSE_IGNORE 99
#include formhistory-frontend.h
-#include formhistory-crypt.h
static void
formhistory_toggle_state_cb (GtkAction* action,
@@ -141,6 +140,14 @@
[Xfce4-commits] www:master l10n: Updated Chinese (China) (zh_CN) translation to 21%
Updating branch refs/heads/master to da9cb7a44fe8a469fcf47cd9d4ca02441799145e (commit) from 8506aa7213e5ac210fa37bce6a4503c82cc5a87c (commit) commit da9cb7a44fe8a469fcf47cd9d4ca02441799145e Author: Chipong Luo chipong@yahoo.com Date: Mon Feb 20 07:39:48 2012 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 21% New status: 147 messages complete with 0 fuzzies and 526 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/zh_CN.po | 14 +- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/po/zh_CN.po b/lib/po/zh_CN.po index 47bdfff..a424eb6 100644 --- a/lib/po/zh_CN.po +++ b/lib/po/zh_CN.po @@ -179,12 +179,12 @@ msgid available. We will try to highlight some of the new features which have been added since the last stable release. msgstr -长久期待的 Xfce 桌面环境 4.6.0 版终于发布了。我们将试着 +期待已久的 Xfce 桌面环境 4.6.0 版终于发布了。我们将试着 突出某些从上个稳定版发布以来添加的新功能。 #: about/tour46.php:9 msgid Improved desktop experience with Xfdesktop -msgstr 用 Xfdesktop 提升桌面体验 +msgstr 用 Xfdesktop 改善桌面体验 #: about/tour46.php:12 msgid @@ -228,7 +228,7 @@ msgid improved set of panel plugins. msgstr 许多长期摆在那的缺陷已经在 bXfce4 Panel/b 中修复了， -特别是对于多屏设置，但此新发布也带来了一个增强的面板设置。 +特别是对于多屏设置，但此新发布也带来了一个改进的面板设置。 #: about/tour46.php:32 msgid New binary clock @@ -266,7 +266,7 @@ msgstr #: about/tour46.php:49 msgid Improved session manager -msgstr +msgstr 改进的会话管理器 #: about/tour46.php:52 msgid @@ -277,10 +277,14 @@ msgid you are not left without a desktop, panel, window manager, etcetera, if a crash occurs. msgstr +伴随 bXfce 4.6/b 而来的是一增强的会话管理器：您的会话 +应该可以启动得快些，且重写了设置对话框以便降低会话性应用 +程序管理的难度。而且，会话管理器在崩溃发生时会自动重启会 +话应用程序，这样您就不会丢失桌面、面板、窗口管理器等等。 #: about/tour46.php:56 msgid Session settings dialog -msgstr +msgstr 会话设置对话框 #: about/tour46.php:60 msgid ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:xfce-4.8 l10n: Updated Slovak (sk) translation to 100%
Updating branch refs/heads/xfce-4.8 to 210b721a853aa67978a830fe33815b20a2106af1 (commit) from d64110105a143106cab9225650124c76730dbd3b (commit) commit 210b721a853aa67978a830fe33815b20a2106af1 Author: Tomáš Vadina kyber...@gmail.com Date: Mon Feb 20 07:40:34 2012 +0100 l10n: Updated Slovak (sk) translation to 100% New status: 347 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sk.po | 14 -- 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/po/sk.po b/po/sk.po index cb9a9ba..4d2c3f1 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,19 +5,19 @@ # Roman Moravcik roman.morav...@gmail.com, 2006. # Robert Hartl hartl.rob...@gmail.com, 2009, 2010. # Tomáš Vadina kyber...@gmail.com, 2011, 2012. -# +# msgid msgstr Project-Id-Version: xfce4-panel 4.8.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-02-13 08:18+\n +POT-Creation-Date: 2012-02-20 03:36+\n PO-Revision-Date: 2012-02-13 14:38+0100\n Last-Translator: Tomáš Vadina kyber...@gmail.com\n Language-Team: slovenčina slovenska-lokalizacia-x...@googlegroups.com\n -Language: sk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: sk\n Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n=2 n=4) ? 2 : 0;\n X-Poedit-Language: Slovak\n X-Poedit-Country: SLOVAKIA\n @@ -29,7 +29,7 @@ msgstr Pridať na panel nový spúšťač založený na informáciách zo súbo #: ../panel-desktop-handler.desktop.in.h:2 msgid Create Launcher on the panel -msgstr Vytvoriť spúšťač na panely +msgstr Vytvoriť spúšťač na paneli #: ../panel-preferences.desktop.in.h:1 msgid Customize the panel @@ -433,7 +433,8 @@ msgstr _Položky msgid L_ength (%): msgstr _Dĺžka (%): -#. I18N: name of the section (frame) in the panel preferences where the user can define the length and size of the panel +#. I18N: name of the section (frame) in the panel preferences where the user +#. can define the length and size of the panel #: ../panel/panel-preferences-dialog.glade.h:18 msgid Measurements msgstr Rozmery @@ -870,7 +871,8 @@ msgstr Zobraziť _sekundy msgid F_ormat: msgstr _Formát: -#. I18N: the fuzziness the *precision* of the fuzzy clock. Time steps of 5, 15 or parts of the day. +#. I18N: the fuzziness the *precision* of the fuzzy clock. Time steps of 5, 15 +#. or parts of the day. #: ../plugins/clock/clock-dialog.glade.h:11 msgid F_uzziness: msgstr _Približnosť: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master l10n: Updated Chinese (China) (zh_CN) translation to 23%
Updating branch refs/heads/master to 90ee5b51c2706181a6777ad49b4c9d2170a4f91b (commit) from da9cb7a44fe8a469fcf47cd9d4ca02441799145e (commit) commit 90ee5b51c2706181a6777ad49b4c9d2170a4f91b Author: Chipong Luo chipong@yahoo.com Date: Mon Feb 20 08:02:42 2012 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 23% New status: 157 messages complete with 0 fuzzies and 516 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/zh_CN.po | 21 - 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/po/zh_CN.po b/lib/po/zh_CN.po index a424eb6..6466b14 100644 --- a/lib/po/zh_CN.po +++ b/lib/po/zh_CN.po @@ -293,14 +293,17 @@ msgid now has two additional buttons which offer to suspend or hibernate your computer. msgstr +会话管理器还包括一个期待已久的功能：对 b待机/b 和 b休眠/b 的 +“即开即用” 的支持。注销对话框现在有另外两个按钮用来让 +您的计算机待机或休眠。 #: about/tour46.php:64 msgid Session logout dialog -msgstr +msgstr 会话注销对话框 #: about/tour46.php:67 msgid Window manager -msgstr +msgstr 窗口管理器 #: about/tour46.php:70 msgid @@ -308,36 +311,44 @@ msgid many bugs have been fixed, support for multiple displays has been added, and overall performance has been improved. msgstr +与往常一样，bXfwm4/b 在此发行周期内成熟了不少：修复了很多 +缺陷、添加了对多显示的支持，且提升了总体性能。 #: about/tour46.php:73 msgid In addition to some other new features, bXfwm4/b is now able to detect windows that do not respond and offer to terminate them. msgstr +除了一些其它新功能，bXfwm4/b 现在能够侦测无响应的窗口并 +终止它们。 #: about/tour46.php:77 msgid Dialog to terminate busy applications -msgstr +msgstr 终止无响应应用程序的对话框 #: about/tour46.php:81 msgid There is also a new bactions menu/b which allows you to quickly move and resize windows, put them above or below other windows, or fullscreen them. msgstr +还有一个新的 b动作菜单/b 让您快速地移动窗口和调整其大小、 +将它们放在其它窗口之上或之下或全屏显示它们。 #: about/tour46.php:85 msgid New actions menu -msgstr +msgstr 新的动作菜单 #: about/tour46.php:89 msgid A new bfill/b operation has been implemented; it expands a given window to the available space without overlapping other adjacent windows. msgstr +新的 b填充/b 操作已实现；它可以将给定窗口扩展至可用空间 +而不遮住其它相邻窗口 #: about/tour46.php:93 msgid Fill operation -msgstr +msgstr 填充操作 #: about/tour46.php:97 msgid ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
