[Xfce4-commits] l10n: Updated Uyghur (ug) translation to 100%
Updating branch refs/heads/master to ba7b6f93df1ac6bfa90f4ef1a6ba04939886d90b (commit) from 428207bbd6c102da58b819a38b06e0dcf225cae6 (commit) commit ba7b6f93df1ac6bfa90f4ef1a6ba04939886d90b Author: Gheyret Kenji Date: Thu Jul 26 07:42:38 2012 +0200 l10n: Updated Uyghur (ug) translation to 100% New status: 27 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po | 272 +++--- 1 files changed, 136 insertions(+), 136 deletions(-) diff --git a/po/ug.po b/po/ug.po index 5b450a7..61f39ea 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1,136 +1,136 @@ -# Uyghur translation for xfce4-notifyd. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Gheyret Kenji , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: xfce4-notifyd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-26 02:06+\n" -"PO-Revision-Date: 2011-11-09 16:10+0900\n" -"Last-Translator: Gheyret Kenji \n" -"Language-Team: Uyghur Computer Science Association \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: \n" - -#: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 -#: ../xfce4-notifyd-config/main.c:260 -msgid "Xfce Notify Daemon" -msgstr "Xfce ئۇقتۇرۇش Daemon" - -#: ../xfce4-notifyd/main.c:53 -#, c-format -msgid "Unknown option \"%s\"\n" -msgstr "نامەلۇم تاللانما «%s»\n" - -#: ../xfce4-notifyd/main.c:62 -msgid "Unable to start notification daemon" -msgstr "ئۇقتۇرۇش daemon نى قوزغاتقىلى بولمىدى" - -#: ../xfce4-notifyd/xfce-notify-daemon.c:1184 -#, c-format -msgid "Unable to connect to D-Bus session bus" -msgstr "D-Bus ئەڭگىمە باش لىنىيىسىگە باغلانغىلى بولمىدى" - -#: ../xfce4-notifyd/xfce-notify-daemon.c:1201 -#, c-format -msgid "Another notification xndaemon is already running" -msgstr "باشقا بىر xndaemon ئىجرا بۆلۈۋېتىپتۇ" - -#: ../xfce4-notifyd/xfce-notify-window.c:816 -msgid "image: " -msgstr "سۈرەت: " - -#: ../xfce4-notifyd-config/main.c:120 ../xfce4-notifyd-config/main.c:227 -msgid "" -"notify-send \"Notification Preview\" \"This is how notifications will look " -"like\"" -msgstr "notify-send «ئۇقتۇرۇشنى ئالدىن كۆرۈش» «ئۇقتۇرۇش ياخشى كۆرۈندىمۇ»" - -#: ../xfce4-notifyd-config/main.c:124 ../xfce4-notifyd-config/main.c:231 -msgid "Notification preview failed" -msgstr "ئۇقتۇرۇشنى ئالدىن كۆرۈش مەغلۇپ بولدى" - -#: ../xfce4-notifyd-config/main.c:262 -msgid "Settings daemon is unavailable" -msgstr "تەڭشەك daemon نى يوق" - -#: ../xfce4-notifyd-config/main.c:312 -msgid "Display version information" -msgstr "نەشر ئۇچۇرىنى كۆرسەت" - -#: ../xfce4-notifyd-config/main.c:313 -msgid "Settings manager socket" -msgstr "باشقۇرغۇچى سوكېتنىڭ تەڭشەكلىرى" - -#: ../xfce4-notifyd-config/main.c:313 -msgid "SOCKET_ID" -msgstr "SOCKET_ID" - -#: ../xfce4-notifyd-config/main.c:323 -#, c-format -msgid "Type '%s --help' for usage." -msgstr "'%s --help' كىرگۈزسە ئىشلىتىش ئۇسۇلىنى كۆرگىلى بولىدۇ" - -#: ../xfce4-notifyd-config/main.c:336 -#, c-format -msgid "Released under the terms of the GNU General Public License, version 2\n" -msgstr "" -"مەزكۇر پروگرامما GNU General Public License, version 2 ئاساسىدا تارقىتىلغان\n" - -#: ../xfce4-notifyd-config/main.c:337 -#, c-format -msgid "Please report bugs to %s.\n" -msgstr "كەمتۈكنى %s غا مەلۇم قىلىڭ.\n" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:1 -msgid "Bottom left" -msgstr "ئاستى سول" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:2 -msgid "Bottom right" -msgstr "ئاستى ئوڭ" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 -msgid "Default _position:" -msgstr "كۆڭۈلدىكى ئورۇن(_P):" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 -#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:2 -msgid "Notifications" -msgstr "ئۇقتۇرۇشلار" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 -msgid "Top left" -msgstr "ئۈستى سول" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 -msgid "Top right" -msgstr "ئۈستى ئوڭ" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 -msgid "_Disappear after:" -msgstr "غايىب بولغۇچە بولغان ۋاقىت(_D):" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 -msgid "_Opacity:" -msgstr "غۇۋالىقى(_O):" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 -msgid "_Preview" -msgstr "ئالدىن كۆزەت(_P)" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:10 -msgid "_Theme:" -msgstr "ئۆرنەك(_T):" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:11 -msgid "seconds" -msgstr "سېكۇنت" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 -msgid "Customize how notifications appear on your screen" -msgstr "ئۇقتۇرۇشلارنىڭ كۆرۈنۈش ئۇسۇلىنى ئۆزلەشتۈر" +# Uyghur translation for xfce4-notifyd. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same l
[Xfce4-commits] l10n: Updated Uyghur (ug) translation to 100%
Updating branch refs/heads/master to 428207bbd6c102da58b819a38b06e0dcf225cae6 (commit) from 12f483e782f43df02dab76aa8279e963d23c1d88 (commit) commit 428207bbd6c102da58b819a38b06e0dcf225cae6 Author: Gheyret Kenji Date: Thu Jul 26 07:40:24 2012 +0200 l10n: Updated Uyghur (ug) translation to 100% New status: 27 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po | 13 +++-- 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/po/ug.po b/po/ug.po index d85d6c0..5b450a7 100644 --- a/po/ug.po +++ b/po/ug.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Gheyret Kenji , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-notifyd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-10 06:15+\n" +"POT-Creation-Date: 2012-07-26 02:06+\n" "PO-Revision-Date: 2011-11-09 16:10+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 #: ../xfce4-notifyd-config/main.c:260 @@ -48,11 +48,11 @@ msgstr "سۈرەت: " msgid "" "notify-send \"Notification Preview\" \"This is how notifications will look " "like\"" -msgstr "" +msgstr "notify-send «ئۇقتۇرۇشنى ئالدىن كۆرۈش» «ئۇقتۇرۇش ياخشى كۆرۈندىمۇ»" #: ../xfce4-notifyd-config/main.c:124 ../xfce4-notifyd-config/main.c:231 msgid "Notification preview failed" -msgstr "" +msgstr "ئۇقتۇرۇشنى ئالدىن كۆرۈش مەغلۇپ بولدى" #: ../xfce4-notifyd-config/main.c:262 msgid "Settings daemon is unavailable" @@ -78,7 +78,8 @@ msgstr "'%s --help' كىرگۈزسە ئىشلىتىش ئۇسۇلىنى كۆرگ #: ../xfce4-notifyd-config/main.c:336 #, c-format msgid "Released under the terms of the GNU General Public License, version 2\n" -msgstr "مەزكۇر پروگرامما GNU General Public License, version 2 ئاساسىدا تارقىتىلغان\n" +msgstr "" +"مەزكۇر پروگرامما GNU General Public License, version 2 ئاساسىدا تارقىتىلغان\n" #: ../xfce4-notifyd-config/main.c:337 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Uyghur (ug) translation to 93%
Updating branch refs/heads/master to 3e38c0bb69ac156d20e8253ef823dfb50ffa3de0 (commit) from 381ae720edc03812881ce808ccfef774aca343bc (commit) commit 3e38c0bb69ac156d20e8253ef823dfb50ffa3de0 Author: Gheyret Kenji Date: Thu Jul 26 07:33:14 2012 +0200 l10n: Updated Uyghur (ug) translation to 93% New status: 629 messages complete with 0 fuzzies and 45 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ug.po b/po/ug.po index 553f5cd..395a639 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1829,9 +1829,8 @@ msgid "Send a message to %s" msgstr "%s غا ئۇچۇر ئەۋەتىدۇ" #: ../midori/midori-view.c:2661 -#, fuzzy msgid "Add _search engine..." -msgstr "ئىزدەش ماتورى قوش" +msgstr "ئىزدەش ماتورى قوش(_S)…" #: ../midori/midori-view.c:2705 ../midori/midori-view.c:3031 msgid "Inspect _Element" @@ -2034,10 +2033,9 @@ msgid "Show Tab _Icon Only" msgstr "پەقەت بەتكۈچ سىنبەلگىسىنىلا كۆرسەت(_I)" #: ../midori/midori-view.c:5074 -#, fuzzy msgid "Close Ot_her Tab" msgid_plural "Close Ot_her Tabs" -msgstr[0] "باشقا بەتكۈچلەرنى تاقا(_H)" +msgstr[0] "باشقا بەتكۈچ(لەر)نى تاقا(_H)" #. i18n: word stem of "previous page" type links, case is not important #: ../midori/midori-view.c:5910 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Uyghur (ug) translation to 96%
Updating branch refs/heads/master to 94a1d95f84fe299ca1a0b5d50341bb420e39cf06 (commit) from 5863c1be76d2e18af99958a7bc6ff99d59387f5f (commit) commit 94a1d95f84fe299ca1a0b5d50341bb420e39cf06 Author: Gheyret Kenji Date: Thu Jul 26 07:29:05 2012 +0200 l10n: Updated Uyghur (ug) translation to 96% New status: 262 messages complete with 0 fuzzies and 9 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ug.po b/po/ug.po index d92bcef..0852a36 100644 --- a/po/ug.po +++ b/po/ug.po @@ -575,7 +575,7 @@ msgstr "ھەممىنى تاللا(_A)" #: ../terminal/terminal-window.c:231 msgid "Select all text in the terminal" -msgstr تېرمىنالدىكى بارلىق تېكىستنى تاللايدۇ"" +msgstr "تېرمىنالدىكى بارلىق تېكىستنى تاللايدۇ" #: ../terminal/terminal-window.c:232 msgid "_Toolbars..." ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Uyghur (ug) translation to None%
Updating branch refs/heads/master to 5863c1be76d2e18af99958a7bc6ff99d59387f5f (commit) from c2fe067969302bdbf48d3d18fd82512a0291783f (commit) commit 5863c1be76d2e18af99958a7bc6ff99d59387f5f Author: Gheyret Kenji Date: Thu Jul 26 07:25:44 2012 +0200 l10n: Updated Uyghur (ug) translation to None% New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po | 546 +- 1 files changed, 323 insertions(+), 223 deletions(-) diff --git a/po/ug.po b/po/ug.po index 6662f67..d92bcef 100644 --- a/po/ug.po +++ b/po/ug.po @@ -2,15 +2,16 @@ # Copyright (C) 2003-2007 os-cillation e.K. # This file is distributed under the same license as the Terminal package. # Gheyret T.Kenji , 2010. -# +# msgid "" msgstr "" "Project-Id-Version: Terminal\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-20 10:00+\n" +"POT-Creation-Date: 2012-07-26 00:09+\n" "PO-Revision-Date: 2010-04-13 17:01+0900\n" "Last-Translator: Gheyret T.Kenji \n" "Language-Team: Uyghur Computer Science Association \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -84,38 +85,33 @@ msgstr "سىنبەلگە" #: ../terminal/main.c:95 #, c-format msgid "See the %s man page for full explanation of the options above." -msgstr "يۇقىرىقى تاللانمىلار ھەققىدىكى تېخىمۇ كوپ ئۇچۇرلارنى %s نىڭ man بېتىدىن كۆرۈڭ." +msgstr "" +"يۇقىرىقى تاللانمىلار ھەققىدىكى تېخىمۇ كوپ ئۇچۇرلارنى %s نىڭ man بېتىدىن " +"كۆرۈڭ." -#: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1262 -#: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1 +#: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1274 +#: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.in.h:1 msgid "Terminal" msgstr "تېرمىنال" -#: ../terminal/main.c:144 +#: ../terminal/main.c:147 +msgid "The Xfce development team. All rights reserved." +msgstr "بارلىق ھوقۇق Xfce ئىجادىيەت گۇرۇپپىسىغا تەۋە." + +#: ../terminal/main.c:148 +msgid "Written by Benedikt Meurer " +msgstr "ئاپتور Benedikt Meurer " + +#: ../terminal/main.c:149 +msgid "and Nick Schermer ." +msgstr "ۋە Nick Schermer ." + +#: ../terminal/main.c:150 #, c-format -msgid "" -"%s %s (Xfce %s)\n" -"\n" -"Copyright (c) %s\n" -"os-cillation e.K. All rights reserved.\n" -"\n" -"Written by Benedikt Meurer .\n" -"\n" -"Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d.\n" -"\n" -"Please report bugs to <%s>.\n" -msgstr "%s %s (Xfce %s)\n" -"\n" -"Copyright (c) %s\n" -"os-cillation e.K. All rights reserved.\n" -"\n" -"ئاپتور: Benedikt Meurer .\n" -"\n" -"Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d.\n" -"\n" -"كەمتۈكلەرنى <%s> غا مەلۇم قىلىڭ.\n" - -#: ../terminal/main.c:254 +msgid "Please report bugs to <%s>." +msgstr "كەمتۈكنى <%s> گە مەلۇم قىلىڭ." + +#: ../terminal/main.c:249 #, c-format msgid "Unable to register terminal service: %s\n" msgstr "تېرمىنال مۇلازىمىتىنى خەتلەتكىلى بولمىدى: %s\n" @@ -127,7 +123,7 @@ msgstr "گېئومېتىرىيە ھەرپ تىزمىسى «%s» ئىناۋەتس #: ../terminal/terminal-dbus.c:113 msgid "User id mismatch" -msgstr "ئىشلەتكۈچى id سى ماس كەلمىدى" +msgstr "ئىشلەتكۈچى كىملىكى ماس كەلمىدى" #: ../terminal/terminal-dbus.c:119 msgid "Display mismatch" @@ -136,246 +132,260 @@ msgstr "كۆرسەتكۈچ ماسلاشمىدى" #: ../terminal/terminal-dbus.c:145 #, c-format msgid "D-BUS message bus disconnected, exiting...\n" -msgstr "[fuzzy]D-BUS ئۇچۇر باش لىنىيىسى ئۈزۈلدى. ئاخىرلىشىدۇ...\n" +msgstr "D-BUS ئۇچۇر باش لىنىيىسى ئۈزۈلدى. ئاخىرلىشىدۇ...\n" #: ../terminal/terminal-dbus.c:207 #, c-format msgid "Unable to register object %s" msgstr "جىسىم %s نى خەتلەتكىلى بولمىدى" -#: ../terminal/terminal-dialogs.c:95 ../Terminal-default-apps.xml.in.in.h:1 +#: ../terminal/terminal-dialogs.c:90 ../Terminal-default-apps.xml.in.in.h:1 msgid "Xfce Terminal Emulator" -msgstr "Xfce تېرمىنال Emulator ئى" +msgstr "Xfce تېرمىنال تەقلىدلىگۈچىسى" -#: ../terminal/terminal-dialogs.c:102 +#: ../terminal/terminal-dialogs.c:97 msgid "translator-credits" -msgstr "Gheyret T.Kenji 2010" +msgstr "غەيرەت ت.كەنجى 2010" -#: ../terminal/terminal-dialogs.c:105 +#: ../terminal/terminal-dialogs.c:100 msgid "Visit Terminal website" msgstr "تېرمىنال توربېتىنى زىيارەت قىلىش" -#: ../terminal/terminal-dialogs.c:215 -#, c-format -msgid "The %s user manual is not installed on your computer" -msgstr "%s نىڭ قوللانمىسى بۇ كومپيۇتېرغا ئورنىتىلماپتۇ" - -#: ../terminal/terminal-dialogs.c:218 -#, c-format -msgid "You can read the user manual online. This manual may however not exactly match your %s version." -msgstr "قوللانمىنى توردىمۇ كۆرەلەيسىز. بۇ قوللانما سىز ئىشلىتىۋاتقان %s نەشرى بىلەن ماس كەلمەسلىكى مۇمكىن." - -#: ../terminal/terminal-dialogs.c:220 -msgid "User manual is missing" -msgstr "قوللانما يوق ئىكەن" - -#: ../terminal/terminal-dialogs.c:222 -msgid "_R
[Xfce4-commits] Move token to the front in Manage Search Engines
Updating branch refs/heads/master to de4ea9b3bf88987d1eed7e84eefdfca3d56cf1c9 (commit) from 75d7a7024c481cd2fd9c8742312ea36e20df77b6 (commit) commit de4ea9b3bf88987d1eed7e84eefdfca3d56cf1c9 Author: Paweł Forysiuk Date: Wed Jul 25 23:21:05 2012 +0200 Move token to the front in Manage Search Engines midori/midori-searchaction.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index da4f9bd..6164d33 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -1380,6 +1380,11 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, (GtkTreeCellDataFunc)midori_search_action_dialog_render_tick_cb, treeview, NULL); +renderer_text = gtk_cell_renderer_text_new (); +gtk_tree_view_column_pack_start (column, renderer_text, FALSE); +gtk_tree_view_column_set_cell_data_func (column, renderer_text, +(GtkTreeCellDataFunc)midori_search_action_dialog_render_token, +treeview, NULL); renderer_pixbuf = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE); gtk_tree_view_column_set_cell_data_func (column, renderer_pixbuf, @@ -1390,11 +1395,6 @@ midori_search_action_get_dialog (MidoriSearchAction* search_action) gtk_tree_view_column_set_cell_data_func (column, renderer_text, (GtkTreeCellDataFunc)midori_search_action_dialog_render_text, treeview, NULL); -renderer_text = gtk_cell_renderer_text_new (); -gtk_tree_view_column_pack_start (column, renderer_text, TRUE); -gtk_tree_view_column_set_cell_data_func (column, renderer_text, -(GtkTreeCellDataFunc)midori_search_action_dialog_render_token, -treeview, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add list style select to about:widgets
Updating branch refs/heads/master to 16a0f666da326e97612863748e35bc19c8b55ca7 (commit) from 6809231e545483c903b3410cc352530b49054b06 (commit) commit 16a0f666da326e97612863748e35bc19c8b55ca7 Author: Christian Dywan Date: Wed Jul 25 22:37:21 2012 +0200 Add list style select to about:widgets See: https://bugs.launchpad.net/midori/+bug/1029059 midori/midori-view.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index fa534d5..41669ed 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4420,7 +4420,8 @@ midori_view_set_uri (MidoriView* view, "", " demo", " demo", -"foo barspam eggs", +"foo barspam eggs", +"foo barspam eggs", "", "", "", ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Guess a suitable token for a form-based search
Updating branch refs/heads/master
to 75d7a7024c481cd2fd9c8742312ea36e20df77b6 (commit)
from 16a0f666da326e97612863748e35bc19c8b55ca7 (commit)
commit 75d7a7024c481cd2fd9c8742312ea36e20df77b6
Author: Paweł Forysiuk
Date: Wed Jul 25 23:03:37 2012 +0200
Guess a suitable token for a form-based search
midori/midori-searchaction.c | 60 -
midori/midori-view.c |4 +++
2 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c
index 9568573..da4f9bd 100644
--- a/midori/midori-searchaction.c
+++ b/midori/midori-searchaction.c
@@ -877,6 +877,63 @@ midori_search_action_editor_name_changed_cb (GtkWidget*
entry,
GTK_RESPONSE_ACCEPT, text && *text);
}
+gchar*
+midori_search_action_token_for_uri (const gchar* uri)
+{
+guint len, i;
+gchar** parts;
+gchar* hostname = NULL, *path = NULL;
+
+path = midori_uri_parse_hostname (uri, NULL);
+parts = g_strsplit (path, ".", -1);
+g_free (path);
+
+len = g_strv_length (parts);
+if (len > 2)
+{
+for (i = len; i == 0; i--)
+{
+if (parts[i] && *parts[i])
+if (strlen (parts[i]) > 3)
+{
+hostname = g_strdup (parts[i]);
+break;
+}
+}
+}
+else
+hostname = g_strdup (parts[0]);
+
+if (!hostname)
+hostname = g_strdup (parts[1]);
+
+g_strfreev (parts);
+
+if (strlen (hostname) > 4)
+{
+GString* str = g_string_new (NULL);
+int j, count = 0;
+
+for (j = 0; count < 4; j++)
+{
+if (hostname[j] == 'a'
+|| hostname[j] == 'e'
+|| hostname[j] == 'i'
+|| hostname[j] == 'o'
+|| hostname[j] == 'u')
+continue;
+else
+{
+g_string_append_c (str, hostname[j]);
+count++;
+}
+}
+return g_string_free (str, FALSE);
+}
+return g_strdup (hostname);
+}
+
+
void
midori_search_action_get_editor (MidoriSearchAction* search_action,
KatzeItem* item,
@@ -978,8 +1035,7 @@ midori_search_action_get_editor (MidoriSearchAction*
search_action,
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry_token = gtk_entry_new ();
gtk_entry_set_activates_default (GTK_ENTRY (entry_token), TRUE);
-if (!new_engine)
-gtk_entry_set_text (GTK_ENTRY (entry_token)
+gtk_entry_set_text (GTK_ENTRY (entry_token)
, katze_str_non_null (katze_item_get_token (item)));
gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (content_area), hbox);
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 41669ed..5b13ff1 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2441,6 +2441,9 @@ midori_view_menu_add_search_engine_cb (GtkWidget* widget,
midori_search_action_get_editor (MIDORI_SEARCH_ACTION (action), item,
TRUE);
}
+gchar*
+midori_search_action_token_for_uri (const gchar* uri);
+
static KatzeItem*
midori_view_search_engine_for_form (MidoriView*view,
WebKitWebView* web_view)
@@ -2512,6 +2515,7 @@ midori_view_search_engine_for_form (MidoriView*view,
item = katze_item_new ();
katze_item_set_uri (item, g_string_free (uri_str, FALSE));
+item->token = midori_search_action_token_for_uri (view->uri);
if (strstr (title, " - "))
parts = g_strsplit (title, " - ", 2);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Singular/ plural in Close Other Tab(s)
Updating branch refs/heads/master
to 6809231e545483c903b3410cc352530b49054b06 (commit)
from 94a997a2893732b079071ea552a85ea2c50f8621 (commit)
commit 6809231e545483c903b3410cc352530b49054b06
Author: Christian Dywan
Date: Wed Jul 25 22:31:36 2012 +0200
Singular/ plural in Close Other Tab(s)
And make it insensitive if there's only one tab.
midori/midori-view.c |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 12137fa..fa534d5 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -5030,6 +5030,7 @@ midori_view_get_tab_menu (MidoriView* view)
{
MidoriBrowser* browser;
GtkActionGroup* actions;
+gint pages;
GtkWidget* menu;
GtkWidget* menuitem;
@@ -5037,6 +5038,7 @@ midori_view_get_tab_menu (MidoriView* view)
browser = midori_browser_get_for_widget (GTK_WIDGET (view));
actions = midori_browser_get_action_group (browser);
+pages = midori_browser_get_n_pages (browser);
menu = gtk_menu_new ();
menuitem = sokoke_action_create_popup_menu_item (
@@ -5063,10 +5065,12 @@ midori_view_get_tab_menu (MidoriView* view)
G_CALLBACK (midori_view_tab_label_menu_minimize_tab_cb), view);
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-menuitem = gtk_menu_item_new_with_mnemonic (_("Close ot_her Tabs"));
+menuitem = gtk_menu_item_new_with_mnemonic (
+g_dngettext (NULL, "Close Ot_her Tab", "Close Ot_her Tabs", pages -
1));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_view_tab_label_menu_close_other_tabs_cb), view);
+gtk_widget_set_sensitive (menuitem, pages > 1);
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_CLOSE, NULL);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
g_signal_connect (menuitem, "activate",
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 6bc5ccb509a38eca33d996ffe45ee16ac7feced4 (commit) from 32570741420f685669e88d5a7f088a8bc37a9f90 (commit) commit 6bc5ccb509a38eca33d996ffe45ee16ac7feced4 Author: Masato Hashimoto Date: Wed Jul 25 17:03:06 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 155 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 163 +++--- 1 files changed, 81 insertions(+), 82 deletions(-) diff --git a/po/ja.po b/po/ja.po index aec2edb..465faa2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: xfce-weather-plugin 0.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-24 19:25+0900\n" -"PO-Revision-Date: 2012-07-24 19:27+0900\n" +"POT-Creation-Date: 2012-07-25 23:59+0900\n" +"PO-Revision-Date: 2012-07-26 00:02+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -21,74 +21,74 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../panel-plugin/weather.c:127 +#: ../panel-plugin/weather.c:125 msgid "T" msgstr "気温" -#: ../panel-plugin/weather.c:130 +#: ../panel-plugin/weather.c:128 msgid "P" msgstr "気圧" -#: ../panel-plugin/weather.c:133 +#: ../panel-plugin/weather.c:131 msgid "WS" msgstr "風速" -#: ../panel-plugin/weather.c:136 +#: ../panel-plugin/weather.c:134 msgid "WB" msgstr "風力" -#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142 +#: ../panel-plugin/weather.c:137 ../panel-plugin/weather.c:140 msgid "WD" msgstr "風向" -#: ../panel-plugin/weather.c:145 +#: ../panel-plugin/weather.c:143 msgid "H" msgstr "湿度" -#: ../panel-plugin/weather.c:148 +#: ../panel-plugin/weather.c:146 msgid "CL" msgstr "下層雲" -#: ../panel-plugin/weather.c:151 +#: ../panel-plugin/weather.c:149 msgid "CM" msgstr "中層雲" -#: ../panel-plugin/weather.c:154 +#: ../panel-plugin/weather.c:152 msgid "CH" msgstr "上層雲" -#: ../panel-plugin/weather.c:157 +#: ../panel-plugin/weather.c:155 msgid "C" msgstr "雲量" -#: ../panel-plugin/weather.c:160 +#: ../panel-plugin/weather.c:158 msgid "F" msgstr "霧" -#: ../panel-plugin/weather.c:163 +#: ../panel-plugin/weather.c:161 msgid "R" msgstr "降水量" -#: ../panel-plugin/weather.c:243 +#: ../panel-plugin/weather.c:238 msgid "No Data" msgstr "データ無し" -#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869 +#: ../panel-plugin/weather.c:265 ../panel-plugin/weather.c:864 msgid "Cannot update weather data" msgstr "気象データを更新できません" -#: ../panel-plugin/weather.c:799 +#: ../panel-plugin/weather.c:794 #, c-format msgid "Unable to open the following url: %s" msgstr "次の URL を開くことができません: %s" -#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625 -#: ../panel-plugin/weather.desktop.in.in.h:1 +#: ../panel-plugin/weather.c:822 ../panel-plugin/weather-summary.c:621 +#: ../panel-plugin/weather.desktop.in.h:1 msgid "Weather Update" msgstr "最新の天気" #. add refresh button to right click menu, for people who missed the middle mouse click feature -#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670 +#: ../panel-plugin/weather.c:965 ../panel-plugin/weather-summary.c:666 msgid "_Forecast" msgstr "予報(_F)" @@ -219,43 +219,43 @@ msgstr "下へ(_D)" msgid "Animate _transitions between labels" msgstr "ラベルの切り換えをアニメーションで行う(_T)" -#: ../panel-plugin/weather-data.c:131 +#: ../panel-plugin/weather-data.c:124 msgid "ft" msgstr "ft" -#: ../panel-plugin/weather-data.c:131 +#: ../panel-plugin/weather-data.c:124 msgid "m" msgstr "m" -#: ../panel-plugin/weather-data.c:133 +#: ../panel-plugin/weather-data.c:126 msgid "°F" msgstr "°F" -#: ../panel-plugin/weather-data.c:133 +#: ../panel-plugin/weather-data.c:126 msgid "°C" msgstr "°C" -#: ../panel-plugin/weather-data.c:135 +#: ../panel-plugin/weather-data.c:128 msgid "psi" msgstr "psi" -#: ../panel-plugin/weather-data.c:135 +#: ../panel-plugin/weather-data.c:128 msgid "hPa" msgstr "hPa" -#: ../panel-plugin/weather-data.c:137 +#: ../panel-plugin/weather-data.c:130 msgid "mph" msgstr "mph" -#: ../panel-plugin/weather-data.c:137 +#: ../panel-plugin/weather-data.c:130 msgid "km/h" msgstr "km/h" -#: ../panel-plugin/weather-data.c:150 +#: ../panel-plugin/weather-data.c:143 msgid "in" msgstr "in" -#: ../panel-plugin/weather-data.c:150 +#: ../panel-plugin/weather-data.c:143 msgid "mm" msgstr "mm" @@ -266,43 +266,43 @@ msgid "Failed to get the hostname %s. Retry in %d seconds." msgstr "ホスト名 %s の取得に失敗しました。%d 秒後に再試行してください。" #. display warning -#: ../panel-plugin/weather-http.c:244 +#: ../panel-plugin/weather-http.c:240 #, c-format msgid "Failed to open the socket (%s)." msgstr "ソケットを開くことに失敗しました (%s)。" #. display warning -#: ../panel-plugin/weather-http.c:255 +#: ../panel-plugin/weather-http.c:251 #, c-f
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 32570741420f685669e88d5a7f088a8bc37a9f90 (commit) from 947b8630e504700a7cc94b1d4f1eb45c634b5725 (commit) commit 32570741420f685669e88d5a7f088a8bc37a9f90 Author: Seong-ho Cho Date: Wed Jul 25 15:37:18 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 155 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 267 - 1 files changed, 123 insertions(+), 144 deletions(-) diff --git a/po/ko.po b/po/ko.po index ab99c32..fc3feac 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,17 +1,16 @@ # Korean translation of the xfce-weather-plugin package. # Copyright (C) 2006-2008 The Xfce development team. # This file is distributed under the same license as the xfce-weather-plugin package.. -# Seong-ho, Cho +# Seong-ho Cho , 2012. # msgid "" msgstr "" "Project-Id-Version: xfce-weather-plugin.master\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: xfce-i18n \n" "POT-Creation-Date: 2012-07-22 20:29+0200\n" -"PO-Revision-Date: 2012-02-28 07:04+0900\n" -"Last-Translator: Seong-ho, Cho \n" -"Language-Team: xfce4-users-kr-i18n \n" +"PO-Revision-Date: 2012-07-25 22:30+0900\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: xfce-i18n \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +30,11 @@ msgid "WS" msgstr "풍속" #: ../panel-plugin/weather.c:136 -#, fuzzy msgid "WB" -msgstr "서" +msgstr "보포르 풍속" -#: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142 +#: ../panel-plugin/weather.c:139 +#: ../panel-plugin/weather.c:142 msgid "WD" msgstr "풍향" @@ -44,37 +43,35 @@ msgid "H" msgstr "습도" #: ../panel-plugin/weather.c:148 -#, fuzzy msgid "CL" -msgstr "무풍" +msgstr "구름 조금" #: ../panel-plugin/weather.c:151 -#, fuzzy msgid "CM" -msgstr "무풍" +msgstr "구름 적당히" #: ../panel-plugin/weather.c:154 -#, fuzzy msgid "CH" -msgstr "습도" +msgstr "구름 많이" #: ../panel-plugin/weather.c:157 msgid "C" -msgstr "" +msgstr "구름 양" #: ../panel-plugin/weather.c:160 msgid "F" -msgstr "체감온도" +msgstr "안개" #: ../panel-plugin/weather.c:163 msgid "R" -msgstr "" +msgstr "강수율" #: ../panel-plugin/weather.c:243 msgid "No Data" -msgstr "" +msgstr "데이터 없음" -#: ../panel-plugin/weather.c:270 ../panel-plugin/weather.c:869 +#: ../panel-plugin/weather.c:270 +#: ../panel-plugin/weather.c:869 msgid "Cannot update weather data" msgstr "날씨 정보를 업데이트할 수 없습니다" @@ -83,76 +80,72 @@ msgstr "날씨 정보를 업데이트할 수 없습니다" msgid "Unable to open the following url: %s" msgstr "다음 URL을 열 수 없습니다: %s" -#: ../panel-plugin/weather.c:827 ../panel-plugin/weather-summary.c:625 +#: ../panel-plugin/weather.c:827 +#: ../panel-plugin/weather-summary.c:625 #: ../panel-plugin/weather.desktop.in.in.h:1 msgid "Weather Update" msgstr "날씨 업데이트" #. add refresh button to right click menu, for people who missed the middle mouse click feature -#: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:670 +#: ../panel-plugin/weather.c:970 +#: ../panel-plugin/weather-summary.c:670 msgid "_Forecast" msgstr "예보(_F)" #: ../panel-plugin/weather-config.c:38 -#, fuzzy msgid "Temperature (T)" -msgstr "기온 (T)" +msgstr "기온(T)" #: ../panel-plugin/weather-config.c:39 msgid "Atmosphere pressure (P)" -msgstr "기압 (P)" +msgstr "기압(P)" #: ../panel-plugin/weather-config.c:40 msgid "Wind speed (WS)" -msgstr "풍속 (WS)" +msgstr "풍속(WS)" #: ../panel-plugin/weather-config.c:41 msgid "Wind speed - Beaufort scale (WB)" -msgstr "" +msgstr "풍속 - 보포르 규모(WB)" #: ../panel-plugin/weather-config.c:42 msgid "Wind direction (WD)" -msgstr "풍향 (WD)" +msgstr "풍향(WD)" #: ../panel-plugin/weather-config.c:43 -#, fuzzy msgid "Wind direction in degrees (WD)" -msgstr "풍향 (WD)" +msgstr "도 단위 풍향(WD)" #: ../panel-plugin/weather-config.c:44 msgid "Humidity (H)" -msgstr "습도 (H)" +msgstr "습도(H)" #: ../panel-plugin/weather-config.c:45 -#, fuzzy msgid "Low clouds (CL)" -msgstr "구름" +msgstr "구름 조금(CL)" #: ../panel-plugin/weather-config.c:46 -#, fuzzy msgid "Medium clouds (CM)" -msgstr "변동이 심한 구름" +msgstr "구름 적당히(CM)" #: ../panel-plugin/weather-config.c:47 -#, fuzzy msgid "High clouds (CH)" -msgstr "대체로 흐림" +msgstr "구름 많음(CH)" #: ../panel-plugin/weather-config.c:48 -#, fuzzy msgid "Cloudiness (C)" -msgstr "구름" +msgstr "구름 양(C)" #: ../panel-plugin/weather-config.c:49 msgid "Fog (F)" -msgstr "" +msgstr "안개(F)" #: ../panel-plugin/weather-config.c:50 -#, fuzzy msgid "Precipitations (R)" -msgstr "강수 률" +msgstr "강수율(R)" -#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383 +#: ../panel-plugin/weather-config.c:229 +#: ../panel-plugin/weather-config.c:383 #: ../panel-plugin/weather-config.c:494 msgid "Unset" msgstr "해제" @@ -163,12 +156,11 @@ msgstr "프록시 설정을 입력하여주십시오" #: ../panel-plugin/weather-config.c:392 msgid "Detecting..." -msgstr "감지중..." +msgstr
[Xfce4-commits] Properly hide the mouse-cursor in fullscreen-mode (Bug #7910)
Updating branch refs/heads/master
to 89c7588c5f7290686358a89c7e86db9b29bd70b4 (commit)
from 2804a6bcad029810a15a398c66e7fe0bd08a3c37 (commit)
commit 89c7588c5f7290686358a89c7e86db9b29bd70b4
Author: Simon Steinbeiss
Date: Wed Jul 25 14:30:44 2012 +0200
Properly hide the mouse-cursor in fullscreen-mode (Bug #7910)
Could probably be improved, is the query for gdkwindow really needed?
src/parole-player.c | 11 ++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index aff774c..1926b7d 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1463,6 +1463,7 @@ parole_player_full_screen (ParolePlayer *player, gboolean
fullscreen)
{
gint npages;
static gint current_page = 0;
+GdkWindow *gdkwindow;
if ( player->priv->full_screen == fullscreen )
return;
@@ -1485,6 +1486,8 @@ parole_player_full_screen (ParolePlayer *player, gboolean
fullscreen)
gtk_window_unfullscreen (GTK_WINDOW (player->priv->window));
gtk_notebook_set_current_page (GTK_NOTEBOOK
(player->priv->playlist_nt), current_page);
+ gdkwindow = gtk_widget_get_window (player->priv->window);
+ gdk_window_set_cursor (gdkwindow, NULL);
player->priv->full_screen = FALSE;
}
else
@@ -1629,6 +1632,7 @@ parole_player_gst_widget_button_release (GtkWidget
*widget, GdkEventButton *ev,
static gboolean parole_player_hide_fs_window (gpointer data)
{
ParolePlayer *player;
+GdkWindow *gdkwindow;
gint x, y, w, h;
player = PAROLE_PLAYER (data);
@@ -1645,6 +1649,8 @@ static gboolean parole_player_hide_fs_window (gpointer
data)
return TRUE;
gtk_widget_hide (player->priv->fs_window);
+ gdkwindow = gtk_widget_get_window (player->priv->window);
+ parole_window_invisible_cursor (gdkwindow);
}
return FALSE;
@@ -1654,10 +1660,13 @@ static gboolean
parole_player_gst_widget_motion_notify_event (GtkWidget *widget,
GdkEventMotion *ev, ParolePlayer *player)
{
static gulong hide_timeout = 0;
+GdkWindow *gdkwindow;
if ( player->priv->full_screen )
{
gtk_widget_show_all (player->priv->fs_window);
+ gdkwindow = gtk_widget_get_window (player->priv->window);
+ gdk_window_set_cursor (gdkwindow, NULL);
if ( hide_timeout != 0 )
{
g_source_remove (hide_timeout);
@@ -2325,7 +2334,7 @@ parole_player_init (ParolePlayer *player)
g_signal_connect (G_OBJECT (player->priv->gst), "motion-notify-event",
G_CALLBACK
(parole_player_gst_widget_motion_notify_event), player);
-
+
output = GTK_WIDGET (gtk_builder_get_object (builder, "output"));
gtk_drag_dest_set (output, GTK_DEST_DEFAULT_ALL,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bump minimum requirements to match XFCE-4.6.
Updating branch refs/heads/master to 947b8630e504700a7cc94b1d4f1eb45c634b5725 (commit) from dad97d875264a68ef313e73224d2963595c94374 (commit) commit 947b8630e504700a7cc94b1d4f1eb45c634b5725 Author: Harald Judt Date: Wed Jul 25 14:12:49 2012 +0200 Bump minimum requirements to match XFCE-4.6. http://docs.xfce.org/xfce/building: Xfce 4.10 requires Gtk+ 2.20 and Glib 2.24 Xfce 4.8 requires Gtk+ 2.14 and Glib 2.20 Xfce 4.6 requires Gtk+ 2.10 and Glib 2.12 configure.ac.in |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 25dfefc..0e46e65 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -57,11 +57,12 @@ XDT_I18N([@LINGUAS@]) dnl *** dnl *** Check for required packages *** dnl *** -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0]) +XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0]) +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0]) XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0]) AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Cleanup: Remove xml_time from get_unit() parameters.
Updating branch refs/heads/master
to dad97d875264a68ef313e73224d2963595c94374 (commit)
from 13adc71ad5bbc2f5636c4c11f7f89b8dc50f9d8e (commit)
commit dad97d875264a68ef313e73224d2963595c94374
Author: Harald Judt
Date: Wed Jul 25 13:46:25 2012 +0200
Cleanup: Remove xml_time from get_unit() parameters.
It's not used here anymore.
panel-plugin/weather-data.c |2 +-
panel-plugin/weather-data.h |2 +-
panel-plugin/weather-summary.c |8
panel-plugin/weather-translate.c |2 +-
panel-plugin/weather.c |4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index cff2b20..b8ad206 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -117,7 +117,7 @@ get_data (xml_time *timeslice, unit_systems unit_system,
datas type)
}
const gchar *
-get_unit (xml_time *timeslice, unit_systems unit_system, datas type)
+get_unit (unit_systems unit_system, datas type)
{
switch(type) {
case ALTITUDE:
diff --git a/panel-plugin/weather-data.h b/panel-plugin/weather-data.h
index a7b6911..1b3cec7 100644
--- a/panel-plugin/weather-data.h
+++ b/panel-plugin/weather-data.h
@@ -55,7 +55,7 @@ typedef enum {
gchar *
get_data (xml_time *timeslice, unit_systems unit_system, datas type);
const gchar *
-get_unit (xml_time *timeslice, unit_systems unit_system, datas type);
+get_unit (unit_systems unit_system, datas type);
gboolean
is_night_time();
time_t
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 3b529b6..240718d 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -42,7 +42,7 @@ static gboolean lnk_clicked (GtkTextTag *tag, GObject *obj,
&iter, text,
-1);\
g_free (value);
#define APPEND_TEXT_ITEM(text, item) rawvalue = get_data(conditions,
data->unit_system, item); \
- unit = get_unit(conditions,
data->unit_system, item); \
+ unit = get_unit(data->unit_system,
item); \
value =
g_strdup_printf("\t%s%s%s%s%s\n", \
text, text ?
": " : "", \
rawvalue, \
@@ -313,7 +313,7 @@ create_summary_tab (xfceweather_data *data)
rawvalue = get_data (conditions, data->unit_system, WIND_DIRECTION_DEG);
value = g_strdup_printf ("\t%s: %s (%s%s)\n", _("Direction"),
wind, rawvalue,
- get_unit (conditions, data->unit_system,
WIND_DIRECTION_DEG));
+ get_unit (data->unit_system, WIND_DIRECTION_DEG));
g_free (rawvalue);
g_free (wind);
APPEND_TEXT_ITEM_REAL (value);
@@ -508,7 +508,7 @@ make_forecast (xfceweather_data *data)
rawvalue = get_data(fcdata, data->unit_system,
TEMPERATURE);
value = g_strdup_printf("%s %s",
rawvalue,
-get_unit(fcdata,
data->unit_system, TEMPERATURE));
+get_unit(data->unit_system,
TEMPERATURE));
g_free(rawvalue);
label = gtk_label_new(value);
gtk_box_pack_start(GTK_BOX(forecast_box),
GTK_WIDGET(label),
@@ -521,7 +521,7 @@ make_forecast (xfceweather_data *data)
value = g_strdup_printf("%s %s %s",
wind_direction,
wind_speed,
-get_unit(fcdata,
data->unit_system, WIND_SPEED));
+get_unit(data->unit_system,
WIND_SPEED));
g_free(wind_speed);
g_free(wind_direction);
g_free(rawvalue);
diff --git a/panel-plugin/weather-translate.c b/panel-plugin/weather-translate.c
index e78e222..7024afd 100644
--- a/panel-plugin/weather-translate.c
+++ b/panel-plugin/weather-translate.c
@@ -217,7 +217,7 @@ translate_wind_speed (xml_time*timeslice,
wspeed_loc = g_strdup (_("N/A"));
else {
wspeed_loc =
- g_strdup_printf ("%s %s", wspeed, get_unit (timeslice, unit_system,
WIND_SPEED));
+ g_strdup_printf ("%s %s", wspeed, get_unit (unit_system, WIND_SPEED));
}
return wspeed_loc;
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index e8f3de5..c8296ab 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -193,7 +193,7 @@ make_label (xfceweather_data *data,
}
else
{
-unit = get_unit (conditions, data->unit_system, opt);
+unit = get_unit (data->unit_system,
[Xfce4-commits] Cleanup: Fix unused, uninitialized variables and silence warnings.
Updating branch refs/heads/master
to 13adc71ad5bbc2f5636c4c11f7f89b8dc50f9d8e (commit)
from d0de0fc0e670cb6ccc0ad07c105b4c7041b65577 (commit)
commit 13adc71ad5bbc2f5636c4c11f7f89b8dc50f9d8e
Author: Harald Judt
Date: Wed Jul 25 13:38:30 2012 +0200
Cleanup: Fix unused, uninitialized variables and silence warnings.
panel-plugin/weather-config.c |4 ++--
panel-plugin/weather-data.c| 10 +-
panel-plugin/weather-http.c|8 ++--
panel-plugin/weather-search.c |4 +---
panel-plugin/weather-summary.c |4
panel-plugin/weather.c |7 +--
6 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index c572d96..b1bf8ad 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -218,7 +218,7 @@ sanitize_location_name(const gchar *location_name)
offset = g_utf8_pointer_to_offset (location_name, pos);
if (offset > LOC_NAME_MAX_LEN)
offset = LOC_NAME_MAX_LEN;
- pos = g_utf8_strncpy (sane, location_name, offset);
+ (void) g_utf8_strncpy (sane, location_name, offset);
sane[LOC_NAME_MAX_LEN * 4 - 1] = '\0';
return g_strdup (sane);
}
@@ -228,7 +228,7 @@ sanitize_location_name(const gchar *location_name)
if (len >= LOC_NAME_MAX_LEN)
{
- pos = g_utf8_strncpy (sane, location_name, len);
+ (void) g_utf8_strncpy (sane, location_name, len);
sane[LOC_NAME_MAX_LEN * 4 - 1] = '\0';
return g_strdup (sane);
}
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index c029ea7..cff2b20 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -119,13 +119,6 @@ get_data (xml_time *timeslice, unit_systems unit_system,
datas type)
const gchar *
get_unit (xml_time *timeslice, unit_systems unit_system, datas type)
{
- const xml_location *loc = NULL;
-
- if (timeslice == NULL)
- return "";
-
- loc = timeslice->location;
-
switch(type) {
case ALTITUDE:
return (unit_system == IMPERIAL) ? _("ft") : _("m");
@@ -411,7 +404,6 @@ xml_time *make_current_conditions(xml_weather *data)
/* now search for the nearest and shortest interval data
* available, using a maximum interval of 6 hours */
end_tm = start_tm = now_tm;
-start_t = mktime(&start_tm);
/* set interval to 1 hour as minimum, we don't want to retrieve point data
*/
end_t = time_calc_hour(end_tm, 1);
@@ -441,7 +433,7 @@ xml_time *make_current_conditions(xml_weather *data)
xml_time *
make_forecast_data(xml_weather *data, int day, daytime dt)
{
- xml_time *forecast, *point_data, *interval_data;
+ xml_time *forecast = NULL, *point_data = NULL, *interval_data = NULL;
struct tm now_tm, start_tm, end_tm;
time_t now_t, start_t, end_t;
gint interval;
diff --git a/panel-plugin/weather-http.c b/panel-plugin/weather-http.c
index 0c6b540..30d72c5 100644
--- a/panel-plugin/weather-http.c
+++ b/panel-plugin/weather-http.c
@@ -145,7 +145,7 @@ weather_http_receive_data_idle (gpointer user_data)
{
WeatherConnection *connection = user_data;
gchar buffer[1024];
- gintbytes, n, m;
+ gintbytes = 0, n, m = 0;
gchar *request;
fd_set fds;
struct timeval select_timeout;
@@ -216,10 +216,8 @@ weather_http_receive_data_idle (gpointer user_data)
for (a = r; a != NULL; a = a->ai_next) {
connection->fd = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
-if (connection->fd < 0) {
- err = errno;
+if (connection->fd < 0)
continue;
-}
#ifdef G_OS_UNIX
signal(SIGALRM, timeout_handler);
alarm(WEATHER_MAX_CONN_TIMEOUT);
@@ -231,8 +229,6 @@ weather_http_receive_data_idle (gpointer user_data)
#endif
if (m == 0)
break;
-else
- err = errno;
if (weather_http_receive_data_check (connection, timeout))
break;
diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c
index ecf59d9..3a814d6 100644
--- a/panel-plugin/weather-search.c
+++ b/panel-plugin/weather-search.c
@@ -215,7 +215,7 @@ create_search_dialog (GtkWindow *parent,
GtkWidget *vbox, *hbox, *scroll, *frame;
GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
search_dialog *dialog;
- GtkWidget *dialog_vbox, *dialog_action;
+ GtkWidget *dialog_vbox;
dialog = g_slice_new0 (search_dialog);
@@ -238,10 +238,8 @@ create_search_dialog (GtkWindow *parent,
#if GTK_CHECK_VERSION(2,14,0)
dialog_vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog->dialog));
- dialog_action = gtk_dialog_get_action_area(GTK_DIALOG(dialog->dialog));
#else
dialog_vbox = GTK_DIALOG (dialog->dialog)->vbox;
- dialog_action = GTK_DIALOG (dialog->dialog)->action_area;
#endif
vbox = gtk_vb
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 9df7332c0d6a39860a77f8d2159f329fd9d180fa (commit) from 6c77cf982fb408019c349eefcd03b34f6e2de9df (commit) commit 9df7332c0d6a39860a77f8d2159f329fd9d180fa Author: Seong-ho Cho Date: Wed Jul 25 13:27:59 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 30 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 75 +++-- 1 files changed, 38 insertions(+), 37 deletions(-) diff --git a/po/ko.po b/po/ko.po index e997aba..01e169f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-netload-plugin\n" -"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" -"POT-Creation-Date: 2012-02-27 16:45+\n" -"PO-Revision-Date: 2012-02-28 06:40+0900\n" -"Last-Translator: Seong-ho, Cho \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-07-25 09:57+\n" +"PO-Revision-Date: 2012-07-25 20:26+0900\n" +"Last-Translator: Seong-ho Cho \n" "Language-Team: xfce4-users-kr-i18n \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -18,47 +18,48 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../panel-plugin/netload.c:59 +#: ../panel-plugin/netload.c:61 msgid "Xfce4-Netload-Plugin" msgstr "Xfce4-Netload-Plugin" -#: ../panel-plugin/netload.c:62 +#: ../panel-plugin/netload.c:64 msgid "Unknown error." msgstr "알 수 없는 오류." -#: ../panel-plugin/netload.c:63 +#: ../panel-plugin/netload.c:65 msgid "Linux proc device '/proc/net/dev' not found." msgstr "Linux proc 장치 '/proc/net/dev'를 찾을 수 없습니다." -#: ../panel-plugin/netload.c:64 +#: ../panel-plugin/netload.c:66 msgid "Interface was not found." msgstr "인터페이스를 찾을 수 없습니다." -#: ../panel-plugin/netload.c:162 +#: ../panel-plugin/netload.c:163 #, c-format msgid "<< %s >> (Interface down)" msgstr "<< %s >> (인터페이스 죽음)" -#: ../panel-plugin/netload.c:249 +#: ../panel-plugin/netload.c:250 #, c-format msgid "" "<< %s >> (%s)\n" -"Average of last %d measures:\n" -"Incoming: %s/s\n" -"Outgoing: %s/s\n" -"Total: %s/s" +"Average of last %d measures\n" +"with an interval of %.2fs:\n" +"Incoming: %s\n" +"Outgoing: %s\n" +"Total: %s" msgstr "" "<< %s >> (%s)\n" -"최근 %d 회 측정 평균:\n" -"들어오는 것: %s/s\n" -"나가는 것: %s/s\n" -"전부: %s/s" +"최근 %d 회 측정 평균주기시간: %.2fs\n" +"수신: %s/s\n" +"송신: %s/s\n" +"총계: %s/s" -#: ../panel-plugin/netload.c:251 +#: ../panel-plugin/netload.c:253 msgid "no IP address" msgstr "IP 주소가 없습니다." -#: ../panel-plugin/netload.c:533 +#: ../panel-plugin/netload.c:567 #, c-format msgid "" "%s: Error in initializing:\n" @@ -67,72 +68,72 @@ msgstr "" "%s: 초기화 도중 오류 발생:\n" "%s" -#: ../panel-plugin/netload.c:872 +#: ../panel-plugin/netload.c:882 msgid "Select color" msgstr "색상을 선택하십시오" -#: ../panel-plugin/netload.c:938 +#: ../panel-plugin/netload.c:948 msgid "Bar color (i_ncoming):" msgstr "막대 색(들어오는 것)(_N):" -#: ../panel-plugin/netload.c:939 +#: ../panel-plugin/netload.c:949 msgid "Bar color (_outgoing):" msgstr "막대 색(나가는 것)(_O):" -#: ../panel-plugin/netload.c:942 +#: ../panel-plugin/netload.c:952 msgid "Maximum (inco_ming):" msgstr "최대 (들어오는 것)(_M):" -#: ../panel-plugin/netload.c:943 +#: ../panel-plugin/netload.c:953 msgid "Maximum (o_utgoing):" msgstr "최대 (나가는 것)(_U):" -#: ../panel-plugin/netload.c:948 +#: ../panel-plugin/netload.c:958 #: ../panel-plugin/netload.desktop.in.in.h:1 msgid "Network Monitor" msgstr "네트워크 감시기" -#: ../panel-plugin/netload.c:977 +#: ../panel-plugin/netload.c:987 msgid "_Text to display:" msgstr "표시할 내용(_T):" -#: ../panel-plugin/netload.c:1008 +#: ../panel-plugin/netload.c:1018 msgid "Network _device:" msgstr "네트워크 장치(_D):" -#: ../panel-plugin/netload.c:1036 +#: ../panel-plugin/netload.c:1046 msgid "Update _interval:" msgstr "업데이트 간격(_I):" -#: ../panel-plugin/netload.c:1049 +#: ../panel-plugin/netload.c:1059 msgid "s" msgstr "초" -#: ../panel-plugin/netload.c:1062 +#: ../panel-plugin/netload.c:1072 msgid "_Automatic maximum" msgstr "최대치 자동 설정(_A)" -#: ../panel-plugin/netload.c:1096 +#: ../panel-plugin/netload.c:1106 msgid "KiB/s" msgstr "KiB/s" -#: ../panel-plugin/netload.c:1121 +#: ../panel-plugin/netload.c:1131 msgid "_Present data as:" msgstr "다음으로 데이터 보기(_P):" -#: ../panel-plugin/netload.c:1130 +#: ../panel-plugin/netload.c:1140 msgid "Bars" msgstr "막대" -#: ../panel-plugin/netload.c:1131 +#: ../panel-plugin/netload.c:1141 msgid "Values" msgstr "값" -#: ../panel-plugin/netload.c:1132 +#: ../panel-plugin/netload.c:1142 msgid "Bars and values" msgstr "막대와 값" -#: ../panel-plugin/netload.c:1182 +#: ../panel-plugin/netload.c:1192 msgid "_Colorize values" msgstr "값을 색상화(_C)" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to d9bb52ca9db637bcf79b303fdf004e38b35d26b8 (commit) from eb18cc031976d803202cc9d126464c4508fab3ee (commit) commit d9bb52ca9db637bcf79b303fdf004e38b35d26b8 Author: Seong-ho Cho Date: Wed Jul 25 13:23:32 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 73 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index 7c37e3e..52542dc 100644 --- a/po/ko.po +++ b/po/ko.po @@ -83,7 +83,7 @@ msgstr "영역 선택" #: ../src/main.c:68 #: ../panel-plugin/screenshooter-plugin.c:321 msgid "Select a region to be captured by clicking a point of the screen without releasing the mouse button, dragging your mouse to the other corner of the region, and releasing the mouse button." -msgstr "마우스 단추를 떼지 않고 화면의 점을 누르고 다른 영역의 구석으로 마우스를 끈 다음 단추를 떼어서 찍을 화면 영역을 선택합니다." +msgstr "화면의 한 점을 누른 상태에서 마우스 단추를 떼지 않고 다른 영역의 구석으로 마우스를 끈 다음 단추를 떼어서 찍을 화면 영역을 선택합니다." #: ../lib/screenshooter-dialogs.c:795 msgid "Capture the mouse pointer" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%
Updating branch refs/heads/master to 2804a6bcad029810a15a398c66e7fe0bd08a3c37 (commit) from 76116a1190e06fe00f4a9fcb73c94faf75cc1746 (commit) commit 2804a6bcad029810a15a398c66e7fe0bd08a3c37 Author: Seong-ho Cho Date: Wed Jul 25 12:59:39 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 183 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 649 +++--- 1 files changed, 327 insertions(+), 322 deletions(-) diff --git a/po/ko.po b/po/ko.po index d45542e..fa9c6ce 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,330 +6,298 @@ msgid "" msgstr "" "Project-Id-Version: parole.master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-20 11:45+0200\n" -"PO-Revision-Date: 2012-02-27 05:56+0900\n" -"Last-Translator: Seong-ho, Cho \n" -"Language-Team: xfce4-users-kr-i18n \n" +"Report-Msgid-Bugs-To: xfce-i18n \n" +"POT-Creation-Date: 2012-07-25 07:45+\n" +"PO-Revision-Date: 2012-07-25 19:58+0900\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: xfce4-users-kr-i18n \n" "Language: ko\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Poedit-Language: Korean\n" "X-Poedit-Country: KOREA, REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../data/interfaces/parole.ui.h:1 ../src/parole-about.c:89 -msgid "Parole Media Player" -msgstr "빠롤 미디어 재생기" +#: ../data/interfaces/parole.ui.h:1 +msgid "16:9 (Widescreen)" +msgstr "16:9 (와이드스크린)" #: ../data/interfaces/parole.ui.h:2 -msgid "_Media" -msgstr "미디어(_M)" +msgid "20:9 (DVB)" +msgstr "20:9 (DVB)" #: ../data/interfaces/parole.ui.h:3 -#, fuzzy -msgid "Open _location" -msgstr "위치 열기(_O)" +msgid "4:3 (TV)" +msgstr "4:3 (TV)" #: ../data/interfaces/parole.ui.h:4 -msgid "_DVD" -msgstr "" +#: ../src/misc/parole-filters.c:64 +msgid "Audio" +msgstr "음악" #: ../data/interfaces/parole.ui.h:5 -msgid "From ISO image" -msgstr "ISO 이미지에서" +msgid "Audio Track:" +msgstr "오디오 트랙:" #: ../data/interfaces/parole.ui.h:6 -msgid "_Edit" -msgstr "편집(_E)" - -#: ../data/interfaces/parole.ui.h:7 -#, fuzzy -msgid "_Repeat" -msgstr "반복" +msgid "Auto" +msgstr "자동" #: ../data/interfaces/parole.ui.h:8 -#, fuzzy -msgid "_Shuffle" -msgstr "무작위" +#, no-c-format +msgid "Buffering (0%)" +msgstr "버퍼링(0%)" #: ../data/interfaces/parole.ui.h:9 -#, fuzzy -msgid "Pl_ugins" -msgstr "플러그인" +#: ../src/parole-player.c:641 +msgid "Empty" +msgstr "비어 있음" #: ../data/interfaces/parole.ui.h:10 -msgid "_View" -msgstr "보기(_V)" +msgid "Languages" +msgstr "언어" #: ../data/interfaces/parole.ui.h:11 -#, fuzzy -msgid "Show _playlist" -msgstr "재생목록 보기" +msgid "Media player" +msgstr "미디어 재생기" #: ../data/interfaces/parole.ui.h:12 -#, fuzzy -msgid "_Aspect Ratio" -msgstr "영상비율" - -#: ../data/interfaces/parole.ui.h:13 msgid "None" msgstr "없음" +#: ../data/interfaces/parole.ui.h:13 +msgid "Open _location" +msgstr "위치 열기(_L)" + #: ../data/interfaces/parole.ui.h:14 -msgid "Auto" -msgstr "자동" +#: ../src/parole-about.c:55 +msgid "Parole Media Player" +msgstr "빠롤 미디어 재생기" #: ../data/interfaces/parole.ui.h:15 -msgid "Square" -msgstr "정사각형" +msgid "Pl_ugins" +msgstr "플러그인(_U)" #: ../data/interfaces/parole.ui.h:16 -msgid "4:3 (TV)" -msgstr "4:3 (TV)" +#: ../src/parole-disc.c:218 +#: ../src/parole-disc.c:270 +msgid "Play Disc" +msgstr "디스크 재생" #: ../data/interfaces/parole.ui.h:17 -msgid "16:9 (Widescreen)" -msgstr "16:9 (와이드스크린)" +msgid "Select Text Subtitles..." +msgstr "텍스트 자막을 선택하십시오..." #: ../data/interfaces/parole.ui.h:18 -msgid "20:9 (DVB)" -msgstr "20:9 (DVB)" +msgid "Show _playlist" +msgstr "재생 목록 보기(_P)" #: ../data/interfaces/parole.ui.h:19 -msgid "Sound" -msgstr "소리" +msgid "Square" +msgstr "정사각형" #: ../data/interfaces/parole.ui.h:20 -#, fuzzy -msgid "_Mute" -msgstr "음소거" +msgid "Subtitles" +msgstr "자막" #: ../data/interfaces/parole.ui.h:21 -#, fuzzy -msgid "Volume _Up" -msgstr "음량 증가" +msgid "Subtitles:" +msgstr "자막:" #: ../data/interfaces/parole.ui.h:22 -#, fuzzy msgid "Volume _Down" -msgstr "음량 감소" +msgstr "음량 작게" #: ../data/interfaces/parole.ui.h:23 -msgid "_Help" -msgstr "도움말(_H)" +msgid "Volume _Up" +msgstr "음량 크게" #: ../data/interfaces/parole.ui.h:24 -#, fuzzy -msgid "Audio Track:" -msgstr "이전 트랙" +msgid "_Aspect Ratio" +msgstr "영상 비율(_A)" #: ../data/interfaces/parole.ui.h:25 -#, fuzzy -msgid "Subtitles:" -msgstr "자막" +msgid "_Edit" +msgstr "편집(_E)" #: ../data/interfaces/parole.ui.h:26 -msgid "0:00" -msgstr "" +msgid "_Help" +msgstr "도움말(_H)" + +#: ../data/interfaces/parole.ui.h:27 +msgid "_Media" +msgstr "미디어(_M)" #: ../data/interfaces/parole.ui.h:28 -#, fuzzy, no-c-format -msgid "Buffering (0%)" -msgstr "버퍼링" +msgid "_Mute" +msgstr "음소거(_M)" #: ../data/interfaces/parole.ui.h:29 -msgid "Media player" -msgstr "미디어 재생기
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 76116a1190e06fe00f4a9fcb73c94faf75cc1746 (commit) from 3d92daa924c88be7908be41d1b290d75b98a0468 (commit) commit 76116a1190e06fe00f4a9fcb73c94faf75cc1746 Author: Sergio Marques Date: Wed Jul 25 11:57:20 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 183 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 82 +++--- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/po/pt.po b/po/pt.po index 7aa47fd..46a7b73 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: parole 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-24 10:21+\n" +"POT-Creation-Date: 2012-07-25 07:45+\n" "PO-Revision-Date: \n" "Last-Translator: Nuno Miguel \n" "Language-Team: Portuguese\n" @@ -149,33 +149,33 @@ msgid "_Open" msgstr "_Abrir" #: ../data/interfaces/plugins.ui.h:1 -msgid "Author:" -msgstr "Autor:" +msgid "Author" +msgstr "Autor" #: ../data/interfaces/plugins.ui.h:2 -msgid "Description:" -msgstr "Descrição:" +msgid "Description" +msgstr "Descrição" #: ../data/interfaces/plugins.ui.h:3 -msgid "Site:" -msgstr "Sítio:" - -#: ../data/interfaces/plugins.ui.h:4 msgid "Enabled" msgstr "Ativo" -#: ../data/interfaces/plugins.ui.h:5 +#: ../data/interfaces/plugins.ui.h:4 msgid "Media Player plugins" msgstr "\"Plug-ins\" do reprodutor" -#: ../data/interfaces/plugins.ui.h:6 +#: ../data/interfaces/plugins.ui.h:5 msgid "Parole Plugins" msgstr "\"Plug-ins\" Parole" -#: ../data/interfaces/plugins.ui.h:7 +#: ../data/interfaces/plugins.ui.h:6 msgid "Plugin" msgstr "\"Plugin\"" +#: ../data/interfaces/plugins.ui.h:7 +msgid "Visit Website" +msgstr "Visitar sítio web" + #: ../data/interfaces/parole-settings.ui.h:1 msgid "Audio" msgstr "Áudio" @@ -361,71 +361,75 @@ msgstr "" msgid "Unknown argument " msgstr "Argumento desconhecido" -#: ../src/main.c:223 +#: ../src/main.c:224 msgid "Open a new instance" msgstr "Abrir nova instância" -#: ../src/main.c:224 +#: ../src/main.c:225 msgid "Do not load plugins" msgstr "Não carregar \"plugins\"" -#: ../src/main.c:225 +#: ../src/main.c:226 msgid "Set Audio-CD/VCD/DVD device path" msgstr "Definir o caminho do dispositivo CD/VCD/DVD" -#: ../src/main.c:226 +#: ../src/main.c:227 msgid "Play or pause if already playing" msgstr "Reproduzir ou pausar se em execução" -#: ../src/main.c:227 +#: ../src/main.c:228 msgid "Stop playing" msgstr "Parar reprodução" -#: ../src/main.c:228 +#: ../src/main.c:229 msgid "Next track" msgstr "Faixa seguinte" -#: ../src/main.c:229 +#: ../src/main.c:230 msgid "Previous track" msgstr "Faixa anterior" -#: ../src/main.c:230 +#: ../src/main.c:231 msgid "Seek forward" msgstr "Avançar" -#: ../src/main.c:231 +#: ../src/main.c:232 msgid "Seek Backward" msgstr "Recuar" -#: ../src/main.c:232 +#: ../src/main.c:233 msgid "Raise volume" msgstr "Aumentar volume" -#: ../src/main.c:233 +#: ../src/main.c:234 msgid "Lower volume" msgstr "Diminuir volume" -#: ../src/main.c:234 +#: ../src/main.c:235 msgid "Mute volume" msgstr "Silenciar" -#: ../src/main.c:235 +#: ../src/main.c:236 msgid "Version information" msgstr "Informações da versão" -#: ../src/main.c:236 +#: ../src/main.c:237 msgid "Start in fullscreen mode" msgstr "Iniciar em ecrã completo" -#: ../src/main.c:237 +#: ../src/main.c:238 msgid "Enabled/Disable XV support" msgstr "Ativar/desativar suporte XV" #: ../src/main.c:239 +msgid "Add files to playlist" +msgstr "Adicionar ficheiros à lista de reprodução" + +#: ../src/main.c:241 msgid "Media to play" msgstr "Multimédia a reproduzir" -#: ../src/main.c:276 +#: ../src/main.c:279 #, c-format msgid "Parole is already running, use -i to open a new instance\n" msgstr "O Parole já está em execução. Use -i para abrir uma nova instância\n" @@ -454,7 +458,7 @@ msgstr "Formato desconhecido" msgid "Please chooser a supported playlist format" msgstr "Por favor, selecione um formato suportado" -#: ../src/parole-medialist.c:593 ../src/parole-plugins-manager.c:378 +#: ../src/parole-medialist.c:593 ../src/parole-plugins-manager.c:349 #: ../src/plugins/properties/stream-properties-provider.c:140 #: ../src/plugins/properties/stream-properties-provider.c:141 #: ../src/plugins/properties/stream-properties-provider.c:142 @@ -462,7 +466,7 @@ msgstr "Por favor, selecione um formato suportado" msgid "Unknown" msgstr "Desconhecido" -#: ../src/parole-medialist.c:667 ../src/parole-player.c:2418 +#: ../src/parole-medialist.c:667 ../src/parole-player.c:2419 msgid "Playlist" msgstr "Lista de reprodução" @@ -519,15 +523,15 @@ msgstr "Imagem de CD" msgid "DVD image" msgstr "Imagem de DVD" -#: ../src/parole-player.c:897 ../src/parole-player.c:1020 +#: ../src/parole-player.c:898 ../src/parole-player.c:1021 msgid
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to d0de0fc0e670cb6ccc0ad07c105b4c7041b65577 (commit) from 654ce328524c1f9c7e812c1c999e8b51a2c4721c (commit) commit d0de0fc0e670cb6ccc0ad07c105b4c7041b65577 Author: Pjotr vertaalt Date: Wed Jul 25 11:46:49 2012 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 155 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7b674b6..903b086 100644 --- a/po/nl.po +++ b/po/nl.po @@ -144,7 +144,7 @@ msgstr "Neerslag (R)" #: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383 #: ../panel-plugin/weather-config.c:494 msgid "Unset" -msgstr "Niet ingesteld" +msgstr "Niet meer ingesteld" #: ../panel-plugin/weather-config.c:325 msgid "Please enter proxy settings" @@ -358,7 +358,8 @@ msgstr "" msgid "" "\tTemperature, wind, atmosphere and cloud data apply to:\n" "\t%s\n" -msgstr "" +msgstr "\tGegevens voor temperatuur, wind, luchtdruk en bewolking zijn van toepassing op:\n" +"\t%s\n" #: ../panel-plugin/weather-summary.c:294 #, c-format @@ -368,7 +369,11 @@ msgid "" "\tfor the following time interval:\n" "\tStart:\t%s\n" "\tEnd:\t%s\n" -msgstr "" +msgstr "\n" +"\tNeerslag en het weersymbool zijn berekend\n" +"\tvoor het volgende tijdvak:\n" +"\tBegin:\t%s\n" +"\tEinde:\t%s\n" #. Temperature #: ../panel-plugin/weather-summary.c:300 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 29fdd92fe1c0858959d5e3570744f61422b3c514 (commit) from cc0d81345ba8502636d6f83a1c09091313843a78 (commit) commit 29fdd92fe1c0858959d5e3570744f61422b3c514 Author: Pjotr vertaalt Date: Wed Jul 25 11:40:32 2012 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 674 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 503 +++--- 1 files changed, 254 insertions(+), 249 deletions(-) diff --git a/po/nl.po b/po/nl.po index a24c749..d5418df 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,14 +2,14 @@ # Copyright (C) The Xfce development team. # This file is distributed under the same license as the midori package. # Vincent Tunru 2008 -# Emmo, 2011 (assisted by Pjotr). +# Emmo, 2011-2012 (assisted by Pjotr). # msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-21 12:36+\n" -"PO-Revision-Date: 2011-09-08 12:02+0200\n" +"POT-Creation-Date: 2012-07-25 07:33+\n" +"PO-Revision-Date: 2012-07-25 12:02+0200\n" "Last-Translator: Emmo (assisted by Pjotr)\n" "Language-Team: Dutch (Flemish)\n" "Language: nl (Dutch)\n" @@ -32,18 +32,22 @@ msgid "Midori" msgstr "Midori" #: ../data/midori.desktop.in.h:4 +msgid "Midori Web Browser" +msgstr "Webbrowser Midori" + +#: ../data/midori.desktop.in.h:5 msgid "New Private Browsing Window" msgstr "Nieuw privé-surfvenster" -#: ../data/midori.desktop.in.h:5 ../midori/midori-browser.c:1424 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1429 msgid "New Tab" msgstr "Nieuw tabblad" -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1421 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1426 msgid "New Window" msgstr "Nieuw venster" -#: ../data/midori.desktop.in.h:7 +#: ../data/midori.desktop.in.h:8 msgid "Web Browser" msgstr "Webbrowser" @@ -55,7 +59,7 @@ msgstr "Midori Privé-surfen" msgid "Open a new private browsing window" msgstr "Open een nieuw privé-surfvenster" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4445 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4476 msgid "Private Browsing" msgstr "Privé-surfen" @@ -320,7 +324,7 @@ msgstr "_Negeren" msgid "Unexpected action '%s'." msgstr "Onverwachte actie '%s'." -#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6381 +#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6388 msgid "_Bookmarks" msgstr "_Bladwijzers" @@ -333,7 +337,7 @@ msgid "_Extensions" msgstr "_Extensies" #. i18n: Browsing history, visited web pages, closed tabs -#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4829 +#: ../midori/midori-app.c:1456 ../midori/midori-browser.c:4834 msgid "_History" msgstr "_Geschiedenis" @@ -355,13 +359,13 @@ msgstr "Bestand_overdrachten" #: ../midori/midori-app.c:1461 msgid "Netscape p_lugins" -msgstr "Netscape p_lugins" +msgstr "Netscape-invoegtoepassingen" #: ../midori/midori-app.c:1462 msgid "_Closed Tabs" msgstr "Ge_sloten tabbladen" -#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5520 +#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5527 msgid "New _Window" msgstr "Nieuw _venster" @@ -386,12 +390,12 @@ msgstr "Onbekende bladwijzeropmaak." msgid "Writing failed." msgstr "Schrijven is mislukt." -#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5608 -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5615 +#: ../midori/midori-browser.c:5624 msgid "Reload the current page" msgstr "De huidige pagina opnieuw laden" -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5621 msgid "Stop loading the current page" msgstr "Stop met het laden van de huidige pagina" @@ -446,7 +450,7 @@ msgstr "Uitvoeren als _webtoepassing" #: ../midori/midori-browser.c:970 #, c-format msgid "The file \"%s\" can't be saved in this folder." -msgstr " Het bestand \"%s\" kan niet worden opgeslagen in deze map." +msgstr " Het bestand '%s' kan niet worden opgeslagen in deze map." #: ../midori/midori-browser.c:972 #, c-format @@ -456,54 +460,54 @@ msgstr "U heeft geen rechten om op deze plaats te schrijven." #: ../midori/midori-browser.c:979 #, c-format msgid "There is not enough free space to download \"%s\"." -msgstr "Er is niet voldoende schijfruimte om \"%s\" binnen te halen." +msgstr "Er is niet voldoende schijfruimte om '%s' binnen te halen." #: ../midori/midori-browser.c:982 #, c-format msgid "The file needs %s but only %s are left." -msgstr "Het bestand heeft %s nodig maar slechts %s is over." +msgstr "Het bestand heeft %s nodig maar slechts %s zijn over." -#: ../midori/midori-browser.c:1113 ../midori/midori-browser.c:4630 +#: ../midori/midori-br
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to 3d92daa924c88be7908be41d1b290d75b98a0468 (commit) from 969262cf7b091dbbc51fb262590cc8124893127b (commit) commit 3d92daa924c88be7908be41d1b290d75b98a0468 Author: Pjotr vertaalt Date: Wed Jul 25 11:28:25 2012 +0200 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 183 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 577 ++ 1 files changed, 282 insertions(+), 295 deletions(-) diff --git a/po/nl.po b/po/nl.po index 532c67b..b92f8e7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,18 +1,18 @@ -# Dutch translation of the parole package. +# Dutch translation of the Parole package. # Copyright (C) The Xfce development team. -# This file is distributed under the same license as the parole package. +# This file is distributed under the same license as the Parole package. # Huib Kleinhout , 2002–2004. # Tino Meinen , 2004–2009. # Wouter Bolsterlee , 2006–2009. # Mario Blättermann . -# Pjotr, 2011. +# Pjotr, 2011-2012. # msgid "" msgstr "" "Project-Id-Version: parole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-20 11:45+0200\n" -"PO-Revision-Date: 2011-09-08 11:55+0200\n" +"POT-Creation-Date: 2012-07-25 07:45+\n" +"PO-Revision-Date: 2012-07-025 11:55+0200\n" "Last-Translator: Pjotr\n" "Language-Team: Dutch (Flemish)\n" "Language: nl (Dutch)\n" @@ -21,319 +21,282 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/interfaces/parole.ui.h:1 ../src/parole-about.c:89 -msgid "Parole Media Player" -msgstr "Parole mediaspeler" +#: ../data/interfaces/parole.ui.h:1 +msgid "16:9 (Widescreen)" +msgstr "16:9 (breedbeeld)" #: ../data/interfaces/parole.ui.h:2 -msgid "_Media" -msgstr "_Media" +msgid "20:9 (DVB)" +msgstr "20:9 (DVB)" #: ../data/interfaces/parole.ui.h:3 -#, fuzzy -msgid "Open _location" -msgstr "Locatie _openen…" +msgid "4:3 (TV)" +msgstr "4:3 (TV)" -#: ../data/interfaces/parole.ui.h:4 -msgid "_DVD" -msgstr "" +#: ../data/interfaces/parole.ui.h:4 ../src/misc/parole-filters.c:64 +msgid "Audio" +msgstr "Audio" #: ../data/interfaces/parole.ui.h:5 -msgid "From ISO image" -msgstr "Van ISO-beeldbestand" +msgid "Audio Track:" +msgstr "Geluidsspoor" #: ../data/interfaces/parole.ui.h:6 -msgid "_Edit" -msgstr "Be_werken" - -#: ../data/interfaces/parole.ui.h:7 -#, fuzzy -msgid "_Repeat" -msgstr "Herhaal" +msgid "Auto" +msgstr "Automatisch" #: ../data/interfaces/parole.ui.h:8 -#, fuzzy -msgid "_Shuffle" -msgstr "Schuffelen" +msgid "Buffering (0%)" +msgstr "Aan het bufferen (0%)" -#: ../data/interfaces/parole.ui.h:9 -#, fuzzy -msgid "Pl_ugins" -msgstr "Plugins" +#: ../data/interfaces/parole.ui.h:9 ../src/parole-player.c:641 +msgid "Empty" +msgstr "Leeg" #: ../data/interfaces/parole.ui.h:10 -msgid "_View" -msgstr "_Beeld" +msgid "Languages" +msgstr "Talen" +# Totem erbij want ik heb meerdere mediaspelers. +# media omdat totem meer dan alleen films kan afspelen #: ../data/interfaces/parole.ui.h:11 -#, fuzzy -msgid "Show _playlist" -msgstr "Speellijst tonen" +msgid "Media player" +msgstr "Mediaspeler" #: ../data/interfaces/parole.ui.h:12 -#, fuzzy -msgid "_Aspect Ratio" -msgstr "Beeldverhouding" - -#: ../data/interfaces/parole.ui.h:13 msgid "None" msgstr "Geen" -#: ../data/interfaces/parole.ui.h:14 -msgid "Auto" -msgstr "Automatisch" +#: ../data/interfaces/parole.ui.h:13 +msgid "Open _location" +msgstr "Locatie openen" + +#: ../data/interfaces/parole.ui.h:14 ../src/parole-about.c:55 +msgid "Parole Media Player" +msgstr "Parole mediaspeler" #: ../data/interfaces/parole.ui.h:15 -msgid "Square" -msgstr "Vierkant" +msgid "Pl_ugins" +msgstr "Invoegtoepassingen" -#: ../data/interfaces/parole.ui.h:16 -msgid "4:3 (TV)" -msgstr "4:3 (TV)" +#: ../data/interfaces/parole.ui.h:16 ../src/parole-disc.c:218 +#: ../src/parole-disc.c:270 +msgid "Play Disc" +msgstr "Schijf afspelen" #: ../data/interfaces/parole.ui.h:17 -msgid "16:9 (Widescreen)" -msgstr "16:9 (breedbeeld)" +msgid "Select Text Subtitles..." +msgstr "Ondertitels kiezen..." #: ../data/interfaces/parole.ui.h:18 -msgid "20:9 (DVB)" -msgstr "20:9 (DVB)" +msgid "Show _playlist" +msgstr "Speellijst tonen" #: ../data/interfaces/parole.ui.h:19 -msgid "Sound" -msgstr "Geluid" +msgid "Square" +msgstr "Vierkant" #: ../data/interfaces/parole.ui.h:20 -#, fuzzy -msgid "_Mute" -msgstr "Dempen" +msgid "Subtitles" +msgstr "Ondertitels" -# harder/Meer volume #: ../data/interfaces/parole.ui.h:21 -#, fuzzy -msgid "Volume _Up" -msgstr "Harder" +msgid "Subtitles:" +msgstr "Ondertitels:" # zachter/Minder volume #: ../data/interfaces/parole.ui.h:22 -#, fuzzy msgid "Volume _Down" -msgstr "Zachter" +msgstr "_Zachter" +# harder/Meer volume #: ../data/interfaces/parole.ui.h:23 -msgid "_Help" -msgstr "_Hulp" +msgid "Volume _Up" +msgstr "Har_der" #
[Xfce4-commits] Adjust configure to the 22>24px icon switch
Updating branch refs/heads/master to 969262cf7b091dbbc51fb262590cc8124893127b (commit) from 9659737d5e33e8671de46315caa1b4d1c0be4ce6 (commit) commit 969262cf7b091dbbc51fb262590cc8124893127b Author: Simon Steinbeiss Date: Wed Jul 25 11:24:41 2012 +0200 Adjust configure to the 22>24px icon switch configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 33a0a38..b9db577 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -210,7 +210,7 @@ data/pixmaps/Makefile data/interfaces/Makefile data/icons/Makefile data/icons/16x16/Makefile -data/icons/22x22/Makefile +data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Really get the plugin working on OpenBSD (bug #9152).
Updating branch refs/heads/master
to 654ce328524c1f9c7e812c1c999e8b51a2c4721c (commit)
from 77546c193fb1307c76981e8f41687687344b24f2 (commit)
commit 654ce328524c1f9c7e812c1c999e8b51a2c4721c
Author: Landry Breuil
Date: Wed Jul 25 10:23:04 2012 +0200
Really get the plugin working on OpenBSD (bug #9152).
The #define added in 94c7c6e88ed7caf1ed8fec608558050274064a84
is only part of the solution. One also has to initialize the
tm structs before using strptime, otherwise the behaviour is
not defined.
Some references:
http://linux.die.net/man/3/strptime
"In principle, this function does not initialize tm but only stores the
values
specified. This means that tm should be initialized before the call. Details
differ a bit between different UNIX systems. The glibc implementation does
not
touch those fields which are not explicitly specified, except that it
recomputes the tm_wday and tm_yday field if any of the year, month, or day
elements changed."
http://www.openbsd.org/cgi-bin/man.cgi?query=strptime
"There is no way to specify whether Daylight Saving Time is in effect when
calling strptime. To use the resulting tm structure with functions that
check the tm_isdst field, either set it to a negative value, which will
cause mktime(3) to attempt to divine whether Daylight Saving Time would
be in effect for the given time, or compute the value manually."
panel-plugin/weather-parsers.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
index d574df2..dc47805 100644
--- a/panel-plugin/weather-parsers.c
+++ b/panel-plugin/weather-parsers.c
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
static time_t my_timegm(struct tm *tm)
{
@@ -98,6 +99,11 @@ void parse_time (xmlNode * cur_node, xml_weather * data) {
xml_time *timeslice;
xmlNode *child_node;
+memset(&start_tm, 0, sizeof(struct tm));
+memset(&end_tm, 0, sizeof(struct tm));
+start_tm.tm_isdst = -1;
+end_tm.tm_isdst = -1;
+
if (xmlStrcasecmp(datatype, "forecast")) {
xmlFree(datatype);
xmlFree(start);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Build plugin as a module (bug #9152).
Updating branch refs/heads/master
to 77546c193fb1307c76981e8f41687687344b24f2 (commit)
from 94c7c6e88ed7caf1ed8fec608558050274064a84 (commit)
commit 77546c193fb1307c76981e8f41687687344b24f2
Author: Landry Breuil
Date: Wed Jul 25 09:34:46 2012 +0200
Build plugin as a module (bug #9152).
panel-plugin/Makefile.am | 32 ++--
panel-plugin/weather.c |2 +-
.../{weather.desktop.in.in => weather.desktop.in} |3 +-
po/POTFILES.in |2 +-
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index ed06da1..f1fe387 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -4,12 +4,11 @@ INCLUDES =
\
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DG_LOG_DOMAIN=\"weather\"
-plugin_PROGRAMS = \
- xfce4-weather-plugin
+plugin_LTLIBRARIES = libweather.la
-plugindir = $(libexecdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
-xfce4_weather_plugin_SOURCES = \
+libweather_la_SOURCES =\
weather.c \
weather.h \
weather-config.c\
@@ -31,14 +30,14 @@ xfce4_weather_plugin_SOURCES =
\
weather-translate.c \
weather-translate.h
-xfce4_weather_plugin_CFLAGS = \
+libweather_la_CFLAGS = \
$(LIBXFCE4PANEL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXML_CFLAGS)
-xfce4_weather_plugin_LDADD = \
+libweather_la_LIBADD = \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UTIL_LIBS)\
$(LIBXFCE4UI_LIBS) \
@@ -46,19 +45,20 @@ xfce4_weather_plugin_LDADD =
\
$(LIBXML_LIBS) \
$(LIBRESOLV)
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = weather.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
- sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+libweather_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
+
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_in_files = weather.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
+EXTRA_DIST = $(desktop_in_files)
-CLEANFILES = \
- $(desktop_in_files) \
- $(desktop_DATA)
+CLEANFILES = $(desktop_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 5eb81f3..b24 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -1188,4 +1188,4 @@ weather_construct (XfcePanelPlugin *plugin)
update_weatherdata (data);
}
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (weather_construct);
+XFCE_PANEL_PLUGIN_REGISTER (weather_construct);
diff --git a/panel-plugin/weather.desktop.in.in
b/panel-plugin/weather.desktop.in
similarity index 64%
rename from panel-plugin/weather.desktop.in.in
rename to panel-plugin/weather.desktop.in
index 6c39f68..fa40e0a 100644
--- a/panel-plugin/weather.desktop.in.in
+++ b/panel-plugin/weather.desktop.in
@@ -3,4 +3,5 @@ Type=X-XFCE-PanelPlugin
_Name=Weather Update
_Comment=Show current weather conditions
Icon=xfce4-weather
-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-weather-plugin
+X-XFCE-Internal=FALSE
+X-XFCE-Module=weather
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f2884b..c834059 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,4 +19,4 @@ panel-plugin/weather-summary.h
panel-plugin/weather-translate.c
panel-plugin/weather-translate.h
-panel-plugin/weather.deskto
