[Xfce4-commits] xfwm4:xfce-4.10 l10n: Updated Hindi (hi) translation to 31%
Updating branch refs/heads/xfce-4.10 to 2866e7f59fdc0308b5affa0881eae905f4afa524 (commit) from 4b8e51a6bc7d2f5a4e6d1785c615beceb1ca (commit) commit 2866e7f59fdc0308b5affa0881eae905f4afa524 Author: Anurag Garg ang.astron...@gmail.com Date: Mon Oct 29 09:23:02 2012 +0100 l10n: Updated Hindi (hi) translation to 31% New status: 74 messages complete with 96 fuzzies and 65 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hi.po | 23 --- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/po/hi.po b/po/hi.po index bfe788b..8aa80ef 100644 --- a/po/hi.po +++ b/po/hi.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfwm4 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-10-13 18:21+\n +POT-Creation-Date: 2012-10-29 03:30+\n PO-Revision-Date: 2005-10-09 20:44+0900\n Last-Translator: Ravishankar Shrivastava raviratl...@yahoo.com\n Language-Team: Hindi indlinux-gr...@lists.sourceforge.net\n @@ -34,7 +34,7 @@ msgstr बिल्कुल नहीं #: ../settings-dialogs/tweaks-settings.c:454 msgid Session manager socket -msgstr +msgstr सत्र प्रबंधक साकेट #: ../settings-dialogs/tweaks-settings.c:454 #: ../settings-dialogs/workspace-settings.c:381 @@ -62,6 +62,8 @@ msgid %s: %s\n Try %s --help to see a full list of available command line options.\n msgstr +%s: %s\n +आज़माए %s --help पूर्ण उपलब्ध कमाण्ड सुची विक्लप देखने के लिए।\n #: ../settings-dialogs/workspace-settings.c:74 #: ../settings-dialogs/workspace-settings.c:89 @@ -218,7 +220,7 @@ msgstr फोकस देने हेतु क्लिक करें #: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout -msgstr +msgstr अभिन्यास बदलने के लिए बटन को क्लिक् करके खिचें #: ../settings-dialogs/xfwm4-dialog.glade.h:28 msgid Close @@ -295,7 +297,7 @@ msgstr टाइटल बार में डबल क्लिक करन #: ../settings-dialogs/xfwm4-dialog.glade.h:46 msgid The window title cannot be removed -msgstr +msgstr विंडो शीर्षक हटाया नही जा सकता #: ../settings-dialogs/xfwm4-dialog.glade.h:47 msgid Title @@ -329,12 +331,11 @@ msgstr फोकस माडल #: ../settings-dialogs/xfwm4-dialog.glade.h:54 msgid _Reset to Defaults -msgstr +msgstr _R मुलभूत पर बदले #: ../settings-dialogs/xfwm4-dialog.glade.h:55 -#, fuzzy msgid _Style -msgstr शीर्षक +msgstr _S शैली #: ../settings-dialogs/xfwm4-settings.c:220 #: ../settings-dialogs/xfwm4-settings.c:253 @@ -377,19 +378,19 @@ msgstr दाँया #: ../settings-dialogs/xfwm4-settings.c:236 msgid Window operations menu -msgstr +msgstr विंडो कार्य प्रणाली मेन्यु #: ../settings-dialogs/xfwm4-settings.c:237 msgid Up -msgstr +msgstr ऊपर #: ../settings-dialogs/xfwm4-settings.c:238 msgid Down -msgstr +msgstr निचे #: ../settings-dialogs/xfwm4-settings.c:241 msgid Cancel -msgstr +msgstr रद्द करें #: ../settings-dialogs/xfwm4-settings.c:242 #, fuzzy ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:xfce-4.10 l10n: Updated Hindi (hi) translation to 42%
Updating branch refs/heads/xfce-4.10 to 545198349d216a58bb2bea733c52e16dd0c5bef4 (commit) from 2866e7f59fdc0308b5affa0881eae905f4afa524 (commit) commit 545198349d216a58bb2bea733c52e16dd0c5bef4 Author: Anurag Garg ang.astron...@gmail.com Date: Mon Oct 29 09:45:22 2012 +0100 l10n: Updated Hindi (hi) translation to 42% New status: 99 messages complete with 72 fuzzies and 64 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hi.po | 74 +- 1 files changed, 25 insertions(+), 49 deletions(-) diff --git a/po/hi.po b/po/hi.po index 8aa80ef..89b95a8 100644 --- a/po/hi.po +++ b/po/hi.po @@ -82,9 +82,8 @@ msgstr तंत्र प्रबंधक साकेट #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-dialog.glade.h:29 -#, fuzzy msgid Configure window behavior and shortcuts -msgstr आकार बदलने पर विंडो की चीजों को दिखाएं +msgstr समनुरुपण विंडो का व्यवहार व शॉर्ट्कट # gnome-session/splash.c:71 #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:2 @@ -94,9 +93,8 @@ msgstr विन्डो प्रबंधक #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:16 -#, fuzzy msgid Fine-tune window behaviour and effects -msgstr आकार बदलने पर विंडो की चीजों को दिखाएं +msgstr समनुरुपण विंडो का व्यवहार व प्रभाव ठिक करें # gnome-session/splash.c:71 #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 @@ -214,9 +212,8 @@ msgstr स्वतः फोकस दें #: ../settings-dialogs/xfwm4-dialog.glade.h:26 -#, fuzzy msgid Clic_k to focus -msgstr फोकस देने हेतु क्लिक करें +msgstr फोकस देने हेतु क्लिक करें _k #: ../settings-dialogs/xfwm4-dialog.glade.h:27 msgid Click and drag the buttons to change the layout @@ -227,9 +224,8 @@ msgid Close msgstr बंद करें #: ../settings-dialogs/xfwm4-dialog.glade.h:30 -#, fuzzy msgid Delay _before raising focused window: -msgstr फोकस किए विंडो को ऊपर लाने से पहले विलम्ब +msgstr फोकस किए विंडो को ऊपर लाने से पहले विलम्ब _b #: ../settings-dialogs/xfwm4-dialog.glade.h:31 msgid Dis_tance: @@ -244,9 +240,8 @@ msgid Hidden msgstr हिडन #: ../settings-dialogs/xfwm4-dialog.glade.h:34 -#, fuzzy msgid Hide content of windows when _moving -msgstr खिसकाने पर विंडो की चीजों को दिखाएं +msgstr खिसकाने पर विंडो की चीजों को छिपाएँ _m #: ../settings-dialogs/xfwm4-dialog.glade.h:35 msgid Hide content of windows when _resizing @@ -291,9 +286,8 @@ msgid Stick msgstr स्टिक #: ../settings-dialogs/xfwm4-dialog.glade.h:45 -#, fuzzy msgid The action to perform when the title-bar is double-clicked -msgstr टाइटल बार में डबल क्लिक करने पर क्रिया निष्पादन : +msgstr टाइटल बार में डबल क्लिक करने पर क्रियान्वित क्रिया #: ../settings-dialogs/xfwm4-dialog.glade.h:46 msgid The window title cannot be removed @@ -304,30 +298,25 @@ msgid Title msgstr शीर्षक #: ../settings-dialogs/xfwm4-dialog.glade.h:49 -#, fuzzy msgid Wrap workspaces when _dragging a window off the screen -msgstr जब स्क्रीन के बाहर विंडो को खींचें तो कार्यस्थानों को व्रेप करें +msgstr जब स्क्रीन के बाहर विंडो को खींचें तो कार्यस्थानों को व्रेप करें _d #: ../settings-dialogs/xfwm4-dialog.glade.h:50 -#, fuzzy msgid Wrap workspaces when the _pointer reaches the screen edge -msgstr जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें +msgstr जब पाइंटर स्क्रीन के किनारे पर पंहुचे तो कार्यस्थानों को व्रेप करें _p #: ../settings-dialogs/xfwm4-dialog.glade.h:51 -#, fuzzy msgid _Delay before window receives focus: -msgstr फोकस किए विंडो को ऊपर लाने से पहले विलम्ब +msgstr फोकस किए विंडो को ऊपर लाने से पहले विलम्ब _D #: ../settings-dialogs/xfwm4-dialog.glade.h:52 -#, fuzzy msgid _Edge resistance: -msgstr किनारा प्रतिरोध : +msgstr _E किनारा प्रतिरोध : #: ../settings-dialogs/xfwm4-dialog.glade.h:53 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:43 -#, fuzzy msgid _Focus -msgstr फोकस माडल +msgstr _F फोकस #: ../settings-dialogs/xfwm4-dialog.glade.h:54 msgid _Reset to Defaults @@ -354,9 +343,8 @@ msgstr विंडो को अधिकतम करें #: ../settings-dialogs/xfwm4-settings.c:223 #: ../settings-dialogs/xfwm4-settings.c:258 -#, fuzzy msgid Fill window -msgstr विंडो छुपाएं +msgstr विंडो भरें #: ../settings-dialogs/xfwm4-settings.c:224 msgid Nothing @@ -393,68 +381,56 @@ msgid Cancel msgstr रद्द करें #: ../settings-dialogs/xfwm4-settings.c:242 -#, fuzzy msgid Cycle windows -msgstr विंडो छुपाएं +msgstr विंडो घुमाएँ #: ../settings-dialogs/xfwm4-settings.c:243 -#, fuzzy msgid Cycle windows (Reverse) -msgstr विंडो छुपाएं +msgstr विंडो घुमाएँ (उलटा) #: ../settings-dialogs/xfwm4-settings.c:244 -#, fuzzy msgid Switch window for same application -msgstr नया विंडो फोकस +msgstr समान अनुप्रयोग के लिए विंडो को बदलें #: ../settings-dialogs/xfwm4-settings.c:245 msgid Switch application -msgstr +msgstr अनुप्रयोग बदले #: ../settings-dialogs/xfwm4-settings.c:246 -#, fuzzy msgid Close window -msgstr विंडो छुपाएं +msgstr
[Xfce4-commits] xfwm4:xfce-4.10 l10n: Updated Hindi (hi) translation to 52%
Updating branch refs/heads/xfce-4.10 to bb4e119ca651589a1bcd66142b3dd3f67cdd65df (commit) from 545198349d216a58bb2bea733c52e16dd0c5bef4 (commit) commit bb4e119ca651589a1bcd66142b3dd3f67cdd65df Author: Anurag Garg ang.astron...@gmail.com Date: Mon Oct 29 10:00:19 2012 +0100 l10n: Updated Hindi (hi) translation to 52% New status: 124 messages complete with 49 fuzzies and 62 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hi.po | 75 + 1 files changed, 26 insertions(+), 49 deletions(-) diff --git a/po/hi.po b/po/hi.po index 89b95a8..bc980a3 100644 --- a/po/hi.po +++ b/po/hi.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfwm4 4.4.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-10-29 03:30+\n +POT-Creation-Date: 2012-10-29 08:51+\n PO-Revision-Date: 2005-10-09 20:44+0900\n Last-Translator: Ravishankar Shrivastava raviratl...@yahoo.com\n Language-Team: Hindi indlinux-gr...@lists.sourceforge.net\n @@ -433,127 +433,104 @@ msgid Raise or lower window msgstr विंडो को उठाएँ या निचे करे #: ../settings-dialogs/xfwm4-settings.c:259 -#, fuzzy msgid Fill window horizontally -msgstr विंडो को अधिकतम करें +msgstr क्षितिज के समांतर दिशा में विंडो को भरें #: ../settings-dialogs/xfwm4-settings.c:260 -#, fuzzy msgid Fill window vertically -msgstr विंडो को अधिकतम करें +msgstr विंडो को लंबवत भरें #: ../settings-dialogs/xfwm4-settings.c:261 msgid Toggle above -msgstr +msgstr ऊपर स्थानांतरित करें #: ../settings-dialogs/xfwm4-settings.c:262 msgid Toggle fullscreen -msgstr +msgstr पूर्ण-स्क्रीन में बदलें #: ../settings-dialogs/xfwm4-settings.c:263 -#, fuzzy msgid Move window to upper workspace -msgstr नया विंडो फोकस +msgstr विंडो को ऊपर वाले कार्यक्षेत्र में भेजे #: ../settings-dialogs/xfwm4-settings.c:264 -#, fuzzy msgid Move window to bottom workspace -msgstr नया विंडो फोकस +msgstr विंडो को निचे वाले कार्यक्षेत्र में भेजे #: ../settings-dialogs/xfwm4-settings.c:265 -#, fuzzy msgid Move window to left workspace -msgstr नया विंडो फोकस +msgstr विंडो को बायँ कार्यक्षेत्र में भेजे #: ../settings-dialogs/xfwm4-settings.c:266 -#, fuzzy msgid Move window to right workspace -msgstr नया विंडो फोकस +msgstr विंडो को दायँ कार्यक्षेत्र में भेजे #: ../settings-dialogs/xfwm4-settings.c:267 -#, fuzzy msgid Move window to previous workspace -msgstr कार्यस्थान व्रेप करें +msgstr विंडो को पिछले कार्यक्षेत्र में भेजे #: ../settings-dialogs/xfwm4-settings.c:268 -#, fuzzy msgid Move window to next workspace -msgstr नया विंडो फोकस +msgstr विंडो को अगले कार्यक्षेत्र में भेजे #: ../settings-dialogs/xfwm4-settings.c:269 -#, fuzzy msgid Move window to workspace 1 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र १ में भेजे #: ../settings-dialogs/xfwm4-settings.c:270 -#, fuzzy msgid Move window to workspace 2 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र २ में भेजे #: ../settings-dialogs/xfwm4-settings.c:271 -#, fuzzy msgid Move window to workspace 3 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ३ में भेजे #: ../settings-dialogs/xfwm4-settings.c:272 -#, fuzzy msgid Move window to workspace 4 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ४ में भेजे #: ../settings-dialogs/xfwm4-settings.c:273 -#, fuzzy msgid Move window to workspace 5 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ५ में भेजे #: ../settings-dialogs/xfwm4-settings.c:274 -#, fuzzy msgid Move window to workspace 6 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ६ में भेजे #: ../settings-dialogs/xfwm4-settings.c:275 -#, fuzzy msgid Move window to workspace 7 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ७ में भेजे #: ../settings-dialogs/xfwm4-settings.c:276 -#, fuzzy msgid Move window to workspace 8 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ८ में भेजे #: ../settings-dialogs/xfwm4-settings.c:277 -#, fuzzy msgid Move window to workspace 9 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ९ में भेजे #: ../settings-dialogs/xfwm4-settings.c:278 -#, fuzzy msgid Move window to workspace 10 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र १० में भेजे #: ../settings-dialogs/xfwm4-settings.c:279 -#, fuzzy msgid Move window to workspace 11 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र ११ में भेजे #: ../settings-dialogs/xfwm4-settings.c:280 -#, fuzzy msgid Move window to workspace 12 -msgstr नया विंडो फोकस +msgstr विंडो को कार्यक्षेत्र १२ में भेजे #: ../settings-dialogs/xfwm4-settings.c:281 -#, fuzzy msgid Tile window to the top -msgstr नया विंडो फोकस +msgstr विंडो को शीर्ष भाग में टाइल करें #: ../settings-dialogs/xfwm4-settings.c:282 -#, fuzzy msgid Tile window to the bottom -msgstr नया विंडो फोकस +msgstr विंडो को निचले भाग में टाइल करें #: ../settings-dialogs/xfwm4-settings.c:283 -#, fuzzy msgid Tile window to the left -msgstr विंडो छुपाएं +msgstr विंडो को बायँ भाग में
[Xfce4-commits] midori:master Include main resource and fix target checks
Updating branch refs/heads/master
to 4c83c3947ead7df9394d040a83ac1c2b8625f62a (commit)
from f7b4119d85c96a0ab19ea0c4dd822fd4f49018dd (commit)
commit 4c83c3947ead7df9394d040a83ac1c2b8625f62a
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Oct 29 10:12:02 2012 +0100
Include main resource and fix target checks
Fixes: https://bugs.launchpad.net/midori/+bug/1072412
midori/midori-browser.c |2 +-
midori/midori-view.c| 12
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index b7bddc5..b90c699 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1039,7 +1039,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
GtkWidget* dialog;
const gchar* title = midori_view_get_display_title (view);
gchar* filename;
-GList* resources = midori_view_get_subresources (view);
+GList* resources = midori_view_get_resources (view);
gboolean file_only = TRUE;
GtkWidget* checkbox = NULL;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 37cc78f..a2bda09 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1993,21 +1993,22 @@ midori_web_view_menu_image_new_tab_activate_cb
(GtkWidget* widget,
}
GList*
-midori_view_get_subresources (MidoriView* view)
+midori_view_get_resources (MidoriView* view)
{
WebKitWebView* web_view = WEBKIT_WEB_VIEW (view-web_view);
WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
WebKitWebDataSource* data_source = webkit_web_frame_get_data_source
(frame);
-return webkit_web_data_source_get_subresources (data_source);
+GList* resources = webkit_web_data_source_get_subresources (data_source);
+return g_list_prepend (resources, webkit_web_data_source_get_main_resource
(data_source));
}
static GString*
midori_view_get_data_for_uri (MidoriView* view,
const gchar* uri)
{
-GList* resources = midori_view_get_subresources (view);
+GList* resources = midori_view_get_resources (view);
GList* list;
-GString* result;
+GString* result = NULL;
for (list = resources; list; list = g_list_next (list))
{
@@ -2032,7 +2033,9 @@ midori_view_clipboard_get_image_cb (GtkClipboard*
clipboard,
MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, view));
WebKitHitTestResult* hit_test = user_data;
gchar* uri = katze_object_get_string (hit_test, image-uri);
+GdkAtom target = gtk_selection_data_get_target (selection_data);
/* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */
+if (gtk_targets_include_image (target, 1, TRUE))
{
GString* data = midori_view_get_data_for_uri (view, uri);
if (data != NULL)
@@ -2053,6 +2056,7 @@ midori_view_clipboard_get_image_cb (GtkClipboard*
clipboard,
g_warn_if_reached ();
}
/* if (gtk_selection_data_targets_include_text (selection_data)) */
+if (gtk_targets_include_text (target, 1))
gtk_selection_data_set_text (selection_data, uri, -1);
g_free (uri);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Allow zeitgeist dependency to be disable
Updating branch refs/heads/master
to 6891492f1ee56b86caf495650a22fd82c910219a (commit)
from 4c83c3947ead7df9394d040a83ac1c2b8625f62a (commit)
commit 6891492f1ee56b86caf495650a22fd82c910219a
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Oct 29 10:39:10 2012 +0100
Allow zeitgeist dependency to be disable
Fixes: https://bugs.launchpad.net/midori/+bug/1072459
wscript |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/wscript b/wscript
index f55ee97..f8d4167 100644
--- a/wscript
+++ b/wscript
@@ -237,7 +237,8 @@ def configure (conf):
granite = 'no '
conf.define ('GRANITE_VERSION', 'No')
-check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=False)
+if option_enabled ('zeitgeist'):
+check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=True)
conf.check (lib='m', mandatory=True)
check_pkg ('gmodule-2.0', '2.8.0', False)
check_pkg ('gthread-2.0', '2.8.0', False)
@@ -445,6 +446,7 @@ def set_options (opt):
add_enable_option ('tests', 'building of tests', group, disable=True)
add_enable_option ('hildon', 'Maemo integration', group, disable=not
is_maemo ())
add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group,
disable=True)
+add_enable_option ('zeitgeist', 'Zeitgeist history integration', group,
disable=is_win32 (os.environ))
# Provided for compatibility
opt.add_option ('--build', help='Ignored')
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Unit test view source and reset source tabs for new URLs
Updating branch refs/heads/master
to bc557f9988141f5ed14ad259edeb7d17a86e1261 (commit)
from 6891492f1ee56b86caf495650a22fd82c910219a (commit)
commit bc557f9988141f5ed14ad259edeb7d17a86e1261
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Oct 29 11:07:50 2012 +0100
Unit test view source and reset source tabs for new URLs
Fixes: https://bugs.launchpad.net/midori/+bug/875295
midori/midori-tab.vala |2 +-
midori/midori-view.c |8 +---
tests/tab.vala | 21 +
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/midori/midori-tab.vala b/midori/midori-tab.vala
index d70e9c3..b6c78a9 100644
--- a/midori/midori-tab.vala
+++ b/midori/midori-tab.vala
@@ -119,7 +119,7 @@ namespace Midori {
}
public bool can_view_source () {
-if (is_blank () || special)
+if (is_blank () || special || web_view.get_view_source_mode ())
return false;
string content_type = ContentType.from_mime_type (mime_type);
#if HAVE_WIN32
diff --git a/midori/midori-view.c b/midori/midori-view.c
index a2bda09..59df6a6 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2767,13 +2767,6 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*
web_view,
{
if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view),
mime_type))
{
-gboolean view_source = FALSE;
-/* Dedicated source code views are always pseudo-blank pages */
-if (midori_view_is_blank (view))
-view_source = webkit_web_view_get_view_source_mode
(WEBKIT_WEB_VIEW (web_view));
-
-webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW (web_view),
view_source);
-
if (web_frame == webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW
(web_view)))
{
g_warn_if_fail (mime_type != NULL);
@@ -4061,6 +4054,7 @@ midori_view_set_uri (MidoriView* view,
midori_tab_set_uri (MIDORI_TAB (view), uri);
katze_item_set_uri (view-item, midori_tab_get_uri (MIDORI_TAB
(view)));
katze_assign (view-title, NULL);
+webkit_web_view_set_view_source_mode (WEBKIT_WEB_VIEW
(view-web_view), FALSE);
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view-web_view), uri);
}
}
diff --git a/tests/tab.vala b/tests/tab.vala
index c01868b..3fe1439 100644
--- a/tests/tab.vala
+++ b/tests/tab.vala
@@ -127,6 +127,27 @@ void tab_special () {
assert (tab.can_view_source ());
assert (!tab.special);
assert (tab.can_save ());
+tab.destroy ();
+
+/* Mimic browser: SourceView with no external editor */
+var source = new Midori.View.with_title ();
+browser.add (source);
+source.web_view.set_view_source_mode (true);
+source.web_view.load_uri (http://example.com;);
+do { loop.iteration (true); } while (source.load_status !=
Midori.LoadStatus.FINISHED);
+assert (!source.is_blank ());
+assert (!source.can_view_source ());
+/* FIXME assert (!source.special); */
+/* FIXME assert (source.can_save ()); */
+assert (source.web_view.get_view_source_mode ());
+
+source.set_uri (http://.invalid;);
+do { loop.iteration (true); } while (source.load_status !=
Midori.LoadStatus.FINISHED);
+assert (!source.is_blank ());
+assert (!source.can_view_source ());
+assert (source.special);
+assert (!source.can_save ());
+assert (!source.web_view.get_view_source_mode ());
}
void main (string[] args) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Integrate GraniteWidgets.NavigationBox into Midori.Tab
Updating branch refs/heads/master
to 4abfbf7d44ea8b0cfd247b7b8105b443b2954930 (commit)
from bc557f9988141f5ed14ad259edeb7d17a86e1261 (commit)
commit 4abfbf7d44ea8b0cfd247b7b8105b443b2954930
Author: Tom Beckmann t...@elementaryos.org
Date: Sun Oct 28 16:43:28 2012 +0100
Integrate GraniteWidgets.NavigationBox into Midori.Tab
extensions/wscript_build |4 ++-
midori/midori-app.c |5 +++
midori/midori-tab.vala | 11 +++
midori/midori-view.c | 70 +-
midori/wscript_build |4 ++-
wscript |2 +
6 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/extensions/wscript_build b/extensions/wscript_build
index cf556c9..5e2b41e 100644
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -32,13 +32,15 @@ for extension in extensions:
obj.target = target
obj.includes = '.. ../katze ../midori'
obj.source = source
-obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON'
+obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML HILDON CLUTTER
GRANITE'
obj.vapi_dirs = '../midori ../katze'
obj.packages = 'glib-2.0 gio-2.0 libsoup-2.4 sqlite3 midori midori-core
katze'
if bld.env['HAVE_GTK3']:
obj.packages += ' gtk+-3.0 webkitgtk-3.0'
else:
obj.packages += ' gtk+-2.0 webkit-1.0 unique-1.0'
+if bld.env['HAVE_GRANITE']:
+obj.packages += ' clutter-gtk-1.0 granite'
obj.install_path = '${LIBDIR}/midori'
if bld.env['platform'] == 'win32':
obj.uselib_local = 'midori'
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 0b4fba5..05fc559 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1436,8 +1436,13 @@ midori_app_setup (gint *argc,
textdomain (GETTEXT_PACKAGE);
#endif
+#ifdef HAVE_GRANITE
+success = gtk_clutter_init_with_args (argc, argument_vector,
_([Addresses]),
+ (GOptionEntry*)entries,
GETTEXT_PACKAGE, error);
+#else
success = gtk_init_with_args (argc, argument_vector, _([Addresses]),
entries, GETTEXT_PACKAGE, error);
+#endif
factory = gtk_icon_factory_new ();
for (i = 0; i G_N_ELEMENTS (items); i++)
diff --git a/midori/midori-tab.vala b/midori/midori-tab.vala
index b6c78a9..db6e6a8 100644
--- a/midori/midori-tab.vala
+++ b/midori/midori-tab.vala
@@ -36,6 +36,10 @@ namespace Midori {
public class Tab : Gtk.VBox {
public WebKit.WebView web_view { get; private set; }
+#if HAVE_GRANITE
+public Granite.Widgets.NavigationBox navigation_box { get; private
set; }
+#endif
+
private string current_uri = about:blank;
public string uri { get {
return current_uri;
@@ -90,6 +94,10 @@ namespace Midori {
orientation = Gtk.Orientation.VERTICAL;
#endif
+#if HAVE_GRANITE
+navigation_box = new Granite.Widgets.NavigationBox ();
+#endif
+
web_view = new WebKit.WebView ();
/* Load something to avoid a bug where WebKit might not set a main
frame */
web_view.load_uri ();
@@ -187,6 +195,9 @@ namespace Midori {
}
public void go_forward () {
+#if HAVE_GRANITE
+navigation_box.forward ();
+#endif
web_view.go_forward ();
}
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 59df6a6..47c1028 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -787,6 +787,10 @@ webkit_web_view_load_committed_cb (WebKitWebView*
web_view,
if (web_frame != webkit_web_view_get_main_frame (web_view))
return;
+#ifdef HAVE_GRANITE
+GraniteWidgetsNavigationBox* navigation_box =
midori_tab_get_navigation_box (MIDORI_TAB (view));
+granite_widgets_navigation_box_transition_ready (navigation_box);
+#endif
g_object_freeze_notify (G_OBJECT (view));
uri = webkit_web_frame_get_uri (web_frame);
@@ -3071,32 +3075,6 @@ midori_view_init (MidoriView* view)
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW
(view-scrolled_window),
GTK_SHADOW_NONE);
-#if GTK_CHECK_VERSION(3, 2, 0)
-view-overlay = gtk_overlay_new ();
-gtk_widget_show (view-overlay);
-gtk_container_add (GTK_CONTAINER (view-overlay), view-scrolled_window);
-gtk_box_pack_start (GTK_BOX (view), view-overlay, TRUE, TRUE, 0);
-
-/* Overlays must be created before showing GtkOverlay as of GTK+ 3.2 */
-{
-GtkWidget* frame = gtk_frame_new (NULL);
-view-overlay_label = gtk_label_new (NULL);
-gtk_widget_show (view-overlay_label);
-gtk_container_add (GTK_CONTAINER (frame), view-overlay_label);
-gtk_widget_set_halign (frame, GTK_ALIGN_START);
-gtk_widget_set_valign (frame, GTK_ALIGN_END);
-gtk_overlay_add_overlay
[Xfce4-commits] xfce4-trigger-launcher:master l10n: Updated Hindi (hi) translation to 100%
Updating branch refs/heads/master to c738a4895e763d6be1de161b90052e5e7aea4340 (commit) from c4960e2da8825195f77055455e3638bcac45dcb2 (commit) commit c738a4895e763d6be1de161b90052e5e7aea4340 Author: Anurag Garg ang.astron...@gmail.com Date: Mon Oct 29 14:26:51 2012 +0100 l10n: Updated Hindi (hi) translation to 100% New status: 23 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hi.po |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/hi.po b/po/hi.po index 4c2f782..ec27e25 100644 --- a/po/hi.po +++ b/po/hi.po @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2011-06-18 18:43+0530\n Last-Translator: Anurag Garg ang.astron...@gmail.com\n Language-Team: Hindi indlinux-gr...@lists.sourceforge.net\n -Language: hi\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: hi\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Generator: Virtaal 0.6.1\n @@ -88,7 +88,6 @@ msgid Icon: msgstr आइकन #: ../panel-plugin/xfce-trigger-launcher-options.c:236 -#, fuzzy msgid To Check Status msgstr स्थिति की जाँच करने के लिए ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 5e1fbd28338cc6f26d762c579d5097b235e665c8 (commit) from 1d62ea7fb76ce14c87c61dd4a41d6ccc5b9c6095 (commit) commit 5e1fbd28338cc6f26d762c579d5097b235e665c8 Author: Sergio Marques smarque...@gmail.com Date: Mon Oct 29 15:06:35 2012 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 347 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 154 +++--- 1 files changed, 107 insertions(+), 47 deletions(-) diff --git a/po/pt.po b/po/pt.po index 39dba49..0fbfd38 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-09-30 18:27+\n +POT-Creation-Date: 2012-10-29 12:36+\n PO-Revision-Date: 2012-04-27 15:49+0100\n Last-Translator: Nuno Miguel nunom...@gmail.com\n Language-Team: \n @@ -228,21 +228,21 @@ msgstr pixeis/seg #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:94 -#: ../dialogs/display-settings/main.c:102 +#: ../dialogs/display-settings/main.c:136 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid Settings manager socket msgstr Socket do gestor de definições #: ../dialogs/accessibility-settings/main.c:43 #: ../dialogs/appearance-settings/main.c:94 -#: ../dialogs/display-settings/main.c:102 +#: ../dialogs/display-settings/main.c:136 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79 msgid SOCKET ID msgstr ID de SOCKET #: ../dialogs/accessibility-settings/main.c:44 #: ../dialogs/appearance-settings/main.c:95 -#: ../dialogs/display-settings/main.c:103 +#: ../dialogs/display-settings/main.c:137 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43 #: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39 @@ -251,7 +251,7 @@ msgstr Informações da versão #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:966 -#: ../dialogs/display-settings/main.c:1043 +#: ../dialogs/display-settings/main.c:1922 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63 #: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60 @@ -261,7 +261,7 @@ msgstr Digite '%s --help' para informações de utilização. #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:985 -#: ../dialogs/display-settings/main.c:1062 +#: ../dialogs/display-settings/main.c:1941 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82 #: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76 @@ -270,7 +270,7 @@ msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados. #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:986 -#: ../dialogs/display-settings/main.c:1063 +#: ../dialogs/display-settings/main.c:1942 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83 #: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77 @@ -295,7 +295,7 @@ msgid Appearance msgstr Aparência #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3 -#: ../dialogs/display-settings/main.c:82 +#: ../dialogs/display-settings/main.c:116 msgid Both msgstr Ambos @@ -390,7 +390,8 @@ msgstr Menus e botões #: ../dialogs/appearance-settings/appearance-dialog.glade.h:22 #: ../dialogs/appearance-settings/main.c:852 -#: ../dialogs/display-settings/main.c:79 +#: ../dialogs/display-settings/main.c:102 +#: ../dialogs/display-settings/main.c:113 msgid None msgstr Nenhum @@ -559,70 +560,106 @@ msgid Display msgstr Ecrã #: ../dialogs/display-settings/display-dialog.glade.h:3 +msgid Mirror displays +msgstr Inverter ecrãs + +#: ../dialogs/display-settings/display-dialog.glade.h:4 +msgid Position: +msgstr Posição: + +#: ../dialogs/display-settings/display-dialog.glade.h:5 msgid R_esolution: msgstr R_esolução: -#: ../dialogs/display-settings/display-dialog.glade.h:4 +#: ../dialogs/display-settings/display-dialog.glade.h:6 msgid Ref_lection: msgstr Ref_lexo: -#: ../dialogs/display-settings/display-dialog.glade.h:5 +#: ../dialogs/display-settings/display-dialog.glade.h:7 msgid Refresh _rate: msgstr Ta_xa de atualização: -#: ../dialogs/display-settings/display-dialog.glade.h:6 +#: ../dialogs/display-settings/display-dialog.glade.h:8 msgid Ro_tation: msgstr Ro_tação: -#: ../dialogs/display-settings/display-dialog.glade.h:7 -msgid _Use this output -msgstr _Utilizar este escrã +#:
[Xfce4-commits] orage:master l10n: Updated Hindi (hi) translation to 32%
Updating branch refs/heads/master to e5e83c0fb11971e6758047e0608296a1b12771ea (commit) from 7ab55d777fe274ac419309479cb567b58955e17e (commit) commit e5e83c0fb11971e6758047e0608296a1b12771ea Author: Anurag Garg ang.astron...@gmail.com Date: Mon Oct 29 16:53:09 2012 +0100 l10n: Updated Hindi (hi) translation to 32% New status: 262 messages complete with 26 fuzzies and 513 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hi.po | 439 ++ 1 files changed, 244 insertions(+), 195 deletions(-) diff --git a/po/hi.po b/po/hi.po index d0f3f51..3c153b8 100644 --- a/po/hi.po +++ b/po/hi.po @@ -8,13 +8,13 @@ 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: 2011-06-19 21:02+0530\n +PO-Revision-Date: 2012-10-29 21:22+0530\n Last-Translator: Anurag Garg ang.astron...@gmail.com\n Language-Team: Hindi indlinux-gr...@lists.sourceforge.net\n +Language: hi\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: hi\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Generator: Virtaal 0.6.1\n @@ -53,13 +53,11 @@ msgid adjust to change hour msgstr घंटे को परिवर्तित करने कि लिए समायोजित करें #: ../globaltime/globaltime.c:496 -msgid -adjust to change minute. Click arrows with button 2 to change only 1 minute. -msgstr -मिनट को परिवर्तित करने के लिए समायोजित करें। केवल 1 मिनट का परिवर्तन करने कि लिए बटन -2 को तीर के साथ क्लिक करें। +msgid adjust to change minute. Click arrows with button 2 to change only 1 minute. +msgstr मिनट को परिवर्तित करने के लिए समायोजित करें। केवल 1 मिनट का परिवर्तन करने कि लिए बटन 2 को तीर के साथ क्लिक करें। -#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266 +#: ../globaltime/gt_prefs.c:265 +#: ../globaltime/gt_prefs.c:266 msgid NEW msgstr नया @@ -75,7 +73,8 @@ msgstr अंतिम घड़ी को हटाना संभव नह msgid update this clock msgstr इस घड़ी का अद्यतन करें -#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034 +#: ../globaltime/gt_prefs.c:521 +#: ../globaltime/gt_prefs.c:1034 msgid add new empty clock msgstr नई खाली घड़ी जोड़े @@ -107,7 +106,8 @@ msgstr इस घड़ी को सबसे पिछे खिसकाए msgid set the timezone of this clock to be local timezone msgstr इस घड़ी के समय क्षेत्र को स्थानीय समयक्षेत्र पर निर्धारित करें -#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042 +#: ../globaltime/gt_prefs.c:568 +#: ../globaltime/gt_prefs.c:1042 msgid close window and exit msgstr खिड़की बंद करें और बाहर निकलें @@ -137,7 +137,8 @@ msgid Text Formatting msgstr पाठ स्वरूपण #. background- -#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856 +#: ../globaltime/gt_prefs.c:649 +#: ../globaltime/gt_prefs.c:856 msgid Background color: msgstr पृष्ठभूमि का रंग: @@ -145,22 +146,31 @@ msgstr पृष्ठभूमि का रंग: msgid Click to change background colour for clock msgstr घड़ी की पृष्ठभूमि के रंग को बदलने के लिए क्लिक करें -#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697 -#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762 -#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826 -#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905 -#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972 +#: ../globaltime/gt_prefs.c:665 +#: ../globaltime/gt_prefs.c:697 +#: ../globaltime/gt_prefs.c:729 +#: ../globaltime/gt_prefs.c:762 +#: ../globaltime/gt_prefs.c:796 +#: ../globaltime/gt_prefs.c:826 +#: ../globaltime/gt_prefs.c:872 +#: ../globaltime/gt_prefs.c:905 +#: ../globaltime/gt_prefs.c:938 +#: ../globaltime/gt_prefs.c:972 msgid Use default msgstr मूलभूत का उपयोग करें -#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702 -#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768 -#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832 +#: ../globaltime/gt_prefs.c:670 +#: ../globaltime/gt_prefs.c:702 +#: ../globaltime/gt_prefs.c:735 +#: ../globaltime/gt_prefs.c:768 +#: ../globaltime/gt_prefs.c:802 +#: ../globaltime/gt_prefs.c:832 msgid Cross this to use default instead of selected value msgstr चयनित मान के बजाय मूलभूत का उपयोग करने के लिए इसे क्रॉस करें #. foreground- -#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889 +#: ../globaltime/gt_prefs.c:681 +#: ../globaltime/gt_prefs.c:889 msgid Foreground (=text) color: msgstr अग्रभूमि (= पाठ) रंग: @@ -169,7 +179,8 @@ msgid Click to change foreground colour for clock msgstr घड़ी के अग्रभूमि के रंग को बदलने के लिए क्लिक करें #. name font- -#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922 +#: ../globaltime/gt_prefs.c:713 +#: ../globaltime/gt_prefs.c:922 msgid Font for name of clock: msgstr घड़ी का नाम के लिए फॉन्ट: @@ -178,7 +189,8 @@ msgid
[Xfce4-commits] xfce4-dict:master l10n: Serbian translation
Updating branch refs/heads/master
to 4b816f5704951f0f2f0f9bc0b748cf7bce9fa2ef (commit)
from 3cbe5fab72c4cee2ff8e33abf77a332e14ece6bc (commit)
commit 4b816f5704951f0f2f0f9bc0b748cf7bce9fa2ef
Author: Саша Петровић salepetron...@gmail.com
Date: Mon Oct 29 18:26:16 2012 +0100
l10n: Serbian translation
New status: 102 messages complete with 0 fuzzies and 9 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{zh_TW.po = sr.po} | 249 ++--
1 files changed, 133 insertions(+), 116 deletions(-)
diff --git a/po/zh_TW.po b/po/sr.po
similarity index 54%
copy from po/zh_TW.po
copy to po/sr.po
index 2588899..a56bfd4 100644
--- a/po/zh_TW.po
+++ b/po/sr.po
@@ -2,200 +2,207 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
-#
+# Саша Петровић salepetron...@gmail.com, 2012.
+#
msgid
msgstr
-Project-Id-Version: xfce4-dict master\n
+Project-Id-Version: master\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-08-09 13:06+\n
-PO-Revision-Date: 2012-07-11 18:36+0800\n
-Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n
-Language-Team: chinese-l10n chinese-l...@googlegroups.com\n
+POT-Creation-Date: 2012-09-27 14:06+\n
+PO-Revision-Date: 2012-10-29 11:32+0100\n
+Last-Translator: Саша Петровић salepetron...@gmail.com\n
+Language-Team: српски xfce-i...@xfce.org\n
+Language: \n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
-Language: \n
-Plural-Forms: nplurals=2; plural=(n1);\n
+Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n
+%10010 || n%100=20) ? 1 : 2);\n
+X-Generator: Gtranslator 2.91.5\n
#: ../panel-plugin/xfce4-dict-plugin.desktop.in.h:1
msgid A plugin to query different dictionaries.
-msgstr 可查詢不同字典的插件。
+msgstr Прикључак за упит различитим речницима.
#: ../panel-plugin/xfce4-dict-plugin.desktop.in.h:2
#: ../src/xfce4-dict.desktop.in.h:2 ../lib/gui.c:736 ../lib/prefs.c:270
msgid Dictionary
-msgstr 字典
+msgstr Речник
#: ../panel-plugin/xfce4-dict-plugin.c:366
#: ../panel-plugin/xfce4-dict-plugin.c:492 ../src/xfce4-dict.c:200
#: ../lib/spell.c:243 ../lib/gui.c:516
msgid Ready
-msgstr 就緒
+msgstr Спреман
#: ../panel-plugin/xfce4-dict-plugin.c:431
msgid Look up a word
-msgstr
+msgstr Прегледај реч
#: ../panel-plugin/xfce4-dict-plugin.c:467 ../lib/gui.c:766
msgid Search term
-msgstr
+msgstr Тражи израз
#: ../src/xfce4-dict.c:51
msgid Search the given text using a Dict server(RFC 2229)
-msgstr
+msgstr Тражи дати текст користећи речник сервер (RFC 2229)
#: ../src/xfce4-dict.c:52
msgid Search the given text using a web-based search engine
-msgstr
+msgstr Тражи дати текст користећи веб погон претраге
#: ../src/xfce4-dict.c:53
msgid Check the given text with a spell checker
-msgstr
+msgstr Провери дати текст правописара
#: ../src/xfce4-dict.c:54
msgid Grab the focus on the text field in the panel
-msgstr
+msgstr Пребаци фокус на поље уноса на панелу
#: ../src/xfce4-dict.c:55
msgid Start stand-alone application even if the panel plugin is loaded
-msgstr
+msgstr Покрени посебан програм иако је прикључак за панел учитан
#: ../src/xfce4-dict.c:56
msgid Grabs the PRIMARY selection content and uses it as search text
-msgstr
+msgstr Преузима садржај примарног избора и користи га за претрагу текста
#: ../src/xfce4-dict.c:57
msgid Be verbose
-msgstr
+msgstr Опширнији испис
#: ../src/xfce4-dict.c:58
msgid Show version information
-msgstr
+msgstr Прикажи податке о издању
#: ../src/xfce4-dict.c:131
msgid [TEXT]
-msgstr
+msgstr [ТЕКСТ]
#: ../src/xfce4-dict.c:147
#, c-format
msgid Please report bugs to %s.
-msgstr
+msgstr Молим пријавите грешке на %s.
#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:962
msgid A client program to query different dictionaries.
-msgstr
+msgstr Програм клијент за упит различитих речника
#: ../src/xfce4-dict.desktop.in.h:3
msgid Dictionary Client
-msgstr 字典客戶端
+msgstr Речник
#: ../lib/spell.c:75
msgid Spell Checker Results:
-msgstr
+msgstr Резултати правописара
#: ../lib/spell.c:101
#, c-format
msgid %d suggestion found.
msgid_plural %d suggestions found.
-msgstr[0]
-msgstr[1]
+msgstr[0] %d пронађен предлог.
+msgstr[1] %d пронађена предлога.
+msgstr[2] %d пронађених предлога.
#: ../lib/spell.c:105
#, c-format
msgid Suggestions for \%s\ (%s):
-msgstr
+msgstr Предлози за „%s“ (%s):
#: ../lib/spell.c:122
#, c-format
msgid \%s\ is spelled correctly (%s).
-msgstr
+msgstr „%s“ је написан исправно (%s).
#: ../lib/spell.c:134
#, c-format
msgid No suggestions could be found for \%s\ (%s).
-msgstr
+msgstr Нису могли бити пронађени предлози за „%s“ (%s).
#. translation hint:
#. * Error while executing spell command, e.g. aspell (error message)
#: ../lib/spell.c:164
#, c-format
msgid Error while
[Xfce4-commits] www:master l10n: Updated Polish (pl) translation to 30%
Updating branch refs/heads/master to 68a96d3091a483da1a036fce81e1436baa80a1fe (commit) from 6726ac8682b30b74668def0e623153b008cea514 (commit) commit 68a96d3091a483da1a036fce81e1436baa80a1fe Author: Piotr Sokół pso...@jabster.pl Date: Mon Oct 29 19:28:45 2012 +0100 l10n: Updated Polish (pl) translation to 30% New status: 185 messages complete with 2 fuzzies and 410 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/pl.po | 72 - 1 files changed, 55 insertions(+), 17 deletions(-) diff --git a/lib/po/pl.po b/lib/po/pl.po index 8fafac9..2ea67bf 100644 --- a/lib/po/pl.po +++ b/lib/po/pl.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: www.xfce.org\n Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n; POT-Creation-Date: 2012-05-02 18:32+0200\n -PO-Revision-Date: 2012-10-26 23:12+0200\n +PO-Revision-Date: 2012-10-29 19:05+0100\n Last-Translator: Piotr Sokół pso...@jabster.pl\n Language-Team: polski \n Language: \n @@ -493,7 +493,7 @@ msgstr #: download/index.php:25 msgid Individual releases -msgstr +msgstr Wydania indywidualne #: download/index.php:27 msgid @@ -505,6 +505,14 @@ msgid a or follow the Xfce a href=\http://identi.ca/xfce\;identi.ca channel/ a. msgstr +Każdy pakiet środowiska Xfce może zostać wydany w wersji stabilnej lub +rozwojowej. Dotyczy to również pakietów głównych komponentów (tak jak +opisano w a href=\/about/releasemodel\modelu wydawniczym/a). Aby nie +przeoczyć nowych wydań oprogramowania, można śledzić ich zapowiedzi na a +href=\/community/lists\liście dyskusyjnej użytkowników Xfce/a, +zasubskrybować odpowiednie a href=\http://archive.xfce.org/feeds/project/; +\źródła wiadomości/a lub obserwować zawartość a href=\http://identi.ca/; +xfce\kanału Xfce identi.ca/a. #: download/index.php:35 #, php-format @@ -640,7 +648,7 @@ msgstr zawiera listę wszystkich twórców #: about/nav.php:35 about/releasemodel.php:3 msgid Release Model -msgstr Model wydań +msgstr Model wydawniczy #: about/nav.php:36 msgid the Xfce release policy for core modules @@ -1261,7 +1269,7 @@ msgid documentation easier. msgstr Podczas prac na wersją 4.10 zdecydowaliśmy się usunąć podręczniki -użytkownika z pakietów oprogramowania i umieścić je w sieci w postaci stron +użytkownika z pakietów oprogramowania i umieścić je w sieci, w postaci stron wiki, dostępnych pod adresem a href=\http://docs.xfce.org\;docs.xfce.org/ a. Dzięki temu tworzenie i uaktualnianie dokumentacji powinno być teraz łatwiejsze. @@ -1282,7 +1290,7 @@ msgstr #: about/tour.php:17 msgid Collapsed view of the Application Finder -msgstr +msgstr Widok zwarty Wyszukiwarki programów #: about/tour.php:19 msgid @@ -1291,14 +1299,19 @@ msgid improvements, it now allows creating custom actions matching a prefix or a regex pattern. msgstr +Wyszukiwarka programów została przepisana od podstaw, po to by połączyć +funkcjonalność starej wyszukiwarki i modułu do uruchamiania poleceń xfrun4. +Nowa wyszukiwarka to nie tylko usprawnienia interfejsu. Teraz umożliwia ona +wykonywanie różnych czynności po dopasowaniu wyszukiwanej frazy do prefiksu +lub wyrażenia regularnego. #: about/tour.php:21 msgid Expanded view of the Application Finder -msgstr +msgstr Widok rozwinięty Wyszukiwarki programów #: about/tour.php:25 msgid Multiple Rows -msgstr +msgstr Wiele wierszy #: about/tour.php:27 msgid @@ -1307,14 +1320,17 @@ msgid while others, like window buttons are allowed to occupy full width of the panel. msgstr +W wersji 4.10 dodano możliwość określenia ilości wierszy w panelu. Niektóre +aplety (np. emaktywatory/em) mieszczą się w jednym wierszu, podczas gdy +inne, takie jak przyciski okien, mogą zajmować całą szerokość panelu. #: about/tour.php:29 msgid A horizontal panel with a number of rows set to three -msgstr +msgstr Pionowy panel posiadający trzy wiersze #: about/tour.php:31 msgid Deskbar Mode -msgstr +msgstr Układ boczny #: about/tour.php:33 msgid @@ -1323,28 +1339,34 @@ msgid mode, but the plugins are laid out horizontally. With multiple rows, it allows creating wide vertical panels suitable for wide-screen setups. msgstr +Panel został wyposażony w nowy układ nazwany embocznym/em. W tym +układzie panel jest ułożony pionowo, ale aplety są wyświetlane poziomo. W +połączeniu z wieloma wierszami, taki układ umożliwia skonfigurowanie +pionowych paneli, dobrze dopasowanych do szerokich ekranów. #: about/tour.php:35 msgid A panel in Deskbar mode with a number of rows set to five -msgstr +msgstr Panel w układzie bocznym posiadający pięć wierszów #: about/tour.php:37 msgid Actions Plugin -msgstr +msgstr Aplet sesji #: about/tour.php:39 msgid Session plugin from the xfce4-session package has been merged with a rewritten emactions/em plugin msgstr +W najnowszym wydaniu połączono pakiet xfce4-session z napisanym na nowo +apletem
[Xfce4-commits] thunar:master Open in tabs in the details view too.
Updating branch refs/heads/master
to bd7ca398c98ec50a9b49178b06e0de8ebd19973a (commit)
from 872484b34da277bc3bcd167062390765ec26d253 (commit)
commit bd7ca398c98ec50a9b49178b06e0de8ebd19973a
Author: Nick Schermer n...@xfce.org
Date: Mon Oct 29 20:19:02 2012 +0100
Open in tabs in the details view too.
thunar/thunar-details-view.c | 35 ---
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index 1c25884..b6a5f3d 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -29,6 +29,7 @@
#include thunar/thunar-gtk-extensions.h
#include thunar/thunar-private.h
#include thunar/thunar-text-renderer.h
+#include thunar/thunar-preferences.h
@@ -651,11 +652,14 @@ thunar_details_view_button_press_event (GtkTreeView
*tree_view,
GdkEventButton*event,
ThunarDetailsView *details_view)
{
- GtkTreeSelection *selection;
- GtkTreePath *path;
- GtkTreeIter iter;
- ThunarFile *file;
- GtkAction*action;
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+ GtkTreeIteriter;
+ ThunarFile*file;
+ GtkAction *action;
+ ThunarPreferences *preferences;
+ gboolean in_tab;
+ const gchar *action_name;
/* check if the event is for the bin window */
if (G_UNLIKELY (event-window != gtk_tree_view_get_bin_window (tree_view)))
@@ -714,8 +718,25 @@ thunar_details_view_button_press_event (GtkTreeView
*tree_view,
if (G_LIKELY (file != NULL))
{
/* determine the action to perform depending on the type of
the file */
- action = thunar_gtk_ui_manager_get_action_by_name
(THUNAR_STANDARD_VIEW (details_view)-ui_manager,
- thunar_file_is_directory (file) ? open-in-new-window :
open);
+ if (thunar_file_is_directory (file))
+{
+ /* lookup setting if we should open in a tab or a window
*/
+ preferences = thunar_preferences_get ();
+ g_object_get (preferences, misc-middle-click-in-tab,
in_tab, NULL);
+ g_object_unref (preferences);
+
+ /* holding ctrl inverts the action */
+ if ((event-state GDK_CONTROL_MASK) != 0)
+in_tab = !in_tab;
+
+ action_name = in_tab ? open-in-new-tab :
open-in-new-window;
+}
+ else
+{
+ action_name = open;
+}
+
+ action = thunar_gtk_ui_manager_get_action_by_name
(THUNAR_STANDARD_VIEW (details_view)-ui_manager, action_name);
/* emit the action */
if (G_LIKELY (action != NULL))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Collect properties at once in window_init and use infobar.
Updating branch refs/heads/master
to e0182d851af5e76611c483b3a59376848d78810e (commit)
from bd7ca398c98ec50a9b49178b06e0de8ebd19973a (commit)
commit e0182d851af5e76611c483b3a59376848d78810e
Author: Nick Schermer n...@xfce.org
Date: Mon Oct 29 21:43:20 2012 +0100
Collect properties at once in window_init and use infobar.
thunar/thunar-window.c | 86 +++-
1 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 1f6a5d0..1d7624f 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -767,20 +767,21 @@ thunar_window_init (ThunarWindow *window)
{
GtkRadioAction *radio_action;
GtkAccelGroup *accel_group;
- GtkWidget *separator;
GtkWidget *label;
- GtkWidget *ebox;
+ GtkWidget *infobar;
GtkWidget *item;
GtkAction *action;
- gbooleanshow_hidden;
- gbooleanvisible;
+ gbooleanlast_show_hidden;
+ gbooleanlast_menubar_visible;
GSList *group;
- gchar *type_name;
+ gchar *last_location_bar;
+ gchar *last_side_pane;
GType type;
- gintposition;
- gintwidth;
- gintheight;
- gbooleanmaximized;
+ gintlast_separator_position;
+ gintlast_window_width;
+ gintlast_window_height;
+ gbooleanlast_window_maximized;
+ gbooleanlast_statusbar_visible;
GtkRcStyle *style;
/* unset the view type */
@@ -792,6 +793,19 @@ thunar_window_init (ThunarWindow *window)
/* grab a reference on the preferences */
window-preferences = thunar_preferences_get ();
+ /* get all properties for init */
+ g_object_get (G_OBJECT (window-preferences),
+last-show-hidden, last_show_hidden,
+last-window-width, last_window_width,
+last-window-height, last_window_height,
+last-window-maximized, last_window_maximized,
+last-menubar-visible, last_menubar_visible,
+last-separator-position, last_separator_position,
+last-location-bar, last_location_bar,
+last-side-pane, last_side_pane,
+last-statusbar-visible, last_statusbar_visible,
+NULL);
+
/* connect to the volume monitor */
window-device_monitor = thunar_device_monitor_get ();
g_signal_connect (window-device_monitor, device-pre-unmount, G_CALLBACK
(thunar_window_device_pre_unmount), window);
@@ -807,7 +821,6 @@ thunar_window_init (ThunarWindow *window)
window-menu_item_deselected_closure = g_cclosure_new_object (G_CALLBACK
(thunar_window_menu_item_deselected), G_OBJECT (window));
g_closure_ref (window-menu_item_deselected_closure);
g_closure_sink (window-menu_item_deselected_closure);
-
window-icon_factory = thunar_icon_factory_get_default ();
/* setup the action group for this window */
@@ -818,8 +831,7 @@ thunar_window_init (ThunarWindow *window)
/* initialize the show-hidden action using the last value from the
preferences */
action = gtk_action_group_get_action (window-action_group, show-hidden);
- g_object_get (G_OBJECT (window-preferences), last-show-hidden,
show_hidden, NULL);
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_hidden);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), last_show_hidden);
/* rename the user dir menu entries and hide the unexisting ones */
thunar_window_setup_user_dir_menu_entries (window);
@@ -866,11 +878,10 @@ thunar_window_init (ThunarWindow *window)
g_signal_connect_swapped (G_OBJECT (window-launcher), open-new-tab,
G_CALLBACK (thunar_window_notebook_insert), window);
/* determine the default window size from the preferences */
- g_object_get (G_OBJECT (window-preferences), last-window-width, width,
last-window-height, height, last-window-maximized, maximized, NULL);
- gtk_window_set_default_size (GTK_WINDOW (window), width, height);
+ gtk_window_set_default_size (GTK_WINDOW (window), last_window_width,
last_window_height);
/* restore the maxized state of the window */
- if (G_UNLIKELY (maximized))
+ if (G_UNLIKELY (last_window_maximized))
gtk_window_maximize (GTK_WINDOW (window));
window-table = gtk_table_new (6, 1, FALSE);
@@ -881,10 +892,9 @@ thunar_window_init (ThunarWindow *window)
gtk_table_attach (GTK_TABLE (window-table), window-menubar, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
/* update menubar visibiliy */
- g_object_get (G_OBJECT (window-preferences), last-menubar-visible,
visible, NULL);
action = gtk_action_group_get_action (window-action_group, view-menubar);
g_signal_connect (G_OBJECT (window-menubar), deactivate, G_CALLBACK
(thunar_window_toggle_menubar_deactivate), window);
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
+
[Xfce4-commits] thunar:master Option to set small toolbar icons (bug #3971).
Updating branch refs/heads/master
to c3baf825e14bc8d4b578eca505ce00d3a2530bdf (commit)
from e0182d851af5e76611c483b3a59376848d78810e (commit)
commit c3baf825e14bc8d4b578eca505ce00d3a2530bdf
Author: Nick Schermer n...@xfce.org
Date: Mon Oct 29 21:52:07 2012 +0100
Option to set small toolbar icons (bug #3971).
thunar/thunar-preferences.c | 14 ++
thunar/thunar-window.c |5 -
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c
index b2ab0bb..0c0535a 100644
--- a/thunar/thunar-preferences.c
+++ b/thunar/thunar-preferences.c
@@ -85,6 +85,7 @@ enum
PROP_MISC_SHOW_THUMBNAILS,
PROP_MISC_SINGLE_CLICK,
PROP_MISC_SINGLE_CLICK_TIMEOUT,
+ PROP_MISC_SMALL_TOOLBAR_ICONS,
PROP_MISC_TAB_CLOSE_MIDDLE_CLICK,
PROP_MISC_TEXT_BESIDE_ICONS,
PROP_SHORTCUTS_ICON_EMBLEMS,
@@ -648,6 +649,19 @@ thunar_preferences_class_init (ThunarPreferencesClass
*klass)
EXO_PARAM_READWRITE));
/**
+ * ThunarPreferences:misc-small-toolbar-icons:
+ *
+ * Use small icons on the toolbar instead of the default toolbar size.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_MISC_SMALL_TOOLBAR_ICONS,
+ g_param_spec_boolean
(misc-small-toolbar-icons,
+ NULL,
+ NULL,
+ FALSE,
+ EXO_PARAM_READWRITE));
+
+ /**
* ThunarPreferences:misc-tab-close-middle-click:
*
* Whether to close tabs when the tab label is clicked with the 2nd
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 1d7624f..8925f92 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1810,6 +1810,7 @@ thunar_window_install_location_bar (ThunarWindow *window,
GType type)
{
GtkToolItem *item;
+ gboolean small_icons;
_thunar_return_if_fail (type == G_TYPE_NONE || g_type_is_a (type,
THUNAR_TYPE_LOCATION_BAR));
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
@@ -1847,7 +1848,9 @@ thunar_window_install_location_bar (ThunarWindow *window,
{
/* setup the toolbar for the location bar */
window-location_toolbar = gtk_ui_manager_get_widget
(window-ui_manager, /location-toolbar);
- /*gtk_toolbar_set_icon_size (GTK_TOOLBAR (window-location_toolbar),
GTK_ICON_SIZE_SMALL_TOOLBAR);*/
+ g_object_get (G_OBJECT (window-preferences),
misc-small-toolbar-icons, small_icons, NULL);
+ if (small_icons)
+gtk_toolbar_set_icon_size (GTK_TOOLBAR (window-location_toolbar),
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_table_attach (GTK_TABLE (window-table),
window-location_toolbar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (window-location_toolbar);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Revert Remove XdndDirectSave0 protocol. (bug #9414).
Updating branch refs/heads/master
to 134d0187afd0c2ebc2d0e47fbde4bda71b25fbb9 (commit)
from 8b4429b68dbaf51eceae966ac9f6c339b412b5de (commit)
commit 134d0187afd0c2ebc2d0e47fbde4bda71b25fbb9
Author: Nick Schermer n...@xfce.org
Date: Mon Oct 29 22:16:36 2012 +0100
Revert Remove XdndDirectSave0 protocol. (bug #9414).
This reverts commit dfd6faa57224a9c3a697e9781aa4bd7525d9832b.
THis breaks file-roller and probably some other stuff.
thunar/thunar-standard-view.c | 155 +++--
1 files changed, 149 insertions(+), 6 deletions(-)
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 559f8d5..5734691 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -400,6 +400,7 @@ static const GtkTargetEntry drag_targets[] =
static const GtkTargetEntry drop_targets[] =
{
{ text/uri-list, 0, TARGET_TEXT_URI_LIST, },
+ { XdndDirectSave0, 0, TARGET_XDND_DIRECT_SAVE0, },
{ _NETSCAPE_URL, 0, TARGET_NETSCAPE_URL, },
};
@@ -2915,7 +2916,12 @@ thunar_standard_view_drag_drop (GtkWidget *view,
guint timestamp,
ThunarStandardView *standard_view)
{
- GdkAtom target;
+ ThunarFile *file = NULL;
+ GdkAtom target;
+ guchar *prop_text;
+ GFile *path;
+ gchar *uri = NULL;
+ gintprop_len;
target = gtk_drag_dest_find_target (view, context, NULL);
if (G_UNLIKELY (target == GDK_NONE))
@@ -2923,13 +2929,69 @@ thunar_standard_view_drag_drop (GtkWidget
*view,
/* we cannot handle the drag data */
return FALSE;
}
+ else if (G_UNLIKELY (target == gdk_atom_intern_static_string
(XdndDirectSave0)))
+{
+ /* determine the file for the drop position */
+ file = thunar_standard_view_get_drop_file (standard_view, x, y, NULL);
+ if (G_LIKELY (file != NULL))
+{
+ /* determine the file name from the DnD source window */
+ if (gdk_property_get (context-source_window,
gdk_atom_intern_static_string (XdndDirectSave0),
+gdk_atom_intern_static_string (text/plain),
0, 1024, FALSE, NULL, NULL,
+prop_len, prop_text) prop_text != NULL)
+{
+ /* zero-terminate the string */
+ prop_text = g_realloc (prop_text, prop_len + 1);
+ prop_text[prop_len] = '\0';
+
+ /* verify that the file name provided by the source is valid */
+ if (G_LIKELY (*prop_text != '\0' strchr ((const gchar *)
prop_text, G_DIR_SEPARATOR) == NULL))
+{
+ /* allocate the relative path for the target */
+ path = g_file_resolve_relative_path (thunar_file_get_file
(file),
+ (const gchar
*)prop_text);
+
+ /* determine the new URI */
+ uri = g_file_get_uri (path);
+
+ /* setup the property */
+ gdk_property_change (GDK_DRAWABLE (context-source_window),
+ gdk_atom_intern_static_string
(XdndDirectSave0),
+ gdk_atom_intern_static_string
(text/plain), 8,
+ GDK_PROP_MODE_REPLACE, (const guchar *)
uri,
+ strlen (uri));
+
+ /* cleanup */
+ g_object_unref (path);
+ g_free (uri);
+}
+ else
+{
+ /* tell the user that the file name provided by the X Direct
Save source is invalid */
+ thunar_dialogs_show_error (GTK_WIDGET (standard_view), NULL,
_(Invalid filename provided by XDS drag site));
+}
+
+ /* cleanup */
+ g_free (prop_text);
+}
+
+ /* release the file reference */
+ g_object_unref (G_OBJECT (file));
+}
+
+ /* if uri == NULL, we didn't set the property */
+ if (G_UNLIKELY (uri == NULL))
+return FALSE;
+}
/* set state so the drag-data-received knows that
* this is really a drop this time.
*/
standard_view-priv-drop_occurred = TRUE;
- /* request the drag data from the source */
+ /* request the drag data from the source (initiates
+ * saving in case of XdndDirectSave).
+ */
gtk_drag_get_data (view, context, target, timestamp);
/* we'll call gtk_drag_finish() later */
@@ -2974,6 +3036,7 @@ thunar_standard_view_drag_data_received (GtkWidget
*view,
{
GdkDragAction actions;
GdkDragAction action;
+ ThunarFolder *folder;
ThunarFile *file = NULL;
GtkWidget*toplevel;
gboolean succeed = FALSE;
@@ -3003,7 +3066,42 @@ thunar_standard_view_drag_data_received (GtkWidget
*view,
/* reset the state */
[Xfce4-commits] thunar:master Rename filename of insecure desktop files (bug #8786).
Updating branch refs/heads/master
to 93095e43dd059d5474e1bf52f698e5357b7fd632 (commit)
from 697b921b9a6fac4e3901bcb9a0bdd93f2f452a3a (commit)
commit 93095e43dd059d5474e1bf52f698e5357b7fd632
Author: Nick Schermer n...@xfce.org
Date: Mon Oct 29 22:39:14 2012 +0100
Rename filename of insecure desktop files (bug #8786).
thunar/thunar-file.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index f4eda62..f885d27 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -1571,6 +1571,7 @@ thunar_file_rename (ThunarFile *file,
GError *err = NULL;
GFile*previous_file;
GFile*renamed_file;
+ gboolean is_secure;
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
_thunar_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE);
@@ -1578,7 +1579,8 @@ thunar_file_rename (ThunarFile *file,
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* check if this file is a desktop entry */
- if (thunar_file_is_desktop_file (file, NULL))
+ if (thunar_file_is_desktop_file (file, is_secure)
+ is_secure)
{
/* try to load the desktop entry into a key file */
key_file = thunar_g_file_query_key_file (file-gfile, cancellable, err);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
