From 6e73e8ff110a474d161a14e678d8579177634209 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 12 Jul 2005 03:53:56 +0000 Subject: [PATCH] damn - um... patches from mailing list - fix patch with layer number. da.po - waiting for da.po i can use.. etc :) SVN revision: 15738 --- autogen.sh | 1 - configure.in | 3 +- data/themes/default_clock.edc | 143 ++++ po/Makefile.am | 85 +-- po/da.po | 1311 ++++++++++++++++++++++++++++++++ src/bin/e_apps.c | 3 +- src/bin/e_border.c | 6 +- src/bin/e_intl.c | 1 + src/bin/e_ipc_handlers.h | 1 + src/bin/e_utils.c | 3 +- src/bin/e_zone.c | 21 + src/bin/e_zone.h | 1 + src/modules/clock/e_mod_main.c | 116 ++- src/modules/clock/e_mod_main.h | 4 + src/modules/ibar/e_mod_main.c | 2 +- src/modules/test/e_mod_main.c | 2 +- 16 files changed, 1613 insertions(+), 90 deletions(-) create mode 100644 po/da.po diff --git a/autogen.sh b/autogen.sh index b34aba5e8..be9f2bf4b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,7 +10,6 @@ echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \ && echo "Running automake..."; automake --add-missing --copy --gnu \ && echo "Generating gettext enlightenment.pot template"; \ xgettext \ --s \ -n \ -C \ -d enlightenment \ diff --git a/configure.in b/configure.in index 86c98e45b..74a81f68d 100644 --- a/configure.in +++ b/configure.in @@ -124,7 +124,8 @@ AC_CHECK_HEADER(X11/X.h, AC_SUBST(x_cflags) AC_SUBST(x_libs) -ALL_LINGUAS="bg de es fi fr ja pl pt ru zh_CN hu sl it cs" +ALL_LINGUAS="bg de es fi fr ja pl pt ru zh_CN hu sl it cs da" +AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION(0.12.1) diff --git a/data/themes/default_clock.edc b/data/themes/default_clock.edc index 135f9098e..cf3e59c95 100644 --- a/data/themes/default_clock.edc +++ b/data/themes/default_clock.edc @@ -1,6 +1,7 @@ images { image: "e17_clock_bg.png" COMP; image: "e17_clock_fg.png" COMP; + image: "e17_button.png" COMP; image: "e17_clock_seconds_00.png" COMP; image: "e17_clock_seconds_01.png" COMP; image: "e17_clock_seconds_02.png" COMP; @@ -187,9 +188,23 @@ group { script { public clock_cb(val) { new buf[11]; + new digitalVal[15]; + new hourStr[4], minuteStr[4], secondStr[4]; new year, month, day, yearday, weekday, hour, minute; new Float:second; new v; + new isAfternoon; + new digiBuf[2]; + new digitalStyle; + new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_MILITARY; + + DIGITAL_STYLE_NONE = 0; + DIGITAL_STYLE_NORMAL = 1; + DIGITAL_STYLE_MILITARY = 2; + + get_text(PART:"digitalStyle", digiBuf, 2); + + digitalStyle = atoi(digiBuf); date(year, month, day, yearday, weekday, hour, minute, second); v = round(second); @@ -200,6 +215,7 @@ group { #endif #if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE != MEDIUMRES_PDA buf[0] = 0; + digitalVal[0] = 0; if (v < 10) {snprintf(buf, 10, "0%i", v);} else {snprintf(buf, 10, "%i", v);} set_state(PART:"seconds", buf, 0.0); @@ -209,11 +225,61 @@ group { if (v < 10) {snprintf(buf, 10, "0%i", v);} else {snprintf(buf, 10, "%i", v);} set_state(PART:"minutes", buf, 0.0); + v = ((hour % 12) * 5) + ((minute * 5) / 60); buf[0] = 0; if (v < 10) {snprintf(buf, 10, "0%i", v);} else {snprintf(buf, 10, "%i", v);} set_state(PART:"hour", buf, 0.0); + + + buf[0] = 0; + v = round(second); + if (v < 10) {snprintf(buf, 10, "0%i", v);} + else {snprintf(buf, 10, "%i", v);} + snprintf(secondStr, 3, "%s", buf); + + buf[0] = 0; + if (minute < 10) {snprintf(buf, 10, "0%i", minute);} + else {snprintf(buf, 10, "%i", minute);} + snprintf(minuteStr, 3, "%s", buf); + + buf[0] = 0; + isAfternoon = 0; + v = hour; + if (hour >= 12 && hour < 24) { isAfternoon = 1; } + if (digitalStyle == DIGITAL_STYLE_MILITARY) { + if (v == 0) { v = 24; } + } else { + v = (v % 12); + if (v == 0) { v = 12; } + } + snprintf(buf, 10, "%i", v); + snprintf(hourStr, 3, "%s", buf); + + buf[0] = 0; + + if (isAfternoon == 1) { + snprintf(buf, 10, "PM"); + } else { + snprintf(buf, 10, "AM"); + } + + if (digitalStyle != DIGITAL_STYLE_NONE) { + if (digitalStyle == DIGITAL_STYLE_NORMAL) { + snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr, secondStr, buf); + } else if (digitalStyle == DIGITAL_STYLE_MILITARY) { + snprintf(digitalVal, 14, "%s:%s:%s", hourStr, minuteStr, secondStr); + } + + set_text(PART:"digital", digitalVal); + set_state(PART:"digital", "digital", 0.0); + set_state(PART:"digital_bg", "digital", 0.0); + } else { + set_text(PART:"digital", ""); + set_state(PART:"digital", "hidden", 0.0); + set_state(PART:"digital_bg", "hidden", 0.0); + } } } parts { @@ -521,6 +587,83 @@ group { } } } + part { + name: "digital_bg"; + mouse_events: 0; + description { + state: "digital" 0.0; + image { + normal: "e17_button.png"; + } + rel1 { + relative: 0.0 1.0; + } + rel2 { + relative: 1.0 1.2; + } + } + description { + state: "hidden" 0.0; + image { + normal: "e17_button.png"; + } + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 0.0 0.0; + } + } + } + part { + name: "digital"; + type: TEXT; + effect: SOFT_SHADOW; + description { + state: "digital" 0.0; + min: 0 11; + rel1 { + relative: 0.0 0.9; + } + rel2 { + relative: 1.0 1.0; + } + color: 255 255 255 255; + color3: 0 0 0 32; + text { + text: "00:00:00 AM"; + font: "Edje Vera"; + size: 7; + min: 1 0; + fit: 0 1; + align: 0.5 1.0; + } + } + description { + state: "hidden" 0.0; + aspect: 0.0 0.0; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 0.0 0.0; + } + } + } + part { + name: "digitalStyle"; + type: TEXT; + description { + state: "hidden" 0.0; + aspect: 0.0 0.0; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 0.0 0.0; + } + } + } } programs { program { diff --git a/po/Makefile.am b/po/Makefile.am index 089ede4cf..a0f449945 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -3,95 +3,24 @@ MAINTAINERCLEANFILES = Makefile.in MSGFMT = msgfmt podir = -po_DATA = \ -fr.mo \ -ja.mo \ -es.mo \ -pt.mo \ -fi.mo \ -ru.mo \ -bg.mo \ -de.mo \ -pl.mo \ -zh_CN.mo \ -hu.mo \ -sl.mo \ -it.mo \ -cs.mo +po_DATA = $(addsuffix .mo,$(ALL_LINGUAS)) -LANGS = \ -fr \ -ja \ -es \ -pt \ -fi \ -ru \ -bg \ -de \ -pl \ -zh_CN \ -hu \ -sl \ -it \ -cs +EXTRA_DIST = enlightenment.pot $(addsuffix .po,$(ALL_LINGUAS)) -EXTRA_DIST = \ -enlightenment.pot \ -fr.po \ -ja.po \ -es.po \ -pt.po \ -fi.po \ -ru.po \ -bg.po \ -de.po \ -pl.po \ -zh_CN.po \ -hu.po \ -sl.po \ -it.po \ -cs.po - -ja.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/ja.po -fr.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/fr.po -es.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/es.po -pt.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/pt.po -fi.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/fi.po -ru.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/ru.po -bg.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/bg.po -de.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/de.po -pl.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/pl.po -zh_CN.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/zh_CN.po -hu.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/hu.po -sl.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/sl.po -it.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/it.po -cs.mo: - $(MSGFMT) -f -o $@ $(top_srcdir)/po/cs.po +%.mo : %.po + $(MSGFMT) -f -o $@ $< install-poDATA: uninstall-poDATA: install-data-local: - for L in $(LANGS); do \ + for L in $(ALL_LINGUAS); do \ $(mkinstalldirs) $(DESTDIR)$(datadir)/locale/$$L/LC_MESSAGES; \ $(INSTALL_DATA) \ $$L.mo $(DESTDIR)$(datadir)/locale/$$L/LC_MESSAGES/$(PACKAGE).mo; \ done - + uninstall: - for L in $(LANGS); do \ + for L in $(ALL_LINGUAS); do \ rm -f $(DESTDIR)$(datadir)/locale/$$L/LC_MESSAGES/$(PACKAGE).mo; \ done diff --git a/po/da.po b/po/da.po new file mode 100644 index 000000000..263cf9519 --- /dev/null +++ b/po/da.po @@ -0,0 +1,1311 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2005-07-12 11:51+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/bin/e_main.c:166 +#, c-format +msgid "" +"Options:\n" +"\t-display DISPLAY\n" +"\t\tConnect to display named DISPLAY.\n" +"\t\tEG: -display :1.0\n" +"\t-fake-xinerama-screen WxH+X+Y\n" +"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n" +"\t\tgiven the geometry. Add as many as you like. They all\n" +"\t\treplace the real xinerama screens, if any. This can\n" +"\t\tbe used to simulate xinerama.\n" +"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800" +"+0\n" +"\t-good\n" +"\t\tBe good.\n" +"\t-evil\n" +"\t\tBe evil.\n" +"\t-psychotic\n" +"\t\tBe psychotic.\n" +msgstr "" + +#: src/bin/e_main.c:218 +msgid "" +"Enlightenment cannot Initialize Ecore!\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:228 +msgid "" +"Enlightenment cannot set up an exit signal handler.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:234 +msgid "" +"Enlightenment cannot set up a HUP signal handler.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:245 +msgid "" +"Enlightenment cannot initialize its X connection.\n" +"Have you set your DISPLAY variable?" +msgstr "" + +#: src/bin/e_main.c:253 +msgid "" +"Enlightenment cannot initialize its emergency alert system.\n" +"Have you set your DISPLAY variable?" +msgstr "" + +#: src/bin/e_main.c:260 +msgid "" +"Enlightenment cannot setup xinerama wrapping.\n" +"This should not happen." +msgstr "" + +#: src/bin/e_main.c:276 +msgid "" +"Enlightenment cannot initialize the connections system.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:284 +msgid "" +"Enlightenment cannot initialize the IPC system.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:292 +msgid "" +"Enlightenment cannot initialize the Evas system.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:298 +msgid "" +"Enlightenment found ecore_evas doesnt support Software X11\n" +"rendering in Evas. Please check your installation of Evas and\n" +"Ecore and check they support Software X11 rendering." +msgstr "" + +#: src/bin/e_main.c:307 +msgid "" +"Enlightenment cannot initialize the File system.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:319 +msgid "" +"Enlightenment cannot create directories in your home directory.\n" +"Perhaps you have no home directory or the disk is full?" +msgstr "" + +#: src/bin/e_main.c:327 +msgid "Enlightenment cannot set up its config system." +msgstr "" + +#: src/bin/e_main.c:334 +msgid "" +"Enlightenment cannot set up paths for finding files.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:342 +msgid "Enlightenment cannot set up its actions system." +msgstr "" + +#: src/bin/e_main.c:349 +msgid "Enlightenment cannot set up its bindings system." +msgstr "" + +#: src/bin/e_main.c:356 +msgid "Enlightenment cannot set up its popup system." +msgstr "" + +#: src/bin/e_main.c:367 +msgid "Enlightenment cannot set up its font system." +msgstr "" + +#: src/bin/e_main.c:379 +msgid "" +"Enlightenment cannot set up init screen.\n" +"Perhaps you are out of memory?" +msgstr "" + +#: src/bin/e_main.c:388 +msgid "Enlightenment cannot set up its app system." +msgstr "" + +#: src/bin/e_main.c:395 +msgid "Enlightenment cannot set up its theme system." +msgstr "" + +#: src/bin/e_main.c:402 +msgid "" +"Enlightenment set up window management for all the screens on your system\n" +"failed. Perhaps another window manager is running?\n" +msgstr "" + +#: src/bin/e_main.c:409 +msgid "Enlightenment cannot setup remember settings." +msgstr "" + +#: src/bin/e_main.c:425 src/bin/e_main.c:473 +msgid "" +"Enlightenment cannot set up the IPC socket.\n" +"It likely is already in use by an existing copy of Enlightenment.\n" +"Double check to see if Enlightenment is not already on this display,\n" +"but if that fails try deleting all files in ~/.ecore/enlightenment-*\n" +"and try running again." +msgstr "" + +#: src/bin/e_main.c:438 +msgid "Enlightenment cannot set up its msg system." +msgstr "" + +#: src/bin/e_main.c:445 +msgid "Enlightenment cannot set up its dnd system." +msgstr "" + +#: src/bin/e_main.c:452 +msgid "Enlightenment cannot set up its input grab handling system." +msgstr "" + +#: src/bin/e_main.c:459 +msgid "Enlightenment cannot set up its module system." +msgstr "" + +#: src/bin/e_main.c:466 +msgid "Enlightenment cannot set up its window list system." +msgstr "" + +#: src/bin/e_main.c:472 +msgid "Enlightenment IPC setup error!" +msgstr "" + +#: src/bin/e_main.c:489 +msgid "Enlightenment" +msgstr "" + +#: src/bin/e_main.c:491 +msgid "Enlightenment Starting. Please wait." +msgstr "" + +#: src/bin/e_border.c:5566 +msgid "Position (User)" +msgstr "" + +#: src/bin/e_border.c:5567 +msgid "Size (User)" +msgstr "" + +#: src/bin/e_border.c:5568 +msgid "Stacking (User)" +msgstr "" + +#: src/bin/e_border.c:5569 +msgid "Iconify (User)" +msgstr "" + +#: src/bin/e_border.c:5571 +msgid "Sticky (User)" +msgstr "" + +#: src/bin/e_border.c:5572 +msgid "Shade (User)" +msgstr "" + +#: src/bin/e_border.c:5573 +msgid "Maximize (User)" +msgstr "" + +#: src/bin/e_border.c:5574 +msgid "Fullscreen (User)" +msgstr "" + +#: src/bin/e_border.c:5577 +msgid "Position (Application)" +msgstr "" + +#: src/bin/e_border.c:5578 +msgid "Size (Application)" +msgstr "" + +#: src/bin/e_border.c:5579 +msgid "Stacking (Application)" +msgstr "" + +#: src/bin/e_border.c:5580 +msgid "Iconify (Application)" +msgstr "" + +#: src/bin/e_border.c:5582 +msgid "Sticky (Application)" +msgstr "" + +#: src/bin/e_border.c:5583 +msgid "Shade (Application)" +msgstr "" + +#: src/bin/e_border.c:5584 +msgid "Maximize (Application)" +msgstr "" + +#: src/bin/e_border.c:5585 +msgid "Fullscreen (Application)" +msgstr "" + +#: src/bin/e_border.c:5588 +msgid "Border" +msgstr "" + +#: src/bin/e_border.c:5589 src/bin/e_border.c:5647 +msgid "Close" +msgstr "" + +#: src/bin/e_border.c:5592 +msgid "Lifespan" +msgstr "" + +#: src/bin/e_border.c:5606 +msgid "Remember This Window" +msgstr "" + +#: src/bin/e_border.c:5613 +msgid "Remember This Instance Only" +msgstr "" + +#: src/bin/e_border.c:5616 +msgid "Match by Name" +msgstr "" + +#: src/bin/e_border.c:5617 +msgid "Match by Class" +msgstr "" + +#: src/bin/e_border.c:5618 +msgid "Match by Title" +msgstr "" + +#: src/bin/e_border.c:5619 +msgid "Match by Role" +msgstr "" + +#: src/bin/e_border.c:5620 +msgid "Match by Window Type" +msgstr "" + +#: src/bin/e_border.c:5621 +msgid "Match by Transient Status" +msgstr "" + +#: src/bin/e_border.c:5624 +msgid "Remember Position" +msgstr "" + +#: src/bin/e_border.c:5625 +msgid "Remember Size" +msgstr "" + +#: src/bin/e_border.c:5626 +msgid "Remember Stacking" +msgstr "" + +#: src/bin/e_border.c:5627 +msgid "Remember Locks" +msgstr "" + +#: src/bin/e_border.c:5628 +msgid "Remember Border" +msgstr "" + +#: src/bin/e_border.c:5629 +msgid "Remember Stickiness" +msgstr "" + +#: src/bin/e_border.c:5630 +msgid "Remember Desktop" +msgstr "" + +#: src/bin/e_border.c:5631 +msgid "Remember Shaded State" +msgstr "" + +#: src/bin/e_border.c:5632 +msgid "Remember Zone" +msgstr "" + +#: src/bin/e_border.c:5633 +msgid "Remember Skip Window List" +msgstr "" + +#: src/bin/e_border.c:5658 +msgid "Iconify" +msgstr "" + +#: src/bin/e_border.c:5672 +msgid "Kill" +msgstr "" + +#: src/bin/e_border.c:5685 +msgid "Shaded" +msgstr "" + +#: src/bin/e_border.c:5698 +msgid "Maximized" +msgstr "" + +#: src/bin/e_border.c:5711 +msgid "Sticky" +msgstr "" + +#: src/bin/e_border.c:5724 +msgid "Always On Top" +msgstr "" + +#: src/bin/e_border.c:5737 +msgid "Always Below" +msgstr "" + +#: src/bin/e_border.c:5750 +msgid "Borderless" +msgstr "" + +#: src/bin/e_border.c:5763 +msgid "Fullscreen" +msgstr "" + +#: src/bin/e_border.c:5777 +msgid "Skip Window List" +msgstr "" + +#: src/bin/e_border.c:5791 +msgid "Locks" +msgstr "" + +#: src/bin/e_border.c:5798 +msgid "Remember" +msgstr "" + +#: src/bin/e_border.c:5808 +msgid "Send To" +msgstr "" + +#: src/bin/e_border.c:5830 +msgid "Edit Icon" +msgstr "" + +#: src/bin/e_border.c:5856 +msgid "Create Icon" +msgstr "" + +#: src/bin/e_border.c:5944 +msgid "Icon Edit Error" +msgstr "" + +#: src/bin/e_border.c:5945 +msgid "" +"Error starting icon editor\n" +"\n" +"please install e_util_eapp_edit\n" +"or make sure it is in your PATH\n" +msgstr "" + +#: src/bin/e_apps.c:265 src/bin/e_apps.c:1032 src/bin/e_utils.c:200 +msgid "Run Error" +msgstr "" + +#: src/bin/e_apps.c:266 src/bin/e_utils.c:201 +#, c-format +msgid "" +"Enlightenment was unable fork a child process:\n" +"\n" +"%s\n" +"\n" +msgstr "" + +#: src/bin/e_apps.c:1033 +#, c-format +msgid "" +"Enlightenment was unable run the program:\n" +"\n" +"%s\n" +"\n" +"The command was not found\n" +msgstr "" + +#: src/bin/e_config.c:258 +msgid "" +"Configuration data needed upgrading. Your old configuration\n" +"has been wiped and a new set of defaults initialized. This\n" +"will happen regularly during development, so don't report a\n" +"bug. This simply means Enlightenment needs new configuration\n" +"data by default for usable functionality that your old\n" +"configuration simply lacks. This new set of defaults will fix\n" +"that by adding it in. You can re-configure things now to your\n" +"liking. Sorry for the hiccup in your configuration.\n" +msgstr "" + +#: src/bin/e_config.c:272 +msgid "" +"Your configuration is NEWER than Enlightenment. This is very\n" +"strange. This should not happen unless you downgraded\n" +"Enlightenment or copied the configuration from a place where\n" +"a newer version of Enlightenment was running. This is bad and\n" +"as a precaution your configuration has been now restored to\n" +"defaults. Sorry for the inconvenience.\n" +msgstr "" + +#: src/bin/e_config.c:1163 +msgid "Configuration Upgraded" +msgstr "" + +#: src/bin/e_container.c:105 +#, c-format +msgid "Container %d" +msgstr "" + +#: src/bin/e_int_menus.c:68 +msgid "Favorite Applications" +msgstr "" + +#: src/bin/e_int_menus.c:80 +msgid "Modules" +msgstr "" + +#: src/bin/e_int_menus.c:89 +msgid "Desktops" +msgstr "" + +#: src/bin/e_int_menus.c:98 +msgid "Windows" +msgstr "" + +#: src/bin/e_int_menus.c:107 +msgid "Lost Windows" +msgstr "" + +#: src/bin/e_int_menus.c:116 +msgid "Gadgets" +msgstr "" + +#: src/bin/e_int_menus.c:125 +msgid "Themes" +msgstr "" + +#: src/bin/e_int_menus.c:135 src/bin/e_int_menus.c:305 +msgid "About Enlightenment" +msgstr "" + +#: src/bin/e_int_menus.c:144 +msgid "Run Command" +msgstr "" + +#: src/bin/e_int_menus.c:154 src/bin/e_module.c:399 +msgid "Configuration" +msgstr "" + +#: src/bin/e_int_menus.c:164 +msgid "Restart Enlightenment" +msgstr "" + +#: src/bin/e_int_menus.c:171 +msgid "Exit Enlightenment" +msgstr "" + +#: src/bin/e_int_menus.c:306 +#, c-format +msgid "" +"This is Enlightenment %s.\n" +"Copyright © 1999-2005, by the Enlightenment Dev Team.\n" +"\n" +"We hope you enjoy using this software as much as we enjoyed writing it.\n" +"\n" +"Please think of the aardvarks. They need some love too." +msgstr "" + +#: src/bin/e_int_menus.c:375 +msgid "(No Applications)" +msgstr "" + +#: src/bin/e_int_menus.c:457 +msgid "New Row of Desktops" +msgstr "" + +#: src/bin/e_int_menus.c:461 +msgid "Remove Row of Desktops" +msgstr "" + +#: src/bin/e_int_menus.c:465 +msgid "New Column of Desktops" +msgstr "" + +#: src/bin/e_int_menus.c:469 +msgid "Remove Column of Desktops" +msgstr "" + +#: src/bin/e_int_menus.c:549 src/bin/e_int_menus.c:814 +msgid "(No Windows)" +msgstr "" + +#: src/bin/e_int_menus.c:567 src/bin/e_int_menus.c:831 +msgid "No name!!" +msgstr "" + +#: src/bin/e_int_menus.c:583 +msgid "Cleanup Windows" +msgstr "" + +#: src/bin/e_int_menus.c:663 src/modules/battery/e_mod_main.c:561 +#: src/modules/clock/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:610 +#: src/modules/ibox/e_mod_main.c:457 src/modules/pager/e_mod_main.c:437 +#: src/modules/temperature/e_mod_main.c:728 +#: src/modules/cpufreq/e_mod_main.c:810 src/modules/start/e_mod_main.c:233 +msgid "Edit Mode" +msgstr "" + +#: src/bin/e_int_menus.c:669 +msgid "(Unused)" +msgstr "" + +#: src/bin/e_int_menus.c:759 +msgid "(Empty)" +msgstr "" + +#: src/bin/e_desk.c:45 +#, c-format +msgid "Desktop %d, %d" +msgstr "" + +#: src/bin/e_error.c:209 src/bin/e_error.c:218 +msgid "OK" +msgstr "" + +#: src/bin/e_error.c:364 +msgid "Enlightenment: Error!" +msgstr "" + +#: src/bin/e_gadman.c:537 +msgid "Automatic Width" +msgstr "" + +#: src/bin/e_gadman.c:548 +msgid "Half Screen Width" +msgstr "" + +#: src/bin/e_gadman.c:554 +msgid "Full Screen Width" +msgstr "" + +#: src/bin/e_gadman.c:566 +msgid "Center Horizontally" +msgstr "" + +#: src/bin/e_gadman.c:584 +msgid "Automatic Height" +msgstr "" + +#: src/bin/e_gadman.c:595 +msgid "Half Screen Height" +msgstr "" + +#: src/bin/e_gadman.c:601 +msgid "Full Screen Height" +msgstr "" + +#: src/bin/e_gadman.c:612 +msgid "Center Vertically" +msgstr "" + +#: src/bin/e_gadman.c:624 +msgid "End Edit Mode" +msgstr "" + +#: src/bin/e_init.c:37 +#, c-format +msgid "X reports there are no root windows and %i screens!\n" +msgstr "" + +#: src/bin/e_init.c:111 +msgid "Disable this splash screen in the future?" +msgstr "" + +#: src/bin/e_module.c:100 src/bin/e_module.c:111 src/bin/e_module.c:133 +msgid "Error loading Module" +msgstr "" + +#: src/bin/e_module.c:101 +#, c-format +msgid "" +"There was an error loading module named: %s\n" +"No module named %s could be found in the\n" +"module search directories\n" +msgstr "" + +#: src/bin/e_module.c:112 src/bin/e_module.c:134 +#, c-format +msgid "" +"There was an error loading module named: %s\n" +"The full path to this module is:\n" +"%s\n" +"The error reported was:\n" +"%s" +msgstr "" + +#: src/bin/e_module.c:384 +msgid "About..." +msgstr "" + +#: src/bin/e_module.c:388 +msgid "Enabled" +msgstr "" + +#: src/bin/e_utils.c:246 +msgid "Cannot exit - immortal windows." +msgstr "" + +#: src/bin/e_utils.c:247 +msgid "" +"Some windows are left still around with the Lifespan lock enabled. This " +"means\n" +"that Enlightenment will not allow itself to exit until these windows have\n" +"been closed or have the lifespan lock removed.\n" +msgstr "" + +#: src/bin/e_winlist.c:115 +msgid "Select a window" +msgstr "" + +#: src/modules/battery/e_mod_main.c:45 src/modules/clock/e_mod_main.c:40 +#: src/modules/dropshadow/e_mod_main.c:96 src/modules/ibar/e_mod_main.c:119 +#: src/modules/ibox/e_mod_main.c:103 src/modules/pager/e_mod_main.c:84 +#: src/modules/temperature/e_mod_main.c:48 src/modules/test/e_mod_main.c:9 +#: src/modules/cpufreq/e_mod_main.c:57 src/modules/start/e_mod_main.c:28 +msgid "Module API Error" +msgstr "" + +#: src/modules/battery/e_mod_main.c:46 +#, c-format +msgid "" +"Error initializing Module: Battery\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/battery/e_mod_main.c:89 +msgid "Battery" +msgstr "" + +#: src/modules/battery/e_mod_main.c:98 +msgid "Enlightenment Battery Module" +msgstr "" + +#: src/modules/battery/e_mod_main.c:99 +msgid "" +"A basic battery meter that uses either ACPI or APM\n" +"on Linux to monitor your battery and AC power adaptor\n" +"status. This will only work under Linux and is only\n" +"as accurate as your BIOS or kernel drivers." +msgstr "" + +#: src/modules/battery/e_mod_main.c:190 src/modules/battery/e_mod_main.c:469 +#: src/modules/cpufreq/e_mod_main.c:191 src/modules/cpufreq/e_mod_main.c:474 +msgid "Set Poll Time" +msgstr "" + +#: src/modules/battery/e_mod_main.c:194 src/modules/battery/e_mod_main.c:473 +msgid "Set Alarm" +msgstr "" + +#: src/modules/battery/e_mod_main.c:376 +msgid "Disable" +msgstr "" + +#: src/modules/battery/e_mod_main.c:383 +msgid "10 mins" +msgstr "" + +#: src/modules/battery/e_mod_main.c:390 +msgid "20 mins" +msgstr "" + +#: src/modules/battery/e_mod_main.c:397 +msgid "30 mins" +msgstr "" + +#: src/modules/battery/e_mod_main.c:404 +msgid "40 mins" +msgstr "" + +#: src/modules/battery/e_mod_main.c:411 +msgid "50 mins" +msgstr "" + +#: src/modules/battery/e_mod_main.c:418 +msgid "1 hour" +msgstr "" + +#: src/modules/battery/e_mod_main.c:430 +msgid "Check Fast (1 sec)" +msgstr "" + +#: src/modules/battery/e_mod_main.c:437 +msgid "Check Medium (5 sec)" +msgstr "" + +#: src/modules/battery/e_mod_main.c:444 +msgid "Check Normal (10 sec)" +msgstr "" + +#: src/modules/battery/e_mod_main.c:451 +msgid "Check Slow (30 sec)" +msgstr "" + +#: src/modules/battery/e_mod_main.c:458 +msgid "Check Very Slow (60 sec)" +msgstr "" + +#: src/modules/battery/e_mod_main.c:686 +msgid "Battery Running Low" +msgstr "" + +#: src/modules/battery/e_mod_main.c:687 +msgid "" +"Your battery is running low.\n" +"You may wish to switch to an AC source." +msgstr "" + +#: src/modules/battery/e_mod_main.c:748 +msgid "NO INFO" +msgstr "" + +#: src/modules/battery/e_mod_main.c:879 +msgid "NO BAT" +msgstr "" + +#: src/modules/battery/e_mod_main.c:903 +msgid "BAD DRIVER" +msgstr "" + +#: src/modules/battery/e_mod_main.c:927 +msgid "FULL" +msgstr "" + +#: src/modules/battery/e_mod_main.c:987 +msgid "High" +msgstr "" + +#: src/modules/battery/e_mod_main.c:991 +msgid "Low" +msgstr "" + +#: src/modules/battery/e_mod_main.c:995 +msgid "Danger" +msgstr "" + +#: src/modules/battery/e_mod_main.c:999 +msgid "Charging" +msgstr "" + +#: src/modules/clock/e_mod_main.c:41 +#, c-format +msgid "" +"Error initializing Module: Clock\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/clock/e_mod_main.c:86 +msgid "Clock" +msgstr "" + +#: src/modules/clock/e_mod_main.c:95 +msgid "Enlightenment Clock Module" +msgstr "" + +#: src/modules/clock/e_mod_main.c:96 +msgid "A simple module to give E17 a clock." +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:97 +#, c-format +msgid "" +"Error initializing Module: Dropshadow\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:161 +msgid "Dropshadow" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:170 +msgid "Enlightenment Dropshadow Module" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:171 +msgid "" +"This is the dropshadow module that allows dropshadows to be cast\n" +"on the desktop background - without special X-Server extensions\n" +"or hardware acceleration." +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:281 +msgid "Very Fuzzy" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:290 +msgid "Fuzzy" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:299 src/modules/ibar/e_mod_main.c:839 +#: src/modules/ibox/e_mod_main.c:640 +msgid "Medium" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:308 +msgid "Sharp" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:317 +msgid "Very Sharp" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:329 +msgid "Very Dark" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:338 +msgid "Dark" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:347 +msgid "Light" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:356 +msgid "Very Light" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:368 +msgid "Very Far" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:377 +msgid "Far" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:386 +msgid "Near" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:395 +msgid "Very Near" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:404 +msgid "Extremely Near" +msgstr "" + +#: src/modules/dropshadow/e_mod_main.c:413 +msgid "Immediately Underneath" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:120 +#, c-format +msgid "" +"Error initializing Module: IBar\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/ibar/e_mod_main.c:163 +msgid "IBar" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:172 +msgid "Enlightenment IBar Module" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:173 +msgid "" +"This is the IBar Application Launcher bar module for Enlightenment.\n" +"It is a first example module and is being used to flesh out several\n" +"interfaces in Enlightenment 0.17.0. It is under heavy development,\n" +"so expect it to break often and change as it improves." +msgstr "" + +#: src/modules/ibar/e_mod_main.c:282 src/modules/ibar/e_mod_main.c:889 +#: src/modules/ibox/e_mod_main.c:690 +msgid "Options" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:286 src/modules/ibar/e_mod_main.c:893 +#: src/modules/ibox/e_mod_main.c:694 +msgid "Size" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:796 src/modules/ibox/e_mod_main.c:603 +msgid "Auto fit icons" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:802 +msgid "Follower" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:811 src/modules/ibox/e_mod_main.c:612 +msgid "Microscopic" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:818 src/modules/ibox/e_mod_main.c:619 +msgid "Tiny" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:825 src/modules/ibox/e_mod_main.c:626 +msgid "Very Small" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:832 src/modules/ibox/e_mod_main.c:633 +msgid "Small" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:846 src/modules/ibox/e_mod_main.c:647 +msgid "Large" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:853 src/modules/ibox/e_mod_main.c:654 +msgid "Very Large" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:860 src/modules/ibox/e_mod_main.c:661 +msgid "Extremely Large" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:867 src/modules/ibox/e_mod_main.c:668 +msgid "Huge" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:874 src/modules/ibox/e_mod_main.c:675 +msgid "Enormous" +msgstr "" + +#: src/modules/ibar/e_mod_main.c:881 src/modules/ibox/e_mod_main.c:682 +msgid "Gigantic" +msgstr "" + +#: src/modules/ibox/e_mod_main.c:104 +#, c-format +msgid "" +"Error initializing Module: IBox\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/ibox/e_mod_main.c:147 +msgid "IBox" +msgstr "" + +#: src/modules/ibox/e_mod_main.c:157 +msgid "Enlightenment IBox Module" +msgstr "" + +#: src/modules/ibox/e_mod_main.c:158 +msgid "" +"This is the IBox Application Launcher box module for Enlightenment.\n" +"It is a first example module and is being used to flesh out several\n" +"Interfaces in Enlightenment 0.17.0. It is under heavy development,\n" +"so expect it to break often and change as it improves." +msgstr "" + +#: src/modules/pager/e_mod_main.c:85 +#, c-format +msgid "" +"Error initializing Module: Pager\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/pager/e_mod_main.c:131 +msgid "Pager" +msgstr "" + +#: src/modules/pager/e_mod_main.c:140 +msgid "Enlightenment Pager Module" +msgstr "" + +#: src/modules/pager/e_mod_main.c:141 +msgid "A pager module to navigate virtual desktops." +msgstr "" + +#: src/modules/temperature/e_mod_main.c:49 +#, c-format +msgid "" +"Error initializing Module: Temperature\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/temperature/e_mod_main.c:92 +msgid "Temperature" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:101 +msgid "Enlightenment Temperature Module" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:102 +msgid "" +"A module to measure the ACPI Thermal sensor on Linux.\n" +"It is especially useful for modern Laptops with high speed\n" +"CPUs that generate a lot of heat." +msgstr "" + +#: src/modules/temperature/e_mod_main.c:189 +#: src/modules/temperature/e_mod_main.c:615 +msgid "Check Interval" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:193 +#: src/modules/temperature/e_mod_main.c:619 +msgid "Low Temperature" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:197 +#: src/modules/temperature/e_mod_main.c:623 +msgid "High Temperature" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:467 +msgid "Fast (1 sec)" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:474 +msgid "Medium (5 sec)" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:481 +msgid "Normal (10 sec)" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:488 +msgid "Slow (30 sec)" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:495 +msgid "Very Slow (60 sec)" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:507 +msgid "10C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:514 +#: src/modules/temperature/e_mod_main.c:547 +msgid "20C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:521 +#: src/modules/temperature/e_mod_main.c:554 +msgid "30C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:528 +#: src/modules/temperature/e_mod_main.c:561 +msgid "40C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:535 +#: src/modules/temperature/e_mod_main.c:568 +msgid "50C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:575 +msgid "60C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:582 +msgid "70C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:589 +msgid "80C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:596 +msgid "90C" +msgstr "" + +#: src/modules/temperature/e_mod_main.c:603 +msgid "100C" +msgstr "" + +#: src/modules/test/e_mod_main.c:10 +#, c-format +msgid "" +"Error initializing Module: test\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/test/e_mod_main.c:24 +msgid "Module Config Menu Item 1" +msgstr "" + +#: src/modules/test/e_mod_main.c:26 +msgid "Module Config Menu Item 2" +msgstr "" + +#: src/modules/test/e_mod_main.c:28 +msgid "Module Config Menu Item 3" +msgstr "" + +#: src/modules/test/e_mod_main.c:32 +msgid "Something Else" +msgstr "" + +#: src/modules/test/e_mod_main.c:59 +msgid "Test!!!" +msgstr "" + +#: src/modules/test/e_mod_main.c:66 +msgid "Enlightenment Test Module" +msgstr "" + +#: src/modules/test/e_mod_main.c:67 +msgid "" +"This module is VERY simple and is only used to test the basic\n" +"interface of the Enlightenment 0.17.0 module system. Please\n" +"ignore this module unless you are working on the module system." +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:58 +#, c-format +msgid "" +"Error initializing Module: cpufreq\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:98 +msgid "CpuFreq" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:107 +msgid "CPU Frequency Controller Module" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:108 +msgid "" +"A simple module to control the frequency of the system CPU. This is " +"especially useful to save power on laptops." +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:198 src/modules/cpufreq/e_mod_main.c:480 +msgid "Set Controller" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:206 src/modules/cpufreq/e_mod_main.c:487 +msgid "Set Speed" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:266 src/modules/cpufreq/e_mod_main.c:283 +msgid "CPU Frequency ERROR" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:267 +msgid "" +"There was an error trying to set the cpu frequency\n" +"governor via the module's setfreq utility." +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:284 +msgid "" +"There was an error trying to set the cpu frequency\n" +"setting via the module's setfreq utility." +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:384 +msgid "Check Fast (0.5 sec)" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:391 +msgid "Check Medium (1 sec)" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:398 +msgid "Check Normal (2 sec)" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:405 +msgid "Check Slow (5 sec)" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:412 +msgid "Check Very Slow (30 sec)" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:428 +msgid "Manual" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:430 +msgid "Automatic" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:432 +msgid "Minimum Speed" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:434 +msgid "Maximum Speed" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:456 +#, c-format +msgid "%i Mhz" +msgstr "" + +#: src/modules/cpufreq/e_mod_main.c:459 +#, c-format +msgid "%i.%i Ghz" +msgstr "" + +#: src/modules/start/e_mod_main.c:29 +#, c-format +msgid "" +"Error initializing Module: start\n" +"It requires a minimum module API version of: %i.\n" +"The module API advertized by Enlightenment is: %i.\n" +"Aborting module." +msgstr "" + +#: src/modules/start/e_mod_main.c:72 +msgid "Start" +msgstr "" + +#: src/modules/start/e_mod_main.c:81 +msgid "Enlightenment Start Module" +msgstr "" + +#: src/modules/start/e_mod_main.c:82 +msgid "Experimental Button module for E17" +msgstr "" diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c index fc5e46f66..9a9e0633e 100644 --- a/src/bin/e_apps.c +++ b/src/bin/e_apps.c @@ -263,8 +263,7 @@ e_app_exec(E_App *a) if (!exe) { e_error_dialog_show(_("Run Error"), - _("Enlightenment was unable fork a child process\n" - "to run the execute line:\n" + _("Enlightenment was unable fork a child process:\n" "\n" "%s\n" "\n"), diff --git a/src/bin/e_border.c b/src/bin/e_border.c index a37a520ea..e8fb34b2c 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -5736,7 +5736,7 @@ _e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key) mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Always Below")); e_menu_item_check_set(mi, 1); - e_menu_item_toggle_set(mi, (bd->layer == 0 ? 1 : 0)); + e_menu_item_toggle_set(mi, (bd->layer == 50 ? 1 : 0)); e_menu_item_callback_set(mi, _e_border_menu_cb_below, bd); e_menu_item_icon_edje_set(mi, (char *)e_theme_edje_file_get("base/theme/borders", @@ -5991,14 +5991,14 @@ _e_border_menu_cb_below(void *data, E_Menu *m, E_Menu_Item *mi) E_Border *bd; bd = data; - if (bd->layer == 0) + if (bd->layer == 50) { bd->layer = 100; e_hints_window_stacking_set(bd, E_STACKING_NONE); } else { - bd->layer = 0; + bd->layer = 50; e_hints_window_stacking_set(bd, E_STACKING_BELOW); } e_container_border_raise(bd); diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index d6ccd7ced..82c09e8ab 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -63,6 +63,7 @@ e_intl_init(void) ADD_LANG("sl_SI.UTF-8"); ADD_LANG("it_IT.UTF-8"); ADD_LANG("cs_CS.UTF-8"); + ADD_LANG("da_DK.UTF-8"); if ((s = getenv("LC_MESSAGES"))) _e_intl_orig_lc_messages = strdup(s); if ((s = getenv("LANGUAGE"))) _e_intl_orig_language = strdup(s); diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h index 5d1631b2d..d30f17dbb 100644 --- a/src/bin/e_ipc_handlers.h +++ b/src/bin/e_ipc_handlers.h @@ -1492,6 +1492,7 @@ break; START_INT(value, HDL); e_config->use_edge_flip = value; E_CONFIG_LIMIT(e_config->use_edge_flip, 0, 1); + e_zone_update_flip_all(); SAVE; END_INT; #elif (TYPE == E_REMOTE_IN) diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index 8dee0e099..b1f86b5d9 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -198,8 +198,7 @@ e_util_head_exec(int head, char *cmd) if (!exe) { e_error_dialog_show(_("Run Error"), - _("Enlightenment was unable fork a child process\n" - "to run the execute line:\n" + _("Enlightenment was unable fork a child process:\n" "\n" "%s\n" "\n"), diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 43c4d4d9a..28fc3eda5 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -384,6 +384,27 @@ e_zone_update_flip(E_Zone *zone) _e_zone_update_flip(zone); } +void +e_zone_update_flip_all(void) +{ + Evas_List *l, *ll; + E_Manager *man; + E_Container *con; + E_Zone *zone; + + for (l = e_manager_list(); l; l = l->next) + { + man = l->data; + for (ll = man->containers; ll; ll = ll->next) + { + con = ll->data; + zone = e_zone_current_get(con); + e_zone_update_flip(zone); + } + } +} + + void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy) { diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h index cf4c80ec5..6d06642b1 100644 --- a/src/bin/e_zone.h +++ b/src/bin/e_zone.h @@ -75,6 +75,7 @@ EAPI void e_zone_flip_coords_handle(E_Zone *zone, int x, int y); EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count); EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count); EAPI void e_zone_update_flip(E_Zone *zone); +EAPI void e_zone_update_flip_all(void); EAPI void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy); EAPI void e_zone_desk_flip_to(E_Zone *zone, int x, int y); EAPI void e_zone_desk_linear_flip_by(E_Zone *zone, int dx); diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index d2fe59e20..fcbb9f60d 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -22,12 +22,21 @@ static void _clock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gad static void _clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi); static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); +static void _clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi); +static void _clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi); +static void _clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi); static int _clock_count; static E_Config_DD *conf_edd; static E_Config_DD *conf_face_edd; +const int + DIGITAL_STYLE_NONE = 0, + DIGITAL_STYLE_NORMAL = 1, + DIGITAL_STYLE_MILITARY = 2 +; + /* public module routines. all modules must have these */ void * e_modapi_init(E_Module *module) @@ -115,6 +124,7 @@ _clock_new() #define T Config_Face #define D conf_face_edd E_CONFIG_VAL(D, T, enabled, UCHAR); + E_CONFIG_VAL(D, T, digitalStyle, INT); conf_edd = E_CONFIG_DD_NEW("Clock_Config", Config); #undef T @@ -153,6 +163,7 @@ _clock_new() { face->conf = E_NEW(Config_Face, 1); face->conf->enabled = 1; + face->conf->digitalStyle = DIGITAL_STYLE_NONE; clock->conf->faces = evas_list_append(clock->conf->faces, face->conf); } else @@ -289,7 +300,7 @@ _clock_face_disable(Clock_Face *face) static void _clock_face_menu_new(Clock_Face *face) { - E_Menu *mn; + E_Menu *mn, *smn; E_Menu_Item *mi; mn = e_menu_new(); @@ -308,6 +319,52 @@ _clock_face_menu_new(Clock_Face *face) mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Edit Mode")); e_menu_item_callback_set(mi, _clock_face_cb_menu_edit, face); + + /* + * Create a Digital submenu + */ + smn = e_menu_new(); + + /* Hide digital time */ + mi = e_menu_item_new(smn); + e_menu_item_label_set(mi, _("No Digital Display")); + e_menu_item_radio_set(mi, 1); + e_menu_item_radio_group_set(mi, 1); + if (face->conf->digitalStyle == DIGITAL_STYLE_NONE) { + e_menu_item_toggle_set(mi, 1); + _clock_face_cb_digital_none(face, smn, mi); + } + e_menu_item_callback_set(mi, _clock_face_cb_digital_none, face); + + /* Show normal time */ + mi = e_menu_item_new(smn); + e_menu_item_label_set(mi, _("Normal Time")); + e_menu_item_radio_set(mi, 1); + e_menu_item_radio_group_set(mi, 1); + if (face->conf->digitalStyle == DIGITAL_STYLE_NORMAL) { + e_menu_item_toggle_set(mi, 1); + _clock_face_cb_digital_normal(face, smn, mi); + } + e_menu_item_callback_set(mi, _clock_face_cb_digital_normal, face); + + /* Show military time */ + mi = e_menu_item_new(smn); + e_menu_item_label_set(mi, _("Military Time")); + e_menu_item_radio_set(mi, 1); + e_menu_item_radio_group_set(mi, 1); + if (face->conf->digitalStyle == DIGITAL_STYLE_MILITARY) { + e_menu_item_toggle_set(mi, 1); + _clock_face_cb_digital_military(face, smn, mi); + } + e_menu_item_callback_set(mi, _clock_face_cb_digital_military, face); + + face->digital_menu = smn; + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Digital Display")); + e_menu_item_submenu_set(mi, face->digital_menu); + + } static void @@ -374,6 +431,63 @@ _clock_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) } } +static void +_clock_face_cb_digital_none(void *data, E_Menu *m, E_Menu_Item *mi) +{ + Clock_Face *face; + char buf[2]; + + face = data; + + memset(buf, 0, sizeof(buf)); + + snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NONE); + + edje_object_part_text_set(face->clock_object, "digitalStyle", buf); + + face->conf->digitalStyle = DIGITAL_STYLE_NONE; + + e_config_save_queue(); +} + +static void +_clock_face_cb_digital_normal(void *data, E_Menu *m, E_Menu_Item *mi) +{ + Clock_Face *face; + char buf[2]; + + face = data; + + memset(buf, 0, sizeof(buf)); + + snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_NORMAL); + + edje_object_part_text_set(face->clock_object, "digitalStyle", buf); + + face->conf->digitalStyle = DIGITAL_STYLE_NORMAL; + + e_config_save_queue(); +} + +static void +_clock_face_cb_digital_military(void *data, E_Menu *m, E_Menu_Item *mi) +{ + Clock_Face *face; + char buf[2]; + + face = data; + + memset(buf, 0, sizeof(buf)); + + snprintf(buf, sizeof(buf), "%i", DIGITAL_STYLE_MILITARY); + + edje_object_part_text_set(face->clock_object, "digitalStyle", buf); + + face->conf->digitalStyle = DIGITAL_STYLE_MILITARY; + + e_config_save_queue(); +} + static void _clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { diff --git a/src/modules/clock/e_mod_main.h b/src/modules/clock/e_mod_main.h index 529f152cc..7137aa867 100644 --- a/src/modules/clock/e_mod_main.h +++ b/src/modules/clock/e_mod_main.h @@ -17,6 +17,9 @@ struct _Config struct _Config_Face { unsigned char enabled; + int + digitalStyle + ; }; struct _Clock @@ -31,6 +34,7 @@ struct _Clock_Face { E_Container *con; E_Menu *menu; + E_Menu *digital_menu; Config_Face *conf; Evas_Object *clock_object; diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index ad37c1b21..42a51bdbb 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -172,7 +172,7 @@ e_modapi_about(E_Module *m) e_error_dialog_show(_("Enlightenment IBar Module"), _("This is the IBar Application Launcher bar module for Enlightenment.\n" "It is a first example module and is being used to flesh out several\n" - "Interfaces in Enlightenment 0.17.0. It is under heavy development,\n" + "interfaces in Enlightenment 0.17.0. It is under heavy development,\n" "so expect it to break often and change as it improves.")); return 1; } diff --git a/src/modules/test/e_mod_main.c b/src/modules/test/e_mod_main.c index ac21d2db4..6a024d228 100644 --- a/src/modules/test/e_mod_main.c +++ b/src/modules/test/e_mod_main.c @@ -66,6 +66,6 @@ e_modapi_about(E_Module *m) e_error_dialog_show(_("Enlightenment Test Module"), _("This module is VERY simple and is only used to test the basic\n" "interface of the Enlightenment 0.17.0 module system. Please\n" - "Ignore this module unless you are working on the module system.")); + "ignore this module unless you are working on the module system.")); return 1; }