[EGIT] [core/enlightenment] enlightenment-0.17 13/85: Fix inverted arguments for lseek()
cedric pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=88cdaa67d5fd38ed21cdcede5283011ab05beda1 commit 88cdaa67d5fd38ed21cdcede5283011ab05beda1 Author: Igor Murzov e-m...@date.by Date: Tue Dec 25 18:12:31 2012 + Fix inverted arguments for lseek() Patch from Maxime Villard rusty...@gmx.fr Hum, I've made a mistake in e_fm_op.c with lseek(), I inverted the two last arguments. However it's not harmful, as SEEK_SET=0.: SVN revision: 81697 --- src/bin/e_fm_op.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c index eb21634..dd13376 100644 --- a/src/bin/e_fm_op.c +++ b/src/bin/e_fm_op.c @@ -1752,7 +1752,7 @@ _e_fm_op_destroy_atom(E_Fm_Op_Task *task) if (task-passes == NB_PASS) goto finish; - if (lseek(fd, SEEK_SET, 0) == -1) + if (lseek(fd, 0, SEEK_SET) == -1) goto finish; task-pos = 0; --
[EGIT] [core/elementary] master 01/01: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=894bfb5dc1b8be9e7f0a929b172428e383b1c49f commit 894bfb5dc1b8be9e7f0a929b172428e383b1c49f Author: Igor Murzov ga...@efl.so Date: Sat Feb 7 15:17:53 2015 +0300 Update russian translation --- po/ru.po | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index db96628..59b9284 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,15 +3,15 @@ # Copyright (C) 2012 Enlightenment development team # This file is distributed under the same license as the elementary package. # Danny Moshnakov d...@agent.co.il, 2012. -# Igor Murzov ga...@efl.so, 2014. +# Igor Murzov ga...@efl.so, 2014-2015. # #: src/lib/elm_config.c:3174 msgid msgstr Project-Id-Version: elementary 1.11\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2015-02-04 18:11+0900\n -PO-Revision-Date: 2014-11-15 13:55+0300\n +POT-Creation-Date: 2015-02-07 15:16+0300\n +PO-Revision-Date: 2015-02-07 15:16+0300\n Last-Translator: Игорь Мурзов ga...@efl.so\n Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n @@ -31,7 +31,7 @@ msgstr Дом #: src/lib/elc_fileselector.c:1527 msgid Search -msgstr +msgstr Поиск #: src/lib/elc_fileselector.c:1693 src/lib/elm_entry.c:1487 #: src/lib/elm_entry.c:1512 @@ -214,7 +214,7 @@ msgstr Алфавитный указатель msgid Index Item msgstr Элемент алфавитного указателя -#: src/lib/elm_label.c:389 +#: src/lib/elm_label.c:393 msgid Label msgstr Метка @@ -258,7 +258,7 @@ msgstr Состояние: Невыбрано msgid Segment Control Item msgstr Элемент сегментного элемента управления -#: src/lib/elm_slider.c:887 +#: src/lib/elm_slider.c:889 msgid slider msgstr бегунок --
[EGIT] [core/efl] master 01/01: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e98ba63c8293d37328daf1054474b8c34cac04ee commit e98ba63c8293d37328daf1054474b8c34cac04ee Author: Igor Murzov ga...@efl.so Date: Sat Feb 7 15:38:49 2015 +0300 Update russian translation --- po/ru.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3413ff4..f792027 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,14 +1,15 @@ # Russian translation for Efl. # Copyright (C) 2012 Enlightenment development team # This file is put in the public domain. +# Igor Murzov ga...@efl.so, 2015. # msgid msgstr Project-Id-Version: Efl\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2015-02-04 18:08+0900\n -PO-Revision-Date: 2012-06-24 17:10+0900\n -Last-Translator: Jerome Pinot ngc...@gmail.com\n +POT-Creation-Date: 2015-02-06 01:25+0300\n +PO-Revision-Date: 2015-02-06 01:25+0300\n +Last-Translator: Игорь Мурзов ga...@efl.so\n Language-Team: Enlightenment Team\n Language: ru\n MIME-Version: 1.0\n @@ -209,28 +210,28 @@ msgstr Рабочий стол #: src/lib/efreet/efreet_base.c:131 msgid Downloads -msgstr +msgstr Загрузки #: src/lib/efreet/efreet_base.c:140 msgid Templates -msgstr +msgstr Шаблоны #: src/lib/efreet/efreet_base.c:149 msgid Public -msgstr +msgstr Общий каталог #: src/lib/efreet/efreet_base.c:158 msgid Documents -msgstr +msgstr Документы #: src/lib/efreet/efreet_base.c:166 msgid Music -msgstr +msgstr Музыка #: src/lib/efreet/efreet_base.c:174 msgid Pictures -msgstr +msgstr Изображения #: src/lib/efreet/efreet_base.c:182 msgid Videos -msgstr +msgstr Видео --
[EGIT] [core/elementary] elementary-1.12 01/01: Update russian translation
garik pushed a commit to branch elementary-1.12. http://git.enlightenment.org/core/elementary.git/commit/?id=c0481f5131a1a5227d40d02d072d93a0b0204be2 commit c0481f5131a1a5227d40d02d072d93a0b0204be2 Author: Igor Murzov ga...@efl.so Date: Sat Nov 15 14:14:59 2014 +0300 Update russian translation --- po/ru.po | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index aee6ecb..5ab07a4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,8 +10,8 @@ msgid msgstr Project-Id-Version: elementary 1.11\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2014-11-07 09:26+0900\n -PO-Revision-Date: 2014-07-31 19:14+0400\n +POT-Creation-Date: 2014-11-15 13:55+0300\n +PO-Revision-Date: 2014-11-15 13:55+0300\n Last-Translator: Игорь Мурзов ga...@efl.so\n Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n @@ -223,14 +223,12 @@ msgid state: closed msgstr состояние: закрыто #: src/lib/elm_panel.c:110 -#, fuzzy msgid A panel is open -msgstr Отрисовщик открыт +msgstr Панель открыта #: src/lib/elm_panel.c:112 -#, fuzzy msgid Double tap to close panel menu -msgstr Двойной щелчёк, чтобы закрыть меню отрисовщика +msgstr Двойной щелчок, чтобы закрыть меню панели #: src/lib/elm_panel.c:182 msgid panel button --
[EGIT] [core/elementary] master 01/01: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b140c1727245ab3dc9e80233f71ff831707a0d01 commit b140c1727245ab3dc9e80233f71ff831707a0d01 Author: Igor Murzov ga...@efl.so Date: Sat Nov 15 14:05:37 2014 +0300 Update russian translation --- po/ru.po | 66 +++- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/po/ru.po b/po/ru.po index aee6ecb..e5c8a6e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,13 +5,13 @@ # Danny Moshnakov d...@agent.co.il, 2012. # Igor Murzov ga...@efl.so, 2014. # -#: src/lib/elm_config.c:3207 +#: src/lib/elm_config.c:3229 msgid msgstr Project-Id-Version: elementary 1.11\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2014-11-07 09:26+0900\n -PO-Revision-Date: 2014-07-31 19:14+0400\n +POT-Creation-Date: 2014-11-15 13:55+0300\n +PO-Revision-Date: 2014-11-15 13:55+0300\n Last-Translator: Игорь Мурзов ga...@efl.so\n Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n @@ -38,35 +38,35 @@ msgstr Отмена msgid OK msgstr ОК -#: src/lib/elc_multibuttonentry.c:604 +#: src/lib/elc_multibuttonentry.c:611 msgid multi button entry label msgstr метка многокопочного элемента -#: src/lib/elc_multibuttonentry.c:625 +#: src/lib/elc_multibuttonentry.c:633 msgid multi button entry item msgstr кнопка многокопочного элемента -#: src/lib/elc_multibuttonentry.c:1490 +#: src/lib/elc_multibuttonentry.c:1507 msgid multi button entry msgstr многокнопочный элемент -#: src/lib/elc_naviframe.c:430 +#: src/lib/elc_naviframe.c:431 msgid Title msgstr Заголовок -#: src/lib/elc_naviframe.c:957 src/lib/elc_naviframe.c:1155 +#: src/lib/elc_naviframe.c:957 src/lib/elc_naviframe.c:1156 msgid Back msgstr Назад -#: src/lib/elc_naviframe.c:1246 +#: src/lib/elc_naviframe.c:1249 msgid Next msgstr Вперёд -#: src/lib/elc_popup.c:258 src/lib/elc_popup.c:880 +#: src/lib/elc_popup.c:261 src/lib/elc_popup.c:868 msgid Popup Title msgstr Заголовок всплывающего окна -#: src/lib/elc_popup.c:268 src/lib/elc_popup.c:946 +#: src/lib/elc_popup.c:271 src/lib/elc_popup.c:934 msgid Popup Body Text msgstr Текст всплывающего окна @@ -78,10 +78,10 @@ msgstr Облачко msgid Clicked msgstr Нажато -#: src/lib/elm_button.c:271 src/lib/elm_check.c:235 src/lib/elm_gengrid.c:770 -#: src/lib/elm_genlist.c:1518 src/lib/elm_list.c:2054 src/lib/elm_radio.c:256 -#: src/lib/elm_segment_control.c:521 src/lib/elm_spinner.c:578 -#: src/lib/elm_toolbar.c:2208 +#: src/lib/elm_button.c:271 src/lib/elm_check.c:235 src/lib/elm_gengrid.c:782 +#: src/lib/elm_genlist.c:1518 src/lib/elm_list.c:2064 src/lib/elm_radio.c:256 +#: src/lib/elm_segment_control.c:525 src/lib/elm_spinner.c:578 +#: src/lib/elm_toolbar.c:2213 msgid State: Disabled msgstr Состояние: Отключено @@ -162,19 +162,19 @@ msgstr Состояние: Редактируемо msgid Clock msgstr Часы -#: src/lib/elm_colorselector.c:1367 +#: src/lib/elm_colorselector.c:1377 msgid color selector palette item msgstr элемент выбора цвета палитры -#: src/lib/elm_config.c:3223 +#: src/lib/elm_config.c:3245 msgid default:LTR msgstr по умолчанию: ЛНП -#: src/lib/elm_dayselector.c:396 +#: src/lib/elm_dayselector.c:404 msgid day selector item msgstr элемент выбора дня -#: src/lib/elm_diskselector.c:675 +#: src/lib/elm_diskselector.c:688 msgid diskselector item msgstr элемент диска выбора @@ -198,15 +198,15 @@ msgstr Выбрать msgid Entry msgstr Запись -#: src/lib/elm_gengrid.c:800 +#: src/lib/elm_gengrid.c:812 msgid Gengrid Item msgstr Элемент сетки -#: src/lib/elm_index.c:91 +#: src/lib/elm_index.c:93 msgid Index msgstr Алфавитный указатель -#: src/lib/elm_index.c:118 +#: src/lib/elm_index.c:121 msgid Index Item msgstr Элемент алфавитного указателя @@ -223,14 +223,12 @@ msgid state: closed msgstr состояние: закрыто #: src/lib/elm_panel.c:110 -#, fuzzy msgid A panel is open -msgstr Отрисовщик открыт +msgstr Панель открыта #: src/lib/elm_panel.c:112 -#, fuzzy msgid Double tap to close panel menu -msgstr Двойной щелчёк, чтобы закрыть меню отрисовщика +msgstr Двойной щелчок, чтобы закрыть меню панели #: src/lib/elm_panel.c:182 msgid panel button @@ -244,15 +242,15 @@ msgstr индикатор выполнения msgid Radio msgstr Радио флажок -#: src/lib/elm_segment_control.c:524 src/lib/elm_toolbar.c:2210 +#: src/lib/elm_segment_control.c:528 src/lib/elm_toolbar.c:2215 msgid State: Selected msgstr Состояние: Выбрано -#: src/lib/elm_segment_control.c:526 +#: src/lib/elm_segment_control.c:530 msgid State: Unselected msgstr Состояние: Невыбрано -#: src/lib/elm_segment_control.c:538 +#: src/lib/elm_segment_control.c:544 msgid Segment Control Item msgstr Элемент сегментного элемента управления @@ -272,22 +270,22 @@ msgstr кнопка уменьшения счётчика msgid spinner msgstr счётчик -#: src/lib/elm_toolbar.c:1670 src/lib/elm_toolbar.c:2269 +#: src/lib/elm_toolbar.c
[EGIT] [core/enlightenment] master 01/01: Restore translated strings accidentally dropped in fac4e89
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=db45e4067df1cebb49cadf141c8e579e83326e3b commit db45e4067df1cebb49cadf141c8e579e83326e3b Author: Igor Murzov ga...@efl.so Date: Fri Sep 12 14:03:26 2014 +0400 Restore translated strings accidentally dropped in fac4e89 --- config/tiling/profile.desktop| 8 +++- src/modules/packagekit/module.desktop.in | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/tiling/profile.desktop b/config/tiling/profile.desktop index b25efce..edab940 100644 --- a/config/tiling/profile.desktop +++ b/config/tiling/profile.desktop @@ -7,14 +7,12 @@ Name[de]=Kacheln (Vorgabe Enlightenment) Name[fi]=Limittävä (Tavallinen Enlightenment) Name[it]=Tiling (a piastrelle) Name[ms]=Penjubinan (Enlightenment Piawai) +Name[ru]=Мозаичный режим (Стандартный Enlightenment) Name[tr]=Döşeme (Standard Enlightenment) Comment=Tiling window management configuration for devices with keyboards and micebrlike your average PC Desktop, Laptop or Netbookbrwith Enlightenment's traditional keyboard bindingsbrand mouse controls.brDefault tiling bindings are: Win-key + Space, arrows, and left mouse button.brSee the module settings for more information. Comment[ca]=Mosaic per la configuració de la gestió de finestres per dispositius amb teclats i ratolins brcom ara PC d'escriptori, portàtil o netbookbramb associacions de tecles típiques d'EnlightenmentbrTecles d'accés ràpid per defecte són: Tecla Win + Espai, fletxes i botó esquerre del ratolí brVeure la configuració del mòdul per obtenir més informació. Comment[it]=Configurazione con finestre in griglia per dispositivi con tastiere e mousebrcome i normali PC Desktop, Laptop o Netbookbrcon le tradizionali scorciatoie di tastiera e controllibrdel mouse di Enlightenment.brLe associazioni di tasti predefinite proprie di questa modalità sono:brTasto-windows + spazio, frecce, e tasto sinistro del mouse.brVedere le impostazioni del modulo Tiling per maggiori informazioni. Comment[ms]=Konfigurasi pengurusan tetingkap berjubin untuk peranti dengan papan kekunci dan tetikusbrseperti Komputer Desktop, Komputer Riba atau Netbook andabrdengan pengikatan papan kekunci tradisional Enlightenmentbrdan kawalan tetikus.brPengikatan penjubinan lalai adalah: Win-key + Space, anak panah, dan butang tetikus kiri.brSila rujuk tetapan modul untuk maklumat lanjut. -Comment[tr]=Enlightenment'in klavye ve fare kontrol bağlayıcıları ile kullanılan, ortalama br -PC masaüstü, dizüstü ve netbook gibi klavye ve fare aygıtları bulunan cihazlar br -için pencere döşeme yönetimi yapılandırması. Öntanımlı döşeme bağlayıcıları:br -Win Tuşu + Boşluk, ok tuşları ve sol fare tuşu.br -Daha fazla bilgi için modül ayarlarına bakınız. +Comment[ru]=Конфигурация с мозаичным режимом управления окнамиbrпригодная для устройств с клавиатурой и мышью,brтаких как обычный компьютер или ноутбук,brс традиционными для Enlightenment'а сочетаниямиbrклавиш и управлением мышью.brКомбинации клавиш для мозаичного режима по умолчанию:brКнопка Win + пробел, стрелки и левая кнопка мыши. +Comment[tr]=Enlightenment'in klavye ve fare kontrol bağlayıcıları ile kullanılan, ortalama brPC masaüstü, dizüstü ve netbook gibi klavye ve fare aygıtları bulunan cihazlar briçin pencere döşeme yönetimi yapılandırması. Öntanımlı döşeme bağlayıcıları:brWin Tuşu + Boşluk, ok tuşları ve sol fare tuşu.brDaha fazla bilgi için modül ayarlarına bakınız. Icon=enlightenment-tiling diff --git a/src/modules/packagekit/module.desktop.in b/src/modules/packagekit/module.desktop.in index efd1cc5..40daced 100644 --- a/src/modules/packagekit/module.desktop.in +++ b/src/modules/packagekit/module.desktop.in @@ -14,6 +14,7 @@ Name[ko]=패키지 관리자 통합 Name[ms]=Penyepaduan pengurus pakej Name[pl]=Integracja menedżera pakietów Name[pt]=Atualizações do sistema +Name[ru]=Интеграция с пакетным менеджером Name[sr]=Склад са управником пакета Name[tr]=Paket Yöneticisi Bağlantısı Comment=Control system update status @@ -28,6 +29,7 @@ Comment[it]=Controlla lo stato degli aggiornamenti del sistema Comment[ja]=システム更新情報の調整 Comment[ms]=Status kemaskini sistem kawalan Comment[pt]=Controlar o estado das atualizações do sistema +Comment[ru]=Контроль за статусом системных обновлений Comment[sr]=Управља стањем надоградње система Comment[tr]=Sistem güncelleme durumu kontrolü Icon=e-module-packagekit --
[EGIT] [core/elementary] master 01/01: Revert revert of my translation updates.
garik pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=21453a13a98cf1f0d559630d6ef818e79ba1349a commit 21453a13a98cf1f0d559630d6ef818e79ba1349a Author: Igor Murzov ga...@efl.so Date: Fri Sep 12 14:36:38 2014 +0400 Revert revert of my translation updates. --- data/desktop/elementary_config.desktop | 4 ++-- data/desktop/elementary_test.desktop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/desktop/elementary_config.desktop b/data/desktop/elementary_config.desktop index 26eae01..0bc81ec 100644 --- a/data/desktop/elementary_config.desktop +++ b/data/desktop/elementary_config.desktop @@ -16,7 +16,7 @@ Name[lt]=Elementary nustatymai Name[ms]=Konfigurasi Elementary Name[pl]=Podstawowa konfiguracja Name[pt]=Configure o Elementary -Name[ru]=Конфигурация для Elementary (Элементарий) +Name[ru]=Параметры Elementary Name[sr]=Поставке Еламентарија Name[tr]=Elementary Yapılandırması Comment=Elementary Configuration @@ -34,7 +34,7 @@ Comment[lt]=Elementary nustatymai Comment[ms]=Konfigurasi Elementary Comment[pl]=Podstawowa konfiguracja Comment[pt]=Configure o Elementary -Comment[ru]=Конфигурация для Elementary (Элементарий) +Comment[ru]=Параметры Elementary Comment[sr]=Поставке Еламентарија Comment[tr]=Elementary Yapılandırması Icon=elementary diff --git a/data/desktop/elementary_test.desktop b/data/desktop/elementary_test.desktop index 1471aab..9306d48 100644 --- a/data/desktop/elementary_test.desktop +++ b/data/desktop/elementary_test.desktop @@ -28,7 +28,7 @@ Comment[it]=Applicazione di test per Elementary Comment[ja]=Elementary テストアプリケーション Comment[ms]=Aplikasi Uji Elementary Comment[pt]=Aplicação de testes do Elementary -Comment[ru]=Тестовое приложение Элементария +Comment[ru]=Приложение для тестирования Elementary Comment[sr]=Пробач програма Елементарија Comment[tr]=Elementary Test Uygulaması Icon=elementary --
[EGIT] [core/evas_generic_loaders] evas_generic_loaders-1.11 01/01: Improve LO binary detection
garik pushed a commit to branch evas_generic_loaders-1.11. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=430ac88561f6f5723a847a6f7487e3f5fad30236 commit 430ac88561f6f5723a847a6f7487e3f5fad30236 Author: Igor Murzov ga...@efl.so Date: Thu Aug 21 13:41:27 2014 +0400 Improve LO binary detection --- src/bin/pdf/evas_generic_pdf_loader.libreoffice | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/pdf/evas_generic_pdf_loader.libreoffice b/src/bin/pdf/evas_generic_pdf_loader.libreoffice index 1809b1d..b36e11e 100755 --- a/src/bin/pdf/evas_generic_pdf_loader.libreoffice +++ b/src/bin/pdf/evas_generic_pdf_loader.libreoffice @@ -1,2 +1,8 @@ #!/bin/sh -/usr/lib/libreoffice/program/soffice.bin --headless --convert-to pdf --outdir $2 $1 +LOBIN=soffice +if [ -x /usr/lib/libreoffice/program/soffice.bin ]; then + LOBIN=/usr/lib/libreoffice/program/soffice.bin +elif [ -x /usr/lib64/libreoffice/program/soffice.bin ]; then + LOBIN=/usr/lib64/libreoffice/program/soffice.bin +fi +$LOBIN --headless --convert-to pdf --outdir $2 $1 --
[EGIT] [core/enlightenment] master 01/02: po/POTFILES.in: Add files of Pager Plain module
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ef7221320a038633b82a8b0bab712d124dd81408 commit ef7221320a038633b82a8b0bab712d124dd81408 Author: Igor Murzov ga...@efl.so Date: Wed Sep 3 15:28:47 2014 +0400 po/POTFILES.in: Add files of Pager Plain module --- po/POTFILES.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 295c225..119d437 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -262,6 +262,8 @@ src/modules/packagekit/e_mod_main.c src/modules/packagekit/e_mod_packagekit.c src/modules/pager/e_mod_config.c src/modules/pager/e_mod_main.c +src/modules/pager_plain/e_mod_config.c +src/modules/pager_plain/e_mod_main.c src/modules/quickaccess/e_mod_config.c src/modules/quickaccess/e_mod_main.c src/modules/quickaccess/e_mod_quickaccess.c --
[EGIT] [core/enlightenment] master 02/02: Improve messages in bindings configuration dialogs
garik pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=aba7a8c9d53cf5e0d83046e50c4b8a579a118cfd
commit aba7a8c9d53cf5e0d83046e50c4b8a579a118cfd
Author: Igor Murzov ga...@efl.so
Date: Wed Sep 3 17:11:19 2014 +0400
Improve messages in bindings configuration dialogs
---
src/bin/e_grab_dialog.c | 6 +++---
src/modules/conf_bindings/e_int_config_acpibindings.c | 2 +-
src/modules/conf_bindings/e_int_config_keybindings.c | 7 ++-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c
index 2dfbb8f..c2a943e 100644
--- a/src/bin/e_grab_dialog.c
+++ b/src/bin/e_grab_dialog.c
@@ -1,6 +1,6 @@
#include e.h
-#define TEXT_PRESS_KEY_SEQUENCE_(Please press key
sequence,brbr \
+#define TEXT_PRESS_KEY_SEQUENCE_(Please press key
combination,brbr \
or hilightEscape/hilight to
abort.)
#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _(Please hold any modifier you
wantbr\
and press any button on your
mouse,bror roll a \
@@ -122,14 +122,14 @@ e_grab_dialog_show(E_Win *parent, Eina_Bool is_mouse,
Ecore_Event_Handler_Cb key
if (is_mouse)
{
eg-dia = e_dialog_new(c, E, _mousebind_getmouse_dialog);
-e_dialog_title_set(eg-dia, _(Mouse Binding Sequence));
+e_dialog_title_set(eg-dia, _(Mouse Binding Combination));
e_dialog_icon_set(eg-dia, preferences-desktop-mouse, 48);
e_dialog_text_set(eg-dia, TEXT_PRESS_MOUSE_BINIDING_SEQUENCE);
}
else
{
eg-dia = e_dialog_new(c, E, _keybind_getkey_dialog);
-e_dialog_title_set(eg-dia, _(Key Binding Sequence));
+e_dialog_title_set(eg-dia, _(Key Binding Combination));
e_dialog_icon_set(eg-dia, preferences-desktop-keyboard-shortcuts,
48);
e_dialog_text_set(eg-dia, TEXT_PRESS_KEY_SEQUENCE);
}
diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c
b/src/modules/conf_bindings/e_int_config_acpibindings.c
index b9479d6..4e69afe 100644
--- a/src/modules/conf_bindings/e_int_config_acpibindings.c
+++ b/src/modules/conf_bindings/e_int_config_acpibindings.c
@@ -68,7 +68,7 @@ e_int_config_acpibindings(E_Comp *comp,
v-basic.apply_cfdata = _basic_apply;
v-basic.create_widgets = _basic_create;
- cfd = e_config_dialog_new(comp, _(ACPI Bindings), E,
+ cfd = e_config_dialog_new(comp, _(ACPI Bindings Settings), E,
advanced/acpi_bindings,
preferences-system-power-management,
0, v, NULL);
diff --git a/src/modules/conf_bindings/e_int_config_keybindings.c
b/src/modules/conf_bindings/e_int_config_keybindings.c
index 2819ede..108f498 100644
--- a/src/modules/conf_bindings/e_int_config_keybindings.c
+++ b/src/modules/conf_bindings/e_int_config_keybindings.c
@@ -1,9 +1,6 @@
#include e.h
#define TEXT_NONE_ACTION_KEY_(None)
-#define TEXT_PRESS_KEY_SEQUENCE _(Please press key sequence,brbr \
- or hilightEscape/hilight to abort.)
-
#define TEXT_NO_PARAMS _(None)
#define TEXT_NO_MODIFIER_HEADER _(Single key)
@@ -977,10 +974,10 @@ _grab_key_down_cb(void *data,
if (actd) label = _(actd-act_name);
e_util_dialog_show(_(Binding Key Error),
-_(The binding key sequence, that you choose,
+_(The binding key combination that you chose
is already used by br
hilight%s/hilight action.br
- Please choose another binding key
sequence.),
+ Please choose another binding key
combination.),
label ? label : _(Unknown));
#endif
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata-gui.o_binding_list), l, it)
--
[EGIT] [core/evas_generic_loaders] master 01/01: Improve LO binary detection
garik pushed a commit to branch master. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=a70e30b6334f9edfe65b445c4b82f0d6ae0a594d commit a70e30b6334f9edfe65b445c4b82f0d6ae0a594d Author: Igor Murzov ga...@efl.so Date: Thu Aug 21 13:41:27 2014 +0400 Improve LO binary detection --- src/bin/pdf/evas_generic_pdf_loader.libreoffice | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/pdf/evas_generic_pdf_loader.libreoffice b/src/bin/pdf/evas_generic_pdf_loader.libreoffice index 1809b1d..b36e11e 100755 --- a/src/bin/pdf/evas_generic_pdf_loader.libreoffice +++ b/src/bin/pdf/evas_generic_pdf_loader.libreoffice @@ -1,2 +1,8 @@ #!/bin/sh -/usr/lib/libreoffice/program/soffice.bin --headless --convert-to pdf --outdir $2 $1 +LOBIN=soffice +if [ -x /usr/lib/libreoffice/program/soffice.bin ]; then + LOBIN=/usr/lib/libreoffice/program/soffice.bin +elif [ -x /usr/lib64/libreoffice/program/soffice.bin ]; then + LOBIN=/usr/lib64/libreoffice/program/soffice.bin +fi +$LOBIN --headless --convert-to pdf --outdir $2 $1 --
[EGIT] [apps/rage] master 01/01: Translate the desktop file to russian
garik pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=143db1387814ffe3eca70c0dc8c0fbb03a527c04 commit 143db1387814ffe3eca70c0dc8c0fbb03a527c04 Author: Igor Murzov ga...@efl.so Date: Wed Aug 20 02:20:23 2014 +0400 Translate the desktop file to russian --- data/desktop/rage.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/desktop/rage.desktop b/data/desktop/rage.desktop index ad0f5f7..5d4470e 100644 --- a/data/desktop/rage.desktop +++ b/data/desktop/rage.desktop @@ -3,7 +3,9 @@ Type=Application Name=Rage GenericName=Video Player +GenericName[ru]=Видеоплеер Comment=Video player +Comment[ru]=Видеоплеер Exec=rage Icon=rage Categories=AudioVideo;Player; --
[EGIT] [tools/enventor] master 01/01: Translate the desktop file to russian
garik pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=ec80a55e79fe9bbb27117ce282ed864813830b7e commit ec80a55e79fe9bbb27117ce282ed864813830b7e Author: Igor Murzov ga...@efl.so Date: Wed Aug 20 02:21:10 2014 +0400 Translate the desktop file to russian --- data/desktop/enventor.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/data/desktop/enventor.desktop b/data/desktop/enventor.desktop index c1baf48..29b120e 100644 --- a/data/desktop/enventor.desktop +++ b/data/desktop/enventor.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Type=Application Name=Enventor Comment=Enlightenment EDC Editor +Comment[ru]=Редактор EDC-файлов Icon=enventor Exec=enventor Terminal=false --
[EGIT] [libs/libeweather] master 01/01: Drop unused .desktop file
garik pushed a commit to branch master. http://git.enlightenment.org/libs/libeweather.git/commit/?id=754806320594b67102cc249c614fe30b5fd88dd4 commit 754806320594b67102cc249c614fe30b5fd88dd4 Author: Igor Murzov ga...@efl.so Date: Wed Aug 20 21:51:08 2014 +0400 Drop unused .desktop file --- module.desktop.in | 22 -- 1 file changed, 22 deletions(-) diff --git a/module.desktop.in b/module.desktop.in deleted file mode 100644 index 4366dcd..000 --- a/module.desktop.in +++ /dev/null @@ -1,22 +0,0 @@ -[Desktop Entry] -Type=Link -Name=Weather -Name[cs]=Počasí -Name[el]=Καιρός -Name[eo]=Vetero -Name[es]=El tiempo -Name[fr]=Météo -Name[gl]=O Tempo -Name[hu]=Időjárás -Name[pt]=Meteorologia -Icon=weather -Comment=titleWeather Gadget/titlebrA weather gadget. -Comment[cs]=titleGadget na počasí/titlebrZobrazí aktuální počasí. -Comment[el]=titleΣυστατικό-Καιρός/titlebrΈνα συστατικό που δείχνει τις καιρικές συνθήκες. -Comment[eo]=titleModulo de vetero/titlebrVidigi veteron. -Comment[es]=titleGadget del Tiempo/titlebrUn gadget para las condiciones metereológicas. -Comment[fr]=titleGadget Météo/titlebrAffiche la météo actuelle. -Comment[gl]=titleGadget do Tempo/titlebrUn gadget para as condicións meteorolóxicas. -Comment[hu]=titleIdőjárás modul/titlebrAz aktuális, helyi időjárást megjelenítő modul. -Comment[it]=titleModulo Weather/titlebrUn modulo per le condizioni meteo. -Comment[pt]=titleGadget meteorológico/titlebrUm gadget meteorológico --
[EGIT] [enlightenment/modules/everything-websearch] master 01/02: Adapt to e18 changes
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/everything-websearch.git/commit/?id=2387d76be123dc6799d3df4b403bed327ee6bb1d
commit 2387d76be123dc6799d3df4b403bed327ee6bb1d
Author: Igor Murzov e-m...@date.by
Date: Sat Jun 22 01:05:33 2013 +0400
Adapt to e18 changes
---
configure.ac | 4 ++--
src/e_mod_main.c | 19 ++-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7d7ae85..cb5dbd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,8 @@ AM_CONDITIONAL([HAVE_PO], [false])
])
AC_SUBST(LTLIBINTL)
-PKG_CHECK_MODULES(E, [enlightenment])
-PKG_CHECK_MODULES(EVRY, [everything, enotify])
+PKG_CHECK_MODULES(E, [enlightenment = 0.17.99])
+PKG_CHECK_MODULES(EVRY, [everything])
PKG_CHECK_MODULES(CURL, [libcurl])
release=$(pkg-config --variable=release enlightenment)
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 82277c4..2aee0fe 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -4,7 +4,6 @@
#include json.h
#include curl/curl.h
-#include E_Notify.h
#define ACT_GOOGLE 1
@@ -172,11 +171,15 @@ static void
_send_notification(unsigned int id, const char *icon, const char *summary,
const char *body, int timeout)
{
- E_Notification *n;
-
- n = e_notification_full_new(Everything, id, icon, summary, body, timeout);
- e_notification_send(n, NULL, NULL);
- e_notification_unref(n);
+ E_Notification_Notify n;
+ memset(n, 0, sizeof(E_Notification_Notify));
+ n.app_name = _(Everything);
+ n.replaces_id = 0; // id
+ n.icon.icon = icon;
+ n.sumary = summary;
+ n.body = body;
+ n.timeout = timeout;
+ e_notification_client_send(n, NULL, NULL);
}
static Url_Data *
@@ -1597,7 +1600,6 @@ e_modapi_init(E_Module *m)
bindtextdomain(PACKAGE, buf);
bind_textdomain_codeset(PACKAGE, UTF-8);
- e_notification_init();
ecore_con_url_init();
_conf_init(m);
@@ -1616,9 +1618,8 @@ EAPI int
e_modapi_shutdown(E_Module *m)
{
EVRY_MODULE_FREE(evry_module);
-
+
_conf_shutdown();
- e_notification_shutdown();
ecore_con_url_shutdown();
/* XXX free download handler */
--
[EGIT] [enlightenment/modules/everything-websearch] master 02/02: Adapt to e19 changes
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/everything-websearch.git/commit/?id=93f60c338aa38911161a7dcd699dca18e3c74d6e
commit 93f60c338aa38911161a7dcd699dca18e3c74d6e
Author: Igor Murzov ga...@efl.so
Date: Mon Aug 11 01:38:18 2014 +0400
Adapt to e19 changes
---
configure.ac | 2 +-
src/e_mod_main.c | 32 ++--
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index cb5dbd5..a5a1555 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AM_CONDITIONAL([HAVE_PO], [false])
])
AC_SUBST(LTLIBINTL)
-PKG_CHECK_MODULES(E, [enlightenment = 0.17.99])
+PKG_CHECK_MODULES(E, [enlightenment = 0.18.99])
PKG_CHECK_MODULES(EVRY, [everything])
PKG_CHECK_MODULES(CURL, [libcurl])
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 2aee0fe..04afc8c 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -176,7 +176,7 @@ _send_notification(unsigned int id, const char *icon, const
char *summary,
n.app_name = _(Everything);
n.replaces_id = 0; // id
n.icon.icon = icon;
- n.sumary = summary;
+ n.summary = summary;
n.body = body;
n.timeout = timeout;
e_notification_client_send(n, NULL, NULL);
@@ -656,8 +656,8 @@ _open_url(const char *url)
{
Evry_Item_App *app = E_NEW(Evry_Item_App, 1);
Evry_Item_File *file = E_NEW(Evry_Item_File, 1);
- Eina_List *l;
- E_Border *bd;
+
+ E_Client *bd;
app-desktop = efreet_util_desktop_exec_find(_conf-browser);
@@ -670,16 +670,20 @@ _open_url(const char *url)
if (app-desktop)
{
- EINA_LIST_FOREACH(e_border_client_list(), l, bd)
- {
-if (bd-desktop bd-desktop == app-desktop)
- {
- e_desk_show(bd-desk);
- e_border_raise(bd);
- break;
- }
- }
- efreet_desktop_free(app-desktop);
+E_Comp *comp;
+const Eina_List *l, *ll;
+EINA_LIST_FOREACH(e_comp_list(), l, comp)
+ EINA_LIST_FOREACH(comp-clients, ll, bd)
+{
+ if (e_client_util_ignored_get(bd)) continue;
+ if (bd-desktop bd-desktop == app-desktop)
+ {
+e_desk_show(bd-desk);
+evas_object_raise(bd-frame);
+break;
+ }
+}
+efreet_desktop_free(app-desktop);
}
E_FREE(file);
@@ -1349,7 +1353,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd,
Evas *evas, E_Config_Dia
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static E_Config_Dialog *
-_conf_dialog(E_Container *con, const char *params)
+_conf_dialog(E_Comp *con, const char *params)
{
E_Config_Dialog *cfd = NULL;
E_Config_Dialog_View *v = NULL;
--
[EGIT] [core/enlightenment] master 01/02: Fix text markup in mouse binding config popup
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=21a7370a4dc2caaf7c218f98b823376f8f4b7fe7 commit 21a7370a4dc2caaf7c218f98b823376f8f4b7fe7 Author: Igor Murzov ga...@efl.so Date: Mon Aug 4 23:24:54 2014 +0400 Fix text markup in mouse binding config popup --- src/bin/e_grab_dialog.c| 8 src/modules/conf_bindings/e_int_config_mousebindings.c | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c index 27a71af..2dfbb8f 100644 --- a/src/bin/e_grab_dialog.c +++ b/src/bin/e_grab_dialog.c @@ -2,10 +2,10 @@ #define TEXT_PRESS_KEY_SEQUENCE_(Please press key sequence,brbr \ or hilightEscape/hilight to abort.) -#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _(Please hold any modifier you wantbr \ - and press any button on your mouse,br or roll a \ - wheel, to assign mouse binding. \ - brPress hilightEscape/highlight to abort.) +#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _(Please hold any modifier you wantbr\ + and press any button on your mouse,bror roll a \ + wheel, to assign mouse binding. \ + brPress hilightEscape/hilight to abort.) static Eina_Bool _e_grab_dialog_key_handler(void *data, int type __UNUSED__, Ecore_Event_Key *ev) diff --git a/src/modules/conf_bindings/e_int_config_mousebindings.c b/src/modules/conf_bindings/e_int_config_mousebindings.c index 8809576..c1f1d96 100644 --- a/src/modules/conf_bindings/e_int_config_mousebindings.c +++ b/src/modules/conf_bindings/e_int_config_mousebindings.c @@ -4,10 +4,10 @@ #define EXAMPLE_STRING example : #define E_BINDING_CONTEXT_NUMBER 10 -#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _(Please hold any modifier you wantbr \ - and press any button on your mouse,br or roll a \ - wheel, to assign mouse binding. \ - brPress hilightEscape/highlight to abort.) +#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _(Please hold any modifier you wantbr\ + and press any button on your mouse,bror roll a \ + wheel, to assign mouse binding. \ + brPress hilightEscape/hilight to abort.) static void*_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); --
[EGIT] [core/enlightenment] master 02/02: syscon: Fix inconsistency between e_config_dialog_new() and _get() params
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=cf37ec604b8a132eaeb9dc5bbda26a71816173d9 commit cf37ec604b8a132eaeb9dc5bbda26a71816173d9 Author: Igor Murzov ga...@efl.so Date: Mon Aug 4 23:29:48 2014 +0400 syscon: Fix inconsistency between e_config_dialog_new() and _get() params --- src/modules/syscon/e_int_config_syscon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/syscon/e_int_config_syscon.c b/src/modules/syscon/e_int_config_syscon.c index 3287b2d..7076b8a 100644 --- a/src/modules/syscon/e_int_config_syscon.c +++ b/src/modules/syscon/e_int_config_syscon.c @@ -31,7 +31,7 @@ e_int_config_syscon(E_Comp *comp, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find(E, windows/conf_syscon)) return NULL; + if (e_config_dialog_find(E, advanced/conf_syscon)) return NULL; v = E_NEW(E_Config_Dialog_View, 1); v-create_cfdata = _create_data; @@ -41,7 +41,7 @@ e_int_config_syscon(E_Comp *comp, const char *params __UNUSED__) v-basic.check_changed = _basic_check_changed; cfd = e_config_dialog_new(comp, _(System Controls Settings), - E, windows/conf_syscon, + E, advanced/conf_syscon, system-shutdown, 0, v, NULL); return cfd; } --
[EGIT] [core/enlightenment] master 01/01: e_icon: Fix typo
garik pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1f6ff4deb73c59cc55c2489f3f3f97fc26ff1cd5
commit 1f6ff4deb73c59cc55c2489f3f3f97fc26ff1cd5
Author: Igor Murzov ga...@efl.so
Date: Tue Aug 5 14:08:47 2014 +0400
e_icon: Fix typo
---
src/bin/e_icon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c
index 5b9c540..ca34794 100644
--- a/src/bin/e_icon.c
+++ b/src/bin/e_icon.c
@@ -739,7 +739,7 @@ _e_icon_smart_reconfigure(E_Smart_Data *sd)
}
else
{
-ih = 0;
+iw = 0;
ih = 0;
evas_object_image_size_get(sd-obj, iw, ih);
if (iw 1) iw = 1;
--
[EGIT] [core/elementary] master 01/01: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2232978c903d9e99a5603d9cc4e65fff485b6e3c commit 2232978c903d9e99a5603d9cc4e65fff485b6e3c Author: Igor Murzov ga...@efl.so Date: Wed Jul 30 01:25:59 2014 +0400 Update russian translation --- data/desktop/elementary_config.desktop | 4 +- data/desktop/elementary_test.desktop | 2 +- po/ru.po | 200 +++-- 3 files changed, 94 insertions(+), 112 deletions(-) diff --git a/data/desktop/elementary_config.desktop b/data/desktop/elementary_config.desktop index 89e9c0d..c5ad420 100644 --- a/data/desktop/elementary_config.desktop +++ b/data/desktop/elementary_config.desktop @@ -10,7 +10,7 @@ Name[gl]=Configure Elementary Name[it]=Configurazione di Elementary Name[ms]=Konfigurasi Elementary Name[pt]=Configure o Elementary -Name[ru]=Конфигурация для Elementary (Элементарий) +Name[ru]=Параметры Elementary Name[sr]=Поставке Еламентарија Name[tr]=Elementary Yapılandırması Comment=Elementary Configuration @@ -22,7 +22,7 @@ Comment[gl]=Configure Elementary Comment[it]=Configurazione di Elementary Comment[ms]=Konfigurasi Elementary Comment[pt]=Configure o Elementary -Comment[ru]=Конфигурация для Elementary (Элементарий) +Comment[ru]=Параметры Elementary Comment[sr]=Поставке Еламентарија Comment[tr]=Elementary Yapılandırması Icon=elementary diff --git a/data/desktop/elementary_test.desktop b/data/desktop/elementary_test.desktop index c1ffc87..48b0887 100644 --- a/data/desktop/elementary_test.desktop +++ b/data/desktop/elementary_test.desktop @@ -15,7 +15,7 @@ Comment[fr]=Programme de tests pour Elementary Comment[gl]=Aplicativo de probas para Elementary Comment[it]=Applicazione di test per Elementary Comment[pt]=Aplicação de testes do Elementary -Comment[ru]=Тестовое приложение Элементария +Comment[ru]=Приложение для тестирования Elementary Icon=elementary Exec=elementary_test Terminal=false diff --git a/po/ru.po b/po/ru.po index d363f13..48a3ad6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,17 +2,17 @@ # Английские переводы для пакета elementary. # Copyright (C) 2012 Enlightenment development team # This file is distributed under the same license as the elementary package. -# Automatically generated, 2012. # Danny Moshnakov d...@agent.co.il, 2012. +# Igor Murzov ga...@efl.so, 2014. # msgid msgstr -Project-Id-Version: elementary 1.7.99.76688\n +Project-Id-Version: elementary 1.11\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2014-07-22 18:31+0900\n -PO-Revision-Date: 2012-09-14 22:20+0300\n -Last-Translator: Danny Moshnakov d...@agent.co.il\n -Language-Team: General\n +POT-Creation-Date: 2014-07-31 19:14+0400\n +PO-Revision-Date: 2014-07-31 19:14+0400\n +Last-Translator: Игорь Мурзов ga...@efl.so\n +Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -20,156 +20,148 @@ msgstr Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n %10=4 (n%10010 || n%100=20) ? 1 : 2);\n -#: src/lib/elc_fileselector.c:1396 +#: src/lib/elc_fileselector.c:1400 msgid Up msgstr Вверх -#: src/lib/elc_fileselector.c:1411 +#: src/lib/elc_fileselector.c:1415 msgid Home msgstr Дом -#: src/lib/elc_fileselector.c:1627 src/lib/elm_entry.c:1481 +#: src/lib/elc_fileselector.c:1631 src/lib/elm_entry.c:1481 #: src/lib/elm_entry.c:1506 msgid Cancel msgstr Отмена -#: src/lib/elc_fileselector.c:1636 +#: src/lib/elc_fileselector.c:1640 msgid OK msgstr ОК #: src/lib/elc_multibuttonentry.c:606 msgid multi button entry label -msgstr +msgstr метка многокопочного элемента #: src/lib/elc_multibuttonentry.c:627 msgid multi button entry item -msgstr +msgstr кнопка многокопочного элемента #: src/lib/elc_multibuttonentry.c:1492 msgid multi button entry -msgstr +msgstr многокнопочный элемент -#: src/lib/elc_naviframe.c:413 +#: src/lib/elc_naviframe.c:435 msgid Title -msgstr +msgstr Заголовок -#: src/lib/elc_naviframe.c:940 src/lib/elc_naviframe.c:1135 +#: src/lib/elc_naviframe.c:962 src/lib/elc_naviframe.c:1160 msgid Back -msgstr +msgstr Назад -#: src/lib/elc_naviframe.c:1216 +#: src/lib/elc_naviframe.c:1251 msgid Next -msgstr +msgstr Вперёд -#: src/lib/elc_popup.c:259 src/lib/elc_popup.c:880 +#: src/lib/elc_popup.c:263 src/lib/elc_popup.c:884 msgid Popup Title -msgstr +msgstr Заголовок всплывающего окна -#: src/lib/elc_popup.c:269 src/lib/elc_popup.c:946 +#: src/lib/elc_popup.c:273 src/lib/elc_popup.c:950 msgid Popup Body Text -msgstr +msgstr Текст всплывающего окна #: src/lib/elm_bubble.c:196 msgid Bubble -msgstr +msgstr Облачко -#: src/lib/elm_button.c:71 +#: src/lib/elm_button.c:72 msgid Clicked msgstr Нажато -#: src/lib/elm_button.c:276 src/lib/elm_check.c:240 src/lib/elm_gengrid.c:723 -#: src/lib/elm_genlist.c:1455 src/lib/elm_list.c:2043 src/lib/elm_radio.c
[EGIT] [core/enlightenment] master 01/01: po/ru.po: Use proper quotes
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bed733d10001070b8c783275c3178d501717d231 commit bed733d10001070b8c783275c3178d501717d231 Author: Igor Murzov ga...@efl.so Date: Sat Jul 26 02:55:42 2014 +0400 po/ru.po: Use proper quotes --- po/ru.po | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9848f3e..1159883 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgstr Project-Id-Version: Enlightenment 0.17\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n POT-Creation-Date: 2014-06-30 17:28+0400\n -PO-Revision-Date: 2014-06-29 03:15+0400\n +PO-Revision-Date: 2014-07-26 13:15+0400\n Last-Translator: Игорь Мурзов e-m...@date.by\n Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n @@ -195,15 +195,15 @@ msgstr Окно : Состояние #: src/bin/e_actions.c:2968 msgid Sticky Mode Toggle -msgstr Переключить \липкий\ режим +msgstr Переключить «липкий» режим #: src/bin/e_actions.c:2972 msgid Sticky Mode Enable -msgstr Включить \липкий\ режим +msgstr Включить «липкий» режим #: src/bin/e_actions.c:2977 msgid Iconic Mode Toggle -msgstr Переключить портретный режим +msgstr Переключить портретный режим #: src/bin/e_actions.c:2981 msgid Iconic Mode Enable @@ -244,15 +244,15 @@ msgstr Увеличить на весь экран #: src/bin/e_actions.c:3011 msgid Maximize Mode \Smart\ -msgstr Режим увеличения \Умный\ +msgstr Режим увеличения «Умный» #: src/bin/e_actions.c:3013 msgid Maximize Mode \Expand\ -msgstr Режим увеличения \Расширить\ +msgstr Режим увеличения «Расширить» #: src/bin/e_actions.c:3015 msgid Maximize Mode \Fill\ -msgstr Режим увеличения \Заполнить\ +msgstr Режим увеличения «Заполнить» #: src/bin/e_actions.c:3022 msgid Shade Up Mode Toggle @@ -280,7 +280,7 @@ msgstr Установить состояние свернуть в заголо #: src/bin/e_actions.c:3035 msgid syntax: \(0|1) (up|down|left|right)\ -msgstr синтаксис: \(0|1) (верх|низ|лево|право)\ +msgstr синтаксис: «(0|1) (верх|низ|лево|право)» #: src/bin/e_actions.c:3039 msgid Toggle Borderless State @@ -650,7 +650,7 @@ msgstr Показать избранное меню #: src/bin/e_actions.c:3305 msgid Show All Applications Menu -msgstr Показать \Все приложения\ +msgstr Показать «Все приложения» #: src/bin/e_actions.c:3307 msgid Show Clients Menu @@ -2188,7 +2188,7 @@ msgstr Липкость #: src/bin/e_int_client_locks.c:319 src/bin/e_int_client_locks.c:338 #: src/bin/e_int_client_remember.c:768 msgid Shaded state -msgstr Состояние \свёрнут в заголовок\ +msgstr Состояние «свёрнут в заголовок» #: src/bin/e_int_client_locks.c:321 src/bin/e_int_client_locks.c:340 msgid Maximized state @@ -2959,7 +2959,7 @@ msgstr ОПАСНО #: src/bin/e_int_config_comp.c:354 msgid Enable advanced compositing features -msgstr Использовать \продвинутые\ композитные эффекты +msgstr Использовать «продвинутые» композитные эффекты #: src/bin/e_int_config_comp.c:357 src/modules/ibar/e_mod_config.c:148 msgid Misc @@ -3004,7 +3004,7 @@ msgstr Отладка #: src/bin/e_int_config_comp.c:566 msgid Enable \fast\ composite effects -msgstr Использовать \быстрые\ композитные эффекты +msgstr Использовать «быстрые» композитные эффекты #: src/bin/e_int_config_comp.c:575 src/modules/wizard/page_150.c:93 msgid Disable composite effects @@ -3907,7 +3907,7 @@ msgstr 800x600+800+0\n \t-profile CONF_PROFILE\n \t\tИспользовать конфигурационный профиль CONF_PROFILE вместо стандартного -\default\.\n +«default».\n \t-good\n \t\tБудь хорошим.\n \t-evil\n @@ -3928,10 +3928,10 @@ msgid and launching any other required services etc.\n before enlightenment itself begins running.\n msgstr -Вы пытаетесь запустить enlightenment напрямую, \n -что не рекомендуется. Пожалуйста, не запускайте \n -бинарный \enlightenment\, используйте \enlightenment_start\. \n -Это позволит произвести все необходимые настройки, \n +Вы пытаетесь запустить enlightenment напрямую,\n +что не рекомендуется. Пожалуйста, не запускайте\n +бинарный «enlightenment», используйте «enlightenment_start».\n +Это позволит произвести все необходимые настройки,\n запустить базовые службы прежде, чем стартует сам\n enlightenment.\n @@ -4225,7 +4225,7 @@ msgid set your shelf tobr\Below Everything\ or disable autohiding. msgstr Автоскрытие полки не будет работать должным образомbrс текущей -конфигурацией; установите уровень полки вbr\Под всем\ или отключите +конфигурацией; установите уровень полки вbr«Под всем» или отключите автоскрытие. #: src/bin/e_shelf.c:972 @@ -5875,7 +5875,7 @@ msgstr Добавить новый профиль #: src/modules/conf_dialogs/e_int_config_profiles.c:335 #, c-format msgid You want to delete the \%s\ profile.brbrAre you sure? -msgstr Вы хотите удалить профиль \%s\.brbrВы уверены? +msgstr Вы хотите удалить профиль «%s».brbrВы уверены? #: src/modules/conf_dialogs/e_int_config_profiles.c:337 msgid
Re: [E-devel] [EGIT] [core/elementary] elementary-1.10 01/01: Win: Delete focused and unfocused signals emission because they duplicate Widgets signals
On Mon, 14 Jul 2014 21:53:11 +0200 Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On Mon, 2014-07-14 at 09:04, Kateryna Fesyna wrote: seoz pushed a commit to branch elementary-1.10. http://git.enlightenment.org/core/elementary.git/commit/?id=b1df32e61c5f2bade4fd8a07c86b620aa010259f commit b1df32e61c5f2bade4fd8a07c86b620aa010259f Author: Kateryna Fesyna k.fes...@samsung.com Date: Mon Jul 14 16:59:48 2014 +0900 Win: Delete focused and unfocused signals emission because they duplicate Widgets signals Summary: focused and unfocused signals are emitted from Win and Widget. This causes signals duplication when window is unfocused. To avoid this duplication, emission of these signals is deleted from the Win. @fix Why is this patch only in the stable branch and not in master? We don't want to diverge from master so ALL patches should go there first. It is in master! -- Igor -- Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [enlightenment/modules/eweather] master 01/01: Adapt to E19 changes
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/eweather.git/commit/?id=9efb4d51644c46c144bbb35ce5c59370e4fc1668
commit 9efb4d51644c46c144bbb35ce5c59370e4fc1668
Author: Igor Murzov ga...@efl.so
Date: Sat Jul 5 04:05:49 2014 +0400
Adapt to E19 changes
---
configure.ac | 4 ++--
src/module/e_mod_config.c | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9506c6b..d416846 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ PKG_PROG_PKG_CONFIG
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_SUBST(dlopen_libs)
-PKG_CHECK_MODULES(E, [enlightenment
+PKG_CHECK_MODULES(E, [enlightenment = 0.18.99
eweather])
release=$(pkg-config --variable=release enlightenment)
MODULE_ARCH=$host_os-$host_cpu-$release
@@ -52,7 +52,7 @@ AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, $MODULE_ARCH, Module architecture)
# Find edje_cc
-PKG_CHECK_MODULES(EDJE, [edje = 0.5.0])
+PKG_CHECK_MODULES(EDJE, [edje = 1.8])
AC_ARG_WITH(edje-cc,
AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc]),
[
diff --git a/src/module/e_mod_config.c b/src/module/e_mod_config.c
index 4f14376..1c553bf 100644
--- a/src/module/e_mod_config.c
+++ b/src/module/e_mod_config.c
@@ -100,7 +100,6 @@ weather_config_dialog(Config_Item *ci)
{
E_Config_Dialog *cfd = NULL;
E_Config_Dialog_View *v = NULL;
-E_Container *con;
char buf[4096];
if (e_config_dialog_find(eweather, extensions/eweather)) return NULL;
@@ -118,8 +117,7 @@ weather_config_dialog(Config_Item *ci)
snprintf(buf, sizeof(buf), %s/eweather.edj, weather_cfg-mod_dir);
/* create new config dialog */
-con = e_container_current_get(e_manager_current_get());
-cfd = e_config_dialog_new(con, D_(EWeather Configuration), eweather,
+cfd = e_config_dialog_new(NULL, D_(EWeather Configuration), eweather,
extensions/eweather, buf, 0, v, ci);
return cfd;
--
[EGIT] [enlightenment/modules/mem] master 01/03: po/ru.po: Convert to UTF-8
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/mem.git/commit/?id=df3ca660127adbdfe8ea74b6007b0d54ebcba45d commit df3ca660127adbdfe8ea74b6007b0d54ebcba45d Author: Igor Murzov ga...@efl.so Date: Fri Jul 4 16:28:05 2014 +0400 po/ru.po: Convert to UTF-8 --- po/ru.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index f4b646e..05fcbbc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,45 +11,45 @@ msgstr Last-Translator: Stanislav Sedov Unknown\n Language-Team: none\n MIME-Version: 1.0\n -Content-Type: text/plain; charset=koi8-r\n +Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n #: ../src/e_mod_config.c:43 msgid Mem Configuration -msgstr � �� mem +msgstr Параметры модуля mem #: ../src/e_mod_config.c:92 msgid General Settings -msgstr � +msgstr Основные параметры #: ../src/e_mod_config.c:94 msgid Always Show Text -msgstr �� �� � ��� +msgstr Всегда отображать текстовые подписи #: ../src/e_mod_config.c:96 msgid Show Text On Mouse Over -msgstr �� � ��� ��� � � +msgstr Отображать текстовые подписи при наведении указателя мыши #: ../src/e_mod_config.c:99 msgid Show Text As Percent -msgstr �� � � +msgstr Отображать значения в процентах #: ../src/e_mod_config.c:104 msgid Ignore Buffers -msgstr �� � ��� +msgstr Игнорировать память в буферах #: ../src/e_mod_config.c:108 msgid Ignore Cached -msgstr �� ��� +msgstr Игнорировать память для кеша #: ../src/e_mod_config.c:112 msgid Check Interval: -msgstr : +msgstr Интервал проверки: #: ../src/e_mod_config.c:115 #, c-format msgid %1.0f seconds -msgstr %1.0f ��(�) +msgstr %1.0f секунд(ы) #: ../src/e_mod_main.c:105 msgid Mem @@ -57,10 +57,10 @@ msgstr Mem #: ../src/e_mod_main.c:162 msgid Configuration -msgstr � +msgstr Настройка #~ msgid Enlightenment Mem Monitor Module -#~ msgstr �� �� ��� +#~ msgstr Модуль слежения за памятью #~ msgid This module is used to monitor memory. -#~ msgstr �� ��� �� �� ��. +#~ msgstr Этот модуль используется для слежения за состоянием памяти. --
[EGIT] [enlightenment/modules/mem] master 03/03: Revert updating desktop files
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/mem.git/commit/?id=299613e094ad3a6efb59b1623e058a66e3a88c71 commit 299613e094ad3a6efb59b1623e058a66e3a88c71 Author: Igor Murzov ga...@efl.so Date: Sat Jul 5 14:19:24 2014 +0400 Revert updating desktop files This reverts commit 72dac3e1cf92afcb99f4df74c8bab38f1c626357. --- module.desktop.in | 12 1 file changed, 12 deletions(-) diff --git a/module.desktop.in b/module.desktop.in index 6adc5f8..eb3ebd5 100644 --- a/module.desktop.in +++ b/module.desktop.in @@ -2,24 +2,12 @@ Encoding=UTF-8 Type=Link Name=Mem -Name[Name]=Mem -Name[ab]= -Name[ca]= -Name[cs]= -Name[de]= Name[el]=Μνήμη Name[eo]=Memoro -Name[es]= Name[fr]=Mémoire -Name[gl]= Name[hu]=Memória -Name[it]= -Name[ja]= -Name[ko]= Name[pt]=Memória Name[ru]=Память -Name[sr]= -Name[tr]= Comment=Used to monitor memory utilization. Comment[cs]=Zobrazí využití paměti. Comment[el]=Χρησιμοποιείται για την παρατήρηση της μνήμης. --
[EGIT] [enlightenment/modules/mem] master 02/03: Add .gitignore
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/mem.git/commit/?id=41bf331e6441156f8f9f84a8cee66655a0f96e41 commit 41bf331e6441156f8f9f84a8cee66655a0f96e41 Author: Igor Murzov ga...@efl.so Date: Sat Jul 5 14:10:34 2014 +0400 Add .gitignore --- .gitignore | 47 +++ 1 file changed, 47 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..f9399ff --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +*~ +*.o +*.lo +*.la +ABOUT-NLS +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +config.guess +config.h +config.h.in +config.log +config.rpath +config.status +config.sub +configure +depcomp +e-module-mem.edj +e_modules-mem.spec +install-sh +libtool +ltmain.sh +m4/*.m4 +mem.edj +missing +mkinstalldirs +module.desktop +po/*.gmo +po/Makefile +po/Makefile.in +po/Makefile.in.in +po/Makevars.template +po/POTFILES +po/Rules-quot +po/boldquot.sed +po/en@boldquot.header +po/en@quot.header +po/insert-header.sin +po/mem.pot +po/quot.sed +po/remove-potcdate.sed +po/remove-potcdate.sin +po/stamp-po +src/.deps/ +src/.libs/ +stamp-h1 --
[EGIT] [enlightenment/modules/places] master 02/04: Make size units translatable
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=a2b248521965e10014c344a62c5bd77c96054945
commit a2b248521965e10014c344a62c5bd77c96054945
Author: Igor Murzov ga...@efl.so
Date: Fri Jul 4 02:12:40 2014 +0400
Make size units translatable
---
po/POTFILES.in| 1 +
src/e_mod_main.h | 1 +
src/e_mod_places.c| 12 ++--
src/e_mod_udisks_eldbus.c | 3 ++-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 905efda..5cc1a9b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,3 +2,4 @@ src/e_mod_config.c
src/e_mod_main.c
src/e_mod_main.h
src/e_mod_places.c
+src/e_mod_udisks_eldbus.c
diff --git a/src/e_mod_main.h b/src/e_mod_main.h
index b78b560..8720d8e 100644
--- a/src/e_mod_main.h
+++ b/src/e_mod_main.h
@@ -9,6 +9,7 @@
# define bind_textdomain_codeset(domain,codeset)
# define D_(string) (string)
#endif
+#define N_(string) (string)
/* Macros used for config file versioning */
#define MOD_CONFIG_FILE_EPOCH 0x0001
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index d186d32..cba6dc2 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -596,30 +596,30 @@ _places_human_size_get(unsigned long long size)
dsize = (double)size;
if (dsize 1024)
- snprintf(hum, sizeof(hum), %.0fb, dsize);
+ snprintf(hum, sizeof(hum), %.0f%s, dsize, D_(b));
else
{
dsize /= 1024.0;
if (dsize 1024)
- suffix = KB;
+ suffix = N_(KB);
else
{
dsize /= 1024.0;
if (dsize 1024)
- suffix = MB;
+ suffix = N_(MB);
else
{
dsize /= 1024.0;
if(dsize 1024)
-suffix = GB;
+suffix = N_(GB);
else
{
dsize /= 1024.0;
- suffix = TB;
+ suffix = N_(TB);
}
}
}
-snprintf(hum, sizeof(hum), %.1f%s, dsize, suffix);
+snprintf(hum, sizeof(hum), %.1f%s, dsize, D_(suffix));
}
return eina_stringshare_add(hum);
diff --git a/src/e_mod_udisks_eldbus.c b/src/e_mod_udisks_eldbus.c
index 8dfdd9e..98c7de4 100644
--- a/src/e_mod_udisks_eldbus.c
+++ b/src/e_mod_udisks_eldbus.c
@@ -7,6 +7,7 @@
#include Eldbus.h
#include e.h
+#include e_mod_main.h
#include e_mod_places.h
@@ -338,7 +339,7 @@ _places_udisks_volume_task_cb(void *data, const
Eldbus_Message *msg,
if (eldbus_message_error_get(msg, NULL, NULL))
{
eldbus_message_arguments_get(msg,s, str);
- e_util_dialog_internal(Operation failed, str);
+ e_util_dialog_internal(D_(Operation failed), str);
}
}
--
[EGIT] [enlightenment/modules/places] master 01/04: Display sizes = 1TB in terse format as well.
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=701f72dae290f5feabf86590634f050fb89d1427
commit 701f72dae290f5feabf86590634f050fb89d1427
Author: Igor Murzov ga...@efl.so
Date: Fri Jul 4 02:07:22 2014 +0400
Display sizes = 1TB in terse format as well.
---
src/e_mod_places.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index 7891e98..d186d32 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -610,7 +610,13 @@ _places_human_size_get(unsigned long long size)
else
{
dsize /= 1024.0;
- suffix = GB;
+ if(dsize 1024)
+suffix = GB;
+ else
+{
+ dsize /= 1024.0;
+ suffix = TB;
+}
}
}
snprintf(hum, sizeof(hum), %.1f%s, dsize, suffix);
--
[EGIT] [enlightenment/modules/places] master 04/04: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=818c460775fc326696205d7d55616fb58c4010aa commit 818c460775fc326696205d7d55616fb58c4010aa Author: Igor Murzov ga...@efl.so Date: Fri Jul 4 02:55:37 2014 +0400 Update russian translation --- po/ru.po | 88 ++-- 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/po/ru.po b/po/ru.po index 15d464d..4bcf48a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,78 +3,82 @@ # This file is distributed under the same license as the enlightenment package. # Serguey G Basalaev sbasal...@gmail.com, 2009. # Black Raven, 2009. -# Igor Murzov e-m...@date.by, 2012, 2013. +# Igor Murzov ga...@efl.so, 2012-2014. # msgid msgstr Project-Id-Version: enlightenment\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2013-01-08 02:30+0400\n -PO-Revision-Date: 2013-01-08 02:39+0400\n -Last-Translator: Igor Murzov e-m...@date.by\n +POT-Creation-Date: 2014-07-04 01:32+0400\n +PO-Revision-Date: 2014-07-04 01:39+0400\n +Last-Translator: Игорь Мурзов ga...@efl.so\n Language-Team: Russian r...@li.org\n Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: src/e_mod_config.c:54 +#: src/e_mod_config.c:55 msgid Places Settings msgstr Настройка Мест -#: src/e_mod_config.c:136 +#: src/e_mod_config.c:138 msgid General msgstr Общее -#: src/e_mod_config.c:139 +#: src/e_mod_config.c:141 msgid Show in main menu msgstr Показывать в главном меню -#: src/e_mod_config.c:143 +#: src/e_mod_config.c:145 msgid Hide the gadget header msgstr Скрыть заголовок гаджета -#: src/e_mod_config.c:147 +#: src/e_mod_config.c:149 +msgid Auto close the popup +msgstr Автоматически закрывать всплывающее окно + +#: src/e_mod_config.c:153 msgid Mount volumes at boot msgstr Монтировать тома при старте системы -#: src/e_mod_config.c:151 +#: src/e_mod_config.c:157 msgid Mount volumes on insert msgstr Монтировать тома при подключении -#: src/e_mod_config.c:155 +#: src/e_mod_config.c:161 msgid Open filemanager on insert msgstr Открыть файловый менеджер при подключении -#: src/e_mod_config.c:162 +#: src/e_mod_config.c:168 msgid Use a custom file manager msgstr Использовать пользовательский файловый менеджер -#: src/e_mod_config.c:175 +#: src/e_mod_config.c:181 msgid Show in menu msgstr Показывать в меню -#: src/e_mod_config.c:178 src/e_mod_places.c:774 +#: src/e_mod_config.c:184 src/e_mod_places.c:800 msgid Home msgstr Домашний каталог -#: src/e_mod_config.c:181 src/e_mod_places.c:783 +#: src/e_mod_config.c:187 src/e_mod_places.c:809 msgid Desktop msgstr Рабочий стол -#: src/e_mod_config.c:184 src/e_mod_places.c:793 +#: src/e_mod_config.c:190 src/e_mod_places.c:818 msgid Trash msgstr Корзина -#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 +#: src/e_mod_config.c:193 src/e_mod_places.c:649 src/e_mod_places.c:827 msgid Filesystem msgstr Файловая система -#: src/e_mod_config.c:190 src/e_mod_places.c:811 +#: src/e_mod_config.c:196 src/e_mod_places.c:836 msgid Temp msgstr Временные файлы -#: src/e_mod_config.c:193 +#: src/e_mod_config.c:199 msgid Favorites msgstr Избранное @@ -82,24 +86,24 @@ msgstr Избранное msgid Files msgstr Файлы -#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 -#: src/e_mod_places.c:868 +#: src/e_mod_main.c:61 src/e_mod_main.c:315 src/e_mod_places.c:265 +#: src/e_mod_places.c:893 msgid Places msgstr Места -#: src/e_mod_main.c:394 +#: src/e_mod_main.c:412 msgid Places Configuration Updated msgstr Настройки Мест обновлены -#: src/e_mod_main.c:434 +#: src/e_mod_main.c:534 msgid Settings msgstr Настройки -#: src/e_mod_places.c:599 +#: src/e_mod_places.c:497 msgid Warning msgstr Предупреждение -#: src/e_mod_places.c:600 +#: src/e_mod_places.c:498 msgid bCannot run the Enlightenment FileManager./bbrPlease choose a custom file manager inbrthe gadget configuration. @@ -107,23 +111,47 @@ msgstr bНе удалось запустить EFM./bbrПожалуйста, выберите другой файловый менеджерbrв настройках гаджета. -#: src/e_mod_places.c:622 +#: src/e_mod_places.c:599 +msgid b +msgstr Б + +#: src/e_mod_places.c:604 +msgid KB +msgstr КБ + +#: src/e_mod_places.c:609 +msgid MB +msgstr МБ + +#: src/e_mod_places.c:614 +msgid GB +msgstr ГБ + +#: src/e_mod_places.c:618 +msgid TB +msgstr ТБ + +#: src/e_mod_places.c:653 msgid No Name msgstr Без имени -#: src/e_mod_places.c:629 +#: src/e_mod_places.c:660 msgid free of msgstr свободно из -#: src/e_mod_places.c:635 +#: src/e_mod_places.c:666 #, c-format msgid %s Not Mounted msgstr %s Не подключен -#: src/e_mod_places.c:662 +#: src/e_mod_places.c:693 msgid unmount msgstr отключить -#: src/e_mod_places.c:667 +#: src/e_mod_places.c:698 msgid eject msgstr извлечь + +#: src/e_mod_udisks_eldbus.c:342 +msgid Operation
[EGIT] [enlightenment/modules/places] master 03/04: Restore french translation that was lost in 45eaf4422d
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=160db1e6803472735ba01b8d52a75061a5952633 commit 160db1e6803472735ba01b8d52a75061a5952633 Author: Igor Murzov ga...@efl.so Date: Fri Jul 4 02:38:45 2014 +0400 Restore french translation that was lost in 45eaf4422d This partially reverts commit 45eaf4422d --- po/fr.po | 58 ++ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/po/fr.po b/po/fr.po index eb01bf9..b5552c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,15 +7,15 @@ msgid msgstr Project-Id-Version: Places module\n Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n -POT-Creation-Date: 2013-06-21 01:05+0200\n -PO-Revision-Date: 2013-06-20 06:58+\n -Last-Translator: Eliovir Unknown\n +POT-Creation-Date: 2013-05-22 20:28+0200\n +PO-Revision-Date: 2012-12-21 19:41+\n +Last-Translator: batden dazi...@sfr.fr\n Language-Team: Enlightenment French Team sansgou...@gmail.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2013-06-22 05:38+\n -X-Generator: Launchpad (build 16677)\n +X-Launchpad-Export-Date: 2013-05-23 05:28+\n +X-Generator: Launchpad (build 16640)\n X-Poedit-Country: FRANCE\n Language: \n X-Poedit-Language: French\n @@ -23,19 +23,19 @@ msgstr #: src/e_mod_config.c:55 msgid Places Settings -msgstr +msgstr Paramétrage de Raccourcis #: src/e_mod_config.c:138 msgid General -msgstr +msgstr Paramètres généraux #: src/e_mod_config.c:141 msgid Show in main menu -msgstr +msgstr Afficher dans le menu principal #: src/e_mod_config.c:145 msgid Hide the gadget header -msgstr +msgstr Masquer l'en-tête du gadget #: src/e_mod_config.c:149 msgid Auto close the popup @@ -47,56 +47,56 @@ msgstr #: src/e_mod_config.c:157 msgid Mount volumes on insert -msgstr +msgstr Montage des volumes à l'insertion #: src/e_mod_config.c:161 msgid Open filemanager on insert -msgstr +msgstr Ouvrir le gestionnaire de fichiers à l'insertion #: src/e_mod_config.c:168 msgid Use a custom file manager -msgstr +msgstr Utiliser un gestionnaire de fichiers personnalisé #: src/e_mod_config.c:181 msgid Show in menu -msgstr +msgstr Afficher dans le menu #: src/e_mod_config.c:184 src/e_mod_places.c:803 msgid Home -msgstr +msgstr Dossier personnel #: src/e_mod_config.c:187 src/e_mod_places.c:812 msgid Desktop -msgstr +msgstr Bureau #: src/e_mod_config.c:190 src/e_mod_places.c:821 msgid Trash -msgstr +msgstr Corbeille #: src/e_mod_config.c:193 src/e_mod_places.c:652 src/e_mod_places.c:830 msgid Filesystem -msgstr +msgstr Racine #: src/e_mod_config.c:196 src/e_mod_places.c:839 msgid Temp -msgstr +msgstr /tmp #: src/e_mod_config.c:199 msgid Favorites -msgstr +msgstr Favoris #: src/e_mod_main.c:59 msgid Files -msgstr +msgstr Fichiers #: src/e_mod_main.c:61 src/e_mod_main.c:329 src/e_mod_places.c:274 #: src/e_mod_places.c:896 msgid Places -msgstr +msgstr Raccourcis #: src/e_mod_main.c:426 msgid Places Configuration Updated -msgstr +msgstr Configuration de Raccourcis actualisée #: src/e_mod_main.c:542 msgid Settings @@ -104,31 +104,33 @@ msgstr Configuration #: src/e_mod_places.c:506 msgid Warning -msgstr +msgstr Avertissement #: src/e_mod_places.c:507 msgid bCannot run the Enlightenment FileManager./bbrPlease choose a custom file manager inbrthe gadget configuration. msgstr +bImpossible d'exécuter EFM./bbrVeuillez choisir un gestionnaire de +fichiersbrpersonnalisé dans la configuration du gadget. #: src/e_mod_places.c:656 msgid No Name -msgstr +msgstr Sans nom #: src/e_mod_places.c:663 msgid free of -msgstr +msgstr de libre sur #: src/e_mod_places.c:669 #, c-format msgid %s Not Mounted -msgstr +msgstr %s Pas Monté #: src/e_mod_places.c:696 msgid unmount -msgstr +msgstr démonter #: src/e_mod_places.c:701 msgid eject -msgstr +msgstr éjecter --
[EGIT] [admin/devs] master 01/01: garik: Update e-mail
garik pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=2a4312d9ed3a7ad6ce9f64c19685698b7a398697 commit 2a4312d9ed3a7ad6ce9f64c19685698b7a398697 Author: Igor Murzov e-m...@date.by Date: Tue Jul 1 13:16:52 2014 +0400 garik: Update e-mail --- developers/garik/info.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developers/garik/info.txt b/developers/garik/info.txt index dbb7191..0788bd2 100644 --- a/developers/garik/info.txt +++ b/developers/garik/info.txt @@ -2,7 +2,7 @@ Login: garik IRC Nick: GArik Name: Igor Murzov Location: Tver, Russia -E-Mail: e-m...@date.by -Managing: webp loader for evas (?) +E-Mail: i.mur...@yandex.ru +Managing: webp loader for evas Contributing: gettext-related stuff Platform: Slackware --
[EGIT] [core/enlightenment] master 02/02: Properly use gettext for plural forms
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=af50cdc7e10e4fc8225c54049a2586692de610bd commit af50cdc7e10e4fc8225c54049a2586692de610bd Author: Igor Murzov e-m...@date.by Date: Mon Jun 30 03:44:07 2014 +0400 Properly use gettext for plural forms --- src/modules/packagekit/e_mod_packagekit.c | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/packagekit/e_mod_packagekit.c b/src/modules/packagekit/e_mod_packagekit.c index 11685d3..aa07844 100644 --- a/src/modules/packagekit/e_mod_packagekit.c +++ b/src/modules/packagekit/e_mod_packagekit.c @@ -152,12 +152,10 @@ packagekit_popup_update(E_PackageKit_Instance *inst) } } - if (num_updates == 1) - snprintf(buf, sizeof(buf), %s, _(One update available)); - else if (num_updates 1) - snprintf(buf, sizeof(buf), _(%d updates available), num_updates); + if (num_updates = 1) + snprintf(buf, sizeof(buf), P_(One update available, %d updates available, num_updates), num_updates); else - snprintf(buf, sizeof(buf), %s, _(Your system is updated)); + snprintf(buf, sizeof(buf), _(Your system is updated)); e_widget_label_text_set(inst-popup_label, buf); } --
[EGIT] [core/enlightenment] master 01/02: Add some more messages to the pot file
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e624345d3de20efa7cbd0ff2504f037ab84311f8 commit e624345d3de20efa7cbd0ff2504f037ab84311f8 Author: Igor Murzov e-m...@date.by Date: Mon Jun 30 03:41:50 2014 +0400 Add some more messages to the pot file --- po/POTFILES.in | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index f399035..b6b9394 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,6 +11,7 @@ src/bin/e_color.c src/bin/e_color_class.c src/bin/e_color_dialog.c src/bin/e_comp.c +src/bin/e_comp_x.c src/bin/e_config.c src/bin/e_config_dialog.c src/bin/e_configure.c @@ -50,11 +51,11 @@ src/bin/e_int_client_locks.c src/bin/e_int_client_menu.c src/bin/e_int_client_prop.c src/bin/e_int_client_remember.c +src/bin/e_int_config_comp.c +src/bin/e_int_config_comp_match.c src/bin/e_int_config_modules.c src/bin/e_int_gadcon_config.c src/bin/e_int_menus.c -src/bin/e_int_config_comp.c -src/bin/e_int_config_comp_match.c src/bin/e_int_shelf_config.c src/bin/e_int_toolbar_config.c src/bin/e_intl.c @@ -208,8 +209,8 @@ src/modules/conf_window_remembers/e_mod_main.c src/modules/connman/agent.c src/modules/connman/e_mod_config.c src/modules/connman/e_mod_main.c -src/modules/cpufreq/e_mod_main.c src/modules/cpufreq/e_mod_config.c +src/modules/cpufreq/e_mod_main.c src/modules/cpufreq/freqset.c src/modules/everything/e_mod_main.c src/modules/everything/evry.c @@ -257,6 +258,7 @@ src/modules/music-control/e_mod_main.c src/modules/music-control/ui.c src/modules/notification/e_mod_config.c src/modules/notification/e_mod_main.c +src/modules/packagekit/e_mod_config.c src/modules/packagekit/e_mod_main.c src/modules/packagekit/e_mod_packagekit.c src/modules/pager/e_mod_config.c --
Re: [E-devel] mem module
On Wed, 02 Apr 2014 22:28:59 +0200 Massimo Maiurana maiur...@gmail.com wrote: Hi, perhaps the mem module is the only monitoring module still left in legacy subversion. As Wido sent a patch for it in the users mailing list, can someone put it in enlightenment/core/modules so I can commit the patch? The module has been ported to git now. -- Igor -- HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions Find What Matters Most in Your Big Data with HPCC Systems Open Source. Fast. Scalable. Simple. Ideal for Dirty Data. Leverages Graph Analysis for Fast Processing Easy Data Exploration http://p.sf.net/sfu/hpccsystems ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[Bash-completion-commits] [bash-completion] branch master updated (9d250f9 - afe39fd)
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a change to branch master
in repository bash-completion.
from 9d250f9 isql: Fix failglob failure
new afe39fd Added test/site.{bak,exp} to .gitignore
The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails. The revisions
listed as adds were already present in the repository and have only
been added to this reference.
Summary of changes:
test/.gitignore | 2 ++
1 file changed, 2 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 01/01: Added test/site.{bak, exp} to .gitignore
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit afe39fd1e171d0ea3d4fb8ec0d8c8c14fa120ed8
Author: Damien Nadé ali...@livna.org
Date: Tue Jun 10 13:12:51 2014 +0200
Added test/site.{bak,exp} to .gitignore
---
test/.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/.gitignore b/test/.gitignore
index 0a099fd..2ea9dc1 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,2 +1,4 @@
dbg.log
xtrace.log
+site.exp
+site.bak
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] branch master updated (c6ec8f9 - 9d250f9)
This is an automated email from the git hooks/post-receive script. garik-guest pushed a change to branch master in repository bash-completion. from c6ec8f9 modprobe: Try parsing help before using hardcoding option list new 60b8fab ssh-add, ssh-keygen: -? needs to be quoted under failglob (take 2) (Alioth: #314709) new 9d250f9 isql: Fix failglob failure The 2 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: completions/isql | 2 +- completions/ssh-add| 2 +- completions/ssh-keygen | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git ___ Bash-completion-commits mailing list Bash-completion-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 01/02: ssh-add, ssh-keygen: -? needs to be quoted under failglob (take 2) (Alioth: #314709)
This is an automated email from the git hooks/post-receive script. garik-guest pushed a commit to branch master in repository bash-completion. commit 60b8fabec499dbd56636548369ff3796e0d0d0fd Author: Igor Murzov e-m...@date.by Date: Tue Jun 10 02:33:54 2014 +0400 ssh-add, ssh-keygen: -? needs to be quoted under failglob (take 2) (Alioth: #314709) --- completions/ssh-add| 2 +- completions/ssh-keygen | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/completions/ssh-add b/completions/ssh-add index 55818e0..a994baf 100644 --- a/completions/ssh-add +++ b/completions/ssh-add @@ -12,7 +12,7 @@ _ssh_add() esac if [[ $cur == -* ]]; then -COMPREPLY=( $( compgen -W '$( _parse_help $1 -? )' -- $cur ) ) +COMPREPLY=( $( compgen -W '$( _parse_help $1 -\? )' -- $cur ) ) return fi diff --git a/completions/ssh-keygen b/completions/ssh-keygen index 3e94ded..69776f7 100644 --- a/completions/ssh-keygen +++ b/completions/ssh-keygen @@ -40,7 +40,7 @@ _ssh_keygen() esac if [[ $cur == -* ]]; then -COMPREPLY=( $( compgen -W '$( _parse_help $1 -? )' -- $cur ) ) +COMPREPLY=( $( compgen -W '$( _parse_help $1 -\? )' -- $cur ) ) fi } complete -F _ssh_keygen ssh-keygen -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git ___ Bash-completion-commits mailing list Bash-completion-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 02/02: isql: Fix failglob failure
This is an automated email from the git hooks/post-receive script. garik-guest pushed a commit to branch master in repository bash-completion. commit 9d250f9b53a58c70c7a388e5d2272d8a384d6eb1 Author: Igor Murzov e-m...@date.by Date: Tue Jun 10 02:35:31 2014 +0400 isql: Fix failglob failure --- completions/isql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/completions/isql b/completions/isql index 43cd6dd..9ec9f16 100644 --- a/completions/isql +++ b/completions/isql @@ -7,7 +7,7 @@ _isql() _init_completion || return [[ -f $ODBCINI ]] \ - COMPREPLY=( $( command grep \\[$cur $ODBCINI | tr -d \\[\\] ) ) + COMPREPLY=( $( command grep \[$cur $ODBCINI | tr -d \[\] ) ) } complete -F _isql isql -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git ___ Bash-completion-commits mailing list Bash-completion-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 02/03: (testsuite): move testing of _linux_fstab() to umount.exp
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit dcb0ea2ca29cf2c335f1b075f51290d023fcda2e
Author: Igor Murzov e-m...@date.by
Date: Mon Jun 9 01:34:28 2014 +0400
(testsuite): move testing of _linux_fstab() to umount.exp
The function is only used for umount completion.
---
test/lib/completions/mount.exp | 81
test/lib/completions/umount.exp | 83 -
2 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/test/lib/completions/mount.exp b/test/lib/completions/mount.exp
index 1298f36..fea99b8 100644
--- a/test/lib/completions/mount.exp
+++ b/test/lib/completions/mount.exp
@@ -1,35 +1,9 @@
-# mount completion from fstab can't be tested directly because it
-# (correctly) uses absolute paths. So we create a custom completion which
-# reads from a file in our text fixture instead.
-proc setup_dummy_mnt {} {
-assert_bash_exec {unset COMPREPLY cur}
-assert_bash_exec {unset -f _mnt}
-
-assert_bash_exec { \
-_mnt() { \
-local cur=$(_get_cword); \
-_linux_fstab $(_get_pword)
$SRCDIRABS/fixtures/mount/test-fstab; \
-}; \
-complete -F _mnt mnt \
-}
-}
-
-
-proc teardown_dummy_mnt {} {
-assert_bash_exec {unset COMPREPLY cur}
-assert_bash_exec {unset -f _mnt}
-assert_bash_exec {complete -r mnt}
-}
-
-
proc setup {} {
save_env
-setup_dummy_mnt
}
proc teardown {} {
-teardown_dummy_mnt
assert_env_unmodified {/OLDPWD/d}
}
@@ -69,59 +43,4 @@ assert_bash_exec {PATH=$OLDPATH; unset -v OLDPATH}
sync_after_int
-set test Testing internal __linux_fstab_unescape function for mount
-# One round of slashes is for bash.
-assert_bash_exec {var=one\'two\\040three\\}
-assert_bash_exec {__linux_fstab_unescape var}
-set cmd {echo $var}
-send $cmd\r
-expect {
--ex $cmd\r\none'two three\\ { pass $test }
-#default { fail $test }
-}
-sync_after_int
-assert_bash_exec {unset var}
-
-
-sync_after_int
-
-
-# Begin testing through mnt (see setup_dummy_mnt).
-assert_complete {/mnt/nice-test-path} {mnt /mnt/nice-test-p}
-sync_after_int
-
-assert_complete {/mnt/nice\ test-path} {mnt /mnt/nice\ test-p}
-sync_after_int
-
-assert_complete {/mnt/nice\$test-path} {mnt /mnt/nice\$test-p}
-sync_after_int
-
-assert_complete {/mnt/nice\ test\\path} {mnt /mnt/nice\ test\\p}
-sync_after_int
-
-assert_complete {{/mnt/nice\ test\\path} {/mnt/nice\ test-path}} \
-{mnt /mnt/nice\ } -expect-cmd-minus {/mnt/nice\ }
-sync_after_int
-
-assert_complete {/mnt/nice\$test-path} {mnt /mnt/nice\$}
-sync_after_int
-
-assert_complete {/mnt/nice\'test-path} {mnt /mnt/nice\'}
-sync_after_int
-
-assert_complete {/mnt/other\'test\ path} {mnt /mnt/other}
-sync_after_int
-
-assert_complete {Ubuntu\ Karmic} {mnt -L Ubu}
-sync_after_int
-
-assert_complete {Debian-it\'s\ awesome} {mnt -L Deb}
-sync_after_int
-
-# This does not work. Proper support for this requires smarter parsing of
-# $COMP_LINE and it's not worth doing just for mount.
-#assert_complete {$'/mnt/nice\ntest-path'} {mnt $'/mnt/nice\n}
-#sync_after_int
-
-
teardown
diff --git a/test/lib/completions/umount.exp b/test/lib/completions/umount.exp
index 21a2dfa..e7703d1 100644
--- a/test/lib/completions/umount.exp
+++ b/test/lib/completions/umount.exp
@@ -1,10 +1,36 @@
+# umount completion from fstab can't be tested directly because it
+# (correctly) uses absolute paths. So we create a custom completion which
+# reads from a file in our text fixture instead.
+proc setup_dummy_mnt {} {
+assert_bash_exec {unset COMPREPLY cur}
+assert_bash_exec {unset -f _mnt}
+
+assert_bash_exec { \
+_mnt() { \
+local cur=$(_get_cword); \
+_linux_fstab $(_get_pword)
$SRCDIRABS/fixtures/mount/test-fstab; \
+}; \
+complete -F _mnt mnt \
+}
+}
+
+
+proc teardown_dummy_mnt {} {
+assert_bash_exec {unset COMPREPLY cur}
+assert_bash_exec {unset -f _mnt}
+assert_bash_exec {complete -r mnt}
+}
+
+
proc setup {} {
save_env
+setup_dummy_mnt
}
proc teardown {} {
-assert_env_unmodified
+teardown_dummy_mnt
+assert_env_unmodified {/OLDPWD/d}
}
@@ -17,4 +43,59 @@ assert_complete_any umount
sync_after_int
+set test Testing internal __linux_fstab_unescape function for umount
+# One round of slashes is for bash.
+assert_bash_exec {var=one\'two\\040three\\}
+assert_bash_exec {__linux_fstab_unescape var}
+set cmd {echo $var}
+send $cmd\r
+expect {
+-ex $cmd\r\none'two three\\ { pass $test }
+#default { fail $test }
+}
+sync_after_int
+assert_bash_exec {unset var}
+
+
+sync_after_int
+
+
+# Begin testing through mnt (see setup_dummy_mnt).
+assert_complete {/mnt/nice-test-path} {mnt /mnt/nice-test-p}
+sync_after_int
+
+assert_complete {/mnt/nice\ test-path} {mnt /mnt/nice\ test-p}
+sync_after_int
+
+assert_complete
[Bash-completion-commits] [bash-completion] 03/03: _parse_help: Fix failglob failures (Alioth: #314707)
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit d238ab5445627b6fd9888507d1b7545bb20408a7
Author: Damien Nadé ali...@livna.org
Date: Mon Jun 2 20:12:00 2014 +0200
_parse_help: Fix failglob failures (Alioth: #314707)
---
bash_completion | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/bash_completion b/bash_completion
index dc62ec4..59b4908 100644
--- a/bash_completion
+++ b/bash_completion
@@ -742,8 +742,10 @@ __parse_options()
# Take first found long option, or first one (short) if not found.
option=
-for i in $1; do
-case $i in
+local -a array
+read -a array $1
+for i in ${array[@]}; do
+case $i in
---*) break ;;
--?*) option=$i ; break ;;
-?*) [[ $option ]] || option=$i ;;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 01/03: umount: Fix mount points escaping/unescaping with Bash-4.3
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 292830be53f69456d284c10dc5fea28dd393d7bc
Author: Igor Murzov e-m...@date.by
Date: Mon Jun 9 00:59:13 2014 +0400
umount: Fix mount points escaping/unescaping with Bash-4.3
---
completions/umount.linux | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/completions/umount.linux b/completions/umount.linux
index d66c99f..6b27556 100644
--- a/completions/umount.linux
+++ b/completions/umount.linux
@@ -18,8 +18,8 @@ _reply_compgen_array()
# We also have to add another round of escaping to $cur.
local ecur=$cur
-ecur=${ecur//\\/}
-ecur=${ecur//\'/\'}
+ecur=${ecur//\\/}
+ecur=${ecur//\'/\\\'}
# Actually generate completions.
local oldifs=$IFS
@@ -29,7 +29,7 @@ _reply_compgen_array()
# Unescape strings in the linux fstab(5) format (with octal escapes).
__linux_fstab_unescape() {
-eval $1='${!1//\'/\047}'
+eval $1='${!1//\'/\\047}'
eval $1='${!1/%\\/}'
eval $1=$'${!1}'
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
Re: [Bash-completion-devel] How to build the autocompletion from git repo?
On Tue, 3 Jun 2014 13:03:50 +0300 Ville Skyttä ville.sky...@iki.fi wrote: On Tue, Jun 3, 2014 at 1:49 AM, Igor Murzov intergalactic.anonym...@gmail.com wrote: On Wed, 2 Apr 2014 17:07:34 +0300 autoreconf -i is a good first try with just about any project using autotools. Not everyone knows how to use autotools, so I would agree that having autogen.sh is a good idea, even if it contains only one line :) I have no idea why someone who doesn't know autotools or what (s)he's doing after cloning a standardly set up repository for an open source project would know what to do when finding a script by that name, or why he would look for a script in the first place. Some kind of a short mention in README's INSTALLATION section would sound better to me, but... meh. It's just a common buildflow that is described in numerous articles like how to build software from source in three easy steps on the internet. The process is simple: 1. Run `make all` to build the program and then `make install` to install it. 2. Have no Makefile? Run `./configure` first. 3. Have no configure? Run `./autogen.sh`. 4. Have no autogen.sh? Read INSTALL file carefully or ask for assistance on the ML or IRC :) People don't want to learn autotools if everything they want is to compile new version. If you want to prevent people from going to step 4, make 'em stop on step 3 :) -- Igor ___ Bash-completion-devel mailing list Bash-completion-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
[Bash-completion-commits] [bash-completion] 01/03: Quote _filedir arguments when appropriate to prevent failglob failures
This is an automated email from the git hooks/post-receive script. garik-guest pushed a commit to branch master in repository bash-completion. commit 8566a5a89633a6d689192638410914910e2a1523 Author: Igor Murzov e-m...@date.by Date: Thu Jun 5 00:42:11 2014 +0400 Quote _filedir arguments when appropriate to prevent failglob failures --- completions/cppcheck | 2 +- completions/installpkg | 2 +- completions/k3b| 2 +- completions/sqlite3| 2 +- completions/tar| 2 +- completions/upgradepkg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/completions/cppcheck b/completions/cppcheck index 70b92e7..2d9b0b7 100644 --- a/completions/cppcheck +++ b/completions/cppcheck @@ -81,7 +81,7 @@ _cppcheck() COMPREPLY=( $( compgen -W '$( _parse_help $1 )' -- $cur ) ) [[ $COMPREPLY == *= ]] compopt -o nospace else -_filedir @([cht]pp|[cht]xx|cc|[ch]++|[ch]) +_filedir '@([cht]pp|[cht]xx|cc|[ch]++|[ch])' fi } complete -F _cppcheck cppcheck diff --git a/completions/installpkg b/completions/installpkg index cdaf816..400e217 100644 --- a/completions/installpkg +++ b/completions/installpkg @@ -26,7 +26,7 @@ _installpkg() return 0 fi -_filedir t[bglx]z +_filedir 't[bglx]z' } complete -F _installpkg installpkg # ex: ts=4 sw=4 et filetype=sh diff --git a/completions/k3b b/completions/k3b index 9c03642..6dc96f0 100644 --- a/completions/k3b +++ b/completions/k3b @@ -23,7 +23,7 @@ _k3b() return 0 ;; --cdimage|--image) -_filedir @(cue|iso|toc) +_filedir '@(cue|iso|toc)' return 0 ;; --dvdimage) diff --git a/completions/sqlite3 b/completions/sqlite3 index e97c2e9..c5bfcb6 100644 --- a/completions/sqlite3 +++ b/completions/sqlite3 @@ -22,7 +22,7 @@ _sqlite3() return 0 fi -_filedir $dbexts +_filedir $dbexts } complete -F _sqlite3 sqlite3 diff --git a/completions/tar b/completions/tar index 374e069..8d867d0 100644 --- a/completions/tar +++ b/completions/tar @@ -27,7 +27,7 @@ _tar() *[jy]*) ext='t@(?(ar.)bz?(2)|b2)' ;; *J*)ext='t?(ar.)xz' ;; esac -_filedir $ext +_filedir $ext else _filedir fi diff --git a/completions/upgradepkg b/completions/upgradepkg index f9fa23a..5fc4f4d 100644 --- a/completions/upgradepkg +++ b/completions/upgradepkg @@ -23,7 +23,7 @@ _upgradepkg() return fi -_filedir t[bglx]z +_filedir 't[bglx]z' } complete -F _upgradepkg upgradepkg # ex: ts=4 sw=4 et filetype=sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git ___ Bash-completion-commits mailing list Bash-completion-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 02/03: slapt-src: split options from their arguments
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 3a65be4a18f67d1b5101ce1d03398728aebe0668
Author: Igor Murzov e-m...@date.by
Date: Thu Jun 5 00:49:17 2014 +0400
slapt-src: split options from their arguments
---
completions/slapt-src | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/completions/slapt-src b/completions/slapt-src
index 9225804..9b6f501 100644
--- a/completions/slapt-src
+++ b/completions/slapt-src
@@ -2,8 +2,8 @@
_slapt_src()
{
-local cur prev words cword
-_init_completion -n : || return
+local cur prev words cword split
+_init_completion -s -n : || return
case $prev in
--config|-c)
@@ -16,6 +16,8 @@ _slapt_src()
;;
esac
+$split return
+
if [[ $cur == -* ]]; then
COMPREPLY=( $( compgen -W '$( _parse_help $1 --help )' -- $cur ) )
[[ $COMPREPLY == *= ]] compopt -o nospace
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
Re: [Bash-completion-devel] How to build the autocompletion from git repo?
On Wed, 2 Apr 2014 17:07:34 +0300 Ville Skyttä ville.sky...@iki.fi wrote: On Wed, Apr 2, 2014 at 3:02 PM, Adam Ryczkowski adam.ryczkow...@statystyka.net wrote: The .configure script mentioned by the README is missing. README document the setup from a release tarball, not git. When I run automake I get: [...] What should I do? autoreconf -i is a good first try with just about any project using autotools. Not everyone knows how to use autotools, so I would agree that having autogen.sh is a good idea, even if it contains only one line :) -- Igor ___ Bash-completion-devel mailing list Bash-completion-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
[Bash-completion-commits] [bash-completion] 01/01: psql: Tell psql to not load .psqlrc as it may change output format (Alioth: #314636)
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 9186add6298cac3c684b1123ea3c8006f87fc24b
Author: Igor Murzov e-m...@date.by
Date: Tue Jun 3 02:40:42 2014 +0400
psql: Tell psql to not load .psqlrc as it may change output format (Alioth:
#314636)
---
completions/psql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/completions/psql b/completions/psql
index 186177a..c462bf0 100644
--- a/completions/psql
+++ b/completions/psql
@@ -4,14 +4,14 @@ _pg_databases()
{
# -w was introduced in 8.4, https://launchpad.net/bugs/164772
# Access privileges in output may contain linefeeds, hence the NF 1
-COMPREPLY=( $( compgen -W $( psql -AtqwlF $'\t' 2/dev/null | \
+COMPREPLY=( $( compgen -W $( psql -XAtqwlF $'\t' 2/dev/null | \
awk 'NF 1 { print $1 }' ) -- $cur ) )
}
_pg_users()
{
# -w was introduced in 8.4, https://launchpad.net/bugs/164772
-COMPREPLY=( $( compgen -W $( psql -Atqwc 'select usename from pg_user' \
+COMPREPLY=( $( compgen -W $( psql -XAtqwc 'select usename from pg_user' \
template1 2/dev/null ) -- $cur ) )
[[ ${#COMPREPLY[@]} -eq 0 ]] COMPREPLY=( $( compgen -u -- $cur ) )
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
Re: [Bash-completion-devel] [PATCH] make completion shouldn't be confused by the output of $(info confuse: make)
On Sun, 18 May 2014 14:10:50 +0100
Tristan Wibberley tristan.wibber...@gmail.com wrote:
Currently, make completion will parse the output of $(info ...) looking for
make targets. It's too easy to cause extra targets to be suggested by
accident. This patch makes completion ignore lines that appear before the
database output begins.
Hi Tristan.
Thank you for the patch. Could you please also modify the following
Makefile to make the bash-completion testsuite fail without the patch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=bash-completion/bash-completion.git;a=blob;f=test/fixtures/make/Makefile;hb=HEAD
?
-- Igor
---
completions/make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/completions/make b/completions/make
index b6683b8..f8f7193 100644
--- a/completions/make
+++ b/completions/make
@@ -20,7 +20,7 @@ function _make_target_extract_script()
fi
cat EOF
-/^# Make data base/,/^# Files/d;# skip until files section
+1,/^# Files/ d;# skip until files section
/^# Not a target/,/^$/d;# skip not target blocks
/^${prefix_pat}/,/^$/!d;# skip anything user dont
want
--
1.9.1
___
Bash-completion-devel mailing list
Bash-completion-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
Re: [Bash-completion-devel] [PATCH] make completion shouldn't be confused by the output of $(info confuse: make)
On Tue, 20 May 2014 01:41:28 +0400
Igor Murzov intergalactic.anonym...@gmail.com wrote:
On Sun, 18 May 2014 14:10:50 +0100
Tristan Wibberley tristan.wibber...@gmail.com wrote:
Currently, make completion will parse the output of $(info ...) looking for
make targets. It's too easy to cause extra targets to be suggested by
accident. This patch makes completion ignore lines that appear before the
database output begins.
Hi Tristan.
Thank you for the patch. Could you please also modify the following
Makefile to make the bash-completion testsuite fail without the patch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=bash-completion/bash-completion.git;a=blob;f=test/fixtures/make/Makefile;hb=HEAD
?
Nevermind. I already figured it out after i reread the subject :)
Thanks again. The patch has been commited:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=bash-completion/bash-completion.git;a=commit;h=54d53c622745e907d288d67d832a0b09aaa1d3df
-- Igor
---
completions/make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/completions/make b/completions/make
index b6683b8..f8f7193 100644
--- a/completions/make
+++ b/completions/make
@@ -20,7 +20,7 @@ function _make_target_extract_script()
fi
cat EOF
-/^# Make data base/,/^# Files/d;# skip until files section
+1,/^# Files/ d;# skip until files section
/^# Not a target/,/^$/d;# skip not target blocks
/^${prefix_pat}/,/^$/!d;# skip anything user dont
want
--
1.9.1
___
Bash-completion-devel mailing list
Bash-completion-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
[Bash-completion-commits] [bash-completion] 01/01: make: completion shouldn't be confused by the output of $(info confuse: make)
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 54d53c622745e907d288d67d832a0b09aaa1d3df
Author: Tristan Wibberley tristan.wibber...@gmail.com
Date: Sun May 18 14:10:50 2014 +0100
make: completion shouldn't be confused by the output of $(info confuse:
make)
---
completions/make| 2 +-
test/fixtures/make/Makefile | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/completions/make b/completions/make
index b6683b8..f8f7193 100644
--- a/completions/make
+++ b/completions/make
@@ -20,7 +20,7 @@ function _make_target_extract_script()
fi
cat EOF
-/^# Make data base/,/^# Files/d;# skip until files section
+1,/^# Files/ d;# skip until files section
/^# Not a target/,/^$/d;# skip not target blocks
/^${prefix_pat}/,/^$/!d;# skip anything user dont want
diff --git a/test/fixtures/make/Makefile b/test/fixtures/make/Makefile
index 1a6416c..cb99b25 100644
--- a/test/fixtures/make/Makefile
+++ b/test/fixtures/make/Makefile
@@ -1,3 +1,5 @@
+$(info confuse: make)
+
NAME := sample
.PHONY: all
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
Re: [Bash-completion-devel] [patch] /etc/profile.d/bash_completion.sh
On Sat, 23 Nov 2013 18:09:58 +0100
Thilo Six ml...@xk2c.de wrote:
Hello
,[ /etc/profile.d/bash_completion.sh ]
- bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
- if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then
+ if [[ ${BASH_VERSINFO[0]} -gt 4 ]] || \
+ ( [[ ${BASH_VERSINFO[0]} -eq 4 ]] [[ ${BASH_VERSINFO[1]} -ge 1 ]] );
then
`---
Commited. Thanks for the patch :)
-- Igor
kind regards,
Thilo
___
Bash-completion-devel mailing list
Bash-completion-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
[Bash-completion-commits] [bash-completion] branch master updated (c924d32 - eafde37)
This is an automated email from the git hooks/post-receive script. garik-guest pushed a change to branch master in repository bash-completion. from c924d32 hostname: New completion new 38a013e pypy: New completion identical to python (Alioth: #314501) new 768a958 Use more straightforward way to check bash version new eafde37 dpkg: Add support in dpkg completion for .ddeb (LP: #568404) The 3 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: bash_completion.sh.in | 5 ++--- completions/.gitignore | 1 + completions/Makefile.am | 3 ++- completions/dpkg| 2 +- completions/python | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/bash-completion.git ___ Bash-completion-commits mailing list Bash-completion-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 02/03: Use more straightforward way to check bash version
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 768a95854616e25c8da3f9d79048f9bbb5ecb2a6
Author: Thilo Six ml...@xk2c.de
Date: Sat Nov 23 18:09:58 2013 +0100
Use more straightforward way to check bash version
---
bash_completion.sh.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bash_completion.sh.in b/bash_completion.sh.in
index fb22dad..36ccd3f 100644
--- a/bash_completion.sh.in
+++ b/bash_completion.sh.in
@@ -2,8 +2,8 @@
if [ -n $BASH_VERSION -a -n $PS1 -a -z $BASH_COMPLETION_COMPAT_DIR ];
then
# Check for recent enough version of bash.
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then
+if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+ [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
[ -r ${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion ] \
. ${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion
if shopt -q progcomp [ -r @pkgdatadir@/bash_completion ]; then
@@ -11,6 +11,5 @@ if [ -n $BASH_VERSION -a -n $PS1 -a -z
$BASH_COMPLETION_COMPAT_DIR ]; then
. @pkgdatadir@/bash_completion
fi
fi
-unset bash bmajor bminor
fi
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 01/03: pypy: New completion identical to python (Alioth: #314501)
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 38a013e22cd30c0cce84caaaff2763d0c39ce131
Author: Stefano Rivera stefa...@debian.org
Date: Thu Oct 24 16:09:17 2013 +0400
pypy: New completion identical to python (Alioth: #314501)
---
completions/.gitignore | 1 +
completions/Makefile.am | 3 ++-
completions/python | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/completions/.gitignore b/completions/.gitignore
index 0b9cd5e..af0a0d8 100644
--- a/completions/.gitignore
+++ b/completions/.gitignore
@@ -134,6 +134,7 @@ pxz
pydoc3
python2
python3
+pypy
qemu-kvm
qemu-system-i386
qemu-system-x86_64
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 624e5aa..bf5d792 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -548,6 +548,7 @@ CLEANFILES = \
pvscan \
pxz \
pydoc3 \
+ pypy \
python2 \
python3 \
qemu-kvm \
@@ -845,7 +846,7 @@ symlinks: $(targetdir) $(DATA)
rm -f $(targetdir)/$$file \
$(LN_S) pydoc $(targetdir)/$$file ; \
done
- for file in python2 python3 ; do \
+ for file in pypy python2 python3 ; do \
rm -f $(targetdir)/$$file \
$(LN_S) python $(targetdir)/$$file ; \
done
diff --git a/completions/python b/completions/python
index 5c5e788..8736de5 100644
--- a/completions/python
+++ b/completions/python
@@ -28,7 +28,7 @@ _python()
-- $cur ) )
return 0
;;
-!(?(*/)python*([0-9.])|-?))
+!(?(*/)python*([0-9.])|?(*/)pypy*([0-9.])|-?))
[[ $cword -lt 2 || ${words[cword-2]} != -[QW] ]] _filedir
;;
esac
@@ -51,6 +51,6 @@ _python()
return 0
}
-complete -F _python python python2 python3
+complete -F _python python python2 python3 pypy
# ex: ts=4 sw=4 et filetype=sh
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 01/03: portsnap: New completion.
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit c3770c17984bb61255db6adb48886b466c335e03
Author: Peter Dave Hello h...@peterdavehello.org
Date: Thu Jan 2 03:28:56 2014 +0800
portsnap: New completion.
---
completions/Makefile.am | 1 +
completions/portsnap| 25 +
2 files changed, 26 insertions(+)
diff --git a/completions/Makefile.am b/completions/Makefile.am
index be5bc26..7b8f767 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -261,6 +261,7 @@ bashcomp_DATA = 2to3 \
pm-is-supported \
pm-powersave \
portinstall \
+ portsnap \
portupgrade \
postcat \
postconf \
diff --git a/completions/portsnap b/completions/portsnap
new file mode 100644
index 000..22937c0
--- /dev/null
+++ b/completions/portsnap
@@ -0,0 +1,25 @@
+# bash completion for Portsnap -*- shell-script -*-
+
+[[ $OSTYPE == *freebsd* ]] || return 1
+
+_portsnap()
+{
+local cur prev words cword
+_init_completion || return
+
+case $prev in
+-d|-p)
+_filedir -d
+return
+;;
+-l|-f)
+_filedir
+return
+;;
+esac
+
+COMPREPLY=( $(compgen -W fetch cron extract update -- $cur) )
+}
+complete -F _portsnap portsnap
+
+# ex: ts=4 sw=4 et filetype=sh
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [bash-completion] 03/03: testsuite: Add basic tests for portsnap and freebsd-update
This is an automated email from the git hooks/post-receive script.
garik-guest pushed a commit to branch master
in repository bash-completion.
commit 602d18853ccb71baa233c33d93503b0ce27070a0
Author: Igor Murzov e-m...@date.by
Date: Wed Feb 5 02:15:47 2014 +0400
testsuite: Add basic tests for portsnap and freebsd-update
---
test/completion/freebsd-update.exp | 1 +
test/completion/portsnap.exp| 1 +
test/lib/completions/freebsd-update.exp | 18 ++
test/lib/completions/portsnap.exp | 18 ++
4 files changed, 38 insertions(+)
diff --git a/test/completion/freebsd-update.exp
b/test/completion/freebsd-update.exp
new file mode 100644
index 000..80c3566
--- /dev/null
+++ b/test/completion/freebsd-update.exp
@@ -0,0 +1 @@
+assert_source_completions freebsd-update
diff --git a/test/completion/portsnap.exp b/test/completion/portsnap.exp
new file mode 100644
index 000..424004e
--- /dev/null
+++ b/test/completion/portsnap.exp
@@ -0,0 +1 @@
+assert_source_completions portsnap
diff --git a/test/lib/completions/freebsd-update.exp
b/test/lib/completions/freebsd-update.exp
new file mode 100644
index 000..3657ebf
--- /dev/null
+++ b/test/lib/completions/freebsd-update.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+save_env
+}
+
+
+proc teardown {} {
+assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any freebsd-update
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/portsnap.exp
b/test/lib/completions/portsnap.exp
new file mode 100644
index 000..d6028ca
--- /dev/null
+++ b/test/lib/completions/portsnap.exp
@@ -0,0 +1,18 @@
+proc setup {} {
+save_env
+}
+
+
+proc teardown {} {
+assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any portsnap
+sync_after_int
+
+
+teardown
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/bash-completion/bash-completion.git
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
Re: [E-devel] ePeriodique 0.5
On Thu, 2 Jan 2014 12:49:48 +0900 Jérôme Pinot ngc...@gmail.com wrote: Hi, I updated ePeriodique, the EFL periodic table, to be compatible with the new elementary 1.8 theme. Unfortunately, the new version looks worse than the previous one. The header with title and buttons doesn't fit into my screen space, buttons may be completely hidden. Eperiodique 0.4: http://ge.tt/4DLHg3C1/v/0 Eperiodique 0.5: http://ge.tt/86Kyg3C1/v/0 -- Igor -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: Add more messages to the pot
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5e840d4b5cf7b960cc4bafbc417a62598be9496c commit 5e840d4b5cf7b960cc4bafbc417a62598be9496c Author: Igor Murzov e-m...@date.by Date: Sat Dec 21 03:14:36 2013 +0400 Add more messages to the pot --- po/POTFILES.in | 5 + 1 file changed, 5 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index ea89127..133d05d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -78,6 +78,7 @@ src/bin/e_place.c src/bin/e_pointer.c src/bin/e_popup.c src/bin/e_prefix.c +src/bin/e_randr.c src/bin/e_remember.c src/bin/e_resist.c src/bin/e_screensaver.c @@ -157,6 +158,7 @@ src/modules/conf_bindings/e_int_config_mousebindings.c src/modules/conf_bindings/e_int_config_signalbindings.c src/modules/conf_bindings/e_mod_main.c src/modules/conf_comp/e_mod_config.c +src/modules/conf_comp/e_mod_config_match.c src/modules/conf_comp/e_mod_main.c src/modules/conf_dialogs/e_int_config_dialogs.c src/modules/conf_dialogs/e_int_config_profiles.c @@ -209,6 +211,8 @@ src/modules/conf_window_manipulation/e_int_config_window_process.c src/modules/conf_window_manipulation/e_mod_main.c src/modules/conf_window_remembers/e_int_config_remembers.c src/modules/conf_window_remembers/e_mod_main.c +src/modules/connman/agent.c +src/modules/connman/e_mod_config.c src/modules/connman/e_mod_main.c src/modules/cpufreq/e_mod_main.c src/modules/cpufreq/e_mod_config.c @@ -267,6 +271,7 @@ src/modules/start/e_mod_main.c src/modules/syscon/e_int_config_syscon.c src/modules/syscon/e_mod_main.c src/modules/syscon/e_syscon.c +src/modules/syscon/e_syscon_gadget.c src/modules/systray/e_mod_main.c src/modules/systray/e_mod_xembed.c src/modules/tasks/e_mod_config.c --
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: Add more messages to the pot
garik pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1f2cfda6dd592cc78a0a194404154c7629bcf00b commit 1f2cfda6dd592cc78a0a194404154c7629bcf00b Author: Igor Murzov e-m...@date.by Date: Sat Dec 21 03:14:36 2013 +0400 Add more messages to the pot --- po/POTFILES.in | 5 + 1 file changed, 5 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index ea89127..133d05d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -78,6 +78,7 @@ src/bin/e_place.c src/bin/e_pointer.c src/bin/e_popup.c src/bin/e_prefix.c +src/bin/e_randr.c src/bin/e_remember.c src/bin/e_resist.c src/bin/e_screensaver.c @@ -157,6 +158,7 @@ src/modules/conf_bindings/e_int_config_mousebindings.c src/modules/conf_bindings/e_int_config_signalbindings.c src/modules/conf_bindings/e_mod_main.c src/modules/conf_comp/e_mod_config.c +src/modules/conf_comp/e_mod_config_match.c src/modules/conf_comp/e_mod_main.c src/modules/conf_dialogs/e_int_config_dialogs.c src/modules/conf_dialogs/e_int_config_profiles.c @@ -209,6 +211,8 @@ src/modules/conf_window_manipulation/e_int_config_window_process.c src/modules/conf_window_manipulation/e_mod_main.c src/modules/conf_window_remembers/e_int_config_remembers.c src/modules/conf_window_remembers/e_mod_main.c +src/modules/connman/agent.c +src/modules/connman/e_mod_config.c src/modules/connman/e_mod_main.c src/modules/cpufreq/e_mod_main.c src/modules/cpufreq/e_mod_config.c @@ -267,6 +271,7 @@ src/modules/start/e_mod_main.c src/modules/syscon/e_int_config_syscon.c src/modules/syscon/e_mod_main.c src/modules/syscon/e_syscon.c +src/modules/syscon/e_syscon_gadget.c src/modules/systray/e_mod_main.c src/modules/systray/e_mod_xembed.c src/modules/tasks/e_mod_config.c --
[EGIT] [core/enlightenment] master 01/01: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ea1ae87962150c7ea92886884ba7443cc9e86a7a commit ea1ae87962150c7ea92886884ba7443cc9e86a7a Author: Igor Murzov e-m...@date.by Date: Sat Dec 21 03:58:18 2013 +0400 Update russian translation --- po/ru.po | 477 +++ 1 file changed, 299 insertions(+), 178 deletions(-) diff --git a/po/ru.po b/po/ru.po index 54a5878..f602d88 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,8 +10,8 @@ msgid msgstr Project-Id-Version: Enlightenment 0.17\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2013-12-18 02:49+0400\n -PO-Revision-Date: 2013-12-18 02:32+0400\n +POT-Creation-Date: 2013-12-21 03:15+0400\n +PO-Revision-Date: 2013-12-21 03:15+0400\n Last-Translator: Игорь Мурзов e-m...@date.by\n Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n @@ -82,7 +82,7 @@ msgstr Убить #: src/bin/e_actions.c:375 src/bin/e_actions.c:2125 src/bin/e_actions.c:2219 #: src/bin/e_actions.c:2279 src/bin/e_actions.c:2339 src/bin/e_actions.c:2404 #: src/bin/e_actions.c:2469 src/bin/e_confirm_dialog.c:53 -#: src/bin/e_desklock.c:1245 src/bin/e_fm.c:10567 src/bin/e_fm.c:10933 +#: src/bin/e_desklock.c:1247 src/bin/e_fm.c:10567 src/bin/e_fm.c:10934 #: src/bin/e_screensaver.c:190 #: src/modules/quickaccess/e_mod_quickaccess.c:1290 msgid No @@ -98,7 +98,7 @@ msgstr Действительно хотите выйти из Enlightenment? #: src/bin/e_actions.c:2123 src/bin/e_actions.c:2217 src/bin/e_actions.c:2277 #: src/bin/e_actions.c:2337 src/bin/e_actions.c:2402 src/bin/e_actions.c:2467 -#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:1243 +#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:1245 #: src/bin/e_fm.c:10570 src/bin/e_screensaver.c:188 #: src/modules/quickaccess/e_mod_quickaccess.c:1290 msgid Yes @@ -153,7 +153,7 @@ msgstr Действительно хотите перевести систем msgid Window : Actions msgstr Окно : Действия -#: src/bin/e_actions.c:2953 src/bin/e_fm.c:11701 +#: src/bin/e_actions.c:2953 src/bin/e_fm.c:11702 #: src/bin/e_int_border_menu.c:694 msgid Move msgstr Переместить @@ -165,6 +165,8 @@ msgstr Изменить размер #: src/bin/e_actions.c:2975 src/bin/e_actions.c:3336 src/bin/e_actions.c:3338 #: src/bin/e_actions.c:3340 src/bin/e_actions.c:3342 src/bin/e_actions.c:3344 #: src/modules/conf_bindings/e_int_config_mousebindings.c:336 +#: src/modules/conf_comp/e_mod_config_match.c:83 +#: src/modules/conf_comp/e_mod_config_match.c:382 msgid Menu msgstr Меню @@ -315,6 +317,8 @@ msgstr Переключить режим прикрепления #: src/bin/e_actions.c:3221 src/bin/e_actions.c:3223 src/bin/e_actions.c:3436 #: src/bin/e_actions.c:3441 src/bin/e_int_menus.c:186 #: src/bin/e_int_shelf_config.c:293 +#: src/modules/conf_comp/e_mod_config_match.c:75 +#: src/modules/conf_comp/e_mod_config_match.c:374 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:118 #: src/modules/fileman/e_mod_menu.c:432 src/modules/gadman/e_mod_gadman.c:120 #: src/modules/ibox/e_mod_config.c:166 @@ -728,6 +732,7 @@ msgstr Переключить указанный модуль #: src/modules/conf_theme/e_int_config_wallpaper.c:582 #: src/modules/gadman/e_mod_config.c:252 src/modules/syscon/e_mod_main.c:31 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:129 +#: src/modules/syscon/e_syscon_gadget.c:141 msgid System msgstr Система @@ -803,6 +808,7 @@ msgstr Выбрать #: src/modules/conf_bindings/e_int_config_signalbindings.c:624 #: src/modules/conf_intl/e_int_config_imc_import.c:124 #: src/modules/conf_theme/e_int_config_theme_import.c:123 +#: src/modules/connman/agent.c:251 #: src/modules/fileman/e_int_config_mime_edit.c:316 #: src/modules/quickaccess/e_mod_quickaccess.c:323 #: src/modules/quickaccess/e_mod_quickaccess.c:385 @@ -872,7 +878,7 @@ msgstr Изменить прозрачность текущего окна msgid Set current window opacity msgstr Задать прозрачность текущего окна -#: src/bin/e_config.c:972 +#: src/bin/e_config.c:972 src/bin/e_randr.c:176 msgid Settings data needed upgrading. Your old settings havebrbeen wiped and a new set of defaults initialized. Thisbrwill happen regularly during @@ -889,7 +895,7 @@ msgstr brкоторый и был инициализирован. Можете настроить всё заново.brИзвините за неудобства.br -#: src/bin/e_config.c:989 +#: src/bin/e_config.c:989 src/bin/e_randr.c:191 msgid Your settings are NEWER than Enlightenment. This is verybrstrange. This should not happen unless you downgradedbrEnlightenment or copied the @@ -930,7 +936,7 @@ msgstr #: src/bin/e_config.c:1723 src/bin/e_config.c:2384 #: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:858 #: src/bin/e_desktop_editor.c:921 src/bin/e_entry_dialog.c:63 -#: src/bin/e_exec.c:734 src/bin/e_fm.c:10107 src/bin/e_fm.c:10839 +#: src/bin/e_exec.c:734 src/bin/e_fm.c:10107 src/bin/e_fm.c:10840 #: src/bin/e_fm_prop.c:624 src/bin/e_import_config_dialog.c:536
[EGIT] [core/enlightenment] enlightenment-0.18 01/01: Update russian translation
garik pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4fd80bc23609db886f02e758dcadedc85c74ed00 commit 4fd80bc23609db886f02e758dcadedc85c74ed00 Author: Igor Murzov e-m...@date.by Date: Sat Dec 21 03:58:18 2013 +0400 Update russian translation --- po/ru.po | 477 +++ 1 file changed, 299 insertions(+), 178 deletions(-) diff --git a/po/ru.po b/po/ru.po index 54a5878..f602d88 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,8 +10,8 @@ msgid msgstr Project-Id-Version: Enlightenment 0.17\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2013-12-18 02:49+0400\n -PO-Revision-Date: 2013-12-18 02:32+0400\n +POT-Creation-Date: 2013-12-21 03:15+0400\n +PO-Revision-Date: 2013-12-21 03:15+0400\n Last-Translator: Игорь Мурзов e-m...@date.by\n Language-Team: ru enlightenment-i...@lists.sourceforge.net\n Language: ru\n @@ -82,7 +82,7 @@ msgstr Убить #: src/bin/e_actions.c:375 src/bin/e_actions.c:2125 src/bin/e_actions.c:2219 #: src/bin/e_actions.c:2279 src/bin/e_actions.c:2339 src/bin/e_actions.c:2404 #: src/bin/e_actions.c:2469 src/bin/e_confirm_dialog.c:53 -#: src/bin/e_desklock.c:1245 src/bin/e_fm.c:10567 src/bin/e_fm.c:10933 +#: src/bin/e_desklock.c:1247 src/bin/e_fm.c:10567 src/bin/e_fm.c:10934 #: src/bin/e_screensaver.c:190 #: src/modules/quickaccess/e_mod_quickaccess.c:1290 msgid No @@ -98,7 +98,7 @@ msgstr Действительно хотите выйти из Enlightenment? #: src/bin/e_actions.c:2123 src/bin/e_actions.c:2217 src/bin/e_actions.c:2277 #: src/bin/e_actions.c:2337 src/bin/e_actions.c:2402 src/bin/e_actions.c:2467 -#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:1243 +#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:1245 #: src/bin/e_fm.c:10570 src/bin/e_screensaver.c:188 #: src/modules/quickaccess/e_mod_quickaccess.c:1290 msgid Yes @@ -153,7 +153,7 @@ msgstr Действительно хотите перевести систем msgid Window : Actions msgstr Окно : Действия -#: src/bin/e_actions.c:2953 src/bin/e_fm.c:11701 +#: src/bin/e_actions.c:2953 src/bin/e_fm.c:11702 #: src/bin/e_int_border_menu.c:694 msgid Move msgstr Переместить @@ -165,6 +165,8 @@ msgstr Изменить размер #: src/bin/e_actions.c:2975 src/bin/e_actions.c:3336 src/bin/e_actions.c:3338 #: src/bin/e_actions.c:3340 src/bin/e_actions.c:3342 src/bin/e_actions.c:3344 #: src/modules/conf_bindings/e_int_config_mousebindings.c:336 +#: src/modules/conf_comp/e_mod_config_match.c:83 +#: src/modules/conf_comp/e_mod_config_match.c:382 msgid Menu msgstr Меню @@ -315,6 +317,8 @@ msgstr Переключить режим прикрепления #: src/bin/e_actions.c:3221 src/bin/e_actions.c:3223 src/bin/e_actions.c:3436 #: src/bin/e_actions.c:3441 src/bin/e_int_menus.c:186 #: src/bin/e_int_shelf_config.c:293 +#: src/modules/conf_comp/e_mod_config_match.c:75 +#: src/modules/conf_comp/e_mod_config_match.c:374 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:118 #: src/modules/fileman/e_mod_menu.c:432 src/modules/gadman/e_mod_gadman.c:120 #: src/modules/ibox/e_mod_config.c:166 @@ -728,6 +732,7 @@ msgstr Переключить указанный модуль #: src/modules/conf_theme/e_int_config_wallpaper.c:582 #: src/modules/gadman/e_mod_config.c:252 src/modules/syscon/e_mod_main.c:31 #: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:129 +#: src/modules/syscon/e_syscon_gadget.c:141 msgid System msgstr Система @@ -803,6 +808,7 @@ msgstr Выбрать #: src/modules/conf_bindings/e_int_config_signalbindings.c:624 #: src/modules/conf_intl/e_int_config_imc_import.c:124 #: src/modules/conf_theme/e_int_config_theme_import.c:123 +#: src/modules/connman/agent.c:251 #: src/modules/fileman/e_int_config_mime_edit.c:316 #: src/modules/quickaccess/e_mod_quickaccess.c:323 #: src/modules/quickaccess/e_mod_quickaccess.c:385 @@ -872,7 +878,7 @@ msgstr Изменить прозрачность текущего окна msgid Set current window opacity msgstr Задать прозрачность текущего окна -#: src/bin/e_config.c:972 +#: src/bin/e_config.c:972 src/bin/e_randr.c:176 msgid Settings data needed upgrading. Your old settings havebrbeen wiped and a new set of defaults initialized. Thisbrwill happen regularly during @@ -889,7 +895,7 @@ msgstr brкоторый и был инициализирован. Можете настроить всё заново.brИзвините за неудобства.br -#: src/bin/e_config.c:989 +#: src/bin/e_config.c:989 src/bin/e_randr.c:191 msgid Your settings are NEWER than Enlightenment. This is verybrstrange. This should not happen unless you downgradedbrEnlightenment or copied the @@ -930,7 +936,7 @@ msgstr #: src/bin/e_config.c:1723 src/bin/e_config.c:2384 #: src/bin/e_config_dialog.c:278 src/bin/e_desktop_editor.c:858 #: src/bin/e_desktop_editor.c:921 src/bin/e_entry_dialog.c:63 -#: src/bin/e_exec.c:734 src/bin/e_fm.c:10107 src/bin/e_fm.c:10839 +#: src/bin/e_exec.c:734 src/bin/e_fm.c:10107 src/bin/e_fm.c:10840 #: src/bin/e_fm_prop.c:624 src/bin
Re: [E-devel] Webkit EFL
I've got another compilation failure due to incorrect freetype include path: Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/freetype/FontPlatformDataFreeType.cpp.o /tmp/tgz/webkit-efl/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:32:22: fatal error: tttables.h: No such file or directory #include tttables.h The missing file is actually present in /usr/include/freetype2/freetype/, but compiler failed to find it. pkg-config prints the following path: $ pkg-config --cflags freetype2 -I/usr/include/freetype2 so I had to edit some source files in WebCore to make it compile. -- Igor On Wed, 18 Dec 2013 20:18:42 +0900 ryuan Choi ryuan.c...@gmail.com wrote: Interesting, PNGImageDecoder.cpp already checked the libpng version but checked whether it is bigger than 1.5 2013/12/18 Cedric BAIL cedric.b...@free.fr On Wed, Dec 18, 2013 at 5:07 PM, Igor Murzov intergalactic.anonym...@gmail.com wrote: Compilation fails for me with the following error: [ 13%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/platform/image-decoders/png/PNGImageDecoder.cpp.o /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp: In member function 'void WebCore::PNGImageDecoder::headerAvailable()': /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:393:70: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] m_reader-setReadOffset(m_reader-currentBufferSize() - png-buffer_size); ^ /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:393:70: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:394:14: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] png-buffer_size = 0; ^ /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:394:14: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] cc1plus: all warnings being treated as errors make[2]: *** [Source/WebCore/CMakeFiles/WebCore.dir/platform/image-decoders/png/PNGImageDecoder.cpp.o] Error 1 make[1]: *** [Source/WebCore/CMakeFiles/WebCore.dir/all] Error 2 make: *** [all] Error 2 My system is Slackware 14.1 with gcc-4.8.2, libpng-1.4.12, efl-1.8.2. I am guessing that your libpng is to old (not sure), but webkit efl is really something that require all the latest technology. -- Cedric BAIL -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E18 CFBugs #4
Main menu doesn't scroll properly. When mouse pointer gets to the top of the screen, menu starts jiggering doesn't moving down as it should, so some items in the main menu become inaccessible. Screen Limits setting doesn't affect this. Also there is a weird bug in the application menu. I'm not sure whether items of the application menu should appear translated or not. Sometimes they are translated, sometimes not. Another thing that bothers me is how do I disable switching to another virtual desktop when mouse pointers gets outside of the visible area? I've tried to find a setting that does that, but I failed.. -- Igor -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Webkit EFL
Compilation fails for me with the following error: [ 13%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/platform/image-decoders/png/PNGImageDecoder.cpp.o /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp: In member function 'void WebCore::PNGImageDecoder::headerAvailable()': /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:393:70: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] m_reader-setReadOffset(m_reader-currentBufferSize() - png-buffer_size); ^ /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:393:70: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:394:14: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] png-buffer_size = 0; ^ /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:394:14: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] cc1plus: all warnings being treated as errors make[2]: *** [Source/WebCore/CMakeFiles/WebCore.dir/platform/image-decoders/png/PNGImageDecoder.cpp.o] Error 1 make[1]: *** [Source/WebCore/CMakeFiles/WebCore.dir/all] Error 2 make: *** [all] Error 2 My system is Slackware 14.1 with gcc-4.8.2, libpng-1.4.12, efl-1.8.2. -- Igor On Thu, 12 Dec 2013 14:39:11 +0900 Cedric BAIL cedric.b...@free.fr wrote: Hello, Thanks to the help of Ryuan Choi, we can announce today the release of a recent Webkit EFL snapshot. It is based on svn r159807. You can this tarball here (as it was a little bit big, I did go with xz): http://download.enlightenment.org/rel/libs/webkit-efl/webkit-efl-159807.tar.xz . To build it, you need EFL 1.8 and libsoup 2.42 at least. Then something like that will do : mkdir build cd build cmake .. -DPORT=Efl -DENABLE_WEB_AUDIO=Off -DENABLE_VIDEO=Off -DENABLE_VIDEO_TRACK=Off -DENABLE_ACCESSIBILITY=Off -DENABLE_BATTERY_STATUS=Off -DCMAKE_INSTALL_PREFIX=/usr/local make -j 4 I have tested it with elm web and it work quite well for me. I hope it will be useful for others. Just be aware that if you build it, you need around 4G of ram for the linker. This means it can only be build on 64bits system. Cross compilation is required for 32bits system. -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Webkit EFL
Compilation fails for me with the following error: [ 13%] Building CXX object Source/WebCore/CMakeFiles/WebCore.dir/platform/image-decoders/png/PNGImageDecoder.cpp.o /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp: In member function 'void WebCore::PNGImageDecoder::headerAvailable()': /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:393:70: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] m_reader-setReadOffset(m_reader-currentBufferSize() - png-buffer_size); ^ /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:393:70: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:394:14: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] png-buffer_size = 0; ^ /tmp/tgz/webkit-efl/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp:394:14: error: 'png_struct_def::buffer_size' is deprecated (declared at /usr/include/libpng14/png.h:1337) [-Werror=deprecated-declarations] cc1plus: all warnings being treated as errors make[2]: *** [Source/WebCore/CMakeFiles/WebCore.dir/platform/image-decoders/png/PNGImageDecoder.cpp.o] Error 1 make[1]: *** [Source/WebCore/CMakeFiles/WebCore.dir/all] Error 2 make: *** [all] Error 2 My system is Slackware 14.1 with gcc-4.8.2, libpng-1.4.12, efl-1.8.2. -- Igor On Thu, 12 Dec 2013 14:39:11 +0900 Cedric BAIL cedric.b...@free.fr wrote: Hello, Thanks to the help of Ryuan Choi, we can announce today the release of a recent Webkit EFL snapshot. It is based on svn r159807. You can this tarball here (as it was a little bit big, I did go with xz): http://download.enlightenment.org/rel/libs/webkit-efl/webkit-efl-159807.tar.xz . To build it, you need EFL 1.8 and libsoup 2.42 at least. Then something like that will do : mkdir build cd build cmake .. -DPORT=Efl -DENABLE_WEB_AUDIO=Off -DENABLE_VIDEO=Off -DENABLE_VIDEO_TRACK=Off -DENABLE_ACCESSIBILITY=Off -DENABLE_BATTERY_STATUS=Off -DCMAKE_INSTALL_PREFIX=/usr/local make -j 4 I have tested it with elm web and it work quite well for me. I hope it will be useful for others. Just be aware that if you build it, you need around 4G of ram for the linker. This means it can only be build on 64bits system. Cross compilation is required for 32bits system. -- Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [Bash-completion-devel] [bash-completion-Bugs][314417] completion for cc and c++ does not work
complete -F _gcc gcc g++ g77 gcj gpc {
cc --version 2/dev/null | grep -q GCC complete -F _gcc cc || :
c++ --version 2/dev/null | grep -q GCC complete -F _gcc c++ || :
}
Looking in this code, i wonder why there is no such lines for gfortran?
Is there some issues with it?
I wrote a quick patch for gfortran. Is it ok to push?
-
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 69f0e2c..90ffd9e 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -430,13 +430,17 @@ CLEANFILES = \
dpkg-reconfigure \
dropdb \
edquota \
+ f77 \
+ f95 \
filebucket \
freeciv-sdl \
freeciv-xaw \
g++ \
g4 \
g77 \
+ g95 \
gcj \
+ gfortran \
gkrellm2 \
gmake \
gmplayer \
@@ -662,7 +666,7 @@ symlinks: $(targetdir) $(DATA)
rm -f $(targetdir)/$$file \
$(LN_S) function $(targetdir)/$$file ; \
done
- for file in g++ c++ g77 gcj gpc cc ; do \
+ for file in cc c++ g++ gfortran f77 g77 f95 g95 gcj gpc ; do \
rm -f $(targetdir)/$$file \
$(LN_S) gcc $(targetdir)/$$file ; \
done
diff --git a/completions/gcc b/completions/gcc
index 578f800..481d9cf 100644
--- a/completions/gcc
+++ b/completions/gcc
@@ -27,6 +27,9 @@ _gcc()
*77)
backend=f771
;;
+*95)
+backend=f951
+;;
*)
backend=cc1 # (near-)universal backend
;;
@@ -45,7 +48,7 @@ _gcc()
_filedir
fi
}
-complete -F _gcc gcc g++ g77 gcj gpc
+complete -F _gcc gcc g++ gfortran g77 g95 gcj gpc
{
cc --version 2/dev/null | grep -q GCC || \
[[ $( _realcommand cc ) == *gcc* ]] \
@@ -53,6 +56,12 @@ complete -F _gcc gcc g++ g77 gcj gpc
c++ --version 2/dev/null | grep -q GCC || \
[[ $( _realcommand c++ ) == *g++* ]] \
complete -F _gcc c++ || complete -F _minimal c++
+f77 --version 2/dev/null | grep -q GCC || \
+[[ $( _realcommand f77 ) == *gfortran* ]] \
+complete -F _gcc f77 || complete -F _minimal f77
+f95 --version 2/dev/null | grep -q GCC || \
+[[ $( _realcommand f95 ) == *gfortran* ]] \
+complete -F _gcc f95 || complete -F _minimal f95
}
# ex: ts=4 sw=4 et filetype=sh
-
-- Igor
___
Bash-completion-devel mailing list
Bash-completion-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
Re: [E-devel] Release tarballs for testing - EFL 1.7.8 and Enlightenment 0.17.4
On Tue, 30 Jul 2013 14:16:51 -0300 Eduardo Lima (Etrunko) ebl...@gmail.com wrote: Thanks Rafael, the idea is to build the final tarballs by Thursday the end of the day. So this is a call for backports Can somebody backport commit 0bf55848abe19? Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Tue May 21 21:57:05 2013 +0900 add option to not fade backlight on suspend/resume/reboot/shutdown/logout etc. to keep backlight untouched. I know it looks more like a feature, but it's not. Fading backlight on logout is definitely a bug. -- Igor and tests especially on Evil and Enlightenment. Yes, I'm looking at you Devilhorns, don't hide your randr patches. :) Regards, Etrunko On Tue, Jul 30, 2013 at 1:46 PM, Rafael Antognolli antogno...@gmail.com wrote: Hi everyone, Etrunko is planning to do a new release of stable EFL and Enlightenment, and has prepared some tarballs for everyone to test it before actually doing the release. Following are the links to these tarballs, anyone who could test them is very welcome. - Eina 1.7.8 - [[http://download.enlightenment.org/releases/eina-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/eina-1.7.8.tar.bz2 | BZ2 ]] - Eet 1.7.8 - [[http://download.enlightenment.org/releases/eet-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/eet-1.7.8.tar.bz2 | BZ2 ]] - Evas 1.7.8 - [[http://download.enlightenment.org/releases/evas-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/evas-1.7.8.tar.bz2 | BZ2 ]] - Ecore 1.7.8 - [[http://download.enlightenment.org/releases/ecore-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/ecore-1.7.8.tar.bz2 | BZ2 ]] - Embryo 1.7.8 - [[http://download.enlightenment.org/releases/embryo-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/embryo-1.7.8.tar.bz2 | BZ2 ]] - Edje 1.7.8 - [[http://download.enlightenment.org/releases/edje-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/edje-1.7.8.tar.bz2 | BZ2 ]] - Efreet 1.7.8 - [[http://download.enlightenment.org/releases/efreet-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/efreet-1.7.8.tar.bz2 | BZ2 ]] - E_dbus 1.7.8 - [[http://download.enlightenment.org/releases/e_dbus-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/e_dbus-1.7.8.tar.bz2 | BZ2 ]] - Eeze 1.7.8 - [[http://download.enlightenment.org/releases/eeze-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/eeze-1.7.8.tar.bz2 | BZ2 ]] - Expedite 1.7.8 - [[http://download.enlightenment.org/releases/expedite-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/expedite-1.7.8.tar.bz2 | BZ2 ]] - Evas Generic Loaders 1.7.8 - [[http://download.enlightenment.org/releases/evas_generic_loaders-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/evas_generic_loaders-1.7.8.tar.bz2 | BZ2 ]] - Eio 1.7.8 - [[http://download.enlightenment.org/releases/eio-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/eio-1.7.8.tar.bz2 | BZ2 ]] - Emotion 1.7.8 - [[http://download.enlightenment.org/releases/emotion-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/emotion-1.7.8.tar.bz2 | BZ2 ]] - Ethumb 1.7.8 - [[http://download.enlightenment.org/releases/ethumb-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/ethumb-1.7.8.tar.bz2 | BZ2 ]] - Elementary 1.7.8 - [[http://download.enlightenment.org/releases/elementary-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/elementary-1.7.8.tar.bz2 | BZ2 ]] - Evil 1.7.8 - [[http://download.enlightenment.org/releases/evil-1.7.8.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/evil-1.7.8.tar.bz2 | BZ2 ]] - Enlightenment 0.17.4 - [[http://download.enlightenment.org/releases/enlightenment-0.17.4.tar.gz | GZ ]] [[http://download.enlightenment.org/releases/enlightenment-0.17.4.tar.bz2 | BZ2 ]] -- Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [Bash-completion-devel] bash completion for modules
On Tue, 23 Jul 2013 16:10:58 + (GMT) Nathan Hjelm hje...@me.com wrote: Hello, I have a bash completion script for the environment modules package (script attached.) This script differs quite a bit from the one included in modules-3.2.10. The attached version supports tab completion of multiple modules on the same line (doesn't work in the modules-3.2.10 version), caching of available modules (performance enhancement for systems with a large number of modules), and doesn't have many of the bugs present in modules-3.2.10. Can this module be added to bash-completion? If there is already some completion provided by modules-3.2.10, why don't you update/improve it there? There are actually many unmaintained completions in bash-completion. It's not that good idea to get another such completion. When completion provided by the program itself, it probably has more chances to be in-sync with the program. -- Igor ___ Bash-completion-devel mailing list Bash-completion-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
Re: [Bash-completion-devel] Disable multiple completions
On Mon, 08 Apr 2013 00:52:50 -0400 Limao Luo luoli...@gmail.com wrote: Is there a way to disabling showing the completions menu more than once in a row? Nope. -- Igor ___ Bash-completion-devel mailing list Bash-completion-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
Re: [E-devel] [PATCH][RFC][xdg-utils] Use enlightenment_open to open files in xdg-open
a read of that patch says to me that that looks good. :) submit it! Done. https://bugs.freedesktop.org/show_bug.cgi?id=66944 -- Igor The patch is for xdg-utils project. It makes various xdg-* scripts detect if enlightenment is running and use enlightenment_open in xdg-open. How to test the patch: 1. Clone xdg-utils repository from here: git://anongit.freedesktop.org/xdg/xdg-utils 2. Apply the patch. 3. Run ./configure 4! Update scripts from scripts/ directory with: $ cd scripts make scripts Without this step you won't get any changes for the xdg-* scripts! 5. Run make install Please test and give a response. If the patch is good i'll send it to xdg-utils project. -- See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] [PATCH][RFC][xdg-utils] Use enlightenment_open to open files in xdg-open
The patch is for xdg-utils project. It makes various xdg-* scripts detect
if enlightenment is running and use enlightenment_open in xdg-open.
How to test the patch:
1. Clone xdg-utils repository from here:
git://anongit.freedesktop.org/xdg/xdg-utils
2. Apply the patch.
3. Run ./configure
4! Update scripts from scripts/ directory with:
$ cd scripts make scripts
Without this step you won't get any changes for the xdg-* scripts!
5. Run make install
Please test and give a response. If the patch is good i'll send it to
xdg-utils project.
-- Igor
From 31b728ae740f80a881641a094a13cddf87bac7d2 Mon Sep 17 00:00:00 2001
From: Igor Murzov e-m...@date.by
Date: Fri, 12 Jul 2013 04:24:56 +0400
Subject: [PATCH] xdg-open: Detect Enlightenment and make use of it
---
ChangeLog | 3 +++
scripts/xdg-open.in | 15 +++
scripts/xdg-utils-common.in | 4
3 files changed, 22 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 9e4217b..943c141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.x ===
+2013-07-13 Igor Murzov e-m...@date.by
+ * xdg-open: detect Enlightenment and make use of it
+
2012-10-08 Rex Dieter rdie...@fedoraproject.org
* xdg-mime does not search mimeinfo.cache (BR31629)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 0934142..87e161d 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -114,6 +114,17 @@ open_xfce()
fi
}
+open_enlightenment()
+{
+enlightenment_open $1
+
+if [ $? -eq 0 ]; then
+exit_success
+else
+exit_failure_operation_failed
+fi
+}
+
#-
# Recursively search .desktop file
@@ -347,6 +358,10 @@ case $DE in
open_lxde $url
;;
+enlightenment)
+open_enlightenment $url
+;;
+
generic)
open_generic $url
;;
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
index 171d1e7..d20d4ef 100644
--- a/scripts/xdg-utils-common.in
+++ b/scripts/xdg-utils-common.in
@@ -256,6 +256,9 @@ detectDE()
if [ -n ${XDG_CURRENT_DESKTOP} ]; then
case ${XDG_CURRENT_DESKTOP} in
+ ENLIGHTENMENT)
+ DE=enlightenment;
+ ;;
GNOME)
DE=gnome;
;;
@@ -282,6 +285,7 @@ detectDE()
elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager /dev/null 21` ; then DE=gnome;
elif xprop -root _DT_SAVE_MODE 2 /dev/null | grep ' = \xfce4\$' /dev/null 21; then DE=xfce;
elif xprop -root 2 /dev/null | grep -i '^xfce_desktop_window' /dev/null 21; then DE=xfce
+ elif echo $DESKTOP | grep -q '^Enlightenment'; then DE=enlightenment;
fi
fi
--
1.8.3
--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eet: Fix copypaste issue
garik pushed a commit to branch master.
commit 079c1c6d9beb65d0c23c457b0115c29fe55d54f9
Author: Igor Murzov e-m...@date.by
Date: Thu Jul 11 00:52:36 2013 +0400
eet: Fix copypaste issue
---
src/bin/embryo/embryo_cc_sc6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/embryo/embryo_cc_sc6.c b/src/bin/embryo/embryo_cc_sc6.c
index f8fc330..b7cda64 100644
--- a/src/bin/embryo/embryo_cc_sc6.c
+++ b/src/bin/embryo/embryo_cc_sc6.c
@@ -72,7 +72,7 @@ hex2long(char *s, char **n)
} /* if */
assert((*s = '0' *s = '9') || (*s = 'a' *s = 'f')
- || (*s = 'a' *s = 'f'));
+ || (*s = 'A' *s = 'F'));
for (;;)
{
if (*s = '0' *s = '9')
--
--
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831iu=/4140/ostg.clktrk
Re: [E-devel] E18 CFBugs #2
On Tue, 11 Jun 2013 10:55:23 +0100 Michael Blumenkrantz michael.blumenkra...@gmail.com wrote: The old thread was too long for me to see if I fixed everything, so post here if you have a bug that's present using the latest revision. 1. Opening composite settings dialog crashes E. 2. No listable items in Navigate menu is now clickable never worked. Clicking 'No listable items' opens '~'. It should open directory to which that item belongs to. 3. appmenu: externally show a menu of the current focused application never worked for me. -- Igor -- This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [enlightenment/modules/news] enlightenment-0.17 01/01: Require E E18 to compile
garik pushed a commit to branch enlightenment-0.17. commit 96eba9f31cbeb8d05e96027a75f046561fb333ec Author: Igor Murzov e-m...@date.by Date: Tue Jun 18 00:22:07 2013 +0400 Require E E18 to compile --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 508b5a9..fdc543d 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AM_CONDITIONAL([HAVE_PO], [false]) ]) AC_SUBST(LTLIBINTL) -PKG_CHECK_MODULES(E, [enlightenment]) +PKG_CHECK_MODULES(E, [enlightenment 0.17.99]) release=$(pkg-config --variable=release enlightenment) MODULE_ARCH=$host_os-$host_cpu-$release AC_SUBST(MODULE_ARCH) -- -- This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev
[EGIT] [enlightenment/modules/mpdule] master 01/01: Update russian translation
garik pushed a commit to branch master. commit 00b58294fb4fd29c4f2830fcacae274c76626706 Author: Igor Murzov e-m...@date.by Date: Mon Jun 17 16:57:51 2013 +0400 Update russian translation --- po/ru.po | 48 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5aeeab0..4ea34bb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,15 +1,15 @@ # Russian translation of MPDule module # Copyright (c) 2012 Enlightenment development team # This file is distributed under the same license as the enlightenment package. -# Igor Murzov e-m...@date.by, 2012. +# Igor Murzov e-m...@date.by, 2012-2013. # msgid msgstr Project-Id-Version: mpdule 0.0.1\n Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n -POT-Creation-Date: 2012-10-28 21:35+0400\n -PO-Revision-Date: 2012-10-28 18:57+0400\n -Last-Translator: Igor Murzov e-m...@date.by\n +POT-Creation-Date: 2013-06-17 16:52+0400\n +PO-Revision-Date: 2013-06-17 16:52+0400\n +Last-Translator: Игорь Мурзов e-m...@date.by\n Language-Team: Russian r...@li.org\n Language: ru\n MIME-Version: 1.0\n @@ -20,51 +20,67 @@ msgstr msgid MPDule Configuration msgstr Конфигурация MPDule -#: src/e_mod_config.c:88 +#: src/e_mod_config.c:87 msgid Configuration msgstr Конфигурация -#: src/e_mod_config.c:89 +#: src/e_mod_config.c:88 msgid Poll Time: msgstr Интервал опроса: -#: src/e_mod_config.c:92 +#: src/e_mod_config.c:91 #, c-format msgid %1.0f seconds msgstr %1.0f секунд -#: src/e_mod_config.c:95 +#: src/e_mod_config.c:94 msgid Hostname: msgstr Имя хоста: -#: src/e_mod_config.c:102 +#: src/e_mod_config.c:101 msgid Port: msgstr Порт: -#: src/e_mod_config.c:109 +#: src/e_mod_config.c:106 msgid Show Popup msgstr Показывать всплывающую подсказку -#: src/e_mod_main.c:175 +#: src/e_mod_main.c:193 msgid MPDule msgstr -#: src/e_mod_main.c:217 +#: src/e_mod_main.c:231 msgid Settings msgstr Настройки -#: src/e_mod_main.c:495 src/e_mod_main.c:497 +#: src/e_mod_main.c:499 msgid Unknown msgstr Неизвестно -#: src/e_mod_main.c:502 src/e_mod_main.c:504 +#: src/e_mod_main.c:507 msgid Stopped msgstr Остановлено -#: src/e_mod_main.c:509 src/e_mod_main.c:511 +#: src/e_mod_main.c:515 msgid Playing msgstr Воспроизведение -#: src/e_mod_main.c:516 src/e_mod_main.c:518 +#: src/e_mod_main.c:523 msgid Paused msgstr Пауза + +#: src/e_mod_main.c:715 +msgid Artist: +msgstr Исполнитель: + +#: src/e_mod_main.c:716 +msgid Title: +msgstr Название: + +#: src/e_mod_main.c:717 +msgid Album: +msgstr Альбом: + +#: src/e_mod_main.c:718 +msgid Genre: +msgstr Жанр: -- -- This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev
Re: [E-devel] E-MODULES-EXTRA migration to git
On Thu, 13 Jun 2013 17:29:50 +0100 Tom Hacohen tom.haco...@samsung.com wrote: Hey, So, following up on: https://phab.enlightenment.org/T159 I'm migrating E-MODULES-EXTRA to git. I'm going to create a repo per module. I'm just interested to know, which modules would you guys like to see migrated? I use comp-scale, everything-places, everything-websearch, eweather, mpdule, net, news, places and photo modules. But I think you should not ask questions like this, you should migrate all modules to git. The work isn't manual, so what's the problem? If you believe some of the modules are broken or not maintained, you can move them to the legacy category. -- Igor -- This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 03/04: Make systray settings dialog translatable
garik pushed a commit to branch master.
commit d4176581fa66d8d3812800fca40d539c967a3e9f
Author: Igor Murzov e-m...@date.by
Date: Sun Jun 9 00:49:54 2013 +0400
Make systray settings dialog translatable
---
src/modules/systray/e_mod_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 0bd332d..318762e 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -72,7 +72,7 @@ _cfg_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas
*evas, E_Config_Dialo
{
Evas_Object *o, *of;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_check_add(evas, Enable Xembed, (cfdata-use_xembed));
+ of = e_widget_check_add(evas, _(Enable Xembed), (cfdata-use_xembed));
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@@ -113,7 +113,7 @@ _cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi
EINA_UNUSED)
v-basic.create_widgets = _cfg_widgets_create;
v-basic.apply_cfdata = _cfg_data_apply;
- e_config_dialog_new(m-zone-container, Systray Settings, E,
+ e_config_dialog_new(m-zone-container, _(Systray Settings), E,
_e_mod_systray_config_dialog,
NULL, 0, v, data);
}
@@ -130,7 +130,7 @@ _systray_menu_new(Instance *inst, Evas_Event_Mouse_Down *ev)
m = e_menu_new();
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, Settings);
+ e_menu_item_label_set(mi, _(Settings));
e_util_menu_item_theme_icon_set(mi, configure);
e_menu_item_callback_set(mi, _cb_menu_cfg, inst);
m = e_gadcon_client_util_menu_items_append(inst-gcc, m, 0);
--
--
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
[EGIT] [core/enlightenment] master 04/04: Add missing space to the message
garik pushed a commit to branch master. commit c1f51a82a65b415e079993233afae2b1e264009b Author: Igor Murzov e-m...@date.by Date: Sun Jun 9 18:57:55 2013 +0400 Add missing space to the message --- src/bin/e_configure_option.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c index fdc2fb0..d77cace 100644 --- a/src/bin/e_configure_option.c +++ b/src/bin/e_configure_option.c @@ -1603,7 +1603,7 @@ e_configure_option_init(void) OPT_MINMAX_STEP_FMT(0, 100, 2, _(%2.0f pixels)); OPT_ADD(BOOL, geometry_auto_move, _(Ensure initial placement of windows inside useful geometry), _(border), _(placement)); - OPT_HELP(_(Useful geometry is calculated as the screen size minus the geometry of any shelves which do not allow windows to overlap them. + OPT_HELP(_(Useful geometry is calculated as the screen size minus the geometry of any shelves which do not allow windows to overlap them. This option ensures that non-user placement of windows will be inside the useful geometry of the current screen)); OPT_ADD(BOOL, geometry_auto_resize_limit, _(Limit window autoresizing to useful geometry), _(border), _(placement), _(resize)); OPT_HELP(_(Useful geometry is calculated as the screen size minus the geometry of any shelves which do not allow windows to overlap them)); -- -- How ServiceNow helps IT people transform IT departments: 1. A cloud service to automate IT design, transition and operations 2. Dashboards that offer high-level views of enterprise services 3. A single system of record for all IT processes http://p.sf.net/sfu/servicenow-d2d-j
[EGIT] [core/enlightenment] master 02/04: Don't ask questions in systray settings dialog
garik pushed a commit to branch master.
commit 4d345be847470e028716c86a0c5500bc4b26c426
Author: Igor Murzov e-m...@date.by
Date: Sun Jun 9 01:04:56 2013 +0400
Don't ask questions in systray settings dialog
---
src/modules/systray/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index d3d6e6d..0bd332d 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -72,7 +72,7 @@ _cfg_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas
*evas, E_Config_Dialo
{
Evas_Object *o, *of;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_check_add(evas, Enable Xembed?, (cfdata-use_xembed));
+ of = e_widget_check_add(evas, Enable Xembed, (cfdata-use_xembed));
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
--
--
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
Re: [E-devel] Desktop hover
On Tue, 21 May 2013 20:48:13 +0200 Massimo Maiurana maiur...@gmail.com wrote: Michael Blumenkrantz, il 21/05/2013 19:52, ha scritto: On Tue, 21 May 2013 19:45:36 +0200 Massimo Maiurana maiur...@gmail.com wrote: The string in the subject is located in src/modules/gadman/e_mod_gadman.c:124, but I'm not really sure what it does and I need to know it to correctly translate it. Has it something to do with gadget moving on the desktop? this is the layer of gadgets which hovers over the desktop and must be toggled (using an action) to become visible. it's basically useless at the moment since gadman is so awful, but I have plans for it in the future Ok, thank you very much :) #: src/modules/gadman/e_mod_gadman.c:124 -#, fuzzy msgid Desktop Hover -msgstr File desktop +msgstr Sovrapposizione al desktop Wrong. Desktop Hover is the same thing as Hover (Key Toggle), which you have translated as Livello nascosto (tasti visualizzazione). These two messages should match. -- Igor -- Try New Relic Now We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 05/06: Update italian translation
garik pushed a commit to branch master. commit e26845645035f1c044653f9d7a0f8f708386d153 Author: Igor Murzov e-m...@date.by Date: Sat May 11 12:20:35 2013 +0400 Update italian translation --- po/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/it.po b/po/it.po index 3ba1650..fe3d11c 100644 --- a/po/it.po +++ b/po/it.po @@ -9632,7 +9632,7 @@ msgstr Geometria ridimensionamento #: src/modules/fileman/e_mod_config.c:355 src/modules/tasks/e_mod_config.c:86 #: src/modules/winlist/e_int_config_winlist.c:197 msgid Display -msgstr Visualizzazioni +msgstr Mostra #: src/modules/conf_window_manipulation/e_int_config_window_display.c:164 msgid Placement -- -- Learn Graph Databases - Download FREE O'Reilly Book Graph Databases is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
[EGIT] [core/enlightenment] master 01/01: Make gadcon locations translatable
garik pushed a commit to branch master.
commit abfe4e1b69856271a4e73a4a54d7fba19ac7f88a
Author: Igor Murzov e-m...@date.by
Date: Sun May 12 01:46:47 2013 +0400
Make gadcon locations translatable
---
src/bin/e_toolbar.c | 2 +-
src/modules/gadman/e_mod_gadman.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index 4d8df86..0a76337 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -125,7 +125,7 @@ _e_toolbar_gadget_add(void *data EINA_UNUSED,
E_Gadcon_Client *gcc, const E_Gadc
EINTERN int
e_toolbar_init(void)
{
- tb_location = e_gadcon_location_new(EFM Toolbar,
E_GADCON_SITE_EFM_TOOLBAR,
+ tb_location = e_gadcon_location_new(_(EFM Toolbar),
E_GADCON_SITE_EFM_TOOLBAR,
_e_toolbar_gadget_add, NULL,
_e_toolbar_gadget_remove, NULL);
e_gadcon_location_set_icon_name(tb_location, configure-toolbars);
diff --git a/src/modules/gadman/e_mod_gadman.c
b/src/modules/gadman/e_mod_gadman.c
index d02264b..97aa0d9 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -114,14 +114,14 @@ gadman_init(E_Module *m)
e_container_shape_change_callback_add(Man-container, on_shape_change,
NULL);
/* create and register desktop location */
- location = Man-location[GADMAN_LAYER_BG] =
e_gadcon_location_new(Desktop, E_GADCON_SITE_DESKTOP,
+ location = Man-location[GADMAN_LAYER_BG] =
e_gadcon_location_new(_(Desktop), E_GADCON_SITE_DESKTOP,
_e_gadman_client_add, NULL,
_e_gadman_client_remove, NULL);
e_gadcon_location_set_icon_name(location, preferences-desktop);
e_gadcon_location_register(location);
/* create and register desktop hover location */
- location = Man-location[GADMAN_LAYER_TOP] = e_gadcon_location_new(Desktop
Hover, E_GADCON_SITE_DESKTOP,
+ location = Man-location[GADMAN_LAYER_TOP] =
e_gadcon_location_new(_(Desktop Hover), E_GADCON_SITE_DESKTOP,
_e_gadman_client_add, NULL,
_e_gadman_client_remove, NULL);
e_gadcon_location_set_icon_name(location, preferences-desktop);
--
--
Learn Graph Databases - Download FREE O'Reilly Book
Graph Databases is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
[EGIT] [core/enlightenment] master 01/02: Partially revert commit 8d7c40c622
garik pushed a commit to branch master. commit 599ff00c260ad3a722430aeed49c4ed912fa3f21 Author: Igor Murzov e-m...@date.by Date: Sun May 5 00:33:45 2013 +0400 Partially revert commit 8d7c40c622 --- src/modules/illume-home-toggle/module.desktop.in | 29 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/modules/illume-home-toggle/module.desktop.in b/src/modules/illume-home-toggle/module.desktop.in index 92c7d91..f29587c 100644 --- a/src/modules/illume-home-toggle/module.desktop.in +++ b/src/modules/illume-home-toggle/module.desktop.in @@ -1,27 +1,6 @@ [Desktop Entry] Type=Link -Name=Mixer -Name[cs]=Ovládání hlasitosti -Name[de]=Mixer -Name[eo]=Sonmiksilo -Name[es]=Mezclador -Name[fr]=Mélangeur -Name[gl]=Xestor de son -Name[pt]=Gestor de som -Name[ru]=Микшер -Name[sr]=Мешач -Name[tr]=Karıştırıcı -Icon=preferences-desktop-mixer -Comment=A module to provide a mixer for changing volume. -Comment[cs]=Modul pro ovládání hlasitosti. -Comment[de]=Stellt einen Mixer zum Ändern der Lautstärke bereit -Comment[eo]=Modulo de sonmiksilo por sxanĝi la sonfortecon. -Comment[es]=Un módulo que proporciona un mezclador para cambiar el volumen. -Comment[fr]=Fournit un mélangeur pour régler le volume. -Comment[gl]=Un módulo que fornece un control para cambiar o volume. -Comment[it]=Un modulo che fornisce un mixer per regolare il volume. -Comment[pt]=Um módulo que disponibiliza um controlo para alterar o volume -Comment[ru]=Модуль для управления уровнями громкости. -Comment[sr]=Јединица која обезбеђује мешач звука за промену гласноће -Comment[tr]=Sesi ayarlarmak için kullanılan karıştırıcı modülü. -X-Enlightenment-ModuleType=system +Name=Illume-Home-Toggle +Icon=e-module-illume-home-toggle +X-Enlightenment-ModuleType=mobile +Comment= -- -- Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with 2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2
[EGIT] [core/enlightenment] master 02/02: Comment out outdated translations in .desktop file of conf_comp module.
garik pushed a commit to branch master. commit 60c687415a88f2d136146574accb3058e4ca Author: Igor Murzov e-m...@date.by Date: Sun May 5 00:42:13 2013 +0400 Comment out outdated translations in .desktop file of conf_comp module. Translations in .desktop file of conf_comp module are copied from one of now removed comp module. And as there is no tag 'fuzzy' for desktop files, translations that need to be updated are commented out. --- src/modules/conf_comp/module.desktop.in | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/modules/conf_comp/module.desktop.in b/src/modules/conf_comp/module.desktop.in index c72caa4..a4b0e52 100644 --- a/src/modules/conf_comp/module.desktop.in +++ b/src/modules/conf_comp/module.desktop.in @@ -1,23 +1,23 @@ [Desktop Entry] Type=Link Name=Composite Settings -Name[de]=Composite-Grafik -Name[eo]=Kunmetado -Name[es]=Composición -Name[gl]=Composición +#Name[de]=Composite-Grafik +#Name[eo]=Kunmetado +#Name[es]=Composición +#Name[gl]=Composición Name[it]=Compositing -Name[pt]=Composição +#Name[pt]=Composição Name[ru]=Настройка композитного режима -Name[tr]=Birleşiklik +#Name[tr]=Birleşiklik Icon=preferences-composite Comment=Enlightenment Composite Manager Settings -Comment[ru]=Настройки менеджера композитного режима -Comment[de]=Composite-Manager für Enlightenment -Comment[eo]=Administrilo de kunmetado por Enlightenment -Comment[es]=Administrador de composición de Enlightenment. -Comment[fr]=Gestionnaire de composite intégré. -Comment[gl]=Xestor de composición de Enlightenment. +#Comment[de]=Composite-Manager für Enlightenment +#Comment[eo]=Administrilo de kunmetado por Enlightenment +#Comment[es]=Administrador de composición de Enlightenment. +#Comment[fr]=Gestionnaire de composite intégré. +#Comment[gl]=Xestor de composición de Enlightenment. Comment[it]=Composite manager per Enlightenment. -Comment[pt]=Gestão de composição integrada -Comment[tr]=Enlightenment için birleşiklik yöneticisi +#Comment[pt]=Gestão de composição integrada +Comment[ru]=Настройки менеджера композитного режима +#Comment[tr]=Enlightenment için birleşiklik yöneticisi X-Enlightenment-ModuleType=settings -- -- Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with 2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2
[EGIT] [core/enlightenment] master 01/01: po/POTFILES.in: Sort filenames alphabetically, remove duplicates
garik pushed a commit to branch master. commit 288fea3b3e0ab9e5076b7905b9699090ed74f018 Author: Igor Murzov e-m...@date.by Date: Fri May 3 13:17:30 2013 +0400 po/POTFILES.in: Sort filenames alphabetically, remove duplicates --- po/POTFILES.in | 101 - 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 61f5046..ff09abe 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -20,10 +20,10 @@ src/bin/e_container.c src/bin/e_datastore.c src/bin/e_desk.c src/bin/e_desklock.c +src/bin/e_desktop_editor.c src/bin/e_dialog.c src/bin/e_dnd.c src/bin/e_dpms.c -src/bin/e_desktop_editor.c src/bin/e_entry.c src/bin/e_entry_dialog.c src/bin/e_error.c @@ -45,8 +45,8 @@ src/bin/e_hints.c src/bin/e_icon.c src/bin/e_ilist.c src/bin/e_imc_main.c -src/bin/e_import_dialog.c src/bin/e_import_config_dialog.c +src/bin/e_import_dialog.c src/bin/e_init.c src/bin/e_int_border_locks.c src/bin/e_int_border_menu.c @@ -54,10 +54,10 @@ src/bin/e_int_border_prop.c src/bin/e_int_border_remember.c src/bin/e_int_config_modules.c src/bin/e_int_gadcon_config.c -src/bin/e_int_toolbar_config.c -src/bin/e_intl.c src/bin/e_int_menus.c src/bin/e_int_shelf_config.c +src/bin/e_int_toolbar_config.c +src/bin/e_intl.c src/bin/e_ipc.c src/bin/e_ipc_codec.c src/bin/e_layout.c @@ -95,22 +95,22 @@ src/bin/e_sys.c src/bin/e_sys_main.c src/bin/e_table.c src/bin/e_test.c -src/bin/e_theme_about.c src/bin/e_theme.c +src/bin/e_theme_about.c src/bin/e_thumb.c src/bin/e_thumb_main.c src/bin/e_toolbar.c src/bin/e_user.c src/bin/e_utils.c +src/bin/e_widget.c src/bin/e_widget_aspect.c +src/bin/e_widget_bgpreview.c src/bin/e_widget_button.c -src/bin/e_widget.c src/bin/e_widget_check.c src/bin/e_widget_color_well.c src/bin/e_widget_config_list.c src/bin/e_widget_csel.c src/bin/e_widget_cslider.c -src/bin/e_widget_bgpreview.c src/bin/e_widget_entry.c src/bin/e_widget_filepreview.c src/bin/e_widget_font_preview.c @@ -145,31 +145,32 @@ src/modules/clock/e_mod_main.c src/modules/conf/e_conf.c src/modules/conf/e_mod_config.c src/modules/conf/e_mod_main.c -src/modules/conf2/e_mod_main.c src/modules/conf2/e_conf2.c -src/modules/conf_comp/e_mod_config.c -src/modules/conf_comp/e_mod_main.c -src/modules/conf_comp/e_mod_config.c -src/modules/conf_comp/e_mod_main.c +src/modules/conf2/e_mod_main.c src/modules/conf_applications/e_int_config_apps.c src/modules/conf_applications/e_int_config_apps_personal.c src/modules/conf_applications/e_int_config_defapps.c src/modules/conf_applications/e_int_config_deskenv.c src/modules/conf_applications/e_mod_main.c -src/modules/conf_dialogs/e_int_config_profiles.c +src/modules/conf_bindings/e_int_config_acpibindings.c +src/modules/conf_bindings/e_int_config_edgebindings.c +src/modules/conf_bindings/e_int_config_keybindings.c +src/modules/conf_bindings/e_int_config_mousebindings.c +src/modules/conf_bindings/e_int_config_signalbindings.c +src/modules/conf_bindings/e_mod_main.c +src/modules/conf_comp/e_mod_config.c +src/modules/conf_comp/e_mod_main.c src/modules/conf_dialogs/e_int_config_dialogs.c +src/modules/conf_dialogs/e_int_config_profiles.c src/modules/conf_dialogs/e_mod_main.c -src/modules/conf_display/e_int_config_display.c -src/modules/conf_display/e_int_config_desks.c src/modules/conf_display/e_int_config_desk.c -src/modules/conf_display/e_int_config_desklock_fsel.c src/modules/conf_display/e_int_config_desklock.c -src/modules/conf_display/e_int_config_screensaver.c +src/modules/conf_display/e_int_config_desklock_fsel.c +src/modules/conf_display/e_int_config_desks.c +src/modules/conf_display/e_int_config_display.c src/modules/conf_display/e_int_config_dpms.c +src/modules/conf_display/e_int_config_screensaver.c src/modules/conf_display/e_mod_main.c -src/modules/conf_bindings/e_int_config_edgebindings.c -src/modules/conf_bindings/e_int_config_signalbindings.c -src/modules/conf_bindings/e_mod_main.c src/modules/conf_interaction/e_int_config_interaction.c src/modules/conf_interaction/e_int_config_mouse.c src/modules/conf_interaction/e_mod_main.c @@ -177,14 +178,10 @@ src/modules/conf_intl/e_int_config_imc.c src/modules/conf_intl/e_int_config_imc_import.c src/modules/conf_intl/e_int_config_intl.c src/modules/conf_intl/e_mod_main.c -src/modules/conf_bindings/e_int_config_acpibindings.c -src/modules/conf_bindings/e_int_config_keybindings.c -src/modules/conf_bindings/e_int_config_mousebindings.c -src/modules/conf_bindings/e_mod_main.c src/modules/conf_menus/e_int_config_menus.c src/modules/conf_menus/e_mod_main.c -src/modules/conf_paths/e_int_config_paths.c src/modules/conf_paths/e_int_config_env.c +src/modules/conf_paths/e_int_config_paths.c src/modules/conf_paths/e_mod_main.c src/modules/conf_performance/e_int_config_engine.c src/modules/conf_performance/e_int_config_performance.c @@ -194,27 +191,28 @@ src/modules/conf_randr/e_int_config_randr.c src/modules
[EGIT] [apps/enjoy] master 01/01: Rename edbus - eldbus
garik pushed a commit to branch master.
commit d9981369669656209aa6b99d283816c91ef64921
Author: Igor Murzov e-m...@date.by
Date: Thu May 2 14:21:05 2013 +0400
Rename edbus - eldbus
---
configure.ac | 2 +-
src/bin/Makefile.am | 6 +-
src/bin/dbus.c| 48 +++---
src/bin/main.c| 2 +-
src/plugins/fso/Makefile.am | 4 +-
src/plugins/fso/fso.c | 40 ++---
src/plugins/mpris/Makefile.am | 4 +-
src/plugins/mpris/mpris.c | 380 +-
8 files changed, 243 insertions(+), 243 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1a57fe3..7a86407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AM_GNU_GETTEXT_VERSION([0.12.1])
AM_GNU_GETTEXT([external])
PKG_CHECK_MODULES([ECORE], [ecore])
-PKG_CHECK_MODULES([EDBUS], [edbus2])
+PKG_CHECK_MODULES([ELDBUS], [eldbus])
PKG_CHECK_MODULES([EFL], [ecore-file eina evas ecore-evas edje])
PKG_CHECK_MODULES([ELEMENTARY], [elementary])
PKG_CHECK_MODULES([EMOTION], [emotion])
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ab668e1..c0ba679 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
@EMOTION_CFLAGS@ \
@LMS_CFLAGS@ \
@SQLITE3_CFLAGS@ \
-@EDBUS_CFLAGS@
+@ELDBUS_CFLAGS@
bin_PROGRAMS = enjoy
if BUILD_QUICKLAUNCH
@@ -27,7 +27,7 @@ PREFS_PLUGINS = \
preferences_db_folder_add.c \
preferences_db_optimize.c
-enjoy_LDADD = @ELEMENTARY_LIBS@ @EFL_LIBS@ @ECORE_LIBS@ @EMOTION_LIBS@
@LMS_LIBS@ @SQLITE3_LIBS@ @EDBUS_LIBS@
+enjoy_LDADD = @ELEMENTARY_LIBS@ @EFL_LIBS@ @ECORE_LIBS@ @EMOTION_LIBS@
@LMS_LIBS@ @SQLITE3_LIBS@ @ELDBUS_LIBS@
enjoy_CFLAGS = -rdynamic
enjoy_SOURCES = main.c win.c db.c list.c page.c cover.c nowplaying.c
preferences.c $(PREFS_PLUGINS) dbus.c
@@ -41,7 +41,7 @@ if BUILD_QUICKLAUNCH
enjoy_qldir = $(quicklauncher_libdir)
enjoy_ql_LTLIBRARIES = enjoy_ql.la
enjoy_ql_la_SOURCES = main.c win.c db.c list.c page.c cover.c nowplaying.c
preferences.c $(PREFS_PLUGINS) dbus.c
-enjoy_ql_la_LIBADD = @ELEMENTARY_LIBS@ @EFL_LIBS@ @ECORE_LIBS@ @EMOTION_LIBS@
@LMS_LIBS@ @SQLITE3_LIBS@ @EDBUS_LIBS@
+enjoy_ql_la_LIBADD = @ELEMENTARY_LIBS@ @EFL_LIBS@ @ECORE_LIBS@ @EMOTION_LIBS@
@LMS_LIBS@ @SQLITE3_LIBS@ @ELDBUS_LIBS@
enjoy_ql_la_CFLAGS =
enjoy_ql_la_LDFLAGS = -module -avoid-version -no-undefined
enjoy_ql_SOURCES = main.c
diff --git a/src/bin/dbus.c b/src/bin/dbus.c
index 0eaf75d..dd9e8ba 100644
--- a/src/bin/dbus.c
+++ b/src/bin/dbus.c
@@ -3,72 +3,72 @@
#endif
#include private.h
-#include EDBus.h
+#include Eldbus.h
#define DBUS_NAME org.enlightenment.enjoy
#define DBUS_IFACE org.enlightenment.enjoy.Control
#define DBUS_PATH /org/enlightenment/enjoy/Control
-static EDBus_Connection *conn;
-static EDBus_Service_Interface *control;
+static Eldbus_Connection *conn;
+static Eldbus_Service_Interface *control;
-static EDBus_Message *
-_cb_dbus_quit(const EDBus_Service_Interface *iface __UNUSED__, const
EDBus_Message *msg)
+static Eldbus_Message *
+_cb_dbus_quit(const Eldbus_Service_Interface *iface __UNUSED__, const
Eldbus_Message *msg)
{
enjoy_quit();
- return edbus_message_method_return_new(msg);
+ return eldbus_message_method_return_new(msg);
}
-static EDBus_Message *
-_cb_dbus_version(const EDBus_Service_Interface *iface __UNUSED__, const
EDBus_Message *msg)
+static Eldbus_Message *
+_cb_dbus_version(const Eldbus_Service_Interface *iface __UNUSED__, const
Eldbus_Message *msg)
{
- EDBus_Message *reply = edbus_message_method_return_new(msg);
+ Eldbus_Message *reply = eldbus_message_method_return_new(msg);
uint16_t aj = VMAJ, in = VMIN, ic = VMIC;
- edbus_message_arguments_append(reply, qqq, aj, in, ic);
+ eldbus_message_arguments_append(reply, qqq, aj, in, ic);
return reply;
}
/* Avoid duplicating MPRIS -- see src/plugins/mpris */
-static const EDBus_Method control_methods[] = {
+static const Eldbus_Method control_methods[] = {
{ Quit, NULL, NULL, _cb_dbus_quit, 0 },
{
-Version, NULL, EDBUS_ARGS({q, }, {q, }, {q, }),
+Version, NULL, ELDBUS_ARGS({q, }, {q, }, {q, }),
_cb_dbus_version, 0
},
/* TODO: DB management */
{ }
};
-static const EDBus_Service_Interface_Desc desc = {
+static const Eldbus_Service_Interface_Desc desc = {
DBUS_IFACE, control_methods
};
static void
-_cb_dbus_request_name(void *data __UNUSED__, const EDBus_Message *msg,
EDBus_Pending *pending__UNUSED__)
+_cb_dbus_request_name(void *data __UNUSED__, const Eldbus_Message *msg,
Eldbus_Pending *pending__UNUSED__)
{
const char *error_name, *error_txt;
unsigned flag;
- if (edbus_message_error_get(msg, error_name, error_txt))
+ if (eldbus_message_error_get(msg, error_name, error_txt))
{
ERR(Error %s %s, error_name, error_txt);
goto end;
}
- if (!edbus_message_arguments_get(msg, u, flag))
+ if (!eldbus_message_arguments_get(msg, u, flag
[EGIT] [core/enlightenment] master 01/06: Gettextize bluez4 module
garik pushed a commit to branch master.
commit 2b86e82d6c3153cda28bcabe325011d88c92c8b5
Author: Igor Murzov e-m...@date.by
Date: Mon Apr 29 00:49:16 2013 +0400
Gettextize bluez4 module
---
po/POTFILES.in | 3 +++
src/modules/bluez4/agent.c | 37 +++--
src/modules/bluez4/e_mod_main.c | 38 +++---
src/modules/bluez4/ebluez4.c| 29 +++--
4 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f1bb74..3efda26 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -134,6 +134,9 @@ src/modules/access/e_mod_config.c
src/modules/backlight/e_mod_main.c
src/modules/battery/e_mod_config.c
src/modules/battery/e_mod_main.c
+src/modules/bluez4/agent.c
+src/modules/bluez4/e_mod_main.c
+src/modules/bluez4/ebluez4.c
src/modules/clock/e_mod_config.c
src/modules/clock/e_mod_main.c
src/modules/conf_comp/e_mod_config.c
diff --git a/src/modules/bluez4/agent.c b/src/modules/bluez4/agent.c
index e7fd227..e60a032 100644
--- a/src/modules/bluez4/agent.c
+++ b/src/modules/bluez4/agent.c
@@ -57,7 +57,7 @@ _create_dialog(const char *title, const char *msg,
con = e_container_current_get(e_manager_current_get());
dialog = e_dialog_new(con, title, class);
- e_dialog_title_set(dialog, title);
+ e_dialog_title_set(dialog, _(title));
e_dialog_icon_set(dialog, icon, 64);
e_dialog_text_set(dialog, msg);
return dialog;
@@ -68,7 +68,7 @@ _display_msg(const char *title, const char *msg)
{
E_Dialog *dialog = _create_dialog(title, msg, view-hidden-files,
display);
- e_dialog_button_add(dialog, OK, NULL, NULL, NULL);
+ e_dialog_button_add(dialog, _(OK), NULL, NULL, NULL);
e_dialog_show(dialog);
}
@@ -113,7 +113,7 @@ _ask(const char *title, const char *ask_msg, const char
*ok_label,
dialog-data = eldbus_message;
e_win_delete_callback_set(dialog-win, _close);
e_dialog_button_add(dialog, ok_label, NULL, _ok, NULL);
- e_dialog_button_add(dialog, Reject, NULL, _reject, NULL);
+ e_dialog_button_add(dialog, _(Reject), NULL, _reject, NULL);
e_dialog_show(dialog);
}
@@ -130,10 +130,10 @@ _agent_request_pin_code(const Eldbus_Service_Interface
*iface, const Eldbus_Mess
{
Eldbus_Message *msg = (Eldbus_Message *)message;
eldbus_message_ref(msg);
- e_entry_dialog_show(Pin Code Requested, NULL,
- Enter the PinCode above. It should have 1-16
- characters and can be alphanumeric., ,
- OK, Cancel, _pincode_ok, _cancel, msg);
+ e_entry_dialog_show(_(Pin Code Requested), NULL,
+ _(Enter the PinCode above. It should have 1-16
+ characters and can be alphanumeric.), ,
+ _(OK), _(Cancel), _pincode_ok, _cancel, msg);
return NULL;
}
@@ -142,9 +142,10 @@ _agent_request_passkey(const Eldbus_Service_Interface
*iface, const Eldbus_Messa
{
Eldbus_Message *msg = (Eldbus_Message *)message;
eldbus_message_ref(msg);
- e_entry_dialog_show(Passkey Requested, NULL, Enter the Passkey above.
- It should be a numeric value between 0-99.,
- 0, OK, Cancel, _passkey_ok, _cancel, msg);
+ e_entry_dialog_show(_(Passkey Requested), NULL,
+ _(Enter the Passkey above.
+ It should be a numeric value between 0-99.),
+ 0, _(OK), _(Cancel), _passkey_ok, _cancel, msg);
return NULL;
}
@@ -159,9 +160,9 @@ _agent_display_passkey(const Eldbus_Service_Interface
*iface, const Eldbus_Messa
if(!eldbus_message_arguments_get(message, ouq, device, passkey,
entered))
return eldbus_message_error_new(message, BLUEZ_ERROR_FAILED,
GET_ERROR_MSG);
dev = eina_list_search_unsorted(ctxt-devices, ebluez4_dev_path_cmp,
device);
- snprintf(buf, sizeof(buf), %d keys were typed on %s. Passkey is %06d,
+ snprintf(buf, sizeof(buf), _(%d keys were typed on %s. Passkey is %06d),
entered, dev-name, passkey);
- _display_msg(Display Passkey, buf);
+ _display_msg(N_(Display Passkey), buf);
return eldbus_message_method_return_new(message);
}
@@ -174,8 +175,8 @@ _agent_display_pin_code(const Eldbus_Service_Interface
*iface, const Eldbus_Mess
if(!eldbus_message_arguments_get(message, os, device, pincode))
return eldbus_message_error_new(message, BLUEZ_ERROR_FAILED,
GET_ERROR_MSG);
dev = eina_list_search_unsorted(ctxt-devices, ebluez4_dev_path_cmp,
device);
- snprintf(buf, sizeof(buf), Pincode for %s is %s, dev-name, pincode);
- _display_msg(Display Pincode, buf);
+ snprintf(buf, sizeof(buf), _(Pincode for %s is %s), dev-name, pincode);
+ _display_msg(N_(Display Pincode), buf);
return eldbus_message_method_return_new(message);
}
@@ -189,10 +190,10 @@ _agent_request_confirmation(const
[EGIT] [core/enlightenment] master 04/06: Fix thinkos
garik pushed a commit to branch master. commit c449a14ce53602816944957f68a374221cf8f0da Author: Igor Murzov e-m...@date.by Date: Mon Apr 29 11:19:51 2013 +0400 Fix thinkos --- src/bin/e_configure_option.c | 4 ++-- src/modules/appmenu/module.desktop.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c index 9f96fa3..54a3458 100644 --- a/src/bin/e_configure_option.c +++ b/src/bin/e_configure_option.c @@ -1674,7 +1674,7 @@ e_configure_option_init(void) OPT_ADD(BOOL, move_info_follows, _(Window position info follows window when moving), _(border), _(placement), _(move)); OPT_ADD(BOOL, resize_info_follows, _(Window geometry info follows window when resizing), _(border), _(placement), _(resize)); OPT_ADD(BOOL, move_info_visible, _(Window position info visible when moving), _(border), _(placement), _(move)); - OPT_ADD(BOOL, resize_info_visible, _(Window geometry info visible when moving), _(border), _(placement), _(resize)); + OPT_ADD(BOOL, resize_info_visible, _(Window geometry info visible when resizing), _(border), _(placement), _(resize)); /* FIXME */ //OPT_ADD(CUSTOM, input_method, _(Input method), _(input), _(language)); @@ -1937,7 +1937,7 @@ e_configure_option_init(void) OPT_ADD(DOUBLE_UINT, powersave.max, _(powersave)); OPT_MINMAX_STEP_FMT(E_POWERSAVE_MODE_NONE, E_POWERSAVE_MODE_EXTREME); */ - OPT_ADD(BOOL, deskenv.load_xrdb, _(Load ~/.xrdb on startup), _(environment)); + OPT_ADD(BOOL, deskenv.load_xrdb, _(Load ~/.Xresources on startup), _(environment)); OPT_ADD(BOOL, deskenv.load_xmodmap, _(Load ~/.Xmodmap), _(environment)); OPT_ADD(BOOL, deskenv.load_gnome, _(Run gnome-settings-daemon), _(environment)); OPT_ADD(BOOL, deskenv.load_kde, _(Run kdeinit), _(environment)); diff --git a/src/modules/appmenu/module.desktop.in b/src/modules/appmenu/module.desktop.in index b7cdbc5..5e9c84c 100644 --- a/src/modules/appmenu/module.desktop.in +++ b/src/modules/appmenu/module.desktop.in @@ -2,6 +2,6 @@ Type=Link Name=Application Menu Icon=e-module-appmenu -Comment=Gadget that hold the toolbar of the foreground application. +Comment=Gadget that holds the menubar of the foreground application. Comment[it]=Gadget che contiene la barra degli strumenti dell'applicazione in primo piano. X-Enlightenment-ModuleType=utils -- -- Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagnostics for performance bottlenecks with 2% overhead Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap1
[EGIT] [core/elementary] master 01/01: Install CMake config to the proper path
garik pushed a commit to branch master. commit bf94572657c0dce2beacb1f319238f43029da90f Author: Igor Murzov e-m...@date.by Date: Sun Apr 14 02:09:58 2013 +0400 Install CMake config to the proper path --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ef7abd3..c7b7b23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,7 @@ config.rpath pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = elementary.pc -cmakeconfigdir = $(prefix)/share/cmake/Modules +cmakeconfigdir = $(libdir)/cmake/Elementary cmakeconfig_DATA = \ cmakeconfig/ElementaryConfig.cmake \ cmakeconfig/ElementaryConfigVersion.cmake -- -- Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter
[EGIT] [apps/ephoto] master 01/01: Add list of supported images format in .desktop file.
garik pushed a commit to branch master. commit aec77f4a3c690330a1d18349e65a75eeaf637186 Author: Igor Murzov e-m...@date.by Date: Sun Apr 14 15:19:11 2013 +0400 Add list of supported images format in .desktop file. NOTE: Raw formats are missing. --- data/desktop/ephoto.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/data/desktop/ephoto.desktop b/data/desktop/ephoto.desktop index 49cad92..33a11f7 100644 --- a/data/desktop/ephoto.desktop +++ b/data/desktop/ephoto.desktop @@ -13,3 +13,4 @@ Icon=ephoto Terminal=false Type=Application Categories=Graphics;Viewer; +MimeType=inode/directory;image/png;image/jpeg;image/pjpeg;image/x-xpixmap;image/tiff;image/svg+xml;image/svg+xml-compressed;image/gif;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/bmp;image/x-bmp;image/x-tga;image/vnd.wap.wbmp;image/webp;image/vnd.microsoft.icon;image/ico;image/x-ico;image/x-win-bitmap;image/vnd.adobe.photoshop;image/x-psd;application/pdf;application/x-pdf;image/pdf;application/postscript;image/x-xcf;image/x-compre [...] -- -- Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter
[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.1-3-g94b7e63
The following commit has been merged in the master branch: commit 0354981b1f348263edb7c2e6f1f8dc619a48c476 Author: Igor Murzov e-m...@date.by Date: Sat Apr 6 03:38:30 2013 +0400 feh: Add new sort type diff --git a/completions/feh b/completions/feh index e53ca2b..3b2d440 100644 --- a/completions/feh +++ b/completions/feh @@ -52,8 +52,8 @@ _feh() return ;; -S|--sort) -COMPREPLY=( $( compgen -W 'name filename width height pixels size -format' -- $cur ) ) +COMPREPLY=( $( compgen -W 'name filename mtime width height +pixels size format' -- $cur ) ) return ;; -R|--reload|-H|--limit-height|-W|--limit-width|-E|--thumb-height|\ -- bash-completion ___ Bash-completion-commits mailing list Bash-completion-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.1-3-g94b7e63
The following commit has been merged in the master branch:
commit 6cb7f969745dd6b2075dd61244f8e60445a6a3d5
Author: Igor Murzov e-m...@date.by
Date: Sat Apr 6 03:40:32 2013 +0400
kcov: Add new sort types, complete --replace-src-path arguments
diff --git a/completions/kcov b/completions/kcov
index 86d2d10..3fa06f1 100644
--- a/completions/kcov
+++ b/completions/kcov
@@ -3,7 +3,7 @@
_kcov()
{
local cur prev words cword split
-_init_completion -s || return
+_init_completion -s -n : || return
case $prev in
--pid|-p)
@@ -11,25 +11,31 @@ _kcov()
return
;;
--sort-type|-s)
-COMPREPLY=( $( compgen -W 'filename percentage lines uncovered' \
--- $cur ) )
+COMPREPLY=( $( compgen -W 'filename percent reverse lines
+uncovered' -- $cur ) )
return
;;
--include-path|--exclude-path)
_filedir
return
;;
+--replace-src-path)
+if [[ $cur == ?*:* ]]; then
+cur=${cur##*:}
+_filedir
+else
+_filedir
+compopt -o nospace
+fi
+return
+;;
--limits|-l)
-split=false
if [[ $cur == ?*,* ]]; then
prev=${cur%,*}
cur=${cur##*,}
-split=true
-fi
-COMPREPLY=( $( compgen -W {0..100} -- $cur ) )
-if $split; then
-COMPREPLY=( ${COMPREPLY[@]/#/$prev,} )
+COMPREPLY=( $( compgen -P $prev, -W {0..100} -- $cur ) )
else
+COMPREPLY=( $( compgen -W {0..100} -- $cur ) )
compopt -o nospace
fi
return
--
bash-completion
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
[Bash-completion-devel] configs for cmake build system
Hi, list :)
I have finally finished integration of cmake configs into
bash-completion. Those configs do pretty much the same
things that pkg-config does. The reason for inclusion of
cmake configs is that some projects use cmake as a build
system and avoid using autotools and pkg-config (most notably
CMake itself).
Here is the patch:
--
From b07c113e6746db0d5a2c32d1e91ef90c760987e1 Mon Sep 17 00:00:00 2001
From: Igor Murzov e-m...@date.by
Date: Mon, 19 Mar 2012 00:49:57 +0400
Subject: [PATCH] Add config for cmake to bash-completion.
This will allow projects using cmake to get information about
bash-completion. This works much like pkg-config files.
---
.gitignore | 2 ++
Makefile.am | 6 ++
bash-completion-config-version.cmake.in | 7 +++
bash-completion-config.cmake.in | 11 +++
configure.ac| 11 ++-
5 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 bash-completion-config-version.cmake.in
create mode 100644 bash-completion-config.cmake.in
diff --git a/.gitignore b/.gitignore
index 742b7e3..083411e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ doc/*.xml
doc/html*
bash_completion.sh
bash-completion.pc
+bash-completion-config.cmake
+bash-completion-config-version.cmake
diff --git a/Makefile.am b/Makefile.am
index dbbba0c..ea49abb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,10 @@ profile_DATA = bash_completion.sh
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = bash-completion.pc
+cmakeconfigdir = $(libdir)/cmake/$(PACKAGE)/
+cmakeconfig_DATA = bash-completion-config.cmake \
+ bash-completion-config-version.cmake
+
bash_completion.sh: bash_completion.sh.in Makefile
sed -e 's|@pkgdatadir[@]|$(pkgdatadir)|' $(srcdir)/$@.in $@
@@ -25,3 +29,5 @@ install-data-hook:
$(DESTDIR)$(pkgdatadir)/bash_completion $$tmpfile \
cat $$tmpfile $(DESTDIR)$(pkgdatadir)/bash_completion \
rm $$tmpfile
+ sed -i -e 's|\$${prefix}|$(prefix)|' \
+ $(DESTDIR)$(libdir)/cmake/$(PACKAGE)/bash-completion-config.cmake
diff --git a/bash-completion-config-version.cmake.in
b/bash-completion-config-version.cmake.in
new file mode 100644
index 000..265e075
--- /dev/null
+++ b/bash-completion-config-version.cmake.in
@@ -0,0 +1,7 @@
+set (PACKAGE_VERSION @VERSION@)
+if (NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
+ set (PACKAGE_VERSION_COMPATIBLE 1)
+ if (${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+set (PACKAGE_VERSION_EXACT 1)
+ endif ()
+endif ()
diff --git a/bash-completion-config.cmake.in b/bash-completion-config.cmake.in
new file mode 100644
index 000..402b7b6
--- /dev/null
+++ b/bash-completion-config.cmake.in
@@ -0,0 +1,11 @@
+# config file for bash-completion
+# http://bash-completion.alioth.debian.org/
+
+set (BASH_COMPLETION_VERSION @VERSION@)
+
+set (BASH_COMPLETION_PREFIX @prefix@)
+set (BASH_COMPLETION_COMPATDIR @compatdir@)
+set (BASH_COMPLETION_COMPLETIONSDIR @datarootdir@/@PACKAGE@/completions)
+set (BASH_COMPLETION_HELPERSDIR @datarootdir@/@PACKAGE@/helpers)
+
+set (BASH_COMPLETION_FOUND TRUE)
diff --git a/configure.ac b/configure.ac
index 3dd17c6..23d2b4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,5 +4,14 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall
-Werror])
AC_PROG_LN_S
AC_PROG_MKDIR_P
AC_SUBST(compatdir, $sysconfdir/bash_completion.d)
-AC_CONFIG_FILES([Makefile completions/Makefile doc/Makefile helpers/Makefile
test/Makefile bash-completion.pc])
+AC_CONFIG_FILES([
+Makefile
+completions/Makefile
+doc/Makefile
+helpers/Makefile
+test/Makefile
+bash-completion.pc
+bash-completion-config.cmake
+bash-completion-config-version.cmake
+])
AC_OUTPUT
--
1.8.2
--
The code is a bit hackish, but i'm not aware of the better way to integrate
cmake configs into autotools. So comments are welcome.
And here is an example of how to use cmake configs to install completion
scripts in the proper path:
--
CMakeLists.txt| 7 ++
completion/CMakeLists.txt | 3 +++
completion/kcov.bash | 58 +++
3 files changed, 68 insertions(+)
create mode 100644 completion/CMakeLists.txt
create mode 100644 completion/kcov.bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 727e907..66be76f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,10 @@ endif(NOT CMAKE_BUILD_TYPE)
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
find_package (PkgConfig REQUIRED)
+find_package (bash-completion)
+if (NOT BASH_COMPLETION_FOUND)
+message (WARNING Failed to find bash-completion.)
+endif (NOT BASH_COMPLETION_FOUND
Re: [E-devel] Enjoy - migration to git
On Wed, 03 Apr 2013 10:36:11 +0100 Daniel Willmann d.willm...@samsung.com wrote: On 02/04/13 11:56, Daniel Willmann wrote: On 01/04/13 10:33, Igor Murzov wrote: On Sun, 31 Mar 2013 18:09:19 -0300 Rafael Antognolli antogno...@gmail.com wrote: Hey guys, could you please do this for me? And ephoto, please ^_^ This might take me until tomorrow. Take a look here: http://git.enlightenment.org/devs/asdfuser/migrate/ephoto.git/ If it looks okay I'll move it. Looks good. Thanks. -- Igor -- Minimize network downtime and maximize team effectiveness. Reduce network management and security costs.Learn how to hire the most talented Cisco Certified professionals. Visit the Employer Resources Portal http://www.cisco.com/web/learning/employer_resources/index.html ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [Bash-completion-devel] Time to release 2.1?
On Wed, 27 Mar 2013 21:28:37 +0200 Ville Skyttä ville.sky...@iki.fi wrote: Hello, WDYT, would it be time to release 2.1? I think enough useful things have been added since 2.0, and there's nothing intrusive and nothing larger in progress AFAIK so now could be a good time to do it. Do we still have a release manager? -- Igor ___ Bash-completion-devel mailing list Bash-completion-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
Re: [E-devel] Enjoy - migration to git
On Sun, 31 Mar 2013 18:09:19 -0300 Rafael Antognolli antogno...@gmail.com wrote: Hey guys, could you please do this for me? And ephoto, please ^_^ -- Igor -- Own the Future-Intelreg; Level Up Game Demo Contest 2013 Rise to greatness in Intel's independent game demo contest. Compete for recognition, cash, and the chance to get your game on Steam. $5K grand prize plus 10 genre and skill prizes. Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 2.0-142-ge191799
The following commit has been merged in the master branch:
commit e191799dea5b38272dba7e5efe60b3adf86311e5
Author: AllKind allk...@fastest.cc
Date: Wed Mar 6 00:40:06 2013 +0100
Fix __ltrim_colon_completions() fail on parameter (\$1) containing a glob.
diff --git a/bash_completion b/bash_completion
index aa61c86..41b4bc0 100644
--- a/bash_completion
+++ b/bash_completion
@@ -509,7 +509,7 @@ __ltrim_colon_completions()
{
if [[ $1 == *:* $COMP_WORDBREAKS == *:* ]]; then
# Remove colon-word prefix from COMPREPLY items
-local colon_word=${1%${1##*:}}
+local colon_word=${1%${1##*:}}
local i=${#COMPREPLY[*]}
while [[ $((--i)) -ge 0 ]]; do
COMPREPLY[$i]=${COMPREPLY[$i]#$colon_word}
--
bash-completion
___
Bash-completion-commits mailing list
Bash-completion-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
Re: [Bash-completion-devel] -option=word1|word2|word3
On Mon, 4 Feb 2013 11:01:48 +0100 Dr. med. Christoph Gille christoph.gi...@charite.de wrote: I am new to this list and need help. I am writing a bash completion for a program. The option -aligner=... takes one from a list of words. For instance -aligner=t_coffee -aligner=clustalw It should work from version 3 to on newest bash. Do you know a simple example of a script from where I could learn how to do it? Start from reading Programmable Completion section in bash manual, then proceed to `compgen' and `complete' builtin commands description. If you plan to integrate your completion with bash-completion, then there are plenty of example scripts for you to learn from in the bash-completion distribution. If you don't want to depend on bash-completion, then I'd recommend to look into this completion: http://code.google.com/p/sbopkg/source/browse/trunk/src/usr/doc/contrib/sbopkg.bash it's simple and quite clear. -- Igor ___ Bash-completion-devel mailing list Bash-completion-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-devel
Re: [E-devel] elemines 0.2
On Sat, 2 Feb 2013 13:05:32 +0900 Jérôme Pinot ngc...@gmail.com wrote: On 02/01/13 02:57, Igor Murzov wrote: On Sun, 20 Jan 2013 17:46:18 +0900 Jérôme Pinot ngc...@gmail.com wrote: I would like to announce the availability of elemines 0.2, the EFL minesweeper clone. This new version has some improvements, like: - scores management (using etrophy library) - in game configuration - middle click support (thanks to Sebastian Dransfeld) Middle click is still broken in elemines 0.2.1. Middle click should always open all remaining surrounding squares even if player set his flags to incorrect positions. In this case player should obviously stumble on a mine and lose the game. Well, I though that it was the expected behavior to do nothing if the flags was not correct. No. There are no second chances on a mine field :) Open wrong square -- lose the game, that's it. I'm not very familiar with this feature and just added it because someone was nice enough to contribute it. Please try the this patch and let me know if it now works as expected. It didn't work as expected, so i changed the behaviour of elemines, so it behaves as i think it should. You can find the patches in attachments. Also, if you didn't push the translation yet, please reset it and apply new patch, which fixes one small translation issue. Thanks. -- Igor 0001-Add-russian-translation.patch.gz Description: GNU Zip compressed data 0002-Refactor-and-improve-_clean-function.patch.gz Description: GNU Zip compressed data 0003-Fix-middle-click-once-again.patch.gz Description: GNU Zip compressed data 0004-Fix-flags-accounting.patch.gz Description: GNU Zip compressed data 0005-Validate-user-data-to-prevent-endless-loop.patch.gz Description: GNU Zip compressed data -- Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E17 crashes with EFL 1.7
On Fri, 1 Feb 2013 09:41:54 +0900 Daniel Juyung Seo seojuyu...@gmail.com wrote: Hello I tried to use EFL 1.7 + E17 from e/branches. It fails to start with the following crash. http://www.enlightenment.org/~seoz/e17-crash.txt This is my build script. http://trac.enlightenment.org/e/browser/trunk/devs/seoz/build_e17.sh Anybody has any idea? What revision is that? Does your E include r83539: authordiscomfitor 2013-02-01 07:48:19 (GMT) fix xkb crash ? -- Igor -- Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_jan ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
