[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Serbian (sr) translation to 38%
Updating branch refs/heads/master to bee836004824b3845b6089ec1f3e0612ccbeba98 (commit) from 7caf670cb014ed5f783d48a25d64e42a54b2bb71 (commit) commit bee836004824b3845b6089ec1f3e0612ccbeba98 Author: Саша Петровић salepetron...@gmail.com Date: Mon Aug 27 09:58:26 2012 +0200 l10n: Updated Serbian (sr) translation to 38% New status: 67 messages complete with 0 fuzzies and 108 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po | 202 +- 1 files changed, 107 insertions(+), 95 deletions(-) diff --git a/po/sr.po b/po/sr.po index 1fbdb1c..d1668b8 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,46 +2,45 @@ # Copyright (C) 2012 THE xfce4-weather-plugin'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-weather-plugin package. # h.j...@gmx.at, 2012. -# +# msgid msgstr Project-Id-Version: xfce4-weather-plugin 0.8.1git-9f0895e\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-08-22 20:56+0200\n PO-Revision-Date: 2012-08-22 20:58+0200\n -Last-Translator: h.j...@gmx.at\n +Last-Translator: h.j...@gmx.at\n Language-Team: Serbian\n -Language: sr\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n -%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Language: sr\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n #. TRANSLATORS: Keep in sync with labeloptions in weather-config.c #: ../panel-plugin/weather.c:138 msgid T -msgstr +msgstr Т #: ../panel-plugin/weather.c:141 msgid P -msgstr +msgstr П #: ../panel-plugin/weather.c:144 msgid WS -msgstr +msgstr БВ #: ../panel-plugin/weather.c:147 msgid WB -msgstr +msgstr БВБ #: ../panel-plugin/weather.c:150 ../panel-plugin/weather.c:153 msgid WD -msgstr +msgstr ПВ #: ../panel-plugin/weather.c:156 msgid H -msgstr +msgstr В #: ../panel-plugin/weather.c:159 msgid CL @@ -69,43 +68,42 @@ msgstr #: ../panel-plugin/weather.c:277 ../panel-plugin/weather.c:281 msgid No Data -msgstr +msgstr Нема података #: ../panel-plugin/weather.c:803 #, c-format msgid Unable to open the following url: %s -msgstr +msgstr Нисам успео да отворим следећу адресу: %s #: ../panel-plugin/weather.c:831 ../panel-plugin/weather-summary.c:757 #: ../panel-plugin/weather.desktop.in.h:1 msgid Weather Update -msgstr +msgstr Ажурирање временске прогнозе #: ../panel-plugin/weather.c:874 msgid Short-term forecast data unavailable. -msgstr +msgstr Подаци краткорочне прогнозе нису доступни. #: ../panel-plugin/weather.c:889 msgid The sun never rises today. -msgstr +msgstr Данас сунце не излази. #: ../panel-plugin/weather.c:891 msgid The sun never sets today. -msgstr +msgstr Данас сунце не залази. #: ../panel-plugin/weather.c:897 #, c-format msgid The sun rises at %s and sets at %s. -msgstr +msgstr Сунце излази у %s и залази у %s. -#. #. * TRANSLATORS: Re-arrange and align at will, optionally using #. * abbreviations for labels if desired or necessary. Just take #. * into account the possible size constraints, the centered #. * vertical alignment of the icon - which unfortunately cannot #. * be changed easily - and try to make it compact and look #. * good! -#. +#. #: ../panel-plugin/weather.c:928 #, c-format msgid @@ -123,15 +121,14 @@ msgstr #: ../panel-plugin/weather.c:982 msgid Cannot update weather data -msgstr +msgstr Не успевам ажурирати податке о временској прогнози #. add forecast window to right click menu, for people who missed #. the left mouse click feature #: ../panel-plugin/weather.c:1076 ../panel-plugin/weather-summary.c:803 msgid _Forecast -msgstr +msgstr _Прогноза -#. #. * TRANSLATORS: The abbreviations in parentheses will be shown in #. * the scrollbox together with the values. Keep them in sync with #. * those in make_label() in weather.c. Some of them may be @@ -139,67 +136,67 @@ msgstr #. * read that up somewhere and decide whether you want to use them #. * or not. In general, though, you should just try to choose #. * letter(s) that make sense and don't use up too much space. -#. +#. #: ../panel-plugin/weather-config.c:49 msgid Temperature (T) -msgstr +msgstr Температура(Т) #: ../panel-plugin/weather-config.c:50 msgid Atmosphere pressure (P) -msgstr +msgstr Ваздушни притисак (П) #: ../panel-plugin/weather-config.c:51 msgid Wind speed (WS) -msgstr +msgstr Брзина ветра (БВ) #: ../panel-plugin/weather-config.c:52 msgid Wind speed - Beaufort scale (WB) -msgstr +msgstr Брзина ветра - Бофорова скала (БВБ) #: ../panel-plugin/weather-config.c:53 msgid Wind direction (WD) -msgstr +msgstr Правац ветра (ПВ) #: ../panel-plugin/weather-config.c:54 msgid Wind direction in degrees (WD) -msgstr +msgstr Правац верта у степенима (ПВС) #:
[Xfce4-commits] ristretto:master l10n: Updated Russian (ru) translation to 91%
Updating branch refs/heads/master to 07e7ad10fa175c130ae1ca77ae00a8141a3416bc (commit) from 8979edbc1ae45ee65fcb9bc3e1f51824506f741d (commit) commit 07e7ad10fa175c130ae1ca77ae00a8141a3416bc Author: Alex Z ad_u...@lavabit.com Date: Mon Aug 27 13:58:51 2012 +0200 l10n: Updated Russian (ru) translation to 91% New status: 168 messages complete with 2 fuzzies and 13 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 134 ++ 1 files changed, 73 insertions(+), 61 deletions(-) diff --git a/po/ru.po b/po/ru.po index 37e9b9b..96b5c9d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,19 +2,19 @@ # This file is distributed under the same license as the ristretto package. # Stefan Zerkalica zerkal...@gmail.com, 2008. # Denis Koryavov dkorya...@yandex.ru, 2010. -# +# msgid msgstr Project-Id-Version: ristretto\n Report-Msgid-Bugs-To: xfce-i...@xfce.org\n -POT-Creation-Date: 2012-08-21 07:12+\n -PO-Revision-Date: 2011-09-10 03:49+0700\n -Last-Translator: Urmas davian...@gmail.com\n +POT-Creation-Date: 2012-08-27 07:39+\n +PO-Revision-Date: 2012-08-27 22:58+1000\n +Last-Translator: Alex 'AdUser' Z ad_u...@lavabit.com\n Language-Team: Russian\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: \n X-Poedit-Language: Russian\n #: ../src/main.c:62 @@ -42,10 +42,10 @@ msgid available command line options.\n msgstr %s: %s\n -Попробуйте %s --help для просмотра полного списка параметров командной -строки.\n +Попробуйте %s --help для просмотра полного списка параметров командной строки.\n -#: ../src/main_window.c:57 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:57 +#: ../ristretto.desktop.in.h:1 msgid Image Viewer msgstr Просмотр изображений @@ -87,7 +87,8 @@ msgid Show file properties msgstr Показать свойства файла #. Icon-name -#: ../src/main_window.c:387 ../src/main_window.c:406 +#: ../src/main_window.c:387 +#: ../src/main_window.c:406 msgid _Edit msgstr _Правка @@ -171,9 +172,8 @@ msgstr _Выйти из полноэкранного режима #. Label-text #. Keyboard shortcut #: ../src/main_window.c:449 -#, fuzzy msgid Leave Fullscreen -msgstr _Выйти из полноэкранного режима +msgstr Выйти из полноэкранного режима #. Icon-name #: ../src/main_window.c:453 @@ -433,15 +433,18 @@ msgstr _Недавно просмотренные msgid Recently used msgstr Недавно просмотренные -#: ../src/main_window.c:957 ../src/main_window.c:1495 +#: ../src/main_window.c:957 +#: ../src/main_window.c:1495 msgid Press open to select an image msgstr Нажмите открыть для выбора изображения -#: ../src/main_window.c:1354 ../src/main_window.c:1358 +#: ../src/main_window.c:1354 +#: ../src/main_window.c:1358 msgid Open With Other _Application... -msgstr +msgstr Открыть с помощью... -#: ../src/main_window.c:1379 ../src/main_window.c:1385 +#: ../src/main_window.c:1379 +#: ../src/main_window.c:1385 msgid Empty msgstr Пусто @@ -453,25 +456,28 @@ msgstr Загрузка... msgid Choose 'set wallpaper' method msgstr Выберите способ установки обоев -#: ../src/main_window.c:2124 ../src/preferences_dialog.c:464 +#: ../src/main_window.c:2124 +#: ../src/preferences_dialog.c:464 msgid Configure which system is currently managing your desktop.\n This setting determines the method iRistretto/i will use\n to configure the desktop wallpaper. msgstr Выберите ваше текущее рабочее окружение.\n -Эта настройка указывает способ, которым iRistretto/i будет устанавливать -ваши обои рабочего стола. +Эта настройка указывает способ, которым iRistretto/i будет устанавливать ваши обои рабочего стола. -#: ../src/main_window.c:2149 ../src/preferences_dialog.c:488 +#: ../src/main_window.c:2149 +#: ../src/preferences_dialog.c:488 msgid None msgstr Нет -#: ../src/main_window.c:2153 ../src/preferences_dialog.c:492 +#: ../src/main_window.c:2153 +#: ../src/preferences_dialog.c:492 msgid Xfce msgstr Xfce -#: ../src/main_window.c:2157 ../src/preferences_dialog.c:496 +#: ../src/main_window.c:2157 +#: ../src/preferences_dialog.c:496 msgid GNOME msgstr GNOME @@ -481,9 +487,7 @@ msgstr Разработчик: #: ../src/main_window.c:2597 msgid Ristretto is an image viewer for the Xfce desktop environment. -msgstr -Ristretto - быстрый и легковесный просмотрщик изображений для рабочего -окружения Xfce +msgstr Ristretto - быстрый и легковесный просмотрщик изображений для рабочего окружения Xfce #: ../src/main_window.c:2605 msgid translator-credits @@ -501,7 +505,8 @@ msgstr Изображения msgid .jp(e)g msgstr .jp(e)g -#: ../src/main_window.c:2958 ../src/main_window.c:3100 +#: ../src/main_window.c:2958 +#: ../src/main_window.c:3100 msgid Could not open file msgstr Невозможно открыть файл @@ -519,12 +524,15 @@ msgid Are you sure you want to delete image '%s' from disk? msgstr Удалить изображение '%s' с диска? #: ../src/main_window.c:3345 -#, fuzzy,
[Xfce4-commits] parole:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 68874c73a85dc6e42128dcd20ee9bd55f1135fc5 (commit) from f81fb75dda394555a810287284278fbd0b1d56c5 (commit) commit 68874c73a85dc6e42128dcd20ee9bd55f1135fc5 Author: Alex Z ad_u...@lavabit.com Date: Mon Aug 27 14:17:28 2012 +0200 l10n: Updated Russian (ru) translation to 100% New status: 185 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 687 -- 1 files changed, 359 insertions(+), 328 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4967d18..b91eecf 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,324 +6,313 @@ msgid msgstr Project-Id-Version: Parole 0.1.99git.rALT0.4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-07-20 11:45+0200\n -PO-Revision-Date: 2009-12-11 15:06+0300\n -Last-Translator: Anatoly Chernov aicher...@umail.ru\n +POT-Creation-Date: 2012-08-27 07:33+\n +PO-Revision-Date: 2012-08-27 23:16+1000\n +Last-Translator: Alex 'AdUser' Z ad_u...@lavabit.com\n Language-Team: Russia, ALT LInux\n Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\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 (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 _Правка - -#: ../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:663 +msgid Empty +msgstr Пусто #: ../data/interfaces/parole.ui.h:10 -msgid _View -msgstr _Вид +#: ../src/parole-disc.c:125 +#: ../src/parole-disc.c:385 +msgid Insert Disc +msgstr Вставьте диск #: ../data/interfaces/parole.ui.h:11 -#, fuzzy -msgid Show _playlist -msgstr Показать список воспроизведения +msgid Languages +msgstr Языки #: ../data/interfaces/parole.ui.h:12 -#, fuzzy -msgid _Aspect Ratio -msgstr Формат экрана +msgid Media player +msgstr Медиапригрыватель #: ../data/interfaces/parole.ui.h:13 msgid None msgstr Нет #: ../data/interfaces/parole.ui.h:14 -msgid Auto -msgstr Авто +msgid Open _location +msgstr _Открыть адрес #: ../data/interfaces/parole.ui.h:15 -msgid Square -msgstr Квадрат +#: ../src/parole-about.c:55 +msgid Parole Media Player +msgstr Медиапроигрыватель Parole #: ../data/interfaces/parole.ui.h:16 -msgid 4:3 (TV) -msgstr 4:3 (TV) +msgid Pl_ugins +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 _Приглушить #: ../data/interfaces/parole.ui.h:29 -msgid Media player -msgstr Медиапригрыватель +msgid _Repeat +msgstr П_овтор + +#: ../data/interfaces/parole.ui.h:30 +msgid _Shuffle +msgstr Случайно + +#: ../data/interfaces/parole.ui.h:31 +msgid _View +msgstr _Вид #: ../data/interfaces/mediachooser.ui.h:1 -msgid Parole Media
[Xfce4-commits] xfce4-settings:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to 64bff9435a73279cabaabcdff5196e337c11bcdf (commit) from 82e5e13af558adb83054d07b4dc2286ad20462db (commit) commit 64bff9435a73279cabaabcdff5196e337c11bcdf Author: Alex Z ad_u...@lavabit.com Date: Mon Aug 27 14:20:00 2012 +0200 l10n: Updated Russian (ru) translation to 100% New status: 336 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 132 ++ 1 files changed, 64 insertions(+), 68 deletions(-) diff --git a/po/ru.po b/po/ru.po index 50ac85a..cfd491a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-05-27 03:39+\n +POT-Creation-Date: 2012-08-27 10:33+\n PO-Revision-Date: 2011-08-23 14:43+0300\n Last-Translator: Artem Zolochevskiy artem.zolochevs...@gmail.com\n Language-Team: Russian\n @@ -769,62 +769,82 @@ msgstr Пове_дение msgid Blink _delay: msgstr Задержка _мигания: +# Automatically copied. Please review and remove fuzzy flag. #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:4 +msgid Change layout option +msgstr Изменить параметры раскладки + +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +msgid Compose key +msgstr Расположение клавиши Compose + +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 msgid Cursor msgstr Курсор -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:5 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 msgid Define _shortcuts for launching applications: msgstr Задать _комбинации клавиш для запуска приложений: -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:6 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:1 msgid Edit keyboard settings and application shortcuts msgstr Изменение настроек клавиатуры и комбинаций клавиш -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 #: ../dialogs/mouse-settings/mouse-dialog.glade.h:16 msgid General msgstr Общие -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:8 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 #: ../dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in.h:2 msgid Keyboard msgstr Клавиатура -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:9 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 msgid Keyboard layout msgstr Раскладка клавиатуры -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:10 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 msgid Keyboard layout selection msgstr Выбор раскладки клавиатуры -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:11 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 msgid Keyboard model msgstr Модель клавиатуры -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:12 +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 +msgid Move currently selected item down by one row +msgstr Переместить выбранный элемент на одну строку вниз + +# Automatically copied. Please review and remove fuzzy flag. +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15 +msgid Move currently selected item up by one row +msgstr Переместить выбранный элемент на одну строку вверх + +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16 msgid Repeat _speed: msgstr Скорость _повтора: -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:13 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17 msgid Reset to _Defaults msgstr Сбросить настройки -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:14 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18 msgid Restore num l_ock state on startup msgstr Зап_оминать состояние клавиши Num Lock -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:15 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:19 msgid Select keyboard layout and variant msgstr Выбрать раскладку клавиатуры и вариант -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:16 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:20 msgid Show _blinking msgstr Мигание -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:17 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:21 msgid Specifies whether the keyboard layout is controlled with this settings dialog, or by the X server @@ -832,27 +852,27 @@ msgstr Определяет, должна ли раскладка клавиатуры контролироваться через меню настроек или через X сервер -#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:18 +#: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:22 msgid Specify whether or not the text cursor blinks
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Japanese (ja) translation to 100%
Updating branch refs/heads/master to 53f6231784bcd9adc1930e745e3dec6ccbecec46 (commit) from bee836004824b3845b6089ec1f3e0612ccbeba98 (commit) commit 53f6231784bcd9adc1930e745e3dec6ccbecec46 Author: Masato Hashimoto hash...@xfce.org Date: Mon Aug 27 14:38:50 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 174 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/po/ja.po b/po/ja.po index 175a439..e03f6ae 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,12 +8,16 @@ # 翻訳メモ: # Sunny (日中の晴れ), Clear (夜間の晴れ) # +# 天気の種類と意味についての説明など (as of ver. 0.8.2): +# http://mail.xfce.org/pipermail/xfce-i18n/2012-August/008236.html +# +# msgid msgstr Project-Id-Version: xfce-weather-plugin 0.6.0\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-08-25 22:05+0900\n -PO-Revision-Date: 2012-08-25 22:28+0900\n +PO-Revision-Date: 2012-08-27 21:38+0900\n Last-Translator: Masato Hashimoto cabezon.hashim...@gmail.com\n Language-Team: Japanese xfce-i...@xfce.org\n Language: ja\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:xfce-4.10 l10n: Updated Croatian (hr) translation to 75%
Updating branch refs/heads/xfce-4.10 to 73d9cb3575bdad97090ab98d9cbe1a01d089473a (commit) from 6ac4201d2ce8156324342e2510149259d835573c (commit) commit 73d9cb3575bdad97090ab98d9cbe1a01d089473a Author: Ivica Kolić ik...@yahoo.com Date: Mon Aug 27 19:12:28 2012 +0200 l10n: Updated Croatian (hr) translation to 75% New status: 160 messages complete with 0 fuzzies and 53 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 19 --- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/po/hr.po b/po/hr.po index a1c0420..fe00788 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: power manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-22 05:36+\n +POT-Creation-Date: 2012-08-27 15:27+\n PO-Revision-Date: 2011-10-02 19:47+0200\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Croatian ik...@yahoo.com\n @@ -643,6 +643,9 @@ msgid %s\n %s waiting to discharge (%i%%). msgstr +\t\r\n +%s\n +%s čekam da se isprazni (%i%%). #: ../src/xfpm-battery.c:482 #, c-format @@ -650,6 +653,8 @@ msgid %s\n %s waiting to charge (%i%%). msgstr +%s\n +%s čekam da se napuni (%i%%). #: ../src/xfpm-battery.c:486 #, c-format @@ -705,11 +710,11 @@ msgstr #: ../src/xfpm-main.c:76 ../src/xfpm-power-info.c:376 msgid True -msgstr +msgstr Istinito #: ../src/xfpm-main.c:76 ../src/xfpm-power-info.c:376 msgid False -msgstr +msgstr Neistinito #: ../src/xfpm-main.c:113 #, c-format @@ -837,12 +842,12 @@ msgstr Xfce upravitelj energijom je već pokrenut #: ../src/xfpm-inhibit.c:331 #, c-format msgid Invalid arguments -msgstr +msgstr Neispravni argumenti #: ../src/xfpm-inhibit.c:357 #, c-format msgid Invalid cookie -msgstr +msgstr Neispravni kolačić #. TRANSLATORS: the command line was not provided #: ../src/xfpm-power-info.c:118 @@ -942,7 +947,7 @@ msgstr USB aktivnost %s #: ../src/xfpm-power-info.c:242 #, c-format msgid Wakeup %s -msgstr +msgstr Probudi %s #. TRANSLATORS: interupts on the system required for basic operation #: ../src/xfpm-power-info.c:245 @@ -1028,7 +1033,7 @@ msgstr PID #: ../src/xfpm-power-info.c:754 msgid Wakeups -msgstr +msgstr Buđenja #: ../src/xfpm-power-info.c:760 msgid Command ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:master l10n: Updates to Croatian (hr) translation
Updating branch refs/heads/master to 482eecefe824c0d56bdb9ba2c81a661268392df3 (commit) from f0c1f9d0baee206488fc2835a394fe7b29b9a0fb (commit) commit 482eecefe824c0d56bdb9ba2c81a661268392df3 Author: Ivica Kolić ik...@yahoo.com Date: Mon Aug 27 19:25:11 2012 +0200 l10n: Updates to Croatian (hr) translation New status: 0 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 1322 -- 1 files changed, 418 insertions(+), 904 deletions(-) diff --git a/po/hr.po b/po/hr.po index a1c0420..c63318e 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,1056 +2,570 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-power-manager package. # Ivica Kolić ik...@yahoo.com, 2011. -# +# msgid msgstr Project-Id-Version: power manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-04-22 05:36+\n +POT-Creation-Date: 2012-08-27 15:27+\n PO-Revision-Date: 2011-10-02 19:47+0200\n Last-Translator: Ivica Kolić ik...@yahoo.com\n Language-Team: Croatian ik...@yahoo.com\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: \n -Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n +%10=4 (n%10010 || n%100=20) ? 1 : 2);\n X-Poedit-Language: Croatian\n X-Poedit-SourceCharset: utf-8\n X-Poedit-Country: CROATIA\n -#: ../data/interfaces/xfpm-settings.ui.h:1 -msgid bActions/b -msgstr +#~ msgid bAdvanced Options/b +#~ msgstr bNapredne opcije/b -#: ../data/interfaces/xfpm-settings.ui.h:2 -msgid bAdvanced Options/b -msgstr bNapredne opcije/b +#~ msgid bBrightness/b +#~ msgstr bSvjetlina/b -#: ../data/interfaces/xfpm-settings.ui.h:3 -msgid bBrightness/b -msgstr bSvjetlina/b +#~ msgid bGeneral Options/b +#~ msgstr bOsnovne opcije/b -#: ../data/interfaces/xfpm-settings.ui.h:4 -msgid bGeneral Options/b -msgstr bOsnovne opcije/b +#~ msgid bMonitor/b +#~ msgstr bMonitor/b -#: ../data/interfaces/xfpm-settings.ui.h:5 -msgid bMonitor/b -msgstr bMonitor/b +#~ msgid Hibernate +#~ msgstr Hiberniraj -#: ../data/interfaces/xfpm-settings.ui.h:6 -msgid Actions -msgstr +#~ msgid Level: +#~ msgstr Razina: -#: ../data/interfaces/xfpm-settings.ui.h:7 -msgid Consider the computer on low power at: -msgstr +#~ msgid Lock screen when going for suspend/hibernate +#~ msgstr Zaključaj zaslon kada se ide na suspenziju/hibernaciju -#. Hibernate menu option -#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:820 -#: ../settings/xfpm-settings.c:888 ../settings/xfpm-settings.c:1037 -#: ../settings/xfpm-settings.c:1214 ../settings/xfpm-settings.c:1271 -#: ../settings/xfpm-settings.c:1323 ../src/xfpm-power.c:484 -#: ../src/xfpm-power.c:779 -msgid Hibernate -msgstr Hiberniraj - -#: ../data/interfaces/xfpm-settings.ui.h:9 -msgid Level: -msgstr Razina: - -#: ../data/interfaces/xfpm-settings.ui.h:10 -msgid Lock screen when going for suspend/hibernate -msgstr Zaključaj zaslon kada se ide na suspenziju/hibernaciju - -#: ../data/interfaces/xfpm-settings.ui.h:11 ../src/xfpm-power-common.c:132 -msgid Monitor -msgstr Monitor - -#: ../data/interfaces/xfpm-settings.ui.h:12 -msgid Monitor power management control -msgstr +#~ msgid Monitor +#~ msgstr Monitor -#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:809 -#: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026 -#: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260 -#: ../settings/xfpm-settings.c:1312 -msgid Nothing -msgstr Ništa +#~ msgid Nothing +#~ msgstr Ništa -#: ../data/interfaces/xfpm-settings.ui.h:14 -msgid Power manager settings -msgstr Postavke upravitelja energijom +#~ msgid Power manager settings +#~ msgstr Postavke upravitelja energijom -#: ../data/interfaces/xfpm-settings.ui.h:15 -msgid Prefer power savings over performance -msgstr +#~ msgid Put display to sleep when computer is inactive for: +#~ msgstr Postavi zaslon u način spavanja kada je računalo neaktivan : -#: ../data/interfaces/xfpm-settings.ui.h:16 -msgid Put display to sleep when computer is inactive for: -msgstr Postavi zaslon u način spavanja kada je računalo neaktivan : +#~ msgid Put the computer to sleep when inactive for: +#~ msgstr Postavi računalo u način spavanja kada je neaktivno: -#: ../data/interfaces/xfpm-settings.ui.h:17 -msgid Put the computer to sleep when inactive for: -msgstr Postavi računalo u način spavanja kada je neaktivno: +#~ msgid Reduce screen brightness when computer is inactive for: +#~ msgstr Smanji svjetlinu zaslona kada je računalo neaktivno : -#: ../data/interfaces/xfpm-settings.ui.h:18 -msgid Reduce screen brightness when computer is inactive for: -msgstr Smanji svjetlinu zaslona kada je
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Basque (eu) translation to 71%
Updating branch refs/heads/master to be5bd4852aff4db7cb4e843b414c6275e63acebe (commit) from 53f6231784bcd9adc1930e745e3dec6ccbecec46 (commit) commit be5bd4852aff4db7cb4e843b414c6275e63acebe Author: Asier Iturralde Sarasola asier.iturra...@gmail.com Date: Mon Aug 27 20:56:56 2012 +0200 l10n: Updated Basque (eu) translation to 71% New status: 125 messages complete with 19 fuzzies and 31 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 116 ++--- 1 files changed, 57 insertions(+), 59 deletions(-) diff --git a/po/eu.po b/po/eu.po index 1500b4a..9787689 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2,7 +2,7 @@ # Basque translation of the xfce-weather-plugin package. # Copyright (C) 2006-2007 The Xfce development team. # This file is distributed under the same license as the xfce-weather-plugin package. -# +# # Piarres Beobide p...@beobide.net 2005,2006, 2008, 2009. msgid msgstr @@ -12,10 +12,10 @@ msgstr PO-Revision-Date: 2009-07-22 23:05+0200\n Last-Translator: Piarres Beobide p...@beobide.net\n Language-Team: Basque kde-i18n-...@kde.org\n -Language: eu\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: eu\n Plural-Forms: nplurals=2; plural=n != 1;\n X-Generator: Lokalize 0.3\n @@ -99,14 +99,13 @@ msgstr msgid The sun rises at %s and sets at %s. msgstr -#. #. * TRANSLATORS: Re-arrange and align at will, optionally using #. * abbreviations for labels if desired or necessary. Just take #. * into account the possible size constraints, the centered #. * vertical alignment of the icon - which unfortunately cannot #. * be changed easily - and try to make it compact and look #. * good! -#. +#. #: ../panel-plugin/weather.c:928 #, c-format msgid @@ -132,7 +131,6 @@ msgstr Ezin dira eguraldiaren datuak eguneratu msgid _Forecast msgstr _Iragarpena -#. #. * TRANSLATORS: The abbreviations in parentheses will be shown in #. * the scrollbox together with the values. Keep them in sync with #. * those in make_label() in weather.c. Some of them may be @@ -140,7 +138,7 @@ msgstr _Iragarpena #. * read that up somewhere and decide whether you want to use them #. * or not. In general, though, you should just try to choose #. * letter(s) that make sense and don't use up too much space. -#. +#. #: ../panel-plugin/weather-config.c:49 msgid Temperature (T) msgstr Tenperatura (T) @@ -306,8 +304,9 @@ msgid °C msgstr °C #: ../panel-plugin/weather-data.c:147 +#, fuzzy msgid psi -msgstr +msgstr psi #: ../panel-plugin/weather-data.c:147 msgid hPa @@ -378,21 +377,21 @@ msgstr Bilatzen... #: ../panel-plugin/weather-search.c:221 #, fuzzy msgid Search location -msgstr Bilatu eguraldi kokaleku kodea +msgstr Bilatu kokapena #: ../panel-plugin/weather-search.c:242 #, fuzzy msgid Enter a city name or address -msgstr Idatzi hiri izen edo posta kodea +msgstr Idatzi hiriaren izena edo helbidea -#. #. * TRANSLATORS: Latitude and longitude are known from the #. * search results, but not the location name. The user shall #. * give the place a name. -#. +#. #: ../panel-plugin/weather-search.c:418 +#, fuzzy msgid Unnamed place -msgstr +msgstr Izenik gabeko lekua #. head #: ../panel-plugin/weather-summary.c:313 @@ -447,10 +446,13 @@ msgstr #. sun and moon #: ../panel-plugin/weather-summary.c:346 +#, fuzzy msgid \n Astronomical Data\n msgstr +\n +Datu astronomikoak\n #: ../panel-plugin/weather-summary.c:349 msgid \tSunrise:\t\tThe sun never rises today.\n @@ -605,8 +607,9 @@ msgid msgstr #: ../panel-plugin/weather-summary.c:444 +#, fuzzy msgid Thanks to met.no -msgstr +msgstr Eskerrak met.no-ri #: ../panel-plugin/weather-summary.c:557 msgid Morning @@ -722,8 +725,9 @@ msgstr LASAI #. TRANSLATORS: Moon phases #: ../panel-plugin/weather-translate.c:58 +#, fuzzy msgid New moon -msgstr +msgstr Ilargi berria #: ../panel-plugin/weather-translate.c:59 msgid Waxing crescent @@ -753,15 +757,19 @@ msgstr msgid Waning crescent msgstr -#. -#. * TRANSLATORS: How these symbols are defined is explained at http://api.yr.no/faq.html#symbols. +#. * TRANSLATORS: How these symbols are defined is explained at +#. http://api.yr.no/faq.html#symbols. #. * More information can be obtained from the following pages: -#. * http://www.theweathernetwork.com/weathericons/?product=weathericonspagecontent=index -#. * http://www.theweathernetwork.com/index.php?product=helpplacecode=cabc0164pagecontent=helpicons +#. * +#. http://www.theweathernetwork.com/weathericons/?product=weathericonspagecontent=index +#. * +#. http://www.theweathernetwork.com/index.php?product=helpplacecode=cabc0164pagecontent=helpicons #. * http://www.mir-co.net/sonstiges/wetterausdruecke.htm -#. * The latter page is in German, but it contains a symbol table with Norwegian descriptions. -#. * The ones that
[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Basque (eu) translation to 77%
Updating branch refs/heads/master to aa5c1df28ef2f2773cac8f05fc265bc74c2ec35d (commit) from be5bd4852aff4db7cb4e843b414c6275e63acebe (commit) commit aa5c1df28ef2f2773cac8f05fc265bc74c2ec35d Author: Asier Iturralde Sarasola asier.iturra...@gmail.com Date: Mon Aug 27 21:00:09 2012 +0200 l10n: Updated Basque (eu) translation to 77% New status: 136 messages complete with 8 fuzzies and 31 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 25 + 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/po/eu.po b/po/eu.po index 9787689..429456a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -210,9 +210,8 @@ msgid msgstr #: ../panel-plugin/weather-config.c:390 -#, fuzzy msgid Please select a location by using the \Change\ button. -msgstr Mesedez ezarri kokaleku bat pluginaren ezarpenetan. +msgstr Mesedez hautatu kokaleku bat \Aldatu\ botoia erabiliz. #: ../panel-plugin/weather-config.c:427 msgid Detecting... @@ -250,9 +249,8 @@ msgid Use proxy _server msgstr Erabili proxy _zerbitzaria #: ../panel-plugin/weather-config.c:550 -#, fuzzy msgid Auto-detect from _environment -msgstr Atzemateko-automatikoa ingurunetik +msgstr Atzeman automatikoki ingurunetik #. number of days shown in forecast #: ../panel-plugin/weather-config.c:603 @@ -304,7 +302,6 @@ msgid °C msgstr °C #: ../panel-plugin/weather-data.c:147 -#, fuzzy msgid psi msgstr psi @@ -335,22 +332,22 @@ msgid Failed to get the hostname %s. Retry in %d seconds. msgstr Huts %s ostalari-izena eskuratzean. %d segundutan berriz saiatuko da. #: ../panel-plugin/weather-http.c:246 -#, fuzzy, c-format +#, c-format msgid Failed to open the socket(%s). -msgstr Huts socket-a irekitzean (%s). +msgstr Huts (%s) socket-a irekitzean. #: ../panel-plugin/weather-http.c:252 -#, fuzzy, c-format +#, c-format msgid Failed to create a connection with the host(%s). -msgstr Huts ostalariarekin konexioa sortzean (%s). +msgstr Huts ostalariarekin konexio bat sortzean (%s). #: ../panel-plugin/weather-http.c:289 -#, fuzzy, c-format +#, c-format msgid Failed to send the request(%s). msgstr Huts eskaera bidaltzerakoan (%s). #: ../panel-plugin/weather-http.c:337 -#, fuzzy, c-format +#, c-format msgid Failed to receive data(%s) msgstr Huts datuak jasotzerakoan (%s) @@ -375,12 +372,10 @@ msgid Searching... msgstr Bilatzen... #: ../panel-plugin/weather-search.c:221 -#, fuzzy msgid Search location -msgstr Bilatu kokapena +msgstr Bilatu kokalekua #: ../panel-plugin/weather-search.c:242 -#, fuzzy msgid Enter a city name or address msgstr Idatzi hiriaren izena edo helbidea @@ -389,7 +384,6 @@ msgstr Idatzi hiriaren izena edo helbidea #. * give the place a name. #. #: ../panel-plugin/weather-search.c:418 -#, fuzzy msgid Unnamed place msgstr Izenik gabeko lekua @@ -446,7 +440,6 @@ msgstr #. sun and moon #: ../panel-plugin/weather-summary.c:346 -#, fuzzy msgid \n Astronomical Data\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Zoom text and images by default
Updating branch refs/heads/master to cfb0db3b600d86298946c891663f8a7bb4676e04 (commit) from f41498e16ced1c2b8804dae033f2354dd688f0af (commit) commit cfb0db3b600d86298946c891663f8a7bb4676e04 Author: Christian Dywan christ...@twotoasts.de Date: Sun Aug 26 14:18:22 2012 +0200 Zoom text and images by default midori/midori-websettings.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 1397e82..9b629be 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -887,7 +887,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) zoom-text-and-images, _(Zoom Text and Images), _(Whether to zoom text and images), - FALSE, + TRUE, flags)); /** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Exact debug token check and verify tokens are listed
Updating branch refs/heads/master
to f41498e16ced1c2b8804dae033f2354dd688f0af (commit)
from b5ff08c4c0e7ee19ebf73b9ecb4dcfe7af699ca8 (commit)
commit f41498e16ced1c2b8804dae033f2354dd688f0af
Author: Christian Dywan christ...@twotoasts.de
Date: Sun Aug 26 14:16:14 2012 +0200
Exact debug token check and verify tokens are listed
midori/midori-app.c | 15 +--
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 1c87460..f73fe8f 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1566,13 +1566,13 @@ gboolean
midori_debug (const gchar* token)
{
static const gchar* debug_token = NULL;
-g_return_val_if_fail (token != NULL, FALSE);
+const gchar* debug = g_getenv (MIDORI_DEBUG);
+const gchar* debug_tokens = soup soup:1 soup:2 soup:3 cookies ;
+const gchar* full_debug_tokens = adblock:1 adblock:2 startup bookmarks ;
if (debug_token == NULL)
{
-const gchar* debug = g_getenv (MIDORI_DEBUG);
-const gchar* debug_tokens = soup:1 soup:2 soup:3 cookies;
-const gchar* full_debug_tokens = adblock:1 adblock:2 startup
bookmarks;
-if (debug strstr (full_debug_tokens, debug))
+gchar* found_token;
+if (debug (found_token = strstr (full_debug_tokens, debug))
*found_token == ' ')
{
#ifdef G_ENABLE_DEBUG
debug_token = g_intern_static_string (debug);
@@ -1580,7 +1580,7 @@ midori_debug (const gchar* token)
g_warning (Value '%s' for MIDORI_DEBUG requires a full debugging
build., debug);
#endif
}
-else if (debug strstr (debug_tokens, debug))
+else if (debug (found_token = strstr (debug_tokens, debug))
*found_token == ' ')
debug_token = g_intern_static_string (debug);
else if (debug)
g_warning (Unrecognized value '%s' for MIDORI_DEBUG., debug);
@@ -1593,6 +1593,9 @@ midori_debug (const gchar* token)
debug_tokens, full_debug_tokens);
}
}
+if (debug_token != g_intern_static_string (NONE)
+ !strstr (debug_tokens, token) !strstr (full_debug_tokens, token))
+g_warning (Token '%s' passed to midori_debug is not a known token.,
token);
return debug_token == g_intern_static_string (token);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Reverse certificate check in navigation_decision_cb
Updating branch refs/heads/master
to 49dae87d36c4b4e48d7f67c51552959ed83dc697 (commit)
from cfb0db3b600d86298946c891663f8a7bb4676e04 (commit)
commit 49dae87d36c4b4e48d7f67c51552959ed83dc697
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Aug 27 19:02:37 2012 +0200
Reverse certificate check in navigation_decision_cb
midori/midori-view.c |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index f9d3414..267cd1b 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -988,15 +988,15 @@ midori_view_web_view_navigation_decision_cb
(WebKitWebView* web_view
g_object_get (tls_cert, certificate, der_cert, NULL);
gcr_cert = gcr_simple_certificate_new (der_cert-data,
der_cert-len);
g_byte_array_unref (der_cert);
-if (soup_uri soup_uri-host
gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH,
soup_uri-host, NULL, NULL))
+if (soup_uri soup_uri-host
!gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH,
soup_uri-host, NULL, NULL))
{
GError* error = NULL;
gcr_trust_add_pinned_certificate (gcr_cert,
GCR_PURPOSE_SERVER_AUTH, soup_uri-host, NULL, error);
if (error != NULL)
{
-midori_view_stop_loading (view);
gchar* slots = g_strjoinv ( , ,
(gchar**)gcr_pkcs11_get_trust_lookup_uris ());
gchar* title = g_strdup_printf (Error granting trust:
%s, error-message);
+midori_view_stop_loading (view);
midori_view_display_error (view, view-uri,
view-title ? view-title : view-uri, title,
slots,
_(Trust this website), NULL);
@@ -1121,6 +1121,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*
web_view,
message = midori_map_get_message (message);
g_object_get (message, tls-certificate, tls_cert, NULL);
+g_return_if_fail (tls_cert != NULL);
g_object_get (tls_cert, certificate, der_cert, NULL);
gcr_cert = gcr_simple_certificate_new (der_cert-data,
der_cert-len);
g_byte_array_unref (der_cert);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Introduce Midori.Paths and Midori.RuntimeMode
Updating branch refs/heads/master
to 7f37162fe009e7f7f6b51497fe4c20a4445e2cd8 (commit)
from 49dae87d36c4b4e48d7f67c51552959ed83dc697 (commit)
commit 7f37162fe009e7f7f6b51497fe4c20a4445e2cd8
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Aug 27 21:49:36 2012 +0200
Introduce Midori.Paths and Midori.RuntimeMode
Also introduce initial portable mode on Win32.
extensions/adblock.c |4 +-
extensions/addons.c | 22
extensions/web-cache.c|2 +-
katze/katze-net.c | 12 +---
katze/katze-utils.c |4 +-
katze/midori-paths.vala | 117 +
midori/main.c | 44 ---
midori/midori-app.c |7 ++-
midori/midori-bookmarks.c |5 +-
midori/midori-browser.c | 17 +++
midori/midori-extension.c |3 +-
midori/midori-preferences.c |3 +-
midori/midori-view.c | 29 +++---
midori/midori-view.h |3 -
midori/sokoke.c | 43 +--
midori/sokoke.h |6 --
tests/browser.c |1 +
tests/extensions.c|1 +
tests/properties.c|1 +
toolbars/midori-transferbar.c |2 +-
wscript |1 +
21 files changed, 192 insertions(+), 135 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 7480f75..68a5551 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -10,6 +10,7 @@
See the file COPYING for the full license text.
*/
#include midori/midori.h
+#include midori-core.h
#include glib/gstdio.h
#include config.h
@@ -179,8 +180,7 @@ adblock_get_filename_for_uri (const gchar* uri)
if (!strncmp (uri, file, 4))
return g_strndup (uri + 7, strlen (uri) - 7);
-folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
- adblock, NULL);
+folder = g_build_filename (midori_paths_get_cache_dir (), adblock, NULL);
katze_mkdir_with_parents (folder, 0700);
filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
diff --git a/extensions/addons.c b/extensions/addons.c
index 5cfce23..6087af4 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -14,6 +14,7 @@
/* This extensions add support for user addons: userscripts and userstyles */
#include midori/midori.h
+#include midori-core.h
#include glib/gstdio.h
#include config.h
@@ -182,8 +183,8 @@ addons_install_response (GtkWidget* infobar,
if (!filename)
filename = g_path_get_basename (uri);
-folder_path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir
(),
- PACKAGE_NAME, folder, NULL);
+folder_path = g_build_path (G_DIR_SEPARATOR_S,
+midori_paths_get_user_data_dir (), PACKAGE_NAME, folder, NULL);
if (!g_file_test (folder_path, G_FILE_TEST_EXISTS))
katze_mkdir_with_parents (folder_path, 0700);
@@ -293,13 +294,13 @@ addons_button_add_clicked_cb (GtkToolItem* toolitem,
if (addons-kind == ADDONS_USER_SCRIPTS)
{
addons_type = g_strdup (userscripts);
-path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir
(),
PACKAGE_NAME, scripts, NULL);
}
else if (addons-kind == ADDONS_USER_STYLES)
{
addons_type = g_strdup (userstyles);
-path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir
(),
PACKAGE_NAME, styles, NULL);
}
else
@@ -513,13 +514,10 @@ addons_open_target_folder_clicked_cb (GtkWidget* toolitem,
}
else
{
-folder = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
- PACKAGE_NAME,
- addons-kind == ADDONS_USER_SCRIPTS
- ? scripts : styles, NULL);
-
-if (!g_file_test (folder, G_FILE_TEST_EXISTS))
-katze_mkdir_with_parents (folder, 0700);
+folder = g_build_path (G_DIR_SEPARATOR_S,
midori_paths_get_user_data_dir (),
+PACKAGE_NAME, addons-kind == ADDONS_USER_SCRIPTS
+ ? scripts : styles, NULL);
+katze_mkdir_with_parents (folder, 0700);
}
folder_uri = g_filename_to_uri (folder, NULL, NULL);
@@ -827,7 +825,7 @@ addons_get_directories (AddonsKind kind)
else
g_assert_not_reached ();
-path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+path = g_build_path (G_DIR_SEPARATOR_S, midori_paths_get_user_data_dir (),
PACKAGE_NAME, folder_name, NULL);
directories = g_slist_prepend (directories, path);
diff --git
[Xfce4-commits] midori:master Disable GtkRecentManager in private and portable mode
Updating branch refs/heads/master
to cc4fbca8e35814d0cd5614a4505e214140b9b48d (commit)
from 7f37162fe009e7f7f6b51497fe4c20a4445e2cd8 (commit)
commit cc4fbca8e35814d0cd5614a4505e214140b9b48d
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Aug 27 22:27:48 2012 +0200
Disable GtkRecentManager in private and portable mode
midori/main.c |6 ++
toolbars/midori-transferbar.c |7 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index abce0a2..2e4ef81 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2210,12 +2210,18 @@ main (intargc,
NULL);
#endif
+g_object_set (gtk_settings_get_default (),
+gtk-recent-files-max-age, 0, NULL);
midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, private://);
}
else if (webapp)
midori_paths_init (MIDORI_RUNTIME_MODE_APP, config ? config :
app://);
else if (portable)
+{
+g_object_set (gtk_settings_get_default (),
+gtk-recent-files-max-age, 0, NULL);
midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, portable://);
+}
midori_load_soup_session (settings);
if (block_uris)
diff --git a/toolbars/midori-transferbar.c b/toolbars/midori-transferbar.c
index 64b9fc8..5896fa1 100644
--- a/toolbars/midori-transferbar.c
+++ b/toolbars/midori-transferbar.c
@@ -158,11 +158,8 @@ midori_transferbar_download_notify_status_cb
(WebKitDownload* download,
}
g_free (fingerprint);
if (verified)
-{
-if (!midori_paths_is_readonly ())
-gtk_recent_manager_add_item
(gtk_recent_manager_get_default (),
-webkit_download_get_destination_uri (download));
-}
+ gtk_recent_manager_add_item (gtk_recent_manager_get_default
(),
+webkit_download_get_destination_uri (download));
else
gtk_image_set_from_stock (GTK_IMAGE (icon),
GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use new Paths API in web cache extension
Updating branch refs/heads/master
to a6606a9cee600ae77ab96736405b138623a6f11d (commit)
from cc4fbca8e35814d0cd5614a4505e214140b9b48d (commit)
commit a6606a9cee600ae77ab96736405b138623a6f11d
Author: Christian Dywan christ...@twotoasts.de
Date: Mon Aug 27 22:29:13 2012 +0200
Use new Paths API in web cache extension
extensions/web-cache.c |3 +--
katze/katze-net.c |1 -
katze/katze-utils.c|1 -
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/extensions/web-cache.c b/extensions/web-cache.c
index cf81015..53ea445 100644
--- a/extensions/web-cache.c
+++ b/extensions/web-cache.c
@@ -28,8 +28,7 @@ web_cache_get_cache_dir (void)
{
static gchar* cache_dir = NULL;
if (!cache_dir)
-cache_dir = g_build_filename (sokoke_get_user_cache_dir (),
- PACKAGE_NAME, web, NULL);
+cache_dir = g_build_filename (midori_paths_get_cache_dir (), web,
NULL);
return cache_dir;
}
diff --git a/katze/katze-net.c b/katze/katze-net.c
index 09fe271..63b5e60 100644
--- a/katze/katze-net.c
+++ b/katze/katze-net.c
@@ -19,7 +19,6 @@
#include katze-net.h
#include midori-core.h
-#include sokoke.h
#include glib/gstdio.h
#include libsoup/soup.h
diff --git a/katze/katze-utils.c b/katze/katze-utils.c
index 7ded817..68f2771 100644
--- a/katze/katze-utils.c
+++ b/katze/katze-utils.c
@@ -14,7 +14,6 @@
#include katze-utils.h
#include katze-array.h
#include midori-core.h
-#include sokoke.h
#include glib/gstdio.h
#include glib/gi18n.h
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Use #ifdef for ZEITGEIST and GCR
Updating branch refs/heads/master
to 910e2d4842130004ebd5a63d3223e115404fec0e (commit)
from a6606a9cee600ae77ab96736405b138623a6f11d (commit)
commit 910e2d4842130004ebd5a63d3223e115404fec0e
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Mon Aug 27 22:50:33 2012 +0200
Use #ifdef for ZEITGEIST and GCR
midori/midori-browser.c|4 ++--
midori/midori-locationaction.c |6 +++---
midori/midori-view.c |8
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index b45b4b4..9f12e8b 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -38,7 +38,7 @@
#include granite.h
#endif
-#if HAVE_ZEITGEIST
+#ifdef HAVE_ZEITGEIST
#include zeitgeist.h
#endif
@@ -489,7 +489,7 @@ midori_browser_update_history (KatzeItem* item,
const gchar* type,
const gchar* event)
{
-#if HAVE_ZEITGEIST
+#ifdef HAVE_ZEITGEIST
const gchar* inter;
if (strstr (event, access))
inter = ZEITGEIST_ZG_ACCESS_EVENT;
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index dc59549..5bd0b7d 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1174,7 +1174,7 @@ midori_location_action_focus_out_event_cb (GtkWidget*
widget,
return FALSE;
}
-#if HAVE_GCR
+#ifdef HAVE_GCR
#define GCR_API_SUBJECT_TO_CHANGE
#include gcr/gcr.h
#endif
@@ -1202,7 +1202,7 @@ midori_map_get_message (SoupMessage* message)
return full;
}
-#if HAVE_GCR
+#ifdef HAVE_GCR
typedef enum {
MIDORI_CERT_TRUST,
MIDORI_CERT_REVOKE,
@@ -1295,7 +1295,7 @@ midori_location_action_show_page_info (GtkWidget* widget,
if (tls_cert == NULL)
return;
-#if HAVE_GCR
+#ifdef HAVE_GCR
GByteArray* der_cert;
GcrCertificate* gcr_cert;
GtkWidget* details;
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 6dc108d..315f84b 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -26,7 +26,7 @@
#include granite.h
#endif
-#if HAVE_GCR
+#ifdef HAVE_GCR
#define GCR_API_SUBJECT_TO_CHANGE
#include gcr/gcr.h
@@ -965,7 +965,7 @@ midori_view_web_view_navigation_decision_cb (WebKitWebView*
web_view
return TRUE;
}
}
-#if HAVE_GCR
+#ifdef HAVE_GCR
else if (/* view-special */ !strncmp (uri, https, 5))
{
/* We show an error page if the certificate is invalid.
@@ -1054,7 +1054,7 @@ webkit_web_view_load_started_cb (WebKitWebView* web_view,
g_object_thaw_notify (G_OBJECT (view));
}
-#if HAVE_GCR
+#ifdef HAVE_GCR
const gchar*
midori_location_action_tls_flags_to_string (GTlsCertificateFlags flags);
#endif
@@ -,7 +,7 @@ webkit_web_view_load_committed_cb (WebKitWebView*
web_view,
if (message
soup_message_get_flags (message)
SOUP_MESSAGE_CERTIFICATE_TRUSTED)
view-security = MIDORI_SECURITY_TRUSTED;
-#if HAVE_GCR
+#ifdef HAVE_GCR
else if (!view-special message != NULL)
{
GTlsCertificate* tls_cert;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Move portable setup code path down
Updating branch refs/heads/master
to 8bf93fcad0cfd04e7e2d1736cf1f7bdacb0fbb31 (commit)
from 910e2d4842130004ebd5a63d3223e115404fec0e (commit)
commit 8bf93fcad0cfd04e7e2d1736cf1f7bdacb0fbb31
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Mon Aug 27 23:36:44 2012 +0200
Move portable setup code path down
midori/main.c | 18 ++
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 2e4ef81..e87ab92 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2216,12 +2216,6 @@ main (intargc,
}
else if (webapp)
midori_paths_init (MIDORI_RUNTIME_MODE_APP, config ? config :
app://);
-else if (portable)
-{
-g_object_set (gtk_settings_get_default (),
-gtk-recent-files-max-age, 0, NULL);
-midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, portable://);
-}
midori_load_soup_session (settings);
if (block_uris)
@@ -2334,8 +2328,16 @@ main (intargc,
if (inactivity_reset 0)
g_error (--inactivity-reset is currently only supported with --app.);
-midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config);
-app = midori_app_new ();
+if (portable)
+{
+g_object_set (gtk_settings_get_default (),
+gtk-recent-files-max-age, 0, NULL);
+midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, portable://);
+}
+else
+midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config);
+
+app = midori_app_new ();
katze_assign (config, g_strdup (midori_paths_get_config_dir ()));
midori_startup_timer (App created: \t%f);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-vcs-plugin:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 67%
Updating branch refs/heads/master to dfb637d67627282c2d0607226dfc92e23789b355 (commit) from f031c2e1bf33c047cadff193f0a218feb9341915 (commit) commit dfb637d67627282c2d0607226dfc92e23789b355 Author: Pei Yi Chen cp123cp...@kimo.com Date: Tue Aug 28 07:42:38 2012 +0200 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 67% New status: 209 messages complete with 35 fuzzies and 65 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_TW.po | 33 +++-- 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index eb602b8..675882d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: thunar-vcs-plugin master\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-08-26 10:48+\n +POT-Creation-Date: 2012-08-28 05:36+\n PO-Revision-Date: 2012-01-19 16:00+0800\n Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n Language-Team: chinese-l10n chinese-l...@googlegroups.com\n @@ -814,7 +814,6 @@ msgid Execute changelist action msgstr 執行更新列表動作 #: ../tvp-svn-helper/main.c:132 -#, fuzzy msgid Execute checkout action msgstr 執行取出動作 @@ -847,7 +846,6 @@ msgid Execute lock action msgstr 執行鎖定動作 #: ../tvp-svn-helper/main.c:192 -#, fuzzy msgid Execute properties action msgstr 執行屬性動作 @@ -1248,17 +1246,14 @@ msgid Obstructed msgstr 阻擋的 #: ../tvp-svn-helper/tsh-common.c:702 -#, fuzzy msgid Changed -msgstr 變動的 +msgstr 已變動的 #: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:744 -#, fuzzy msgid Merged -msgstr 合併的 +msgstr 已合併的 #: ../tvp-svn-helper/tsh-common.c:704 ../tvp-svn-helper/tsh-common.c:745 -#, fuzzy msgid Conflicted msgstr 衝突的 @@ -1274,31 +1269,31 @@ msgstr 一般 #: ../tvp-svn-helper/tsh-common.c:746 msgid Ignored -msgstr +msgstr 已忽略的 #: ../tvp-svn-helper/tsh-common.c:749 msgid Incomplete -msgstr +msgstr 未完成 #: ../tvp-svn-helper/tsh-common.c:1087 msgid Error -msgstr +msgstr 錯誤 #: ../tvp-svn-helper/tsh-common.c:1099 msgid Local action -msgstr +msgstr 本地動作 #: ../tvp-svn-helper/tsh-copy.c:112 msgid Local copy -msgstr +msgstr 本地複製 #: ../tvp-svn-helper/tsh-copy.c:159 msgid Copy To -msgstr +msgstr 複製到 #: ../tvp-svn-helper/tsh-delete.c:118 msgid Local delete -msgstr +msgstr 本地刪除 #: ../tvp-svn-helper/tsh-delete.c:158 msgid Delete Message @@ -1332,7 +1327,7 @@ msgstr 紀錄失敗 #: ../tvp-svn-helper/tsh-log-dialog.c:214 msgid Stop On Copy -msgstr +msgstr 複製時停止 #: ../tvp-svn-helper/tsh-log-dialog.c:218 msgid Show Merged Revisions @@ -1391,8 +1386,9 @@ msgstr 值 #. #: ../tvp-svn-helper/tsh-properties-dialog.c:206 #: ../tvp-svn-helper/tsh-status-dialog.c:181 +#, fuzzy msgid Self -msgstr +msgstr 自身 #. Translators: svn recursion selection #. * Immediate files means this file/direcotry and the files it contains are @@ -1404,8 +1400,9 @@ msgstr #. #: ../tvp-svn-helper/tsh-properties-dialog.c:217 #: ../tvp-svn-helper/tsh-status-dialog.c:190 +#, fuzzy msgid Immediate files -msgstr +msgstr 即時文件 #. Translators: svn recursion selection #. * Recursive means the update is full recursive ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
