[Xfce4-commits] parole:master Fix bug #9148 (thanks Landry)
Updating branch refs/heads/master to 50401f4ff13e3c8758e0f869584ff549b723ec3e (commit) from f5f553b85c75e574c5ea65af143971a184216b33 (commit) commit 50401f4ff13e3c8758e0f869584ff549b723ec3e Author: Simon Steinbeiss och...@xfce.org Date: Tue Jul 24 10:42:55 2012 +0200 Fix bug #9148 (thanks Landry) src/parole-player.c |7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index 6193dcf..f033050 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -183,7 +183,8 @@ voidparole_player_volume_mute (GtkWidget *widget, void parole_player_open_preferences_cb (GtkWidget *widget, ParolePlayer *player); -voidparole_player_volume_value_changed_cb (GtkScaleButton *widget, +voidparole_player_volume_value_changed_cb (GtkScaleButton *widget, +gdouble value, ParolePlayer *player); gbooleanparole_player_volume_scroll_event_cb (GtkWidget *widget, @@ -1753,10 +1754,8 @@ parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, Par } void -parole_player_volume_value_changed_cb (GtkScaleButton *widget, ParolePlayer *player) +parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value, ParolePlayer *player) { -gdouble value; -value = gtk_scale_button_get_value (GTK_SCALE_BUTTON (player-priv-volume)); parole_player_change_volume (player, value); parole_rc_write_entry_int (volume, PAROLE_RC_GROUP_GENERAL, (gint)(value * 100)); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Revert Fix bug #9148 (thanks Landry)
Updating branch refs/heads/master to 0a7ff90f6e5d167440680dfb93dea2dfb80272cb (commit) from 50401f4ff13e3c8758e0f869584ff549b723ec3e (commit) commit 0a7ff90f6e5d167440680dfb93dea2dfb80272cb Author: Simon Steinbeiss och...@xfce.org Date: Tue Jul 24 11:02:26 2012 +0200 Revert Fix bug #9148 (thanks Landry) This reverts commit 50401f4ff13e3c8758e0f869584ff549b723ec3e. src/parole-player.c |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index f033050..6193dcf 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -183,8 +183,7 @@ voidparole_player_volume_mute (GtkWidget *widget, void parole_player_open_preferences_cb (GtkWidget *widget, ParolePlayer *player); -voidparole_player_volume_value_changed_cb (GtkScaleButton *widget, -gdouble value, +voidparole_player_volume_value_changed_cb (GtkScaleButton *widget, ParolePlayer *player); gbooleanparole_player_volume_scroll_event_cb (GtkWidget *widget, @@ -1754,8 +1753,10 @@ parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, Par } void -parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value, ParolePlayer *player) +parole_player_volume_value_changed_cb (GtkScaleButton *widget, ParolePlayer *player) { +gdouble value; +value = gtk_scale_button_get_value (GTK_SCALE_BUTTON (player-priv-volume)); parole_player_change_volume (player, value); parole_rc_write_entry_int (volume, PAROLE_RC_GROUP_GENERAL, (gint)(value * 100)); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix crash when changing volume (bug #9148)
Updating branch refs/heads/master to 27c3f22614f7dcc857c0484697008b50f99bd74e (commit) from 0a7ff90f6e5d167440680dfb93dea2dfb80272cb (commit) commit 27c3f22614f7dcc857c0484697008b50f99bd74e Author: Landry Breuil lan...@xfce.org Date: Tue Jul 24 09:14:49 2012 +0200 Fix crash when changing volume (bug #9148) Since the GtkRange was replaced by a GtkVolumeButton, the 'value-changed' callback receives the value as second argument. src/parole-player.c |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index 6193dcf..85b2cf8 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -184,6 +184,7 @@ voidparole_player_open_preferences_cb (GtkWidget *widget, ParolePlayer *player); voidparole_player_volume_value_changed_cb (GtkScaleButton *widget, +gdouble value, ParolePlayer *player); gbooleanparole_player_volume_scroll_event_cb (GtkWidget *widget, @@ -1753,10 +1754,8 @@ parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, Par } void -parole_player_volume_value_changed_cb (GtkScaleButton *widget, ParolePlayer *player) +parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value, ParolePlayer *player) { -gdouble value; -value = gtk_scale_button_get_value (GTK_SCALE_BUTTON (player-priv-volume)); parole_player_change_volume (player, value); parole_rc_write_entry_int (volume, PAROLE_RC_GROUP_GENERAL, (gint)(value * 100)); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Remove uninitialized variables and do not free them (bug #9152).
Updating branch refs/heads/master to 546f670c7f466887b08a724a71e84b8d9ebf8587 (commit) from 8e6afef9a67f08ee247e0a15b65ded2231f08661 (commit) commit 546f670c7f466887b08a724a71e84b8d9ebf8587 Author: Harald Judt h.j...@gmx.at Date: Tue Jul 24 11:09:05 2012 +0200 Remove uninitialized variables and do not free them (bug #9152). Left-over from copy pasting around code which may go unnoticed on linux but makes plugin crash on OpenBSD. This partly fixes bug #9152, but there seem to be similar problems in other parts of the code. panel-plugin/weather-parsers.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c index fd3f463..c0326fb 100644 --- a/panel-plugin/weather-parsers.c +++ b/panel-plugin/weather-parsers.c @@ -161,19 +161,15 @@ xml_time *get_timeslice(xml_weather *data, time_t start_t, time_t end_t) void parse_location (xmlNode * cur_node, xml_location *loc) { xmlNode *child_node; - gchar *altitude, *latitude, *longitude; g_free(loc-altitude); loc-altitude = PROP(cur_node, altitude); - xmlFree(altitude); g_free(loc-latitude); loc-latitude = PROP(cur_node, latitude); - xmlFree(latitude); g_free(loc-longitude); loc-longitude = PROP(cur_node, longitude); - xmlFree(longitude); for (child_node = cur_node-children; child_node; child_node = child_node-next) { ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master Update TODO.
Updating branch refs/heads/master to 9cda2d0a9d5cf6c02ee106b66316d1f4a5904aad (commit) from 546f670c7f466887b08a724a71e84b8d9ebf8587 (commit) commit 9cda2d0a9d5cf6c02ee106b66316d1f4a5904aad Author: Harald Judt h.j...@gmx.at Date: Tue Jul 24 11:30:52 2012 +0200 Update TODO. TODO |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO index 62650ac..b25c9cd 100644 --- a/TODO +++ b/TODO @@ -18,6 +18,10 @@ Data - maybe use data in XML to schedule downloads? * How about a follow-me mode: Auto-determine location based on IP address and adapt to any changes? +* The plugin uses the local time, which results in wrong forecasts + when the user chooses a location in a different timezone. It should + be possible to find the timezone of the chosen location and do some + math to correct this. Forecast tab == ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fixed default filter not being displayed in combobox.
Updating branch refs/heads/master to 1367c515c940970c4ec7744ead8a94bbe5a9ae46 (commit) from 27c3f22614f7dcc857c0484697008b50f99bd74e (commit) commit 1367c515c940970c4ec7744ead8a94bbe5a9ae46 Author: Sean Davis smd.seanda...@gmail.com Date: Tue Jul 24 06:11:42 2012 -0400 Fixed default filter not being displayed in combobox. data/interfaces/mediachooser.ui | 17 - src/parole-mediachooser.c | 14 +- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/data/interfaces/mediachooser.ui b/data/interfaces/mediachooser.ui index cbe19ee..77f2bec 100644 --- a/data/interfaces/mediachooser.ui +++ b/data/interfaces/mediachooser.ui @@ -105,7 +105,6 @@ property name=orientationvertical/property property name=spacing1/property property name=create_foldersFalse/property -property name=filterfilefilter/property property name=local_onlyFalse/property property name=select_multipleTrue/property signal name=file-activated handler=media_chooser_file_activate_cb swapped=no/ @@ -120,22 +119,6 @@ /object /child /object - object class=GtkFileFilter id=filefilter/ - object class=GtkImage id=image1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=stockgtk-open/property - /object - object class=GtkImage id=image2 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=stockgtk-open/property - /object - object class=GtkImage id=image3 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=stockgtk-open/property - /object object class=GtkImage id=image4 property name=visibleTrue/property property name=can_focusFalse/property diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c index c5b7e7f..c70fad0 100644 --- a/src/parole-mediachooser.c +++ b/src/parole-mediachooser.c @@ -191,7 +191,7 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser) GtkWidget *recursive; GtkWidget *replace; GtkWidget *play_opened; -GtkFileFilter *filter; +GtkFileFilter *filter, *all_files; gbooleanscan_recursive; gbooleanreplace_playlist; gbooleanplay; @@ -205,20 +205,16 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser) gtk_widget_hide( media_chooser-spinner ); file_chooser = GTK_WIDGET (gtk_builder_get_object (builder, filechooserwidget)); -filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (file_chooser)); +filter = gtk_file_filter_new(); gtk_file_filter_set_name( filter, _(Supported files) ); - gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), audio/*); gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), video/*); - -GtkFileFilter *all_files; +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter ); + all_files = gtk_file_filter_new(); -gtk_file_filter_add_pattern ( all_files, *); - gtk_file_filter_set_name( all_files, _(All files) ); - -gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter ); +gtk_file_filter_add_pattern ( all_files, *); gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), all_files ); folder = parole_rc_read_entry_string (media-chooser-folder, PAROLE_RC_GROUP_GENERAL, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 4fb9137a4d0a1694c2211cdba37740b16a016a60 (commit) from 9cda2d0a9d5cf6c02ee106b66316d1f4a5904aad (commit) commit 4fb9137a4d0a1694c2211cdba37740b16a016a60 Author: Masato Hashimoto hash...@xfce.org Date: Tue Jul 24 12:27:49 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 | 592 +++--- 1 files changed, 24 insertions(+), 568 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1f51485..aec2edb 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,6 +1,6 @@ # Japanese 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.. +# Copyright (C) 2006-2012 The Xfce development team. +# This file is distributed under the same license as the xfce-weather-plugin package. # Yuko Iwamatsu niga...@gmail.org, 2008 # Nobuhiro Iwamatsu iwama...@nigauri.org, 2008. # Masato Hashimoto cabezon.hashim...@gmail.com, 2011,2012. @@ -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-23 18:04+0900\n -PO-Revision-Date: 2012-07-23 18:05+0900\n +POT-Creation-Date: 2012-07-24 19:25+0900\n +PO-Revision-Date: 2012-07-24 19:27+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-i...@xfce.org\n Language: ja\n @@ -144,78 +144,78 @@ msgstr 霧 (F) msgid Precipitations (R) msgstr 降水量 (R) -#: ../panel-plugin/weather-config.c:229 ../panel-plugin/weather-config.c:383 -#: ../panel-plugin/weather-config.c:494 +#: ../panel-plugin/weather-config.c:239 ../panel-plugin/weather-config.c:393 +#: ../panel-plugin/weather-config.c:504 msgid Unset msgstr 解除 -#: ../panel-plugin/weather-config.c:325 +#: ../panel-plugin/weather-config.c:335 msgid Please enter proxy settings msgstr プロキシ設定を入力してください -#: ../panel-plugin/weather-config.c:392 +#: ../panel-plugin/weather-config.c:402 msgid Detecting... msgstr 検出しています... -#: ../panel-plugin/weather-config.c:450 +#: ../panel-plugin/weather-config.c:460 msgid System of _Measurement: msgstr 測定単位(_M): -#: ../panel-plugin/weather-config.c:455 +#: ../panel-plugin/weather-config.c:465 msgid Imperial msgstr ヤード・ポンド法 -#: ../panel-plugin/weather-config.c:457 +#: ../panel-plugin/weather-config.c:467 msgid Metric msgstr メートル法 -#: ../panel-plugin/weather-config.c:470 +#: ../panel-plugin/weather-config.c:480 msgid L_ocation: msgstr 地域(_O): -#: ../panel-plugin/weather-config.c:508 +#: ../panel-plugin/weather-config.c:518 msgid Chan_ge... msgstr 変更(_G)... #. proxy -#: ../panel-plugin/weather-config.c:521 +#: ../panel-plugin/weather-config.c:531 msgid _Proxy server: msgstr プロキシサーバー(_P): -#: ../panel-plugin/weather-config.c:526 +#: ../panel-plugin/weather-config.c:536 msgid Use proxy _server msgstr プロキシサーバーを使用する(_S) -#: ../panel-plugin/weather-config.c:528 +#: ../panel-plugin/weather-config.c:538 msgid Auto-detect from _environment msgstr 環境から自動検出する(_E) #. number of days shown in forecast -#: ../panel-plugin/weather-config.c:593 +#: ../panel-plugin/weather-config.c:603 msgid Number of _forecast days: msgstr 予報日数(_F): -#: ../panel-plugin/weather-config.c:615 +#: ../panel-plugin/weather-config.c:625 msgid _Labels to display msgstr 表示するラベル(_L) -#: ../panel-plugin/weather-config.c:619 +#: ../panel-plugin/weather-config.c:629 msgid _Add msgstr 追加(_A) -#: ../panel-plugin/weather-config.c:635 +#: ../panel-plugin/weather-config.c:645 msgid _Remove msgstr 削除(_R) -#: ../panel-plugin/weather-config.c:640 +#: ../panel-plugin/weather-config.c:650 msgid Move _Up msgstr 上へ(_U) -#: ../panel-plugin/weather-config.c:645 +#: ../panel-plugin/weather-config.c:655 msgid Move _Down msgstr 下へ(_D) -#: ../panel-plugin/weather-config.c:683 +#: ../panel-plugin/weather-config.c:693 msgid Animate _transitions between labels msgstr ラベルの切り換えをアニメーションで行う(_T) @@ -710,7 +710,7 @@ msgstr 曇り時々雷雨 #: ../panel-plugin/weather-translate.c:118 msgid Sleet and thunder -msgstr 雷とみぞれ +msgstr 雷を伴うみぞれ #: ../panel-plugin/weather-translate.c:215 msgid calm @@ -724,547 +724,3 @@ msgstr 不明 msgid Show current weather conditions msgstr 現在の天気状況を表示します。 -#~ msgid -#~ \tPoint data applies to:\n -#~ \t%s\n -#~ msgstr -#~ \t予報時刻:\n -#~ \t%s\n - -#~ msgid -#~ \n -#~ \tInterval data applies to:\n -#~ \tStart:\t%s\n -#~ \tEnd:\t%s\n -#~ msgstr -#~ \n -#~ \t予報時間帯:\n -#~ \t%s から\n -#~ \t%s まで\n - -#~ msgid -#~ \n -#~ \tInterval data provides icon, description and precipitation,\n -#~ \twhile the remaining information originates from point data.\n -#~ msgstr -#~ \n -#~ \tパネルに表示される天気のアイコン、説明、および降水量は予報時間帯の、\n -#~ \tその他は予報時刻の情報です。\n - -#~ msgid Overall cloudiness (C) -#~ msgstr 全雲量 (C)
[Xfce4-commits] xfburn:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to e263ee38db4dac9b3eae53c2ac755d6f7d16ac01 (commit) from 42b3fecf5a8f59974640c2a46581693bafdbff1b (commit) commit e263ee38db4dac9b3eae53c2ac755d6f7d16ac01 Author: Masato Hashimoto hash...@xfce.org Date: Tue Jul 24 12:30:22 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 281 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 392 -- 1 files changed, 200 insertions(+), 192 deletions(-) diff --git a/po/ja.po b/po/ja.po index bf8e89d..029c6c7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -16,8 +16,8 @@ msgid msgstr Project-Id-Version: xfburn 0.0.3svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-18 14:47+0900\n -PO-Revision-Date: 2012-04-25 20:29+0900\n +POT-Creation-Date: 2012-07-24 19:28+0900\n +PO-Revision-Date: 2012-07-24 19:29+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-users...@ml.fdiary.net\n Language: ja\n @@ -72,12 +72,11 @@ msgstr ディスクの中身を消去 #: ../xfburn/xfburn-burn-image-dialog.c:191 #: ../xfburn/xfburn-copy-cd-dialog.c:131 #: ../xfburn/xfburn-copy-dvd-dialog.c:131 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:159 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:160 msgid Burning device msgstr 焼き込み先のデバイス -#: ../xfburn/xfburn-blank-dialog.c:222 -#: ../xfburn/xfburn-device-box.c:185 +#: ../xfburn/xfburn-blank-dialog.c:222 ../xfburn/xfburn-device-box.c:187 msgid Blank mode msgstr 消去モード @@ -86,7 +85,7 @@ msgstr 消去モード #: ../xfburn/xfburn-burn-image-dialog.c:199 #: ../xfburn/xfburn-copy-cd-dialog.c:139 #: ../xfburn/xfburn-copy-dvd-dialog.c:139 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:193 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:194 msgid Options msgstr オプション @@ -95,7 +94,7 @@ msgstr オプション #: ../xfburn/xfburn-burn-image-dialog.c:203 #: ../xfburn/xfburn-copy-cd-dialog.c:143 #: ../xfburn/xfburn-copy-dvd-dialog.c:143 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:197 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:198 msgid E_ject disk msgstr ディスクを取り出す(_J) @@ -132,8 +131,7 @@ msgstr ディスクの中身を消去しています... msgid Done msgstr 完了しました -#: ../xfburn/xfburn-blank-dialog.c:444 -#: ../xfburn/xfburn-perform-burn.c:372 +#: ../xfburn/xfburn-blank-dialog.c:444 ../xfburn/xfburn-perform-burn.c:372 #: ../xfburn/xfburn-progress-dialog.c:603 msgid Failure msgstr 失敗しました @@ -142,7 +140,7 @@ msgstr 失敗しました #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:610 #: ../xfburn/xfburn-burn-image-dialog.c:388 #: ../xfburn/xfburn-burn-image-dialog.c:556 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:396 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:397 msgid Unable to grab the drive. msgstr ドライブを取得できません。 @@ -175,13 +173,13 @@ msgstr smallデフォルトのコンポジション名を変更しますか? #: ../xfburn/xfburn-burn-image-dialog.c:208 #: ../xfburn/xfburn-copy-cd-dialog.c:148 #: ../xfburn/xfburn-copy-dvd-dialog.c:148 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:202 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:203 msgid _Dummy write msgstr ダミーを書き出す(_D) #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:240 #: ../xfburn/xfburn-burn-image-dialog.c:212 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:206 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:207 msgid Burn_Free msgstr 自由に焼く(_F) @@ -193,7 +191,7 @@ msgid Only create _ISO msgstr ISO 作成のみ(_I) #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:283 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:221 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:222 msgid _Burn Composition msgstr コンポジションを焼く(_B) @@ -217,7 +215,7 @@ msgid An error occurred in the burn backend. msgstr バックエンドでの焼き込みでエラーが発生しました。 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:571 -#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:327 +#: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:328 msgid The write mode is not supported currently. msgstr 書き込みモードは現在サポートされていません。 @@ -270,16 +268,24 @@ msgid Burning image... msgstr イメージを焼き込んでいます... #: ../xfburn/xfburn-burn-image-dialog.c:445 -msgid span weight=\bold\ foreground=\darkred\ stretch=\semiexpanded\Please select an image to burn/span -msgstr span weight=\bold\ foreground=\darkred\ stretch=\semiexpanded\焼き込むイメージを選択してください/span +msgid +span weight=\bold\ foreground=\darkred\ stretch=\semiexpanded\Please +select an image to burn/span +msgstr +span weight=\bold\ foreground=\darkred\ stretch=\semiexpanded\焼き込 +むイメージを選択してください/span #: ../xfburn/xfburn-burn-image-dialog.c:483 -msgid Cannot append data to multisession disc in this write mode (use TAO instead) -msgstr この書き込みモードではマルチセッションディスクにデータを追加できません (代わりに TAO を使用してください) +msgid +Cannot append data to multisession disc in this write mode
[Xfce4-commits] xfce4-dict:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 22ff704fb27af0771a70bade528dd1dfa624943a (commit) from 534b377d84596ede1859d0f8158ff13f828f180c (commit) commit 22ff704fb27af0771a70bade528dd1dfa624943a Author: Masato Hashimoto hash...@xfce.org Date: Tue Jul 24 12:34:37 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 111 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 143 ++--- 1 files changed, 70 insertions(+), 73 deletions(-) diff --git a/po/ja.po b/po/ja.po index 30e0b16..22dac50 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,16 +1,16 @@ # Japanese translation of the xfce4-dict-plugin package. -# Copyright (C) 2006-2008 Enrico Tröger +# Copyright (C) 2006-2012 Enrico Tröger # This file is distributed under the same license as the xfce4-dict-plugin pack # Yuko Iwamatsu nigauri@gmail, 2008. # Nobuhiro Iwamatsu iwama...@nigauri.org, 2008. -# Masato Hashimoto cabezon.hashim...@gmail.com, 2009. +# Masato Hashimoto cabezon.hashim...@gmail.com, 2009, 2012. # msgid msgstr Project-Id-Version: xfce4-dict-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-28 15:05+0900\n -PO-Revision-Date: 2011-09-28 15:07+0900\n +POT-Creation-Date: 2012-07-24 19:32+0900\n +PO-Revision-Date: 2012-07-24 19:33+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-i...@xfce.org\n Language: ja\n @@ -19,31 +19,26 @@ msgstr Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=2; plural=0;\n -#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:1 -msgid A plugin to query different dictionaries. -msgstr いろいろな辞書を照会するプラグインです。 - -#: ../panel-plugin/xfce4-dict-plugin.desktop.in.in.h:2 -#: ../src/xfce4-dict.desktop.in.h:2 -#: ../lib/gui.c:734 -#: ../lib/prefs.c:270 +#: ../panel-plugin/xfce4-dict-plugin.desktop.in.h:1 +#: ../src/xfce4-dict.desktop.in.h:1 ../lib/gui.c:736 ../lib/prefs.c:270 msgid Dictionary msgstr 辞書 -#: ../panel-plugin/xfce4-dict-plugin.c:347 -#: ../panel-plugin/xfce4-dict-plugin.c:473 -#: ../src/xfce4-dict.c:200 -#: ../lib/spell.c:243 -#: ../lib/gui.c:517 +#: ../panel-plugin/xfce4-dict-plugin.desktop.in.h:2 +msgid A plugin to query different dictionaries. +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 準備ができました。 -#: ../panel-plugin/xfce4-dict-plugin.c:413 +#: ../panel-plugin/xfce4-dict-plugin.c:431 msgid Look up a word msgstr 単語を調べます -#: ../panel-plugin/xfce4-dict-plugin.c:444 -#: ../lib/gui.c:758 +#: ../panel-plugin/xfce4-dict-plugin.c:467 ../lib/gui.c:766 msgid Search term msgstr 検索したい言葉を入力してください @@ -70,7 +65,9 @@ msgstr パネル内のテキストフィールドにフォーカスを取得す # CLI --help #: ../src/xfce4-dict.c:55 msgid Start stand-alone application even if the panel plugin is loaded -msgstr パネルプラグインが読み込まれている場合でも、スタンドアロンアプリケーションを起動する +msgstr +パネルプラグインが読み込まれている場合でも、スタンドアロンアプリケーションを +起動する # CLI --help #: ../src/xfce4-dict.c:56 @@ -95,15 +92,14 @@ msgstr [TEXT] msgid Please report bugs to %s. msgstr バグは %s へ報告してください。 -#: ../src/xfce4-dict.desktop.in.h:1 -#: ../lib/gui.c:957 -msgid A client program to query different dictionaries. -msgstr いろいろな辞書を照会できるクライアントプログラムです。 - -#: ../src/xfce4-dict.desktop.in.h:3 +#: ../src/xfce4-dict.desktop.in.h:2 msgid Dictionary Client msgstr 辞書クライアント +#: ../src/xfce4-dict.desktop.in.h:3 ../lib/gui.c:962 +msgid A client program to query different dictionaries. +msgstr いろいろな辞書を照会できるクライアントプログラムです。 + #: ../lib/spell.c:75 msgid Spell Checker Results: msgstr スペルチェックの結果: @@ -141,8 +137,7 @@ msgstr \%s\ の実行中にエラーが発生しました (%s)。 msgid Please set the spell check command in the preferences dialog. msgstr 設定ダイアログで aspell コマンドを設定してください。 -#: ../lib/spell.c:208 -#: ../lib/common.c:224 +#: ../lib/spell.c:208 ../lib/common.c:223 msgid Invalid input msgstr 不正な入力です。 @@ -151,8 +146,7 @@ msgstr 不正な入力です。 msgid Process failed (%s) msgstr 処理失敗 (%s) -#: ../lib/speedreader.c:80 -#: ../lib/speedreader.c:683 +#: ../lib/speedreader.c:80 ../lib/speedreader.c:683 msgid P_ause msgstr 一時停止(_A) @@ -193,8 +187,12 @@ msgstr[0] (一度に %d 個表示します) msgstr[1] (一度に %d 個表示します) #: ../lib/speedreader.c:586 -msgid This is an easy speed reading utility to help train you to read faster. It does this by flashing words at a rapid rate on the screen. -msgstr これは速読練習用の簡単なユーティリティです。画面に文字列を一つずつ、高速に表示します。 +msgid +This is an easy speed reading utility to help train you to read faster. It +does this by flashing words at a rapid rate on the screen. +msgstr +これは速読練習用の簡単なユーティリティです。画面に文字列を一つずつ、高速に表 +示します。 #: ../lib/speedreader.c:589 msgid _Words per Minute: @@ -219,7 +217,8 @@ msgstr フォントサイズ(_F): msgid Enter some text here you would like to read.\n \n -Be relaxed and make yourself comfortable, then press Start to begin speed
[Xfce4-commits] parole:master Cleanup of plugin manager interface.
Updating branch refs/heads/master to f405a4e720a72014fe5593032a3dc5f40b421d93 (commit) from 1367c515c940970c4ec7744ead8a94bbe5a9ae46 (commit) commit f405a4e720a72014fe5593032a3dc5f40b421d93 Author: Sean Davis smd.seanda...@gmail.com Date: Tue Jul 24 06:50:10 2012 -0400 Cleanup of plugin manager interface. data/interfaces/plugins.ui | 152 + src/parole-plugins-manager.c | 44 + 2 files changed, 80 insertions(+), 116 deletions(-) diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui index c55b7ec..077687d 100644 --- a/data/interfaces/plugins.ui +++ b/data/interfaces/plugins.ui @@ -32,10 +32,10 @@ child object class=GtkButton id=close property name=labelgtk-close/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property property name=use_stockTrue/property /object packing @@ -119,112 +119,120 @@ property name=can_focusFalse/property property name=spacing10/property child - object class=GtkTable id=table1 + object class=GtkVBox id=vbox2 property name=visibleTrue/property property name=can_focusFalse/property -property name=n_rows3/property -property name=n_columns2/property -property name=column_spacing4/property -property name=row_spacing10/property -child - object class=GtkLabel id=label1 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=label translatable=yeslt;bgt;Description:lt;/bgt;/property -property name=use_markupTrue/property - /object - packing -property name=x_options/ -property name=y_options/ - /packing -/child -child - object class=GtkLabel id=label2 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=label translatable=yeslt;bgt;Author:lt;/bgt;/property -property name=use_markupTrue/property - /object - packing -property name=top_attach1/property -property name=bottom_attach2/property -property name=x_options/ -property name=y_options/ - /packing -/child -child - object class=GtkLabel id=description -property name=visibleTrue/property -property name=can_focusFalse/property -property name=use_markupTrue/property -property name=wrapTrue/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property - /packing -/child +property name=spacing12/property child - object class=GtkLabel id=author + object class=GtkFrame id=frame1 property name=visibleTrue/property property name=can_focusFalse/property -property name=use_markupTrue/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkLabel id=description +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=yalign0/property +property name=wrapTrue/property + /object +/child +
[Xfce4-commits] midori:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 04417c37c0c8de6088a6cde4890f08f68072c07d (commit) from f82a06afa5f858ca1ff283ba8115a99e2d39725f (commit) commit 04417c37c0c8de6088a6cde4890f08f68072c07d Author: Sergio Marques smarque...@gmail.com Date: Tue Jul 24 14:01:13 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 674 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 235 +++-- 1 files changed, 119 insertions(+), 116 deletions(-) diff --git a/po/pt.po b/po/pt.po index e13540d..1ffd6c2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: midori\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-21 12:36+\n +POT-Creation-Date: 2012-07-24 10:09+\n PO-Revision-Date: \n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: Portuguese\n @@ -33,18 +33,22 @@ msgid Midori msgstr Midori #: ../data/midori.desktop.in.h:4 +msgid Midori Web Browser +msgstr Navegador web Midori + +#: ../data/midori.desktop.in.h:5 msgid New Private Browsing Window msgstr Nova janela de navegação privada -#: ../data/midori.desktop.in.h:5 ../midori/midori-browser.c:1424 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1424 msgid New Tab msgstr Novo separador -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1421 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1421 msgid New Window msgstr Nova janela -#: ../data/midori.desktop.in.h:7 +#: ../data/midori.desktop.in.h:8 msgid Web Browser msgstr Navegador Web @@ -317,7 +321,7 @@ msgstr _Ignorar msgid Unexpected action '%s'. msgstr Ação inesperada \%s\. -#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6381 +#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6383 msgid _Bookmarks msgstr _Marcadores @@ -358,7 +362,7 @@ msgstr \P_lug-ins\ Netscape msgid _Closed Tabs msgstr Separadores _fechados -#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5520 +#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5522 msgid New _Window msgstr _Nova janela @@ -383,12 +387,12 @@ msgstr Formato de marcadores não reconhecido. msgid Writing failed. msgstr Falha ao escrever. -#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5608 -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5619 msgid Reload the current page msgstr Recarregar página atual -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5616 msgid Stop loading the current page msgstr Parar de carregar da página atual @@ -517,7 +521,7 @@ msgstr msgid New feed msgstr Nova fonte -#: ../midori/midori-browser.c:2647 ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:2647 ../midori/midori-browser.c:5682 #: ../panels/midori-bookmarks.c:527 msgid Add a new bookmark msgstr Adicionar novo marcador @@ -542,7 +546,7 @@ msgstr msgid _Enable Caret Browsing msgstr Ativar nav_egação por cursor -#: ../midori/midori-browser.c:4030 ../midori/midori-browser.c:6074 +#: ../midori/midori-browser.c:4030 ../midori/midori-browser.c:6076 #, c-format msgid Failed to insert new history item: %s\n msgstr Falha ao inserir novo item no histórico: %s\n @@ -596,7 +600,7 @@ msgstr Midori 0.2.6 msgid Import bookmarks… msgstr Importar marcadores… -#: ../midori/midori-browser.c:4485 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4485 ../midori/midori-browser.c:5687 msgid _Import bookmarks msgstr _Importar marcadores @@ -677,374 +681,374 @@ msgstr msgid translator-credits msgstr Sérgio Marques smarque...@gmail.com -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5520 msgid _File msgstr _Ficheiro -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5523 msgid Open a new window msgstr Abrir nova janela -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5526 msgid Open a new tab msgstr Abrir novo separador -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5528 msgid New P_rivate Browsing Window msgstr Nova janela de navegação p_rivada -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5532 msgid Open a file msgstr Abrir ficheiro -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5534 msgid _Save Page As… msgstr _Gravar página como -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5535 msgid Save to a file msgstr Gravar para ficheiro -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5537 msgid Add to Speed _dial msgstr Adicionar à ligação rápi_da -#: ../midori/midori-browser.c:5539 +#: ../midori/midori-browser.c:5541 msgid Add Shortcut to the _desktop
[Xfce4-commits] parole:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 40a2ddbdaedcf4b621b8b67becb94c6cf1ad9be8 (commit) from f405a4e720a72014fe5593032a3dc5f40b421d93 (commit) commit 40a2ddbdaedcf4b621b8b67becb94c6cf1ad9be8 Author: Sergio Marques smarque...@gmail.com Date: Tue Jul 24 14:02:05 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 | 134 -- 1 files changed, 69 insertions(+), 65 deletions(-) diff --git a/po/pt.po b/po/pt.po index 7d88c63..7aa47fd 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-23 07:36+\n +POT-Creation-Date: 2012-07-24 10:21+\n PO-Revision-Date: \n Last-Translator: Nuno Miguel nunom...@gmail.com\n Language-Team: Portuguese\n @@ -19,128 +19,124 @@ msgstr X-Poedit-Country: Portugal\n #: ../data/interfaces/parole.ui.h:1 -msgid 0:00 -msgstr 0:00 - -#: ../data/interfaces/parole.ui.h:2 msgid 16:9 (Widescreen) msgstr 16:9 (Ecrã panorâmico) -#: ../data/interfaces/parole.ui.h:3 +#: ../data/interfaces/parole.ui.h:2 msgid 20:9 (DVB) msgstr 20:9 (DVB) -#: ../data/interfaces/parole.ui.h:4 +#: ../data/interfaces/parole.ui.h:3 msgid 4:3 (TV) msgstr 4:3 (TV) -#: ../data/interfaces/parole.ui.h:5 ../src/misc/parole-filters.c:64 +#: ../data/interfaces/parole.ui.h:4 ../src/misc/parole-filters.c:64 msgid Audio msgstr Áudio -#: ../data/interfaces/parole.ui.h:6 +#: ../data/interfaces/parole.ui.h:5 msgid Audio Track: msgstr Faixa áudio: -#: ../data/interfaces/parole.ui.h:7 +#: ../data/interfaces/parole.ui.h:6 msgid Auto msgstr Automático -#: ../data/interfaces/parole.ui.h:9 +#: ../data/interfaces/parole.ui.h:8 #, no-c-format msgid Buffering (0%) msgstr A processar (0%)) -#: ../data/interfaces/parole.ui.h:10 +#: ../data/interfaces/parole.ui.h:9 ../src/parole-player.c:641 msgid Empty msgstr Vazio -#: ../data/interfaces/parole.ui.h:11 +#: ../data/interfaces/parole.ui.h:10 msgid Languages msgstr Idiomas -#: ../data/interfaces/parole.ui.h:12 +#: ../data/interfaces/parole.ui.h:11 msgid Media player msgstr Reprodutor multimédia -#: ../data/interfaces/parole.ui.h:13 +#: ../data/interfaces/parole.ui.h:12 msgid None msgstr Nenhum -#: ../data/interfaces/parole.ui.h:14 +#: ../data/interfaces/parole.ui.h:13 msgid Open _location msgstr Abrir _localização -#: ../data/interfaces/parole.ui.h:15 ../src/parole-about.c:89 +#: ../data/interfaces/parole.ui.h:14 ../src/parole-about.c:55 msgid Parole Media Player msgstr Reprodutor multimédia Parole -#: ../data/interfaces/parole.ui.h:16 +#: ../data/interfaces/parole.ui.h:15 msgid Pl_ugins msgstr \P_lugins\ -#: ../data/interfaces/parole.ui.h:17 ../src/parole-disc.c:218 +#: ../data/interfaces/parole.ui.h:16 ../src/parole-disc.c:218 #: ../src/parole-disc.c:270 msgid Play Disc msgstr Reproduzir disco -#: ../data/interfaces/parole.ui.h:18 +#: ../data/interfaces/parole.ui.h:17 msgid Select Text Subtitles... msgstr Selecione o texto das legendas... -#: ../data/interfaces/parole.ui.h:19 +#: ../data/interfaces/parole.ui.h:18 msgid Show _playlist msgstr Mostrar lista de re_produção -#: ../data/interfaces/parole.ui.h:20 +#: ../data/interfaces/parole.ui.h:19 msgid Square msgstr Quadrado -#: ../data/interfaces/parole.ui.h:21 +#: ../data/interfaces/parole.ui.h:20 msgid Subtitles msgstr Legendas -#: ../data/interfaces/parole.ui.h:22 +#: ../data/interfaces/parole.ui.h:21 msgid Subtitles: msgstr Legendas: -#: ../data/interfaces/parole.ui.h:23 +#: ../data/interfaces/parole.ui.h:22 msgid Volume _Down msgstr _Diminuir volume -#: ../data/interfaces/parole.ui.h:24 +#: ../data/interfaces/parole.ui.h:23 msgid Volume _Up msgstr A_umentar volume -#: ../data/interfaces/parole.ui.h:25 +#: ../data/interfaces/parole.ui.h:24 msgid _Aspect Ratio msgstr T_amanho do vídeo -#: ../data/interfaces/parole.ui.h:26 +#: ../data/interfaces/parole.ui.h:25 msgid _Edit msgstr _Editar -#: ../data/interfaces/parole.ui.h:27 +#: ../data/interfaces/parole.ui.h:26 msgid _Help msgstr _Ajuda -#: ../data/interfaces/parole.ui.h:28 +#: ../data/interfaces/parole.ui.h:27 msgid _Media msgstr _Multimédia -#: ../data/interfaces/parole.ui.h:29 +#: ../data/interfaces/parole.ui.h:28 msgid _Mute msgstr _Silenciar -#: ../data/interfaces/parole.ui.h:30 +#: ../data/interfaces/parole.ui.h:29 msgid _Repeat msgstr _Repetir -#: ../data/interfaces/parole.ui.h:31 +#: ../data/interfaces/parole.ui.h:30 msgid _Shuffle msgstr _Baralhar -#: ../data/interfaces/parole.ui.h:32 +#: ../data/interfaces/parole.ui.h:31 msgid _View msgstr _Ver @@ -149,19 +145,6 @@ msgid Open Media Files msgstr Abrir ficheiros #: ../data/interfaces/mediachooser.ui.h:2 -msgid Replace playlist with opened files -msgstr
[Xfce4-commits] www:master l10n: Updated Spanish (Castilian) (es) translation to 100%
Updating branch refs/heads/master to ad44acfc0c0e48748de272d8040edb950cecb462 (commit) from 7009af011ae2c80d4c995f7388b858c9c71fc647 (commit) commit ad44acfc0c0e48748de272d8040edb950cecb462 Author: Daniel Durante danieldura...@ymail.com Date: Tue Jul 24 15:33:16 2012 +0200 l10n: Updated Spanish (Castilian) (es) translation to 100% New status: 673 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po | 16 ++-- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index d75e11a..ec69042 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -8,8 +8,8 @@ msgstr Project-Id-Version: www.xfce.org\n Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n; POT-Creation-Date: 2011-09-26 18:33+0200\n -PO-Revision-Date: 2012-07-04 14:11+0100\n -Last-Translator: Daniel Durante danieldura...@ymail.com\n +PO-Revision-Date: 2012-07-24 15:26+0100\n +Last-Translator: Daniel Durante daniedura...@ymail.com\n Language-Team: Spanish\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -2124,9 +2124,8 @@ msgid Uploading Translations msgstr Subiedo Traducciones #: getinvolved/translation.php:97 -#, fuzzy msgid When you are identified on Transifex and have the upload rights it is very simple to upload new translations. Go to a project and choose the component that corresponds to a stable version or to the development branch mdash; you can pass through the collection page to find a project mdash; then click on the small emUpload/em button besides the visualize/download/lock/edit buttons at the right of your language or the emAdd a new translation/em button at the bottom of the page if it doesn't exist yet. Fill in the form and click the emSend/em button. -msgstr Cuando se identifican en Transifex y tienen los derechos de carga es muy sencillo cargar las nuevas traducciones. Ir a un proyecto y escoja el componente que corresponde a una versión estable o la rama de desarrollo - puede pasar a través de la página de la colección para encontrar un proyecto - a continuación, haga clic en el botón emUpload/em pequeños, además de la visualización / descarga / lock / editar botones en la parte derecha de su idioma o en emel/em botón emAñadir nueva traducción/em en la parte inferior de la página si no existe todavía. Rellene el formulario y haga clic en el botón emEnviar./em +msgstr Cuando se identifique en Transifex y tenga los permisos para subir archivos, será muy sencillo cargar nuevas traducciones. Vaya a un proyecto y escoja el componente que corresponda a una versión estable o la rama de desarrollo - puede consultar las página de la colección para encontrar un proyecto -, a continuación, haga clic en el botón emUpload/em que está al lado de los de visualización / descarga / lock / editar en la parte derecha correspondiente a su idioma, o en emAñadir nueva traducción/em en la parte inferior de la página, si todavía no existe una nueva. Rellene el formulario y haga clic en el botón emEnviar./em #: getinvolved/translation.php:101 msgid It is a good idea to click the emLock/em button when doing a translation while there is more than one active translator for your current language. Besides the emUpload/em form, you can click the emEdit/em button to update the translations online. @@ -2367,9 +2366,8 @@ msgid For the latest code you need to make local copies of the GIT repositories msgstr Para tener la última versión del código necesita hacer copia local de los repositorios GIT; este es el lugar de almacén de código para los desarrolladores. Si usa GIT, trate de usar la misma rama para todos los paquetes, así evitará problemas de dependencia en la versión. #: download/building.php:67 -#, fuzzy msgid You first need to make clones of each GIT repository, like the command below, where em$category/em is for example emxfce/em and em$module/em emxfce4-panel/em. If you click on a module in the online a href=\http://git.xfce.org/xfce\; class=\external\repository list/a the clone uri is shown at the bottom of the page. -msgstr Primero tiene que hacer clones de cada repositorio GIT, al igual que el siguiente comando, donde em$ categoría/em es para emxfce/em ejemplo y em$ módulo xfce4-panel./em Si hace clic en un módulo en la línea a href=\http://git.xfce.org/xfce\; class=\external\de lista de repositorios/a la uri clon se muestra en la parte inferior de la página. +msgstr Primero tiene que hacer clones de cada repositorio GIT, como especifica el uso del siguiente comando, em$ categoría/em, por ejemloemxfce/em y em$ módulo xfce4-panel./em Si hace clic en un módulo en la línea a href=\http://git.xfce.org/xfce\; class=\external\de lista de repositorios/ase muestra la uri del clon en la parte inferior de la página. #: download/building.php:75 msgid After the repository is cloned you need to choose which branch you want to
[Xfce4-commits] parole:master Added --add/-a command line option to enqueue files. Addresses bug 6216
Updating branch refs/heads/master to d299ca3aa35fd16520196082f09428400970ad1a (commit) from a7aa63c0271632e4714049cd7c1e02343fd73c2e (commit) commit d299ca3aa35fd16520196082f09428400970ad1a Author: Sean Davis smd.seanda...@gmail.com Date: Tue Jul 24 15:26:09 2012 -0400 Added --add/-a command line option to enqueue files. Addresses bug 6216 src/main.c| 22 +- src/org.parole.media.list.xml |1 + src/parole-medialist.c| 15 +-- src/parole-medialist.h|2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/main.c b/src/main.c index 7ef0af8..59e7dbd 100644 --- a/src/main.c +++ b/src/main.c @@ -102,15 +102,14 @@ parole_send_play_disc (const gchar *uri, const gchar *device) } static void -parole_send_files (gchar **filenames) +parole_send_files (gchar **filenames, gboolean enqueue) { DBusGProxy *proxy; GFile *file; gchar **out_paths; GError *error = NULL; guint i; - - + proxy = parole_get_proxy (PAROLE_DBUS_PLAYLIST_PATH, PAROLE_DBUS_PLAYLIST_INTERFACE); if ( !proxy ) @@ -127,7 +126,8 @@ parole_send_files (gchar **filenames) dbus_g_proxy_call (proxy, AddFiles, error, G_TYPE_STRV, out_paths, - G_TYPE_INVALID, + G_TYPE_BOOLEAN, enqueue, + G_TYPE_INVALID, G_TYPE_INVALID); @@ -142,16 +142,16 @@ parole_send_files (gchar **filenames) } static void -parole_send (gchar **filenames, gchar *device) +parole_send (gchar **filenames, gchar *device, gboolean enqueue) { if ( g_strv_length (filenames) == 1 parole_is_uri_disc (filenames[0])) parole_send_play_disc (filenames[0], device); else - parole_send_files (filenames); + parole_send_files (filenames, enqueue); } static void -parole_send_message (const gchar *message) + parole_send_message (const gchar *message) { DBusGProxy *proxy; GError *error = NULL; @@ -216,6 +216,7 @@ int main (int argc, char **argv) gboolean mute = FALSE; gboolean no_plugins = FALSE; gboolean fullscreen = FALSE; + gboolean enqueue = FALSE; gchar*client_id = NULL; GOptionEntry option_entries[] = @@ -235,6 +236,7 @@ int main (int argc, char **argv) { version, 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, version, N_(Version information), NULL }, { fullscreen, 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, fullscreen, N_(Start in fullscreen mode), NULL }, { xv, '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xv_option_given, N_(Enabled/Disable XV support), NULL}, + { add, 'a', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, enqueue, N_(Add files to playlist), NULL}, { sm-client-id, 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, client_id, NULL, NULL }, {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, filenames, N_(Media to play), NULL}, { NULL, }, @@ -273,10 +275,11 @@ int main (int argc, char **argv) if ( !new_instance parole_dbus_name_has_owner (PAROLE_DBUS_NAME) ) { + if (!enqueue) g_print (_(Parole is already running, use -i to open a new instance\n)); if ( filenames filenames[0] != NULL ) - parole_send (filenames, device); + parole_send (filenames, device, enqueue); else if (device != NULL) parole_send_play_disc (NULL, device); @@ -307,6 +310,7 @@ int main (int argc, char **argv) if ( mute ) parole_send_message (Mute); } + else { builder = parole_builder_get_main_interface (); @@ -328,7 +332,7 @@ int main (int argc, char **argv) { ParoleMediaList *list; list = parole_player_get_media_list (player); - parole_media_list_add_files (list, filenames); + parole_media_list_add_files (list, filenames, enqueue); } } else if ( device != NULL ) diff --git a/src/org.parole.media.list.xml b/src/org.parole.media.list.xml index bc7e021..b34cac1 100644 --- a/src/org.parole.media.list.xml +++ b/src/org.parole.media.list.xml @@ -9,6 +9,7 @@ method name=AddFiles arg type=as name=files direction=in/ + arg type=b name=enqueue direction=in/ /method /interface diff --git a/src/parole-medialist.c b/src/parole-medialist.c index 01bdf90..f9997f0 100644 --- a/src/parole-medialist.c +++ b/src/parole-medialist.c @@ -1804,7 +1804,7 @@ void parole_media_list_open_location (ParoleMediaList *list) parole_media_list_open_location_internal (list); } -gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames) +gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames, gboolean
[Xfce4-commits] parole:master Last opened file sets last opened directory. (Bug #7157)
Updating branch refs/heads/master to e408a4853df1bd2ae90e10dcd1c1bba9ff1213a7 (commit) from d299ca3aa35fd16520196082f09428400970ad1a (commit) commit e408a4853df1bd2ae90e10dcd1c1bba9ff1213a7 Author: Sean Davis smd.seanda...@gmail.com Date: Tue Jul 24 16:40:14 2012 -0400 Last opened file sets last opened directory. (Bug #7157) src/misc/parole-file.c | 50 +++- src/misc/parole-file.h |2 + src/parole-player.c|1 + 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/src/misc/parole-file.c b/src/misc/parole-file.c index d46487d..006a2e9 100644 --- a/src/misc/parole-file.c +++ b/src/misc/parole-file.c @@ -46,6 +46,7 @@ struct _ParoleFilePrivate gchar *display_name; gchar *uri; gchar *content_type; + gchar *directory; }; @@ -55,7 +56,8 @@ enum PROP_PATH, PROP_DISPLAY_NAME, PROP_URI, -PROP_CONTENT_TYPE +PROP_CONTENT_TYPE, + PROP_DIRECTORY }; G_DEFINE_TYPE (ParoleFile, parole_file, G_TYPE_OBJECT) @@ -80,6 +82,9 @@ parole_file_finalize (GObject *object) if ( priv-content_type ) g_free (priv-content_type); + + if ( priv-directory ) + g_free (priv-directory); G_OBJECT_CLASS (parole_file_parent_class)-finalize (object); } @@ -99,6 +104,9 @@ parole_file_set_property (GObject *object, guint prop_id, case PROP_DISPLAY_NAME: PAROLE_FILE_GET_PRIVATE (file)-display_name = g_value_dup_string (value); break; + case PROP_DIRECTORY: + PAROLE_FILE_GET_PRIVATE (file)-directory = g_value_dup_string (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -127,6 +135,9 @@ parole_file_get_property (GObject *object, guint prop_id, case PROP_DISPLAY_NAME: g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)-display_name); break; + case PROP_DIRECTORY: + g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)-directory); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -152,6 +163,9 @@ parole_file_constructed (GObject *object) 0, NULL, error); + + + priv-directory = g_file_get_path (g_file_get_parent( gfile )); if ( error ) { @@ -286,6 +300,22 @@ parole_file_class_init (ParoleFileClass *klass) The content type of the file, NULL, G_PARAM_READABLE)); + + /** + * ParoleFile:directory: + * + * The parent directory of the file. + * + * Since: 0.2 + **/ +g_object_class_install_property (object_class, +PROP_DIRECTORY, +g_param_spec_string (directory, + Parent directory, + The parent directory of the file, + NULL, + G_PARAM_CONSTRUCT_ONLY| + G_PARAM_READWRITE)); g_type_class_add_private (klass, sizeof (ParoleFilePrivate)); } @@ -301,6 +331,7 @@ parole_file_init (ParoleFile *file) priv-display_name = NULL; priv-uri = NULL; priv-content_type= NULL; + priv-directory = NULL; } /** @@ -409,3 +440,20 @@ parole_file_get_content_type (const ParoleFile *file) return PAROLE_FILE_GET_PRIVATE (file)-content_type; } + +/** + * parole_file_get_directory: + * @file: a #ParoleFile. + * + * + * Returns: A string containing the parent directory path. + * + * Since: 0.2 + **/ +const gchar * +parole_file_get_directory (const ParoleFile *file) +{ +g_return_val_if_fail (PAROLE_IS_FILE (file), NULL); + +return PAROLE_FILE_GET_PRIVATE (file)-directory; +} diff --git a/src/misc/parole-file.h b/src/misc/parole-file.h index 7430f9c..b286d82 100644 --- a/src/misc/parole-file.h +++ b/src/misc/parole-file.h @@ -52,6 +52,8 @@ ParoleFile *parole_file_new (const gchar *filename) ParoleFile*parole_file_new_with_display_name (const gchar *filename, const gchar *display_name); + +const gchar G_CONST_RETURN *parole_file_get_directory(const ParoleFile
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 576f9d15c39e913724a8cf17dd3763e3e4d17cae (commit) from 4fb9137a4d0a1694c2211cdba37740b16a016a60 (commit) commit 576f9d15c39e913724a8cf17dd3763e3e4d17cae Author: Yarema aka Knedlyk yupad...@gmail.com Date: Tue Jul 24 23:05:46 2012 +0200 l10n: Updated Ukrainian (uk) translation to 100% New status: 155 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 14 +++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/po/uk.po b/po/uk.po index 3f5d4c0..6b9ae4b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # Ukrainian translation of xfce4-weather-plugin. # Copyright (C) 2006-2007 The Xfce development team. # This file is distributed under the same license as the xfce4-weather-plugin package. -# +# # Dmitry Nikitin luckas...@mail.ru, 2008. msgid msgstr @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2012-07-15 11:21+0200\n Last-Translator: Oleksandr Natalenko pfac...@gmail.com\n Language-Team: Ukrainian xfce4-...@xfce.org\n -Language: uk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: uk\n X-Generator: KBabel 1.11.4\n #: ../panel-plugin/weather.c:127 @@ -83,7 +83,8 @@ msgstr Не вдалося відкрити таке посилання: %s msgid Weather Update msgstr Оновлення погоди -#. add refresh button to right click menu, for people who missed the middle mouse click feature +#. 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 msgid _Forecast msgstr _Прогноз @@ -359,6 +360,8 @@ msgid \tTemperature, wind, atmosphere and cloud data apply to:\n \t%s\n msgstr +\tТемпература, вітер, дані про небо та хмари застосувати до:\n +\t%s\n #: ../panel-plugin/weather-summary.c:294 #, c-format @@ -369,6 +372,11 @@ msgid \tStart:\t%s\n \tEnd:\t%s\n msgstr +\n +\tОпади та символ погоди розраховані\n +\tдля такого часового інтервалу:\n +\tStart:\t%s\n +\tEnd:\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] midori:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to e02a90d844e337e342338d1450abe65c46f11fc9 (commit) from 04417c37c0c8de6088a6cde4890f08f68072c07d (commit) commit e02a90d844e337e342338d1450abe65c46f11fc9 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Tue Jul 24 23:07:49 2012 +0200 l10n: Updated Ukrainian (uk) translation to 100% New status: 674 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 242 -- 1 files changed, 124 insertions(+), 118 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1444165..c60eaed 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: midori svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-22 10:00+\n +POT-Creation-Date: 2012-07-24 20:51+\n PO-Revision-Date: 2010-02-16 22:53+0100\n Last-Translator: Yarema aka Knedlyk yupad...@gmail.com\n Language-Team: Ukrainian translat...@linux.org.ua\n @@ -32,18 +32,22 @@ msgid Midori msgstr Мідорі #: ../data/midori.desktop.in.h:4 +msgid Midori Web Browser +msgstr Midori - переглядач Веб-сторінок + +#: ../data/midori.desktop.in.h:5 msgid New Private Browsing Window msgstr Нове вікно в режимі приватності -#: ../data/midori.desktop.in.h:5 ../midori/midori-browser.c:1424 +#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1424 msgid New Tab msgstr Нова вкладка -#: ../data/midori.desktop.in.h:6 ../midori/midori-browser.c:1421 +#: ../data/midori.desktop.in.h:7 ../midori/midori-browser.c:1421 msgid New Window msgstr Нове вікно -#: ../data/midori.desktop.in.h:7 +#: ../data/midori.desktop.in.h:8 msgid Web Browser msgstr Переглядач Веб @@ -318,7 +322,7 @@ msgstr _Ігнорувати msgid Unexpected action '%s'. msgstr Несподівана дія '%s'. -#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6381 +#: ../midori/midori-app.c:1453 ../midori/midori-browser.c:6383 msgid _Bookmarks msgstr _Закладки @@ -359,7 +363,7 @@ msgstr Роз_ширення Netscape msgid _Closed Tabs msgstr _Закриті вкладки -#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5520 +#: ../midori/midori-app.c:1463 ../midori/midori-browser.c:5522 msgid New _Window msgstr _Нове вікно @@ -384,12 +388,12 @@ msgstr Нерозпізнаний формат закладки. msgid Writing failed. msgstr Невдача запису. -#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5608 -#: ../midori/midori-browser.c:5617 +#: ../midori/midori-browser.c:355 ../midori/midori-browser.c:5610 +#: ../midori/midori-browser.c:5619 msgid Reload the current page msgstr Оновити поточну сторінку -#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5614 +#: ../midori/midori-browser.c:364 ../midori/midori-browser.c:5616 msgid Stop loading the current page msgstr Зупинити завантаження поточної сторінки @@ -519,7 +523,7 @@ msgstr msgid New feed msgstr Нова стрічка новин -#: ../midori/midori-browser.c:2647 ../midori/midori-browser.c:5680 +#: ../midori/midori-browser.c:2647 ../midori/midori-browser.c:5682 #: ../panels/midori-bookmarks.c:527 msgid Add a new bookmark msgstr Додати нову закладку @@ -544,7 +548,7 @@ msgstr msgid _Enable Caret Browsing msgstr _Включення курсорного перегляду -#: ../midori/midori-browser.c:4030 ../midori/midori-browser.c:6074 +#: ../midori/midori-browser.c:4030 ../midori/midori-browser.c:6076 #, c-format msgid Failed to insert new history item: %s\n msgstr Неможливо вставити новий об'єкт історії: %s\n @@ -598,7 +602,7 @@ msgstr Мідорі 0.2.6 msgid Import bookmarks… msgstr Імпорт закладок… -#: ../midori/midori-browser.c:4485 ../midori/midori-browser.c:5685 +#: ../midori/midori-browser.c:4485 ../midori/midori-browser.c:5687 msgid _Import bookmarks msgstr _Імпорт закладок @@ -680,374 +684,374 @@ msgstr msgid translator-credits msgstr Yarema aka Knedlyk yupad...@gmail.com -#: ../midori/midori-browser.c:5518 +#: ../midori/midori-browser.c:5520 msgid _File msgstr _Файл -#: ../midori/midori-browser.c:5521 +#: ../midori/midori-browser.c:5523 msgid Open a new window msgstr Відкрити нове вікно -#: ../midori/midori-browser.c:5524 +#: ../midori/midori-browser.c:5526 msgid Open a new tab msgstr Відкрити нову вкладку -#: ../midori/midori-browser.c:5526 +#: ../midori/midori-browser.c:5528 msgid New P_rivate Browsing Window msgstr Нове _вікно в режимі приватності -#: ../midori/midori-browser.c:5530 +#: ../midori/midori-browser.c:5532 msgid Open a file msgstr Відкрити файл -#: ../midori/midori-browser.c:5532 +#: ../midori/midori-browser.c:5534 msgid _Save Page As… msgstr _Зберегти сторінку як… -#: ../midori/midori-browser.c:5533 +#: ../midori/midori-browser.c:5535 msgid Save to a file msgstr Зберегти в файл -#: ../midori/midori-browser.c:5535 +#: ../midori/midori-browser.c:5537 msgid Add to Speed _dial msgstr Додати до шви_дкого виклику -#: ../midori/midori-browser.c:5539 +#:
[Xfce4-commits] midori:master Set default size on certificate details with GTK+2
Updating branch refs/heads/master to 5425f1c3addb2ced8e9853e1d4e31e78ff42ad6d (commit) from e02a90d844e337e342338d1450abe65c46f11fc9 (commit) commit 5425f1c3addb2ced8e9853e1d4e31e78ff42ad6d Author: Christian Dywan christ...@twotoasts.de Date: Tue Jul 24 22:28:39 2012 +0200 Set default size on certificate details with GTK+2 midori/midori-locationaction.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c index dbed3d3..dc125cf 100644 --- a/midori/midori-locationaction.c +++ b/midori/midori-locationaction.c @@ -1290,6 +1290,10 @@ midori_location_action_show_page_info (GtkWidget* widget, g_object_set_data_full (G_OBJECT (dialog), gcr-cert, gcr_cert, (GDestroyNotify)g_object_unref); g_signal_connect (dialog, response, G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert); +/* With GTK+2 the scrolled contents can't communicate a natural size to the window */ +#if !GTK_CHECK_VERSION (3, 0, 0) +gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 200); +#endif #else const gchar* tls_error = midori_location_action_tls_flags_to_string (tls_flags); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Harden check_version to handle pico version
Updating branch refs/heads/master to dce8096593f661f263294b353dc1486ed64c9449 (commit) from 5425f1c3addb2ced8e9853e1d4e31e78ff42ad6d (commit) commit dce8096593f661f263294b353dc1486ed64c9449 Author: Stéphane Marguet smarg...@gmail.com Date: Tue Jul 24 22:32:38 2012 +0200 Harden check_version to handle pico version Fixes: https://bugs.launchpad.net/midori/+bug/1026667 wscript |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/wscript b/wscript index 1623b3c..1a3b61f 100644 --- a/wscript +++ b/wscript @@ -94,7 +94,9 @@ def configure (conf): def check_version (given_version, major, minor, micro): if '.' in given_version: -given_major, given_minor, given_micro = given_version.split ('.') +given_major, given_minor, given_micro = given_version.split ('.', 2) +if '.' in given_micro: +given_micro, given_pico = given_micro.split ('.', 1) else: given_major, given_minor, given_micro = given_version return int(given_major) major or \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Prefill description when adding search engine
Updating branch refs/heads/master to d95513226d265448abc7d12ec1431e9c9d7c0a54 (commit) from dce8096593f661f263294b353dc1486ed64c9449 (commit) commit d95513226d265448abc7d12ec1431e9c9d7c0a54 Author: Paweł Forysiuk tuxa...@o2.pl Date: Tue Jul 24 23:03:17 2012 +0200 Prefill description when adding search engine midori/midori-searchaction.c |3 +-- midori/midori-view.c | 41 - 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/midori/midori-searchaction.c b/midori/midori-searchaction.c index a60271f..9568573 100644 --- a/midori/midori-searchaction.c +++ b/midori/midori-searchaction.c @@ -946,8 +946,7 @@ midori_search_action_get_editor (MidoriSearchAction* search_action, gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); entry_description = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry_description), TRUE); -if (!new_engine) -gtk_entry_set_text (GTK_ENTRY (entry_description) +gtk_entry_set_text (GTK_ENTRY (entry_description) , katze_str_non_null (katze_item_get_text (item))); gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (content_area), hbox); diff --git a/midori/midori-view.c b/midori/midori-view.c index b37c8cf..12137fa 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2442,7 +2442,8 @@ midori_view_menu_add_search_engine_cb (GtkWidget* widget, } static KatzeItem* -midori_view_search_engine_for_form (WebKitWebView* web_view) +midori_view_search_engine_for_form (MidoriView*view, +WebKitWebView* web_view) { WebKitDOMDocument* doc; @@ -2450,9 +2451,12 @@ midori_view_search_engine_for_form (WebKitWebView* web_view) WebKitDOMHTMLCollection* form_nodes; WebKitDOMElement* active_element; gchar* token_element; +const gchar* title; GString* uri_str; gulong form_len; guint i; +KatzeItem* item; +gchar** parts; #if WEBKIT_CHECK_VERSION (1, 9, 5) doc = webkit_web_frame_get_dom_document (web_view); @@ -2504,10 +2508,37 @@ midori_view_search_engine_for_form (WebKitWebView* web_view) } } +title = webkit_web_view_get_title (web_view); + +item = katze_item_new (); +katze_item_set_uri (item, g_string_free (uri_str, FALSE)); + +if (strstr (title, - )) +parts = g_strsplit (title, - , 2); +else if (strstr (title, : )) +parts = g_strsplit (title, : , 2); +else +parts = NULL; +if (parts != NULL) +{ +/* See midori_view_set_title: title can be first or last */ +if (view-ellipsize == PANGO_ELLIPSIZE_END) +{ +katze_item_set_name (item, g_strdup (parts[0])); +katze_item_set_text (item, g_strdup (parts[1])); +} +else +{ +katze_item_set_name (item, g_strdup (parts[1])); +katze_item_set_text (item, g_strdup (parts[2])); +} +g_strfreev (parts); +} +else +katze_item_set_name (item, title); + g_free (token_element); -return g_object_new (KATZE_TYPE_ITEM, -uri, g_string_free (uri_str, FALSE), -name, webkit_web_view_get_title (web_view), NULL); +return item; } #endif @@ -2619,7 +2650,7 @@ midori_view_populate_popup (MidoriView* view, #if WEBKIT_CHECK_VERSION (1, 5, 0) { -KatzeItem* item = midori_view_search_engine_for_form (web_view); +KatzeItem* item = midori_view_search_engine_for_form (view, web_view); if (item != NULL) { menuitem = midori_view_insert_menu_item (menu_shell, -1, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Correctly use nth tab, not n - 1 to append
Updating branch refs/heads/master to 21d95c62f471e1b875a893baeb486996f780d50d (commit) from d95513226d265448abc7d12ec1431e9c9d7c0a54 (commit) commit 21d95c62f471e1b875a893baeb486996f780d50d Author: Christian Dywan christ...@twotoasts.de Date: Tue Jul 24 23:09:31 2012 +0200 Correctly use nth tab, not n - 1 to append midori/midori-browser.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index fb129b6..62d5061 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1801,7 +1801,7 @@ _midori_browser_add_tab (MidoriBrowser* browser, katze_array_move_item (browser-proxy_array, item, n); } else -n = midori_browser_get_n_pages (browser) - 1; +n = midori_browser_get_n_pages (browser); katze_item_set_meta_integer (item, append, -1); #ifdef HAVE_GRANITE ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to ae257ff37c8eac17117f3f0ff88ebe50560bd0ee (commit) from e408a4853df1bd2ae90e10dcd1c1bba9ff1213a7 (commit) commit ae257ff37c8eac17117f3f0ff88ebe50560bd0ee Author: Yarema aka Knedlyk yupad...@gmail.com Date: Tue Jul 24 23:16:53 2012 +0200 l10n: Updated Ukrainian (uk) translation to 100% New status: 183 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 543 ++ 1 files changed, 266 insertions(+), 277 deletions(-) diff --git a/po/uk.po b/po/uk.po index eb8bcf2..cf3434a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,329 +2,293 @@ # Copyright (C) 2009 the parole-media-player's copyright holder # This file is distributed under the same license as the parole-media-player package. # Dmitry Nikitin luckas...@mail.ru, 2011. -# +# msgid msgstr Project-Id-Version: parole\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-20 11:45+0200\n +POT-Creation-Date: 2012-07-24 21:03+\n PO-Revision-Date: 2011-05-27 14:30+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian \n -Language: uk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: uk\n -#: ../data/interfaces/parole.ui.h:1 ../src/parole-about.c:89 -msgid Parole Media Player -msgstr Медіапрогравач Parole +#: ../data/interfaces/parole.ui.h:1 +msgid 16:9 (Widescreen) +msgstr 16:9 (Широкий екран) #: ../data/interfaces/parole.ui.h:2 -msgid _Media -msgstr _Фільм +msgid 20:9 (DVB) +msgstr 20:9 (DVB) #: ../data/interfaces/parole.ui.h:3 -#, fuzzy -msgid Open _location -msgstr _Відкрити адресу... +msgid 4:3 (TV) +msgstr 4:3 (ТБ) -#: ../data/interfaces/parole.ui.h:4 -msgid _DVD -msgstr +#: ../data/interfaces/parole.ui.h:4 ../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 _Редагування - -#: ../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 Модулі... +#: ../data/interfaces/parole.ui.h:9 ../src/parole-player.c:641 +msgid Empty +msgstr Пусто #: ../data/interfaces/parole.ui.h:10 -msgid _View -msgstr _Вигляд +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:14 -msgid Auto -msgstr Авто +#: ../data/interfaces/parole.ui.h:13 +msgid Open _location +msgstr _Відкрити адресу + +#: ../data/interfaces/parole.ui.h:14 ../src/parole-about.c:55 +msgid Parole Media Player +msgstr Медіапрогравач Parole #: ../data/interfaces/parole.ui.h:15 -msgid Square -msgstr Квадрат +msgid Pl_ugins +msgstr _Модулі -#: ../data/interfaces/parole.ui.h:16 -msgid 4:3 (TV) -msgstr 4:3 (ТБ) +#: ../data/interfaces/parole.ui.h:16 ../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 Показати _список відтворення #: ../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 _Допомога +msgid Volume _Up +msgstr _Голосніше #: ../data/interfaces/parole.ui.h:24 -#, fuzzy -msgid Audio Track: -msgstr Попередня доріжка +msgid _Aspect Ratio +msgstr _Розмір екрану #: ../data/interfaces/parole.ui.h:25 -#, fuzzy -msgid Subtitles: -msgstr bСубтитри/b +msgid _Edit +msgstr _Редагування #: ../data/interfaces/parole.ui.h:26 -msgid 0:00 -msgstr +msgid _Help +msgstr _Допомога + +#: ../data/interfaces/parole.ui.h:27 +msgid _Media +msgstr _Фільм #: ../data/interfaces/parole.ui.h:28 -#, fuzzy, no-c-format -msgid Buffering (0%) -msgstr Буферизація +msgid _Mute +msgstr _Без звуку #:
[Xfce4-commits] midori:master Don't bother with adblocked items when saving pages with resources
Updating branch refs/heads/master to cc0d81345ba8502636d6f83a1c09091313843a78 (commit) from 21d95c62f471e1b875a893baeb486996f780d50d (commit) commit cc0d81345ba8502636d6f83a1c09091313843a78 Author: Paweł Forysiuk tuxa...@o2.pl Date: Tue Jul 24 22:12:40 2012 +0200 Don't bother with adblocked items when saving pages with resources midori/midori-browser.c |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 62d5061..5115bcf 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1073,6 +1073,11 @@ midori_browser_save_resources (MidoriView* view, { WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list-data); GString* data = webkit_web_resource_get_data (resource); + +/* Resource could be adblocked, skip it in that case */ +if (!g_strcmp0 (webkit_web_resource_get_uri (resource), about:blank)) +continue; + /* FIXME: mime type fallback should respect the resource's type */ gchar* sub_filename = midori_browser_get_filename_suggestion_for_uri ( view, webkit_web_resource_get_uri (resource)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Update dependencies in README
Updating branch refs/heads/master to 9659737d5e33e8671de46315caa1b4d1c0be4ce6 (commit) from f0dcd62112f72d86e9c9268d1489ae6fb4458aa3 (commit) commit 9659737d5e33e8671de46315caa1b4d1c0be4ce6 Author: Simon Steinbeiss och...@xfce.org Date: Wed Jul 25 01:05:51 2012 +0200 Update dependencies in README README |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 2e66bdb..495ad8b 100644 --- a/README +++ b/README @@ -16,7 +16,7 @@ Parole depends on the following packages: - DBus 0.60 or above. - DBus glib 0.70 or above. - GStreamer: base, video, interface and GStreamer X, version 0.10.11 or above. - - libxfcegui4 4.6.0 or above. + - libxfce4ui 4.7.0 or above. - libxfce4util 4.6.0 or above How to report bugs? ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits