diff --git a/configure.ac b/configure.ac index d6e2d98..dd371c6 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(places, 0.2.0, dave@gurumeditation.it) +AC_INIT(places, 0.5.0, dave@gurumeditation.it) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(configure.ac) AC_CANONICAL_BUILD @@ -59,7 +59,7 @@ AC_MSG_CHECKING([Which edje_cc to use]) AC_MSG_RESULT(${EDJE_CC}) -# check for udisks (default enabled) +# check for udisks, using e_dbus v1 (default enabled) (DEPRECATED) PKG_CHECK_MODULES([E_UDISKS], [dbus-1 edbus eukit >= 1.0.999], [have_udisks="yes"], [have_udisks="no"]) want_udisks=yes @@ -73,6 +73,20 @@ fi AM_CONDITIONAL([HAVE_UDISKS], [test "x$have_udisks" = "xyes"]) test "x$have_udisks" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_UDISKS], [1], [enable Udisks support]) +# check for edbus v2 (default enabled) +PKG_CHECK_MODULES([EDBUS2], [edbus2 >= 1.7.99], + [have_edbus2="yes"], [have_edbus2="no"]) +want_edbus2=yes +AC_ARG_ENABLE([edbus2], + AS_HELP_STRING([--enable-edbus2],[enable UDisks with edbus2 support @<:@default=disabled@:>@]), + [want_edbus2=$enableval]) +if test "x$want_edbus2" = "xno";then + have_edbus2=no +fi + +AM_CONDITIONAL([HAVE_EDBUS2], [test "x$have_edbus2" = "xyes"]) +test "x$have_edbus2" = "xyes" && AC_DEFINE_UNQUOTED([HAVE_EDBUS2], [1], [enable edbus2 support]) + # check for eeze (default disabled) PKG_CHECK_MODULES([EEZE], [eeze >= 1.1.99], [have_eeze="yes"], [have_eeze="no"]) @@ -122,7 +136,8 @@ SUMMARY_EOF echo cat << DEVICE_EOF Device Backends: - * build udisks....: $have_udisks - * build eeze......: $have_eeze (TO BE DONE) + * build udisks (e_dbus v1)....: $have_udisks (deprecated) + * build udisks (edbus v2)....: $have_edbus2 (suggested) + * build eeze..................: $have_eeze (experimental) DEVICE_EOF echo diff --git a/e-module-places.edc b/e-module-places.edc index 8ffb13b..be71244 100644 --- a/e-module-places.edc +++ b/e-module-places.edc @@ -340,28 +340,28 @@ collections color: 255 255 255 0; } description { state: "ext3" 0.0; - image.normal: "tag_ext3.png"; inherit: "default" 0.0; + image.normal: "tag_ext3.png"; color: 255 255 255 240; } description { state: "fat" 0.0; - image.normal: "tag_fat.png"; inherit: "default" 0.0; + image.normal: "tag_fat.png"; color: 255 255 255 240; } description { state: "hfs" 0.0; - image.normal: "tag_hfs.png"; inherit: "default" 0.0; + image.normal: "tag_hfs.png"; color: 255 255 255 240; } description { state: "ufs" 0.0; - image.normal: "tag_ufs.png"; inherit: "default" 0.0; + image.normal: "tag_ufs.png"; color: 255 255 255 240; } description { state: "dvd" 0.0; - image.normal: "tag_dvd.png"; inherit: "default" 0.0; + image.normal: "tag_dvd.png"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 0.5; color: 255 255 255 240; diff --git a/po/ar.po b/po/ar.po index 5f6e46b..56d6e48 100644 --- a/po/ar.po +++ b/po/ar.po @@ -5,118 +5,129 @@ msgid "" msgstr "" "Project-Id-Version: Places module\n" -"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n" -"POT-Creation-Date: 2011-01-16 03:00-0800\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-01-24 20:44+0300\n" "Last-Translator: سمير حسين \n" "Language-Team: Arabic \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: Arabic\n" "X-Poedit-Country: SAUDI ARABIA\n" "X-Poedit-SourceCharset: utf-8\n" -#. create new config dialog -#: ../src/e_mod_config.c:51 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "إعدادات اﻷماكن" -#. General frame -#: ../src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "عام" -#: ../src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "اعرض في القائمة الرئيسية" -#: ../src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "أوصل الحجوم (( ...HDD , flash )) عند اﻹدخال" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "أوصل الحجوم (( ...HDD , flash )) عند اﻹدخال" -#: ../src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "افتح مدير الملفات عند اﻹدخال" -#: ../src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "استخدم مدير ملف مخصص" -#. Display frame -#: ../src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "اعرض في القائمة" -#: ../src/e_mod_config.c:149 -#: ../src/e_mod_places.c:408 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "المنزل" -#: ../src/e_mod_config.c:152 -#: ../src/e_mod_places.c:417 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "سطح المكتب" -#: ../src/e_mod_config.c:155 -#: ../src/e_mod_places.c:427 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "سلة المهملات" -#: ../src/e_mod_config.c:158 -#: ../src/e_mod_places.c:207 -#: ../src/e_mod_places.c:436 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "نظام ملفات" -#: ../src/e_mod_config.c:161 -#: ../src/e_mod_places.c:445 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "مؤقتة" -#: ../src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "مفضلة" -#. Display this Modules config info in the main Config Panel -#: ../src/e_mod_main.c:58 +#: src/e_mod_main.c:59 msgid "Files" msgstr "ملفات" -#: ../src/e_mod_main.c:60 -#: ../src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "أماكن" -#: ../src/e_mod_main.c:430 +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Configuration" + +#: src/e_mod_main.c:434 msgid "Settings" msgstr "اﻹعدادات" -#: ../src/e_mod_places.c:212 +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "بلا اسم" -#: ../src/e_mod_places.c:693 +#: src/e_mod_places.c:629 msgid "free of" msgstr "تخلص من" -#: ../src/e_mod_places.c:699 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s لم يوصل" -#: ../src/e_mod_places.c:716 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "إفصل" -#: ../src/e_mod_places.c:722 +#: src/e_mod_places.c:667 msgid "eject" msgstr "اخرج" -#~ msgid "Places Configuration" -#~ msgstr "Configuration" - #~ msgid "Configuration" #~ msgstr "Configuration" diff --git a/po/cs.po b/po/cs.po index 60c1a4b..304a3e1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Places\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-10-16 14:36+0200\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2011-10-15 12:46+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -17,99 +17,116 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#. create new config dialog -#: ../src/e_mod_config.c:52 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Nastavení modulu Místa" -#. General frame -#: ../src/e_mod_config.c:119 +#: src/e_mod_config.c:136 msgid "General" msgstr "Obecné" -#: ../src/e_mod_config.c:122 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Zobrazit v hlavním menu" -#: ../src/e_mod_config.c:126 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Připojit zařízení při vložení" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Připojit zařízení při vložení" -#: ../src/e_mod_config.c:130 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Otevřít správce souborů při vložení" -#: ../src/e_mod_config.c:134 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Použít vlastní správce souborů" -#. Display frame -#: ../src/e_mod_config.c:147 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Zobrazit v nabídce" -#: ../src/e_mod_config.c:150 ../src/e_mod_places.c:470 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Domovská složka" -#: ../src/e_mod_config.c:153 ../src/e_mod_places.c:479 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Plocha" -#: ../src/e_mod_config.c:156 ../src/e_mod_places.c:489 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Koš" -#: ../src/e_mod_config.c:159 ../src/e_mod_places.c:268 -#: ../src/e_mod_places.c:498 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Systém souborů" -#: ../src/e_mod_config.c:162 ../src/e_mod_places.c:507 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Dočasné" -#: ../src/e_mod_config.c:165 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Oblíbené" -#. Display this Modules config info in the main Config Panel -#: ../src/e_mod_main.c:58 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Soubory" -#: ../src/e_mod_main.c:60 ../src/e_mod_places.c:564 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Místa" -#: ../src/e_mod_main.c:412 +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Nastavení modulu Místa" + +#: src/e_mod_main.c:434 msgid "Settings" msgstr "Nastavení" -#: ../src/e_mod_places.c:273 +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Beze jména" -#: ../src/e_mod_places.c:779 +#: src/e_mod_places.c:629 msgid "free of" msgstr "volných z" -#: ../src/e_mod_places.c:785 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s Není připojeno" -#: ../src/e_mod_places.c:802 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "odpojit" -#: ../src/e_mod_places.c:808 +#: src/e_mod_places.c:667 msgid "eject" msgstr "vysunout" -#~ msgid "Places Configuration" -#~ msgstr "Nastavení modulu Místa" - #~ msgid "Configuration" #~ msgstr "Konfigurace" diff --git a/po/de.po b/po/de.po index c9f3ea2..feaea8a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Places (e17)\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2011-01-09 18:22+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2010-02-28 12:13+0100\n" "Last-Translator: Fabian Nowak \n" "Language-Team: \n" @@ -17,94 +17,116 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/e_mod_config.c:51 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Einstellungen für das Orte-Modul" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Allgemein" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Im Hauptmenü zeigen" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Laufwerke beim Einlegen einbinden" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Laufwerke beim Einlegen einbinden" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Dateimanager automatisch starten" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Benutzerdefinierten Dateimanager verwenden" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Im Menü zeigen" -#: src/e_mod_config.c:149 src/e_mod_places.c:408 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Persönlicher Ordner" -#: src/e_mod_config.c:152 src/e_mod_places.c:417 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Desktop" -#: src/e_mod_config.c:155 src/e_mod_places.c:427 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Mülleimer" -#: src/e_mod_config.c:158 src/e_mod_places.c:207 src/e_mod_places.c:436 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Dateisystem" -#: src/e_mod_config.c:161 src/e_mod_places.c:445 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Temporäre Daten" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Favoriten" -#: src/e_mod_main.c:58 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Dateien" -#: src/e_mod_main.c:60 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Orte" -#: src/e_mod_main.c:430 +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Konfiguration der Orte" + +#: src/e_mod_main.c:434 msgid "Settings" msgstr "Einstellungen" -#: src/e_mod_places.c:212 +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Kein Name" -#: src/e_mod_places.c:693 +#: src/e_mod_places.c:629 msgid "free of" msgstr "frei von" -#: src/e_mod_places.c:699 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s nicht eingehängt" -#: src/e_mod_places.c:716 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "Aushängen" -#: src/e_mod_places.c:722 +#: src/e_mod_places.c:667 msgid "eject" msgstr "Auswerfen" -#~ msgid "Places Configuration" -#~ msgstr "Konfiguration der Orte" - #~ msgid "Configuration" #~ msgstr "Konfiguration" diff --git a/po/el.po b/po/el.po index b4e417a..23d54bd 100644 --- a/po/el.po +++ b/po/el.po @@ -7,100 +7,129 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-02-28 12:14+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2008-12-07 16:43+0200\n" "Last-Translator: \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: src/e_mod_config.c:51 -msgid "Places Configuration" -msgstr "Ρύθμιση Τοποθεσιών" +#: src/e_mod_config.c:54 +msgid "Places Settings" +msgstr "" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Γενικά" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Προσάρτηση τόμων κατα την εισαγωγή" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Προσάρτηση τόμων κατα την εισαγωγή" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Άνοιγμα διαχειριστή αρχείων κατά την εισαγωγή" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "" -#: src/e_mod_config.c:149 src/e_mod_places.c:402 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Home" -#: src/e_mod_config.c:152 src/e_mod_places.c:411 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Επιφάνεια Εργασίας" -#: src/e_mod_config.c:155 src/e_mod_places.c:421 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Απορρίμματα" -#: src/e_mod_config.c:158 src/e_mod_places.c:232 src/e_mod_places.c:430 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Σύστημα Αρχείων" -#: src/e_mod_config.c:161 src/e_mod_places.c:439 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "" -#: src/e_mod_main.c:75 +#: src/e_mod_main.c:59 #, fuzzy msgid "Files" msgstr "Σύστημα Αρχείων" -#: src/e_mod_main.c:77 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Τοποθεσίες" -#: src/e_mod_main.c:443 -msgid "Configuration" -msgstr "Ρύθμιση" +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Ρύθμιση Τοποθεσιών" -#: src/e_mod_places.c:237 +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Χωρίς Όνομα" -#: src/e_mod_places.c:692 +#: src/e_mod_places.c:629 msgid "free of" msgstr "" -#: src/e_mod_places.c:698 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s δεν είναι Προσαρτημένο" -#: src/e_mod_places.c:715 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "αποπροσάρτηση" -#: src/e_mod_places.c:721 +#: src/e_mod_places.c:667 msgid "eject" msgstr "εξαγωγή" +#~ msgid "Configuration" +#~ msgstr "Ρύθμιση" + #~ msgid "File manager (if blank uses Enlightenment)" #~ msgstr "Διαχειριστής Αρχείων (όταν κενό χρησιμοποιεί το Enlightenment)" diff --git a/po/eo.po b/po/eo.po index 88a3ac2..057bea9 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: places 0.1.0\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-04 13:32+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-12-05 11:46+0000\n" "Last-Translator: Michael Moroni \n" "Language-Team: Esperanto \n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -81,7 +82,8 @@ msgstr "Preferitaj" msgid "Files" msgstr "Dosieroj" -#: src/e_mod_main.c:61 src/e_mod_places.c:236 src/e_mod_places.c:868 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Ejoj" diff --git a/po/es.po b/po/es.po index a827f71..b84c830 100644 --- a/po/es.po +++ b/po/es.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the enlightenment package. # Paco Molinero , 2009. # Aníbal Garrido , 2012. - msgid "" msgstr "" "Project-Id-Version: places\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-08 02:06+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-11-08 02:06+0100\n" "Last-Translator: Aníbal Garrido \n" "Language-Team: Enlightenment Team\n" @@ -17,79 +16,6 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/e_mod_places.c:236 -#: src/e_mod_places.c:868 -#: src/e_mod_main.c:61 -msgid "Places" -msgstr "Sitios" - -#: src/e_mod_places.c:599 -msgid "Warning" -msgstr "Aviso" - -#: src/e_mod_places.c:600 -msgid "Cannot run the Enlightenment FileManager.
Please choose a custom file manager in
the gadget configuration." -msgstr "No se puede ejecutar el Gestor de Archivos de Enlightenment.
Por favor escoja un gestor de archivos personalizado en
la configuración del gadget." - -#: src/e_mod_places.c:618 -#: src/e_mod_places.c:802 -#: src/e_mod_config.c:187 -msgid "Filesystem" -msgstr "Sistema de archivos" - -#: src/e_mod_places.c:622 -msgid "No Name" -msgstr "Sin nombre" - -#: src/e_mod_places.c:629 -msgid "free of" -msgstr "libre de" - -#: src/e_mod_places.c:635 -#, c-format -msgid "%s Not Mounted" -msgstr "%s sin montar" - -#: src/e_mod_places.c:662 -msgid "unmount" -msgstr "desmontar" - -#: src/e_mod_places.c:667 -msgid "eject" -msgstr "expulsar" - -#: src/e_mod_places.c:774 -#: src/e_mod_config.c:178 -msgid "Home" -msgstr "Inicio" - -#: src/e_mod_places.c:783 -#: src/e_mod_config.c:181 -msgid "Desktop" -msgstr "Escritorio" - -#: src/e_mod_places.c:793 -#: src/e_mod_config.c:184 -msgid "Trash" -msgstr "Papelera" - -#: src/e_mod_places.c:811 -#: src/e_mod_config.c:190 -msgid "Temp" -msgstr "Temporal" - -#: src/e_mod_main.c:59 -msgid "Files" -msgstr "Archivos" - -#: src/e_mod_main.c:394 -msgid "Places Configuration Updated" -msgstr "Configuración de Sitios actualizada" - -#: src/e_mod_main.c:434 -msgid "Settings" -msgstr "Preferencias" - #: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Preferencias de Sitios" @@ -126,9 +52,80 @@ msgstr "Usar un gestor de archivos personalizado" msgid "Show in menu" msgstr "Mostrar en el menú" +#: src/e_mod_config.c:178 src/e_mod_places.c:774 +msgid "Home" +msgstr "Inicio" + +#: src/e_mod_config.c:181 src/e_mod_places.c:783 +msgid "Desktop" +msgstr "Escritorio" + +#: src/e_mod_config.c:184 src/e_mod_places.c:793 +msgid "Trash" +msgstr "Papelera" + +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 +msgid "Filesystem" +msgstr "Sistema de archivos" + +#: src/e_mod_config.c:190 src/e_mod_places.c:811 +msgid "Temp" +msgstr "Temporal" + #: src/e_mod_config.c:193 msgid "Favorites" msgstr "Favoritos" +#: src/e_mod_main.c:59 +msgid "Files" +msgstr "Archivos" + +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 +msgid "Places" +msgstr "Sitios" + +#: src/e_mod_main.c:394 +msgid "Places Configuration Updated" +msgstr "Configuración de Sitios actualizada" + +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "Preferencias" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "Aviso" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" +"No se puede ejecutar el Gestor de Archivos de Enlightenment.
Por " +"favor escoja un gestor de archivos personalizado en
la configuración del " +"gadget." + +#: src/e_mod_places.c:622 +msgid "No Name" +msgstr "Sin nombre" + +#: src/e_mod_places.c:629 +msgid "free of" +msgstr "libre de" + +#: src/e_mod_places.c:635 +#, c-format +msgid "%s Not Mounted" +msgstr "%s sin montar" + +#: src/e_mod_places.c:662 +msgid "unmount" +msgstr "desmontar" + +#: src/e_mod_places.c:667 +msgid "eject" +msgstr "expulsar" + #~ msgid "Configuration" #~ msgstr "Configuración" diff --git a/po/fr.po b/po/fr.po index b81e2d7..f6ee20e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Places module\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-01-25 08:59+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-01-25 15:11+0100\n" "Last-Translator: dazibao \n" "Language-Team: Enlightenment French Team \n" @@ -20,112 +20,114 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/e_mod_config.c:53 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Paramétrage de Raccourcis" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:136 msgid "General" msgstr "Paramètres généraux" -#: src/e_mod_config.c:124 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Afficher dans le menu principal" -#: src/e_mod_config.c:128 +#: src/e_mod_config.c:143 msgid "Hide the gadget header" msgstr "Masquer l'en-tête du gadget" -#: src/e_mod_config.c:132 +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Montage des volumes à l'insertion" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Montage des volumes à l'insertion" -#: src/e_mod_config.c:136 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Ouvrir le gestionnaire de fichiers à l'insertion" -#: src/e_mod_config.c:140 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Utiliser un gestionnaire de fichiers personnalisé" -#: src/e_mod_config.c:153 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Afficher dans le menu" -#: src/e_mod_config.c:156 -#: src/e_mod_places.c:760 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Dossier personnel" -#: src/e_mod_config.c:159 -#: src/e_mod_places.c:769 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Bureau" -#: src/e_mod_config.c:162 -#: src/e_mod_places.c:779 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Corbeille" -#: src/e_mod_config.c:165 -#: src/e_mod_places.c:604 -#: src/e_mod_places.c:788 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Racine" -#: src/e_mod_config.c:168 -#: src/e_mod_places.c:797 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "/tmp" -#: src/e_mod_config.c:171 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Favoris" -#: src/e_mod_main.c:58 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Fichiers" -#: src/e_mod_main.c:60 -#: src/e_mod_places.c:222 -#: src/e_mod_places.c:854 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Raccourcis" -#: src/e_mod_main.c:379 +#: src/e_mod_main.c:394 msgid "Places Configuration Updated" msgstr "Configuration de Raccourcis actualisée" -#: src/e_mod_main.c:419 +#: src/e_mod_main.c:434 msgid "Settings" msgstr "Configuration" -#: src/e_mod_places.c:585 +#: src/e_mod_places.c:599 msgid "Warning" msgstr "Avertissement" -#: src/e_mod_places.c:586 -msgid "Cannot run the Enlightenment FileManager.
Please choose a custom file manager in
the gadget configuration." -msgstr "Impossible d'exécuter EFM.
Veuillez choisir un gestionnaire de fichiers
personnalisé dans la configuration du gadget." +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" +"Impossible d'exécuter EFM.
Veuillez choisir un gestionnaire de " +"fichiers
personnalisé dans la configuration du gadget." -#: src/e_mod_places.c:608 +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Sans nom" -#: src/e_mod_places.c:615 +#: src/e_mod_places.c:629 msgid "free of" msgstr "de libre sur" -#: src/e_mod_places.c:621 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s Pas Monté" -#: src/e_mod_places.c:648 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "démonter" -#: src/e_mod_places.c:653 +#: src/e_mod_places.c:667 msgid "eject" msgstr "éjecter" diff --git a/po/gl.po b/po/gl.po index 414781a..152655a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: places\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-08-30 19:32+0200\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-09-17 12:30+0200\n" "Last-Translator: Aníbal Garrido \n" "Language-Team: http://trasno.net/ \n" @@ -15,79 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/e_mod_places.c:236 -#: src/e_mod_places.c:868 -#: src/e_mod_main.c:61 -msgid "Places" -msgstr "Lugares" - -#: src/e_mod_places.c:599 -msgid "Warning" -msgstr "Aviso" - -#: src/e_mod_places.c:600 -msgid "Cannot run the Enlightenment FileManager.
Please choose a custom file manager in
the gadget configuration." -msgstr "Non se pode executar o Xestor de Ficheiros de Enlightenment.
Por favor escolla un xestor de ficheiros personalizado na
configuración do módulo." - -#: src/e_mod_places.c:618 -#: src/e_mod_places.c:802 -#: src/e_mod_config.c:187 -msgid "Filesystem" -msgstr "Sistema de ficheiros" - -#: src/e_mod_places.c:622 -msgid "No Name" -msgstr "Sen nome" - -#: src/e_mod_places.c:629 -msgid "free of" -msgstr "libre de" - -#: src/e_mod_places.c:635 -#, c-format -msgid "%s Not Mounted" -msgstr "%s non está montado" - -#: src/e_mod_places.c:662 -msgid "unmount" -msgstr "Desmontar" - -#: src/e_mod_places.c:667 -msgid "eject" -msgstr "expulsar" - -#: src/e_mod_places.c:774 -#: src/e_mod_config.c:178 -msgid "Home" -msgstr "Cartafol persoal" - -#: src/e_mod_places.c:783 -#: src/e_mod_config.c:181 -msgid "Desktop" -msgstr "Escritorio" - -#: src/e_mod_places.c:793 -#: src/e_mod_config.c:184 -msgid "Trash" -msgstr "Lixo" - -#: src/e_mod_places.c:811 -#: src/e_mod_config.c:190 -msgid "Temp" -msgstr "Temporal" - -#: src/e_mod_main.c:59 -msgid "Files" -msgstr "Ficheiros" - -#: src/e_mod_main.c:394 -msgid "Places Configuration Updated" -msgstr "Configuración de Lugares actualizada" - -#: src/e_mod_main.c:434 -msgid "Settings" -msgstr "Preferencias" - #: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Preferencias de Lugares" @@ -124,7 +51,77 @@ msgstr "Empregar un xestor de ficheiros personalizado" msgid "Show in menu" msgstr "Amosar no menú" +#: src/e_mod_config.c:178 src/e_mod_places.c:774 +msgid "Home" +msgstr "Cartafol persoal" + +#: src/e_mod_config.c:181 src/e_mod_places.c:783 +msgid "Desktop" +msgstr "Escritorio" + +#: src/e_mod_config.c:184 src/e_mod_places.c:793 +msgid "Trash" +msgstr "Lixo" + +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 +msgid "Filesystem" +msgstr "Sistema de ficheiros" + +#: src/e_mod_config.c:190 src/e_mod_places.c:811 +msgid "Temp" +msgstr "Temporal" + #: src/e_mod_config.c:193 msgid "Favorites" msgstr "Favoritos" +#: src/e_mod_main.c:59 +msgid "Files" +msgstr "Ficheiros" + +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 +msgid "Places" +msgstr "Lugares" + +#: src/e_mod_main.c:394 +msgid "Places Configuration Updated" +msgstr "Configuración de Lugares actualizada" + +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "Preferencias" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "Aviso" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" +"Non se pode executar o Xestor de Ficheiros de Enlightenment.
Por " +"favor escolla un xestor de ficheiros personalizado na
configuración do " +"módulo." + +#: src/e_mod_places.c:622 +msgid "No Name" +msgstr "Sen nome" + +#: src/e_mod_places.c:629 +msgid "free of" +msgstr "libre de" + +#: src/e_mod_places.c:635 +#, c-format +msgid "%s Not Mounted" +msgstr "%s non está montado" + +#: src/e_mod_places.c:662 +msgid "unmount" +msgstr "Desmontar" + +#: src/e_mod_places.c:667 +msgid "eject" +msgstr "expulsar" diff --git a/po/hr.po b/po/hr.po index fe54442..0283f84 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,97 +7,126 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-02-28 12:14+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2009-11-09 18:11+0000\n" "Last-Translator: Miro Glavić \n" "Language-Team: Croatian \n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-11-12 04:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/e_mod_config.c:51 -msgid "Places Configuration" -msgstr "Konfiguracija Mjesta" +#: src/e_mod_config.c:54 +msgid "Places Settings" +msgstr "" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Općenito" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Prikaži u glavnom izborniku" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Postavi jačine pri ubacivanju" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Postavi jačine pri ubacivanju" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Otvori upravitelja datoteka pri ubacivanju" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Upotrijebi podešenog upravitelja datotekama" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Prikaži u izborniku" -#: src/e_mod_config.c:149 src/e_mod_places.c:402 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Glavna" -#: src/e_mod_config.c:152 src/e_mod_places.c:411 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Radna površina" -#: src/e_mod_config.c:155 src/e_mod_places.c:421 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Smeće" -#: src/e_mod_config.c:158 src/e_mod_places.c:232 src/e_mod_places.c:430 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Datotečni sustav" -#: src/e_mod_config.c:161 src/e_mod_places.c:439 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Temp" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Omiljeni" -#: src/e_mod_main.c:75 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Datoteke" -#: src/e_mod_main.c:77 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Mjesta" -#: src/e_mod_main.c:443 -msgid "Configuration" -msgstr "Konfiguracija" +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Konfiguracija Mjesta" -#: src/e_mod_places.c:237 +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Bez Naziva" -#: src/e_mod_places.c:692 +#: src/e_mod_places.c:629 msgid "free of" msgstr "bez" -#: src/e_mod_places.c:698 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s Nije Montiran" -#: src/e_mod_places.c:715 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "demontiraj" -#: src/e_mod_places.c:721 +#: src/e_mod_places.c:667 msgid "eject" msgstr "izbaci" + +#~ msgid "Configuration" +#~ msgstr "Konfiguracija" diff --git a/po/hu.po b/po/hu.po index 32a5666..86a0d89 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-02-28 12:14+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2009-11-11 20:49+0000\n" "Last-Translator: lisovszki \n" "Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,90 +21,118 @@ msgstr "" "X-Poedit-Country: FRANCE\n" "X-Poedit-Language: French\n" -#: src/e_mod_config.c:51 -msgid "Places Configuration" -msgstr "Beállítások" +#: src/e_mod_config.c:54 +msgid "Places Settings" +msgstr "" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Általános" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Megjelenítés a főmeüben" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Eszközök felcsatolása csatlakoztatáskor" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Eszközök felcsatolása csatlakoztatáskor" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Fájlkezelő megnyitása felcsatoláskor" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Egyedi fájlkezelő használata" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Megjelenítés a menüben" -#: src/e_mod_config.c:149 src/e_mod_places.c:402 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Saját könyvtár" -#: src/e_mod_config.c:152 src/e_mod_places.c:411 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Munkaasztal" -#: src/e_mod_config.c:155 src/e_mod_places.c:421 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Szemétkosár" -#: src/e_mod_config.c:158 src/e_mod_places.c:232 src/e_mod_places.c:430 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Fájlrendszer" -#: src/e_mod_config.c:161 src/e_mod_places.c:439 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Átmeneti" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Kedvencek" -#: src/e_mod_main.c:75 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Fájlok" -#: src/e_mod_main.c:77 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Helyek" -#: src/e_mod_main.c:443 -msgid "Configuration" -msgstr "Beállítás" +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Beállítások" -#: src/e_mod_places.c:237 +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Nincs név" -#: src/e_mod_places.c:692 +#: src/e_mod_places.c:629 msgid "free of" msgstr "szabad hely" -#: src/e_mod_places.c:698 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s nincs felcsatolva" -#: src/e_mod_places.c:715 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "leválasztás" -#: src/e_mod_places.c:721 +#: src/e_mod_places.c:667 msgid "eject" msgstr "kiadás" +#~ msgid "Configuration" +#~ msgstr "Beállítás" + #~ msgid "File manager (if blank uses Enlightenment)" #~ msgstr "Fájlkezelő (ha üres, akkor az e17 fájlkezelőjét használja)" diff --git a/po/it.po b/po/it.po index 447a62e..6418b3a 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Places\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-09-15 17:28+0200\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-09-15 17:29+0200\n" "Last-Translator: DaveMDS \n" "Language-Team: none\n" @@ -79,7 +79,8 @@ msgstr "Preferiti" msgid "Files" msgstr "File" -#: src/e_mod_main.c:61 src/e_mod_places.c:236 src/e_mod_places.c:868 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Risorse" diff --git a/po/lt.po b/po/lt.po index 0dc2d3d..a5843d4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,17 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" -"Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n" -"POT-Creation-Date: 2012-12-21 11:55+0100\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2013-01-05 22:32+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian \n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2013-01-06 04:54+0000\n" "X-Generator: Launchpad (build 16393)\n" -"Language: lt\n" #: src/e_mod_config.c:54 msgid "Places Settings" diff --git a/po/nl.po b/po/nl.po index 6bdc918..2378233 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Places\n" -"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n" -"POT-Creation-Date: 2011-09-02 15:01-0700\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2011-09-03 15:37+0100\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: \n" @@ -17,99 +17,111 @@ msgstr "" "X-Poedit-Language: NL\n" "X-Poedit-Country: Nederland\n" -#. create new config dialog -#: ../src/e_mod_config.c:52 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Plaatsen-instellingen" -#. General frame -#: ../src/e_mod_config.c:119 +#: src/e_mod_config.c:136 msgid "General" msgstr "Algemeen" -#: ../src/e_mod_config.c:122 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Toon in hoofdmenu" -#: ../src/e_mod_config.c:126 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Koppel volumes aan bij invoeren" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Koppel volumes aan bij invoeren" -#: ../src/e_mod_config.c:130 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Open bestandsbeheerder bij invoeren" -#: ../src/e_mod_config.c:134 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Gebruik een aangepaste bestandsbeheerder" -#. Display frame -#: ../src/e_mod_config.c:147 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Toon in menu" -#: ../src/e_mod_config.c:150 -#: ../src/e_mod_places.c:470 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Persoonlijke map" -#: ../src/e_mod_config.c:153 -#: ../src/e_mod_places.c:479 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Bureaublad" -#: ../src/e_mod_config.c:156 -#: ../src/e_mod_places.c:489 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Prullenbak" -#: ../src/e_mod_config.c:159 -#: ../src/e_mod_places.c:268 -#: ../src/e_mod_places.c:498 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Bestandssysteem" -#: ../src/e_mod_config.c:162 -#: ../src/e_mod_places.c:507 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Temp" -#: ../src/e_mod_config.c:165 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Favorieten" -#. Display this Modules config info in the main Config Panel -#: ../src/e_mod_main.c:59 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Bestanden" -#: ../src/e_mod_main.c:61 -#: ../src/e_mod_places.c:564 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Plaatsen" -#: ../src/e_mod_main.c:427 +#: src/e_mod_main.c:394 +msgid "Places Configuration Updated" +msgstr "" + +#: src/e_mod_main.c:434 msgid "Settings" msgstr "Instellingen" -#: ../src/e_mod_places.c:273 +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Geen naam" -#: ../src/e_mod_places.c:779 +#: src/e_mod_places.c:629 msgid "free of" msgstr "vrij van" -#: ../src/e_mod_places.c:785 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s Niet aangekoppeld" -#: ../src/e_mod_places.c:802 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "koppel af" -#: ../src/e_mod_places.c:808 +#: src/e_mod_places.c:667 msgid "eject" msgstr "werp uit" - diff --git a/po/pl.po b/po/pl.po index f3d2470..37fffca 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,97 +7,126 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-02-28 12:14+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2009-11-13 17:51+0000\n" "Last-Translator: Stanislaw Gackowski \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-11-14 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/e_mod_config.c:51 -msgid "Places Configuration" -msgstr "Konfiguracja miejsc" +#: src/e_mod_config.c:54 +msgid "Places Settings" +msgstr "" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Ogólne" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Pokaż w menu" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Montuj przy włożeniu" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Montuj przy włożeniu" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Otwieraj manadżer plików przy włożeniu" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Używaj własnego manadżera plików" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Pokazuj w menu" -#: src/e_mod_config.c:149 src/e_mod_places.c:402 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Katalog domowy" -#: src/e_mod_config.c:152 src/e_mod_places.c:411 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Pulpit" -#: src/e_mod_config.c:155 src/e_mod_places.c:421 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Kosz" -#: src/e_mod_config.c:158 src/e_mod_places.c:232 src/e_mod_places.c:430 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "System plików." -#: src/e_mod_config.c:161 src/e_mod_places.c:439 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Ulubione" -#: src/e_mod_main.c:75 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Pliki" -#: src/e_mod_main.c:77 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Miejsca" -#: src/e_mod_main.c:443 -msgid "Configuration" -msgstr "Konfiguracja" +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Konfiguracja miejsc" -#: src/e_mod_places.c:237 +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Bez nazwy" -#: src/e_mod_places.c:692 +#: src/e_mod_places.c:629 msgid "free of" msgstr "wolne z" -#: src/e_mod_places.c:698 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s nie jest zamontowane" -#: src/e_mod_places.c:715 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "odmontuj" -#: src/e_mod_places.c:721 +#: src/e_mod_places.c:667 msgid "eject" msgstr "wysuń" + +#~ msgid "Configuration" +#~ msgstr "Konfiguracja" diff --git a/po/pt.po b/po/pt.po index 37b3e84..d986e93 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: places\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-13 00:56+0100\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-09-13 01:15+0100\n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese <>\n" @@ -56,29 +56,23 @@ msgstr "Utilizar um gestor de ficheiros personalizado" msgid "Show in menu" msgstr "Mostrar no menu" -#: src/e_mod_config.c:178 -#: src/e_mod_places.c:774 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Pasta pessoal" -#: src/e_mod_config.c:181 -#: src/e_mod_places.c:783 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Área de trabalho" -#: src/e_mod_config.c:184 -#: src/e_mod_places.c:793 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Lixo" -#: src/e_mod_config.c:187 -#: src/e_mod_places.c:618 -#: src/e_mod_places.c:802 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: src/e_mod_config.c:190 -#: src/e_mod_places.c:811 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Temporários" @@ -90,8 +84,7 @@ msgstr "Favoritos" msgid "Files" msgstr "Ficheiros" -#: src/e_mod_main.c:61 -#: src/e_mod_places.c:236 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 #: src/e_mod_places.c:868 msgid "Places" msgstr "Locais" @@ -109,8 +102,12 @@ msgid "Warning" msgstr "Aviso" #: src/e_mod_places.c:600 -msgid "Cannot run the Enlightenment FileManager.
Please choose a custom file manager in
the gadget configuration." -msgstr "Não foi possível executar o EFM.
Escolha o gestor de ficheiros na configuração do gadget." +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" +"Não foi possível executar o EFM.
Escolha o gestor de ficheiros na " +"configuração do gadget." #: src/e_mod_places.c:622 msgid "No Name" diff --git a/po/pt_BR.po b/po/pt_BR.po index d01e23f..9fbb7b7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,97 +7,122 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-02-28 12:14+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2010-02-14 04:51+0000\n" "Last-Translator: Teylo Laundos Aguiar \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2010-02-15 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/e_mod_config.c:51 -msgid "Places Configuration" +#: src/e_mod_config.c:54 +msgid "Places Settings" msgstr "" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Exibir no menu principal" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Montar volumes ao inserir" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Montar volumes ao inserir" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Abrir gerenciados de arquivos ao inserir" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Exibir no menu" -#: src/e_mod_config.c:149 src/e_mod_places.c:402 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "" -#: src/e_mod_config.c:152 src/e_mod_places.c:411 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "" -#: src/e_mod_config.c:155 src/e_mod_places.c:421 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "" -#: src/e_mod_config.c:158 src/e_mod_places.c:232 src/e_mod_places.c:430 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "" -#: src/e_mod_config.c:161 src/e_mod_places.c:439 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "" -#: src/e_mod_main.c:75 +#: src/e_mod_main.c:59 msgid "Files" msgstr "" -#: src/e_mod_main.c:77 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "" -#: src/e_mod_main.c:443 -msgid "Configuration" +#: src/e_mod_main.c:394 +msgid "Places Configuration Updated" msgstr "" -#: src/e_mod_places.c:237 +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "" -#: src/e_mod_places.c:692 +#: src/e_mod_places.c:629 msgid "free of" msgstr "" -#: src/e_mod_places.c:698 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s Não montado" -#: src/e_mod_places.c:715 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "" -#: src/e_mod_places.c:721 +#: src/e_mod_places.c:667 msgid "eject" msgstr "" diff --git a/po/sl.po b/po/sl.po index fbb3f80..ac5680f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6,104 +6,124 @@ msgid "" msgstr "" "Project-Id-Version: places\n" -"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n" -"POT-Creation-Date: 2011-02-17 15:00-0800\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2011-02-23 03:57+0100\n" "Last-Translator: r1to \n" "Language-Team: Slovenian \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" -#. create new config dialog -#: ../src/e_mod_config.c:51 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Nastavitev modula Mesta" -#. General frame -#: ../src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Splošno" -#: ../src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Prikaz v glavnem meniju" -#: ../src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Priklopi diske ob vstavitvi" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Priklopi diske ob vstavitvi" -#: ../src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Odpri upravitelja datotek ob vstavitvi" -#: ../src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Uporabi naslednjega upravitelja datotek" -#. Display frame -#: ../src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Prikaži v meniju" -#: ../src/e_mod_config.c:149 ../src/e_mod_places.c:408 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Dom" -#: ../src/e_mod_config.c:152 ../src/e_mod_places.c:417 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Namizje" -#: ../src/e_mod_config.c:155 ../src/e_mod_places.c:427 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Smeti" -#: ../src/e_mod_config.c:158 ../src/e_mod_places.c:207 -#: ../src/e_mod_places.c:436 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Datotečni sistem" -#: ../src/e_mod_config.c:161 ../src/e_mod_places.c:445 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Začasno" -#: ../src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Priljubljeni" -#. Display this Modules config info in the main Config Panel -#: ../src/e_mod_main.c:58 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Datoteke" -#: ../src/e_mod_main.c:60 ../src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Mesta" -#: ../src/e_mod_main.c:430 +#: src/e_mod_main.c:394 +msgid "Places Configuration Updated" +msgstr "" + +#: src/e_mod_main.c:434 msgid "Settings" msgstr "Nastavitve" -#: ../src/e_mod_places.c:212 +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Brezimno" -#: ../src/e_mod_places.c:693 +#: src/e_mod_places.c:629 msgid "free of" msgstr "prosto od" -#: ../src/e_mod_places.c:699 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s·Ni priklopljen" -#: ../src/e_mod_places.c:716 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "Odklopi" -#: ../src/e_mod_places.c:722 +#: src/e_mod_places.c:667 msgid "eject" msgstr "Izvrzi" - diff --git a/po/tr.po b/po/tr.po index 23c63ea..296d4d7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,97 +7,125 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-02-28 12:14+0100\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2009-11-15 09:10+0000\n" "Last-Translator: Mustafa Yılmaz \n" "Language-Team: Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2009-11-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#: src/e_mod_config.c:51 -msgid "Places Configuration" -msgstr "Yerler Yapılandırması" +#: src/e_mod_config.c:54 +msgid "Places Settings" +msgstr "" -#: src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Genel" -#: src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Ana menüde göster" -#: src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +msgid "Mount volumes at boot" +msgstr "" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "" -#: src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "" -#: src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Özel bir dosya yöneticisi kullan" -#: src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Menüde göster" -#: src/e_mod_config.c:149 src/e_mod_places.c:402 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Ev" -#: src/e_mod_config.c:152 src/e_mod_places.c:411 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Masaüstü" -#: src/e_mod_config.c:155 src/e_mod_places.c:421 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Çöp" -#: src/e_mod_config.c:158 src/e_mod_places.c:232 src/e_mod_places.c:430 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Dosya sistemi" -#: src/e_mod_config.c:161 src/e_mod_places.c:439 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Geçici" -#: src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Beğenilenler" -#: src/e_mod_main.c:75 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Dosyalar" -#: src/e_mod_main.c:77 src/e_mod_places.c:502 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Yerler" -#: src/e_mod_main.c:443 -msgid "Configuration" -msgstr "Yapılandırma" +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Yerler Yapılandırması" -#: src/e_mod_places.c:237 +#: src/e_mod_main.c:434 +msgid "Settings" +msgstr "" + +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "İsimsiz" -#: src/e_mod_places.c:692 +#: src/e_mod_places.c:629 msgid "free of" msgstr "boş" -#: src/e_mod_places.c:698 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s Bağlı Değil" -#: src/e_mod_places.c:715 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "ayır" -#: src/e_mod_places.c:721 +#: src/e_mod_places.c:667 msgid "eject" msgstr "çıkart" + +#~ msgid "Configuration" +#~ msgstr "Yapılandırma" diff --git a/po/uk.po b/po/uk.po index 979589f..996d51c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: places.HEAD\n" -"Report-Msgid-Bugs-To: http://trac.enlightenment.org/e\n" -"POT-Creation-Date: 2010-09-09 08:01-0700\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2011-02-06 09:46+0300\n" "Last-Translator: Korostil Daniel \n" "Language-Team: translation@linux.org.ua\n" @@ -13,103 +13,120 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.6.1\n" "X-Launchpad-Export-Date: 2009-11-13 11:33+0000\n" -#. create new config dialog -#: ../src/e_mod_config.c:51 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Налаштування" -#. General frame -#: ../src/e_mod_config.c:118 +#: src/e_mod_config.c:136 msgid "General" msgstr "Загальне" -#: ../src/e_mod_config.c:121 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "Показати в головному меню" -#: ../src/e_mod_config.c:125 +#: src/e_mod_config.c:143 +msgid "Hide the gadget header" +msgstr "" + +#: src/e_mod_config.c:147 +#, fuzzy +msgid "Mount volumes at boot" +msgstr "Змонтовувати том при вводі" + +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "Змонтовувати том при вводі" -#: ../src/e_mod_config.c:129 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "Відкривати менеджера файлів при вводі" -#: ../src/e_mod_config.c:133 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "Використовувати вибраний файловий менеджер" -#. Display frame -#: ../src/e_mod_config.c:146 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "Показати в меню" -#: ../src/e_mod_config.c:149 ../src/e_mod_places.c:379 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "Домівка" -#: ../src/e_mod_config.c:152 ../src/e_mod_places.c:388 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "Стільниця" -#: ../src/e_mod_config.c:155 ../src/e_mod_places.c:398 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 msgid "Trash" msgstr "Корзина" -#: ../src/e_mod_config.c:158 ../src/e_mod_places.c:208 -#: ../src/e_mod_places.c:407 +#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "Файлова система" -#: ../src/e_mod_config.c:161 ../src/e_mod_places.c:416 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "Тимчасове" -#: ../src/e_mod_config.c:164 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "Улюблені" -#. Display this Modules config info in the main Config Panel -#: ../src/e_mod_main.c:58 +#: src/e_mod_main.c:59 msgid "Files" msgstr "Файли" -#: ../src/e_mod_main.c:60 ../src/e_mod_places.c:479 +#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "Місця" -#: ../src/e_mod_main.c:430 +#: src/e_mod_main.c:394 +#, fuzzy +msgid "Places Configuration Updated" +msgstr "Налаштування місцин" + +#: src/e_mod_main.c:434 msgid "Settings" msgstr "Налаштування" -#: ../src/e_mod_places.c:213 +#: src/e_mod_places.c:599 +msgid "Warning" +msgstr "" + +#: src/e_mod_places.c:600 +msgid "" +"Cannot run the Enlightenment FileManager.
Please choose a custom " +"file manager in
the gadget configuration." +msgstr "" + +#: src/e_mod_places.c:622 msgid "No Name" msgstr "Без назви" -#: ../src/e_mod_places.c:669 +#: src/e_mod_places.c:629 msgid "free of" msgstr "вільно з" -#: ../src/e_mod_places.c:675 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s не змонтовано" -#: ../src/e_mod_places.c:692 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "демонтувати" -#: ../src/e_mod_places.c:698 +#: src/e_mod_places.c:667 msgid "eject" msgstr "вийняти" -#~ msgid "Places Configuration" -#~ msgstr "Налаштування місцин" - #~ msgid "Configuration" #~ msgstr "Налаштування" diff --git a/po/zh_CN.po b/po/zh_CN.po index f3eec02..b428732 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: places VERSION\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-12-22 06:13+0800\n" +"POT-Creation-Date: 2013-04-14 18:28+0200\n" "PO-Revision-Date: 2012-12-22 06:15+0800\n" "Last-Translator: Aron Xu \n" "Language-Team: Chinese (simplified) \n" @@ -19,118 +19,113 @@ msgstr "" "X-Launchpad-Export-Date: 2010-02-11 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" -#. create new config dialog -#: ../src/e_mod_config.c:54 +#: src/e_mod_config.c:54 msgid "Places Settings" msgstr "Places 设置" -#. General frame -#: ../src/e_mod_config.c:136 +#: src/e_mod_config.c:136 msgid "General" msgstr "常规" -#: ../src/e_mod_config.c:139 +#: src/e_mod_config.c:139 msgid "Show in main menu" msgstr "在主菜单中显示" -#: ../src/e_mod_config.c:143 +#: src/e_mod_config.c:143 msgid "Hide the gadget header" msgstr "隐藏组件头" -#: ../src/e_mod_config.c:147 +#: src/e_mod_config.c:147 msgid "Mount volumes at boot" msgstr "启动时挂载卷" -#: ../src/e_mod_config.c:151 +#: src/e_mod_config.c:151 msgid "Mount volumes on insert" msgstr "插入后立刻挂载" -#: ../src/e_mod_config.c:155 +#: src/e_mod_config.c:155 msgid "Open filemanager on insert" msgstr "插入后启动文件管理器" -#: ../src/e_mod_config.c:162 +#: src/e_mod_config.c:162 msgid "Use a custom file manager" msgstr "使用常规文件管理器" -#. Display frame -#: ../src/e_mod_config.c:175 +#: src/e_mod_config.c:175 msgid "Show in menu" msgstr "在菜单中显示" -#: ../src/e_mod_config.c:178 ../src/e_mod_places.c:774 +#: src/e_mod_config.c:178 src/e_mod_places.c:774 msgid "Home" msgstr "主目录" -#: ../src/e_mod_config.c:181 ../src/e_mod_places.c:783 +#: src/e_mod_config.c:181 src/e_mod_places.c:783 msgid "Desktop" msgstr "桌面" -#: ../src/e_mod_config.c:184 ../src/e_mod_places.c:793 +#: src/e_mod_config.c:184 src/e_mod_places.c:793 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:187 src/e_mod_places.c:618 src/e_mod_places.c:802 msgid "Filesystem" msgstr "文件系统" -#: ../src/e_mod_config.c:190 ../src/e_mod_places.c:811 +#: src/e_mod_config.c:190 src/e_mod_places.c:811 msgid "Temp" msgstr "临时文件" -#: ../src/e_mod_config.c:193 +#: src/e_mod_config.c:193 msgid "Favorites" msgstr "收藏夹" -#. Display this Modules config info in the main Config Panel -#: ../src/e_mod_main.c:59 +#: src/e_mod_main.c:59 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:298 src/e_mod_places.c:236 +#: src/e_mod_places.c:868 msgid "Places" msgstr "位置" -#: ../src/e_mod_main.c:394 +#: src/e_mod_main.c:394 msgid "Places Configuration Updated" msgstr "已更新 Places 配置" -#: ../src/e_mod_main.c:434 +#: src/e_mod_main.c:434 msgid "Settings" msgstr "设置" -#: ../src/e_mod_places.c:599 +#: src/e_mod_places.c:599 msgid "Warning" msgstr "警告" -#: ../src/e_mod_places.c:600 +#: src/e_mod_places.c:600 msgid "" "Cannot run the Enlightenment FileManager.
Please choose a custom " "file manager in
the gadget configuration." msgstr "" -"无法运行 Enlightenment 文件管理器。请在配置中选择一个自定义的文件" -"管理器。" +"无法运行 Enlightenment 文件管理器。请在配置中选择一个自定义的文件管" +"理器。" -#: ../src/e_mod_places.c:622 +#: src/e_mod_places.c:622 msgid "No Name" msgstr "无名称" -#: ../src/e_mod_places.c:629 +#: src/e_mod_places.c:629 msgid "free of" msgstr "空闲，总计" -#: ../src/e_mod_places.c:635 +#: src/e_mod_places.c:635 #, c-format msgid "%s Not Mounted" msgstr "%s 未挂载" -#: ../src/e_mod_places.c:662 +#: src/e_mod_places.c:662 msgid "unmount" msgstr "卸载" -#: ../src/e_mod_places.c:667 +#: src/e_mod_places.c:667 msgid "eject" msgstr "弹出" diff --git a/src/Makefile.am b/src/Makefile.am index ebafee0..c61ce7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,6 +14,8 @@ module_la_SOURCES = e_mod_main.h \ e_mod_places.c \ e_mod_udisks.h \ e_mod_udisks.c \ + e_mod_udisks_edbus2.h \ + e_mod_udisks_edbus2.c \ e_mod_eeze.h \ e_mod_eeze.c diff --git a/src/e_mod_eeze.c b/src/e_mod_eeze.c index 175cd90..9a88dc9 100644 --- a/src/e_mod_eeze.c +++ b/src/e_mod_eeze.c @@ -8,42 +8,135 @@ #include #include "e_mod_places.h" #include -// #include +#include /* Local Function Prototypes */ /* Local Variables */ +// Eina_Bool eeze_mount_mtab_scan (void) +// Eina_Bool eeze_mount_fstab_scan (void) +// Eina_Bool eeze_mount_tabs_watch (void) +// void eeze_mount_tabs_unwatch (void) + +// Eina_Bool eeze_disk_mount (Eeze_Disk *disk) +// Eina_Bool eeze_disk_unmount (Eeze_Disk *disk) +// Eina_Bool eeze_disk_eject (Eeze_Disk *disk) /* Implementation */ + +void _places_eeze_disk_print(Eeze_Disk *disk) +{ + eeze_disk_scan(disk); // NEEDED ?? + + printf("PLACES: SysPath: %s\n", eeze_disk_syspath_get(disk)); + printf("PLACES: devpath: %s\n", eeze_disk_devpath_get(disk)); + printf("PLACES: mount_point: %s\n", eeze_disk_mount_point_get(disk)); + printf("PLACES: mountopts: %ld\n", eeze_disk_mountopts_get(disk)); + printf("PLACES: label: %s\n", eeze_disk_label_get(disk)); + printf("PLACES: type: %d\n", eeze_disk_type_get(disk)); + printf("PLACES: fstype: %s\n", eeze_disk_fstype_get(disk)); + printf("PLACES: mounted: %d\n", eeze_disk_mounted_get(disk)); + printf("PLACES: removable: %d\n", eeze_disk_removable_get(disk)); + printf("PLACES: mount_wrapper: %s\n", eeze_disk_mount_wrapper_get(disk)); + + printf("PLACES: vendor: %s\n", eeze_disk_vendor_get(disk)); + printf("PLACES: model: %s\n", eeze_disk_model_get(disk)); + printf("PLACES: serial: %s\n", eeze_disk_serial_get(disk)); + printf("PLACES: uuid: %s\n", eeze_disk_uuid_get(disk)); + + printf("PLACES: ---------------\n"); +} + Eina_Bool places_eeze_init(void) { printf("PLACES: eeze: init()\n"); - if (!eeze_init() /*|| !eeze_disk_function()*/) - { - printf("Impossible to setup eeze.\n"); - return EINA_FALSE; - } + // This will fail on compilation/runtime if Disk functions not available + eeze_disk_function(); + + // init eeze + if (!eeze_init()) + { + printf("Impossible to setup eeze.\n"); + return EINA_FALSE; + } + + // check eeze mount/umont/eject support + if (!eeze_disk_can_mount() || + !eeze_disk_can_unmount() || + !eeze_disk_can_eject()) + { + printf("Eeze don't have mount/umount/eject support.\n"); + eeze_shutdown(); + return EINA_FALSE; + } + + // if (!eeze_mount_tabs_watch()) + // { + // printf("Cannot setup watcher for fstab/mtab.\n"); + // eeze_shutdown(); + // return EINA_FALSE; + // } + + eeze_mount_fstab_scan(); + eeze_mount_mtab_scan(); + -/* Eina_List *disks; const char *syspath; - disks = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_MOUNTABLE, NULL); - printf("Found the following mountable disks:\n"); + Eeze_Disk *disk; + + + disks = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_INTERNAL, NULL); + printf("PLACES: Found the following internal disks:\n"); EINA_LIST_FREE(disks, syspath) { - Eeze_Disk *disk; - disk = eeze_disk_new(syspath); - printf("\t%s - %s:%s\n", syspath, eeze_disk_devpath_get(disk), eeze_disk_mount_point_get(disk)); + _places_eeze_disk_print(disk); + eina_stringshare_del(syspath); + eeze_disk_free(disk); + } + + disks = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_MOUNTABLE, NULL); + printf("PLACES: Found the following mountable disks:\n"); + EINA_LIST_FREE(disks, syspath) + { + disk = eeze_disk_new(syspath); + _places_eeze_disk_print(disk); eeze_disk_free(disk); eina_stringshare_del(syspath); } -*/ + + disks = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_CDROM, NULL); + printf("PLACES: Found the following cdrom disks:\n"); + EINA_LIST_FREE(disks, syspath) + { + disk = eeze_disk_new(syspath); + _places_eeze_disk_print(disk); + + eeze_disk_free(disk); + eina_stringshare_del(syspath); + } + + // disks = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_REMOVABLE, NULL); + // printf("PLACES: Found the following removable disks:\n"); + // EINA_LIST_FREE(disks, syspath) + // { + // places_eeze_print_syspath_info(syspath); + // eina_stringshare_del(syspath); + // } + + printf("PLACES: Searching for your root:\n"); + disk = eeze_disk_new_from_mount("/"); + if (disk) + { + _places_eeze_disk_print(disk); + eeze_disk_free(disk); + } return EINA_TRUE; } @@ -51,6 +144,7 @@ places_eeze_init(void) void places_eeze_shutdown(void) { + eeze_mount_tabs_unwatch(); eeze_shutdown(); } diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 447fc14..37e8cc3 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -2,7 +2,6 @@ # include "config.h" #endif #include -#include #include "e_mod_main.h" #include "e_mod_places.h" diff --git a/src/e_mod_places.c b/src/e_mod_places.c index 6838804..975ec4a 100644 --- a/src/e_mod_places.c +++ b/src/e_mod_places.c @@ -11,6 +11,9 @@ #ifdef HAVE_EEZE # include "e_mod_eeze.h" #endif +#ifdef HAVE_EDBUS2 +# include "e_mod_udisks_edbus2.h" +#endif /* Local Function Prototypes */ static Eina_Bool _places_poller(void *data); @@ -18,8 +21,6 @@ static const char *_places_human_size_get(unsigned long long size); static void _places_volume_object_update(Volume *vol, Evas_Object *obj); static void _places_run_fm(void *data, E_Menu *m, E_Menu_Item *mi); - - /* Edje callbacks */ void _places_icon_activated_cb(void *data, Evas_Object *o, const char *emission, const char *source); void _places_custom_icon_activated_cb(void *data, Evas_Object *o, const char *emission, const char *source); @@ -46,6 +47,9 @@ places_init(void) #ifdef HAVE_EEZE places_eeze_init(); #endif +#ifdef HAVE_EDBUS2 + places_udisks_edbus2_init(); +#endif snprintf(theme_file, PATH_MAX, "%s/e-module-places.edj", places_conf->module->dir); @@ -57,15 +61,18 @@ places_shutdown(void) { if (poller) ecore_timer_del(poller); + while (volumes) + places_volume_del((Volume*)volumes->data); + #ifdef HAVE_UDISKS places_udisks_shutdown(); #endif #ifdef HAVE_EEZE places_eeze_shutdown(); #endif - - while (volumes) - places_volume_del((Volume*)volumes->data); +#ifdef HAVE_EDBUS2 + places_udisks_edbus2_shutdown(); +#endif } Eina_List * @@ -87,13 +94,18 @@ places_volume_add(const char *id, Eina_Bool first_time) v->id = eina_stringshare_add(id); v->valid = EINA_FALSE; v->objs = NULL; - v->icon = NULL; - v->device = NULL; + v->icon = eina_stringshare_add(""); + v->device = eina_stringshare_add(""); + v->label = eina_stringshare_add(""); + v->mount_point = eina_stringshare_add(""); + v->fstype = eina_stringshare_add(""); v->to_mount = EINA_FALSE; v->force_open = EINA_FALSE; - v->drive_type = ""; - v->model = ""; - v->bus = ""; + v->drive_type = eina_stringshare_add(""); + v->model = eina_stringshare_add(""); + v->serial = eina_stringshare_add(""); + v->vendor = eina_stringshare_add(""); + v->bus = eina_stringshare_add(""); v->to_mount = ((places_conf->auto_mount && !first_time) || (first_time && places_conf->boot_mount)); v->force_open = (places_conf->auto_open && !first_time); @@ -109,6 +121,9 @@ places_volume_del(Volume *v) Evas_Object *o; Evas_Object *swal; + if (v->free_func) + v->free_func(v); + volumes = eina_list_remove(volumes, v); EINA_LIST_FREE(v->objs, o) { @@ -122,7 +137,7 @@ places_volume_del(Volume *v) e_box_unpack(o); evas_object_del(o); } - if (v->id) eina_stringshare_del(v->id); + if (v->id) eina_stringshare_del(v->id); if (v->label) eina_stringshare_del(v->label); if (v->icon) eina_stringshare_del(v->icon); if (v->mount_point) eina_stringshare_del(v->mount_point); @@ -133,7 +148,7 @@ places_volume_del(Volume *v) if (v->model) eina_stringshare_del(v->model); if (v->vendor) eina_stringshare_del(v->vendor); if (v->serial) eina_stringshare_del(v->serial); - + free(v); } @@ -252,7 +267,6 @@ places_fill_box(Evas_Object *box) edje_object_signal_callback_add(o, "header,activated", "places", _places_header_activated_cb, NULL); - // volume objects for (l = volumes; l; l = l->next) { @@ -373,8 +387,9 @@ places_empty_box(Evas_Object *box) count = e_box_pack_count_get(box); while (count >= 0) { - Evas_Object *o; - Evas_Object *swal; + Volume *vol; + Eina_List *l; + Evas_Object *o, *swal; o = e_box_pack_object_nth(box, count); swal = edje_object_part_swallow_get(o, "icon"); @@ -384,6 +399,9 @@ places_empty_box(Evas_Object *box) evas_object_del(swal); } + EINA_LIST_FOREACH(volumes, l, vol) + vol->objs = eina_list_remove(vol->objs, o); + e_box_unpack(o); evas_object_del(o); @@ -432,7 +450,7 @@ places_print_volume(Volume *v) { const char *size, *free; - printf("Got volume %s\n", v->id); + printf("Got volume %s (totals: %d)\n", v->id, eina_list_count(volumes)); printf(" label: %s\n",v->label); printf(" mounted: %d\n", v->mounted); printf(" m_point: %s\n", v->mount_point); @@ -616,7 +634,7 @@ _places_volume_object_update(Volume *vol, Evas_Object *obj) // the volume label if (vol->mount_point && !strcmp(vol->mount_point, "/")) edje_object_part_text_set(obj, "volume_label", D_("Filesystem")); - else if (vol->label && strlen(vol->label)) + else if (vol->label && vol->label[0]) edje_object_part_text_set(obj, "volume_label", vol->label); else edje_object_part_text_set(obj, "volume_label", D_("No Name")); diff --git a/src/e_mod_places.h b/src/e_mod_places.h index c96a1b4..93ee8f4 100644 --- a/src/e_mod_places.h +++ b/src/e_mod_places.h @@ -41,6 +41,8 @@ struct _Volume void (*mount_func)(Volume *vol, Eina_List *opts); void (*unmount_func)(Volume *vol, Eina_List *opts); void (*eject_func)(Volume *vol, Eina_List *opts); + void (*free_func)(Volume *vol); + void *backend_data; }; void places_init(void); diff --git a/src/e_mod_udisks_edbus2.c b/src/e_mod_udisks_edbus2.c new file mode 100644 index 0000000..a783370 --- /dev/null +++ b/src/e_mod_udisks_edbus2.c @@ -0,0 +1,417 @@ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_EDBUS2 + +#include +#include +#include "e_mod_places.h" + + +/* Local Function Prototypes */ +static void _places_udisks_name_start(void *data, const EDBus_Message *msg, EDBus_Pending *pending); +static void _places_udisks_enumerate_devices_cb(void *data, const EDBus_Message *msg, EDBus_Pending *pending); +static void _places_udisks_device_add_cb(void *data, const EDBus_Message *msg); +static void _places_udisks_device_del_cb(void *data, const EDBus_Message *msg); +static void _places_udisks_device_changed_cb(void *data, const EDBus_Message *msg); +static void _places_udisks_vol_props_cb(void *data, const EDBus_Message *msg, EDBus_Pending *pending); + +static Volume* _places_udisks_volume_add(const char *devpath, Eina_Bool first_time); +static void _places_udisks_mount_func(Volume *vol, Eina_List *opts); +static void _places_udisks_unmount_func(Volume *vol, Eina_List *opts); +static void _places_udisks_eject_func(Volume *vol, Eina_List *opts); +static void _places_udisks_free_func(Volume *vol); + + +/* Local Variables */ +#define UDISKS_BUS "org.freedesktop.UDisks" +#define UDISKS_PATH "/org/freedesktop/UDisks" +#define UDISKS_IFACE "org.freedesktop.UDisks" +#define UDISKS_DEVICE_IFACE "org.freedesktop.UDisks.Device" + +static EDBus_Connection *_places_dbus_conn = NULL; +static EDBus_Proxy *_places_udisks_proxy = NULL; + + +/* API */ +Eina_Bool +places_udisks_edbus2_init(void) +{ + printf("PLACES: udisks2: init()\n"); + + if (!edbus_init()) + return EINA_FALSE; + + _places_dbus_conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SYSTEM); + if (!_places_dbus_conn) + { + printf("PLACES: udisks2: Error connecting to system bus. Is it running?\n"); + return EINA_FALSE; + } + + edbus_name_start(_places_dbus_conn, UDISKS_BUS, 0, + _places_udisks_name_start, NULL); + + return EINA_TRUE; +} + +void +places_udisks_edbus2_shutdown(void) +{ + if (_places_udisks_proxy) edbus_proxy_unref(_places_udisks_proxy); + if (_places_dbus_conn) edbus_connection_unref(_places_dbus_conn); + edbus_shutdown(); +} + +/* Implementation */ +static void +_places_udisks_name_start(void *data, const EDBus_Message *msg, + EDBus_Pending *pending) +{ + EDBus_Object *obj; + unsigned flag; + + EINA_SAFETY_ON_FALSE_RETURN(edbus_message_arguments_get(msg, "u", &flag)); + + obj = edbus_object_get(_places_dbus_conn, UDISKS_BUS, UDISKS_PATH); + _places_udisks_proxy = edbus_proxy_get(obj, UDISKS_IFACE); + + edbus_proxy_call(_places_udisks_proxy, "EnumerateDevices", + _places_udisks_enumerate_devices_cb, NULL, -1, ""); + + edbus_proxy_signal_handler_add(_places_udisks_proxy, "DeviceAdded", + _places_udisks_device_add_cb, NULL); + edbus_proxy_signal_handler_add(_places_udisks_proxy, "DeviceRemoved", + _places_udisks_device_del_cb, NULL); +} + +static Volume* +_places_udisks_volume_add(const char *devpath, Eina_Bool first_time) +{ + EDBus_Object *obj; + EDBus_Proxy *proxy; + Volume *vol; + + // create the EDBus object and proxy + obj = edbus_object_get(_places_dbus_conn, UDISKS_BUS, devpath); + if (!obj) return NULL; + proxy = edbus_proxy_get(obj, UDISKS_DEVICE_IFACE); + if (!proxy) return NULL; + + // create the places volume + vol = places_volume_add(devpath, first_time); + if (!vol) return NULL; + vol->backend_data = proxy; + vol->mount_func = _places_udisks_mount_func; + vol->unmount_func = _places_udisks_unmount_func; + vol->eject_func = _places_udisks_eject_func; + vol->free_func = _places_udisks_free_func; + + // get notification when the dive change + edbus_proxy_signal_handler_add(proxy, "Changed", + _places_udisks_device_changed_cb, vol); + + return vol; +} + +/* Callback of UDisks method "EnumerateDevices()" */ +static void +_places_udisks_enumerate_devices_cb(void *data, const EDBus_Message *msg, EDBus_Pending *pending) +{ + EDBus_Message_Iter *ao; + const char *devpath; + + EINA_SAFETY_ON_TRUE_RETURN(edbus_message_error_get(msg, NULL, NULL)); + EINA_SAFETY_ON_FALSE_RETURN(edbus_message_arguments_get(msg, "ao", &ao)); + + while (edbus_message_iter_get_and_next(ao, 'o', &devpath)) + { + Volume *vol; + vol = _places_udisks_volume_add(devpath, EINA_TRUE); + if (!vol) return; + edbus_proxy_property_get_all((EDBus_Proxy *)vol->backend_data, + _places_udisks_vol_props_cb, vol); + } +} + +/* Callback for UDisks signal "DeviceAdded" */ +static void +_places_udisks_device_add_cb(void *data, const EDBus_Message *msg) +{ + Volume *vol; + char *devpath; + + EINA_SAFETY_ON_FALSE_RETURN(edbus_message_arguments_get(msg, "o", &devpath)); + printf("PLACES udisks: DeviceAdded [%s]\n", devpath); + + if ((vol = _places_udisks_volume_add(devpath, EINA_FALSE))) + edbus_proxy_property_get_all((EDBus_Proxy *)vol->backend_data, + _places_udisks_vol_props_cb, vol); +} + +/* Callback for UDisks signal "DeviceRemoved" */ +static void +_places_udisks_device_del_cb(void *data, const EDBus_Message *msg) +{ + Volume *vol; + char *devpath; + + EINA_SAFETY_ON_FALSE_RETURN(edbus_message_arguments_get(msg, "o", &devpath)); + + if ((vol = places_volume_by_id_get(devpath))) + places_volume_del(vol); +} + +/* Callback for UDisks signal "Changed" */ +static void +_places_udisks_device_changed_cb(void *data, const EDBus_Message *msg) +{ + Volume *vol = data; + + if (!vol) return; + edbus_proxy_property_get_all((EDBus_Proxy *)vol->backend_data, + _places_udisks_vol_props_cb, vol); +} + +/* Callback for edbus_proxy_property_get_all() */ +static void +_places_udisks_vol_props_cb(void *data, const EDBus_Message *msg, EDBus_Pending *pending) +{ + Volume *vol = data; + EDBus_Message_Iter *array, *dict; + + const char *label = NULL; + const char *partition_label = NULL; + const char *device = NULL; + const char *mount_point = NULL; + const char *drive_type = NULL; + const char *fstype = NULL; + const char *bus = NULL; + const char *model = NULL; + const char *serial = NULL; + const char *vendor = NULL; + const char *id_usage = NULL; + Eina_Bool mounted = EINA_FALSE; + Eina_Bool unlocked = EINA_FALSE; + Eina_Bool removable = EINA_FALSE; + Eina_Bool requires_eject = EINA_FALSE; + Eina_Bool can_detach = EINA_FALSE; + Eina_Bool encrypted = EINA_FALSE; + Eina_Bool media_available = EINA_FALSE; + unsigned long long size = 0; + + EINA_SAFETY_ON_TRUE_RETURN(edbus_message_error_get(msg, NULL, NULL)); + EINA_SAFETY_ON_FALSE_RETURN(edbus_message_arguments_get(msg, "a{sv}", &array)); + + // collect usefull props iterating over the dict + while (edbus_message_iter_get_and_next(array, 'e', &dict)) + { + EDBus_Message_Iter *var; + const char *key; + Eina_Bool bool; + + if (!edbus_message_iter_arguments_get(dict, "sv", &key, &var)) + continue; + + // skip volumes with volume.ignore set + if (!strcmp(key, "DeviceIsMediaChangeDetectionInhibited")) + { + edbus_message_iter_arguments_get(var, "b", &bool); + if (bool) return; + } + else if (!strcmp(key, "IdUsage")) + edbus_message_iter_arguments_get(var, "s", &id_usage); + else if (!strcmp(key, "DeviceFile")) + edbus_message_iter_arguments_get(var, "s", &device); + else if (!strcmp(key, "IdLabel")) + edbus_message_iter_arguments_get(var, "s", &label); + else if (!strcmp(key, "PartitionLabel")) + edbus_message_iter_arguments_get(var, "s", &partition_label); + else if (!strcmp(key, "IdType")) + edbus_message_iter_arguments_get(var, "s", &fstype); + else if (!strcmp(key, "DriveModel")) + edbus_message_iter_arguments_get(var, "s", &model); + else if (!strcmp(key, "DriveSerial")) + edbus_message_iter_arguments_get(var, "s", &serial); + else if (!strcmp(key, "DriveVendor")) + edbus_message_iter_arguments_get(var, "s", &vendor); + else if (!strcmp(key, "DriveConnectionInterface")) + edbus_message_iter_arguments_get(var, "s", &bus); + else if (!strcmp(key, "DeviceMountPaths")) + { + EDBus_Message_Iter *inner_array; + if (!edbus_message_iter_arguments_get(var, "as", &inner_array)) + continue; + edbus_message_iter_get_and_next(inner_array, 's', &mount_point); + } + else if (!strcmp(key, "DriveMediaCompatibility")) + { + EDBus_Message_Iter *inner_array; + if (!edbus_message_iter_arguments_get(var, "as", &inner_array)) + continue; + edbus_message_iter_get_and_next(inner_array, 's', &drive_type); + } + else if (!strcmp(key, "DeviceIsLuks")) + edbus_message_iter_arguments_get(var, "b", &encrypted); + else if (!strcmp(key, "DeviceIsMounted")) + edbus_message_iter_arguments_get(var, "b", &mounted); + else if (!strcmp(key, "DeviceIsLuksCleartext")) + edbus_message_iter_arguments_get(var, "b", &unlocked); + else if (!strcmp(key, "DeviceIsRemovable")) + edbus_message_iter_arguments_get(var, "b", &removable); + else if (!strcmp(key, "DriveIsMediaEjectable")) + edbus_message_iter_arguments_get(var, "b", &requires_eject); + else if (!strcmp(key, "DeviceIsMediaAvailable")) + edbus_message_iter_arguments_get(var, "b", &media_available); + else if (!strcmp(key, "DriveCanDetach")) + edbus_message_iter_arguments_get(var, "b", &can_detach); + else if (!strcmp(key, "DeviceSize")) + edbus_message_iter_arguments_get(var, "t", &size); + } + + // a cdrom has been ejected, invalidate the drive to 'hide' it + if (!media_available && vol->valid) + { + vol->valid = EINA_FALSE; + places_update_all_gadgets(); + return; + } + + // skip volumes that aren't filesystems or crypto + if (!id_usage || !id_usage[0]) return; + if (!strcmp(id_usage, "crypto") && !encrypted) + return; + else if (strcmp(id_usage, "filesystem")) + return; + + // choose the best label + if (partition_label && partition_label[0]) + eina_stringshare_replace(&vol->label, partition_label); + else if (label && label[0]) + eina_stringshare_replace(&vol->label, label); + else if (mount_point && mount_point[0]) + eina_stringshare_replace(&vol->label, mount_point); + else if (device && device[0]) + eina_stringshare_replace(&vol->label, vol->device); + + // store all other props in the Volume* + if (device) eina_stringshare_replace(&vol->device, device); + if (mount_point) eina_stringshare_replace(&vol->mount_point, mount_point); + if (fstype) eina_stringshare_replace(&vol->fstype, fstype); + if (model) eina_stringshare_replace(&vol->model, model); + if (serial) eina_stringshare_replace(&vol->serial, serial); + if (vendor) eina_stringshare_replace(&vol->vendor, vendor); + if (bus) eina_stringshare_replace(&vol->bus, bus); + if (drive_type) eina_stringshare_replace(&vol->drive_type, drive_type); + vol->mounted = mounted; + vol->unlocked = unlocked; + vol->removable = removable; + vol->requires_eject = requires_eject || can_detach; + vol->encrypted = encrypted; + vol->size = size; + + if (!vol->valid) + { + vol->valid = EINA_TRUE; + // trigger a full redraw, is the only way to show a new device + places_update_all_gadgets(); + } + + // the update is always needed to trigger auto_mount/auto_open + places_volume_update(vol); +} + +static void +_places_udisks_volume_task_cb(void *data, const EDBus_Message *msg, + EDBus_Pending *pending) +{ + // Volume *vol = data; + + // TODO alert if the operation has failed + // printf("sig: '%s'\n", edbus_message_signature_get(msg)); + // char *str; + // edbus_message_arguments_get(msg,"s", &str); + // printf("%s\n", str); +} + +static void +_places_udisks_mount_func(Volume *vol, Eina_List *opts) +{ + EDBus_Proxy *proxy = vol->backend_data; + EDBus_Message_Iter *array, *main_iter; + EDBus_Message *msg; + Eina_List *l; + const char *opt_txt; + + if (!proxy) return; + + msg = edbus_proxy_method_call_new(proxy, "FilesystemMount"); + main_iter = edbus_message_iter_get(msg); + edbus_message_iter_arguments_append(main_iter, "sas", vol->fstype, &array); + EINA_LIST_FOREACH(opts, l, opt_txt) + { + // printf(" opt: '%s'\n", opt_txt); + edbus_message_iter_basic_append(array, 's', opt_txt); + } + edbus_message_iter_container_close(main_iter, array); + + edbus_proxy_send(proxy, msg, _places_udisks_volume_task_cb, vol, -1); +} + +static void +_places_udisks_unmount_func(Volume *vol, Eina_List *opts) +{ + EDBus_Proxy *proxy = vol->backend_data; + EDBus_Message_Iter *array, *main_iter; + EDBus_Message *msg; + + if (!proxy) return; + + msg = edbus_proxy_method_call_new(proxy, "FilesystemUnmount"); + main_iter = edbus_message_iter_get(msg); + edbus_message_iter_arguments_append(main_iter, "as", &array); + // here we can use the force option if needed + edbus_message_iter_container_close(main_iter, array); + + edbus_proxy_send(proxy, msg, _places_udisks_volume_task_cb, vol, -1); +} + +static void +_places_udisks_eject_func(Volume *vol, Eina_List *opts) +{ + EDBus_Proxy *proxy = vol->backend_data; + EDBus_Message_Iter *array, *main_iter; + EDBus_Message *msg; + + if (!proxy) return; + + msg = edbus_proxy_method_call_new(proxy, "DriveEject"); + // msg = edbus_proxy_method_call_new(proxy, "DriveDetach"); + main_iter = edbus_message_iter_get(msg); + edbus_message_iter_arguments_append(main_iter, "as", &array); + edbus_message_iter_container_close(main_iter, array); + + edbus_proxy_send(proxy, msg, _places_udisks_volume_task_cb, vol, -1); +} + +static void +_places_udisks_free_func(Volume *vol) +{ + EDBus_Object *obj; + EDBus_Proxy *proxy; + + if (vol->backend_data) + { + proxy = vol->backend_data; + obj = edbus_proxy_object_get(proxy); + + if (proxy) edbus_proxy_unref(proxy); + if (obj) edbus_object_unref(obj); + + vol->backend_data = NULL; + } +} + +#endif diff --git a/src/e_mod_udisks_edbus2.h b/src/e_mod_udisks_edbus2.h new file mode 100644 index 0000000..c51b487 --- /dev/null +++ b/src/e_mod_udisks_edbus2.h @@ -0,0 +1,8 @@ +#ifndef E_MOD_PLACES_UDISKS_EDBUS2_H +#define E_MOD_PLACES_UDISKS_EDBUS2_H + +void places_udisks_edbus2_init(void); +void places_udisks_edbus2_shutdown(void); + +#endif +