From: Eduardo Lima (Etrunko) Date: Mon, 12 Aug 2013 20:01:23 +0000 (-0300) Subject: Imported Upstream version 0.17.4 X-Git-Tag: upstream/0.17.4^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6d49e84efd3b9763fd156efe232d057e28d5db4;p=platform%2Fupstream%2Fenlightenment.git Imported Upstream version 0.17.4 --- diff --git a/ABOUT-NLS b/ABOUT-NLS index 83bc72ec26..4f50fb5f0d 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -181,855 +181,1114 @@ programming skills, here. ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of November -2007. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2010. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - Compendium | [] [] [] [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] [] | - bash | [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - dialog | | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - fetchmail | [] [] () [] [] | - findutils | [] | - findutils_stable | [] [] [] | - flex | [] [] [] | - fslint | | - gas | | - gawk | [] [] [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gip | [] | - gliv | [] [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | [] [] () () [] | - gnuedu | | - gnulib | [] | - gnunet | | - gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | | - gramadoir | [] [] | - grep | [] [] | - gretl | () | - gsasl | | - gss | | - gst-plugins-bad | [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gst-plugins-ugly | [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | () | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] | - indent | [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lprng | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] | - make | [] [] | - man-db | [] [] [] | - minicom | [] [] [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] | - pwdutils | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - shared-mime-info | [] [] [] [] () [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - skencil | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] | - texinfo | [] [] [] | - tin | () () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 + Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh + +---------------------------------------------------+ + a2ps | [] [] | + aegis | | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | + bfd | | + bibshelf | [] | + binutils | | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | + doodle | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | + gas | | + gawk | [] [] | + gcal | [] | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | + gnubiff | | + gnucash | [] | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + help2man | | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] [] | + iso_639_3 | [] | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | + libextractor | | + libgnutls | | + libgpewidget | | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | + mailutils | | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | + pwdutils | | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | | + solfege-manual | | + soundtracker | | + sp | | + sysstat | | + tar | [] | + texinfo | | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + af am ar as ast az be be@latin bg bn_IN bs ca crh + 6 0 2 3 19 1 11 3 28 3 1 38 5 + + cs da de el en en_GB en_ZA eo es et eu fa fi + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | [] [] | + buzztard | [] [] [] | + cflow | [] [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | [] | + cppi | [] | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] [] | + gjay | [] [] | + gliv | [] [] [] [] | + glunarclock | [] [] [] | + gnubiff | () | + gnucash | [] () () () () () | + gnuedu | [] [] | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] [] [] | + gpe-beam | [] [] [] [] [] | + gpe-bluetooth | [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] [] | + gpe-sketchbook | [] [] [] [] [] | + gpe-su | [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] () [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] | + gsasl | [] [] | + gss | [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] | + gtick | [] () [] [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] [] [] | + help2man | [] [] | + hylafax | [] [] | + idutils | [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] [] | + iso_3166 | [] [] [] () [] [] [] () [] | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] [] | + iso_639 | [] [] [] () [] [] [] | + iso_639_3 | | + jwhois | [] [] | + kbd | [] [] [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] | + klavaro | [] [] [] [] | + latrine | [] () [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] [] | + linkdr | [] [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] [] | + mkisofs | [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] [] | + psmisc | [] [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] [] | + wget | [] [] [] [] | + wyslij-po | [] | + xchat | [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + cs da de el en en_GB en_ZA eo es et eu fa fi + 64 105 117 18 1 8 0 28 89 18 19 0 104 - es et eu fa fi fr ga gl gu he hi hr hu id is it - +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] | - bfd | [] [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - dialog | [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - fetchmail | [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] | - flex | [] [] [] | - fslint | | - gas | [] [] | - gawk | [] [] [] [] () | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] [] | - gip | [] [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnuedu | [] | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] [] | - gpsdrive | [] | - gramadoir | [] [] | - grep | [] [] [] | - gretl | [] [] [] () | - gsasl | [] [] | - gss | [] [] | - gst-plugins-bad | [] [] [] [] | - gst-plugins-base | [] [] [] [] | - gst-plugins-good | [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] [] [] | - keytouch-editor | [] | - keytouch-keyboa... | [] [] | - latrine | [] [] | - ld | [] [] [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] [] [] | - lingoteach | [] [] [] | - lprng | | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailfromd | | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | [] | - minicom | [] [] [] [] | - nano | [] [] [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | [] | - skencil | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - tin | [] () | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - util-linux-ng | [] [] [] [] [] [] [] | - vorbis-tools | | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 + fr ga gl gu he hi hr hu hy id is it ja ka kn + +------------------------------------------------+ + a2ps | [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | | + buzztard | [] | + cflow | [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] | + freedink | [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | () | + glunarclock | [] [] [] | + gnubiff | () [] () | + gnucash | () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] | + gpe-beam | [] [] [] | + gpe-bluetooth | [] [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] | + gpe-su | [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] | + help2man | [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | () [] [] | + iso_3166 | () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | () [] [] [] [] | + iso_639 | () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] | + keytouch-editor | [] [] [] [] | + keytouch-keyboa... | [] [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] () | + libc | [] [] [] [] | + libexif | | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] | + linkdr | [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] | + psmisc | [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] | + xchat | [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + +------------------------------------------------+ + fr ga gl gu he hi hr hu hy id is it ja ka kn + 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4 - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - +--------------------------------------------------+ - Compendium | [] | - a2ps | () [] [] | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | [] | - cpplib | [] | - cryptonit | [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - fetchmail | [] [] | - findutils | [] | - findutils_stable | [] | - flex | [] [] | - fslint | | - gas | | - gawk | [] [] | - gcal | | - gcc | | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] [] | - gnubiff | | - gnucash | () () () | - gnuedu | | - gnulib | [] [] | - gnunet | | - gnunet-gtk | | - gnutls | [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | [] | - gpsdrive | [] | - gramadoir | () | - grep | [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins-bad | [] | - gst-plugins-base | [] | - gst-plugins-good | [] | - gst-plugins-ugly | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] | - herrie | [] | - hylafax | | - idutils | [] | - indent | [] [] | - iso_15924 | [] | - iso_3166 | [] [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] | - libexif | | - libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | [] | - libidn | [] [] | - lifelines | [] | - lilypond | [] | - lingoteach | [] | - lprng | | - lynx | [] [] | - m4 | [] [] | - mailfromd | | - mailutils | | - make | [] [] [] | - man-db | | - minicom | [] | - nano | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - popt | [] [] [] | - psmisc | [] [] [] | - pwdutils | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - shared-mime-info | [] [] [] [] [] [] [] | - sharutils | [] [] | - shishi | | - skencil | | - solfege | () () | - soundtracker | | - sp | () | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] | - tin | | - tuxpaint | () [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - util-linux-ng | [] [] | - vorbis-tools | | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn - 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1 - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +--------------------------------------------------+ - Compendium | [] [] [] [] [] | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] [] | - bash | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - dialog | [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - fetchmail | [] [] [] | - findutils | [] [] [] | - findutils_stable | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] [] | - gcal | [] | - gcc | [] [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () [] | - gnucash | () [] | - gnuedu | | - gnulib | [] [] [] | - gnunet | | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] | - gramadoir | [] [] | - grep | [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] [] | - gss | [] [] [] [] | - gst-plugins-bad | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] | - gst-plugins-ugly | [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] | - gtkam | [] [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - herrie | [] [] [] | - hylafax | | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] [] [] [] | - iso_639 | [] [] [] [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] | - libexif | [] [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] [] | - libgpg-error | [] [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lprng | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] [] [] [] | - minicom | [] [] [] [] [] | - nano | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | | - popt | [] [] [] [] | - psmisc | [] [] | - pwdutils | [] [] | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - skencil | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] | - texinfo | [] [] [] [] | - tin | () | - tuxpaint | [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - util-linux-ng | [] [] [] [] | - vorbis-tools | [] | - wastesedge | | - wdiff | [] [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - Compendium | [] [] [] [] | 19 - a2ps | [] [] [] | 19 - aegis | [] | 1 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 16 - bash | [] | 6 - bfd | | 2 - bibshelf | [] | 7 - binutils | [] [] [] [] | 9 - bison | [] [] [] [] | 20 - bison-runtime | [] [] [] [] | 18 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 5 - clisp | | 9 - console-tools | [] [] | 5 - coreutils | [] [] [] | 18 - cpio | [] [] [] [] | 11 - cpplib | [] [] [] [] [] | 12 - cryptonit | [] | 6 - dialog | [] [] [] | 9 - diffutils | [] [] [] [] [] | 29 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - fetchmail | [] [] | 12 - findutils | [] [] [] | 11 - findutils_stable | [] [] [] [] | 18 - flex | [] [] | 15 - fslint | [] | 2 - gas | [] | 3 - gawk | [] [] [] | 16 - gcal | [] | 5 - gcc | [] [] [] | 7 - gettext-examples | [] [] [] [] [] [] | 29 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 20 - gip | [] [] | 13 - gliv | [] [] | 11 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 16 - gnubiff | [] | 2 - gnucash | () [] | 5 - gnuedu | [] | 2 - gnulib | [] | 10 - gnunet | | 0 - gnunet-gtk | [] [] | 3 - gnutls | | 4 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] | 7 - gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] [] | 16 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] [] | 22 - gpe-filemanager | [] [] | 7 - gpe-go | [] [] [] [] | 19 - gpe-login | [] [] [] [] [] | 21 - gpe-ownerinfo | [] [] [] [] | 21 - gpe-package | [] | 6 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] [] | 21 - gpe-taskmanager | [] [] [] [] | 21 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] [] | 8 - gphoto2 | [] [] [] [] | 21 - gprof | [] [] | 13 - gpsdrive | [] | 5 - gramadoir | [] | 7 - grep | [] | 12 - gretl | | 6 - gsasl | [] [] [] | 9 - gss | [] | 7 - gst-plugins-bad | [] [] [] | 13 - gst-plugins-base | [] [] | 11 - gst-plugins-good | [] [] [] [] [] | 16 - gst-plugins-ugly | [] [] [] | 13 - gstreamer | [] [] [] | 18 - gtick | [] [] | 7 - gtkam | [] | 16 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 27 - gutenprint | | 4 - hello | [] [] [] [] [] | 38 - herrie | [] [] | 8 - hylafax | | 0 - idutils | [] [] | 15 - indent | [] [] [] [] [] | 28 - iso_15924 | [] [] | 4 - iso_3166 | [] [] [] [] [] [] [] [] [] | 54 - iso_3166_2 | [] [] | 4 - iso_4217 | [] [] [] [] [] | 24 - iso_639 | [] [] [] [] [] | 26 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] [] | 13 - keytouch | [] | 8 - keytouch-editor | [] | 5 - keytouch-keyboa... | [] | 5 - latrine | [] [] | 5 - ld | [] [] [] [] | 10 - leafpad | [] [] [] [] [] | 24 - libc | [] [] [] | 19 - libexif | [] | 5 - libextractor | [] | 5 - libgpewidget | [] [] [] | 20 - libgpg-error | [] | 6 - libgphoto2 | [] [] | 9 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] [] | 11 - libidn | [] [] | 11 - lifelines | | 4 - lilypond | [] | 6 - lingoteach | [] | 6 - lprng | [] | 2 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailfromd | [] [] | 3 - mailutils | [] [] | 8 - make | [] [] [] | 20 - man-db | [] | 9 - minicom | [] | 14 - nano | [] [] [] | 20 - opcodes | [] [] | 10 - parted | [] [] [] | 11 - pilot-qof | [] | 1 - popt | [] [] [] [] | 18 - psmisc | [] [] | 10 - pwdutils | [] | 3 - qof | [] | 4 - radius | [] [] | 7 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 13 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] [] | 23 - shared-mime-info | [] [] [] | 29 - sharutils | [] [] [] | 23 - shishi | [] | 3 - skencil | [] | 7 - solfege | [] | 3 - soundtracker | [] [] | 9 - sp | [] | 3 - system-tools-ba... | [] [] [] [] [] [] [] | 38 - tar | [] [] [] | 17 - texinfo | [] [] [] | 15 - tin | | 1 - tuxpaint | [] [] [] | 19 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] | 11 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 13 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 30 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () () | 9 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 22 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] [] | 25 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 6 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 13 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] | 16 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - util-linux-ng | [] [] [] | 20 - vorbis-tools | [] [] | 4 - wastesedge | | 1 - wdiff | [] [] | 23 - wget | [] [] [] | 20 - xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] | 14 - xpad | [] [] [] | 15 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60 + xkeyboard-config | [] [] [] [] | 25 +---------------------------------------------------+ - 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 + 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1042,9 +1301,9 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If November 2007 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. The most -up-to-date matrix with full percentage details can be found at + If May 2010 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at `http://translationproject.org/extra/matrix.html'. 1.6 Using `gettext' in new packages diff --git a/ChangeLog b/ChangeLog index 4d916a42a2..f3d44b6c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2013-08-02 Eduardo Lima (Etrunko) + + * 0.17.4 release + +2013-05-11 Rafael Antognolli + + * 0.17.3 release + +2013-06-17 Mike Blumenkrantz + + * fixed bug where e widgets would not unset focus + * fixed bug with filemanager setting path with too many spaces when opened from menu + +2013-06-10 Mike Blumenkrantz + + * fix remember size/position apply + +2013-05-24 Christopher Michael + + * added support for hotplugging monitors in randr code + * added support for setting Primary Output used by randr protocol + 2013-04-26 Mike Blumenkrantz * fixed theme bug which prevented windows from unshading correctly when animations were disabled diff --git a/Makefile.in b/Makefile.in index 8666a1463e..639cd2f06d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,70 +91,70 @@ host_triplet = @host@ @HAVE_PO_TRUE@po/Rules-quot subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/enlightenment.pc.in $(srcdir)/enlightenment.spec.in \ - $(top_srcdir)/configure \ - $(top_srcdir)/src/modules/access/module.desktop.in \ - $(top_srcdir)/src/modules/backlight/module.desktop.in \ - $(top_srcdir)/src/modules/battery/module.desktop.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/enlightenment.spec.in \ + $(srcdir)/enlightenment.pc.in \ + $(top_srcdir)/src/modules/ibar/module.desktop.in \ + $(top_srcdir)/src/modules/dropshadow/module.desktop.in \ $(top_srcdir)/src/modules/clock/module.desktop.in \ - $(top_srcdir)/src/modules/comp/module.desktop.in \ + $(top_srcdir)/src/modules/pager/module.desktop.in \ + $(top_srcdir)/src/modules/battery/module.desktop.in \ + $(top_srcdir)/src/modules/temperature/module.desktop.in \ + $(top_srcdir)/src/modules/notification/module.desktop.in \ + $(top_srcdir)/src/modules/cpufreq/module.desktop.in \ + $(top_srcdir)/src/modules/ibox/module.desktop.in \ + $(top_srcdir)/src/modules/start/module.desktop.in \ + $(top_srcdir)/src/modules/winlist/module.desktop.in \ + $(top_srcdir)/src/modules/fileman/module.desktop.in \ + $(top_srcdir)/src/modules/fileman_opinfo/module.desktop.in \ $(top_srcdir)/src/modules/conf/module.desktop.in \ + $(top_srcdir)/src/modules/conf_wallpaper2/module.desktop.in \ + $(top_srcdir)/src/modules/conf_theme/module.desktop.in \ + $(top_srcdir)/src/modules/conf_intl/module.desktop.in \ $(top_srcdir)/src/modules/conf_applications/module.desktop.in \ - $(top_srcdir)/src/modules/conf_dialogs/module.desktop.in \ $(top_srcdir)/src/modules/conf_display/module.desktop.in \ - $(top_srcdir)/src/modules/conf_edgebindings/module.desktop.in \ - $(top_srcdir)/src/modules/conf_interaction/module.desktop.in \ - $(top_srcdir)/src/modules/conf_intl/module.desktop.in \ + $(top_srcdir)/src/modules/conf_shelves/module.desktop.in \ $(top_srcdir)/src/modules/conf_keybindings/module.desktop.in \ + $(top_srcdir)/src/modules/conf_edgebindings/module.desktop.in \ + $(top_srcdir)/src/modules/conf_window_remembers/module.desktop.in \ + $(top_srcdir)/src/modules/conf_window_manipulation/module.desktop.in \ $(top_srcdir)/src/modules/conf_menus/module.desktop.in \ - $(top_srcdir)/src/modules/conf_paths/module.desktop.in \ + $(top_srcdir)/src/modules/conf_dialogs/module.desktop.in \ $(top_srcdir)/src/modules/conf_performance/module.desktop.in \ + $(top_srcdir)/src/modules/conf_paths/module.desktop.in \ + $(top_srcdir)/src/modules/conf_interaction/module.desktop.in \ + $(top_srcdir)/src/modules/msgbus/module.desktop.in \ $(top_srcdir)/src/modules/conf_randr/module.desktop.in \ - $(top_srcdir)/src/modules/conf_shelves/module.desktop.in \ - $(top_srcdir)/src/modules/conf_theme/module.desktop.in \ - $(top_srcdir)/src/modules/conf_wallpaper2/module.desktop.in \ - $(top_srcdir)/src/modules/conf_window_manipulation/module.desktop.in \ - $(top_srcdir)/src/modules/conf_window_remembers/module.desktop.in \ - $(top_srcdir)/src/modules/connman/module.desktop.in \ - $(top_srcdir)/src/modules/cpufreq/module.desktop.in \ - $(top_srcdir)/src/modules/dropshadow/module.desktop.in \ - $(top_srcdir)/src/modules/everything/everything.pc.in \ - $(top_srcdir)/src/modules/everything/module.desktop.in \ - $(top_srcdir)/src/modules/fileman/module.desktop.in \ - $(top_srcdir)/src/modules/fileman_opinfo/module.desktop.in \ $(top_srcdir)/src/modules/gadman/module.desktop.in \ - $(top_srcdir)/src/modules/ibar/module.desktop.in \ - $(top_srcdir)/src/modules/ibox/module.desktop.in \ - $(top_srcdir)/src/modules/illume-bluetooth/module.desktop.in \ - $(top_srcdir)/src/modules/illume-home-toggle/module.desktop.in \ + $(top_srcdir)/src/modules/mixer/module.desktop.in \ + $(top_srcdir)/src/modules/connman/module.desktop.in \ + $(top_srcdir)/src/modules/illume2/doc/illume.dox.in \ + $(top_srcdir)/src/modules/illume2/module.desktop.in \ $(top_srcdir)/src/modules/illume-home/module.desktop.in \ + $(top_srcdir)/src/modules/illume-home-toggle/module.desktop.in \ + $(top_srcdir)/src/modules/illume-softkey/module.desktop.in \ + $(top_srcdir)/src/modules/illume-keyboard/module.desktop.in \ $(top_srcdir)/src/modules/illume-indicator/module.desktop.in \ $(top_srcdir)/src/modules/illume-kbd-toggle/module.desktop.in \ - $(top_srcdir)/src/modules/illume-keyboard/module.desktop.in \ $(top_srcdir)/src/modules/illume-mode-toggle/module.desktop.in \ - $(top_srcdir)/src/modules/illume-softkey/module.desktop.in \ - $(top_srcdir)/src/modules/illume2/doc/illume.dox.in \ - $(top_srcdir)/src/modules/illume2/module.desktop.in \ - $(top_srcdir)/src/modules/mixer/module.desktop.in \ - $(top_srcdir)/src/modules/msgbus/module.desktop.in \ - $(top_srcdir)/src/modules/notification/module.desktop.in \ - $(top_srcdir)/src/modules/pager/module.desktop.in \ + $(top_srcdir)/src/modules/illume-bluetooth/module.desktop.in \ + $(top_srcdir)/src/modules/syscon/module.desktop.in \ + $(top_srcdir)/src/modules/everything/module.desktop.in \ + $(top_srcdir)/src/modules/everything/everything.pc.in \ + $(top_srcdir)/src/modules/systray/module.desktop.in \ + $(top_srcdir)/src/modules/comp/module.desktop.in \ $(top_srcdir)/src/modules/physics/module.desktop.in \ $(top_srcdir)/src/modules/quickaccess/module.desktop.in \ $(top_srcdir)/src/modules/shot/module.desktop.in \ - $(top_srcdir)/src/modules/start/module.desktop.in \ - $(top_srcdir)/src/modules/syscon/module.desktop.in \ - $(top_srcdir)/src/modules/systray/module.desktop.in \ + $(top_srcdir)/src/modules/backlight/module.desktop.in \ $(top_srcdir)/src/modules/tasks/module.desktop.in \ - $(top_srcdir)/src/modules/temperature/module.desktop.in \ - $(top_srcdir)/src/modules/tiling/module.desktop.in \ - $(top_srcdir)/src/modules/winlist/module.desktop.in \ $(top_srcdir)/src/modules/xkbswitch/module.desktop.in \ - ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS compile \ - config.guess config.rpath config.sub depcomp install-sh \ - ltmain.sh missing + $(top_srcdir)/src/modules/tiling/module.desktop.in \ + $(top_srcdir)/src/modules/access/module.desktop.in ABOUT-NLS \ + COPYING compile config.guess config.rpath config.sub depcomp \ + install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -206,21 +233,28 @@ CONFIG_CLEAN_FILES = enlightenment.spec enlightenment.pc \ src/modules/tiling/module.desktop \ src/modules/access/module.desktop CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -257,11 +291,33 @@ am__installdirs = "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" DATA = $(files_DATA) $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = src data doc config po DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -272,6 +328,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -299,6 +356,7 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -833,22 +891,25 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -863,57 +924,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -929,12 +945,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -946,15 +957,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -963,9 +970,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -1033,40 +1062,35 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -1077,8 +1101,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -1090,9 +1112,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -1124,7 +1146,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1263,25 +1285,24 @@ ps-am: uninstall-am: uninstall-filesDATA uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-filesDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-filesDATA \ +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-filesDATA install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-filesDATA \ uninstall-pkgconfigDATA diff --git a/NEWS b/NEWS index fd3fd701d4..da3fe7987a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +Changes since 0.17.3: +--------------------- + +Additions: + +Deprecations: + +Changes: + +Removed: + +Improvements: + +Fixes: + + + Changes since 0.17.2: --------------------- @@ -109,3 +126,6 @@ Fixes: * fixed possible NULL deref in desktop editor * fixed possible NULL deref in e_sys when debugging * fixed bug where dragging files into sidebar would move them instead of creating links + * fixed bug where e widgets would not unset focus + * fixed bug with filemanager setting path with too many spaces when opened from menu + * fix remember size/position apply diff --git a/aclocal.m4 b/aclocal.m4 index 80dd8ae0b5..e0c76a12c4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -48,7 +48,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -94,7 +95,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -142,9 +144,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -157,7 +159,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -168,7 +170,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -178,25 +180,62 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -212,24 +251,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -248,7 +285,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -274,22 +311,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -308,16 +342,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -327,7 +359,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -340,12 +372,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -353,8 +386,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -394,16 +427,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -412,8 +445,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -421,7 +454,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -469,7 +502,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -479,9 +512,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -496,20 +533,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -522,7 +557,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -534,21 +569,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -566,7 +599,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -576,15 +609,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -600,7 +630,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -629,31 +659,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -664,28 +703,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -713,15 +756,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -735,16 +775,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -760,14 +798,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -785,7 +821,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -810,15 +846,12 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_CC_C_O # -------------- # Like AC_PROG_CC_C_O, but changed for automake. @@ -847,15 +880,12 @@ m4_define([AC_PROG_CC], # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -863,11 +893,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -880,29 +909,32 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, dnl while keeping a definition of mkdir_p for backward compatibility. dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. @@ -919,15 +951,12 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -937,7 +966,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -953,22 +982,16 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -979,32 +1002,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1014,31 +1045,50 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1056,7 +1106,7 @@ else am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1073,44 +1123,40 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1124,18 +1170,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1145,76 +1189,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/compile b/compile index 862a14e8c8..531136b068 100755 --- a/compile +++ b/compile @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ func_cl_dashl () lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff --git a/config.guess b/config.guess index d622a44e55..b79252d6b1 100755 --- a/config.guess +++ b/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <, 1996 # @@ -47,7 +47,7 @@ for cc_temp in $CC""; do done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ else ;; esac ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -76,7 +76,13 @@ else ;; linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -124,7 +130,7 @@ else esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -132,7 +138,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -158,7 +164,7 @@ if test "$with_gnu_ld" = yes; then # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -254,7 +260,7 @@ else hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -264,7 +270,7 @@ else # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -326,7 +332,7 @@ else ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -494,7 +500,7 @@ else fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. # Unlike libtool.m4, here we don't care about _all_ names of the library, but # only about the one the linker finds when passed -lNAME. This is the last # element of library_names_spec in libtool.m4, or possibly two of them if the @@ -505,7 +511,7 @@ case "$host_os" in aix3*) library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) library_names_spec='$libname$shrext' ;; amigaos*) @@ -517,7 +523,7 @@ case "$host_os" in bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; diff --git a/config.sub b/config.sub index c894da4550..c765b34b7b 100755 --- a/config.sub +++ b/config.sub @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-04-24' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see . @@ -26,11 +20,12 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,8 +252,10 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -267,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -285,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -364,7 +366,7 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -383,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -401,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -782,9 +786,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -998,7 +1006,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1013,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1486,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1546,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1577,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/config/Makefile.in b/config/Makefile.in index 5275354070..201e335c53 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = config -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,21 +99,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -123,9 +157,29 @@ am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -509,22 +563,25 @@ uninstall-filesDATA: dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -539,57 +596,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -605,12 +617,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -622,15 +629,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -639,6 +642,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -803,12 +821,11 @@ ps-am: uninstall-am: uninstall-filesDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-local ctags ctags-recursive distclean distclean-generic \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool clean-local \ + cscopelist-am ctags ctags-am distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -818,7 +835,7 @@ uninstall-am: uninstall-filesDATA installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-filesDATA + tags tags-am uninstall uninstall-am uninstall-filesDATA .src.cfg: diff --git a/config/default/Makefile.in b/config/default/Makefile.in index ba63a1b2f8..1d150db782 100644 --- a/config/default/Makefile.in +++ b/config/default/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = config/default -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -474,11 +508,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -618,16 +652,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-filesDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-filesDATA + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA .src.cfg: diff --git a/config/default/profile.desktop b/config/default/profile.desktop index 11d946380e..9a8c7fa7c4 100644 --- a/config/default/profile.desktop +++ b/config/default/profile.desktop @@ -1,31 +1,38 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Default +Name[Name]=Default +Name[ab]=默认 +Name[ca]= Name[cs]=Výchozí +Name[de]= +Name[el]=Προκαθορισμένο Name[eo]=Aprioro Name[es]=Predefinido +Name[fr]=Prédéfini Name[gl]=Predefinido -Name[it]=Predefinito Name[hu]=Alapértelmezett -Name[fr]=Prédéfini -Name[el]=Προκαθορισμένο -Name[zh_CN]=默认 +Name[it]=Predefinito +Name[ja]= +Name[ko]=기본 Name[pt]=Predefinições -Name[ru]=По умолчанию +Name[ru]=Заново +Name[sr]= Name[tr]=Öntanımlı -Name[ko]=기본 -Icon=enlightenment-default +Name[zh_CN]=默认 Comment=Select this to begin the initial setup again. -Comment[ru]=Выберите этот пункт, чтобы начать настройку сначала. Comment[cs]=Vyberte pro znovuspuštění
tohoto průvodce. +Comment[el]=Επέλεξε αυτό για να
ξεκινήσεις την αρχική ρύθμιση ξανά. Comment[eo]=Elektu ĉi tion por ekigi komencan agordadon. Comment[es]=Seleccione esto para volver a la configuración inicial. +Comment[fr]=Sélectionnez ceci pour retrouver la configuration
par défaut et reprendre le paramétrage initial. Comment[gl]=Seleccione isto para voltar á configuración inicial. -Comment[it]=Selezionare questo per riprendere la
configurazione iniziale. Comment[hu]=Válaszd ezt az alap
beállítáok megismétléséhez. -Comment[fr]=Sélectionnez ceci pour retrouver la configuration
par défaut et reprendre le paramétrage initial. -Comment[el]=Επέλεξε αυτό για να
ξεκινήσεις την αρχική ρύθμιση ξανά. -Comment[zh_CN]=点击这里重新进行初始化设置主题。 +Comment[it]=Selezionare questo per riprendere la
configurazione iniziale. +Comment[ko]=초기 설정을 다시 하려면 이 부분을 선택하세요. Comment[pt]=Escolha isto para executar novamente a configuração inicial +Comment[ru]=Выберите этот пункт, чтобы начать настройку сначала. Comment[tr]=Açılış ayarlarına geri dönmek için bu profili seçin. -Comment[ko]=초기 설정을 다시 하려면 이 부분을 선택하세요. +Comment[zh_CN]=点击这里重新进行初始化设置主题。 +Icon=enlightenment-default diff --git a/config/mobile/Makefile.in b/config/mobile/Makefile.in index 20c6ae8333..888444256c 100644 --- a/config/mobile/Makefile.in +++ b/config/mobile/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = config/mobile -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -488,11 +522,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -632,16 +666,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-filesDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-filesDATA + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA .src.cfg: diff --git a/config/mobile/profile.desktop b/config/mobile/profile.desktop index 95f8a9cf08..3371490e35 100644 --- a/config/mobile/profile.desktop +++ b/config/mobile/profile.desktop @@ -1,20 +1,32 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Mobile -Name[eo]=Portebla +Name[Name]=Mobile +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Poŝtelefono Name[es]=Móvil Name[fr]=Écran tactile Name[gl]=Móbil +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]=터치스크린 Name[pt]=Ecrã tátil Name[ru]=Мобильные устройства -Name[ko]=터치스크린 -Icon=enlightenment-mobile +Name[sr]= +Name[tr]= Comment=EXPERIMENTAL!
Configuration set up to work best with touchscreen
phones, tablets and similar devices. Comment[eo]=EKSPERIMENTA!
Agordoj kongruas plej kun tuŝekranaj telefonoj,
tabulkomputiloj aŭ similaj aparatoj. Comment[es]=¡EXPERIMENTAL!
Configuración adaptada para el uso en móviles
de pantalla táctil, tablets y dispositivos similares. Comment[fr]=EXPÉRIMENTAL !
Configuration adaptée aux écrans tactiles
des téléphones, tablettes et apparentés. Comment[gl]=EXPERIMENTAL!
Configuración adaptada para o uso en móbiles
de pantalla táctil, tablets e dispositivos similares. Comment[it]=SPERIMENTALE!
Configurazione adatta per l'uso in smartphone
con interfaccia tattile, tablets e similari. +Comment[ko]=실험 단계중!
터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정. Comment[pt]=EXPERIMENTAL!
Configuração de ecrãs táteis como os dos telefones, tablets e similares. Comment[ru]=Экспериментально!
Конфигурация предназначенная специально для сенсорных
экранов телефонов, планшетов и прочих подобных устройств. -Comment[ko]=실험 단계중!
터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정. +Icon=enlightenment-mobile diff --git a/config/standard/Makefile.in b/config/standard/Makefile.in index e033ae75fa..767f6f4742 100644 --- a/config/standard/Makefile.in +++ b/config/standard/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = config/standard -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -492,11 +526,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -636,16 +670,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-filesDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-filesDATA + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA .src.cfg: diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop index b560f60182..6de7242b6f 100644 --- a/config/standard/profile.desktop +++ b/config/standard/profile.desktop @@ -1,21 +1,32 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Computer (Standard Enlightenment) +Name[Name]=Computer (Standard Enlightenment) +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Komputilo (kutima Enlightenment) Name[es]=Ordenador (Enlightenment estándar) Name[fr]=Ordinateur (Enlightenment standard) Name[gl]=Ordenador (Enlightenment estándar) +Name[hu]= Name[it]=Computer (Enlightenment standard) +Name[ja]= +Name[ko]=컴퓨터 (표준 Enlightenment) Name[pt]=Computador (Enlightenment padrão) Name[ru]=Компьютер (Стандартный Enlightenment) -Name[ko]=컴퓨터 (표준 Enlightenment) -Icon=enlightenment-standard +Name[sr]= +Name[tr]= Comment=Configuration for devices with keyboards and mice
like your average PC Desktop, Laptop or Netbook
with Enlightenment's traditional keyboard bindings
and mouse controls. -Comment[eo]=Agordoj por aparatoj kun klavaro kaj muso
samkiel via kutima PC aÅ­ portebla komputilo
kun kutima klavaraj bindaĵoj de Enlightenment kaj musaj kontroloj. -Comment[es]=Configuración para dispositivos con teclado y
ratón, como puede ser un PC de escritorio, portátil o Netbook,
con las asociaciones de teclado y ratón
tradicionales de Enlightenment. +Comment[eo]=Agordoj por aparatoj kun klavaro kaj muso
samkiel via kutima PC aÅ­ portebla komputilo
kun kutima klavaraj bindaĵoj de Enlightenment kaj musaj kontroloj. +Comment[es]=Configuración para dispositivos con teclado y
ratón, como puede ser un PC de escritorio, portátil o Netbook,
con las asociaciones de teclado y ratón
tradicionales de Enlightenment. Comment[fr]=Configuration pour les machines avec clavier et
souris comme les PC de bureau et les portables,
offrant raccourcis et contrôles traditionnels. Comment[gl]=Configuración para dispositivos con teclado e
rato, tal como un PC de escritorio, portátil ou Netbook,
coas asociacións de teclado e rato
tradicionais de Enlightenment. Comment[it]=Configurazione per macchine con tastiera e mouse,
come i normali computer fissi e portatili,
con le tradizionali associazioni di tasti e controlli
del mouse. +Comment[ko]=일반적인 PC 데스크탑, 노트북, 넷북 환경과 같이 키보드와 마우스 기반 환경 설정. Enlightenment 의 전통적인 키보드 바인딩 및 마우스 동작 지원. Comment[pt]=Configuração de dispositivos com teclados e ratos como os computadores de secretária ou portáteis, com os atalhos padrão do Enlightenment. Comment[ru]=Конфигурация для устройств с клавиатурой и мышью,
таких как обычный компьютер или ноутбук,
с традиционными для Enlightenment'а сочетаниями
клавиш и управлением мышью. -Comment[ko]=일반적인 PC 데스크탑, 노트북, 넷북 환경과 같이 키보드와 마우스 기반 환경 설정. Enlightenment 의 전통적인 키보드 바인딩 및 마우스 동작 지원. +Icon=enlightenment-standard diff --git a/configure b/configure index 4f117aa5d0..686e571779 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for enlightenment 0.17.3. +# Generated by GNU Autoconf 2.69 for enlightenment 0.17.4. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='enlightenment' PACKAGE_TARNAME='enlightenment' -PACKAGE_VERSION='0.17.3' -PACKAGE_STRING='enlightenment 0.17.3' +PACKAGE_VERSION='0.17.4' +PACKAGE_STRING='enlightenment 0.17.4' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1641,8 +1661,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1728,7 +1746,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures enlightenment 0.17.3 to adapt to many kinds of systems. +\`configure' configures enlightenment 0.17.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1798,7 +1816,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of enlightenment 0.17.3:";; + short | recursive ) echo "Configuration of enlightenment 0.17.4:";; esac cat <<\_ACEOF @@ -1806,10 +1824,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] @@ -2087,10 +2107,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -enlightenment configure 0.17.3 -generated by GNU Autoconf 2.68 +enlightenment configure 0.17.4 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2166,7 +2186,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2510,8 +2530,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by enlightenment $as_me 0.17.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by enlightenment $as_me 0.17.4, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2984,7 +3004,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3024,7 +3044,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3077,7 +3097,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3118,7 +3138,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3176,7 +3196,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3220,7 +3240,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3666,8 +3686,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3815,7 +3834,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3854,7 +3873,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3912,9 +3931,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3925,32 +3941,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3962,6 +3986,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3984,12 +4018,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -4001,10 +4035,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -4023,7 +4057,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4063,7 +4097,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4114,7 +4148,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -4143,12 +4177,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -4167,7 +4195,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4250,7 +4278,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4294,6 +4322,45 @@ else fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4316,7 +4383,7 @@ fi # Define the identity of the package. PACKAGE='enlightenment' - VERSION='0.17.3' + VERSION='0.17.4' cat >>confdefs.h <<_ACEOF @@ -4344,17 +4411,28 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4366,8 +4444,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4402,16 +4480,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4420,8 +4498,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4429,7 +4507,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4489,10 +4567,10 @@ if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -4678,7 +4756,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4744,7 +4822,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4951,8 +5029,8 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -5353,7 +5431,7 @@ main () return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -5521,11 +5599,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -5542,8 +5620,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -5559,10 +5638,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -5752,23 +5831,20 @@ else /* end confdefs.h. */ $ac_includes_default int -find_stack_direction () +find_stack_direction (int *addr, int depth) { - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; + int dir, dummy = 0; + if (! addr) + addr = &dummy; + *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; + dir = depth ? find_stack_direction (addr, depth - 1) : 0; + return dir + dummy; } int -main () +main (int argc, char **argv) { - return find_stack_direction () < 0; + return find_stack_direction (0, argc + !argv + 20) < 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -5961,7 +6037,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6040,7 +6116,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6296,7 +6372,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6340,7 +6416,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6764,7 +6840,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6804,7 +6880,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7110,7 +7186,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7150,7 +7226,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7253,7 +7329,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7297,7 +7373,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7422,7 +7498,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7462,7 +7538,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7521,7 +7597,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7561,7 +7637,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8210,7 +8286,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8250,7 +8326,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8330,7 +8406,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8370,7 +8446,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8422,7 +8498,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8462,7 +8538,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8514,7 +8590,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8554,7 +8630,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8606,7 +8682,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8646,7 +8722,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8698,7 +8774,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8738,7 +8814,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12978,7 +13054,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 3 +#define VMIC 4 _ACEOF @@ -12986,14 +13062,15 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="17:3:17" +version_info="17:4:17" release_info="" ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -release=0.17.3 +release=0.17.4 + @@ -13022,7 +13099,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13065,7 +13142,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13191,7 +13268,7 @@ fi done -efl_version="1.7.6" +efl_version="1.7.8" for ac_header in sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h @@ -13324,7 +13401,7 @@ fi -MODULE_ARCH="$host_os-$host_cpu-0.17.3" +MODULE_ARCH="$host_os-$host_cpu-0.17.4" cat >>confdefs.h <<_ACEOF @@ -13503,6 +13580,13 @@ ALL_LINGUAS="bg ca cs da de el eo es fi fr fr_CH he hu it ja ko nb nl pl pt_BR r +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -13518,7 +13602,7 @@ $as_echo "$USE_NLS" >&6; } - GETTEXT_MACRO_VERSION=0.17 + GETTEXT_MACRO_VERSION=0.18 @@ -13610,7 +13694,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13858,7 +13942,7 @@ $as_echo_n "checking for ld used by GCC... " >&6; } # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -13892,9 +13976,9 @@ else # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -13966,23 +14050,70 @@ fi - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + + + @@ -14028,6 +14159,10 @@ if test "${with_libiconv_prefix+set}" = set; then : else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -14037,6 +14172,7 @@ fi LTLIBICONV= INCICONV= LIBICONV_PREFIX= + HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -14179,7 +14315,9 @@ fi if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -14246,7 +14384,16 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBICONV_PREFIX="$basedir" + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -14295,9 +14442,11 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -14440,6 +14589,12 @@ fi + + + + + + @@ -14719,6 +14874,25 @@ int main () return 1; } } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } #if 0 /* This bug could be worked around by the caller. */ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ { @@ -14797,6 +14971,9 @@ $as_echo "$LIBICONV" >&6; } + + + use_additional=yes acl_save_prefix="$prefix" @@ -14833,6 +15010,10 @@ if test "${with_libintl_prefix+set}" = set; then : else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -14842,6 +15023,7 @@ fi LTLIBINTL= INCINTL= LIBINTL_PREFIX= + HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -14984,7 +15166,9 @@ fi if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -15051,7 +15235,16 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBINTL_PREFIX="$basedir" + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -15100,9 +15293,11 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -15228,6 +15423,11 @@ fi done fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } if eval \${$gt_func_gnugettext_libintl+:} false; then : @@ -15584,6 +15784,7 @@ if test -n "$EEZE_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EEZE_CFLAGS=`$PKG_CONFIG --cflags "eeze >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15600,6 +15801,7 @@ if test -n "$EEZE_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EEZE_LIBS=`$PKG_CONFIG --libs "eeze >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15619,9 +15821,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EEZE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eeze >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version}" 2>&1` + EEZE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eeze >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version}" 2>&1` else - EEZE_PKG_ERRORS=`$PKG_CONFIG --print-errors "eeze >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version}" 2>&1` + EEZE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eeze >= ${efl_version} ecore >= ${efl_version} eina >= ${efl_version}" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EEZE_PKG_ERRORS" >&5 @@ -15927,7 +16129,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_efl_have_doxygen="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15976,7 +16178,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_efl_have_doxygen="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16069,6 +16271,7 @@ if test -n "$E_REMOTE_CFLAGS"; then eet >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16100,6 +16303,7 @@ if test -n "$E_REMOTE_LIBS"; then eet >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16119,14 +16323,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_REMOTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_REMOTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ecore >= ${efl_version} ecore-ipc >= ${efl_version} eet >= ${efl_version} eina >= ${efl_version} " 2>&1` else - E_REMOTE_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_REMOTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ecore >= ${efl_version} ecore-ipc >= ${efl_version} eet >= ${efl_version} @@ -16151,7 +16355,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_REMOTE_CFLAGS and E_REMOTE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16167,7 +16370,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_REMOTE_CFLAGS=$pkg_cv_E_REMOTE_CFLAGS E_REMOTE_LIBS=$pkg_cv_E_REMOTE_LIBS @@ -16197,6 +16399,7 @@ if test -n "$E_START_CFLAGS"; then pkg_cv_E_START_CFLAGS=`$PKG_CONFIG --cflags " eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16219,6 +16422,7 @@ if test -n "$E_START_LIBS"; then pkg_cv_E_START_LIBS=`$PKG_CONFIG --libs " eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16238,11 +16442,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_START_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_START_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} " 2>&1` else - E_START_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_START_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} " 2>&1` fi @@ -16261,7 +16465,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_START_CFLAGS and E_START_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16277,7 +16480,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_START_CFLAGS=$pkg_cv_E_START_CFLAGS E_START_LIBS=$pkg_cv_E_START_LIBS @@ -16313,6 +16515,7 @@ if test -n "$E_IMC_CFLAGS"; then eet >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16341,6 +16544,7 @@ if test -n "$E_IMC_LIBS"; then eet >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16360,13 +16564,13 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_IMC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_IMC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ecore-file >= ${efl_version} eet >= ${efl_version} eina >= ${efl_version} " 2>&1` else - E_IMC_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_IMC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ecore-file >= ${efl_version} eet >= ${efl_version} eina >= ${efl_version} @@ -16389,7 +16593,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_IMC_CFLAGS and E_IMC_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16405,7 +16608,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_IMC_CFLAGS=$pkg_cv_E_IMC_CFLAGS E_IMC_LIBS=$pkg_cv_E_IMC_LIBS @@ -16459,6 +16661,7 @@ if test -n "$E_THUMB_CFLAGS"; then eet >= ${efl_version} efreet >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16505,6 +16708,7 @@ if test -n "$E_THUMB_LIBS"; then eet >= ${efl_version} efreet >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16524,7 +16728,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_THUMB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_THUMB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} evas >= ${efl_version} ecore >= ${efl_version} @@ -16536,7 +16740,7 @@ fi efreet >= ${efl_version} " 2>&1` else - E_THUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_THUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} evas >= ${efl_version} ecore >= ${efl_version} @@ -16571,7 +16775,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_THUMB_CFLAGS and E_THUMB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16587,7 +16790,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_THUMB_CFLAGS=$pkg_cv_E_THUMB_CFLAGS E_THUMB_LIBS=$pkg_cv_E_THUMB_LIBS @@ -16629,6 +16831,7 @@ if test -n "$E_GRABBER_CFLAGS"; then efreet >= ${efl_version} ecore-x >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16663,6 +16866,7 @@ if test -n "$E_GRABBER_LIBS"; then efreet >= ${efl_version} ecore-x >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16682,7 +16886,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_GRABBER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_GRABBER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} ecore >= ${efl_version} eet >= ${efl_version} @@ -16690,7 +16894,7 @@ fi ecore-x >= ${efl_version} " 2>&1` else - E_GRABBER_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_GRABBER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} ecore >= ${efl_version} eet >= ${efl_version} @@ -16717,7 +16921,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_GRABBER_CFLAGS and E_GRABBER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16733,7 +16936,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_GRABBER_CFLAGS=$pkg_cv_E_GRABBER_CFLAGS E_GRABBER_LIBS=$pkg_cv_E_GRABBER_LIBS @@ -16770,6 +16972,7 @@ if test -n "$E_FM_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_E_FM_CFLAGS=`$PKG_CONFIG --cflags "$efm_requires" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16786,6 +16989,7 @@ if test -n "$E_FM_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_E_FM_LIBS=`$PKG_CONFIG --libs "$efm_requires" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16805,9 +17009,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_FM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$efm_requires" 2>&1` + E_FM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$efm_requires" 2>&1` else - E_FM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$efm_requires" 2>&1` + E_FM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$efm_requires" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$E_FM_PKG_ERRORS" >&5 @@ -16822,7 +17026,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_FM_CFLAGS and E_FM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16838,7 +17041,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_FM_CFLAGS=$pkg_cv_E_FM_CFLAGS E_FM_LIBS=$pkg_cv_E_FM_LIBS @@ -16880,6 +17082,7 @@ if test -n "$E_FM_CMDLINE_CFLAGS"; then edbus >= ${efl_version} dbus-1 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16914,6 +17117,7 @@ if test -n "$E_FM_CMDLINE_LIBS"; then edbus >= ${efl_version} dbus-1 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16933,7 +17137,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_FM_CMDLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_FM_CMDLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} ecore >= ${efl_version} ecore-file >= ${efl_version} @@ -16941,7 +17145,7 @@ fi dbus-1 " 2>&1` else - E_FM_CMDLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_FM_CMDLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} ecore >= ${efl_version} ecore-file >= ${efl_version} @@ -16968,7 +17172,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_FM_CMDLINE_CFLAGS and E_FM_CMDLINE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -16984,7 +17187,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_FM_CMDLINE_CFLAGS=$pkg_cv_E_FM_CMDLINE_CFLAGS E_FM_CMDLINE_LIBS=$pkg_cv_E_FM_CMDLINE_LIBS @@ -17020,6 +17222,7 @@ if test -n "$E_FM_OP_CFLAGS"; then ecore-file >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17048,6 +17251,7 @@ if test -n "$E_FM_OP_LIBS"; then ecore-file >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17067,13 +17271,13 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_FM_OP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_FM_OP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ecore >= ${efl_version} ecore-file >= ${efl_version} eina >= ${efl_version} " 2>&1` else - E_FM_OP_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_FM_OP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ecore >= ${efl_version} ecore-file >= ${efl_version} eina >= ${efl_version} @@ -17096,7 +17300,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_FM_OP_CFLAGS and E_FM_OP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17112,7 +17315,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_FM_OP_CFLAGS=$pkg_cv_E_FM_OP_CFLAGS E_FM_OP_LIBS=$pkg_cv_E_FM_OP_LIBS @@ -17154,6 +17356,7 @@ if test -n "$E_FM_OPEN_CFLAGS"; then ecore-ipc >= ${efl_version} ecore-con >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17188,6 +17391,7 @@ if test -n "$E_FM_OPEN_LIBS"; then ecore-ipc >= ${efl_version} ecore-con >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17207,7 +17411,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_FM_OPEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_FM_OPEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} eet >= ${efl_version} ecore >= ${efl_version} @@ -17215,7 +17419,7 @@ fi ecore-con >= ${efl_version} " 2>&1` else - E_FM_OPEN_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_FM_OPEN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} eet >= ${efl_version} ecore >= ${efl_version} @@ -17242,7 +17446,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_FM_OPEN_CFLAGS and E_FM_OPEN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17258,7 +17461,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_FM_OPEN_CFLAGS=$pkg_cv_E_FM_OPEN_CFLAGS E_FM_OPEN_LIBS=$pkg_cv_E_FM_OPEN_LIBS @@ -17288,6 +17490,7 @@ if test -n "$E_SYS_CFLAGS"; then pkg_cv_E_SYS_CFLAGS=`$PKG_CONFIG --cflags " eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17310,6 +17513,7 @@ if test -n "$E_SYS_LIBS"; then pkg_cv_E_SYS_LIBS=`$PKG_CONFIG --libs " eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17329,11 +17533,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_SYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_SYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} " 2>&1` else - E_SYS_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_SYS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} " 2>&1` fi @@ -17352,7 +17556,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_SYS_CFLAGS and E_SYS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17368,7 +17571,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_SYS_CFLAGS=$pkg_cv_E_SYS_CFLAGS E_SYS_LIBS=$pkg_cv_E_SYS_LIBS @@ -17416,6 +17618,7 @@ if test -n "$E_INIT_CFLAGS"; then ecore-ipc >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17456,6 +17659,7 @@ if test -n "$E_INIT_LIBS"; then ecore-ipc >= ${efl_version} eina >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17475,7 +17679,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_INIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_INIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " evas >= ${efl_version} ecore >= ${efl_version} ecore-evas >= ${efl_version} @@ -17485,7 +17689,7 @@ fi eina >= ${efl_version} " 2>&1` else - E_INIT_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_INIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " evas >= ${efl_version} ecore >= ${efl_version} ecore-evas >= ${efl_version} @@ -17516,7 +17720,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_INIT_CFLAGS and E_INIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17532,7 +17735,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_INIT_CFLAGS=$pkg_cv_E_INIT_CFLAGS E_INIT_LIBS=$pkg_cv_E_INIT_LIBS @@ -17577,6 +17779,7 @@ if test -n "$E_ALERT_CFLAGS"; then ecore >= ${efl_version} ecore-ipc >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17614,6 +17817,7 @@ if test -n "$E_ALERT_LIBS"; then ecore >= ${efl_version} ecore-ipc >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17633,7 +17837,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_ALERT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_ALERT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " xcb xcb-shape xcb-keysyms @@ -17642,7 +17846,7 @@ fi ecore-ipc >= ${efl_version} " 2>&1` else - E_ALERT_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_ALERT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " xcb xcb-shape xcb-keysyms @@ -17671,7 +17875,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_ALERT_CFLAGS and E_ALERT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17687,7 +17890,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_ALERT_CFLAGS=$pkg_cv_E_ALERT_CFLAGS E_ALERT_LIBS=$pkg_cv_E_ALERT_LIBS @@ -17780,6 +17982,7 @@ if test -n "$E_CFLAGS"; then $udisks_mount $device_backend " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17865,6 +18068,7 @@ if test -n "$E_LIBS"; then $udisks_mount $device_backend " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -17884,7 +18088,7 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " evas >= ${efl_version} ecore >= ${efl_version} ecore-x >= ${efl_version} @@ -17909,7 +18113,7 @@ fi $device_backend " 2>&1` else - E_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " evas >= ${efl_version} ecore >= ${efl_version} ecore-x >= ${efl_version} @@ -17970,7 +18174,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_CFLAGS and E_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -17986,7 +18189,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_CFLAGS=$pkg_cv_E_CFLAGS E_LIBS=$pkg_cv_E_LIBS @@ -18043,6 +18245,7 @@ if test -n "$ELM_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELM_CFLAGS=`$PKG_CONFIG --cflags "elementary >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18059,6 +18262,7 @@ if test -n "$ELM_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELM_LIBS=`$PKG_CONFIG --libs "elementary >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18078,9 +18282,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ELM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "elementary >= ${efl_version}" 2>&1` + ELM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "elementary >= ${efl_version}" 2>&1` else - ELM_PKG_ERRORS=`$PKG_CONFIG --print-errors "elementary >= ${efl_version}" 2>&1` + ELM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "elementary >= ${efl_version}" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ELM_PKG_ERRORS" >&5 @@ -18104,7 +18308,7 @@ fi $as_echo "#define HAVE_ELEMENTARY 1" >>confdefs.h - requirements_e="${requirements_e} elementary > 1.6.9.0" + requirements_e="${requirements_e} elementary >= ${efl_version}" fi fi @@ -18134,6 +18338,7 @@ if test -n "$EMOTION_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EMOTION_CFLAGS=`$PKG_CONFIG --cflags "emotion >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18150,6 +18355,7 @@ if test -n "$EMOTION_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EMOTION_LIBS=`$PKG_CONFIG --libs "emotion >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18169,9 +18375,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EMOTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "emotion >= ${efl_version}" 2>&1` + EMOTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "emotion >= ${efl_version}" 2>&1` else - EMOTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "emotion >= ${efl_version}" 2>&1` + EMOTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "emotion >= ${efl_version}" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EMOTION_PKG_ERRORS" >&5 @@ -18229,6 +18435,7 @@ if test -n "$E_OPEN_CFLAGS"; then efreet >= ${efl_version} efreet-mime >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18260,6 +18467,7 @@ if test -n "$E_OPEN_LIBS"; then efreet >= ${efl_version} efreet-mime >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18279,14 +18487,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - E_OPEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + E_OPEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " eina >= ${efl_version} ecore >= ${efl_version} efreet >= ${efl_version} efreet-mime >= ${efl_version} " 2>&1` else - E_OPEN_PKG_ERRORS=`$PKG_CONFIG --print-errors " + E_OPEN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " eina >= ${efl_version} ecore >= ${efl_version} efreet >= ${efl_version} @@ -18311,7 +18519,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables E_OPEN_CFLAGS and E_OPEN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18327,7 +18534,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else E_OPEN_CFLAGS=$pkg_cv_E_OPEN_CFLAGS E_OPEN_LIBS=$pkg_cv_E_OPEN_LIBS @@ -18356,6 +18562,7 @@ if test -n "$ECORE_IMF_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags " ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18372,6 +18579,7 @@ if test -n "$ECORE_IMF_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ECORE_IMF_LIBS=`$PKG_CONFIG --libs " ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18391,9 +18599,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} " 2>&1` + ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} " 2>&1` else - ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors " ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} " 2>&1` + ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ecore-imf >= ${efl_version} ecore-imf-evas >= ${efl_version} " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ECORE_IMF_PKG_ERRORS" >&5 @@ -18499,6 +18707,7 @@ if test -n "$EET_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18515,6 +18724,7 @@ if test -n "$EET_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= ${efl_version}" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18534,9 +18744,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eet >= ${efl_version}" 2>&1` + EET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "eet >= ${efl_version}" 2>&1` else - EET_PKG_ERRORS=`$PKG_CONFIG --print-errors "eet >= ${efl_version}" 2>&1` + EET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "eet >= ${efl_version}" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EET_PKG_ERRORS" >&5 @@ -18551,7 +18761,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables EET_CFLAGS and EET_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18567,7 +18776,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else EET_CFLAGS=$pkg_cv_EET_CFLAGS EET_LIBS=$pkg_cv_EET_LIBS @@ -18704,6 +18912,7 @@ if test -n "$ENOTIFY_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ENOTIFY_CFLAGS=`$PKG_CONFIG --cflags " edbus >= $efl_version enotify >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18720,6 +18929,7 @@ if test -n "$ENOTIFY_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ENOTIFY_LIBS=`$PKG_CONFIG --libs " edbus >= $efl_version enotify >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18739,9 +18949,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ENOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " edbus >= $efl_version enotify >= $efl_version " 2>&1` + ENOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " edbus >= $efl_version enotify >= $efl_version " 2>&1` else - ENOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors " edbus >= $efl_version enotify >= $efl_version " 2>&1` + ENOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " edbus >= $efl_version enotify >= $efl_version " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ENOTIFY_PKG_ERRORS" >&5 @@ -18868,6 +19078,7 @@ if test -n "$EPHYSICS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EPHYSICS_CFLAGS=`$PKG_CONFIG --cflags " ephysics " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18884,6 +19095,7 @@ if test -n "$EPHYSICS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EPHYSICS_LIBS=`$PKG_CONFIG --libs " ephysics " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18903,9 +19115,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EPHYSICS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ephysics " 2>&1` + EPHYSICS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ephysics " 2>&1` else - EPHYSICS_PKG_ERRORS=`$PKG_CONFIG --print-errors " ephysics " 2>&1` + EPHYSICS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ephysics " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EPHYSICS_PKG_ERRORS" >&5 @@ -19052,6 +19264,7 @@ if test -n "$WAYLAND_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19068,6 +19281,7 @@ if test -n "$WAYLAND_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19087,9 +19301,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image" 2>&1` + WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image" 2>&1` else - WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors "wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image" 2>&1` + WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WAYLAND_PKG_ERRORS" >&5 @@ -19523,6 +19737,7 @@ if test -n "$BATTERY_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BATTERY_CFLAGS=`$PKG_CONFIG --cflags " ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19539,6 +19754,7 @@ if test -n "$BATTERY_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BATTERY_LIBS=`$PKG_CONFIG --libs " ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19558,9 +19774,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BATTERY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version " 2>&1` + BATTERY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version " 2>&1` else - BATTERY_PKG_ERRORS=`$PKG_CONFIG --print-errors " ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version " 2>&1` + BATTERY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$BATTERY_PKG_ERRORS" >&5 @@ -19726,6 +19942,7 @@ if test -n "$TEMPERATURE_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TEMPERATURE_CFLAGS=`$PKG_CONFIG --cflags " ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19742,6 +19959,7 @@ if test -n "$TEMPERATURE_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TEMPERATURE_LIBS=`$PKG_CONFIG --libs " ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19761,9 +19979,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TEMPERATURE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version " 2>&1` + TEMPERATURE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version " 2>&1` else - TEMPERATURE_PKG_ERRORS=`$PKG_CONFIG --print-errors " ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version " 2>&1` + TEMPERATURE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TEMPERATURE_PKG_ERRORS" >&5 @@ -22064,6 +22282,7 @@ if test -n "$ALSA_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22080,6 +22299,7 @@ if test -n "$ALSA_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.8" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22099,9 +22319,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa >= 1.0.8" 2>&1` + ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.8" 2>&1` else - ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa >= 1.0.8" 2>&1` + ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.8" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ALSA_PKG_ERRORS" >&5 @@ -22292,6 +22512,7 @@ if test -n "$ECONNMAN_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ECONNMAN_CFLAGS=`$PKG_CONFIG --cflags " edbus >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22308,6 +22529,7 @@ if test -n "$ECONNMAN_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ECONNMAN_LIBS=`$PKG_CONFIG --libs " edbus >= $efl_version " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22327,9 +22549,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ECONNMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " edbus >= $efl_version " 2>&1` + ECONNMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " edbus >= $efl_version " 2>&1` else - ECONNMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors " edbus >= $efl_version " 2>&1` + ECONNMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " edbus >= $efl_version " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ECONNMAN_PKG_ERRORS" >&5 @@ -23609,7 +23831,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SUSPEND="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23662,7 +23884,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_HIBERNATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23950,6 +24172,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -24569,16 +24799,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -24638,28 +24868,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -24680,8 +24898,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by enlightenment $as_me 0.17.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by enlightenment $as_me 0.17.4, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -24746,11 +24964,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -enlightenment config.status 0.17.3 -configured by $0, generated by GNU Autoconf 2.68, +enlightenment config.status 0.17.4 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -24841,7 +25059,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -25846,7 +26064,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -25859,7 +26077,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -25893,21 +26111,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff --git a/configure.ac b/configure.ac index 9a287f19d5..dd3545fe6d 100644 --- a/configure.ac +++ b/configure.ac @@ -2,13 +2,13 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [17]) -m4_define([v_mic], [3]) +m4_define([v_mic], [4]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line m4_undefine([v_rev]) -m4_define([relname], [0.17.3]) +m4_define([relname], [0.17.4]) ##-- When doing snapshots - change soname. remove dnl on below line dnl m4_define([relname], [ver-pre-svn-08]) dnl m4_define([v_rel], [-release relname]) @@ -75,7 +75,7 @@ EFL_CHECK_PATH_MAX AC_CHECK_FUNCS(setenv) AC_CHECK_FUNCS(unsetenv) -efl_version="1.7.6" +efl_version="1.7.8" AC_SUBST(efl_version) AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) @@ -594,7 +594,7 @@ if test "x$want_elementary" != "xno"; then fi if test "x$have_elementary" = "xyes"; then AC_DEFINE([HAVE_ELEMENTARY], 1, "Have Elementary support") - requirements_e="${requirements_e} elementary > 1.6.9.0" + requirements_e="${requirements_e} elementary >= ${efl_version}" fi fi diff --git a/data/Makefile.in b/data/Makefile.in index 792597c86c..825221d5d8 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -71,21 +98,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -93,9 +127,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -464,22 +518,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -494,57 +551,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -560,12 +572,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -577,15 +584,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -594,6 +597,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -755,22 +773,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/backgrounds/Makefile.in b/data/backgrounds/Makefile.in index 9ffdfdf0fe..0d8a538f41 100644 --- a/data/backgrounds/Makefile.in +++ b/data/backgrounds/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/backgrounds -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -500,11 +534,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -644,16 +678,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/desktop/Makefile.in b/data/desktop/Makefile.in index df9d63c432..3507ac265d 100644 --- a/data/desktop/Makefile.in +++ b/data/desktop/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/desktop -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -465,11 +499,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -609,16 +643,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/desktop/enlightenment_filemanager.desktop b/data/desktop/enlightenment_filemanager.desktop index 19806bfcd9..e236047638 100644 --- a/data/desktop/enlightenment_filemanager.desktop +++ b/data/desktop/enlightenment_filemanager.desktop @@ -1,24 +1,38 @@ [Desktop Entry] +Encoding=UTF-8 Type=Application Name=Enlightenment File Manager +Name[Name]=Enlightenment File Manager +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Dosieradministrilo de Enlightenment Name[es]=Administrador de archivos de Enlightenment +Name[fr]=Gestionnaire de fichiers d'Enlightenment Name[gl]=Xestor de ficheiros de Enlightenment +Name[hu]= Name[it]=Filemanager di Enlightenment +Name[ja]= +Name[ko]= Name[pt]=Gestor de ficheiros do Enlightenment Name[ru]=Файловый менеджер для Enlightenment +Name[sr]= +Name[tr]= Comment=File Manager provided by Enlightenment Comment[eo]=La dosieradministrilo provizita de Enlightenment Comment[es]=El administrador de ficheros proporcionado por Enlightenment +Comment[fr]=Explorateur de fichier fourni par Enlightenment Comment[gl]=O xestor de ficheiros fornecido por Enlightenment Comment[it]=Il filemanager fornito da Enlightenment Comment[pt]=Gestor de ficheiros para o Enlightenment Comment[ru]=Файловый менеджер встроенный в Enlightenment -Exec=enlightenment_filemanager %U Icon=system-file-manager -Categories=FileManager;Utility;Core;System;FileTools; +OnlyShowIn=X-Enlightenment; +Exec=enlightenment_filemanager %U Terminal=false +MimeType=inode/directory; +Categories=FileManager;Utility;Core;System;FileTools; StartupNotify=false StartupWMClass=e_fm -OnlyShowIn=X-Enlightenment; -MimeType=inode/directory; diff --git a/data/etc/Makefile.in b/data/etc/Makefile.in index 79b51c62b7..802ff37086 100644 --- a/data/etc/Makefile.in +++ b/data/etc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,7 +81,7 @@ host_triplet = @host@ @INSTALL_SYSACTIONS_TRUE@am__append_1 = sysactions.conf @INSTALL_ENLIGHTENMENT_MENU_TRUE@am__append_2 = enlightenment.menu subdir = data/etc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/sysactions.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ @@ -75,12 +102,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = sysactions.conf CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -117,6 +150,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(menusdir)" DATA = $(files_DATA) $(menus_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -491,11 +525,11 @@ uninstall-menusDATA: @list='$(menus_DATA)'; test -n "$(menusdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(menusdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -635,17 +669,17 @@ uninstall-am: uninstall-filesDATA uninstall-menusDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-menusDATA install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-filesDATA \ - uninstall-menusDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-menusDATA install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-filesDATA uninstall-menusDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/favorites/Makefile.in b/data/favorites/Makefile.in index f2bd8dd4ba..5ba91e82ba 100644 --- a/data/favorites/Makefile.in +++ b/data/favorites/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/favorites -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(favsdir)" DATA = $(favs_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -469,11 +503,11 @@ uninstall-favsDATA: @list='$(favs_DATA)'; test -n "$(favsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(favsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -613,16 +647,16 @@ uninstall-am: uninstall-favsDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-favsDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-favsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-favsDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-favsDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/favorites/desktop.desktop b/data/favorites/desktop.desktop index 03f7647bfd..34bc0f9293 100644 --- a/data/favorites/desktop.desktop +++ b/data/favorites/desktop.desktop @@ -1,11 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Desktop +Name[Name]=Desktop +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Labortablo Name[es]=Escritorio Name[fr]=Bureau Name[gl]=Escritorio +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Área de trabalho Name[ru]=Рабочий стол +Name[sr]= +Name[tr]= Comment=Files on your Desktop Comment[eo]=Dosieroj sur via labortablo Comment[es]=Los archivos en su escritorio @@ -14,8 +28,7 @@ Comment[gl]=Os ficheiros no seu escritorio Comment[it]=I file sul vostro desktop Comment[pt]=Os ficheiros da área de trabalho Comment[ru]=Файлы на рабочем столе -Type=Link -X-Enlightenment-Type=Mount -URL=file:$HOME/Desktop Icon=user-desktop NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:$HOME/Desktop +X-Enlightenment-Type=Mount diff --git a/data/favorites/home.desktop b/data/favorites/home.desktop index a5fa25d4fc..a2424f853b 100644 --- a/data/favorites/home.desktop +++ b/data/favorites/home.desktop @@ -1,10 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Home +Name[Name]=Home +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Hejmo Name[es]=Carpeta personal +Name[fr]=Accueil Name[gl]=Cartafol persoal +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Pasta pessoal Name[ru]=Домашний каталог +Name[sr]= +Name[tr]= Comment=The Directory containing all your personal files Comment[eo]=La dosierujo enhavante viajn proprajn dosieroj Comment[es]=El directorio que contiene todos sus archivos personales @@ -13,8 +28,7 @@ Comment[gl]=O directorio que contén tódolos seus ficheiros persoais Comment[it]=La directory contenente i vostri file personali Comment[pt]=O diretório com os ficheiros do utilizador Comment[ru]=Каталог содержащий ваши личные файлы -Type=Link -X-Enlightenment-Type=Mount -URL=file:$HOME Icon=user-home NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:$HOME +X-Enlightenment-Type=Mount diff --git a/data/favorites/root.desktop b/data/favorites/root.desktop index 628c9228aa..fe7ef40d4c 100644 --- a/data/favorites/root.desktop +++ b/data/favorites/root.desktop @@ -1,7 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Root +Name[Name]=Root +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Radiko +Name[es]= +Name[fr]=Dossier racine +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Корневой каталог +Name[sr]= +Name[tr]= Comment=The Root Filesystem base Comment[eo]=La radika dosiersistemo Comment[es]=El sistema de archivos root @@ -10,8 +28,7 @@ Comment[gl]=O sistema de ficheiros root Comment[it]=Il filesystem principale Comment[pt]=O sistema de ficheiros root Comment[ru]=Корень файловой системы -Type=Link -X-Enlightenment-Type=Mount -URL=file:/ Icon=computer NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:/ +X-Enlightenment-Type=Mount diff --git a/data/favorites/tmp.desktop b/data/favorites/tmp.desktop index 766dcd3cfa..bc02a76040 100644 --- a/data/favorites/tmp.desktop +++ b/data/favorites/tmp.desktop @@ -1,8 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Temp +Name[Name]=Temp +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Dumtempaj +Name[es]= +Name[fr]=Temporaires +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Temporários Name[ru]=Временный каталог +Name[sr]= +Name[tr]= Comment=Temporary files Comment[eo]=Dumtempaj dosieroj Comment[es]=Archivos temporales @@ -11,8 +28,7 @@ Comment[gl]=Ficheiros temporais Comment[it]=File temporanei Comment[pt]=Ficheiros temporários Comment[ru]=Временные файлы -Type=Link -X-Enlightenment-Type=Mount -URL=file:/tmp Icon=user-temp NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:/tmp +X-Enlightenment-Type=Mount diff --git a/data/flags/Makefile.in b/data/flags/Makefile.in index aec9644464..997aa50206 100644 --- a/data/flags/Makefile.in +++ b/data/flags/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/flags -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -562,11 +596,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -706,16 +740,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index d84e0edd35..e283692952 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -472,11 +506,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -616,16 +650,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/images/Makefile.in b/data/images/Makefile.in index 16b70cc20b..26ee07fb9a 100644 --- a/data/images/Makefile.in +++ b/data/images/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/images -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -469,11 +503,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -613,16 +647,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/input_methods/Makefile.in b/data/input_methods/Makefile.in index 69218120dd..6f9bbc7179 100644 --- a/data/input_methods/Makefile.in +++ b/data/input_methods/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/input_methods -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -471,11 +505,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -615,16 +649,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in index 428db8df3b..d25b6f50c5 100644 --- a/data/themes/Makefile.in +++ b/data/themes/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/themes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -1200,11 +1234,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -1344,16 +1378,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-filesDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-filesDATA + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA default.edj: Makefile $(EXTRA_DIST) diff --git a/data/themes/edc/randr.edc b/data/themes/edc/randr.edc index d2fcc2e9a6..5e2a2f53fd 100644 --- a/data/themes/edc/randr.edc +++ b/data/themes/edc/randr.edc @@ -1,3 +1,53 @@ +group { name: "e/conf/randr/main"; + images.image: "inset_shadow.png" COMP; + images.image: "bevel_in.png" COMP; + parts { + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + color: 64 64 64 255; + } + } + part { name: "clipper"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.content"; + rel2.to: "e.swallow.content"; + } + } + part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.offset: 0 0; + rel2.offset: -1 -1; + } + } + part { name: "shadow"; type: IMAGE; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "inset_shadow.png"; + image.border: 5 5 7 3; + image.middle: 0; + rel1.to: "bg"; + rel2.to: "bg"; + fill.smooth: 0; + color: 255 255 255 128; + } + } + part { name: "inset"; type: IMAGE; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "bevel_in.png"; + image.border: 1 1 1 1; + image.middle: 0; + rel1.offset: -1 -1; + rel1.to: "bg"; + rel2.offset: 0 0; + rel2.to: "bg"; + fill.smooth: 0; + } + } + } +} + group { name: "e/conf/randr/main/monitor"; parts { part { name: "e.swallow.stand"; type: SWALLOW; @@ -28,7 +78,7 @@ group { name: "e/conf/randr/main/frame"; images.image: "sym_up_light_normal.png" COMP; images.image: "sym_up_light_selected.png" COMP; styles { - style { name: "randr_monitor_style"; + style { name: "randr_name_style"; base: "font=Sans font_size=10 text_class=randr_monitor align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word"; tag: "br" "\n"; tag: "hilight" "+ font=Sans:style=Bold"; @@ -38,11 +88,29 @@ group { name: "e/conf/randr/main/frame"; tag: "br" "\n"; tag: "hilight" "+ font=Sans:style=Bold"; } + style { name: "randr_position_style"; + base: "font=Sans font_size=10 text_class=randr_position align=center color=#3399ffff wrap=mixed style=glow glow_color=#3399ff18 align=center glow2_color=#3399ff12"; + tag: "br" "\n"; + tag: "hilight" "+ font=Sans:style=Bold"; + } } script { public refresh_open; } parts { + part { name: "primary"; type: IMAGE; + description { state: "default" 0.0; + image.normal: "glow_small.png"; + image.border: 7 7 7 7; + rel1.offset: -4 -4; + rel2.offset: 3 3; + visible: 0; + } + description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "base"; description { state: "default" 0.0; image.normal: "screen_bg.png"; @@ -61,6 +129,11 @@ group { name: "e/conf/randr/main/frame"; rel1.to: "e.swallow.preview"; rel2.to: "e.swallow.preview"; } + description { state: "off" 0.0; + inherit: "default" 0.0; + color: 255 255 255 64; +// color: 64 64 64 255; + } } part { name: "e.box.clone"; type: BOX; clip_to: "clone_clip"; @@ -68,7 +141,9 @@ group { name: "e/conf/randr/main/frame"; rel1.to: "e.swallow.preview"; rel1.relative: 0.0 1.0; rel1.offset: 0 -27; - rel2.to: "e.swallow.preview"; + rel2.relative: 1.0 0.0; + rel2.to_x: "e.swallow.preview"; + rel2.to_y: "e.event.indicator"; box { layout: "horizontal"; padding: 2 0; @@ -141,7 +216,7 @@ group { name: "e/conf/randr/main/frame"; rel2.relative: 0.5 0.5; rel2.to: "e.swallow.preview"; align: 0.5 1.0; - text { style: "randr_monitor_style"; + text { style: "randr_name_style"; min: 1.0 1.0; } } @@ -160,6 +235,21 @@ group { name: "e/conf/randr/main/frame"; } } } + part { name: "e.text.position"; type: TEXTBLOCK; mouse_events: 0; + clip_to: "clip"; + scale: 1; + description { state: "default" 0.0; + rel1.relative: 0.5 1.0; + rel1.to_x: "e.swallow.preview"; + rel1.to_y: "e.text.resolution"; + rel2.relative: 0.5 0.5; + rel2.to: "e.swallow.preview"; + align: 0.5 0.0; + text { style: "randr_position_style"; + min: 1.0 1.0; + } + } + } part { name: "scr_shine"; mouse_events: 0; description { state: "default" 0.0; image.normal: "shine.png"; @@ -335,9 +425,13 @@ group { name: "e/conf/randr/main/frame"; part { name: "e.event.indicator"; type: RECT; description { state: "default" 0.0; color: 0 0 0 0; - max: 21 21; + max: 15 15; align: 0.0 1.0; } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "e.event.resize"; type: RECT; description { state: "default" 0.0; @@ -422,6 +516,7 @@ group { name: "e/conf/randr/main/frame"; program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; + target: "clip"; target: "led"; after: "pulse1"; } @@ -436,6 +531,7 @@ group { name: "e/conf/randr/main/frame"; signal: "e,state,disabled"; source: "e"; action: STATE_SET "off" 0.0; target: "led"; + target: "clip"; } program { signal: "e,state,drop,on"; source: "e"; @@ -452,6 +548,26 @@ group { name: "e/conf/randr/main/frame"; action: STATE_SET "disabled" 0.0; target: "e.event.rotate"; } + program { + signal: "e,state,primary,off"; source: "e"; + action: STATE_SET "default" 0.0; + target: "primary"; + } + program { + signal: "e,state,primary,on"; source: "e"; + action: STATE_SET "on" 0.0; + target: "primary"; + } + program { + signal: "e,state,indicator,enabled"; source: "e"; + action: STATE_SET "default" 0.0; + target: "e.event.indicator"; + } + program { + signal: "e,state,indicator,disabled"; source: "e"; + action: STATE_SET "disabled" 0.0; + target: "e.event.indicator"; + } program { signal: "mouse,in"; source: "e.event.resize"; action: SIGNAL_EMIT "e,action,resize,in" "e"; diff --git a/data/themes/edc/tasks.edc b/data/themes/edc/tasks.edc index 1a31cfb0ac..044ad8a6d4 100644 --- a/data/themes/edc/tasks.edc +++ b/data/themes/edc/tasks.edc @@ -46,8 +46,8 @@ group { name:"e/modules/tasks/item"; part { name: "sel_base"; mouse_events: 0; clip_to: "sel_clip"; description { state: "default" 0.0; - rel1.offset: 4 4; - rel2.offset: -5 -5; + rel1.offset: 3 3; + rel2.offset: -4 -4; image.normal: "vgrad_med_dark.png"; fill.smooth: 0; TILED_HORIZ(120) @@ -178,14 +178,26 @@ group { name:"e/modules/tasks/item"; color: 255 255 255 64; } } + part { name: "bar"; mouse_events: 0; + clip_to: "sel_clip"; + description { state: "default" 0.0; + rel1.offset: -5 -10; + rel1.relative: 0.0 1.0; + rel1.to: "sel_base"; + rel2.offset: 4 4; + rel2.to: "sel_base"; + image.normal: "horizontal_separated_bar_glow.png"; + image.border: 7 7 7 7; + fill.smooth: 0; + fixed: 0 1; + } + } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; clip_to: "icon_clip"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: VERTICAL; align: 0.0 0.5; - rel1.offset: 4 4; rel1.to: "icon"; - rel2.offset: -5 -5; rel2.to: "icon"; color: 255 0 0 128; } @@ -206,20 +218,6 @@ group { name:"e/modules/tasks/item"; color: 0 0 0 0; } } - part { name: "bar"; mouse_events: 0; - clip_to: "sel_clip"; - description { state: "default" 0.0; - rel1.offset: -5 -10; - rel1.relative: 0.0 1.0; - rel1.to: "sel_base"; - rel2.offset: 4 4; - rel2.to: "sel_base"; - image.normal: "horizontal_separated_bar_glow.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - fixed: 0 1; - } - } part { name: "sel_shine"; mouse_events: 0; clip_to: "sel_clip"; description { state: "default" 0.0; diff --git a/data/tools/Makefile.in b/data/tools/Makefile.in index b53f925d46..e30246d899 100644 --- a/data/tools/Makefile.in +++ b/data/tools/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -101,12 +128,18 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(enlightenment_remotedir)" SCRIPTS = $(enlightenment_remote_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -114,6 +147,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -477,11 +511,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -621,17 +655,17 @@ uninstall-am: uninstall-enlightenment_remoteSCRIPTS .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-enlightenment_remoteSCRIPTS install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-enlightenment_remoteSCRIPTS \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-enlightenment_remoteSCRIPTS + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-enlightenment_remoteSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/xsession/Makefile.in b/data/xsession/Makefile.in index c32d488b99..6f9116c76f 100644 --- a/data/xsession/Makefile.in +++ b/data/xsession/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data/xsession -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/enlightenment.desktop.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ @@ -73,12 +100,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = enlightenment.desktop CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +148,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -466,11 +500,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -610,16 +644,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-filesDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-filesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-filesDATA \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/xsession/enlightenment.desktop.in b/data/xsession/enlightenment.desktop.in index b4a73bb874..2e1795e1a3 100644 --- a/data/xsession/enlightenment.desktop.in +++ b/data/xsession/enlightenment.desktop.in @@ -1,9 +1,24 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Application Name=Enlightenment +Name[Name]=Enlightenment +Name[ab]= Name[ca]=Enlightenment +Name[cs]= +Name[de]= Name[el]=Enlightenment Name[eo]=Enlightenment +Name[es]= +Name[fr]=Enlightenment +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Enlightenment +Name[sr]= Name[tr]=Enlightenment Comment=Log in using Enlightenment (Version @VERSION@) Comment[ca]=Iniciar sessió amb Enlightenment (Versió @VERSION@) @@ -12,12 +27,11 @@ Comment[eo]=Ensaluti pere de Enlightenment (Versio @VERSION@) Comment[es]=Iniciar sesión usando Enlightenment (Versión @VERSION@) Comment[fr]=Ouvrir une session Enlightenment (Version @VERSION@) Comment[gl]=Iniciar sesión usando Enlightenment (Versión @VERSION@) -Comment[ko]=Enlightenment 로그인(버전 @VERSION@) Comment[it]=Accedi con Enlightenment (Versione @VERSION@) +Comment[ko]=Enlightenment 로그인(버전 @VERSION@) Comment[pt]=Iniciar sessão no Enlightenment (Versão @VERSION@) Comment[ru]=Войти используя Enlightenment (Версия @VERSION@) Comment[tr]=Enlightenment kullanarak giriş yaın (Version @VERSION@) -Type=Application Icon=@prefix@/share/enlightenment/data/images/enlightenment.png -Exec=@prefix@/bin/enlightenment_start TryExec=@prefix@/bin/enlightenment_start +Exec=@prefix@/bin/enlightenment_start diff --git a/depcomp b/depcomp index 25a39e6cd5..4ebd5b3a2f 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ gcc) ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ sgi) # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ aix) # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ $ { G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ dashmstdout) # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff --git a/doc/Makefile.in b/doc/Makefile.in index e6e4617b88..d60421a087 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/e.dox.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/Doxyfile.in $(srcdir)/e.dox.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -73,12 +100,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = Doxyfile e.dox CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +148,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(filesdir)" DATA = $(files_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -476,11 +510,11 @@ uninstall-filesDATA: @list='$(files_DATA)'; test -n "$(filesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(filesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -621,16 +655,16 @@ uninstall-am: uninstall-filesDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-filesDATA \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-filesDATA + ps ps-am tags-am uninstall uninstall-am uninstall-filesDATA .PHONY: doc diff --git a/enlightenment.pc b/enlightenment.pc index a319b22709..a9b521df85 100644 --- a/enlightenment.pc +++ b/enlightenment.pc @@ -1,19 +1,19 @@ -prefix=/home/antognolli/efl/1.7/git-release/local +prefix=/home/edebarro/install_stable/usr exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=/home/edebarro/install_stable/usr/lib64 datadir=${prefix}/share includedir=${prefix}/include/enlightenment -modules=${exec_prefix}/lib/enlightenment/modules +modules=/home/edebarro/install_stable/usr/lib64/enlightenment/modules pkgdatadir=${prefix}/share/enlightenment/data themes=${pkgdatadir}/themes backgrounds=${pkgdatadir}/backgrounds -config_apps=/home/antognolli/efl/1.7/git-release/local/share/enlightenment/config-apps -release=0.17.3 +config_apps=/home/edebarro/install_stable/usr/share/enlightenment/config-apps +release=0.17.4 Name: enlightenment Description: Enlightenmnt Window Manager -Requires: evas >= 1.7.6 ecore >= 1.7.6 ecore-x >= 1.7.6 ecore-evas >= 1.7.6 ecore-con >= 1.7.6 ecore-ipc >= 1.7.6 ecore-file >= 1.7.6 eet >= 1.7.6 edje >= 1.7.6 efreet >= 1.7.6 efreet-mime >= 1.7.6 efreet-trash >= 1.7.6 eina >= 1.7.6 dbus-1 edbus >= 1.7.6 eio >= 1.7.6 ehal >= 1.7.6, edbus >= 1.7.6 eukit >= 1.7.6 eeze elementary > 1.6.9.0 emotion >= 1.7.6 -Version: 0.17.3 +Requires: evas >= 1.7.8 ecore >= 1.7.8 ecore-x >= 1.7.8 ecore-evas >= 1.7.8 ecore-con >= 1.7.8 ecore-ipc >= 1.7.8 ecore-file >= 1.7.8 eet >= 1.7.8 edje >= 1.7.8 efreet >= 1.7.8 efreet-mime >= 1.7.8 efreet-trash >= 1.7.8 eina >= 1.7.8 dbus-1 edbus >= 1.7.8 eio >= 1.7.8 ehal >= 1.7.8, edbus >= 1.7.8 eukit >= 1.7.8 eeze elementary >= 1.7.8 emotion >= 1.7.8 +Version: 0.17.4 Libs: -L${libdir} Libs.private: -lm Cflags: -I${includedir} -DUSE_E_CONFIG_H diff --git a/enlightenment.spec b/enlightenment.spec index 6955c3c2de..b23c76423b 100644 --- a/enlightenment.spec +++ b/enlightenment.spec @@ -2,7 +2,7 @@ Summary: The Enlightenment window manager Name: enlightenment -Version: 0.17.3 +Version: 0.17.4 Release: %{_rel} License: BSD Group: User Interface/Desktops @@ -13,9 +13,9 @@ Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} Prefix: %{_prefix} #BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel -BuildRequires: efl-devel >= 1.7.6, edje-devel, edje-bin +BuildRequires: efl-devel >= 1.7.8, edje-devel, edje-bin BuildRequires: eeze-devel -Requires: efl >= 1.7.6 +Requires: efl >= 1.7.8 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description diff --git a/install-sh b/install-sh index a9244eb078..377bb8687f 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/m4/gettext.m4 b/m4/gettext.m4 index c9ae1f7de8..f84e6a5d75 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 60 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006. +dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) @@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT], gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -329,36 +331,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + AC_SUBST([INTLOBJS]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 66bc76f48c..f46ff14215 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM6 (gettext-0.17) -dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. +# iconv.m4 serial 9 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK], am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include @@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_func_iconv=yes) + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -51,14 +51,14 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ - dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" @@ -87,6 +87,25 @@ int main () return 1; } } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } #if 0 /* This bug could be worked around by the caller. */ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ { @@ -134,7 +153,7 @@ int main () am_func_iconv=no am_cv_lib_iconv=no fi if test "$am_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, + AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then @@ -147,8 +166,8 @@ int main () LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) AC_DEFUN([AM_ICONV], @@ -156,7 +175,7 @@ AC_DEFUN([AM_ICONV], AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_CACHE_VAL([am_cv_proto_iconv], [ AC_TRY_COMPILE([ #include #include @@ -169,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") +], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi ]) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index d3f0d904d2..dd91025962 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 1 (gettext-0.17) -dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,7 +19,7 @@ AC_DEFUN([gt_INTL_MACOSX], [ dnl Check for API introduced in MacOS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, + [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_TRY_LINK([#include ], @@ -28,11 +28,11 @@ AC_DEFUN([gt_INTL_MACOSX], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], @@ -40,7 +40,7 @@ AC_DEFUN([gt_INTL_MACOSX], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 96c4e2c339..ebb30528bd 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ dnl with libtool.m4. dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do @@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD, # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -101,9 +101,9 @@ else fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then - AC_MSG_RESULT($LD) + AC_MSG_RESULT([$LD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index e3d26fc42d..c73bd8e3a4 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,12 +1,12 @@ -# lib-link.m4 serial 13 (gettext-0.17) -dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ(2.54) +AC_PREREQ([2.54]) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. @@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" @@ -39,16 +39,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS], dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the dnl results of this search when this library appears as a dependency. HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) + popdef([NAME]) + popdef([Name]) ]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) dnl searches for libname and the libraries corresponding to explicit and dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname @@ -57,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -73,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else @@ -95,8 +108,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) AC_SUBST([LIB]NAME[_PREFIX]) - undefine([Name]) - undefine([NAME]) + popdef([NAME]) + popdef([Name]) ]) dnl Determine the platform dependent parameters needed to use rpath: @@ -114,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH], AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh @@ -131,11 +144,32 @@ AC_DEFUN([AC_LIB_RPATH], acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. @@ -144,19 +178,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) dnl Autoconf >= 2.61 supports dots in --with options. - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], -[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -169,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -178,6 +220,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LTLIB[]NAME= INC[]NAME= LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -327,7 +372,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -415,7 +462,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIB[]NAME[]_PREFIX="$basedir" + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -476,9 +532,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -609,6 +667,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -654,7 +717,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -663,7 +727,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index a8684e17e3..1601ceaefd 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff --git a/m4/nls.m4 b/m4/nls.m4 index 7967cc2f9a..003704c4b9 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff --git a/m4/po.m4 b/m4/po.m4 index 0734762ab1..47f36a41a0 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 15 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], @@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl diff --git a/m4/progtest.m4 b/m4/progtest.m4 index a56365cd37..2d804ac99d 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper , 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -55,7 +55,7 @@ rm -f conf$$.file # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff --git a/missing b/missing index 86a8fc31e3..cdea514931 100755 --- a/missing +++ b/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/po/LINGUAS b/po/LINGUAS index 992c7cae83..a533e97843 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -32,6 +32,7 @@ ro ru sk sl +sr sv tr uk diff --git a/po/Makefile.in.in b/po/Makefile.in.in index fecf500f3f..83d8838ac0 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,8 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.17 -GETTEXT_MACRO_VERSION = 0.17 +# Origin: gettext-0.18 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -88,8 +88,8 @@ CATALOGS = @CATALOGS@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ @@ -193,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -217,7 +224,6 @@ install-data: install-data-@USE_NLS@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -269,7 +275,6 @@ installdirs-data: installdirs-data-@USE_NLS@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -395,9 +400,15 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -418,9 +429,13 @@ $(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff --git a/po/POTFILES.in b/po/POTFILES.in index 815cb3ff4b..f3464e811d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -98,6 +98,7 @@ src/bin/e_theme.c src/bin/e_thumb.c src/bin/e_thumb_main.c src/bin/e_toolbar.c +src/bin/e_update.c src/bin/e_user.c src/bin/e_utils.c src/bin/e_widget_aspect.c diff --git a/po/Rules-quot b/po/Rules-quot index 9c2a995e30..af5248792a 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-update-en ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ diff --git a/po/ar.gmo b/po/ar.gmo index fec8593b2b..1c0ea8ed72 100644 Binary files a/po/ar.gmo and b/po/ar.gmo differ diff --git a/po/ar.po b/po/ar.po index cf79f5f91c..7d61e61f6b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment HEAD\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-22 00:04+0300\n" "Last-Translator: سمير حسين \n" "Language-Team: Arabic \n" @@ -816,7 +816,7 @@ msgstr "حدد" msgid "Cancel" msgstr "ألغ" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -833,7 +833,7 @@ msgstr "" "هذه اﻹعدادات الجديدة ستصلح
ذلك عبر إضافتها فيها. يمكنك اﻵن إعادة إعداد " "اﻷشياء حسب
رغبتك. نأسف ﻹزعاجك..
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -846,11 +846,11 @@ msgstr "" "جديدة من إنلايتنمينت تعمل عليه. هذا سيء
و كإجراء إحترازي فإن إعداداتك " "ستعاد إلى
اﻹفتراضيات. نأسف ﻹزعاجك.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "خلل في كتابة أعدادات إنلايتنمينت" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -860,14 +860,15 @@ msgstr "" "حصل إنلايتنمينت على خطأ أثناء نقل ملفات اﻹعداد
من :
%s

إلى :
" "%s

بقية الكتابة أُلغيت ﻷجل سلامة الملفات
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -878,19 +879,19 @@ msgstr "" msgid "OK" msgstr "موافق" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "تم ترقية اﻹعدادات" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "تعامل ملف EET سيء." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "بيانات الملف فارغة" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -898,15 +899,15 @@ msgstr "" "الملف غير قابل للكتابة عليه. ربما لكون القرص مخصصا للقراءة فقط
أو فقدت " "الأذونات إلى ملفاتك." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "نفِدت الذاكرة أثناء اﻹعداد للكتابة.
رجاءا حرر مساحة من الذاكرة." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "هذا خطأ عام" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -914,59 +915,59 @@ msgstr "" "ملف إعدادات الضبط كبير جدا.
بينما يجب أن يكون صغيرا (بعض مئات من " "الكيلوبايتات)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "لديك أخطاء I/O على القرص.
ربما تحتاج لتبديله؟" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "نفِدَت المساحة الشاغرة لديك أثناء كتابة الملف" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "أُغلِق الملف على ذلك أثناء الكتابة" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "فشِل تكوين خريطة - mmap - ذاكرة الملف " -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "فشِل الترميز X509" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "فشل التوقيع." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "التوقيع غير صالح" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "لم تُوقّع" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "ميزة لم تنفّذ" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "لم يُصَنَّف مولد الأعداد العشوائية المزيفة " -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "فشل التشفير." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "فشل فك التشفير." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "الخطأ مجهول لدى إنلايتنمينت" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3864,6 +3865,27 @@ msgstr "إبدء تحريك\\تحجيم العناصر" msgid "Set Toolbar Contents" msgstr "تعيين محتويات شريط اﻷدوات" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "التحديثات" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6402,11 +6424,21 @@ msgstr "اﻷداء" msgid "Power Management" msgstr "إدارة الطاقة" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "ضبط الشاشة" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "مخرج" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "اقفل عند اﻹقلاع" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -8269,9 +8301,9 @@ msgstr "" "<CTRL+'X'> للقفز لملحق يبدأ بالحرف 'x'
" "<CTRL+يمين/يسار > للتجول بين الملحقات
" "<CTRL+أعلى/أسفل> للانتقال إلى أول/آخر عنصر
" -"<CTRL+1> لتبديل أوضاع العرض (أخرج من هذه الصفحة ;)" -"
<CTRL+2> لتبديل أوضاع عرض القائمة
" -"<CTRL+3> لتبديل أوضاع عرض المصغرات" +"<CTRL+1> لتبديل أوضاع العرض (أخرج من هذه " +"الصفحة ;)
<CTRL+2> لتبديل أوضاع عرض القائمة " +"
<CTRL+3> لتبديل أوضاع عرض المصغرات" #: src/modules/everything/evry_view_tabs.c:93 msgid "Back" diff --git a/po/bg.gmo b/po/bg.gmo index 2ec55fe174..7c8a89f8be 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index bad4d686e8..c0e98a9027 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-11-06 10:39+0000\n" "Last-Translator: Viktor Kojouharov \n" "Language-Team: English \n" -"Language: en\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -882,7 +882,7 @@ msgstr "Настройки" msgid "Cancel" msgstr "Отказ" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -893,7 +893,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -902,11 +902,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -914,14 +914,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -932,22 +933,22 @@ msgstr "" msgid "OK" msgstr "Добре" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 #, fuzzy msgid "Settings Upgraded" msgstr "Настройки Обновен" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET файлов манипулатор е лошо." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Файла с данни е празна." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -956,19 +957,19 @@ msgstr "" "Файлът не може да се записва. Може би най- диск е само за четене
или сте " "загубили разрешения за вашите файлове." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Памет избяга по време на подготовката на обезценката.
Моля, свободна " "памет нагоре." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Това е едно родово грешка." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -977,70 +978,70 @@ msgstr "" "Файлът с настройките е твърде голям.
Тя трябва да бъде много малка " "(няколко стотин KB най-много)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Ще ви се притече на пространството , докато писането на файл" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Файлът е върху него , докато пишете." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Памет -картографиране (mmap) на файла се провали." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "Неуспешно x509 Encoding." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Подпис не успя." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Подписът е невалиден." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Няма прозорци)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Характеристиката не се изпълнява." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG не е семена." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Неуспешно шифроване." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Описание: не е зададено" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4139,6 +4140,27 @@ msgstr "Започване на редактиране на всичко" msgid "Set Toolbar Contents" msgstr "Задайте лентата с инструменти за пазаруване" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Фаза" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6832,12 +6854,22 @@ msgstr "Бързодействието" msgid "Power Management" msgstr "Енергийни настройки" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Предпазител на екрана" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "продукция" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Ключалка на Startup" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ca.gmo b/po/ca.gmo index 7c571cb4a6..367a024570 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 20b3c48d0e..3bb1829497 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,15 +3,16 @@ # Marc Furtià i Puig , 2007-2013. # Pau Bosch i Crespo , 2007 # Joan Coll , 2013. +# Oriol Pellicer i Sabrià , 2013. # msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" -"PO-Revision-Date: 2013-04-06 10:46+0100\n" -"Last-Translator: JoanColl \n" -"Language-Team: Catalan\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" +"PO-Revision-Date: 2013-06-08 11:55+0200\n" +"Last-Translator: Oriol Pellicer i Sabrià \n" +"Language-Team: Català \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,13 +66,13 @@ msgid "" "window
which has not yet been saved will be lost!

Are you sure you " "want to kill this window?" msgstr "" -"Vol matar el procés %s.

Si us plau, recordi que tota la informació " -"d'aquesta finestra,
que no hagi estat desada es perdrà!!!

Esteu " -"segur que voleu matar aquesta finestra?" +"Voleu matar el procés %s.

Si us plau, recordeu que tota la informació " +"d'aquesta finestra,
que no hagi estat desada es perdrà!

Segur que " +"voleu matar aquesta finestra?" #: src/bin/e_actions.c:372 msgid "Are you sure you want to kill this window?" -msgstr "Esteu segur que voleu matar aquesta finestra ?" +msgstr "Segur que voleu matar aquesta finestra ?" #: src/bin/e_actions.c:375 src/bin/e_actions.c:2997 #: src/bin/e_int_border_menu.c:749 @@ -93,7 +94,7 @@ msgstr "Surt" #: src/bin/e_actions.c:2124 msgid "Are you sure you want to exit Enlightenment?" -msgstr "Esteu segur que voleu sortir?" +msgstr "Segur que voleu sortir?" #: src/bin/e_actions.c:2126 src/bin/e_actions.c:2220 src/bin/e_actions.c:2280 #: src/bin/e_actions.c:2340 src/bin/e_actions.c:2405 src/bin/e_actions.c:2470 @@ -109,7 +110,7 @@ msgstr "Tanca sessió" #: src/bin/e_actions.c:2218 msgid "Are you sure you want to logout?" -msgstr "Esteu segur que voleu tancar sessió?" +msgstr "Segur que voleu tancar la sessió?" #: src/bin/e_actions.c:2276 src/bin/e_sys.c:749 msgid "Power off" @@ -117,7 +118,7 @@ msgstr "Apaga" #: src/bin/e_actions.c:2278 msgid "Are you sure you want to power off your computer?" -msgstr "Esteu segur que voleu aturar l'ordinador?" +msgstr "Segur que voleu aturar l'ordinador?" #: src/bin/e_actions.c:2337 src/bin/e_actions.c:3414 msgid "Reboot" @@ -125,7 +126,7 @@ msgstr "Reinicia" #: src/bin/e_actions.c:2338 msgid "Are you sure you want to reboot your computer?" -msgstr "Esteu segur que voleu reiniciar l'ordinador?" +msgstr "Segur que voleu reiniciar l'ordinador?" #: src/bin/e_actions.c:2402 src/bin/e_actions.c:3422 msgid "Suspend" @@ -133,16 +134,16 @@ msgstr "Atura temporalment" #: src/bin/e_actions.c:2403 msgid "Are you sure you want to suspend your computer?" -msgstr "Esteu segur que voleu aturar temporalment l'ordinador?" +msgstr "Segur que voleu aturar temporalment l'ordinador?" #: src/bin/e_actions.c:2467 src/bin/e_actions.c:3426 #: src/modules/conf_keybindings/e_int_config_acpibindings.c:379 msgid "Hibernate" -msgstr "Hiverna" +msgstr "Hiberna" #: src/bin/e_actions.c:2468 msgid "Are you sure you want to hibernate your computer?" -msgstr "Esteu segur que voleu hivernar l'ordinador?" +msgstr "Segur que voleu hibernar l'ordinador?" #: src/bin/e_actions.c:2952 src/bin/e_actions.c:2963 src/bin/e_actions.c:2982 #: src/bin/e_actions.c:2987 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997 @@ -175,11 +176,11 @@ msgstr "Menú de finestra" #: src/bin/e_actions.c:2982 src/bin/e_int_border_menu.c:1052 #: src/modules/winlist/e_int_config_winlist.c:216 msgid "Raise" -msgstr "Puja" +msgstr "Eleva" #: src/bin/e_actions.c:2987 src/bin/e_int_border_menu.c:1060 msgid "Lower" -msgstr "Baixa" +msgstr "Abaixa" #: src/bin/e_actions.c:3002 src/bin/e_actions.c:3006 src/bin/e_actions.c:3011 #: src/bin/e_actions.c:3015 src/bin/e_actions.c:3020 src/bin/e_actions.c:3024 @@ -549,7 +550,7 @@ msgstr "Envia el ratolí a la pantalla anterior" #: src/bin/e_actions.c:3254 msgid "Send Mouse Forward/Back Screens..." -msgstr "Envia el ratolí endavant/enrera pantalles..." +msgstr "Envia el ratolí endavant/enrere pantalles..." #: src/bin/e_actions.c:3259 msgid "Dim" @@ -581,11 +582,11 @@ msgstr "Ajusta llum de fons" #: src/bin/e_actions.c:3276 msgid "Backlight Up" -msgstr "Puja llum de fons" +msgstr "Apuja llum de fons" #: src/bin/e_actions.c:3278 msgid "Backlight Down" -msgstr "Baixa llum de fons" +msgstr "Abaixa llum de fons" #: src/bin/e_actions.c:3283 msgid "Move To Center" @@ -626,7 +627,7 @@ msgstr "A l'escriptori previ" #: src/bin/e_actions.c:3319 msgid "By Desktop #..." -msgstr "Per escriptori #..." +msgstr "Per número d'escriptori..." #: src/bin/e_actions.c:3325 msgid "To Desktop..." @@ -742,7 +743,7 @@ msgstr "Tanca sessió" #: src/bin/e_actions.c:3406 msgid "Power Off Now" -msgstr "Apaga ara" +msgstr "Apaga immediatament" #: src/bin/e_actions.c:3410 msgid "Power Off" @@ -754,7 +755,7 @@ msgstr "Atura temporalment ara" #: src/bin/e_actions.c:3430 msgid "Hibernate Now" -msgstr "Hiverna ara" +msgstr "Hiberna ara" #: src/bin/e_actions.c:3438 msgid "Lock" @@ -790,7 +791,7 @@ msgstr "Disposició de teclat anterior" #: src/bin/e_bg.c:22 msgid "Set As Background" -msgstr "Posa com a fons de pantalla" +msgstr "Estableix com a fons de pantalla" #: src/bin/e_color_dialog.c:26 msgid "Color Selector" @@ -817,7 +818,7 @@ msgstr "Selecciona" msgid "Cancel" msgstr "Cancel·la " -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -827,15 +828,15 @@ msgid "" "adding it in. You can re-configure things now to your
liking. Sorry for " "the hiccup in your settings.
" msgstr "" -"La configuració necessitava ser actualitzada. La vella configuració
ha " -"estat eliminada i s'ha establert una nova configuració per defecte. Això
" -"sol passar durant el desenvolupament, per tant no cal informar
error. " -"Això simplement significa que Enlightenment necessita una nova " -"configuració
que la vella configuració no tenia.Aquesta nova " -"configuració per defecte
resoldrà això. Ara podrà reconfigurar les coses " -"com
vostè desitgi.Disculpi les molèsties." - -#: src/bin/e_config.c:1062 +"Calia actualitzar la configuració. La configuració anterior
ha estat " +"eliminada i s'ha establert una nova configuració per defecte. Això
sol " +"passar durant el desenvolupament, per tant no cal informar
de l'error. " +"Simplement significa que Enlightenment necessitava noves dades de " +"configuració
que la configuració anterior no tenia. Aquestes noves dades " +"ho resoldran.
Ara podreu reconfigurar les coses com
desitgeu. " +"Disculpeu les molèsties.
" + +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -843,18 +844,18 @@ msgid "" "This is bad and
as a precaution your settings have been now restored " "to
defaults. Sorry for the inconvenience.
" msgstr "" -"La seva configuració és més NOVA que Enlightenment. Això és
molt " -"extrany. Això no hauria d'haver passat a no ser que tingués
una versió " -"desactualitzada d'Enlightenment o hagués copiat la configuració d'algun " -"lloc
on hi ha una versió d'Enlightenment més nova funcionant. Això pot " -"causar problemes i
com a precaució la seva configuració ha estat " -"restaurada
per defecte. Disculpi les molèsties.
" - -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +"La vostra configuració és més NOVA que Enlightenment. Això és
molt " +"extrany. Això no hauria d'haver passat a no ser que tinguéssiu
una " +"versió desactualitzada d'Enlightenment o haguéssiu copiat la configuració " +"d'algun lloc
on hi ha una versió d'Enlightenment més nova funcionant. " +"Això pot causar problemes i
com a precaució la vostra configuració ha " +"estat restaurada
per defecte. Disculpeu les molèsties.
" + +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" -msgstr "Problemes a l'escriure les preferències d'Enlightenment" +msgstr "Problemes en escriure les preferències d'Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -863,16 +864,17 @@ msgid "" msgstr "" "Enlightenment ha tingut un error mentre movia fitxers de configuració
" "de :
%s

a:
%s

La resta d'escriptura ha estat " -"cancel·lada per més seguretat.
" +"cancel·lada per seguretat.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -883,19 +885,19 @@ msgstr "" msgid "OK" msgstr "Accepta" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Configuració actualitzada" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "L'identificador d'arxiu EET és dolent." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "L'arxiu de dades és buit." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -903,77 +905,77 @@ msgstr "" "El fitxer no es pot escriure. Podria ser que el disc sigui de només " "lectura
o que hagi perdut els permisos dels seus fitxers" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "S'ha quedat sense memòria mentre es preparava l'escriptura.
Si us plau, " -"alliberi memòria." +"allibereu memòria." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Això és un error genèric." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -"L'arxiu de configuració és massa gran.
Hauria de ser molt petit (uns pocs " +"L'arxiu de configuració és massa gran.
Hauria de ser molt petit (uns " "centenars de KB com a màxim)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" -msgstr "Té errors d'entrada/sortida al disc.
Potser l'haurà de canviar" +msgstr "Teniu errors d'entrada/sortida al disc.
Potser l'haureu de canviar" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." -msgstr "S'ha quedat sense espai per escriure el fitxer" +msgstr "Us heu quedat sense espai per escriure el fitxer" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "El fitxer s'ha tancat mentre s'escrivia." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." -msgstr "L'assignació de memòria (mmap) de l'arxiu ha fallat." +msgstr "Ha fallat l'assignació de memòria (mmap) de l'arxiu." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." -msgstr "Codificació X509 fallida." +msgstr "Ha fallat la codificació X509." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." -msgstr "Signatura fallida." +msgstr "Ha fallat la signatura." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Signatura no vàlida." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." -msgstr "No signat" +msgstr "No signat." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Funció no implementada." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Impossible generar nombre pseudo-aleatori." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." -msgstr "Encriptació fallida." +msgstr "Ha fallat el xifrat." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." -msgstr "Desencriptació fallida." +msgstr "Ha fallat el desxifrat." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." -msgstr "Aquest error és desconegut per Enlightenment" +msgstr "Aquest error és desconegut per a l'Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -982,7 +984,7 @@ msgid "" msgstr "" "Enlightenment ha tingut un error mentre escrivia
el seu fitxer de " "configuració.
%s

El fitxer on ha succeït l'error és:
" -"%s

Aquest fitxer ha estat eliminat per prevenir corrupció de dades." +"%s

Aquest fitxer ha estat eliminat per a prevenir corrupció de dades." "
" #: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817 @@ -1029,14 +1031,14 @@ msgstr "Contenidor %d" #: src/bin/e_desklock.c:236 msgid "Error - no PAM support" -msgstr "Error- no hi ha suport per PAM" +msgstr "Error- no hi ha suport PAM" #: src/bin/e_desklock.c:237 msgid "" "No PAM support was built into Enlightenment, so
desk locking is disabled." msgstr "" -"No hi ha suport per PAM en l'Enlightenment,
per tant el bloqueig de " -"pantalla està  deshabilitat." +"No hi ha suport PAM en l'Enlightenment,
per tant el bloqueig de " +"pantalla està deshabilitat." #: src/bin/e_desklock.c:301 msgid "Lock Failed" @@ -1047,24 +1049,24 @@ msgid "" "Locking the desktop failed because some application
has grabbed either " "the keyboard or the mouse or both
and their grab is unable to be broken." msgstr "" -"El bloqueig d'escriptori ha fallat perquè alguna aplicació
ha capturatel " -"teclat o el ratolí o ambdós i no es pot fer el bloqueig" +"El bloqueig d'escriptori ha fallat perquè alguna aplicació
ha capturat " +"el teclat o el ratolí (o ambdós) i no es pot fer el bloqueig." #: src/bin/e_desklock.c:541 msgid "Please enter your unlock password" -msgstr "Introdueixi la contrasenya per desbloquejar" +msgstr "Introduïu la contrasenya per a desbloquejar" #: src/bin/e_desklock.c:926 msgid "Authenticating..." -msgstr "Autentificant... " +msgstr "Autenticant... " #: src/bin/e_desklock.c:931 msgid "The password you entered is invalid. Try again." -msgstr "La contrasenya que ha entrat no és correcta. Provi-ho un altre cop." +msgstr "La contrasenya que heu entrat no és correcta. Proveu-ho un altre cop." #: src/bin/e_desklock.c:968 msgid "Authentication System Error" -msgstr "Error del sistema d'autentificació" +msgstr "Error del sistema d'autenticació" #: src/bin/e_desklock.c:969 #, c-format @@ -1073,9 +1075,9 @@ msgid "" "The error code was %i.
This is bad and should not be " "happening. Please report this bug." msgstr "" -"L'autentificació via PAM ha tingut errors per autentificar la sessió.
" +"L'autenticació via PAM ha tingut errors per autenticar la sessió.
" "L'error que ha succeït és %i.
Això és dolent i no " -"hauria d'estar passant. Si us plau, avisi d'aquest error." +"hauria d'estar passant. Si us plau, aviseu d'aquest error." #: src/bin/e_desklock.c:1302 src/bin/e_screensaver.c:180 msgid "Activate Presentation Mode?" @@ -1087,8 +1089,8 @@ msgid "" "presentation mode and temporarily disable screen saver, lock and " "power saving?" msgstr "" -"Ha desbloquejat el seu escriptori massa ràpid.

Voleu tornar a activar " -"el mode presentació i desactivar temporalment l'estalvi de pantalla, " +"Heu desbloquejat l'escriptori massa ràpid.

Voleu tornar a activar el " +"mode presentació i desactivar temporalment l'estalvi de pantalla, " "bloqueig i estalvi d'energia?" #: src/bin/e_desklock.c:1315 src/bin/e_screensaver.c:193 @@ -1110,9 +1112,9 @@ msgid "" "instead. This will only
work if the window title is the same at
the " "time the window starts up, and does not
change." msgstr "" -"La finestra per la que s'està  creant una icona no conté
les " +"La finestra per a la que s'està creant una icona no conté
les " "propietats de nom de la finestra ni de classe.
Sense aquestes " -"propietats, haurà d'utilitzar en el seu lloc el títol
de la finestra." +"propietats, haureu d'utilitzar en el seu lloc el títol
de la finestra. " "Això només funcionarà si el títol de la finestra
és el mateix que quan " "la finestra ha arrancat i aquest no
canvia." @@ -1197,11 +1199,11 @@ msgstr "Opcions" #: src/bin/e_eap_editor.c:822 #, c-format msgid "Select an Icon for '%s'" -msgstr "Seleccioni una icona per '%s'" +msgstr "Seleccioneu una icona per '%s'" #: src/bin/e_eap_editor.c:888 msgid "Select an Executable" -msgstr "Seleccioni un executable " +msgstr "Seleccioneu un executable " #: src/bin/e_entry.c:480 src/bin/e_fm.c:9121 src/bin/e_fm.c:10789 #: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475 @@ -1228,7 +1230,7 @@ msgstr "Talla" #: src/bin/e_entry.c:499 src/bin/e_fm.c:9046 src/bin/e_fm.c:11550 msgid "Copy" -msgstr "Còpia " +msgstr "Copia" #: src/bin/e_entry.c:509 src/bin/e_fm.c:8837 src/bin/e_fm.c:9059 msgid "Paste" @@ -1275,7 +1277,7 @@ msgid "" "application failed to start." msgstr "" "Enlightenment no ha pogut executar l'aplicació.

%s

" -"L'aplicació ha fallat a l'iniciar." +"L'aplicació ha fallat en iniciar." #: src/bin/e_exec.c:713 msgid "Application Execution Error" @@ -1334,18 +1336,18 @@ msgstr "%s ha estat interromput per un senyal de fi." #: src/bin/e_exec.c:771 #, c-format msgid "%s was interrupted by a Bus Error." -msgstr "%s ha estat interromput per un error de Bus." +msgstr "%s ha estat interromput per un error de bus." #: src/bin/e_exec.c:774 #, c-format msgid "%s was interrupted by the signal number %i." -msgstr "%s ha estat interromput pel senyal numero %i" +msgstr "%s ha estat interromput pel senyal número %i" #: src/bin/e_exec.c:830 msgid "" "***The remaining output has been truncated. Save the output to view.***\n" msgstr "" -"***El missatge de sortida ha estat truncat. Guardi'l per veure'l complert." +"***El missatge de sortida ha estat truncat. Guardeu-lo per a veure'l complet." "***\n" #: src/bin/e_exec.c:889 src/bin/e_exec.c:967 src/bin/e_exec.c:974 @@ -1384,7 +1386,7 @@ msgstr "No hi ha sortida" #: src/bin/e_fm.c:1060 msgid "Nonexistent path" -msgstr "ruta inexistent" +msgstr "Ruta inexistent" #: src/bin/e_fm.c:1063 #, c-format @@ -1416,7 +1418,7 @@ msgstr "No es pot desmuntar el dispositiu" #: src/bin/e_fm.c:3082 msgid "Eject Error" -msgstr "Error a l'expulsar" +msgstr "Error en expulsar" #: src/bin/e_fm.c:3082 msgid "Can't eject device" @@ -1429,7 +1431,7 @@ msgstr "No es pot expulsar el dispositiu" #: src/bin/e_fm.c:10311 src/bin/e_fm.c:10314 src/bin/e_fm.c:10372 #: src/bin/e_fm.c:10597 src/bin/e_fm_prop.c:254 src/bin/e_shelf.c:2343 msgid "Error" -msgstr "Error " +msgstr "Error" #: src/bin/e_fm.c:6593 src/bin/e_fm.c:6626 #, c-format @@ -1454,11 +1456,11 @@ msgstr "Ordena per mida" #: src/bin/e_fm.c:8721 src/modules/fileman/e_mod_config.c:378 msgid "Directories First" -msgstr "Directoris davant" +msgstr "Directoris al principi" #: src/bin/e_fm.c:8727 src/modules/fileman/e_mod_config.c:382 msgid "Directories Last" -msgstr "Directoris darrera" +msgstr "Directoris al final" #: src/bin/e_fm.c:8760 src/bin/e_fm.c:8920 #: src/modules/fileman/e_mod_config.c:306 @@ -1676,7 +1678,7 @@ msgstr "Avís" #: src/bin/e_fm.c:10434 #, c-format msgid "File already exists, overwrite?
%s" -msgstr "Fitxer ja existeix, vol sobrescriure'l?
%s?" +msgstr "Fitxer ja existeix, voleu sobreescriure'l?
%s?" #: src/bin/e_fm.c:10592 msgid "Move Source" @@ -1684,11 +1686,11 @@ msgstr "Mou origen" #: src/bin/e_fm.c:10593 msgid "Ignore this" -msgstr "Ignora això" +msgstr "Ignora-ho" #: src/bin/e_fm.c:10594 msgid "Ignore all" -msgstr "Ignora tot" +msgstr "Ignora-ho tot" #: src/bin/e_fm.c:10599 #, c-format @@ -1741,7 +1743,7 @@ msgstr "%s—%s" #: src/bin/e_fm_device.c:79 #, c-format msgid "Flash Card—%s" -msgstr "Memòria flash—%s" +msgstr "Memòria flaix—%s" #: src/bin/e_fm_device.c:81 #, c-format @@ -1784,15 +1786,15 @@ msgstr "Darrer accés:" #: src/bin/e_fm_prop.c:425 msgid "Last Modified:" -msgstr "Darrera modificació" +msgstr "Darrera modificació:" #: src/bin/e_fm_prop.c:432 msgid "Last Modified Permissions:" -msgstr "Darrera modificació permisos" +msgstr "Darrera modificació permisos:" #: src/bin/e_fm_prop.c:439 msgid "File Type:" -msgstr "Tipus de fitxer" +msgstr "Tipus de fitxer:" #: src/bin/e_fm_prop.c:446 msgid "Permissions" @@ -1846,11 +1848,11 @@ msgstr "Utilitza aquest icona pels fitxers d'aquest tipus" #: src/bin/e_fm_prop.c:551 msgid "Link Information" -msgstr "Informació d'enllaç " +msgstr "Informació de l'enllaç" #: src/bin/e_fm_prop.c:558 msgid "This link is broken." -msgstr "L'enllaç està trencat" +msgstr "L'enllaç està trencat." #: src/bin/e_fm_prop.c:613 msgid "Select an Image" @@ -1858,7 +1860,7 @@ msgstr "Seleccioneu una imatge" #: src/bin/e_gadcon.c:1402 msgid "Gadget error" -msgstr "Error giny" +msgstr "Error de giny" #: src/bin/e_gadcon.c:1402 #, c-format @@ -1915,7 +1917,7 @@ msgstr "El mòdul %s necessita %s" msgid "" "Please press key sequence,

or Escape to abort." msgstr "" -"Premi una combinació de tecles,

o Escape per " +"Premeu una combinació de tecles,

o ESC per a " "sortir." #: src/bin/e_grab_dialog.c:5 @@ -1925,25 +1927,25 @@ msgid "" "or roll a wheel, to assign mouse binding.
Press Escape to abort." msgstr "" -"Seleccioni el modificador que vulgui
i premi qualsevol botó del seu " -"ratolí.
o faci rodar la roda, per assignar dreçera de ratolí." -"
PremiEsc per interrompre." +"Seleccioneu el modificador que vulgueu
i premeu qualsevol botó del " +"ratolí
o feu rodar la roda per a assignar la drecera de ratolí." +"
PremeuESC per a interrompre." #: src/bin/e_grab_dialog.c:128 msgid "Mouse Binding Sequence" -msgstr "Paràmetres dreçera del ratolí" +msgstr "Paràmetres drecera del ratolí" #: src/bin/e_grab_dialog.c:135 msgid "Key Binding Sequence" -msgstr "Combinació de tecles per dreçera de teclat" +msgstr "Combinació de tecles per a drecera de teclat" #: src/bin/e_hints.c:152 msgid "" "A previous instance of Enlightenment is still active\n" "on this screen. Aborting startup.\n" msgstr "" -"Una instància prèvia d'Enlightenment encara és activa
en aquesta " -"pantalla. Aturant l'inicialització.\n" +"Una instància prèvia d'Enlightenment encara és activa\n" +"en aquesta pantalla. Aturant l'arrancada.\n" #: src/bin/e_import_dialog.c:74 src/bin/e_import_dialog.c:84 #: src/bin/e_import_config_dialog.c:352 src/bin/e_import_config_dialog.c:362 @@ -1953,19 +1955,20 @@ msgstr "Error d'importació" #: src/bin/e_import_dialog.c:75 src/bin/e_import_config_dialog.c:353 msgid "Enlightenment was unable to import the image
due to a copy error." msgstr "" -"Enlightenment no ha pogut importar la imatge
degut a un error en la còpia." +"Enlightenment no ha pogut importar la imatge
a causa d'un error en la " +"còpia." #: src/bin/e_import_dialog.c:85 src/bin/e_import_config_dialog.c:363 msgid "" "Enlightenment was unable to import the image.

Are you sure this is a " "valid image?" msgstr "" -"Enlightenment no ha pogut importar la imatge.

Està segur que és una " +"Enlightenment no ha pogut importar la imatge.

Esteu segur que és una " "imatge vàlida?" #: src/bin/e_import_dialog.c:163 msgid "Select a Picture..." -msgstr "Seleccioni una imatge..." +msgstr "Seleccioneu una imatge..." #: src/bin/e_import_dialog.c:195 msgid "Use" @@ -1979,7 +1982,7 @@ msgstr "Error d'importació d'imatge" msgid "" "Enlightenment was unable to import the picture
due to conversion errors." msgstr "" -"L'Enlightenment no pot importar la imatge
degut a errors de conversió." +"L'Enlightenment no pot importar la imatge
a causa d'errors de conversió." #: src/bin/e_import_config_dialog.c:459 msgid "Import Settings..." @@ -2229,7 +2232,7 @@ msgstr "Normal" #: src/bin/e_int_border_menu.c:1034 msgid "Always Below" -msgstr "Sempre sota" +msgstr "Sempre per sota" #: src/bin/e_int_border_menu.c:1078 msgid "Pin to Desktop" @@ -2300,7 +2303,7 @@ msgstr "%1.3f–%1.3f" #: src/bin/e_int_border_prop.c:153 src/bin/e_int_border_prop.c:175 #, c-format msgid "Withdrawn" -msgstr "Retirat" +msgstr "Retira" #: src/bin/e_int_border_prop.c:161 src/bin/e_int_border_prop.c:183 #, c-format @@ -2373,11 +2376,11 @@ msgstr "Cap" #: src/bin/e_int_border_prop.c:302 msgid "Above" -msgstr "Damunt" +msgstr "Per damunt" #: src/bin/e_int_border_prop.c:306 msgid "Below" -msgstr "Sota" +msgstr "Per sota" #: src/bin/e_int_border_prop.c:385 msgid "ICCCM Properties" @@ -2557,14 +2560,14 @@ msgid "" "settings will be accepted. Press Cancel if you
are not " "sure and nothing will be affected." msgstr "" -"Li està demanant a Enlightenment que recordi aplicar a una finestra " -"
que no té propietats úniques, recordar propietats
" -"(com mida, lloc, estil de vora, etc.) que afectaran a la resta de " +"Li esteu demanant a Enlightenment que recordi aplicar, a una finestra " +"
que no té propietats úniques, propietats
(com " +"mida, lloc, estil de vora, etc.) que afectaran a la resta de " "finestres
Això significa que comparteix Nom/Classe, Rol... amb més d'una " -"finestra a la pantalla
És només un avís, per si no vol que sigui així. Si " -"està d'acord,
premi Aplica o OK." -"Premi Cancelar
si no està segur i no s'aplicarán els " -"canvis." +"finestra a la pantalla
És només un avís, per si no voleu que sigui així. " +"Si hi esteu d'acord,
premeu Aplica o OK. Premeu Cancel·lar
si no n'esteu segurs i no " +"s'aplicaran els canvis." #: src/bin/e_int_border_remember.c:498 msgid "No match properties set" @@ -2577,9 +2580,9 @@ msgid "" "specifying how to remember it.

You must specify at least 1 " "way of remembering this window." msgstr "" -"Li està demanant a Enlightenment que recordi d'aplicar
propietats (com " +"Li esteu demanant a Enlightenment que recordi d'aplicar
propietats (com " "mida, localització, estil de vora etc.) a la finestra
sense " -"especificar com recordar-ho.

Ha d'especificar com a mínim " +"especificar com recordar-ho.

Cal especificar com a mínim " "una forma de recordar aquesta finestra." #: src/bin/e_int_border_remember.c:601 @@ -2680,7 +2683,7 @@ msgstr "Fitxers" #: src/bin/e_int_config_modules.c:55 src/modules/everything/e_mod_main.c:58 #: src/modules/quickaccess/e_mod_main.c:35 msgid "Launcher" -msgstr "Executa " +msgstr "Executa" #: src/bin/e_int_config_modules.c:56 #: src/modules/conf_applications/e_int_config_defapps.c:330 @@ -2754,9 +2757,9 @@ msgid "" "input
method configuration is correct and
that your " "configuration's
executable is in your PATH
" msgstr "" -"Error iniciant l'executable el mètode d'entrada

si us plau, " -"asseguri's que la configuració
del seu mètode d'entrada és correcte i " -"
de que l'executable
de la configuració es trobi en el seu CAMÍ
" +"Error iniciant l'executable del mètode d'entrada

si us plau, " +"assegureu-vos que la configuració
del mètode d'entrada és correcte i " +"
que l'executable
de la configuració està en el PATH
" #: src/bin/e_int_menus.c:134 src/modules/syscon/e_int_config_syscon.c:146 msgid "Main" @@ -2794,7 +2797,7 @@ msgstr "Finestres perdudes" #: src/bin/e_int_menus.c:228 msgid "About" -msgstr "Quant a..." +msgstr "Quant a" #: src/bin/e_int_menus.c:233 src/bin/e_theme_about.c:21 msgid "About Theme" @@ -2839,11 +2842,11 @@ msgstr "Tauler %s" #: src/bin/e_int_menus.c:1665 msgid "Add a Shelf" -msgstr "Afegeix tauler" +msgstr "Afegeix un tauler" #: src/bin/e_int_menus.c:1672 msgid "Delete a Shelf" -msgstr "Elimina tauler" +msgstr "Elimina un tauler" #: src/bin/e_int_shelf_config.c:44 #: src/modules/conf_shelves/e_int_config_shelf.c:55 @@ -2856,11 +2859,11 @@ msgstr "Damunt de tot" #: src/bin/e_int_shelf_config.c:145 msgid "Below Windows" -msgstr "Sota finestres" +msgstr "Per sota les finestres" #: src/bin/e_int_shelf_config.c:147 msgid "Below Everything" -msgstr "Sota de tot" +msgstr "Per sota de tot" #: src/bin/e_int_shelf_config.c:149 msgid "Allow windows to overlap the shelf" @@ -2869,7 +2872,7 @@ msgstr "Permetre que les finestres es sobreposin al tauler" #: src/bin/e_int_shelf_config.c:199 #, c-format msgid "Height (%3.0f pixels)" -msgstr "Amplada (%3.0f pixels)" +msgstr "Amplada (%3.0f píxels)" #: src/bin/e_int_shelf_config.c:202 msgid "Shrink to Content Width" @@ -2934,7 +2937,7 @@ msgstr "Enlightenment no pot crear un domini d'inici de sessió!\n" #: src/bin/e_main.c:278 msgid "Enlightenment cannot initialize Eet!\n" -msgstr "Enlightenment no pot inicialitzar Eet.\n" +msgstr "Enlightenment no pot inicialitzar Eet!\n" #: src/bin/e_main.c:287 msgid "Enlightenment cannot initialize Ecore!\n" @@ -2950,7 +2953,7 @@ msgid "" "Perhaps you are out of memory?" msgstr "" "Enlightenment no pot gestionar el senyal de sortida.\n" -"Potser no hi ha prou memòria" +"Potser no hi ha prou memòria?" #: src/bin/e_main.c:315 msgid "" @@ -2958,15 +2961,15 @@ msgid "" "Perhaps you are out of memory?" msgstr "" "Enlightenment no pot gestionar el senyal de HUP.\n" -"Potser no hi ha prou memòria" +"Potser no hi ha prou memòria?" #: src/bin/e_main.c:322 msgid "" "Enlightenment cannot set up a USER signal handler.\n" "Perhaps you are out of memory?" msgstr "" -"Enlightenment no pot gestionar un senyal d'USUARI.\n" -"Potser no hi ha prou memòria" +"Enlightenment no pot gestionar un senyal USER.\n" +"Potser no hi ha prou memòria?" #: src/bin/e_main.c:331 msgid "Enlightenment cannot initialize Ecore_File!\n" @@ -2990,7 +2993,7 @@ msgstr "Enlightenment no pot inicialitzar Ecore_IMF!\n" #: src/bin/e_main.c:382 msgid "Enlightenment cannot initialize Ecore_Evas!\n" -msgstr "Enlightenment no pot inicialitzar Ecore_Evas!\n" +msgstr "Enlightenment no pot inicialitzar Ecore_Evas!\n" #: src/bin/e_main.c:392 msgid "Enlightenment cannot initialize Elementary!\n" @@ -2998,7 +3001,7 @@ msgstr "Enlightenment no pot inicialitzar Elementary!\n" #: src/bin/e_main.c:403 msgid "Enlightenment cannot initialize Emotion!\n" -msgstr "Enlightenment no pot inicialitzar Emotion!\n" +msgstr "Enlightenment no pot inicialitzar Emotion!\n" #: src/bin/e_main.c:418 msgid "" @@ -3007,8 +3010,8 @@ msgid "" "Ecore and check they support the Software X11 rendering engine." msgstr "" "Enlightenment ha detectat que ecore_evas no permet la renderització de X11\n" -"a Evas. Si us plau, revisi la instal·lació d' Evas i\n" -"Ecore i comprovi si admeten el motor de renderització per X11." +"a Evas. Si us plau, reviseu la instal·lació d' Evas i\n" +"Ecore i comproveu si admeten el motor de renderització per X11." #: src/bin/e_main.c:426 msgid "" @@ -3017,18 +3020,19 @@ msgid "" "Ecore and check they support the Software Buffer rendering engine." msgstr "" "Enlightenment ha detectat que ecore_evas no admet d'ús del renderitzat de " -"buffer per software\n" -"a Evas. Si us plau, revisi la instal·lació d'Evas i Ecore\n" -"i comprovi que aquests siguin compatibles amb el motor de renderització de " -"buffer per software." +"memòria intermèdia\n" +"per programari a Evas. Si us plau, reviseu la instal·lació d'Evas i Ecore i " +"comproveu que aquests\n" +"siguin compatibles amb el motor de renderització de memòria intermèdia per " +"programari." #: src/bin/e_main.c:436 msgid "Enlightenment cannot initialize Edje!\n" -msgstr "Enlightenment no pot inicialitzar Edje!\n" +msgstr "Enlightenment no pot inicialitzar Edje!\n" #: src/bin/e_main.c:448 msgid "Enlightenment cannot initialize E_Intl!\n" -msgstr "Enlightenment no pot inicialitzar E_Intl!\n" +msgstr "Enlightenment no pot inicialitzar E_Intl!\n" #: src/bin/e_main.c:458 msgid "" @@ -3036,7 +3040,7 @@ msgid "" "Have you set your DISPLAY variable?" msgstr "" "Enlightenment no pot inicialitzar el sistema d'avisos d'emergència.\n" -"Ha configurat la variable DISPLAY?" +"Heu configurat la variable DISPLAY?" #: src/bin/e_main.c:468 msgid "Enlightenment cannot initialize E_Xinerama!\n" @@ -3047,13 +3051,12 @@ msgid "" "Enlightenment cannot create directories in your home directory.\n" "Perhaps you have no home directory or the disk is full?" msgstr "" -"Enlightenment no pot crear carpetes en el seu directori personal.
" -"Potser no té un directori personal o bé el disc està ple." +"Enlightenment no pot crear carpetes en el vostre directori personal.\n" +"Potser no teniu un directori personal o bé el disc està ple." #: src/bin/e_main.c:496 msgid "Enlightenment cannot set up its file registry system.\n" -msgstr "" -"Enlightenment no pot configurar el seu sistema de registre de fixers.\n" +msgstr "Enlightenment no pot configurar el sistema de registre de fitxers.\n" #: src/bin/e_main.c:505 msgid "Enlightenment cannot set up its config system.\n" @@ -3081,7 +3084,7 @@ msgid "" "Perhaps you are out of memory?" msgstr "" "Enlightenment no pot establir les rutes de recerca de fitxers.\n" -"Potser no disposa de prou memòria." +"Potser no disposeu de prou memòria." #: src/bin/e_main.c:578 msgid "Enlightenment cannot set up its font system.\n" @@ -3110,8 +3113,8 @@ msgid "" "out of memory or disk space?" msgstr "" "Enlightenment no pot inicialitzar el sistema d'escriptori FDO.\n" -"Potser li manquen permisos a ~/.cache/efreet o que\n" -"no disposi de prou memòria o espai de disc." +"Potser no teniu permisos a ~/.cache/efreet o \n" +"no disposeu de prou memòria o espai de disc." #: src/bin/e_main.c:664 msgid "Setup Screens" @@ -3123,7 +3126,7 @@ msgid "" "failed. Perhaps another window manager is running?\n" msgstr "" "Enlightenment ha fallat quan intentava configurar les pantalles del sistema\n" -"Potser hi ha un altre gestor de finestres actiu\n" +"Potser hi ha un altre gestor de finestres actiu?\n" #: src/bin/e_main.c:676 msgid "Setup ACPI" @@ -3325,7 +3328,7 @@ msgstr "Enlightenment no pot inicialitzar l'actualització del sistema.\n" #: src/bin/e_main.c:969 msgid "Setup Desktop Environment" -msgstr "Configura entorn escriptori" +msgstr "Configura l'entorn d'escriptori" #: src/bin/e_main.c:973 msgid "Enlightenment cannot initialize its desktop environment.\n" @@ -3333,15 +3336,15 @@ msgstr "Enlightenment no pot inicialitzar l'entorn d'escriptori.\n" #: src/bin/e_main.c:980 msgid "Setup File Ordering" -msgstr "Configura ordre fitxers" +msgstr "Configura l'ordre dels fitxers" #: src/bin/e_main.c:984 msgid "Enlightenment cannot set up its order file system.\n" -msgstr "Enlightenment no pot configurar el sistema d'ordre de fitxers.\n" +msgstr "Enlightenment no pot configurar el sistema d'ordre dels fitxers.\n" #: src/bin/e_main.c:999 msgid "Load Modules" -msgstr "Carrega mòduls " +msgstr "Carrega mòduls" #: src/bin/e_main.c:1030 msgid "Setup Shelves" @@ -3384,28 +3387,29 @@ msgid "" "\t\tIf you need this help, you don't need this option.\n" msgstr "" "Opcions:\n" -"\t-pantalla DISPLAY\n" -"\t\t Connexió a la pantalla anomenada DISPLAY.
\t\tEX: -display :1.0
" +"\t-display DISPLAY\n" +"\t\tConnecta a la pantalla anomenada DISPLAY.\n" +"\t\tExemple: -display :1.0\n" "\t-fake-xinerama-screen WxH+X+Y\n" -"\t\tAfegit a una pantalla de prova de xinerama (abans de posar-ho a la " -"real)\n" -"\t\tagafant la geometria. Afegeixi'n tantes com vulgui. Totes elles \n" -"\t\t reemplaçaran la pantalla xinerama. Això es pot \n" -"\t\tutilitzar per simular xinerama.\n" -"\t\tEX: -fake-xinerama-screen 800x600+0+0 -fake - xinerama-screen " -"800x600+800 +0 /n\t -profile CONF_PROFILE /n\t\tUtilitzi la configuració " -"CONF_PROFILE enlloc de la seleccionada per l'usuari o \"default\".\n" -"\t-bo\n" -"\t\tSer bo.\n" -"\t-dolent \n" -"\t\tSer dolent.\n" -"\t\t-psicòtic\n" -"\t\tSer psicòtic.\n" -"\t-bloquejat\n" -"\t\tInicia amb bloqueig d'escriptori i demanant contrasenya.\n" -"\t-Jo-realment-sé-que-estic-fent-i-accepto-tota-la-responsabilitat-de-tot-" -"això\n" -"\t\tSi ha necessitat ajuda aleshores aquesta opció no és per vostè.\n" +"\t\tAfegeix una pantalla xinerama de mentida (en lloc de la real)\n" +"\t\tamb la geometria donada. Afegiu-ne tantes com vulgueu.\n" +"\t\tsubstituiran les pantalles xinerama reals, si n'hi ha. Això\n" +"\t\tes pot utilitzar per a simular xinerama.\n" +"\t\tExemple: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen " +"800x600+800+0\n" +"\t-profile CONF_PROFILE\n" +"\t\tUtilitza la configuració CONF_PROFILE enlloc de la seleccionada per " +"l'usuari o bé \"default\".\n" +"\t-good\n" +"\t\tSigues bo.\n" +"\t-evil\n" +"\t\tSigues dolent.\n" +"\t-psychotic\n" +"\t\tSigues psicòtic.\n" +"\t-locked\n" +"\t\tArrenca amb el bloqueig activat, per tant demanarà la contrasenya.\n" +"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n" +"\t\tSi us cal aquesta ajuda, no necessiteu aquesta opció.\n" #: src/bin/e_main.c:1265 msgid "" @@ -3416,11 +3420,11 @@ msgid "" "and launching any other required services etc.\n" "before enlightenment itself begins running.\n" msgstr "" -"Està executant enlightnement directament.Això és\n" -"dolent.Si us plau no executi el binari\n" -"\"Enlightenment\". Utilitzi el llançador \"enlightenment_start\".Això\n" -"li permetrà gestionar variables d'entorn, rutes,\n" -" i llançarà qualsevol altre servei que requereixi etc.\n" +"Esteu executant enlightnement directament. Això és\n" +"dolent. Si us plau no executeu el binari \"enlightenment\",\n" +"utilitzeu el llançador \"enlightenment_start\".\n" +"Us permetrà gestionar variables d'entorn, rutes,\n" +" i llançarà qualsevol altre servei que requereixi\n" "abans que enlightenment comenci a executar-se.\n" #: src/bin/e_main.c:1546 @@ -3432,22 +3436,23 @@ msgid "" "Enlightenment found Evas can't create a buffer canvas. Please check\n" "Evas has Software Buffer engine support.\n" msgstr "" -"Evas no pot crear el búfer canvas. Comprovi que Evas permet el motor de " -"búfer per software.\n" +"Enlightenment ha trobat que Evas no pot crear la memòria intermèdia canvas. " +"Si us plau\n" +"comproveu que Evas permet el motor de memòria intermèdia per programari.\n" #: src/bin/e_main.c:1562 msgid "" "Enlightenment found Evas can't load SVG files. Check Evas has SVG loader " "support.\n" msgstr "" -"Evas no pot carregar fitxers SVG. Comprovi que Evas tingui suport per SVG.\n" +"Evas no pot carregar fitxers SVG. Comproveu que Evas tingui suport per SVG.\n" #: src/bin/e_main.c:1572 msgid "" "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader " "support.\n" msgstr "" -"Evas no pot carregar fitxers JPEG. Comprovi que Evas tingui suport per " +"Evas no pot carregar fitxers JPEG. Comproveu que Evas tingui suport per " "JPEG.\n" #: src/bin/e_main.c:1582 @@ -3455,14 +3460,14 @@ msgid "" "Enlightenment found Evas can't load PNG files. Check Evas has PNG loader " "support.\n" msgstr "" -"Evas no pot carregar fitxers PNG. Comprovi que Evas tingui suport per PNG.\n" +"Evas no pot carregar fitxers PNG. Comproveu que Evas tingui suport per PNG.\n" #: src/bin/e_main.c:1592 msgid "" "Enlightenment found Evas can't load EET files. Check Evas has EET loader " "support.\n" msgstr "" -"Evas no pot carregar fitxers EET. Comprovi que Evas tingui suport per EET.\n" +"Evas no pot carregar fitxers EET. Comproveu que Evas tingui suport per EET.\n" #: src/bin/e_main.c:1606 msgid "" @@ -3470,7 +3475,7 @@ msgid "" "fontconfig\n" "support and system fontconfig defines a 'Sans' font.\n" msgstr "" -"Evas no pot carregar la font 'Sans'. Comprovi que Evas tingui suport per " +"Evas no pot carregar la font 'Sans'. Comproveu que Evas tingui suport per " "fontconfig i que el sistema de fontconfig defineixi 'Sans'.\n" #: src/bin/e_main.c:1814 @@ -3480,9 +3485,9 @@ msgid "" "error loading the
module named: %s. This module has been disabled
and " "will not be loaded." msgstr "" -"Enlightenment ha fallat poc després d'arrencar i
serà reiniciat.Hi havia " -"un error carregant el
mòdul anomenat:%s.Aquest mòdul serà desactivat
" -"i no tornarà a ser carregat." +"Enlightenment ha fallat poc després d'arrencar i
serà reiniciat. Hi " +"havia un error carregant el
mòdul anomenat:%s. Aquest mòdul serà " +"desactivat
i no tornarà a ser carregat." #: src/bin/e_main.c:1819 src/bin/e_main.c:1836 msgid "Enlightenment crashed early on start and has been restarted" @@ -3507,9 +3512,9 @@ msgid "" "dialog should let you select your
modules again.\n" msgstr "" "Enlightenment ha fallat poc després d'arrencar i serà \n" -"reiniciat.Tots els mòduls han estat desactivats\n" +"reiniciat. Tots els mòduls han estat desactivats\n" "i no seran carregats per ajudar a eliminar qualsevol problema\n" -" de mòduls en la seva configuració.El diàleg de configuració\n" +" de mòduls en la vostra configuració. El diàleg de configuració\n" "de mòduls hauria de permetre seleccionar\n" "els mòduls un altre cop.\n" @@ -3522,9 +3527,9 @@ msgid "" msgstr "" "Enlightenment ha fallat poc després d'arrencar i serà reiniciat.
Tots " "els mòduls han estat desactivats i no es podran carregar
per tal de " -"poder eliminar qualsevol problema de la seva configuració.

El diàleg " -"de configuració de mòduls hauria de permetre seleccionar
els mòduls un " -"altre cop." +"poder eliminar qualsevol problema de la vostra configuració.

El " +"diàleg de configuració de mòduls hauria de permetre seleccionar
els " +"mòduls un altre cop." #: src/bin/e_module.c:100 #, c-format @@ -3542,7 +3547,7 @@ msgstr "" #: src/bin/e_module.c:151 src/bin/e_module.c:164 src/bin/e_module.c:182 msgid "Error loading Module" -msgstr "Error carregant mòdul " +msgstr "Error carregant mòdul" #: src/bin/e_module.c:159 src/bin/e_module.c:176 #, c-format @@ -3551,11 +3556,11 @@ msgid "" "module is:
%s
The error reported was:
%s
" msgstr "" "Error carregant el mòdul anomenat: %s
La ruta completa a aquest mòdul és " -"
%s
L'error reportat ha estat::
%s
" +"
%s
L'error reportat ha estat:
%s
" #: src/bin/e_module.c:181 msgid "Module does not contain all needed functions" -msgstr "El mòdul no conté totes les funcions necessàries." +msgstr "El mòdul no conté totes les funcions necessàries" #: src/bin/e_module.c:196 #, c-format @@ -3575,7 +3580,7 @@ msgstr "Mòdul %s d'Enlightenment" #: src/bin/e_module.c:528 msgid "What action should be taken with this module?
" -msgstr "Què vol fer amb aquest mòdul?
" +msgstr "Què voleu fer amb aquest mòdul?
" #: src/bin/e_module.c:534 src/bin/e_shelf.c:1792 #: src/modules/conf_dialogs/e_int_config_profiles.c:339 @@ -3590,9 +3595,9 @@ msgid "" "cause bugs and crashes.
Please remove them before reporting any bugs." "

The module list is as follows:

" msgstr "" -"Els seguents mòduls no són estàndard per
Enlightenment i poden causar " -"errors i aturades de sistema.
Si us plau, elimini'ls abans de reportar " -"errors.

La llista de mòduls és la següent:

" +"Els següents mòduls no són estàndards per a
Enlightenment i poden causar " +"errors i aturades del sistema.
Si us plau, elimineu-los abans de " +"notificar errors.

La llista de mòduls és la següent:

" #: src/bin/e_module.c:795 msgid "Unstable module tainting" @@ -3608,7 +3613,7 @@ msgid "" "presentation mode and temporarily disable screen saver, lock and " "power saving?" msgstr "" -"S'ha desactivat l'estalvi de pantalla massa ràpid.

Vol tornar a " +"S'ha desactivat l'estalvi de pantalla massa ràpid.

Voleu tornar a " "activar el mode presentació i desactivar temporalment l'estalvi de " "pantalla, bloqueig i estalvi d'energia?" @@ -3681,19 +3686,20 @@ msgstr "Cantonada inferior dreta" #: src/bin/e_shelf.c:268 src/bin/e_shelf.c:1121 #, c-format msgid "Shelf #%d" -msgstr "Tauler #%d" +msgstr "Tauler número %d" #: src/bin/e_shelf.c:892 msgid "Shelf Autohide Error" -msgstr "Error a l'amagar el tauler" +msgstr "Error en amagar el tauler" #: src/bin/e_shelf.c:892 msgid "" "Shelf autohiding will not work properly
with the current configuration; " "set your shelf to
\"Below Everything\" or disable autohiding." msgstr "" -"Amaga automàticament no anirà bé
amb l'actual configuració: Posi el " -"tauler
\"darrera de tot\" o desactivi Amaga automàticament." +"Amaga automàticament no funcionarà correctament
amb l'actual " +"configuració: Poseu el tauler
\"Darrera de tot\" o desactiveu Amaga " +"automàticament." #: src/bin/e_shelf.c:1122 msgid "Add New Shelf" @@ -3701,7 +3707,7 @@ msgstr "Afegeix nou tauler" #: src/bin/e_shelf.c:1143 msgid "Shelf Error" -msgstr "Error tauler" +msgstr "Error del tauler" #: src/bin/e_shelf.c:1143 msgid "A shelf with that name already exists!" @@ -3717,13 +3723,13 @@ msgstr "Moure ginys" #: src/bin/e_shelf.c:1787 msgid "Are you sure you want to delete this shelf?" -msgstr "Està segur de que vol eliminar aquest tauler?" +msgstr "Esteu segur que voleu eliminar aquest tauler?" #: src/bin/e_shelf.c:1789 msgid "" "You requested to delete this shelf.

Are you sure you want to delete " "it?" -msgstr "S'ha demanat eliminar aquest tauler,

Esteu segur?" +msgstr "S'ha demanat eliminar aquest tauler.

N'esteu segur?" #: src/bin/e_shelf.c:2343 msgid "A shelf with that name and id already exists!" @@ -3771,9 +3777,10 @@ msgid "" "want to finish the logout
anyway without closing these
applications " "first?

Auto logout in %d seconds." msgstr "" -"S'està tardant molt de temps en tancar la sessió.
Algunes aplicacions no " -"es tanquen.
Vol tancar la sessió
sense tancar aquestes
aplicacions " -"primer ?

Tancant la sessió automàticament en %d segons." +"S'està trigant molt de temps en tancar la sessió.
Algunes aplicacions no " +"es tanquen.
Voleu tancar la sessió
sense tancar " +"aquestes
aplicacions primer?

Es tancarà la sessió automàticament " +"en %d segons." #: src/bin/e_sys.c:498 msgid "Logout problems" @@ -3781,7 +3788,7 @@ msgstr "Problemes de sortida" #: src/bin/e_sys.c:500 msgid "Logout now" -msgstr "Sortir ja" +msgstr "Sortir immediatament" #: src/bin/e_sys.c:502 msgid "Wait longer" @@ -3797,7 +3804,7 @@ msgstr "La sortida està en procés" #: src/bin/e_sys.c:550 msgid "Logout in progress.
Please wait." -msgstr "Sortida en procés.
Si us plau, esperi" +msgstr "Sortida en procés.
Si us plau, espereu." #: src/bin/e_sys.c:579 src/bin/e_sys.c:634 msgid "Enlightenment is busy with another request" @@ -3824,8 +3831,8 @@ msgid "" "Resetting.
You cannot do any other system actions
once a reboot has " "begun." msgstr "" -"Restabliment.
No es pot fer cap altra acció de sistema
un cop el " -"reinici ha començat." +"Reiniciant.
No es pot fer cap altra acció de sistema
un cop ha " +"començat la reiniciada." #: src/bin/e_sys.c:603 msgid "" @@ -3833,14 +3840,14 @@ msgid "" "system actions." msgstr "" "Aturant temporalment.
Fins que l'aturada temporal s'hagi completat no es " -"pot realitzar qualsevol
altre acció de sistema." +"pot realitzar cap
altra acció de sistema." #: src/bin/e_sys.c:609 msgid "" "Hibernating.
You cannot perform any other system actions
until this is " "complete." msgstr "" -"Hivernant.
Fins que la hivernació no s'hagi completat no pot realitzar " +"Hibernant.
Fins que la hibernació no s'hagi completat no pot realitzar " "cap
altra acció de sistema." #: src/bin/e_sys.c:615 src/bin/e_sys.c:656 @@ -3861,11 +3868,11 @@ msgstr "Aturada temporal fallida." #: src/bin/e_sys.c:652 msgid "Hibernate failed." -msgstr "Hivernació fallida." +msgstr "Hibernació fallida." #: src/bin/e_sys.c:752 msgid "Power off.
Please wait." -msgstr "Apagant.
Si us plau, esperi." +msgstr "Apagant.
Si us plau, espereu." #: src/bin/e_sys.c:796 msgid "Resetting" @@ -3873,7 +3880,7 @@ msgstr "Reiniciant" #: src/bin/e_sys.c:799 msgid "Resetting.
Please wait." -msgstr "Reiniciant.
Esperi, si us plau." +msgstr "Reiniciant.
Espereu, si us plau." #: src/bin/e_sys.c:851 msgid "Suspending" @@ -3881,19 +3888,19 @@ msgstr "Aturant temporalment" #: src/bin/e_sys.c:854 msgid "Suspending.
Please wait." -msgstr "Aturant temporalment.
Esperi, si us plau." +msgstr "Aturant temporalment.
Espereu, si us plau." #: src/bin/e_sys.c:907 msgid "Hibernating" -msgstr "Hivernant" +msgstr "Hibernant" #: src/bin/e_sys.c:910 msgid "Hibernating.
Please wait." -msgstr "Hivernant.
Esperi, si us plau." +msgstr "Hibernant.
Espereu, si us plau." #: src/bin/e_theme_about.c:25 msgid "Select Theme" -msgstr "Seleccioni tema" +msgstr "Seleccioneu tema" #: src/bin/e_theme.c:37 msgid "Set As Theme" @@ -3911,6 +3918,27 @@ msgstr "Mou/redimensiona elements" msgid "Set Toolbar Contents" msgstr "Estableix contingut barra d'eines" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Actualitzacions" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -3919,7 +3947,7 @@ msgstr "Enlightenment no ha pogut crear el procés fill:

%s
" #: src/bin/e_utils.c:245 msgid "Cannot exit - immortal windows." -msgstr "No es pot sortir - Finestres immortals" +msgstr "No es pot sortir - finestres immortals." #: src/bin/e_utils.c:246 msgid "" @@ -3934,7 +3962,7 @@ msgstr "" #: src/bin/e_utils.c:860 #, c-format msgid "%'.0f bytes" -msgstr "%'.0f Bytes" +msgstr "%'.0f bytes" #: src/bin/e_utils.c:864 #, c-format @@ -3964,35 +3992,35 @@ msgstr "En el futur" #: src/bin/e_utils.c:899 #, c-format msgid "In the last minute" -msgstr "Al darrer minut" +msgstr "L'últim minut" #: src/bin/e_utils.c:903 #, c-format msgid "Last year" msgid_plural "%li Years ago" -msgstr[0] "Darrer any" +msgstr[0] "El darrer any" msgstr[1] "Fa %li anys" #: src/bin/e_utils.c:908 #, c-format msgid "Last month" msgid_plural "%li Months ago" -msgstr[0] "Darrer mes" +msgstr[0] "El darrer mes" msgstr[1] "Fa %li mesos" #: src/bin/e_utils.c:913 #, c-format msgid "Last week" msgid_plural "%li Weeks ago" -msgstr[0] "Darrera setmana" -msgstr[1] "fa %li setmanes" +msgstr[0] "La darrera setmana" +msgstr[1] "Fa %li setmanes" #: src/bin/e_utils.c:918 #, c-format msgid "Yesterday" msgid_plural "%li Days ago" msgstr[0] "Ahir" -msgstr[1] "fa %li dies" +msgstr[1] "Fa %li dies" #: src/bin/e_utils.c:923 #, c-format @@ -4031,13 +4059,14 @@ msgid "" "Failed to create directory: %s .
Check that you have correct permissions " "set." msgstr "" -"Error al crear el directori: %s.
Comprovi que té els permisos correctes." +"Error en crear el directori: %s.
Comproveu que teniu els permisos " +"correctes." #: src/bin/e_utils.c:1014 #, c-format msgid "Failed to create directory: %s .
A file of that name already exists." msgstr "" -"Error al crear el directori: %s.
Ja existeix un fitxer amb aquest nom." +"Error en crear el directori: %s.
Ja existeix un fitxer amb aquest nom." #: src/bin/e_utils.c:1172 msgid "" @@ -4049,14 +4078,14 @@ msgid "" "adding it in. You can re-configure things now to your
liking. Sorry for " "the hiccup in your configuration.
" msgstr "" -"Les dades de configuració necessiten ser actualitzades. La configuració " -"vella
ha estat eliminada i una nova configuració per defecte s'ha " -"inicialitzat. Això
sol succeïr regularment durant el desenvolupament " -"pertant
no reporti cap error. Això significa que el mòdul necessita " -"una nova configuració
per ser funcional ja que en la seva vella " -"configuració faltaven opcions.Les noves preferències
per defecte haurien " -"de funcionar. No obstant això pot reconfigurar els paràmetres al seu gust." -"
Disculpi les molèsties.
" +"Les dades de configuració han de ser actualitzades. La configuració " +"vella
ha estat eliminada i s'ha inicialitzat una nova configuració per " +"defecte. Això
sol succeir habitualment durant el desenvolupament, per " +"tant
no informeu de l'error. Significa que el mòdul necessita una nova " +"configuració
per ser funcional ja que en la configuració anterior hi " +"faltaven opcions. Les noves preferències
per defecte haurien de " +"funcionar. No obstant això, podeu reconfigurar els paràmetres al vostre gust." +"
Disculpeu les molèsties.
" #: src/bin/e_utils.c:1181 src/bin/e_utils.c:1205 #, c-format @@ -4071,11 +4100,11 @@ msgid "" "module was running. This is bad and
as a precaution your configuration " "has been now restored to
defaults. Sorry for the inconvenience.
" msgstr "" -"La configuració del mòdul és més NOVA que la versió del mòdul.Això és
" -"molt extrany. Això no hauria d'haver passat si no ha desactualitzat
el " -"mòdul o ha copiat la configuració d'algun lloc on
hi havia una versió més " -"nova de mòdul. Això no és bó i
com a precaució la configuració ha estat " -"
restaurada als valors per defecte. Disculpi les molèsties.
" +"La configuració del mòdul és més NOVA que la versió del mòdul. Això és
" +"molt estrany. Això no hauria d'haver passat si no heu desactualitzat
el " +"mòdul o heu copiat la configuració d'algun lloc on
hi havia una versió " +"més nova de mòdul. Això no és bo i
com a precaució la configuració ha " +"estat
restaurada als valors per defecte. Disculpeu les molèsties.
" #: src/bin/e_utils.c:1288 #, c-format @@ -4190,11 +4219,11 @@ msgstr "Alfa" #: src/bin/e_widget_filepreview.c:81 src/bin/e_widget_filepreview.c:382 msgid "Resolution:" -msgstr "Resolució" +msgstr "Resolució:" #: src/bin/e_widget_filepreview.c:89 msgid "Mime-type:" -msgstr "Tipus-mime" +msgstr "Tipus-mime:" #: src/bin/e_widget_filepreview.c:267 #, c-format @@ -4215,7 +4244,7 @@ msgstr "Reservat:" #: src/bin/e_widget_filepreview.c:333 msgid "Mount status:" -msgstr "Estat muntatge" +msgstr "Estat muntatge:" #: src/bin/e_widget_filepreview.c:335 src/modules/comp/e_mod_config.c:487 #: src/modules/mixer/app_mixer.c:424 @@ -4251,7 +4280,7 @@ msgstr "Desmuntat" #: src/bin/e_widget_filepreview.c:640 #, c-format msgid "You" -msgstr "Vostè" +msgstr "Vós" #: src/bin/e_widget_filepreview.c:689 #, c-format @@ -4299,7 +4328,7 @@ msgstr "Mostra una alerta quan la bateria estigui baixa" #: src/modules/battery/e_mod_config.c:138 msgid "Use desktop notifications for alert" -msgstr "Utilitza notificacions d'escriptori per avisos." +msgstr "Utilitza notificacions d'escriptori per avisos" #: src/modules/battery/e_mod_config.c:235 msgid "Check every:" @@ -4319,7 +4348,7 @@ msgstr "Atura temporalment quan estigui per sota de:" #: src/modules/battery/e_mod_config.c:245 msgid "Hibernate when below:" -msgstr "Hiverna quan estigui per sota de:" +msgstr "Hiberna quan estigui per sota de:" #: src/modules/battery/e_mod_config.c:248 msgid "Shutdown when below:" @@ -4356,7 +4385,7 @@ msgstr "Descarta automàticament en..." #: src/modules/conf_window_manipulation/e_int_config_window_process.c:101 #, c-format msgid "%1.0f s" -msgstr "%1.1f s" +msgstr "%1.0f s" #: src/modules/battery/e_mod_config.c:286 msgid "Alert" @@ -4502,8 +4531,8 @@ msgid "" "Your display server does not support the
compositor overlay window. This " "is needed
for it to function." msgstr "" -"El servidor de pantalla no permet
finestra sobreposada. Es necessari que " -"en permeti l'ús
per poder funcionar." +"El servidor de pantalla no permet la
finestra sobreposada. Es necessari " +"que en permeti l'ús
per a poder funcionar." #: src/modules/comp/e_mod_comp.c:3752 msgid "Compositor Warning" @@ -4526,8 +4555,8 @@ msgid "" "need
XRender and XFixes support in X11 and Ecore." msgstr "" "El servidor de pantalla no permet XComposite,
o Ecore-X ha estat integrat " -"sense compatibilitat amb XComposite.
Tingui en compte que per permetre " -"composite també necessita
compatibilitat amb XRender i XFixes a X11 i " +"sense compatibilitat amb XComposite.
Tingueu en compte que per a permetre " +"composite també necessiteu
compatibilitat amb XRender i XFixes a X11 i " "Ecore." #: src/modules/comp/e_mod_comp.c:4101 @@ -4570,11 +4599,11 @@ msgstr "Diàleg" #: src/modules/comp/e_mod_config.c:448 src/modules/comp/e_mod_config.c:753 msgid "Dock" -msgstr "Dock" +msgstr "Acoblador" #: src/modules/comp/e_mod_config.c:450 src/modules/comp/e_mod_config.c:755 msgid "Drag and Drop" -msgstr "Arrossegar i deixar" +msgstr "Arrossegar i deixar anar" #: src/modules/comp/e_mod_config.c:454 src/modules/comp/e_mod_config.c:759 msgid "Menu (Dropdown)" @@ -4582,7 +4611,7 @@ msgstr "Menú (Desplegable)" #: src/modules/comp/e_mod_config.c:456 src/modules/comp/e_mod_config.c:761 msgid "Menu (Popup)" -msgstr "Menú (popup)" +msgstr "Menú (Emergent)" #: src/modules/comp/e_mod_config.c:460 src/modules/comp/e_mod_config.c:765 #: src/modules/notification/e_mod_main.c:151 @@ -4591,7 +4620,7 @@ msgstr "Notificacions" #: src/modules/comp/e_mod_config.c:462 src/modules/comp/e_mod_config.c:767 msgid "Splash" -msgstr "Pantalla inicial" +msgstr "Pantalla flaix" #: src/modules/comp/e_mod_config.c:464 src/modules/comp/e_mod_config.c:769 #: src/modules/fileman/e_mod_config.c:345 @@ -4646,7 +4675,7 @@ msgstr "Tipus" #: src/modules/comp/e_mod_config.c:797 msgid "On" -msgstr "Sobre" +msgstr "Activat" #: src/modules/comp/e_mod_config.c:799 #: src/modules/conf_display/e_int_config_desks.c:213 @@ -4727,7 +4756,7 @@ msgstr "Captura servidor durant disseny" #: src/modules/comp/e_mod_config.c:1179 msgid "Initial draw timeout for newly mapped windows" -msgstr "Temps d'espera inicial per finestres noves" +msgstr "Temps d'espera inicial per a finestres noves" #: src/modules/comp/e_mod_config.c:1181 #, c-format @@ -4752,7 +4781,7 @@ msgstr "Opcions d'OpenGL" #: src/modules/comp/e_mod_config.c:1199 src/modules/comp/e_mod_config.c:1512 msgid "Tear-free updates (VSynced)" -msgstr "Sincronizació de pantalla (VSYNC)" +msgstr "Sincronització de pantalla (VSYNC)" #: src/modules/comp/e_mod_config.c:1201 msgid "Texture from pixmap" @@ -4768,19 +4797,19 @@ msgstr "Automàtic" #: src/modules/comp/e_mod_config.c:1213 msgid "Invalidate (full redraw)" -msgstr "Invàlida (redibuixat complert)" +msgstr "Invalida (redibuixat complet)" #: src/modules/comp/e_mod_config.c:1215 msgid "Copy from back to front" -msgstr "Còpia de darrera al davant" +msgstr "Copia del darrere al davant" #: src/modules/comp/e_mod_config.c:1217 msgid "Double buffered swaps" -msgstr "Intercanvi de doble buffer" +msgstr "Intercanvis de doble memòria intermèdia" #: src/modules/comp/e_mod_config.c:1219 msgid "Triple buffered swaps" -msgstr "Intercanvi de triple búffer" +msgstr "Intercanvis de triple memòria intermèdia" #: src/modules/comp/e_mod_config.c:1229 #: src/modules/conf_performance/e_mod_main.c:19 @@ -4805,7 +4834,7 @@ msgstr "Memòria" #: src/modules/comp/e_mod_config.c:1313 msgid "Show Framerate" -msgstr "Mostra frames per segon" +msgstr "Mostra fotogrames per segon" #: src/modules/comp/e_mod_config.c:1315 msgid "Rolling average frame count" @@ -4814,7 +4843,7 @@ msgstr "Mitjana recompte de fotogrames" #: src/modules/comp/e_mod_config.c:1317 #, c-format msgid "%1.0f Frames" -msgstr "%1.0f frames" +msgstr "%1.0f fotogrames" #: src/modules/comp/e_mod_config.c:1321 msgid "Corner" @@ -4822,19 +4851,19 @@ msgstr "Cantonada" #: src/modules/comp/e_mod_config.c:1324 msgid "Top Left" -msgstr "Dalt esquerra" +msgstr "Superior esquerra" #: src/modules/comp/e_mod_config.c:1327 msgid "Top Right" -msgstr "Dalt Dreta" +msgstr "Superior Dreta" #: src/modules/comp/e_mod_config.c:1330 msgid "Bottom Left" -msgstr "Baix esquerra" +msgstr "Inferior esquerra" #: src/modules/comp/e_mod_config.c:1333 msgid "Bottom Right" -msgstr "Baix dreta" +msgstr "Inferior dreta" #: src/modules/comp/e_mod_config.c:1338 msgid "Debug" @@ -4842,7 +4871,7 @@ msgstr "Depuració" #: src/modules/comp/e_mod_config.c:1515 msgid "Smooth scaling of window content" -msgstr "Escalat suau del contingut de finestra" +msgstr "Escalat suau del contingut de la finestra" #: src/modules/comp/e_mod_config.c:1521 msgid "Select default style" @@ -4869,7 +4898,7 @@ msgid "" "Dropshadow module is incompatible
with compositing. Disabling " "the
Dropshadow module." msgstr "" -"El mòdul Dropshadow és incompatible
amb el compositor. Desactivant
el " +"El mòdul Dropshadow és incompatible
amb el compositor. Es desactiva
el " "mòdul Dropshadow." #: src/modules/conf/e_mod_config.c:35 src/modules/conf/e_mod_main.c:285 @@ -4996,11 +5025,11 @@ msgstr "Escriptoris principals" #: src/modules/conf_applications/e_int_config_deskenv.c:109 msgid "Start GNOME services on login" -msgstr "Inicia serveis GNOME a l'arrencar" +msgstr "Inicia serveis GNOME en arrencar" #: src/modules/conf_applications/e_int_config_deskenv.c:112 msgid "Start KDE services on login" -msgstr "Inicia serveis KDE a l'arrencar" +msgstr "Inicia serveis KDE en arrencar" #: src/modules/conf_applications/e_mod_main.c:21 msgid "Create Application Launcher" @@ -5093,7 +5122,7 @@ msgstr "Mode de diàleg per defecte" #: src/modules/conf_dialogs/e_mod_main.c:18 msgid "Dialogs" -msgstr "Diàlegs " +msgstr "Diàlegs" #: src/modules/conf_dialogs/e_mod_main.c:19 msgid "Profiles" @@ -5102,7 +5131,7 @@ msgstr "Perfils" #: src/modules/conf_display/e_int_config_desks.c:52 #: src/modules/pager/e_mod_main.c:885 msgid "Virtual Desktops Settings" -msgstr "Preferències d'escriptoris virtuals " +msgstr "Preferències d'escriptoris virtuals" #: src/modules/conf_display/e_int_config_desks.c:168 msgid "Number of Desktops" @@ -5110,7 +5139,7 @@ msgstr "Nombre d'escriptoris" #: src/modules/conf_display/e_int_config_desks.c:171 msgid "Click to change wallpaper" -msgstr "Cliqui per canviar el fons de pantalla" +msgstr "Cliqueu per canviar el fons de pantalla" #: src/modules/conf_display/e_int_config_desks.c:178 #: src/modules/conf_display/e_int_config_desks.c:183 @@ -5203,7 +5232,7 @@ msgstr "Configura" #: src/modules/conf_display/e_int_config_desklock_fsel.c:41 msgid "Select a Background..." -msgstr "Seleccioni un fons ..." +msgstr "Seleccioneu un fons..." #: src/modules/conf_display/e_int_config_desklock_fsel.c:84 #: src/modules/conf_intl/e_int_config_imc.c:803 @@ -5219,7 +5248,7 @@ msgstr "Personal" #: src/modules/conf_display/e_int_config_desklock.c:80 msgid "Screen Lock Settings" -msgstr "Configuració del bloqueig de pantalla " +msgstr "Configuració del bloqueig de pantalla" #: src/modules/conf_display/e_int_config_desklock.c:222 msgid "Lock on Startup" @@ -5255,7 +5284,7 @@ msgstr "Mostra a la pantalla actual" #: src/modules/conf_display/e_int_config_desklock.c:294 msgid "Show on screen #:" -msgstr "Mostra en la pantalla #:" +msgstr "Mostra en la pantalla número:" #: src/modules/conf_display/e_int_config_desklock.c:304 msgid "Login Box" @@ -5276,7 +5305,7 @@ msgstr "%1.0f segons" #: src/modules/conf_display/e_int_config_desklock.c:321 msgid "Lock when idle time exceeded" -msgstr "Bloqueja quan el temps d'espera hagi excedit" +msgstr "Bloqueja quan s'hagi excedit el temps d'espera" #: src/modules/conf_display/e_int_config_desklock.c:326 #: src/modules/conf_display/e_int_config_screensaver.c:166 @@ -5291,7 +5320,7 @@ msgstr "Temporitzadors" #: src/modules/conf_display/e_int_config_desklock.c:336 #: src/modules/conf_display/e_int_config_screensaver.c:195 msgid "Suggest if deactivated before" -msgstr "Suggerir si es desactiva abans de" +msgstr "Suggerir si es desactiva abans" #: src/modules/conf_display/e_int_config_desklock.c:345 msgid "Presentation Mode" @@ -5341,7 +5370,7 @@ msgstr "Atura temporalment tot i estar connectat al corrent" #: src/modules/conf_display/e_int_config_screensaver.c:180 msgid "Suspend delay" -msgstr "Retard aturada temporalment" +msgstr "Retard aturada temporal" #: src/modules/conf_display/e_int_config_screensaver.c:188 #: src/modules/conf_display/e_mod_main.c:32 @@ -5377,7 +5406,7 @@ msgstr "Retard abans d'atenuació" #: src/modules/conf_display/e_int_config_dpms.c:164 #, c-format msgid "%1.0f second(s)" -msgstr "%1.0f segon(s=" +msgstr "%1.0f segon(s)" #: src/modules/conf_display/e_int_config_dpms.c:170 msgid "Fade Time" @@ -5417,9 +5446,10 @@ msgid "" "

You can either specify a delay of this
action using the slider, " "or make it
respond to edge clicks:" msgstr "" -"Si us plau seleccioni una cantonada,
o cliquiTanca per " -"sortir.

Pot especificar un retard d'aquesta
acció utilitzant el " -"control lliscant, o fer que
respongui als clics a les cantonada:" +"Si us plau seleccioneu una cantonada,
o cliqueuTanca " +"per a sortir.

Podeu especificar un retard d'aquesta
acció " +"utilitzant el control lliscant, o fer que
respongui als clics a les " +"cantonades:" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105 msgid "Edge Bindings Settings" @@ -5442,7 +5472,7 @@ msgstr "Modifica" #: src/modules/conf_keybindings/e_int_config_keybindings.c:255 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:302 msgid "Delete All" -msgstr "Elimina totes" +msgstr "Elimina-ho tot" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820 @@ -5477,15 +5507,15 @@ msgstr "Opcions generals" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307 msgid "Allow binding activation with fullscreen windows" -msgstr "Permetre dreçera activació a finestres de pantalla completa" +msgstr "Permetre drecera activació a finestres de pantalla completa" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309 msgid "Allow binding activation with multiple screens (DANGEROUS!)" -msgstr "Permetre dreçera activació amb multiples escriptoris (PERILLÓS!)" +msgstr "Permetre drecera activació amb múltiples escriptoris (PERILLÓS!)" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874 msgid "Edge Binding Sequence" -msgstr "Seqüència per la dreçera de cantonada" +msgstr "Seqüència per la drecera de cantonada" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893 msgid "Clickable edge" @@ -5493,7 +5523,7 @@ msgstr "Cantonada clicable " #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214 msgid "Edge Binding Error" -msgstr "Error dreçera cantonada" +msgstr "Error drecera cantonada" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215 #, c-format @@ -5501,8 +5531,9 @@ msgid "" "The edge binding that you chose is already used by
%s " "action.
Please choose another edge to bind." msgstr "" -"La dreçera de cantonada que ha escollit està  siguent utilitzada per " -"l'acció
%s.
Si us plau, trïi una altra seqüència." +"La drecera de cantonada que heu escollit està essent utilitzada per " +"l'acció
%s.
Si us plau, escolliu una altra " +"seqüència." #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1305 @@ -5520,7 +5551,7 @@ msgstr "ALT" #: src/modules/conf_keybindings/e_int_config_keybindings.c:1316 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1348 msgid "SHIFT" -msgstr "MAJÚSC" +msgstr "MAJÚS" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1322 @@ -5546,19 +5577,19 @@ msgstr "Vora inferior" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393 msgid "Top Left Edge" -msgstr "Cantonada dalt esquerra" +msgstr "Cantonada superior esquerra" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397 msgid "Top Right Edge" -msgstr "Cantonada dalt dreta" +msgstr "Cantonada superior dreta" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401 msgid "Bottom Right Edge" -msgstr "Cantonada baix dreta" +msgstr "Cantonada inferior dreta" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405 msgid "Bottom Left Edge" -msgstr "Cantonada baix esquerra" +msgstr "Cantonada inferior esquerra" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419 #, c-format @@ -5568,12 +5599,12 @@ msgstr "(esquerra clicable)" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421 #, c-format msgid "(clickable)" -msgstr "(click)" +msgstr "(clicable)" #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584 msgid "Signal Binding Error" -msgstr "Error senyal de dreçera" +msgstr "Error senyal de drecera" #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574 msgid "Signal and Source must NOT be blank!" @@ -5585,12 +5616,12 @@ msgid "" "The signal and source that you entered are already used by
%s action.
" msgstr "" -"El senyal i la seqüència de tecles que ha escollit està  siguent utilitzada " +"El senyal i la seqüència de tecles que heu escollit està essent utilitzada " "per l'acció
%s.
" #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634 msgid "Add Signal Binding" -msgstr "Afegir senyal de dreçera" +msgstr "Afegir senyal de drecera" #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645 msgid "Source:" @@ -5637,7 +5668,7 @@ msgstr "Llindar per s arrossegament de dit" #: src/modules/conf_interaction/e_int_config_mouse.c:178 #, c-format msgid "%1.0f pixels" -msgstr "%1.0f pixels" +msgstr "%1.0f píxels" #: src/modules/conf_interaction/e_int_config_interaction.c:110 msgid "Threshold for applying drag momentum" @@ -5646,7 +5677,7 @@ msgstr "Llindar per l'aplicació d'un impuls d'arrossegament" #: src/modules/conf_interaction/e_int_config_interaction.c:113 #, c-format msgid "%1.0f pixels/s" -msgstr "%1.0f pixels/seg" +msgstr "%1.0f píxels/seg" #: src/modules/conf_interaction/e_int_config_interaction.c:119 msgid "Friction slowdown" @@ -5656,7 +5687,7 @@ msgstr "Desacceleració per fricció" #: src/modules/conf_performance/e_int_config_powermanagement.c:243 #, c-format msgid "%1.2f s" -msgstr "%1.2f sec" +msgstr "%1.2f s" #: src/modules/conf_interaction/e_int_config_mouse.c:47 msgid "Mouse Settings" @@ -5755,7 +5786,7 @@ msgstr "Variables d'entorn exportades" #: src/modules/conf_intl/e_int_config_imc_import.c:67 msgid "Select an Input Method Settings..." -msgstr "Seleccioni preferències del mètode entrada" +msgstr "Seleccioneu preferències del mètode entrada" #: src/modules/conf_intl/e_int_config_imc_import.c:283 #: src/modules/conf_intl/e_int_config_imc_import.c:299 @@ -5767,7 +5798,7 @@ msgid "" "Enlightenment was unable to import the configuration.

Are you sure " "this is really a valid configuration?" msgstr "" -"Enlightenment no ha pogut importar la configuració.

Està segur que " +"Enlightenment no ha pogut importar la configuració.

Esteu segur que " "aquesta és una configuració vàlida?" #: src/modules/conf_intl/e_int_config_imc_import.c:300 @@ -5794,11 +5825,11 @@ msgid "" "affected, use the
Environment variable settings to unset them.
The " "variables that may affect you are
as follows:
%s" msgstr "" -"Té algunes variables locals extra d'escriptori
carregades que podrien " -"interferir
amb la visualització correcta del llenguatge escollit.
Si " -"no vol que succeixi això, utilitzi
les preferències de les variables " -"d'entorn per restablir-les.
Les variables que el poden afectar
són les " -"següents:
%s" +"Teniu algunes variables d'escriptori locals addicionals
carregades que " +"podrien interferir
amb la visualització correcta del llenguatge escollit." +"
Si no voleu que això succeeixi, utilitzeu
les preferències de les " +"variables d'entorn per a restablir-les.
Les variables que us poden " +"afectar
són les següents:
%s" #: src/modules/conf_intl/e_int_config_intl.c:962 msgid "Possible Locale problems" @@ -5906,7 +5937,7 @@ msgstr "Augmenta zoom" #: src/modules/conf_keybindings/e_int_config_acpibindings.c:385 msgid "Brightness Down" -msgstr "Baixa brillantor" +msgstr "Disminueix brillantor" #: src/modules/conf_keybindings/e_int_config_acpibindings.c:387 msgid "Brightness Up" @@ -5926,15 +5957,15 @@ msgstr "Vaio" #: src/modules/conf_keybindings/e_int_config_acpibindings.c:497 msgid "ACPI Binding" -msgstr "Drecera ACPI " +msgstr "Drecera ACPI" #: src/modules/conf_keybindings/e_int_config_acpibindings.c:500 msgid "" "Please trigger the ACPI event you wish to bind to,

or " "Escape to abort." msgstr "" -"Si us plau, activi la drecera ACPI on vulgui enllaçar,

o " -"Escape per sortir." +"Si us plau, activeu la drecera ACPI on vulgueu enllaçar,

o " +"ESC per a sortir." #: src/modules/conf_keybindings/e_int_config_keybindings.c:8 msgid "Single key" @@ -5959,8 +5990,8 @@ msgid "" "The binding key sequence, that you choose, is already used by
" "%s action.
Please choose another binding key sequence." msgstr "" -"La seqüència de drecera de tecles, que ha escollit, està siguent utilitzada " -"per l'acció
%s. Si us plau triï una altra drecera de " +"La seqüència de drecera de tecles, que heu escollit, està essent utilitzada " +"per l'acció
%s. Si us plau escolliu una altra " "seqüència de tecles." #: src/modules/conf_keybindings/e_int_config_mousebindings.c:109 @@ -6096,7 +6127,7 @@ msgstr "Menú principal" #: src/modules/conf_menus/e_int_config_menus.c:258 #: src/modules/fileman/e_mod_menu.c:434 msgid "Favorites" -msgstr "Favorits" +msgstr "Preferits" #: src/modules/conf_menus/e_int_config_menus.c:264 msgid "Applications Display" @@ -6136,11 +6167,11 @@ msgstr "Marges" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:262 #, c-format msgid "%2.0f pixels" -msgstr "%2.0f pixels" +msgstr "%2.0f píxels" #: src/modules/conf_menus/e_int_config_menus.c:292 msgid "Cursor Margin" -msgstr "Marge del cursor " +msgstr "Marge del cursor" #: src/modules/conf_menus/e_int_config_menus.c:297 msgid "Autoscroll" @@ -6153,7 +6184,7 @@ msgstr "Velocitat de desplaçament del menú" #: src/modules/conf_menus/e_int_config_menus.c:303 #, c-format msgid "%5.0f pixels/s" -msgstr "%5.0f pixels/s" +msgstr "%5.0f píxels/s" #: src/modules/conf_menus/e_int_config_menus.c:306 msgid "Fast Mouse Move Threshold" @@ -6163,7 +6194,7 @@ msgstr "Llindar moviment ràpid ratolí" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:197 #, c-format msgid "%4.0f pixels/s" -msgstr "%4.0f pixels/s" +msgstr "%4.0f píxels/s" #: src/modules/conf_menus/e_int_config_menus.c:311 msgid "Click Drag Timeout" @@ -6259,13 +6290,13 @@ msgid "" "does not support composite.

Are you sure you wish to enable ARGB " "support?" msgstr "" -"Ha escollit activar la compatibilitat amb el compositor ARGB
però la seva " -"pantalla no permet compositor.

Esteu realment segur que voleu " +"Heu escollit activar la compatibilitat amb el compositor ARGB
però la " +"vostra pantalla no permet compositor.

Esteu realment segur que voleu " "permetre
l'ús d'ARGB?" #: src/modules/conf_performance/e_int_config_engine.c:114 msgid "Enable" -msgstr "Activat" +msgstr "Activa" #: src/modules/conf_performance/e_int_config_performance.c:36 msgid "Performance Settings" @@ -6273,7 +6304,7 @@ msgstr "Preferències de rendiment" #: src/modules/conf_performance/e_int_config_performance.c:107 msgid "Framerate" -msgstr "Tasa de frames" +msgstr "Fotogrames per segon" #: src/modules/conf_performance/e_int_config_performance.c:109 #, c-format @@ -6322,7 +6353,7 @@ msgstr "Nombre d'arxius Edje a memòria cau" #: src/modules/conf_performance/e_int_config_performance.c:150 #, c-format msgid "%1.0f files" -msgstr "%1.0f fitxers..." +msgstr "%1.0f fitxers" #: src/modules/conf_performance/e_int_config_performance.c:154 msgid "Number of Edje collections to cache" @@ -6400,11 +6431,20 @@ msgstr "Rendiment" msgid "Power Management" msgstr "Gestió d'energia" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Preferències pantalla" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Sortida" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "Restaura en l'arrancada" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" @@ -6417,7 +6457,7 @@ msgstr "Esteu segur que voleu eliminar \"%s\"?" #: src/modules/conf_shelves/e_int_config_shelf.c:393 msgid "Confirm Shelf Deletion" -msgstr "Confirmi eliminació tauler" +msgstr "Confirmeu eliminació tauler" #: src/modules/conf_theme/e_int_config_wallpaper.c:103 msgid "Wallpaper Settings" @@ -6622,7 +6662,7 @@ msgstr "Text capçalera llista (imparell)" #: src/modules/conf_theme/e_int_config_color_classes.c:119 msgid "List Header Background Base (Odd)" -msgstr "Base de dons capçalera llista (imparell)" +msgstr "Base de fons capçalera llista (imparell)" #: src/modules/conf_theme/e_int_config_color_classes.c:120 msgid "Radio Text" @@ -6654,7 +6694,7 @@ msgstr "Etiqueta mòdul" #: src/modules/conf_theme/e_int_config_color_classes.c:131 msgid "Composite Focus-out Color" -msgstr "Color quan pèrdua de focus" +msgstr "Color amb pèrdua de focus" #: src/modules/conf_theme/e_int_config_color_classes.c:163 #: src/modules/conf_theme/e_mod_main.c:240 @@ -6669,22 +6709,22 @@ msgstr "Classe de color:%s" #: src/modules/conf_theme/e_int_config_color_classes.c:278 #, c-format msgid "Selected %u mixed colors classes" -msgstr "Seleccionat %u classes de colors barrejats" +msgstr "Seleccionades %u classes de colors barrejats" #: src/modules/conf_theme/e_int_config_color_classes.c:281 #, c-format msgid "Selected %u unset colors classes" -msgstr "Seleccionat %u classes de colors no assignats" +msgstr "Seleccionades %u classes de colors no assignats" #: src/modules/conf_theme/e_int_config_color_classes.c:284 #, c-format msgid "Selected %u uniform colors classes" -msgstr "Seleccionat %u classes de colors uniformes" +msgstr "Seleccionades %u classes de colors uniformes" #: src/modules/conf_theme/e_int_config_color_classes.c:288 #: src/modules/conf_theme/e_int_config_color_classes.c:548 msgid "No selected color class" -msgstr "No seleccionada classe de color" +msgstr "Classe de color no seleccionada" #: src/modules/conf_theme/e_int_config_color_classes.c:551 msgid "Custom colors" @@ -6769,15 +6809,15 @@ msgstr "Comanda Exebuf" #: src/modules/conf_theme/e_int_config_fonts.c:76 msgid "Splash Title" -msgstr "Títol pantalla presentació" +msgstr "Títol pantalla flaix" #: src/modules/conf_theme/e_int_config_fonts.c:77 msgid "Splash Text" -msgstr "Text pantalla presentació" +msgstr "Text pantalla flaix" #: src/modules/conf_theme/e_int_config_fonts.c:78 msgid "Splash Version" -msgstr "Versió pantalla presentació" +msgstr "Versió pantalla flaix" #: src/modules/conf_theme/e_int_config_fonts.c:79 msgid "Digital Clock" @@ -6809,7 +6849,7 @@ msgstr "Botons de selecció" #: src/modules/conf_theme/e_int_config_fonts.c:88 msgid "Check Buttons" -msgstr "Botons d'opcions" +msgstr "Botons d'opció" #: src/modules/conf_theme/e_int_config_fonts.c:89 msgid "Text List Item" @@ -6862,7 +6902,7 @@ msgstr "Configuració de font" #: src/modules/conf_theme/e_int_config_fonts.c:252 msgid "Tiny" -msgstr "Molt petit" +msgstr "Molt petita" #: src/modules/conf_theme/e_int_config_fonts.c:270 msgid "Big" @@ -7002,7 +7042,7 @@ msgstr "Opcions d'inici" #: src/modules/conf_theme/e_int_config_startup.c:317 msgid "Show Splash Screen on Login" -msgstr "Mostra la pantalla d'inici a l'entrar" +msgstr "Mostra la pantalla flaix en entrar" #: src/modules/conf_theme/e_int_config_transitions.c:46 msgid "Transition Settings" @@ -7061,7 +7101,7 @@ msgstr "Esborra" #: src/modules/conf_theme/e_int_config_theme.c:1409 msgid "Clear All" -msgstr "Esborra tot" +msgstr "Esborra-ho tot" #: src/modules/conf_theme/e_int_config_theme_import.c:66 msgid "Select a Theme..." @@ -7083,7 +7123,7 @@ msgstr "" #: src/modules/conf_theme/e_int_config_theme_import.c:293 msgid "Enlightenment was unable to import the theme
due to a copy error." msgstr "" -"Enlightenment no ha pogut importar el tema
degut a un error de còpia." +"Enlightenment no ha pogut importar el tema
a causa d'un error de còpia." #: src/modules/conf_theme/e_int_config_xsettings.c:61 msgid "Application Theme Settings" @@ -7127,7 +7167,7 @@ msgstr "Preferències menú llista finestres" #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:97 msgid "Group By" -msgstr "Agrupa per " +msgstr "Agrupa per" #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:105 msgid "Include windows from other screens" @@ -7179,7 +7219,7 @@ msgstr "Grup separat" #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:151 msgid "Warp to owning desktop" -msgstr "Envia a escriptori propietari" +msgstr "Envia a l'escriptori propietari" #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:154 msgid "Iconified Windows" @@ -7306,7 +7346,7 @@ msgstr "Acceleració pronunciada, llavors desaccelera" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:241 msgid "Bounce" -msgstr "Rebotar" +msgstr "Rebota" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:246 msgid "Bounce more" @@ -7314,11 +7354,11 @@ msgstr "Rebota més" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:251 msgid "Shading" -msgstr "Contracció" +msgstr "Contreu" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:261 msgid "Keep windows within the visual screen limits" -msgstr "Manté finestres dins del limit visual de pantalla" +msgstr "Manté finestres dins del límit visual de pantalla" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:264 msgid "Allow windows partly out of the visual screen limits" @@ -7351,7 +7391,7 @@ msgstr "Finestra més recent sota el ratolí" #: src/modules/conf_window_manipulation/e_int_config_focus.c:227 #: src/modules/conf_window_manipulation/e_int_config_focus.c:272 msgid "Raise windows on mouse over" -msgstr "Augmenta les finestres quan el ratolí estigui damunt" +msgstr "Eleva les finestres quan el ratolí estigui damunt" #: src/modules/conf_window_manipulation/e_int_config_focus.c:246 #: src/modules/wizard/page_060.c:33 @@ -7372,7 +7412,7 @@ msgstr "Focus a finestra nova" #: src/modules/conf_window_manipulation/e_int_config_focus.c:255 msgid "No window" -msgstr "No finestra" +msgstr "Cap finestra" #: src/modules/conf_window_manipulation/e_int_config_focus.c:257 msgid "All windows" @@ -7436,7 +7476,7 @@ msgstr "Sempre envia els esdeveniments de clic als programes" #: src/modules/conf_window_manipulation/e_int_config_focus.c:318 msgid "Click raises the window" -msgstr "Clic per elevar finestra" +msgstr "Cliqueu per a elevar finestra" #: src/modules/conf_window_manipulation/e_int_config_focus.c:321 msgid "Click focuses the window" @@ -7485,7 +7525,7 @@ msgstr "Expansió intel·ligent" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:225 msgid "Fill available space" -msgstr "Omple espai disponible" +msgstr "Omple l'espai disponible" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:228 msgid "Direction" @@ -7585,7 +7625,7 @@ msgstr "Mata procés si no es pot tancar" #: src/modules/conf_window_manipulation/e_int_config_window_process.c:97 msgid "Kill process instead of client" -msgstr "Mata procés enlloc del client" +msgstr "Mata procés en lloc del client" #: src/modules/conf_window_manipulation/e_int_config_window_process.c:99 msgid "Kill timeout:" @@ -7642,7 +7682,7 @@ msgstr "Ràpida (4 ticks)" #: src/modules/cpufreq/e_mod_main.c:190 msgid "Medium (8 ticks)" -msgstr "Mitjà (8 ticks)" +msgstr "Mitjana (8 ticks)" #: src/modules/cpufreq/e_mod_main.c:197 msgid "Normal (32 ticks)" @@ -7662,7 +7702,7 @@ msgstr "Manual" #: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:267 msgid "Lower Power Automatic" -msgstr "Baixa consum automàticament" +msgstr "Consum baix automàtic" #: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:269 msgid "Automatic Interactive" @@ -7724,9 +7764,8 @@ msgid "" "missing
Kernel modules or features, or your CPU
simply does not " "support this feature." msgstr "" -"El kernel no permet
establir la freqüència de CPU. Potser ha oblidat " -"els
mòduls de kernel o característiques, o la seva CPU
simplement no " -"permet aquesta característica." +"El kernel no permet
establir la freqüència de CPU. Potser heu oblidat " +"els
mòduls o funcions del kernel, o bé la CPU
simplement no ho permet." #: src/modules/cpufreq/e_mod_main.c:489 msgid "" @@ -7745,8 +7784,8 @@ msgid "" "The freqset binary in the cpufreq module
directory cannot be found (stat " "failed)" msgstr "" -"El binari freqset del mòdul cpufreq
del directori no s'ha trobat (estat " -"fallat)" +"No s'ha trobat el binari freqset al directori
del mòdul cpufreq (ha " +"fallat stat)" #: src/modules/cpufreq/e_mod_main.c:1165 msgid "Cpufreq Permissions Error" @@ -7759,9 +7798,9 @@ msgid "" "have the
setuid bit set. Please ensure this is the
case. For example:" "

sudo chown root %s
sudo chmod u+s,a+x %s
" msgstr "" -"El binari freqset al mòdul cpufreq
no és propietat del root o no té " -"configurat
el bit setuid. Si us plau, asseguri's de que
es tracta " -"d'això. Per exemple:

sudo chown root %s
sudo chmod u+s,a+x %s
" +"El binari freqset del mòdul cpufreq
no és propietat del root o no té " +"configurat
el bit setuid. Si us plau, assegureu-vos que
això és " +"correcte. Per exemple:

sudo chown root %s
sudo chmod u+s,a+x %s
" #: src/modules/dropshadow/e_mod_config.c:38 msgid "Dropshadow Settings" @@ -7829,7 +7868,7 @@ msgstr "Extremadament a prop" #: src/modules/dropshadow/e_mod_config.c:145 msgid "Underneath" -msgstr "Sota" +msgstr "Inferior" #: src/modules/dropshadow/e_mod_config.c:149 msgid "Shadow Darkness" @@ -7882,7 +7921,7 @@ msgstr "Preferències Everything" #: src/modules/everything/evry_config.c:364 msgid "Available Plugins" -msgstr "Plugins disponibles" +msgstr "Connectors disponibles" #: src/modules/everything/evry_config.c:370 msgid "Move Up" @@ -7915,7 +7954,7 @@ msgstr "Caràcters mínims per a la recerca" #: src/modules/everything/evry_config.c:412 msgid "Plugin Trigger" -msgstr "Llançador del plugin" +msgstr "Llançador del connector" #: src/modules/everything/evry_config.c:417 msgid "Search only when triggered" @@ -7923,7 +7962,7 @@ msgstr "Només cerca quan s'activa" #: src/modules/everything/evry_config.c:424 msgid "Plugin View" -msgstr "Vista de Plugin" +msgstr "Vista de connectors" #: src/modules/everything/evry_config.c:434 #: src/modules/everything/evry_config.c:462 @@ -7936,7 +7975,7 @@ msgstr "Anima desplaçament" #: src/modules/everything/evry_config.c:474 msgid "Up/Down select next item in icon view" -msgstr "Amunt/Avall seleccioni següent element a la vista d'icona" +msgstr "Amunt/Avall selecciona següent element a la vista d'icona" #: src/modules/everything/evry_config.c:483 msgid "Hide input when inactive" @@ -7976,20 +8015,20 @@ msgstr "Darrer ús" #: src/modules/everything/evry_config.c:526 msgid "Subject Plugins" -msgstr "Plugins personals" +msgstr "Connectors personals" #: src/modules/everything/evry_config.c:530 msgid "Action Plugins" -msgstr "Plugins d'acció" +msgstr "Connectors d'acció" #: src/modules/everything/evry_config.c:534 msgid "Object Plugins" -msgstr "Plugins d'objecte" +msgstr "Connectors d'objecte" #: src/modules/everything/evry_config.c:537 #: src/modules/everything/evry_config.c:736 msgid "Plugins" -msgstr "Plugins" +msgstr "Connectors" #: src/modules/everything/evry_config.c:544 msgid "Popup Size" @@ -8042,7 +8081,7 @@ msgstr "Everything: Ginys" #: src/modules/everything/evry_gadget.c:685 msgid "Plugin" -msgstr "Plugin" +msgstr "Connector" #: src/modules/everything/evry_plug_actions.c:172 msgid "Actions" @@ -8057,7 +8096,7 @@ msgstr[1] "%d elements" #: src/modules/everything/evry_plug_aggregator.c:302 msgid "No plugins loaded" -msgstr "No s'han carregat plugins" +msgstr "No s'han carregat connectors" #: src/modules/everything/evry_plug_apps.c:1148 msgid "Exebuf" @@ -8067,7 +8106,7 @@ msgstr "Exebuf" #: src/modules/everything/evry_plug_apps.c:1210 #: src/modules/fileman/e_fwin.c:2160 src/modules/fileman/e_fwin.c:2526 msgid "Open with..." -msgstr "Obre amb ..." +msgstr "Obre amb..." #: src/modules/everything/evry_plug_apps.c:1176 msgid "Open File..." @@ -8088,7 +8127,7 @@ msgstr "Executa amb sudo" #: src/modules/everything/evry_plug_apps.c:1217 #: src/modules/fileman/e_fwin.c:249 msgid "Open Terminal here" -msgstr "Obre terminal" +msgstr "Obre un terminal aquí" #: src/modules/everything/evry_plug_apps.c:1223 msgid "Run Executable" @@ -8109,13 +8148,13 @@ msgstr "Comanda de terminal" #: src/modules/everything/evry_plug_apps.c:1338 msgid "Sudo GUI" -msgstr "Sudo Interfície gràfica d'usuari" +msgstr "Interfície gràfica de Sudo" #: src/modules/everything/evry_plug_apps.c:1409 #: src/modules/everything/evry_plug_collection.c:146 #: src/modules/everything/evry_plug_files.c:1578 msgid "Everything Plugin" -msgstr "Everything: Plugin" +msgstr "Everything: Connector" #: src/modules/everything/evry_plug_calc.c:265 msgid "Calculator" @@ -8135,7 +8174,7 @@ msgstr "Mou a ..." #: src/modules/everything/evry_plug_files.c:1327 msgid "Move to Trash" -msgstr "Mou a paperera" +msgstr "Mou a la paperera" #: src/modules/everything/evry_plug_files.c:1331 msgid "Open Directory" @@ -8173,7 +8212,7 @@ msgstr "Cerca fitxers en memòria cau" #: src/modules/everything/evry_plug_files.c:1496 msgid "Cache visited directories" -msgstr "Directoris visitats en memòria cau" +msgstr "Directoris visitats en memòria cau" #: src/modules/everything/evry_plug_files.c:1500 msgid "Clear cache" @@ -8204,7 +8243,7 @@ msgstr "Envia a l'escriptori" #: src/modules/everything/evry_plugin.c:208 #, c-format msgid "Show %s Plugin" -msgstr "Mostra plugin %s" +msgstr "Mostra connector %s" #: src/modules/everything/evry_plugin.c:187 #, c-format @@ -8231,27 +8270,28 @@ msgid "" " toggle list view modes
<ctrl+3> " "toggle thumb view modes" msgstr "" -"Bé, aqui hi ha l'explicació de tot...
Escrigui algunes " -"lletres del que està cercant.
Utilitzi el cursor amunt/avall per escollir de la llista de coses.
Premi <TAB> per escollir una acció, llavors premi <ENTER>.
Aquesta pàgina no es mostrarà quan executi qualsevol " -"cosa.
<ESC> tanca aquesta " -"finestra
<?> mostra aquesta pàgina
" -"<ENTER> executa acció
<CTRL+ENTER>" -" executa acció i continua
<TAB> " -"canvia selecció
<CRTL+TAB> completa entrada " -"(depen de plugin)
<CTRL+'x'> salta al plugin " -"que comença per 'x'
<CRTL+esquerra " -"Desplaça a través plugins
<CTRL+amunt/avall> " -"va al primer/últim element
<CTRL+1> canvia " -"mode vista (surt d'aquesta pàgina)
<CTRL+2> " -"canvia mode vista de llista
<CTRL+3> Canvia " -"mode vista miniatura" +" Bé, aquí hi ha l'explicació de tot...
Escriviu " +"algunes lletres del que esteu cercant.
Utilitzeu el cursor " +"amunt/avall per a escollir de la llista de coses.
Premeu " +"<TAB> per a escollir una acció, llavors premeu " +"<ENTER>.
Aquesta pàgina no es mostrarà quan " +"executeu qualsevol cosa.
<ESC> tanca aquesta finestra
<?> mostra " +"aquesta pàgina
<ENTER> executa " +"acció
<CTRL+ENTER> executa acció i continua
" +"<TAB> canvia selecció
<CRTL+TAB> completa entrada (depèn de connector)
<CTRL" +"+'x'> salta al connector que comença per 'x'
" +"<CRTL+esquerra Desplaça a través de " +"connectors
<CTRL+amunt/avall> va al primer/" +"últim element
<CTRL+1> canvia mode vista " +"(surt d'aquesta pàgina)
<CTRL+2> canvia mode " +"vista de llista
<CTRL+3> Canvia mode vista " +"miniatura" #: src/modules/everything/evry_view_tabs.c:93 msgid "Back" -msgstr "Enrera" +msgstr "Enrere" #: src/modules/fileman/e_fwin.c:2051 msgid "Other application..." @@ -8290,7 +8330,7 @@ msgstr "Aplicacions conegudes" #: src/modules/fileman/e_fwin.c:2609 msgid "Suggested Applications" -msgstr "Aplicacions suggerides " +msgstr "Aplicacions suggerides" #: src/modules/fileman/e_fwin.c:2644 msgid "All Applications" @@ -8310,7 +8350,7 @@ msgstr "Còpia interrompuda" #: src/modules/fileman_opinfo/e_mod_main.c:109 #, c-format msgid "Moving is aborted" -msgstr "Moure interromput" +msgstr "Desplaçament interromput" #: src/modules/fileman/e_fwin.c:2970 #: src/modules/fileman_opinfo/e_mod_main.c:113 @@ -8334,7 +8374,7 @@ msgstr "Operació desconeguda interrompuda" #: src/modules/fileman_opinfo/e_mod_main.c:131 #, c-format msgid "Copy of %s done" -msgstr "Còpia de %s realitzada" +msgstr "Ha acabat la còpia de %s" #: src/modules/fileman/e_fwin.c:2990 #: src/modules/fileman_opinfo/e_mod_main.c:133 @@ -8346,7 +8386,7 @@ msgstr "Copiant %s (falta: %s)" #: src/modules/fileman_opinfo/e_mod_main.c:139 #, c-format msgid "Move of %s done" -msgstr "Moure %s realitzat" +msgstr "Ha acabat el desplaçament de %s" #: src/modules/fileman/e_fwin.c:2997 #: src/modules/fileman_opinfo/e_mod_main.c:141 @@ -8552,7 +8592,7 @@ msgstr "Ajudes emergents" #: src/modules/fileman/e_mod_main.c:41 src/modules/fileman/e_mod_main.c:55 msgid "File Manager" -msgstr "Gestor de fitxers " +msgstr "Gestor de fitxers" #: src/modules/fileman/e_mod_main.c:58 msgid "Navigate" @@ -8560,7 +8600,7 @@ msgstr "Navega" #: src/modules/fileman/e_mod_main.c:275 msgid "Fileman" -msgstr "gestor de fitxers" +msgstr "Gestor de fitxers" #: src/modules/fileman/e_mod_menu.c:239 msgid "No listable items" @@ -8580,7 +8620,7 @@ msgstr "Carpeta personal" #: src/modules/fileman/e_mod_menu.c:448 msgid "Root" -msgstr "Sistema de fitxers" +msgstr "Arrel" #: src/modules/fileman/e_mod_menu.c:488 msgid "Navigate..." @@ -8761,11 +8801,11 @@ msgstr "Alineament vertical" #: src/modules/winlist/e_int_config_winlist.c:300 msgid "Alignment" -msgstr "Alineament " +msgstr "Alineament" #: src/modules/winlist/e_mod_main.c:28 msgid "Window Switcher" -msgstr "Conmutador de finestres" +msgstr "Commutador de finestres" #: src/modules/winlist/e_mod_main.c:41 msgid "Next Window" @@ -8834,7 +8874,7 @@ msgstr "Preferències IBar" #: src/modules/ibar/e_mod_config.c:102 msgid "Selected source" -msgstr "Origen selecciont" +msgstr "Origen seleccionat" #: src/modules/ibar/e_mod_config.c:114 msgid "Setup" @@ -8866,7 +8906,7 @@ msgstr "Crea un nou origen per IBar" #: src/modules/ibar/e_mod_config.c:180 msgid "Enter a name for this new source:" -msgstr "Introdueixi un nom per aquest nou origen:" +msgstr "Introduïu un nom per aquest nou origen:" #: src/modules/ibar/e_mod_config.c:194 #, c-format @@ -8874,7 +8914,7 @@ msgid "" "You requested to delete \"%s\".

Are you sure you want to delete this " "bar source?" msgstr "" -"Ha demanat eliminar \"%s\".

Esteu segur que voleu eliminar l'origen " +"Heu demanat eliminar \"%s\".

Esteu segur que voleu eliminar l'origen " "de la barra?" #: src/modules/ibar/e_mod_config.c:198 @@ -8916,7 +8956,7 @@ msgstr "Mostra nom" #: src/modules/ibox/e_mod_config.c:110 msgid "Display Title" -msgstr "Mostra títol " +msgstr "Mostra títol" #: src/modules/ibox/e_mod_config.c:115 msgid "Display Class" @@ -8924,7 +8964,7 @@ msgstr "Mostra classe" #: src/modules/ibox/e_mod_config.c:120 msgid "Display Icon Name" -msgstr "Mostra nom d'icona " +msgstr "Mostra nom d'icona" #: src/modules/ibox/e_mod_config.c:125 msgid "Display Border Caption" @@ -8976,7 +9016,7 @@ msgstr "Mostra finestra emergent per finestres urgents" #: src/modules/pager/e_mod_config.c:198 msgid "Resistance to dragging" -msgstr "Resistència a l'arrossegar" +msgstr "Resistència en arrossegar" #: src/modules/pager/e_mod_config.c:200 src/modules/pager/e_mod_config.c:239 #: src/modules/pager/e_mod_config.c:258 @@ -8986,17 +9026,17 @@ msgstr "%.0f px" #: src/modules/pager/e_mod_config.c:205 msgid "Select and Slide button" -msgstr "Botó per seleccionar i desplaçar" +msgstr "Botó per a seleccionar i desplaçar" #: src/modules/pager/e_mod_config.c:207 src/modules/pager/e_mod_config.c:215 #: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:368 #, c-format msgid "Click to set" -msgstr "Cliqui per establir" +msgstr "Cliqueu per a establir" #: src/modules/pager/e_mod_config.c:213 msgid "Drag and Drop button" -msgstr "Botó arrossegar i deixar anar" +msgstr "Botó Arrossegar i deixar anar" #: src/modules/pager/e_mod_config.c:219 msgid "Drag whole desktop" @@ -9087,16 +9127,16 @@ msgstr "Preferències físiques" #: src/modules/physics/e_mod_config.c:107 msgid "Physics delay after drag" -msgstr "Retard físiques després d'arrossegar" +msgstr "Retard física després d'arrossegar" #: src/modules/physics/e_mod_config.c:109 #, c-format msgid "%2.0f Frames" -msgstr "%2.0f frames" +msgstr "%2.0f fotogrames" #: src/modules/physics/e_mod_config.c:111 msgid "Maximum window mass" -msgstr "Massa màxima finestra" +msgstr "Massa màxima de finestra" #: src/modules/physics/e_mod_config.c:113 #, c-format @@ -9105,7 +9145,7 @@ msgstr "%2.1f kg" #: src/modules/physics/e_mod_config.c:115 msgid "Desktop gravity" -msgstr "Gravetat escriptori" +msgstr "Gravetat de l'escriptori" #: src/modules/physics/e_mod_config.c:117 #, c-format @@ -9139,23 +9179,23 @@ msgstr "Ignora" #: src/modules/physics/e_mod_main.c:29 src/modules/physics/e_mod_main.c:47 #: src/modules/physics/e_mod_main.c:54 msgid "Physics" -msgstr "Físiques" +msgstr "Física" #: src/modules/physics/e_mod_main.c:30 msgid "" "Cowardly refusing to battle
with the Tiling module for control
of your " "windows. There can be only one!" msgstr "" -"Rebutjant covardament barallar-se
amb el mòdul de Mosaic pel " -"control
de les finestres. Només podia ser el carallot de vostè!" +"Es rebutja, covardament, la batalla
amb el mòdul de Mosaic pel " +"control
de les finestres. Només n'hi pot haver un!" #: src/modules/physics/e_mod_main.c:68 msgid "Physics Error" -msgstr "Error de físiques" +msgstr "Error de física" #: src/modules/physics/e_mod_main.c:68 msgid "The physics module could not be started" -msgstr "El mòdul de físiques no es pot iniciar" +msgstr "El mòdul de física no es pot iniciar" #: src/modules/syscon/e_int_config_syscon.c:43 msgid "Syscon Settings" @@ -9171,7 +9211,7 @@ msgstr "Extra" #: src/modules/syscon/e_int_config_syscon.c:161 msgid "Icon Sizes" -msgstr "Tamany icona" +msgstr "Mida icona" #: src/modules/syscon/e_int_config_syscon.c:165 msgid "Do default action after timeout" @@ -9255,7 +9295,7 @@ msgstr "Següent" #: src/modules/wizard/e_wizard.c:266 msgid "Please Wait..." -msgstr "Si us plau, esperi ..." +msgstr "Si us plau, espereu ..." #: src/modules/wizard/e_wizard.c:314 msgid "Welcome to Enlightenment" @@ -9264,7 +9304,7 @@ msgstr "Benvingut a Enlightenment" #: src/modules/wizard/page_010.c:161 src/modules/wizard/page_011.c:143 #: src/modules/wizard/page_020.c:52 msgid "Select one" -msgstr "Seleccioni un" +msgstr "Seleccioneu-ne un" #: src/modules/wizard/page_020.c:51 msgid "Profile" @@ -9292,11 +9332,11 @@ msgstr "Gestió de xarxa" #: src/modules/wizard/page_110.c:17 msgid "Connman network service not found" -msgstr "Servei de xarxa Connman no trobat" +msgstr "No s'ha trobat el servei de xarxa Connman" #: src/modules/wizard/page_110.c:20 msgid "Install Connman for network management support" -msgstr "Instal·la Connman per poder gestionar la xarxa" +msgstr "Instal·leu Connman per a poder gestionar la xarxa" #: src/modules/wizard/page_110.c:23 msgid "Connman support disabled" @@ -9304,7 +9344,7 @@ msgstr "Suport Connman desactivat" #: src/modules/wizard/page_110.c:26 msgid "Install/Enable Connman for network management support" -msgstr "Instal·la/Activa Connman per poder gestionar la xarxa" +msgstr "Instal·leu/Activeu Connman per a poder gestionar la xarxa" #: src/modules/wizard/page_110.c:156 msgid "Checking to see if Connman exists" @@ -9327,11 +9367,11 @@ msgid "" "GPU
with well written drivers.
It also will add between 10 to
100 " "MB to the memory needed
for Enlightenment." msgstr "" -"La composició activa la transparència de les finestres i efectes com " +"La composició activa la transparència
de les finestres i efectes com " "ara
aparició, desaparició i zoom
És molt recomanable activar aquesta " -"opció per tenir una millor experiència d'usuari.
Per altre cantó,es " -"necessita potència extra de CPU i una GPU que permeti GLSL Shader.
A més, " -"augmenta fins a 100 MB la memòria utilitzada per Enlightenment." +"opció
per tenir una millor experiència d'usuari.
Per altra banda, es " +"necessita
potència extra de CPU i
una GPU que permeti GLSL Shader." +"
A més, augmenta fins a 100 MB
la memòria utilitzada per Enlightenment." #: src/modules/wizard/page_150.c:117 msgid "Enable Compositing" @@ -9343,7 +9383,7 @@ msgstr "Acceleració per maquinari (OpenGL)" #: src/modules/wizard/page_150.c:125 msgid "Tear-free Rendering (OpenGL only)" -msgstr "Sincronització vertical (OpenGL only)" +msgstr "Sincronització vertical (només OpenGL)" #: src/modules/wizard/page_170.c:24 msgid "Updates" @@ -9368,14 +9408,14 @@ msgid "" msgstr "" "Enlightenment pot comprovar la disponibilitat de
noves versions, " "actualitzacions, pegats de seguretat i
errors, així com també " -"complements.

Això és molt útil, perquè això li permet
saber si hi " -"ha solucions pels errors i
problemes de seguretat que succeeixin. Per " +"complements.

Això és molt útil, perquè això permet
saber si hi ha " +"solucions pels errors i
problemes de seguretat que apareguin. Per " "aquest
motiu, Enlightenment pot connectar a
enlightenment.org i " "transmetre alguna
informació, tal com ho fa per exemple qualsevol " -"navegador.
Cap dada personal com ara
nom, contrasenya o qualsevol " -"altre tipus de fitxers personals
no seran transmesos. Si no ho vol,
" -"si us plau, desactivi l'actualització a sota. No obstant això,
li " -"recomanem que no la desactivi
ja que podria ser vulnerable o " +"navegador.
NO es transmetrà cap dada privada com ara
nom, contrasenya " +"o qualsevol altre tipus de fitxers personals
. Si no ho voleu,
si us " +"plau, desactiveu l'actualització a sota. No obstant això,
us recomanem " +"que no la desactiveu
ja que podríeu patir vulnerabilitats o " "tenir
errors de programari." #: src/modules/wizard/page_170.c:53 @@ -9451,11 +9491,11 @@ msgstr "" #: src/modules/mixer/conf_gadget.c:317 msgid "Sound Cards" -msgstr "Targetes de só" +msgstr "Targetes de so" #: src/modules/mixer/conf_gadget.c:378 msgid "Mixer Settings" -msgstr "Preferències mesclador " +msgstr "Preferències mesclador" #: src/modules/mixer/conf_module.c:93 msgid "Mixer to use for global actions:" @@ -9495,15 +9535,15 @@ msgstr "Mòdul mesclador" #: src/modules/mixer/e_mod_main.c:1385 msgid "Increase Volume" -msgstr "Puja volum" +msgstr "Augmenta el volum" #: src/modules/mixer/e_mod_main.c:1386 msgid "Decrease Volume" -msgstr "Baixa volum" +msgstr "Disminueix el volum" #: src/modules/mixer/e_mod_main.c:1387 msgid "Mute Volume" -msgstr "Silenci" +msgstr "Silencia" #: src/modules/connman/e_mod_main.c:10 msgid "Connection Manager" @@ -9511,7 +9551,7 @@ msgstr "Gestió de connexions" #: src/modules/connman/e_mod_main.c:237 msgid "Missing Application" -msgstr "No s'ha trobat aplicació" +msgstr "No s'ha trobat l'aplicació" #: src/modules/connman/e_mod_main.c:238 msgid "" @@ -9519,7 +9559,7 @@ msgid "" "exist.
Please install EConnMan application." msgstr "" "Aquest mòdul vol executar una aplicació externa EConnMan que no existeix." -"
Si us plau, instal·li l'aplicació EConnMan." +"
Si us plau, instal·leu l'aplicació EConnMan." #: src/modules/connman/e_mod_main.c:315 msgid "Wifi On" @@ -9527,7 +9567,7 @@ msgstr "Wifi activat" #: src/modules/quickaccess/e_mod_config.c:226 msgid "Enter a unique name for this entry" -msgstr "Entri un nom únic per aquesta entrada" +msgstr "Escriviu un nom únic per aquesta entrada" #: src/modules/quickaccess/e_mod_config.c:247 msgid "Disable Warning Dialogs" @@ -9543,7 +9583,7 @@ msgstr "Entrades" #: src/modules/quickaccess/e_mod_config.c:336 msgid "Hide Instead Of Raising" -msgstr "Oculta enlloc de pujar" +msgstr "Oculta enlloc d'elevar" #: src/modules/quickaccess/e_mod_config.c:339 msgid "Hide If Focus Lost" @@ -9565,11 +9605,11 @@ msgstr "Alterna visibilitat" #: src/modules/quickaccess/e_mod_quickaccess.c:9 msgid "Add Quickaccess For Current Window" -msgstr "Afegir accés ràpid per aquesta Finestra" +msgstr "Afegir accés ràpid per aquesta finestra" #: src/modules/quickaccess/e_mod_quickaccess.c:10 msgid "Remove Quickaccess From Current Window" -msgstr "Elimina accés ràpid per aquesta Finestra" +msgstr "Elimina accés ràpid per aquesta finestra" #: src/modules/quickaccess/e_mod_quickaccess.c:265 #: src/modules/quickaccess/e_mod_quickaccess.c:343 @@ -9595,13 +9635,13 @@ msgid "" "this
is a terminal which can change its window name.
Alternatively, " "you can add a data.item to" msgstr "" -"L'opció de rellançar està pensada
per crear aplicacions persistents de " +"L'opció de rellançar està pensada
per a crear aplicacions persistents de " "terminalque s'obren de nou quan es tanquen, com ara terminal desplegable " "estil quake.
O qualsevol de les dues següents: l'aplicació seleccionada " -"no és terminal
o bé la bandera de la linea de comandes per canviar el " +"no és terminal
o bé la bandera de la línia de comandes per canviar el " "nom
de la finestra dels terminals no és conegut. Pot reportar un error de " "programari d'això
si és un terminal on es pugui canviar el nom de " -"finestra.
Alternativament, pots afegir-hi contingut o elements." +"finestra.
Alternativament, podeu afegir-hi contingut o elements." #: src/modules/quickaccess/e_mod_quickaccess.c:314 msgid "Like so:" @@ -9623,8 +9663,7 @@ msgstr "Ajuda accés ràpid" #: src/modules/quickaccess/e_mod_quickaccess.c:343 msgid "Cannot set relaunch for window without name and class!" -msgstr "" -"No es pot configurar rellançament per una finestra sense nom i classe! " +msgstr "No es pot configurar rellançament per una finestra sense nom i classe!" #: src/modules/quickaccess/e_mod_quickaccess.c:350 msgid "Cannot set relaunch for internal E dialog!" @@ -9638,10 +9677,10 @@ msgid "" "app is unknown to us
or it is not intended for use with this option." "
Please choose an action to take:" msgstr "" -"La finestra creada seleccionada amb el nom
%s
i classe
%s
no ha " -"estat trobada a la base de dades de l'aplicació accés ràpid
Això " +"No s'ha trobat la finestra seleccionada creada amb el nom
%s
i " +"classe
%s
a la base de dades de l'aplicació accés ràpid.
Això " "significa que aquesta aplicació és desconeguda
o no s'utilitza amb " -"aquesta opció.
Si us plau, triï una acció a fer :" +"aquesta opció.
Si us plau, escolliu una acció a fer:" #: src/modules/quickaccess/e_mod_quickaccess.c:379 #: src/modules/quickaccess/e_mod_quickaccess.c:977 @@ -9669,7 +9708,7 @@ msgstr "La drecera de teclat que s'ha entrat ja s'està utilitzant!" #: src/modules/quickaccess/e_mod_quickaccess.c:798 msgid "Hide Instead Of Raise" -msgstr "Oculta enlloc d'aparèixer" +msgstr "Oculta en lloc d'elevar" #: src/modules/quickaccess/e_mod_quickaccess.c:805 msgid "Jump Mode" @@ -9717,7 +9756,7 @@ msgstr "" #: src/modules/quickaccess/e_mod_quickaccess.c:975 msgid "You deleted it on your own, you rascal!
Way to go!" -msgstr "Ha eliminat això vostè mateix, és un carallot!! El felicito fill!!" +msgstr "Heu eliminat això vós mateix, carallot!
Així es fa!" #: src/modules/quickaccess/e_mod_quickaccess.c:977 #: src/modules/quickaccess/e_mod_quickaccess.c:1018 @@ -9728,23 +9767,24 @@ msgstr "Atura" #: src/modules/quickaccess/e_mod_quickaccess.c:994 msgid "Great! Activate the Quickaccess entry again to show it!" -msgstr "Genial! Activi l'entrada d'accés ràpid altre cop per mostrar-ho!" +msgstr "Genial! Activeu l'entrada d'accés ràpid un altre cop per a mostrar-ho!" #: src/modules/quickaccess/e_mod_quickaccess.c:996 msgid "Great! Activate the Quickaccess entry again to hide it!" -msgstr "Genial! Activi l'entrada de accés ràpid altre cop per ocultar-ho!" +msgstr "" +"Genial! Activeu l'entrada de accés ràpid un altre cop per a ocultar-ho!" #: src/modules/quickaccess/e_mod_quickaccess.c:1016 msgid "Well done.
Now to delete the entry we just made..." -msgstr "Ben fet.
Ara per eliminar l'entrada només ha de fer ..." +msgstr "Ben fet.
Ara per eliminar l'entrada només heu de..." #: src/modules/quickaccess/e_mod_quickaccess.c:1032 msgid "" "The demo dialog has been bound to the keys you pressed.
Try pressing the " "same keys!" msgstr "" -"El diàleg de demostració ha estat enllaçat amb les tecles que ha presionat." -"
Provi prement les mateixes tecles!" +"El diàleg de demostració ha estat enllaçat amb les tecles que heu pressionat." +"
Proveu prement les mateixes tecles!" #: src/modules/quickaccess/e_mod_quickaccess.c:1197 msgid "" @@ -9767,7 +9807,7 @@ msgid "" "
Click Continue to see a demonstration." msgstr "" "Les entrades d'accés ràpid poden ser creades des de
la vora de menú de " -"qualsevol finestra.
Premi Continua per veure una demostració." +"qualsevol finestra.
Premeu Continua per a veure'n una demostració." #: src/modules/quickaccess/e_mod_quickaccess.c:1248 msgid "" @@ -9778,7 +9818,7 @@ msgid "" msgstr "" "Accés ràpid és la forma d'utilitzar dreceres seleccionades per l'usuari per " "finestres i aplicacions.
Un cop l'entrada d'accés ràpid hagi estat " -"creada,
la finestra associada tornarà a aparèixer
si es clica la " +"creada,
la finestra associada tornarà a aparèixer
si es clica la " "drecera de teclat." #: src/modules/quickaccess/e_mod_quickaccess.c:1265 @@ -9786,8 +9826,8 @@ msgid "" "This appears to be your first time using the Quickaccess module.
Would " "you like some usage tips?" msgstr "" -"Sembla ser que és la primera vegada que utilitza el mòdul accés ràpid." -"
Vol alguns consells d'ús?" +"Sembla ser que és la primera vegada que utilitzeu el mòdul accés ràpid." +"
Voleu alguns consells d'ús?" #: src/modules/quickaccess/e_mod_quickaccess.c:1312 msgid "quick access name/identifier" @@ -9839,13 +9879,13 @@ msgid "" "File has an unspecified extension.
Please use '.jpg' or '.png' " "extensions
only as other formats are not
supported currently." msgstr "" -"El fitxer té una extensió no especificada.
Si us plau, utilitzi només " -"extensions '.jpg' o '.png'
ja que els altres formats no són " -"
actualment admesos." +"El fitxer té una extensió no especificada.
Si us plau, utilitzeu només " +"extensions '.jpg' o '.png'
ja que els altres formats no són
admesos " +"en aquests moments." #: src/modules/shot/e_mod_main.c:277 msgid "Select screenshot save location" -msgstr "Seleccioni ubicació on guardar captura de pantalla" +msgstr "Seleccioneu la ubicació on guardar la captura" #: src/modules/shot/e_mod_main.c:289 src/modules/shot/e_mod_main.c:800 msgid "Save" @@ -9915,11 +9955,11 @@ msgstr "Pujant captura de pantalla" #: src/modules/shot/e_mod_main.c:527 msgid "Uploading ..." -msgstr "Pujant...." +msgstr "Pujant ..." #: src/modules/shot/e_mod_main.c:532 msgid "Screenshot is available at this location:" -msgstr "Captura de pantalla ubicada en aquest lloc:" +msgstr "La captura de pantalla és a:" #: src/modules/shot/e_mod_main.c:541 msgid "Hide" @@ -9927,7 +9967,7 @@ msgstr "Oculta" #: src/modules/shot/e_mod_main.c:565 msgid "Confirm Share" -msgstr "Confirmi compartició" +msgstr "Confirmeu compartició" #: src/modules/shot/e_mod_main.c:566 msgid "" @@ -9943,7 +9983,7 @@ msgstr "Confirma" #: src/modules/shot/e_mod_main.c:669 msgid "Where to put Screenshot..." -msgstr "On vol desar la captura de pantalla..." +msgstr "On voleu desar la captura de pantalla..." #: src/modules/shot/e_mod_main.c:725 msgid "Perfect" @@ -10036,7 +10076,7 @@ msgstr "Mosaic" #: src/modules/tiling/e_mod_tiling.c:4089 msgid "Toggle floating" -msgstr "Conmuta flotant" +msgstr "Commuta flotant" #: src/modules/tiling/e_mod_tiling.c:4092 msgid "Add a stack" @@ -10146,15 +10186,15 @@ msgstr "" #: src/modules/notification/e_mod_main.c:73 msgid "Exited Presentation Mode" -msgstr "Ha sortit del mode presentació" +msgstr "S'ha sortit del mode presentació" #: src/modules/notification/e_mod_main.c:74 msgid "" "Presentation mode is over.
Now screen saver, lock and power saving " "settings will be restored." msgstr "" -"Mode presentació apagat.
Ara l'estalvi de pantalla, bloqueig i estalvi " -"d'energia seran restaurats" +"Mode de presentació apagat.
Es restauraran l'estalvi de pantalla, el " +"bloqueig i l'estalvi d'energia." #: src/modules/notification/e_mod_main.c:89 msgid "Enter Offline Mode" @@ -10165,20 +10205,19 @@ msgid "" "Enlightenment is in offline mode.
During offline mode, modules " "that use network will stop polling remote services." msgstr "" -"Enlightenment és en mode desconnectat.
Mentre estigui " -"desconnectat, els mòduls que utilitzen la xarxa aturaran els serveis de " -"sondeig remot." +"Enlightenment és en mode desconnectat.
Mentre estigui desconnectat " +"els mòduls que utilitzen la xarxa aturaran els serveis de sondeig remot." #: src/modules/notification/e_mod_main.c:96 msgid "Exited Offline Mode" -msgstr "Ha sortit del mode desconnectat" +msgstr "S'ha sortit del mode desconnectat" #: src/modules/notification/e_mod_main.c:97 msgid "" "Now in online mode.
Now modules that use network will resume " "regular tasks." msgstr "" -"Ara és troba en mode connectat
Els mòduls que utilitzen la xarxa " +"Ara s'utilitza el mode connectat
Els mòduls que utilitzen la xarxa " "restabliran les seves tasques." #: src/modules/notification/e_mod_main.c:172 @@ -10194,8 +10233,8 @@ msgid "" "Error during DBus init! Please check if dbus is correctly installed and " "running." msgstr "" -"Error en la inicialització de DBus! Comprovi que D-Bus està correctament " -"instal·lat i funcionant" +"Error en la inicialització de DBus! Comproveu que D-Bus està correctament " +"instal·lat i funcionant." #: src/modules/notification/e_mod_config.c:45 msgid "Notification Settings" @@ -10518,9 +10557,6 @@ msgstr "Utilitza geometria de múltiples monitors" #~ msgid "Use shaped windows instead of ARGB" #~ msgstr "Utilitza finestres amb forma enlloc d'ARGB" -#~ msgid "Restore On Startup" -#~ msgstr "Restaura en l'arrancada" - #~ msgid "randr" #~ msgstr "randr" diff --git a/po/cs.gmo b/po/cs.gmo index 09533eea9e..7967349f12 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 63f838a56b..3f597b1b53 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-21 20:27+0100\n" "Last-Translator: \n" "Language-Team: Czech \n" @@ -815,7 +815,7 @@ msgstr "Vybrat" msgid "Cancel" msgstr "Zrušit" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -833,7 +833,7 @@ msgstr "" "si můžete nastavit Enlightenment zpět k obrazu svému.
Omlouváme se za " "způsobené potíže.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -847,11 +847,11 @@ msgstr "" "Enlightenmentu. Je to zlé a jako protiopatření
bylo vaše nastavení " "vráceno do původních hodnot.
Omlouváme se za způsobené potíže.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problémy při zápisu nastavení E17" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -861,14 +861,15 @@ msgstr "" "V Enlightenmentu nastal problém při přesunu
souborů nastavení z:
" "%s

do:
%s

Zbytek byl přerušen kvůli bezpečnosti.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -879,19 +880,19 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Nastavení aktualizováno" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "Rutina EET obsluhující soubory je špatná." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Data souboru jsou prázdná." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -899,15 +900,15 @@ msgstr "" "Soubor není zapisovatelný. Možná je disk pouze pro
čtení nebo chybí práva " "k souborům." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "Došla paměť při přípravě k zápisu.
Prosím uvolněte ji." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Toto je obecná chyba." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -915,59 +916,59 @@ msgstr "" "Soubor s nastavením je moc velký.
Měl by být velmi malý (maximálně pár " "stovek KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Máte I/O chyby na disku.
Nepotřebuje ho vyměnit?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Během zápisu souboru došlo místo na disku." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Soubor byl zavřen během zápisu." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Mapování paměti (mmap) souboru selhalo." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Kódování X509 selhalo." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Podpis selhal." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Podpis byl neplatný." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Nepodepsáno." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Funkce nebyla implementována." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "PRNG nebyl nasazen." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Šifrování selhalo." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Dešifrování selhalo." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Chyba je Enlightenmentu neznámá." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3903,6 +3904,27 @@ msgstr "Začít přesouvání/zvětšování/zmenšování prvků" msgid "Set Toolbar Contents" msgstr "Nastavit obsah panelu nástrojů" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Aktualizace" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6402,11 +6424,21 @@ msgstr "Výkon" msgid "Power Management" msgstr "Správa napájení" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Nastavení obrazovky" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Výstup" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Uzamknout při spuštění" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -8253,14 +8285,14 @@ msgstr "" "dialog
<?>zobrazí tuto nápovědu
" "<return> vyvolá akci
<ctrl" "+return> vyvolá akci bez zavření tohoto dialogu
" -"<ctrl+tab> doplní vstup (závisí na pluginu)" -"
<ctrl+'x'> přejde na plugin začínající " -"na 'x'
<ctrl+doleva/ doprava> přepíná " -"mezi pluginy
<ctrl+nahoru/ dolu> přejde " -"na první/poslední položku
<ctrl+1> " -"přepne režim zobrazení (a opustí nápovědu ;)
<ctrl" -"+2> přepne režim zobrazení seznamu
<ctrl" -"+3> přepne režim zobrazení ikon" +"<ctrl+tab> doplní vstup (závisí na " +"pluginu)
<ctrl+'x'> přejde na plugin " +"začínající na 'x'
<ctrl+doleva/ doprava> " +"přepíná mezi pluginy
<ctrl+nahoru/ dolu> " +"přejde na první/poslední položku
<ctrl+1> přepne režim zobrazení (a opustí nápovědu ;)
" +"<ctrl+2> přepne režim zobrazení seznamu
" +"<ctrl+3> přepne režim zobrazení ikon" #: src/modules/everything/evry_view_tabs.c:93 msgid "Back" diff --git a/po/da.gmo b/po/da.gmo index a8270d1c72..9bb859a738 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 36ea252a71..4ad445403f 100644 --- a/po/da.po +++ b/po/da.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-12-31 01:44+0000\n" "Last-Translator: nanker \n" "Language-Team: Danish\n" -"Language: \n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -898,7 +898,7 @@ msgstr "Vælg et vindue" msgid "Cancel" msgstr "Fortryd" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -909,7 +909,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -918,11 +918,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -930,14 +930,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -948,22 +949,22 @@ msgstr "" msgid "OK" msgstr "O.k." -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 #, fuzzy msgid "Settings Upgraded" msgstr "Indstillinger Opgraderet" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET fil Håndtaget er dårlig." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Fildataene er tom." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -972,19 +973,19 @@ msgstr "" "Filen er ikke skrivbar. MÃ¥ske disken er skrivebeskyttet
eller du mistet " "tilladelser til dine filer." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Hukommelse løb ud, mens udarbejdelsen af ​​skrive.
venligst frigøre " "hukommelse." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Dette er en generisk fejl." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -993,70 +994,70 @@ msgstr "" "Den indstillinger fil er for stor.
Det bør være meget små (nogle hundrede " "KB højst)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Du løb tør for plads , mens du skriver filen" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Filen blev lukket på det , mens du skriver." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Hukommelse -mapping (mmap) af filen mislykkedes." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Kodning mislykkedes." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Signatur mislykkedes." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Signaturen er ugyldig." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Ingen vinduer)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Funktionen er ikke implementeret." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG blev ikke podet." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Kryptering mislykkedes." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Desktop-fil" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4236,6 +4237,27 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "Sæt Toolbar Indhold" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "stat" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -7024,12 +7046,22 @@ msgstr "Ydelse" msgid "Power Management" msgstr "Power Management" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Screen Saver" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Output" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Sæt kontrollør ved opstart" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -12521,9 +12553,6 @@ msgstr "" #~ msgid "Set Poll Time" #~ msgstr "Sæt forespørgelsesinterval" -#~ msgid "Restore Controller on Startup" -#~ msgstr "Sæt kontrollør ved opstart" - #~ msgid "Check Fast (0.5 sec)" #~ msgstr "Tjek hurtigt (0.5 sek.)" diff --git a/po/de.gmo b/po/de.gmo index 07936bee86..245a7de57d 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index f7d441a9a5..4684ae8bce 100644 --- a/po/de.po +++ b/po/de.po @@ -26,11 +26,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-21 13:52+0100\n" "Last-Translator: Thomas Gstädtner \n" "Language-Team: E17-de\n" -"Language: German\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -835,7 +835,7 @@ msgstr "Auswählen" msgid "Cancel" msgstr "Abbrechen" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -853,7 +853,7 @@ msgstr "" "anpassen, wenn
Sie möchten. Bitte entschuldigen Sie die " "Unannehmlichkeiten.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -869,11 +869,11 @@ msgstr "" "Standardeinstellungen
benutzt. Bitte entschuldigen Sie die " "Unannehmlichkeiten.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Schreibprobleme bei den Enlightenment-Einstellungen" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -883,14 +883,15 @@ msgstr "" "Enlightenment konnte die Konfigurationsdateien nicht von
%s
nach
" "%s
verschieben.
Sicherheitshalber wurde der Schreibvorgang abgebrochen." -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -901,19 +902,19 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Einstellungen wurden aktualisiert" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "Der Dateihandle für EET ist kaputt." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Die Dateidaten sind leer." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -921,17 +922,17 @@ msgstr "" "Die Datei kann nicht beschrieben werden. Vielleicht ist die
Platte nur " "beschreibbar oder Sie haben die Berechtigungen
verloren." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Kein freier Speicher mehr beim Vorbereiten
des Schreibvorgangs. Bitte " "geben Sie zusätzlichen
Speicher frei." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Dies ist ein allgemeiner Fehler." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -939,61 +940,61 @@ msgstr "" "Die Einstellungsdatei ist zu groß.
Sie sollte eigentlich sehr klein " "sein
(höchstens einige Hundert KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" "Es gibt Lese-/Schreib-Fehler mit Ihrer Platte.
Vielleicht muss sie " "ersetzt werden?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Ihr Speicherplatz ging während des Schreibens der Datei zur Neige." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Die Datei wurde geschlossen, während sie geschrieben wurde." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Memory-Mapping der Datei ist fehlgeschlagen." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "X509-Kodierung ist fehlgeschlagen." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Signatur fehlgeschlagen." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Die Signatur ist ungültig." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Nicht signiert." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Feature nicht implementiert." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Die Pseudoufallszahlen-Erzeugung wurde nicht mit einer Saat versehen." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Verschlüsseln fehlgeschlagen." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Entschlüsseln fehlgeschlagen." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Dieser Fehler ist Enlightenment nicht bekannt." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3955,6 +3956,29 @@ msgstr "Verschieben/Größenänderung von Gegenständen starten" msgid "Set Toolbar Contents" msgstr "Modulablageninhalte einstellen" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "Nerve mich später" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "Niewieder anzeigen" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "Aktualisierungshinweis" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" +"Ihre Enlightenment version ist nicht aktuell.
Die aktuelle version ist:" +"

%s

Bitte besuchen Sie www.enlightenment.org
oder " +"aktualisieren Sie Ihre Systempakete
um eine neue Verison zu erhalten." + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6460,11 +6484,21 @@ msgstr "Leistung" msgid "Power Management" msgstr "Energieverwaltung" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Bildschirmeinstellungen" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Ausgabe" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Nach Starten sperren" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -10637,24 +10671,6 @@ msgstr "Mehrfach-Bildschirm-Geometrie benutzen" #~ msgid "Should the position of this monitor be memorized?" #~ msgstr "Soll die Position dieses Bildschirms gespeichert werden?" -#~ msgid "Bother me later" -#~ msgstr "Nerve mich später" - -#~ msgid "Never tell me" -#~ msgstr "Niewieder anzeigen" - -#~ msgid "Update Notice" -#~ msgstr "Aktualisierungshinweis" - -#~ msgid "" -#~ "Your enlightenment version is
not the current latest release.
The " -#~ "latest version is:

%s

Please visit www.enlightenment." -#~ "org
or update your system packages
to get a new version." -#~ msgstr "" -#~ "Ihre Enlightenment version ist nicht aktuell.
Die aktuelle version ist:" -#~ "

%s

Bitte besuchen Sie www.enlightenment.org
oder " -#~ "aktualisieren Sie Ihre Systempakete
um eine neue Verison zu erhalten." - # This is a very specific X term and should NOT be translated. #~ msgid "Override Redirect" #~ msgstr "Override Redirect" diff --git a/po/el.gmo b/po/el.gmo index f02d38bd8d..40b19a4171 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 140c2d882c..9c443ef4df 100644 --- a/po/el.po +++ b/po/el.po @@ -13,11 +13,11 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2013-01-27 12:40+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" -"Language: el_GR\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" @@ -822,7 +822,7 @@ msgstr "Επιλογή" msgid "Cancel" msgstr "Άκυρο" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -842,7 +842,7 @@ msgstr "" "εκ νέου πράγματα σύμφωνα με
τις προτιμήσεις σας. Λυπούμαστε για την " "αναστάτωση.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -857,11 +857,11 @@ msgstr "" "οι ρυθμίσεις σας έχουν επανέλθει
στις προεπιλεγμένες. Συγγνώμη για την " "αναστάτωση.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Προβλήματα εγγραφής ρυθμίσεων του Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -872,14 +872,15 @@ msgstr "" "%s

σε:
%s

Η υπόλοιπη εγγραφή έχει ματαιώθηκε για ασφάλεια." "
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -890,19 +891,19 @@ msgstr "" msgid "OK" msgstr "Εντάξει" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Οι Ρυθμίσεις Αναβαθμίστηκαν" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "Κατεστραμμένη διαχείριση αρχείου EET." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Τα δεδομένα του αρχείου είναι κενά." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -910,17 +911,17 @@ msgstr "" "Το αρχείο δεν είναι εγγράψιμο. Ίσως ο δίσκος είναι μόνο για ανάγνωση
ή " "έχετε χάσει τα δικαιώματα στα αρχεία σας." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Εξαντλήθηκε η μνήμη κατά την προετοιμασία της εγγραφής.
Παρακαλώ " "ελευθερώστε την μνήμη." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Αυτό είναι ένα γενικό σφάλμα." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -928,59 +929,59 @@ msgstr "" "Το αρχείο ρυθμίσεων είναι πολύ μεγάλο.
Θα πρέπει να είναι πολύ μικρό (το " "πολύ μερικές εκατοντάδες KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Έχετε I/O σφάλματα στον δίσκο.
Μήπως χρειάζεται αντικατάσταση;" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Εξάντληση χώρου στον δίσκο κατά την εγγραφή του αρχείου." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Το αρχείο έκλεισε κατά την εγγραφή." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Αποτυχία αντιστοίχησης μνήμης (mmap) του αρχείου." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Αποτυχία Κωδικοποίησης X509." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Αποτυχία υπογραφής." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Μη έγκυρη υπογραφή." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Μη υπογεγραμμένο." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Το χαρακτηριστικό δεν υλοποιήθηκε." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Το PRNG δεν μοιράστηκε." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Αποτυχία Κρυπτογράφησης." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Αποτυχία Αποκρυπτογράφησης." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Άγνωστο σφάλμα στο Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3959,6 +3960,27 @@ msgstr "Έναρξη Μετακίνησης/Αλλαγής Μεγέθους Αν msgid "Set Toolbar Contents" msgstr "Ορισμός Περιεχομένων Μπάρας Εργαλείων" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Ενημερώσεις" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6460,11 +6482,21 @@ msgstr "Επιδόσεις" msgid "Power Management" msgstr "Διαχείριση Ενέργειας" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Ρυθμίσεις Οθόνης" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Έξοδος" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Κλείδωμα με την Έναρξη" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/enlightenment.pot b/po/enlightenment.pot index 2fb83800c3..07c510d22e 100644 --- a/po/enlightenment.pot +++ b/po/enlightenment.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: enlightenment 0.17.3\n" +"Project-Id-Version: enlightenment 0.17.4\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -807,7 +807,7 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -818,7 +818,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -827,11 +827,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -839,14 +839,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -857,91 +858,91 @@ msgstr "" msgid "OK" msgstr "" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." msgstr "" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3713,6 +3714,26 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6146,11 +6167,19 @@ msgstr "" msgid "Power Management" msgstr "" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/eo.gmo b/po/eo.gmo index 838defa7df..19c9f174a7 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 352fc9f4f2..7fe683fa1f 100644 --- a/po/eo.po +++ b/po/eo.po @@ -10,17 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: eo\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" -"PO-Revision-Date: 2013-04-06 21:15+0000\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" +"PO-Revision-Date: 2013-06-30 21:32+0000\n" "Last-Translator: Eliovir \n" "Language-Team: American English \n" -"Language: \n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2013-04-07 06:02+0000\n" -"X-Generator: Launchpad (build 16550)\n" +"X-Launchpad-Export-Date: 2013-07-01 05:37+0000\n" +"X-Generator: Launchpad (build 16692)\n" "X-Language-Team: Esperanto \n" "X-Poedit-SearchPath-0: /usr/portage/distfiles/cvs-src/e17/apps/e/src\n" "X-Poedit-Basepath: .\n" @@ -822,7 +822,7 @@ msgstr "Elekti" msgid "Cancel" msgstr "Nuligi" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -835,12 +835,12 @@ msgstr "" "Agordaj datumoj bezonas ĝisdatigon. Vian malnova agordo
estis viŝita kaj " "nova aro da aprioroj pravalorizita. Ĉi tiu
okazos regule dum evoluado, " "tiel ne raportu
cimon. Ĉi tiu simple signifas ke Enlightenment bezonas " -"novan agordan
datumon defaÅ­te por uzeblaj funkcioj kiujn via " +"novan agordan
datumon defaÅ­lte por uzeblaj funkcioj kiujn via " "malnova
agordo simple ne enhavas. Ĉi tiu nova aro da aprioroj " "fiksos
tion aldonante ĝin en. Vi povas agordi de nove aferojn aktuale laŭ " "via
ŝato. Pardonon pro la momenta problemeto en via agordo.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -854,11 +854,11 @@ msgstr "" "malbone kaj
kiel antaŭ­zorgo via agordo estis restaŭrita per aprioroj." "
Bonvole pardonu por la ĝeno.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problemoj de skribado de agordoj de Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -868,14 +868,15 @@ msgstr "" "Enlightenment ricevis eraron dum movado de dosieroj
el:
%s

al:" "
%s

La cetero de skribo estis sekure ĉesigita.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -886,19 +887,19 @@ msgstr "" msgid "OK" msgstr "Bone" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Agordoj ĝisdatigitaj" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "La priskribo de EET-dosiero nekorektas." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "La datumo de dosiero malplenas." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -906,15 +907,15 @@ msgstr "" "La dosiero ne skribeblas. Eble la disko estas nurlega
aÅ­ vi perdis " "permesojn por viaj dosieroj." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "Memoro ne sufiĉas por skribi.
Bonvole liberigu memoron." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Tio estas komuna eraro." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -922,60 +923,60 @@ msgstr "" "La dosiero de agordoj tro grandas.
Tio estus tre malpeza (kelkaj centoj " "da KB maksimume)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" "Vi havis erarojn de en/eligo sur la disko.
Ĉu vi eble bezonas anstatŭigon?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Vi atingis limon de spaco dum skribado de dosiero." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "La dosiero estis fermita dum skribado." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Mapigo de memoro (mmap) de la dosiero fiaskis." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Kodado de X509 fiaskis." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Subskribo fiaskis." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Subskribo nevalidas." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Ne subskribata." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Trajto ne realigita." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Kkvazaŭstokasta nombro ne kreeblas." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Ĉifrado fiaskis." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Malĉifrado fiaskis." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Ĉi tiu eraro ne estas konata de Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -1411,7 +1412,7 @@ msgstr "Eraro de demeto" #: src/bin/e_fm.c:3067 msgid "Can't unmount device" -msgstr "Aparato9 ne demeteblas" +msgstr "Aparato ne demeteblas" #: src/bin/e_fm.c:3082 msgid "Eject Error" @@ -3920,6 +3921,29 @@ msgstr "Komenci movadon/gandecŝanĝon de eroj" msgid "Set Toolbar Contents" msgstr "Difini la ilobretan enhavon" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "Ĝeni min poste" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "Neniam averti min" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "Ĝisdatiga averto" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" +"Via versio de Enlightenment
ne estas la lasta publikigo.
Lasta versio " +"estas:

%s

Bonvole vizitu www.enlightenment.org
aŭ ĝisdatigu " +"vian pakaĵo-sistemon
por akiri novan version." + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -3937,7 +3961,7 @@ msgid "" "windows have
been closed or have the lifespan lock removed.
" msgstr "" "Kelkaj fenestroj ĉiam ekzistas kun la ŝlosilo ebligita. Tio signifas
ke " -"Enlightenment ne permesos sin ĉesigi ĝis tiujn fenestoj
estos fermitaj aŭ " +"Enlightenment ne permesos sin ĉesigi ĝis tiuj fenestoj
estos fermitaj aŭ " "kies la ŝlosilo foriĝis.
" #: src/bin/e_utils.c:860 @@ -4063,8 +4087,8 @@ msgstr "" "programado, do ne raportu cimon.
Tio simple signifas ke la modulo bezonas " "novajn datumojn de agordo
defaÅ­lte por uzebla funkcieco> kiuj viaj " "agordoj mankas.
Tiu nova aro da defaŭltoj korektos tion aldoniĝante.
" -"Vi povas de nove agordi nun kiel vi volas.
Bonvolu pardoni por la " -"malagrablaĵoj.
" +"Vi povas de nove agordi nun kiel vi volas.
Pardonon pro la momenta " +"problemeto en via agordo.
" #: src/bin/e_utils.c:1181 src/bin/e_utils.c:1205 #, c-format @@ -4079,7 +4103,7 @@ msgid "" "module was running. This is bad and
as a precaution your configuration " "has been now restored to
defaults. Sorry for the inconvenience.
" msgstr "" -"Via agordo de modulo estas PLI NOVA ol Enlightenment. Tio estas
" +"Via agordo de modulo estas PLI NOVA ol la versio de modulo. Tio estas
" "strangega. Tio ne devus okazi krom se vi malĝisdatigis
Enlightenement aŭ­ " "se vi kopiis la agordon el ejo kie pli nova
versio de modulo estis " "funciinta. Tio estas malbone kaj
kiel antaŭ­zorgo via agordo estis " @@ -4232,11 +4256,11 @@ msgstr "Tipo:" #: src/bin/e_widget_filepreview.c:385 msgid "Owner:" -msgstr "Proprietulo :" +msgstr "Posedanto:" #: src/bin/e_widget_filepreview.c:386 msgid "Permissions:" -msgstr "Rajtoj :" +msgstr "Permesoj:" #: src/bin/e_widget_filepreview.c:387 msgid "Modified:" @@ -4555,11 +4579,11 @@ msgstr "Videbla" #: src/modules/comp/e_mod_config.c:270 msgid "Focus-Out" -msgstr "" +msgstr "Elfokusigo" #: src/modules/comp/e_mod_config.c:275 msgid "Focus-In" -msgstr "" +msgstr "Enfokusigo" #: src/modules/comp/e_mod_config.c:440 src/modules/comp/e_mod_config.c:470 #: src/modules/comp/e_mod_config.c:744 src/modules/comp/e_mod_config.c:795 @@ -4598,7 +4622,7 @@ msgstr "Sciigo" #: src/modules/comp/e_mod_config.c:462 src/modules/comp/e_mod_config.c:767 msgid "Splash" -msgstr "" +msgstr "Salutŝildo" #: src/modules/comp/e_mod_config.c:464 src/modules/comp/e_mod_config.c:769 #: src/modules/fileman/e_mod_config.c:345 @@ -4800,7 +4824,7 @@ msgstr "Sendi elbufrigon" #: src/modules/comp/e_mod_config.c:1235 msgid "Send dump" -msgstr "" +msgstr "Sendi nekropsion" #: src/modules/comp/e_mod_config.c:1237 src/modules/comp/e_mod_config.c:1518 msgid "Don't composite fullscreen windows" @@ -4869,7 +4893,7 @@ msgstr "Bildigo" #: src/modules/comp/e_mod_main.c:43 src/modules/comp/e_mod_main.c:74 msgid "Composite" -msgstr "Kunmeto" +msgstr "Kunmetado" #: src/modules/comp/e_mod_main.c:75 msgid "" @@ -5194,7 +5218,7 @@ msgstr "Labortablaj Agordoj" #: src/modules/conf_display/e_int_config_desk.c:185 msgid "Desktop Name" -msgstr "Nomo de labortablo" +msgstr "Labortabla nomo" #: src/modules/conf_display/e_int_config_desk.c:193 msgid "Profile Name:" @@ -5457,7 +5481,7 @@ msgstr "Forigi ĉiujn" #: src/modules/conf_keybindings/e_int_config_keybindings.c:259 #: src/modules/conf_keybindings/e_int_config_mousebindings.c:306 msgid "Restore Default Bindings" -msgstr "Restaŭrigu la apriorajn bindojn" +msgstr "Restaŭrigi la apriorajn bindojn" #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825 @@ -5814,7 +5838,7 @@ msgstr "Lingvoelektilo" #: src/modules/conf_menus/e_int_config_menus.c:169 #: src/modules/wizard/page_010.c:169 msgid "System Default" -msgstr "Sistema apriora valoro" +msgstr "Sistema aprioro" #: src/modules/conf_intl/e_int_config_intl.c:1096 #: src/modules/conf_intl/e_int_config_intl.c:1174 @@ -6075,7 +6099,7 @@ msgstr "Kroma butono (%d) suben" #: src/modules/conf_menus/e_int_config_menus.c:38 #: src/modules/conf_menus/e_mod_main.c:18 msgid "Menu Settings" -msgstr "Menuaj Agordoj" +msgstr "Agordoj de menuo" #: src/modules/conf_menus/e_int_config_menus.c:174 msgid "Enlightenment Default" @@ -6144,7 +6168,7 @@ msgstr "Aŭtomata rulumo" #: src/modules/conf_menus/e_int_config_menus.c:301 msgid "Menu Scroll Speed" -msgstr "Menua ruluma rapideco" +msgstr "Rapido de rulumo de menuo" #: src/modules/conf_menus/e_int_config_menus.c:303 #, c-format @@ -6258,7 +6282,7 @@ msgstr "" #: src/modules/conf_performance/e_int_config_engine.c:114 msgid "Enable" -msgstr "Enŝalti" +msgstr "Ŝalti" #: src/modules/conf_performance/e_int_config_performance.c:36 msgid "Performance Settings" @@ -6266,7 +6290,7 @@ msgstr "Plenumaj Agordoj" #: src/modules/conf_performance/e_int_config_performance.c:107 msgid "Framerate" -msgstr "Kadrofteco" +msgstr "Bildrapido" #: src/modules/conf_performance/e_int_config_performance.c:109 #, c-format @@ -6379,7 +6403,7 @@ msgstr "%.0f s" #: src/modules/conf_performance/e_int_config_powermanagement.c:313 #: src/modules/shot/e_mod_main.c:727 msgid "High" -msgstr "Alte" +msgstr "Alta" #: src/modules/conf_performance/e_int_config_powermanagement.c:352 msgid "Extreme" @@ -6393,11 +6417,19 @@ msgstr "Rendimento" msgid "Power Management" msgstr "Energiadministrado" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Agordoj de ekrano" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "Ĉefa eligo" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "Restaŭrigi dum starto" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" @@ -6500,7 +6532,7 @@ msgstr "Menuero" #: src/modules/conf_theme/e_int_config_color_classes.c:87 msgid "Menu Item Active" -msgstr "Elemento de la aktiva menuo" +msgstr "Aktiva menuero" #: src/modules/conf_theme/e_int_config_color_classes.c:88 msgid "Menu Item Disabled" @@ -6646,7 +6678,7 @@ msgstr "Modula Etikedo" #: src/modules/conf_theme/e_int_config_color_classes.c:131 msgid "Composite Focus-out Color" -msgstr "" +msgstr "Koloro de kunmetada elfokusigo" #: src/modules/conf_theme/e_int_config_color_classes.c:163 #: src/modules/conf_theme/e_mod_main.c:240 @@ -6912,11 +6944,11 @@ msgstr "Aŭtomata" #: src/modules/conf_theme/e_int_config_fonts.c:694 msgid "Font Fallbacks" -msgstr "Alternativaj Tiparoj" +msgstr "Alternativaj tiparoj" #: src/modules/conf_theme/e_int_config_fonts.c:695 msgid "Fallback Name" -msgstr "Alternativa Nomo" +msgstr "Alternativa nomo" #: src/modules/conf_theme/e_int_config_fonts.c:707 msgid "Enable Fallbacks" @@ -7274,7 +7306,7 @@ msgstr "Linia" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:211 msgid "Accelerate, then decelerate" -msgstr "" +msgstr "Plirapidigi kaj poste malplirapidigi" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:216 msgid "Accelerate" @@ -7286,15 +7318,15 @@ msgstr "Malplirapidigi" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:226 msgid "Pronounced Accelerate" -msgstr "" +msgstr "Forte plirapidigi" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:231 msgid "Pronounced Decelerate" -msgstr "" +msgstr "Forte malplirapidigi" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:236 msgid "Pronounced Accelerate, then decelerate" -msgstr "" +msgstr "Forte plirapidigi kaj poste malplirapidigi" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:241 msgid "Bounce" @@ -7343,7 +7375,7 @@ msgstr "Plejfreŝe uzata fenestro sube muso" #: src/modules/conf_window_manipulation/e_int_config_focus.c:227 #: src/modules/conf_window_manipulation/e_int_config_focus.c:272 msgid "Raise windows on mouse over" -msgstr "Altigi fenestrojn kiam la musa suprado" +msgstr "Levi fenestrojn kiam la musa suprado" #: src/modules/conf_window_manipulation/e_int_config_focus.c:246 #: src/modules/wizard/page_060.c:33 @@ -7380,7 +7412,7 @@ msgstr "Nur dialogoj kun fokusitaj patroj" #: src/modules/conf_window_manipulation/e_int_config_focus.c:271 msgid "Autoraise" -msgstr "Aŭtomata altigo" +msgstr "Aŭtomata levo" #: src/modules/conf_window_manipulation/e_int_config_focus.c:275 msgid "Delay before raising:" @@ -7388,15 +7420,15 @@ msgstr "Tempo antaŭ altigi:" #: src/modules/conf_window_manipulation/e_int_config_focus.c:289 msgid "Raise Window" -msgstr "Altigi la fenestron" +msgstr "Levi la fenestron" #: src/modules/conf_window_manipulation/e_int_config_focus.c:291 msgid "Raise when starting to move or resize" -msgstr "Altigi dum komenco de movado aŭ regrandigado" +msgstr "Levi dum komenco de movado aŭ regrandigado" #: src/modules/conf_window_manipulation/e_int_config_focus.c:294 msgid "Raise when focusing" -msgstr "Altigi post fokusado" +msgstr "Levi post fokusado" #: src/modules/conf_window_manipulation/e_int_config_focus.c:302 msgid "Active Window Hint Policy" @@ -7428,7 +7460,7 @@ msgstr "Ĉiam doni eventojn de alklako al aplikaĵoj" #: src/modules/conf_window_manipulation/e_int_config_focus.c:318 msgid "Click raises the window" -msgstr "Alklako altigas fenestron" +msgstr "Alklako levas fenestron" #: src/modules/conf_window_manipulation/e_int_config_focus.c:321 msgid "Click focuses the window" @@ -7497,7 +7529,7 @@ msgstr "Permesi manuzon de maksimumigitaj fenestroj" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:241 msgid "Allow windows above fullscreen window" -msgstr "" +msgstr "Permesi fenestrojn supre plenekrana fenestro" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:245 msgid "Maximization" @@ -7539,15 +7571,15 @@ msgstr "Sekvi movon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:288 msgid "Follow Resize" -msgstr "" +msgstr "Sekvi regrandigon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:291 msgid "Follow Raise" -msgstr "Sekvi altigon" +msgstr "Sekvi levon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:294 msgid "Follow Lower" -msgstr "" +msgstr "Sekvi malaltigon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:297 msgid "Follow Layer" @@ -7555,7 +7587,7 @@ msgstr "Sekvi tavolon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:300 msgid "Follow Desktop" -msgstr "" +msgstr "Sekvi labortablon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:303 msgid "Follow Iconify" @@ -7666,7 +7698,7 @@ msgstr "Minimuma rapideco" #: src/modules/cpufreq/e_mod_main.c:237 src/modules/cpufreq/e_mod_main.c:273 msgid "Maximum Speed" -msgstr "Maksimuma Rapideco" +msgstr "Maksimuma rapideco" #: src/modules/cpufreq/e_mod_main.c:250 msgid "Restore CPU Power Policy" @@ -7730,7 +7762,7 @@ msgstr "" #: src/modules/cpufreq/e_mod_main.c:1157 msgid "Cpufreq Error" -msgstr "" +msgstr "Eraro de procesora ofto" #: src/modules/cpufreq/e_mod_main.c:1158 msgid "" @@ -7740,7 +7772,7 @@ msgstr "" #: src/modules/cpufreq/e_mod_main.c:1165 msgid "Cpufreq Permissions Error" -msgstr "" +msgstr "Eraro de permesoj de procesora ofto" #: src/modules/cpufreq/e_mod_main.c:1166 #, c-format @@ -7906,7 +7938,7 @@ msgstr "" #: src/modules/everything/evry_config.c:417 msgid "Search only when triggered" -msgstr "" +msgstr "Serĉi nur kiam ekagita" #: src/modules/everything/evry_config.c:424 msgid "Plugin View" @@ -7927,7 +7959,7 @@ msgstr "Supre/Sube elektas sekvan eron en piktograma vidigo" #: src/modules/everything/evry_config.c:483 msgid "Hide input when inactive" -msgstr "" +msgstr "Kaŝi enigon se malaktiva" #: src/modules/everything/evry_config.c:488 msgid "Hide list" @@ -7939,11 +7971,11 @@ msgstr "Rapida foliumado" #: src/modules/everything/evry_config.c:497 msgid "Emacs style (ALT + n,p,f,b,m,i)" -msgstr "" +msgstr "Emacs-maniero (ALT + n,p,f,b,m,i)" #: src/modules/everything/evry_config.c:499 msgid "Vi style (ALT + h,j,k,l,n,p,m,i)" -msgstr "" +msgstr "Vi-maniero (ALT + h,j,k,l,n,p,m,i)" #: src/modules/everything/evry_config.c:505 msgid "No Sorting" @@ -8160,7 +8192,7 @@ msgstr "Serĉi kaŝmemorigitajn dosierojn" #: src/modules/everything/evry_plug_files.c:1496 msgid "Cache visited directories" -msgstr "" +msgstr "Kaŝmemorigi vizitatajn dosierujojn" #: src/modules/everything/evry_plug_files.c:1500 msgid "Clear cache" @@ -8373,7 +8405,7 @@ msgstr "" #: src/modules/fileman/e_fwin_nav.c:450 msgid "EFM Navigation" -msgstr "Foliumado per EFM" +msgstr "Foliumado per EFA" #: src/modules/fileman/e_int_config_mime.c:60 #: src/modules/fileman/e_mod_main.c:44 @@ -8660,7 +8692,7 @@ msgstr "Modifi akcesoraĵojn" #: src/modules/winlist/e_int_config_winlist.c:58 msgid "Window Switcher Settings" -msgstr "" +msgstr "Agordoj de interŝanĝilo de fenestroj" #: src/modules/winlist/e_int_config_winlist.c:190 msgid "Windows from other desks" @@ -8712,7 +8744,7 @@ msgstr "Rulumada animacio" #: src/modules/winlist/e_int_config_winlist.c:247 msgid "Scroll speed" -msgstr "Ruluma rapideco" +msgstr "Ruluma rapido" #: src/modules/winlist/e_int_config_winlist.c:260 msgid "Minimum width" @@ -8752,7 +8784,7 @@ msgstr "Ĝisrandigo" #: src/modules/winlist/e_mod_main.c:28 msgid "Window Switcher" -msgstr "Fenstrointerŝanĝilo" +msgstr "Interŝanĝilo de fenestroj" #: src/modules/winlist/e_mod_main.c:41 msgid "Next Window" @@ -8951,7 +8983,7 @@ msgstr "Ĉiam montri nomon de labortabloj" #: src/modules/pager/e_mod_config.c:136 src/modules/pager/e_mod_config.c:195 msgid "Live preview" -msgstr "" +msgstr "Tuja antaŭrigardo" #: src/modules/pager/e_mod_config.c:142 src/modules/pager/e_mod_config.c:231 msgid "Show popup on desktop change" @@ -9257,7 +9289,7 @@ msgstr "Profilo" #: src/modules/wizard/page_040.c:36 msgid "Adding missing App files" -msgstr "" +msgstr "Aldonante mankantajn aplikaĵajn dosierojn" #: src/modules/wizard/page_050.c:130 msgid "Select preferred size" @@ -9498,7 +9530,7 @@ msgstr "Entajpu unikan nomon por tiu ero" #: src/modules/quickaccess/e_mod_config.c:247 msgid "Disable Warning Dialogs" -msgstr "" +msgstr "Malŝalti avertajn dialogojn" #: src/modules/quickaccess/e_mod_config.c:249 msgid "Disable Startup Tutorial" @@ -9550,7 +9582,7 @@ msgstr "" #: src/modules/quickaccess/e_mod_quickaccess.c:265 #: src/modules/quickaccess/e_mod_quickaccess.c:392 msgid "Could not determine command for starting this application!" -msgstr "" +msgstr "Komando ne difineblas por lanĉi tiun aplikaĵon!" #: src/modules/quickaccess/e_mod_quickaccess.c:304 msgid "" @@ -9624,7 +9656,7 @@ msgstr "La klavara bindo kiun vi entajpis jam estas uzata!" #: src/modules/quickaccess/e_mod_quickaccess.c:798 msgid "Hide Instead Of Raise" -msgstr "Kaŝi anstataŭ suprenigi" +msgstr "Kaŝi anstataŭ levi" #: src/modules/quickaccess/e_mod_quickaccess.c:805 msgid "Jump Mode" @@ -9730,28 +9762,28 @@ msgstr "" #: src/modules/systray/e_mod_main.c:497 src/modules/systray/e_mod_main.c:949 msgid "Systray Error" -msgstr "Eraro de taskopleto" +msgstr "Eraro de sistempleto" #: src/modules/systray/e_mod_main.c:498 msgid "Systray cannot set its background invisible to match its shelf." msgstr "" -"Taskopleto ne povas difini sian fonon nevidebla por kongrui sian breton." +"Sistempleto ne povas difini sian fonon nevidebla por kongrui sian breton." #: src/modules/systray/e_mod_main.c:940 msgid "Another systray exists" -msgstr "Alia taskopleto ekzistas" +msgstr "Alia sistempleto ekzistas" #: src/modules/systray/e_mod_main.c:941 msgid "There can be only one systray gadget and another one already exists." -msgstr "Nu unu akcesoraĵo de taskopleto povas esti kaj alia jam ekzistas." +msgstr "Nu unu akcesoraĵo de sistempleto povas esti kaj alia jam ekzistas." #: src/modules/systray/e_mod_main.c:950 msgid "Systray cannot work in a shelf that is set to below everything." -msgstr "Taskopleto ne povas funkcii en breto kiu estas malsupre ĉio." +msgstr "Sistempleto ne povas funkcii en breto kiu estas malsupre ĉio." #: src/modules/systray/e_mod_main.c:1161 msgid "Systray" -msgstr "Taskopleto" +msgstr "Sistempleto" #: src/modules/shot/e_mod_main.c:176 src/modules/shot/e_mod_main.c:210 msgid "Error saving screenshot file" @@ -9810,7 +9842,7 @@ msgstr "Eraro - Ne povas malfermi dosieron" #: src/modules/shot/e_mod_main.c:472 #, c-format msgid "Cannot open temporary file '%s': %s" -msgstr "Ne povas malfermi dumptempan dosieron '%s' : %s" +msgstr "Ne povas malfermi dumtempan dosieron \"%s\": %s" #: src/modules/shot/e_mod_main.c:480 msgid "Error - Bad size" @@ -9875,7 +9907,7 @@ msgstr "Kien meti ekrankopion..." #: src/modules/shot/e_mod_main.c:725 msgid "Perfect" -msgstr "Perfekte" +msgstr "Perfekta" #: src/modules/shot/e_mod_main.c:802 msgid "Share" @@ -9964,7 +9996,7 @@ msgstr "Kaheligado" #: src/modules/tiling/e_mod_tiling.c:4089 msgid "Toggle floating" -msgstr "" +msgstr "Baskuligi glitan" #: src/modules/tiling/e_mod_tiling.c:4092 msgid "Add a stack" @@ -9976,7 +10008,7 @@ msgstr "Forigi stakon" #: src/modules/tiling/e_mod_tiling.c:4098 msgid "Toggle between rows and columns" -msgstr "" +msgstr "Baskuligi inter linioj kaj kolumnoj" #: src/modules/tiling/e_mod_tiling.c:4101 msgid "Swap a window with an other" @@ -10105,6 +10137,8 @@ msgid "" "Now in online mode.
Now modules that use network will resume " "regular tasks." msgstr "" +"Nun en senreta reĝimo.
Nun moduloj kiuj uzas reton daŭrigos " +"ordinarajn taskojn." #: src/modules/notification/e_mod_main.c:172 msgid "Notification Module" @@ -10173,3 +10207,18 @@ msgstr "Malatenti anstataŭigon de ID" #: src/modules/notification/e_mod_config.c:144 msgid "Use multiple monitor geometry" msgstr "Uzi geometrion por pluraj ekranoj" + +#~ msgid "Opacity" +#~ msgstr "Opakeco" + +#~ msgid "Setup Toolbars" +#~ msgstr "Agordi ilobretojn" + +#~ msgid "Enlightenment cannot set up its toolbars.\n" +#~ msgstr "Enlightenment ne povas pravalorizi siajn ilobretojn.\n" + +#~ msgid "Music Player" +#~ msgstr "Muzikludilo" + +#~ msgid "Switch" +#~ msgstr "Ŝalti" diff --git a/po/es.gmo b/po/es.gmo index 76ae70d80a..5aef078ee1 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 5d748d1e07..14315d14c4 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2013-01-27 16:25+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Spanish <>\n" @@ -818,7 +818,7 @@ msgstr "Seleccionar" msgid "Cancel" msgstr "Cancelar" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -837,7 +837,7 @@ msgstr "" "defecto arreglará
ese fallo añadiendo esos parámentros. Ahora podrá " "reconfigurar las cosas a su
gusto" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -851,11 +851,11 @@ msgstr "" "versión más moderna de Enlightment. Ésto puede causar problemas y
como " "precaución, su configuración ha sido restaurada a los
valores por defecto." -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problemas de escritura en las preferencias de Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -865,14 +865,15 @@ msgstr "" "Ha habido un error mientras se movían archivos de configuración de: %s a
" "%s
Se ha cancelado la operación por seguridad.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -883,19 +884,19 @@ msgstr "" msgid "OK" msgstr "Aceptar" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Configuración actualizada" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "El identificador de archivo EET es incorrecto." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "El archivo de datos está vacío." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -903,17 +904,17 @@ msgstr "" "El archivo no tiene permisos de escritura. Tal vez el disco es de sólo " "lectura
o ha perdido los permisos." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Se quedó sin memoria mientras se prepara la escritura.
Por favor, libere " "memoria." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Este es un error genérico." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -921,60 +922,60 @@ msgstr "" "El archivo de configuración es demasiado grande.
Debería ser muy pequeño " "(unos pocos cientos de KB como máximo)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" "Tiene errores de entrada/salida en el disco.
Quizá haya que cambiarlo" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Se quedó sin espacio al escribir el archivo" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "El archivo se cerró mientras se estaba escribiendo en el." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "La asignación de memoria (mmap) del archivo ha fallado." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "La codificación X509 ha fallado." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "La firma falló." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Firma inválida." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "No firmado" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Función no implementada." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "El cifrado falló." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "El descifrado falló." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Error desconocido" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3912,6 +3913,27 @@ msgstr "Comenzar a mover/cambiar el tamaño de los elementos" msgid "Set Toolbar Contents" msgstr "Seleccionar contenido de barra de herramientas" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Actualizaciones" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6398,11 +6420,21 @@ msgstr "Rendimiento" msgid "Power Management" msgstr "Manejo de energía" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Configuración de la pantalla" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Salida" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Bloquear al inicio" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" @@ -8260,9 +8292,10 @@ msgstr "" "+'x''> ir ar plugin que empieza por 'x'
<" "CONTROL+izquiera/derecha> cambiar entre losplugins
" "<CONTROL+arriba/debajo> ir al primer/último
" -"<CONTROL+1> cambiar vista (sale de está ventana ;)" -"
<CONTROL+2> cambiar modos de vista
" -"<CONTROL+3> cambiar modos de vista de miniaturas" +"<CONTROL+1> cambiar vista (sale de está " +"ventana ;)
<CONTROL+2> cambiar modos de " +"vista
<CONTROL+3> cambiar modos de vista de " +"miniaturas" #: src/modules/everything/evry_view_tabs.c:93 msgid "Back" diff --git a/po/et.gmo b/po/et.gmo index 5b9fc57803..74be0aa3a7 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 6ec965ba62..b25ba98072 100644 --- a/po/et.po +++ b/po/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2010-01-07 07:56+0000\n" "Last-Translator: René Pärts \n" "Language-Team: Estonian \n" @@ -954,7 +954,7 @@ msgstr "valimine" msgid "Cancel" msgstr "tühistama" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -965,7 +965,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -974,11 +974,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -986,14 +986,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -1005,22 +1006,22 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 #, fuzzy msgid "Settings Upgraded" msgstr "seaded Täiendatud" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET file handle on halb." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Faili andmed on tühi." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -1029,17 +1030,17 @@ msgstr "" "Fail ei ole kirjutatav. Ehk ketas on read-only
või olete kaotanud õigusi " "faile." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "Mälu otsa koostamise ajal kirjutada.
Palun vaba mälu." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "See on üldine viga." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -1048,70 +1049,70 @@ msgstr "" "Seadete fail on liiga suur.
See peaks olema väga väikesed (paarsada KB " "kõige rohkem)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Sa otsa ruumi kirjutamise ajal faili" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Toimiku sulgemise kohta see kirjutamise ajal." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Mälu kaardistamine (mmap) toimiku ebaõnnestus." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Encoding ebaõnnestus." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Allkiri ei õnnestunud." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Allkiri on kehtetu." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "Pole sisse." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Funktsiooni ei rakendata." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG ei külvatud." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Krüpteerimine ebaõnnestus." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Dekodeerimiseks ebaõnnestus." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4289,6 +4290,27 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "Määra tööriistariba näitamine" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "riik" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -7079,12 +7101,22 @@ msgstr "Performance" msgid "Power Management" msgstr "Power Management" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Screen Saver" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "väljund" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Lukk Startup" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/fi.gmo b/po/fi.gmo index 01376aef75..16b529a5a0 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index ee38599f78..76a14b9307 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment (e17) CVS\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-12-31 07:00+0000\n" "Last-Translator: Jussi Aalto \n" "Language-Team: Finnish \n" @@ -850,7 +850,7 @@ msgstr "Valitse jokin" msgid "Cancel" msgstr "Peruuta" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -868,7 +868,7 @@ msgstr "" "korjaavat tämän lisäämällä nämä uudet
ominaisuudet. Voit tehdä haluamasi " "asetukset uudelleen.
Olemme pahoillamme häiriöstä.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -882,11 +882,11 @@ msgstr "" "versio Enlightenmentista. Tämä on
huono asia, ja varokeinona asetuksesi " "on nyt palautettu
oletusasetuksiin. Olemme pahoillamme häiriöstä.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Ongelmia Enlightenmentin asetusten kirjoituksessa" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -898,14 +898,15 @@ msgstr "" "ilmeni, oli:
%s

Tämä tiedosto on poistettu korruptoituneen datan " "välttämiseksi.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -916,21 +917,21 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Asetukset päivitetty" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET tiedosto Kahva on huono." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Tiedoston data on tyhjä." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -939,17 +940,17 @@ msgstr "" "Tiedostoa ei voi kirjoittaa. Ehkälevy on vain luku-
tai olet menettänyt " "käyttöoikeudet tiedostoja." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "Muisti loppui kun valmistellaankirjoittaa.
Vapauta muistia." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Tämä onyleinen virhe." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -958,71 +959,71 @@ msgstr "" "Asetukset tiedosto on liian suuri.
Sen tulisi olla hyvin pieni (muutama " "sata KB korkeintaan)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Te loppui tila kirjoitettaessatiedostoa" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Tiedoston lopetettiin sitä kirjoittaessani." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Muisti - kartoitus (mmap) jatiedostosta epäonnistui." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 koodaus epäonnistui." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Lepotilaan siirtyminen epäonnistui." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Allekirjoitus ei kelpaa." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Ei ikkunoita)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Ominaisuus ei ole toteutettu." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG ei siemennettiin." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Valmiustilaan siirtyminen epäonnistui." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Valmiustilaan siirtyminen epäonnistui." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Tervetuloa Enlightenmentiin" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4121,6 +4122,27 @@ msgstr "Aloita kohteiden siirtäminen/koon muuttaminen" msgid "Set Toolbar Contents" msgstr "Määritä työkalurivin sisältö" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Tila" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6766,12 +6788,22 @@ msgstr "Suorituskyky" msgid "Power Management" msgstr "Virranhallinta" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Näytönsäästäjä" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Toisto" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Lukitse käynnistettäessä" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/fo.gmo b/po/fo.gmo index d5df4f2b9d..176a7e227e 100644 Binary files a/po/fo.gmo and b/po/fo.gmo differ diff --git a/po/fo.po b/po/fo.po index df03fff8f3..3428cd483d 100644 --- a/po/fo.po +++ b/po/fo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-10-21 20:00+0000\n" "Last-Translator: Gunleif Joensen \n" "Language-Team: Faroese \n" @@ -828,7 +828,7 @@ msgstr "Vel ein/eitt" msgid "Cancel" msgstr "Ógilda" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -839,7 +839,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -848,11 +848,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Skrivi trupuleikar við at goyma Enlightenment setingarnar" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -860,14 +860,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -878,93 +879,93 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Setingar dagførdar" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." msgstr "" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "Rudda upp í gluggum" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Vælkomin til Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3798,6 +3799,26 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6294,12 +6315,21 @@ msgstr "" msgid "Power Management" msgstr "" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Skíggji" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Hvílustøða" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/fr.gmo b/po/fr.gmo index da7fc69606..247eb4eb7e 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 24355d7565..4ff699b8b6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" -"PO-Revision-Date: 2013-03-12 15:18+0000\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" +"PO-Revision-Date: 2013-07-17 13:41+0000\n" "Last-Translator: Eliovir \n" "Language-Team: Enlightenment French Team \n" @@ -25,8 +25,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2013-04-23 06:12+0000\n" -"X-Generator: Launchpad (build 16580)\n" +"X-Launchpad-Export-Date: 2013-07-18 07:15+0000\n" +"X-Generator: Launchpad (build 16696)\n" "X-Poedit-Country: FRANCE\n" "X-Poedit-Language: French\n" "X-Poedit-SourceCharset: utf-8\n" @@ -83,7 +83,7 @@ msgstr "" #: src/bin/e_actions.c:372 msgid "Are you sure you want to kill this window?" -msgstr "" +msgstr "Voulez-vous vraiment tuer cette fenêtre ?" #: src/bin/e_actions.c:375 src/bin/e_actions.c:2997 #: src/bin/e_int_border_menu.c:749 @@ -121,15 +121,15 @@ msgstr "Fermer la session" #: src/bin/e_actions.c:2218 msgid "Are you sure you want to logout?" -msgstr "Voulez-vous vraiment vous déconnecter ?" +msgstr "Voulez-vous vraiment fermer la session ?" #: src/bin/e_actions.c:2276 src/bin/e_sys.c:749 msgid "Power off" -msgstr "Eteindre" +msgstr "Éteindre" #: src/bin/e_actions.c:2278 msgid "Are you sure you want to power off your computer?" -msgstr "Voulez-vous vraiment vous éteindre votre ordinateur ?" +msgstr "Voulez-vous vraiment éteindre votre ordinateur ?" #: src/bin/e_actions.c:2337 src/bin/e_actions.c:3414 msgid "Reboot" @@ -162,7 +162,7 @@ msgstr "Voulez-vous vraiment mettre en hibernation votre ordinateur ?" #: src/bin/e_actions.c:3298 src/bin/e_actions.c:3304 src/bin/e_actions.c:3310 #: src/modules/shot/e_mod_main.c:987 msgid "Window : Actions" -msgstr "" +msgstr "Fenêtres : actions" #: src/bin/e_actions.c:2952 src/bin/e_fm.c:11555 #: src/bin/e_int_border_menu.c:669 @@ -363,7 +363,7 @@ msgstr "Afficher le bureau" #: src/bin/e_actions.c:3121 msgid "Show The Shelf" -msgstr "Afficher le rack" +msgstr "Afficher le rayon" #: src/bin/e_actions.c:3126 msgid "Flip Desktop To..." @@ -423,7 +423,7 @@ msgstr "Passer au bureau 11" #: src/bin/e_actions.c:3162 msgid "Switch To Desktop..." -msgstr "Passer au bureau …" +msgstr "Passer au bureau…" #: src/bin/e_actions.c:3168 msgid "Flip Desktop Left (All Screens)" @@ -616,11 +616,11 @@ msgstr "Redimensionner de …" #: src/bin/e_actions.c:3304 msgid "Push in Direction..." -msgstr "En direction de …" +msgstr "En direction de …" #: src/bin/e_actions.c:3310 msgid "Drag Icon..." -msgstr "Glisser l'icône…" +msgstr "Glisser l'icône …" #: src/bin/e_actions.c:3315 src/bin/e_actions.c:3317 src/bin/e_actions.c:3319 #: src/bin/e_actions.c:3325 src/bin/e_actions.c:3331 src/bin/e_actions.c:3333 @@ -769,7 +769,7 @@ msgstr "Hiberner immédiatement" #: src/bin/e_actions.c:3438 msgid "Lock" -msgstr "Verouiller" +msgstr "Verrouiller" #: src/bin/e_actions.c:3443 src/bin/e_int_menus.c:1327 msgid "Cleanup Windows" @@ -828,7 +828,7 @@ msgstr "Sélectionner" msgid "Cancel" msgstr "Annuler" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -846,7 +846,7 @@ msgstr "" "que votre ancienne configuration ne fournit pas.
Vous pouvez maintenant " "tout reconfigurer selon votre goût.
Désolé pour la gêne occasionnée.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -862,11 +862,11 @@ msgstr "" "de
votre configuration ont été restaurées.
Désolé pour le désagrément." "
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problèmes d'écriture de la configuration d`Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -877,14 +877,15 @@ msgstr "" "configuration
de :
%s

vers :
%s

L'écriture a été " "abandonnée par sécurité.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -895,19 +896,19 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Configuration mise à niveau" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "Le descripteur de fichier EET est incorrect." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Aucune donnée dans le fichier." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -915,16 +916,16 @@ msgstr "" "Le fichier n'est pas accessible en écriture. Le disque est peut-" "être
monté en lecture seule ou les permissions ont été modifiées." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Mémoire insuffisante pour l'écriture.
Veuillez libérer de la mémoire." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Erreur générique." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -932,59 +933,59 @@ msgstr "" "Le fichier de configuration est trop gros.
Il ne devrait pas dépasser " "quelques centaines de ko." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Erreurs d'E/S sur le disque.
Peut-être devriez-vous le remplacer ?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." -msgstr "" +msgstr "Vous êtes tombé à cours d'espace lors de l'écriture du fichier." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Le fichier a été fermé pendant l'écriture." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Échec du mappage du fichier en mémoire (mmap)." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Échec de l'encodage X509." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Échec de la signature." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Signature invalide." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Non signé." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Pas encore implémenté." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Impossible de générer un nombre pseudo-aléatoire." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Échec du chiffrement." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Échec du déchiffrement." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Enlightenment ne reconnaît pas cette erreur." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -1068,7 +1069,7 @@ msgstr "Veuillez saisir le mot de passe de déverrouillage" #: src/bin/e_desklock.c:926 msgid "Authenticating..." -msgstr "Authentification..." +msgstr "Authentification…" #: src/bin/e_desklock.c:931 msgid "The password you entered is invalid. Try again." @@ -1447,6 +1448,7 @@ msgstr "Erreur" #, c-format msgid "The recent DND operation requested for '%s' has failed." msgstr "" +"La récente opération de glisser-déplacer demandée pour « %s » a échoué." #: src/bin/e_fm.c:8694 src/modules/fileman/e_mod_config.c:361 msgid "Case Sensitive" @@ -1628,19 +1630,19 @@ msgstr "Paramètres des icônes de fichiers" #: src/bin/e_fm.c:9847 src/bin/e_fm.c:10063 msgid "Set background..." -msgstr "Définir le fond d'écran…" +msgstr "Définir le fond d'écran …" #: src/bin/e_fm.c:9855 msgid "Clear background" -msgstr "Enlever le fond d'écran…" +msgstr "Enlever le fond d'écran …" #: src/bin/e_fm.c:9862 src/bin/e_fm.c:10091 msgid "Set overlay..." -msgstr "Définir l'incrustation…" +msgstr "Définir l'incrustation …" #: src/bin/e_fm.c:9868 msgid "Clear overlay" -msgstr "Supprimer l'incrustation…" +msgstr "Supprimer l'incrustation …" #: src/bin/e_fm.c:10185 src/bin/e_fm.c:10521 #, c-format @@ -1659,11 +1661,11 @@ msgstr "%s existe déjà !" #: src/bin/e_fm.c:10277 src/bin/e_fm.c:10311 #, c-format msgid "%s could not be renamed because it is protected" -msgstr "" +msgstr "%s ne peut être renommé car il est protégé" #: src/bin/e_fm.c:10280 src/bin/e_fm.c:10314 msgid "Internal filemanager error :(" -msgstr "Erreur interne du gestionnaire de fichiers :(" +msgstr "Erreur interne du gestionnaire de fichiers :(" #: src/bin/e_fm.c:10368 src/bin/e_fm.c:10589 msgid "Retry" @@ -1714,7 +1716,7 @@ msgstr "Confirmer la suppression" #: src/bin/e_fm.c:10802 #, c-format msgid "Are you sure you want to delete
%s?" -msgstr "Voulez-vous vraiment supprimer
%s?" +msgstr "Voulez-vous vraiment supprimer
%s ?" #: src/bin/e_fm.c:10807 #, c-format @@ -1723,7 +1725,7 @@ msgid "" "in
%s?" msgstr "" "Voulez-vous vraiment supprimer
tous les %d fichiers " -"dans
%s?" +"dans
%s ?" #: src/bin/e_fm.c:10817 #, c-format @@ -1767,7 +1769,7 @@ msgstr "Périphérique amovible" #: src/bin/e_fm_prop.c:255 #, c-format msgid "Cannot change permissions: %s" -msgstr "Impossible de changer les permissions: %s" +msgstr "Impossible de changer les permissions : %s" #: src/bin/e_fm_prop.c:390 src/bin/e_shelf.c:1123 src/bin/e_shelf.c:2363 #: src/modules/comp/e_mod_config.c:493 @@ -1788,7 +1790,7 @@ msgstr "Taille :" #: src/bin/e_fm_prop.c:411 msgid "Occupied blocks on disk:" -msgstr "" +msgstr "Blocs occupés sur le disque :" #: src/bin/e_fm_prop.c:418 msgid "Last Accessed:" @@ -1920,7 +1922,7 @@ msgstr "" #: src/bin/e_gadcon.c:3087 #, c-format msgid "Module %s needs to support %s" -msgstr "" +msgstr "Le module %s doit prendre en charge %s" #: src/bin/e_grab_dialog.c:3 #: src/modules/conf_keybindings/e_int_config_keybindings.c:4 @@ -1985,7 +1987,7 @@ msgstr "Utiliser" #: src/bin/e_import_config_dialog.c:295 msgid "Picture Import Error" -msgstr "Erreur lors de l'importation du fichier" +msgstr "Erreur lors de l'importation de l'image" #: src/bin/e_import_config_dialog.c:296 msgid "" @@ -1995,7 +1997,7 @@ msgstr "" #: src/bin/e_import_config_dialog.c:459 msgid "Import Settings..." -msgstr "" +msgstr "Paramètres de l'importation…" #: src/bin/e_import_config_dialog.c:491 msgid "Fill and Stretch Options" @@ -2281,7 +2283,7 @@ msgstr "Liste des fenêtres" #: src/modules/pager/e_mod_main.c:2935 src/modules/pager/e_mod_main.c:2937 #: src/modules/pager/e_mod_main.c:2939 src/modules/pager/e_mod_main.c:2941 msgid "Pager" -msgstr "Pager" +msgstr "Miniature des bureaux" #: src/bin/e_int_border_menu.c:1297 src/modules/wizard/page_180.c:24 msgid "Taskbar" @@ -2537,12 +2539,12 @@ msgstr "Enroulée" #: src/bin/e_int_border_prop.c:508 src/bin/e_int_border_remember.c:731 #: src/modules/quickaccess/e_mod_config.c:342 msgid "Skip Taskbar" -msgstr "Ignorer la barre des tâches" +msgstr "Ne pas afficher dans la barre des tâches" #: src/bin/e_int_border_prop.c:509 src/bin/e_int_border_remember.c:728 #: src/modules/quickaccess/e_mod_config.c:345 msgid "Skip Pager" -msgstr "Ignorer le Pager" +msgstr "Ne pas afficher dans la miniature des bureaux" #: src/bin/e_int_border_prop.c:510 src/modules/comp/e_mod_config.c:280 msgid "Hidden" @@ -2745,7 +2747,7 @@ msgstr "Gadgets disponibles" #: src/bin/e_int_gadcon_config.c:786 msgid "Shelf Contents" -msgstr "Contenu du rack" +msgstr "Contenu du rayon" #: src/bin/e_int_gadcon_config.c:792 msgid "Toolbar Contents" @@ -2832,7 +2834,7 @@ msgstr "Voir/Cacher les fenêtres" #: src/bin/e_int_menus.c:697 msgid "No applications" -msgstr "" +msgstr "Aucune application" #: src/bin/e_int_menus.c:914 msgid "Set Virtual Desktops" @@ -2850,20 +2852,20 @@ msgstr "Fenêtre sans titre" #: src/modules/conf_shelves/e_int_config_shelf.c:193 #, c-format msgid "Shelf %s" -msgstr "" +msgstr "Rayon %s" #: src/bin/e_int_menus.c:1665 msgid "Add a Shelf" -msgstr "Ajouter un rack" +msgstr "Ajouter un rayon" #: src/bin/e_int_menus.c:1672 msgid "Delete a Shelf" -msgstr "Supprimer un rack" +msgstr "Supprimer un rayon" #: src/bin/e_int_shelf_config.c:44 #: src/modules/conf_shelves/e_int_config_shelf.c:55 msgid "Shelf Settings" -msgstr "Paramétrage du rack" +msgstr "Paramétrage du rayon" #: src/bin/e_int_shelf_config.c:143 msgid "Above Everything" @@ -2879,7 +2881,7 @@ msgstr "En dessous de tout" #: src/bin/e_int_shelf_config.c:149 msgid "Allow windows to overlap the shelf" -msgstr "Les fenêtres peuvent masquer ce rack" +msgstr "Les fenêtres peuvent masquer ce rayon" #: src/bin/e_int_shelf_config.c:199 #, c-format @@ -2897,7 +2899,7 @@ msgstr "Style" #: src/bin/e_int_shelf_config.c:219 msgid "Auto-hide the shelf" -msgstr "Auto-masquage du rack" +msgstr "Auto-masquage du rayon" #: src/bin/e_int_shelf_config.c:224 msgid "Show on mouse in" @@ -3178,7 +3180,7 @@ msgstr "Configuration des modes d'économie d'énergie" #: src/bin/e_main.c:720 msgid "Enlightenment cannot set up its powersave modes.\n" -msgstr "" +msgstr "Enlightenment ne peut initialiser ses modes d'économie d'énergie.\n" #: src/bin/e_main.c:727 msgid "Setup Desklock" @@ -3631,7 +3633,7 @@ msgstr "" #: src/bin/e_shelf.c:67 msgid "Float" -msgstr "" +msgstr "Nombre à virgule flottante" #: src/bin/e_shelf.c:68 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:230 @@ -3698,32 +3700,32 @@ msgstr "Coin droit inférieur" #: src/bin/e_shelf.c:268 src/bin/e_shelf.c:1121 #, c-format msgid "Shelf #%d" -msgstr "" +msgstr "Rayon n°%d" #: src/bin/e_shelf.c:892 msgid "Shelf Autohide Error" -msgstr "Erreur d'auto-masquage du rack" +msgstr "Erreur d'auto-masquage du rayon" #: src/bin/e_shelf.c:892 msgid "" "Shelf autohiding will not work properly
with the current configuration; " "set your shelf to
\"Below Everything\" or disable autohiding." msgstr "" -"L’auto-masquage du rack ne va pas fonctionner correctement
avec la " +"L’auto-masquage du rayon ne va pas fonctionner correctement
avec la " "configuration actuelle; configurez votre rack en
\"En dessous de tout\" " "ou désactivez l'auto-masquage." #: src/bin/e_shelf.c:1122 msgid "Add New Shelf" -msgstr "Ajouter un rack" +msgstr "Ajouter un rayon" #: src/bin/e_shelf.c:1143 msgid "Shelf Error" -msgstr "Erreur de rack" +msgstr "Erreur de rayon" #: src/bin/e_shelf.c:1143 msgid "A shelf with that name already exists!" -msgstr "Il existe déjà un rack avec ce nom !" +msgstr "Il existe déjà un rayon avec ce nom !" #: src/bin/e_shelf.c:1657 src/bin/e_shelf.c:2486 msgid "Stop Moving Gadgets" @@ -3735,22 +3737,23 @@ msgstr "Déplacer les gadgets" #: src/bin/e_shelf.c:1787 msgid "Are you sure you want to delete this shelf?" -msgstr "Supprimer ce rack, vraiment ?" +msgstr "Voulez-vous vraiment supprimer ce rayon ?" #: src/bin/e_shelf.c:1789 msgid "" "You requested to delete this shelf.

Are you sure you want to delete " "it?" msgstr "" -"Vous avez demandé à supprimer ce rack.

Voulez-vous vraiment le faire ?" +"Vous avez demandé à supprimer ce rayon.

Voulez-vous vraiment le " +"faire ?" #: src/bin/e_shelf.c:2343 msgid "A shelf with that name and id already exists!" -msgstr "Un rack avec ce nom et id existe déjà !" +msgstr "Un rayon avec ce nom et id existe déjà !" #: src/bin/e_shelf.c:2362 msgid "Rename Shelf" -msgstr "Renommer le rack" +msgstr "Renommer le rayon" #: src/bin/e_shelf.c:2436 src/modules/conf_shelves/e_int_config_shelf.c:145 #: src/modules/ibar/e_mod_main.c:859 @@ -3837,7 +3840,7 @@ msgid "" "Powering off.
You cannot do any other system actions
once a shutdown " "has been started." msgstr "" -"Arrêt en cours.
Vous ne pouvez pas effectuer d'autres actions " +"Extinction en cours.
Vous ne pouvez pas effectuer d'autres actions " "système
pendant cette phase." #: src/bin/e_sys.c:597 @@ -3870,7 +3873,7 @@ msgstr "ARGH ! ça ne devrait pas se produire…" #: src/bin/e_sys.c:640 msgid "Power off failed." -msgstr "Impossible d'arrêter l'ordinateur." +msgstr "Impossible d'éteindre l'ordinateur." #: src/bin/e_sys.c:644 msgid "Reset failed." @@ -3886,7 +3889,7 @@ msgstr "La mise en veille sur disque a échoué." #: src/bin/e_sys.c:752 msgid "Power off.
Please wait." -msgstr "Arrêt en cours.
Veuillez patienter." +msgstr "Extinction en cours.
Veuillez patienter." #: src/bin/e_sys.c:796 msgid "Resetting" @@ -3933,6 +3936,30 @@ msgstr "Déplacer/Redimensionner des éléments" msgid "Set Toolbar Contents" msgstr "Définir le contenu de la barre d'outils" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "Me déranger plus tard" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "Ne jamais m'avertir" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "Avis de mise à jour" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" +"Votre version d'Enlightenment
n'est pas la toute dernière publiée.
La " +"dernière version est :

%s

Veuillez visiter www.enlightenment." +"org
ou mettre à jour vos paquets systèmes
pour obtenir une nouvelle " +"version." + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -4215,7 +4242,7 @@ msgstr "Résolution :" #: src/bin/e_widget_filepreview.c:89 msgid "Mime-type:" -msgstr "Types MIME:" +msgstr "Types MIME :" #: src/bin/e_widget_filepreview.c:267 #, c-format @@ -4224,19 +4251,19 @@ msgstr "%3.1f%%" #: src/bin/e_widget_filepreview.c:273 msgid "Length:" -msgstr "Taille:" +msgstr "Taille :" #: src/bin/e_widget_filepreview.c:330 msgid "Used:" -msgstr "Utilisé:" +msgstr "Utilisé :" #: src/bin/e_widget_filepreview.c:332 msgid "Reserved:" -msgstr "Réservé:" +msgstr "Réservé :" #: src/bin/e_widget_filepreview.c:333 msgid "Mount status:" -msgstr "Statut du montage:" +msgstr "Statut du montage :" #: src/bin/e_widget_filepreview.c:335 src/modules/comp/e_mod_config.c:487 #: src/modules/mixer/app_mixer.c:424 @@ -4478,7 +4505,7 @@ msgstr "Date" #: src/modules/clock/e_mod_config.c:105 msgid "Full" -msgstr "" +msgstr "Complète" #: src/modules/clock/e_mod_config.c:107 msgid "Numbers" @@ -4550,7 +4577,7 @@ msgstr "" #: src/modules/comp/e_mod_config.c:106 msgid "Composite Settings" -msgstr "Options du compositeur" +msgstr "Paramètres de l'extension Composite" #: src/modules/comp/e_mod_config.c:265 msgid "Visible" @@ -4576,7 +4603,7 @@ msgstr "" #: src/modules/comp/e_mod_config.c:446 src/modules/comp/e_mod_config.c:751 #: src/modules/comp/e_mod_config.c:818 msgid "Dialog" -msgstr "" +msgstr "Boîte de dialogue" #: src/modules/comp/e_mod_config.c:448 src/modules/comp/e_mod_config.c:753 msgid "Dock" @@ -5052,11 +5079,12 @@ msgstr "Ajouter un profil" #, c-format msgid "You want to delete the \"%s\" profile.

Are you sure?" msgstr "" -"Vous avez demandé à supprimer le profil « %s ».

En Êtes-vous sûr ?" +"Vous avez demandé à supprimer le profil « %s ».

Voulez-vous vraiment " +"le faire ?" #: src/modules/conf_dialogs/e_int_config_profiles.c:338 msgid "Are you sure you want to delete this profile?" -msgstr "Supprimer ce profil, vraiment ?" +msgstr "Voulez-vous vraiment supprimer ce profil ?" #: src/modules/conf_dialogs/e_int_config_dialogs.c:38 msgid "Dialog Settings" @@ -5775,8 +5803,8 @@ msgid "" "Enlightenment was unable to import the configuration.

Are you sure " "this is really a valid configuration?" msgstr "" -"Enlightenment n'a pu importer la configuration.

Êtes-vous sûr que " -"cette configuration est valide ?" +"Enlightenment n'a pu importer la configuration.

Est-ce que cette " +"configuration est vraiment valide ?" #: src/modules/conf_intl/e_int_config_imc_import.c:300 msgid "" @@ -5882,7 +5910,7 @@ msgstr "" #: src/modules/conf_keybindings/e_int_config_acpibindings.c:367 msgid "Power Button" -msgstr "" +msgstr "Bouton d'allumage" #: src/modules/conf_keybindings/e_int_config_acpibindings.c:369 msgid "Processor" @@ -6353,7 +6381,7 @@ msgstr "Niveaux autorisés" #: src/modules/conf_performance/e_int_config_powermanagement.c:129 msgid "Time to defer power-hungry tasks" -msgstr "Il est temps de reporter les taches consommatrices en énergie" +msgstr "Il est temps de reporter les tâches consommatrices en énergie" #: src/modules/conf_performance/e_int_config_powermanagement.c:140 msgid "Min" @@ -6404,13 +6432,21 @@ msgstr "Performance" #: src/modules/conf_performance/e_mod_main.c:20 msgid "Power Management" -msgstr "Économie d'énergie" +msgstr "Gestion de l'énergie" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Configuration de l'écran" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" @@ -6419,11 +6455,11 @@ msgstr "" #: src/modules/conf_shelves/e_int_config_shelf.c:390 #, c-format msgid "Are you sure you want to delete \"%s\"?" -msgstr "Êtes-vous sûr de vouloir supprimer \"%s\"?" +msgstr "Voulez-vous vraiment supprimer « %s » ?" #: src/modules/conf_shelves/e_int_config_shelf.c:393 msgid "Confirm Shelf Deletion" -msgstr "Confirmer la suppression du rack" +msgstr "Confirmer la suppression du rayon" #: src/modules/conf_theme/e_int_config_wallpaper.c:103 msgid "Wallpaper Settings" @@ -6552,7 +6588,7 @@ msgstr "Fond de base de la boîte de dialogue" #: src/modules/conf_theme/e_int_config_color_classes.c:96 msgid "Shelf Background Base" -msgstr "Fond de base du rack" +msgstr "Arrière-plan de base du rayon" #: src/modules/conf_theme/e_int_config_color_classes.c:97 msgid "File Manager Background Base" @@ -6754,7 +6790,7 @@ msgstr "Titre de l'à propos" #: src/modules/conf_theme/e_int_config_fonts.c:70 msgid "About Version" -msgstr "Version de l'à propos" +msgstr "À propos de la version" #: src/modules/conf_theme/e_int_config_fonts.c:72 msgid "Desklock Title" @@ -7082,8 +7118,8 @@ msgid "" "Enlightenment was unable to import the theme.

Are you sure this is " "really a valid theme?" msgstr "" -"Enlightenment n'a pu importer ce thème.

Êtes-vous sûr qu'il s'agit " -"d'un thème valide ?" +"Enlightenment n'a pu importer ce thème.

Est-ce vraiment un thème " +"valide ?" #: src/modules/conf_theme/e_int_config_theme_import.c:293 msgid "Enlightenment was unable to import the theme
due to a copy error." @@ -7279,7 +7315,7 @@ msgstr "Nouvelles fenêtres" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:194 msgid "Animate" -msgstr "Animation" +msgstr "Animer" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:206 msgid "Linear" @@ -7319,7 +7355,7 @@ msgstr "Plus de rebond" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:251 msgid "Shading" -msgstr "Enroulement" +msgstr "Ombrage" #: src/modules/conf_window_manipulation/e_int_config_window_display.c:261 msgid "Keep windows within the visual screen limits" @@ -7544,7 +7580,7 @@ msgstr "Déplacer après redimensionnement" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:277 msgid "Adjust windows on shelf hide" -msgstr "Ajuster les fenêtres lors de l'auto-masquage du rack" +msgstr "Ajuster les fenêtres lors de l'auto-masquage du rayon" #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:285 msgid "Follow Move" @@ -8038,11 +8074,11 @@ msgstr "" #: src/modules/everything/evry_gadget.c:587 msgid "Everything Gadgets" -msgstr "" +msgstr "Gadgets de Omni" #: src/modules/everything/evry_gadget.c:685 msgid "Plugin" -msgstr "" +msgstr "Greffon" #: src/modules/everything/evry_plug_actions.c:172 msgid "Actions" @@ -8097,7 +8133,7 @@ msgstr "Lancer l'exécutable" #: src/modules/everything/evry_plug_apps.c:1301 #: src/modules/everything/evry_plug_apps.c:1428 msgid "Everything Applications" -msgstr "Omni applications" +msgstr "Applications Omni" #: src/modules/everything/evry_plug_apps.c:1332 msgid "Commands" @@ -8157,7 +8193,7 @@ msgstr "Documents récents" #: src/modules/everything/evry_plug_files.c:1457 #: src/modules/everything/evry_plug_files.c:1600 msgid "Everything Files" -msgstr "Omni fichiers" +msgstr "Fichiers Omni" #: src/modules/everything/evry_plug_files.c:1484 msgid "Show recent files" @@ -8881,7 +8917,7 @@ msgstr "" #: src/modules/ibar/e_mod_config.c:198 msgid "Are you sure you want to delete this bar source?" -msgstr "Supprimer cette source, vraiment ?" +msgstr "Voulez-vous vraiment supprimer cette source ?" #: src/modules/ibar/e_mod_main.c:285 src/modules/ibar/e_mod_main.c:1802 msgid "IBar" @@ -8934,7 +8970,7 @@ msgstr "Afficher la légende de la bordure" #: src/modules/ibox/e_mod_config.c:155 msgid "Show windows from all screens" -msgstr "Afficher les fenêtres des autres écrans" +msgstr "Afficher les fenêtres de tous les écrans" #: src/modules/ibox/e_mod_config.c:160 msgid "Show windows from current screen" @@ -8954,7 +8990,7 @@ msgstr "IBox" #: src/modules/pager/e_mod_config.c:76 msgid "Pager Settings" -msgstr "Paramétrage du Pager" +msgstr "Configuration de la miniature des bureaux" #: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:189 msgid "Flip desktop on mouse wheel" @@ -9006,7 +9042,7 @@ msgstr "Faire glisser le bureau" #: src/modules/pager/e_mod_config.c:235 msgid "Popup pager height" -msgstr "Hauteur du pop-up du Pager" +msgstr "Hauteur du pop-up de la miniature des bureaux" #: src/modules/pager/e_mod_config.c:245 msgid "Popup duration" @@ -9019,7 +9055,7 @@ msgstr "%1.1f secondes" #: src/modules/pager/e_mod_config.c:256 msgid "Pager action popup height" -msgstr "Hauteur du pop-up d'action du Pager" +msgstr "Hauteur du pop-up d'action de la miniature des bureaux" #: src/modules/pager/e_mod_config.c:266 msgid "Show popup for urgent window" @@ -9051,13 +9087,13 @@ msgid "" "already taken by internal
code for context menus.
This button only " "works in the popup." msgstr "" -"Vous ne pouvez pas utiliser le bouton droit de la souris
dans le rack " +"Vous ne pouvez pas utiliser le bouton droit de la souris
dans le rayon " "pour cette action car il est déjà utilisé
par le code interne, pour les " "menus contextuels.
Ce bouton fonctionne uniquement dans le pop-up." #: src/modules/pager/e_mod_main.c:2924 msgid "Show Pager Popup" -msgstr "Afficher le pop-up du Pager" +msgstr "Afficher le pop-up de la miniature des bureaux" #: src/modules/pager/e_mod_main.c:2931 msgid "Popup Desk Right" @@ -9756,6 +9792,8 @@ msgstr "Zone de notification : erreur" #: src/modules/systray/e_mod_main.c:498 msgid "Systray cannot set its background invisible to match its shelf." msgstr "" +"La zone de notification ne peut pas définir son arrière-plan invisible pour " +"correspondre à son rayon." #: src/modules/systray/e_mod_main.c:940 msgid "Another systray exists" @@ -9770,7 +9808,7 @@ msgstr "" #: src/modules/systray/e_mod_main.c:950 msgid "Systray cannot work in a shelf that is set to below everything." msgstr "" -"La zone de notification ne fonctionne pas dans un rack « en dessous de " +"La zone de notification ne fonctionne pas dans un rayon « en dessous de " "tout »." #: src/modules/systray/e_mod_main.c:1161 @@ -10139,7 +10177,7 @@ msgstr "Module de notification" #: src/modules/notification/e_mod_main.c:192 msgid "Error During DBus Init!" -msgstr "Erreur durant l'initialisation de DBus !" +msgstr "Erreur durant l'initialisation de DBus !" #: src/modules/notification/e_mod_main.c:193 msgid "" @@ -10200,3 +10238,6 @@ msgstr "Ignorer l'ID de remplacement" #: src/modules/notification/e_mod_config.c:144 msgid "Use multiple monitor geometry" msgstr "Utiliser la géométrie de plusieurs moniteurs" + +#~ msgid "Opacity" +#~ msgstr "Opacité" diff --git a/po/fr_CH.gmo b/po/fr_CH.gmo index 1534e92b1f..de50e1864b 100644 Binary files a/po/fr_CH.gmo and b/po/fr_CH.gmo differ diff --git a/po/fr_CH.po b/po/fr_CH.po index 0fb7b110c6..f1d9f4ac42 100644 --- a/po/fr_CH.po +++ b/po/fr_CH.po @@ -29,12 +29,12 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2007-06-04 11:27+0100\n" "Last-Translator: Antoine Giniès \n" "Language-Team: Enlightenment i18n French \n" -"Language: \n" +"Language: fr_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -894,7 +894,7 @@ msgstr "Sélectionner une icône" msgid "Cancel" msgstr "Annuler" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 #, fuzzy msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " @@ -915,7 +915,7 @@ msgstr "" "reconfigurer tout à votre goût comme avant.
Désolé pour le désagrément " "occasionné.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 #, fuzzy msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " @@ -931,12 +931,12 @@ msgstr "" "sain et par précaution votre
configuration a été remise à zéro. Désolé " "pour les désagréments.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 #, fuzzy msgid "Enlightenment Settings Write Problems" msgstr "Problèmes d'écriture de la configuration d'Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -947,14 +947,15 @@ msgstr "" "n'est pas courant.

Le fichier sur lequel l'erreur est apparu est:
" "%s

Ce fichier a été effacé pour éviter des erreurs de corruption.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -965,97 +966,97 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 #, fuzzy msgid "Settings Upgraded" msgstr "Paramètre du bureau" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." msgstr "" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "L'hibernation de votre système a échoué." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Aucune fenêtre)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Délai avant hibernation" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Délai avant hibernation" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Bienvenue à Enlightenment 東京" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4244,6 +4245,27 @@ msgstr "Démarrer le déplacement/redimensionnement des éléments" msgid "Set Toolbar Contents" msgstr "Configurer le contenu du tablar" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "État" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6931,12 +6953,22 @@ msgstr "Performance" msgid "Power Management" msgstr "Gestion d'énergie" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Ecran de veille" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Données de sortie" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Restauration de la Résolution au Démarrage" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -14771,9 +14803,6 @@ msgstr "" #~ msgid "Module to change screen resolution for E17" #~ msgstr "Module pour changer la résolution de l'écran pour E17" -#~ msgid "Restore Resolution on Startup" -#~ msgstr "Restauration de la Résolution au Démarrage" - #~ msgid "Keep new resolution %dx%d?

" #~ msgstr "" #~ "Voulez-vous garder la nouvelle résolution %dx%d?" diff --git a/po/gl.gmo b/po/gl.gmo index 4db1475daf..4000996c46 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 5b30c60f4f..4665a29e7a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2013-01-23 20:44+0100\n" "Last-Translator: Aníbal Garrido Hermo \n" "Language-Team: Galician \n" @@ -815,7 +815,7 @@ msgstr "Seleccionar" msgid "Cancel" msgstr "Cancelar" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -835,7 +835,7 @@ msgstr "" "
isto. Agora pode reconfigurar as cousas
ó seu gusto. Desculpe as " "molestias.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -850,11 +850,11 @@ msgstr "" "súa configuración foi restaurada ós seus valores
predeterminados. " "Desculpe polas molestias.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problemas de escritura coas configuracións de Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -864,14 +864,15 @@ msgstr "" "Enlightenment tivo un erro mentres movía os ficheiros de configuración
de:" "
%s

a:
%s

A tarefa cancelouse por seguridade.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -882,19 +883,19 @@ msgstr "" msgid "OK" msgstr "Aceptar" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Configuracións Actualizadas" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "O manexador de ficheiros EET é inválido." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "O ficheiro de datos está vacío." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -902,17 +903,17 @@ msgstr "" "Non se pode escribir no ficheiro. Pode ser que o disco sexa de só-" "lectura
ou que vostede perdera os permisos dos seus ficheiros." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Ficou sen memoria ó preparar a escritura.
Por favor libere espazo da " "memoria." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Isto é un erro xenérico." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -920,59 +921,59 @@ msgstr "" "O ficheiro de configuración é moi grande.
Debe ser moi pequeno (uns " "poucos centos de KB como máximo)" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Ten problemas de E/S no disco.
Quizáis necesite substituilo?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Ficou sen espazo mentres escribía o ficheiro" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Pechouse o ficheiro durante a escritura." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Fallou o \"Memory-mapping (nmap)\" do ficheiro" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Fallo de codificación X509" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Sinatura fallida." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "A sinatura é inválida." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Sen asinar." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Opción non implementada." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "O PRNG non se sementou." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Fallou ó cifrar" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Fallo ó descifrar" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "O erro non é recoñecido por Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3924,6 +3925,27 @@ msgstr "Comezar a mover/mudar de tamaño os elementos" msgid "Set Toolbar Contents" msgstr "Definir o contido da barra de ferramentas" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Actualizacións" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6415,11 +6437,21 @@ msgstr "Rendemento" msgid "Power Management" msgstr "Xestión da enerxía" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Configuración da pantalla" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Saída" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Bloquear ó Arranque" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/he.gmo b/po/he.gmo index 9a8ece5da0..11f7c1109a 100644 Binary files a/po/he.gmo and b/po/he.gmo differ diff --git a/po/he.po b/po/he.po index 41fc74a586..1b9da59aac 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-09-11 09:15+0000\n" "Last-Translator: Yaron \n" "Language-Team: Hebrew \n" @@ -852,7 +852,7 @@ msgstr "הגדרות" msgid "Cancel" msgstr "ביטול" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -863,7 +863,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -872,11 +872,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "בעיות בכתיבה להגדרות Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -887,14 +887,15 @@ msgstr "" "את
מקור השגיאה.

הקובץ בו ארעה השגיאה הינו:
%s

קובץ זה " "נמחק מחשש לנתונים פגומים.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -905,21 +906,21 @@ msgstr "" msgid "OK" msgstr "אישור" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "ההגדרות שודרגו" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "ידית קובץ EET רע." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "קובץ נתונים ריק." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -927,17 +928,17 @@ msgid "" msgstr "" "הקובץאינו ניתן לכתיבה. אולי הדיסק הוא לקריאה בלבד
או איבדת הרשאות לקבצים." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "זיכרון נגמר בעת הכנתהכתיבה.
אנא זיכרון עד בחינם." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "זוהי שגיאה כללית." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -945,70 +946,70 @@ msgid "" msgstr "" "קובץ הגדרות גדול מדי.
זה צריך להיות קטן מאוד (כמה מאות KB לכל היותר)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "אתה רץ מתוך שטח בעת כתיבתקובץ" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "התיק נסגר על זה בזמן הכתיבה." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "זיכרון , מיפוי (mmap) של הקובץ נכשלה." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 קידוד נכשלה." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "החתימה נכשל." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "החתימהלא תקין." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(אין חלונות)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "תכונה לא מיושם." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG לא זרע." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "הצפנת נכשל." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "תיאור: לא זמין" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4077,6 +4078,27 @@ msgstr "התחלת הזזה/שינוי גודל לפריטים" msgid "Set Toolbar Contents" msgstr "הגדרת תכולת סרגל הכלים" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "מצב" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6841,12 +6863,22 @@ msgstr "ביצועים" msgid "Power Management" msgstr "ניהול צריכת חשמל" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "שומר מסך" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "פלט" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "נעל על אתחול" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/hr.gmo b/po/hr.gmo index de03b5dff1..e982497a1a 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index 6b301015d5..dd8039f41a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-11-09 18:07+0000\n" "Last-Translator: Miro Glavić \n" "Language-Team: Croatian \n" @@ -851,7 +851,7 @@ msgstr "Odaberi Jedan" msgid "Cancel" msgstr "Poništi" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -870,7 +870,7 @@ msgstr "" "rekonfigurirati stvari
po vašoj želji. Izvinjavamo se zbog problema sa " "vašim postavkama.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -884,11 +884,11 @@ msgstr "" "i radi predostrožnosti vaše postavke su vraćene u
originalno stanje. " "Izvinjavamo se zbog neugodnosti.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problemi Pisanja Enlightenment Postavki" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -900,14 +900,15 @@ msgstr "" "otkrivena:
%s

je uklonjena da bi se izbjegla korupcija podataka." "
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -918,21 +919,21 @@ msgstr "" msgid "OK" msgstr "U redu" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Postavke Unaprijeđene" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET file ručka je loše." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Datoteka podataka je prazna." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -941,18 +942,18 @@ msgstr "" "Datoteka nije pisati. Moždaje disk samo za čitanje
ili ste izgubili " "dozvole za svojim datotekama." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Memorija je ponestalo , a pripreme pišem.
Molimo slobodnu memoriju gore." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "To jeopćenito greška." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -961,71 +962,71 @@ msgstr "" "Postavke datoteka je prevelika.
To bi trebao biti vrlo mali (nekoliko " "stotina KB najviše)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Vi ponestalo prostora , a pisanje na datoteku" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "File bio je zatvoren na njega dok je pisao." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Memory - mapiranje (mmap) u datoteke nije uspjelo." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Kodiranje nije uspjelo." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Hiberniranje nije uspjelo" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Potpis je bio nevažeći." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Nema Prozora)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Imaju ne provode." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG nije bio prepun." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Suspendiranje nije uspjelo" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Suspendiranje nije uspjelo" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Dobrodošli u Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4112,6 +4113,27 @@ msgstr "Počni Pomicanje/Promjenu Veličine Stvari" msgid "Set Toolbar Contents" msgstr "Postavi Sadržaj Alatne Trake" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Stanje" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6763,12 +6785,22 @@ msgstr "Učinkovitost" msgid "Power Management" msgstr "Upravitelj Energije" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Čuvar Zaslona" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Izlaz" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Zaključavanje na pokretanje" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/hu.gmo b/po/hu.gmo index f61bd57272..ff89ded1c2 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index ecc4ed55dc..cf6c82ad0d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-10-24 09:18+0000\n" "Last-Translator: lisovszki \n" "Language-Team: Hungarian \n" @@ -853,7 +853,7 @@ msgstr "Válassz egy" msgid "Cancel" msgstr "Mégsem" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -870,7 +870,7 @@ msgstr "" "és
ezek az elõzõ fájlokból hiányoztak. Mindent visszaállíthatsz,
ahogy " "neked tetszik. Az esetleges galibákért elnézést kérünk!
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -884,11 +884,11 @@ msgstr "" "Ez így nem túl jó, és figyelmez-
tetésként a beállítások visszaálltak az " "alapértelmezésre.
A galibákért elnézést kérünk!
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Enlightenment konfiguráció írási problémák" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -899,14 +899,15 @@ msgstr "" "megszakadt. Ez nagyon szokatlan.

A fájl, ahol a hiba keletkezett:
" "%s

A fájl törölve lett.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -917,21 +918,21 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Beállítások frissítve" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "Az EET fájlleíróba rossz." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "A fájl adatai üres." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -940,18 +941,18 @@ msgstr "" "A fájl nem írható. Talán a lemez csak olvasható
vagy elveszett " "engedélyeket a fájlokat." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Memória elfogyott , miközben készül az írás.
szabadítson fel memóriát." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Ez egy általános hiba." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -960,71 +961,71 @@ msgstr "" "A beállítások fájl túl nagy.
Meg kell nagyon kicsi (néhány száz KB " "legfeljebb)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Ha elfogyott a hely a fájl írása közben" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "A fájl -én zárult , hogy írás közben." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Memory -mapping (mmap) a fájl nem sikerült." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 kódolás nem sikerült." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Hibernálás nem sikerült." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Az aláírás érvénytelen." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Nincsenek ablakok)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Szolgáltatás nem hajtották végre." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG nem a maggal." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Felfüggesztés nem sikerült." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Felfüggesztés nem sikerült." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Üdvözlünk az Enlightenmentben" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4087,6 +4088,27 @@ msgstr "Elemek mozgatása/átméretezése" msgid "Set Toolbar Contents" msgstr "Eszköztár tartalmának a beállítása" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Állapot" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6741,12 +6763,22 @@ msgstr "Teljesítmény" msgid "Power Management" msgstr "Energiakezelés" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Képernyővédő" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Kimenet" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Lock indításkor" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/it.gmo b/po/it.gmo index 4453e1de08..88c5b7879f 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 5d2b6d28eb..f814a36390 100644 --- a/po/it.po +++ b/po/it.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" -"PO-Revision-Date: 2013-02-09 13:54+0100\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" +"PO-Revision-Date: 2013-07-02 19:26+0200\n" "Last-Translator: Massimo Maiurana \n" "Language-Team: none\n" -"Language: \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" @@ -812,7 +812,7 @@ msgstr "Seleziona" msgid "Cancel" msgstr "Annulla" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -832,7 +832,7 @@ msgstr "" "funzionalità.
Adesso è possibile riconfigurare le cose a proprio " "piacimento.
Ci scusiamo per il disagio.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -847,11 +847,11 @@ msgstr "" "male, quindi la vostra configurazione è
stata ripristinata a scopo " "precauzionale ai valori predefiniti. Ci
scusiamo per l'inconveniente.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problemi scrittura configurazione di Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -862,14 +862,15 @@ msgstr "" "configurazione da:
%s

a:
%s

Il resto della scrittura è " "stato abortito per sicurezza.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -880,19 +881,19 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Impostazioni aggiornate" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "La gestione del file EET è errata." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Il file non contiene dati." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -900,17 +901,17 @@ msgstr "" "Il file non è scrivibile. Forse il disco e' montato in sola
lettura o non " "si hanno più i propri permessi." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "La memoria è andata esaurita mentre si preparava
la scrittura. Si prega " "di liberare memoria." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Questo è un errore generico." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -918,60 +919,60 @@ msgstr "" "Il file di impostazioni è troppo grande.
Dovrebbe essere molto piccolo " "(al massimo qualche centinaio di KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" "Ci sono errori di I/O sul disco.
Forse ha bisogno di essere sostituito?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Lo spazio è andato esaurito mentre si scriveva il file." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Il file è stato chiuso mentre lo si scriveva." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "La mappatura in memoria (mmap) del file è fallita." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "La codifica X509 è fallita." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Firma fallita." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "La firma non era valida." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Non firmato." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Funzionalità non implementata." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Non è stato fornito il seme al PRNG." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Crittazione fallita." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Decrittazione fallita." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "L'errore è sconosciuto a Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3988,6 +3989,30 @@ msgstr "Inizio spostamento/ridimensionamento oggetti" msgid "Set Toolbar Contents" msgstr "Imposta contenuti della barra strumenti" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "Ricordamelo più tardi" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "Non chiedermelo più" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "Notifica aggiornamenti" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" +"La vostra versione di Enlightenment
non è quella più recente.
L'ultima " +"versione è:

%s

Potete visitare www.enlightenment.org
o " +"aggiornare i vostri pacchetti di
sistema per ottenere una " +"nuova
versione." + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6487,11 +6512,19 @@ msgstr "Prestazioni" msgid "Power Management" msgstr "Gestione energetica" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Impostazioni schermo" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "Uscita primaria" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "Ripristina all'avvio" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ja.gmo b/po/ja.gmo index ec13969afb..7c825b2d09 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 63ccad037d..a25133f571 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2011-01-06 16:45+0900\n" "Last-Translator: Yasufumi Haga \n" "Language-Team: E17-jp \n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -858,7 +858,7 @@ msgstr "選択" msgid "Cancel" msgstr "取消" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -875,7 +875,7 @@ msgstr "" "いデフォルト設定
を追加すれば更新されます. これで好きなように設定できます." "ちょっと面倒ですが,
よろしくお願いします.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -889,11 +889,11 @@ msgstr "" "
これではまずいので, 念のためデフォルトの設定に置き換えました.
ご不便を" "おかけしますが, よろしくお願いします.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Enlightenment の設定書込時の問題" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -903,14 +903,15 @@ msgstr "" "%s から %s へ設定ファイルの移動中にエラーが起きました.
安全のため書き出し" "はここで強制終了しました." -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -921,19 +922,19 @@ msgstr "" msgid "OK" msgstr "了解" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "設定が更新されました" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "EETファイルハンドルがおかしいです" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "ファイルデータが空です" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -941,78 +942,78 @@ msgstr "" "このファイルには書き込めません.
ディスクが読み出し専用になっているか書き込" "み権限がありません" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "書き出し準備中のメモリ不足になりました. メモリ解放してください." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "これは一般的なエラーです。" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" "設定ファイルが大きすぎます.
ずっと小さいはずです (せいぜい数百KB程度)" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "ディスクの入出力エラーです. 交換した方がいいかも." -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "ファイル書き出し中にスペースが不足しました" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "書き出し中にファイルがクローズされました" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "ファイルのメモリマップ (mmap) が失敗しました" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "X509エンコーディングが失敗しました" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "署名に失敗しました" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "署名が不正です" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "署名がありません" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "機能が未実装です" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "PRNGの種がありません" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "暗号化が失敗しました" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "復号化が失敗しました" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "未知のエラーです" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4109,6 +4110,27 @@ msgstr "搭載ガジェットの位置と大きさの変更を始める" msgid "Set Toolbar Contents" msgstr "ツールバーの内容の設定" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "更新する" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6747,12 +6769,22 @@ msgstr "性能" msgid "Power Management" msgstr "電源管理" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "スクリーンセーバー" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "出力" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "起動時にガバナー復帰" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -14466,9 +14498,6 @@ msgstr "" #~ msgid "Check Very Slow (30 sec)" #~ msgstr "30 秒ごと" -#~ msgid "Restore Governor on Startup" -#~ msgstr "起動時にガバナー復帰" - #~ msgid "Desktop Name Position" #~ msgstr "デスクトップ名の表示位置" diff --git a/po/km.gmo b/po/km.gmo index 01cf681e11..922afd3452 100644 Binary files a/po/km.gmo and b/po/km.gmo differ diff --git a/po/km.po b/po/km.po index 1e6ebb0cd4..b01a4d5d2e 100644 --- a/po/km.po +++ b/po/km.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-09-03 09:15+0000\n" "Last-Translator: Chanrithy Thim \n" "Language-Team: Khmer \n" -"Language: \n" +"Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -826,7 +826,7 @@ msgstr "ជ្រើស​ទាំងអស់" msgid "Cancel" msgstr "បោះ​​​បង់" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -837,7 +837,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -846,11 +846,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -858,14 +858,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -876,92 +877,92 @@ msgstr "" msgid "OK" msgstr "យល់​ព្រម" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." msgstr "" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "ថ្នាក់​បង្អួច" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3761,6 +3762,26 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6247,12 +6268,20 @@ msgstr "" msgid "Power Management" msgstr "" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "អេក្រង់" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ko.gmo b/po/ko.gmo index 26d28ce340..cb6dfe6142 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 53798fa4b2..d7c80d08fa 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-21 22:14+0900\n" "Last-Translator: Daniel Juyung Seo \n" "Language-Team: Korean \n" @@ -815,7 +815,7 @@ msgstr "선택" msgid "Cancel" msgstr "취소" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -832,7 +832,7 @@ msgstr "" "가하여 문제를 해결합니다.
이제 여러분의 취향대로 다시 설정할 수 있습니다." "
여러분의 설정에 문제를 일으켜 죄송합니다.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -846,11 +846,11 @@ msgstr "" "
이는 잘못된 현상이며 설정을 기본으로 되돌려놓았습니다.
불편을 드려 죄" "송합니다.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "인라이튼먼트 설정 기록 문제" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -861,14 +861,15 @@ msgstr "" "동하는 동안 오류가 발생했습니다.
안전을 위해 나머지 부분의 기록을 중지했습" "니다.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -879,19 +880,19 @@ msgstr "" msgid "OK" msgstr "확인" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "설정이 갱신되었습니다." -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "EET 파일 핸들이 손상되었습니다." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "파일 데이터가 비어 있습니다." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -899,74 +900,74 @@ msgstr "" "파일에 쓰기 권한이 없습니다. 아마도 디스크가 읽기 전용이거나
해당 파일에 " "대한 권한을 잃었을 지도 모릅니다." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "기록을 준비하는 동안 메모리가 바닥났습니다.
메모리를 비워주십시오." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "이것은 일반적인 오류입니다." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" "설정 파일이 너무 큽니다.
설정 파일은 매우 작아야 합니다(최대 몇 백 KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "디스크에 입출력 오류가 발생했습니다.
바꾸어야 하지 않겠습니까?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "파일을 기록하는 동안 공간이 바닥났습니다." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "기록하는 중 파일이 닫혔습니다." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "파일의 메모리 매핑(mmap)에 실패했습니다." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "X509 인코딩에 실패했습니다." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "서명에 실패했습니다." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "서명이 잘못되었습니다." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "서명이 없습니다." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "기능이 구현되지 않았습니다." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "PRNG가 동작하지 않았습니다." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "암호화에 실패했습니다." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "복호화에 실패했습니다." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "인라이튼먼트에서 알려지지 않은 오류입니다." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3889,6 +3890,27 @@ msgstr "항목 이동/크기 조절 시작" msgid "Set Toolbar Contents" msgstr "도구 모음 내용 설정" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "업데이트" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6359,11 +6381,21 @@ msgstr "성능" msgid "Power Management" msgstr "전원 관리" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "화면 설정" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "출력" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "시작시 잠금" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ku.gmo b/po/ku.gmo index 6c595ffb95..eed4bc7679 100644 Binary files a/po/ku.gmo and b/po/ku.gmo differ diff --git a/po/ku.po b/po/ku.po index c4e6907dcf..3c92a7e56a 100644 --- a/po/ku.po +++ b/po/ku.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-06-03 16:28+0000\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -808,7 +808,7 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -819,7 +819,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -828,11 +828,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -840,14 +840,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -858,91 +859,91 @@ msgstr "" msgid "OK" msgstr "" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." msgstr "" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3720,6 +3721,26 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6165,11 +6186,19 @@ msgstr "" msgid "Power Management" msgstr "" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/lt.gmo b/po/lt.gmo index 5f9556eff6..8cd86ca961 100644 Binary files a/po/lt.gmo and b/po/lt.gmo differ diff --git a/po/lt.po b/po/lt.po index b3d376031c..8ba1a0548c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2013-01-05 20:57+0000\n" "Last-Translator: Mantas Kriaučiūnas \n" "Language-Team: Lithuanian Translation team\n" @@ -809,7 +809,7 @@ msgstr "" msgid "Cancel" msgstr "Atsisakyti" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -827,7 +827,7 @@ msgstr "" "numatytuosius nustatymus. Dabar galite viską sukonfigūruoti kaip " "pageidaujate.
Atsiprašome už sukeltus nepatogumus.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -842,11 +842,11 @@ msgstr "" "
viso pikto buvo grąžintos pradinės nustatymų reikšmės. Atsiprašome už " "nepatogumus.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problema įrašant Enlightenment nustatymus" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -854,14 +854,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -872,91 +873,91 @@ msgstr "" msgid "OK" msgstr "Gerai" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Nustatymai atnaujinti" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." msgstr "" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." msgstr "" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3834,6 +3835,26 @@ msgstr "Pradėti elementų perkėlimą/dydžio keitimą" msgid "Set Toolbar Contents" msgstr "Nurodyti įrankių juostos turinį" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6290,11 +6311,20 @@ msgstr "Našumas" msgid "Power Management" msgstr "Energijos valdymas" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Išvestis" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ms.gmo b/po/ms.gmo index d41712c5e9..e1890cab5e 100644 Binary files a/po/ms.gmo and b/po/ms.gmo differ diff --git a/po/ms.po b/po/ms.po index 31e877b2c5..ba8a77c407 100644 --- a/po/ms.po +++ b/po/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-09-11 09:46+0000\n" "Last-Translator: Ibrahim Elias \n" "Language-Team: Malay \n" @@ -946,7 +946,7 @@ msgstr "memilih" msgid "Cancel" msgstr "membatalkan" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -957,7 +957,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -966,11 +966,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -978,14 +978,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -997,22 +998,22 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 #, fuzzy msgid "Settings Upgraded" msgstr "tetapan Dinaiktaraf" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "Pemegang fail EET buruk." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Data fail kosong." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -1021,19 +1022,19 @@ msgstr "" "Fail terebut tidak boleh ditulis. Mungkin cakera adalah
baca sahaja atau " "anda kehilangan keizinan kepada fail anda." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Memori berlari keluar sambil menyediakan tulis.
Sila memori sehingga " "percuma." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Ini adalah satu kesilapan yang generik." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -1042,70 +1043,70 @@ msgstr "" "Fail tetapan adalah terlalu besar.
Ia sepatutnya menjadi sangat kecil " "(beberapa ratus KB paling banyak)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Anda kehabisan ruang semasa menulis fail" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Fail yang telah ditutup pada semasa menulis." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Memori - pemetaan (mmap) fail gagal." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Pengekodan gagal." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Tandatangan gagal." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Tandatangan adalah tidak sah." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "Tidak ditandatangani." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Mempunyai tidak dilaksanakan." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG tidak membenihkan." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Penyulitan gagal." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Dekripsi gagal." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4287,6 +4288,27 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "Tetapkan Kandungan Toolbar" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Negeri" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -7079,12 +7101,22 @@ msgstr "prestasi" msgid "Power Management" msgstr "Pengurusan Power" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Screen Saver" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "output" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Mengunci Permulaan" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/nb.gmo b/po/nb.gmo index 83e687c8f0..933fc891a7 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 7714303d8e..1889251aac 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2010-05-09 22:20+0100\n" "Last-Translator: Audun Gangsto \n" "Language-Team: E17-nb \n" -"Language: \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -855,7 +855,7 @@ msgstr "Velg en" msgid "Cancel" msgstr "Avbryt" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -866,7 +866,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -875,11 +875,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -887,14 +887,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -905,21 +906,21 @@ msgstr "" msgid "OK" msgstr "Ok" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Innstillinger Oppgradert" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "Den EET filreferanse er dårlig." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Datafilen er tom." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -928,19 +929,19 @@ msgstr "" "Filen er ikke skrivbar. Kanskje disken er skrivebeskyttet
eller du mistet " "tillatelser til filene dine." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Minne løp ut mens han forberedte skrivehastigheten.
Vennligst frigjøre " "minne." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Dette er en generisk feilmelding." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -949,71 +950,71 @@ msgstr "" "Innstillingene er for stor.
Det bør være svært liten (noen få hundre KB " "som mest)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Du gikk tom for plass , mens skriving til fil" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Filen ble stengt på det mens du skriver." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Minne - mapping (mmap) av filen mislyktes." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Koding mislyktes." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Signatur mislyktes." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Signaturen var ugyldig." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Ingen vindu)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Har ikke implementert." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG ble ikke seedet." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Kryptering mislyktes." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Beskrivelse: Utilgjengelig" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Velkommen til Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4137,6 +4138,27 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "Sett Toolbar Innhold" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Tilstand" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + # (hehe) #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 @@ -6880,12 +6902,22 @@ msgstr "ytelse" msgid "Power Management" msgstr "Power Management" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Skjermbeskytter" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Ut" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Juster hastighet ved oppstart" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -12530,9 +12562,6 @@ msgstr "" #~ msgid "Set Poll Time" #~ msgstr "Velg oppdateringsfrekvens" -#~ msgid "Restore Controller on Startup" -#~ msgstr "Juster hastighet ved oppstart" - #~ msgid "No Digital Display" #~ msgstr "Fjern digital klokke" diff --git a/po/nl.gmo b/po/nl.gmo index 344d3a411b..1be609627c 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index ce9e4f4e65..6804a56bbd 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,11 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2011-12-06 00:23+0100\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: Dutch \n" -"Language: \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -837,7 +837,7 @@ msgstr "Selecterend" msgid "Cancel" msgstr "Annuleer" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -856,7 +856,7 @@ msgstr "" "oplossen
door het toe te voegen. U kunt uw dingen nu her-instellen naar " "uw
wensen. Excuses voor de wijzigingen in uw instellingen.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -871,11 +871,11 @@ msgstr "" "uw instellingen nu teruggezet naar de
standaarden. Excuses voor het " "ongemak.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Enlightenment Instellingen Schrijfproblemen" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -886,14 +886,15 @@ msgstr "" "instellingenbestanden
van:
%s

naar:
%s

De rest van " "het schrijven is afgebroken voor uw veiligheid.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -904,19 +905,19 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Instellingen geüpgrade" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "De EET-bestandsafhandelaar is slecht." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "De bestandsdata is leeg." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -924,17 +925,17 @@ msgstr "" "Het bestand is niet schrijfbaar. Wellicht is de schijf alleen-lezen
of u " "bent de rechten op uw bestanden kwijt." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Geheugen raakte op tijdens het voorbereiden van het schrijven.
Maak " "alstublieft geheugen vrij." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Dit is een algemene fout." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -942,62 +943,62 @@ msgstr "" "Het instellingenbestand is te groot.
Het zou heel klein moeten zijn " "(hooguit een paar honderd KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" "U heeft I/O-fouten op uw schijf.
Misschien is ie aan vervanging toe?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "U raakte uit geheugen terwijl het bestand geschreven werd" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Het bestand werd gesloten tijdens het schrijven." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Geheugen-toewijzing (mmap) van bestand faalde." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "X509 Encoding gefaald." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Handtekening faalde." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "De handtekening was ongeldig." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Niet ondertekend." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Feature niet ingebouwd." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "PRNG was niet seeded." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Encryptie gefaald." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Decryptie gefaald." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "De fout is onbekend voor Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4048,6 +4049,27 @@ msgstr "Begin verplaatsen/herschalen van items" msgid "Set Toolbar Contents" msgstr "Stel werkbalkinhoud in" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Staat" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6657,12 +6679,22 @@ msgstr "Prestaties" msgid "Power Management" msgstr "Energiebeheer" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Schermbeveiliging" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Uitvoer" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Herstel regelaar bij opstarten" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -12142,9 +12174,6 @@ msgstr "" #~ msgid "Set Poll Time" #~ msgstr "Tussentijd instellen" -#~ msgid "Restore Controller on Startup" -#~ msgstr "Herstel regelaar bij opstarten" - #~ msgid "No Digital Display" #~ msgstr "Geen Digitale Klok" diff --git a/po/pl.gmo b/po/pl.gmo index 0dd6d65e7f..b9e4621c09 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 713a1b01b6..17a4812e6e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,11 +11,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2010-11-28 18:55+0100\n" "Last-Translator: Mariusz Kozakowski <11mariom@gmail.com>\n" "Language-Team: \n" -"Language: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -863,7 +863,7 @@ msgstr "Ustawienia" msgid "Cancel" msgstr "Anuluj" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -881,7 +881,7 @@ msgstr "" "Możesz teraz ponownie skonfigurować wszystko
jak chcesz. Przepraszamy za " "zamieszanie w twoich ustawieniach." -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -895,11 +895,11 @@ msgstr "" "
To jest niedobre i dla bezpieczeństwa zostały przywrócone
domyślne " "ustawienia. Przepraszamy za niedogodność." -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problemy z zapisem ustawień" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -907,14 +907,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -925,21 +926,21 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Ustawienia zaktualizowane" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET uchwyt plik jest zły." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Dane plik jest pusty." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -948,19 +949,19 @@ msgstr "" "Plik nie jest zapisywalny. Być możedysk jest tylko do odczytu
lub stracił " "uprawnienia do plików." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Pamięć zabrakło podczas przygotowywania zapisu.
Proszę wolnej pamięci w " "górę." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Jest to ogólny błąd." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -969,71 +970,71 @@ msgstr "" "Plik ustawień jest zbyt duża.
To powinien być bardzo mały (kilkaset KB co " "najwyżej)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Jesteś zabrakło miejsca podczas zapisu pliku" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Plik został zamknięty na niej podczas pisania." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Pamięć -mapping (mmap) pliku nie powiodło się." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Kodowanie nie powiodło się." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Hibernacja nieudana." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Podpis jest nieprawidłowy." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Żadnemu)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Funkcja nie zaimplementowana." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG nie zaszczepiono." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Szyfrowanie nie powiodło się." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Restet nieudany." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Witaj w Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4119,6 +4120,27 @@ msgstr "Rozpocznij przesuwanie/zmianę rozmiaru składników" msgid "Set Toolbar Contents" msgstr "Ustaw zawartość paska narzędzi" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Stan" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6779,12 +6801,22 @@ msgstr "Wydajność" msgid "Power Management" msgstr "Zarządzanie energią" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Wygaszacz ekranu" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "produkcja" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Przywróć Zarządcę przy Starcie" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -13052,9 +13084,6 @@ msgstr "" #~ msgid "Clock Configuration" #~ msgstr "Konfiguracja Zegara" -#~ msgid "Restore Governor on Startup" -#~ msgstr "Przywróć Zarządcę przy Starcie" - #~ msgid "Desktop Name Position" #~ msgstr "Umieszczenie Nazwy Pulpitu" diff --git a/po/pt.gmo b/po/pt.gmo index 326ee60ff4..590eaab995 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 2eb3d412bf..d060b4a1c5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: e17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2013-01-23 14:06-0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -812,7 +812,7 @@ msgstr "Selecionar" msgid "Cancel" msgstr "Cancelar" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -830,7 +830,7 @@ msgstr "" "situação. Mais tarde
poderá configurar o Enlightenment ao seu gosto." "
Desculpe qualquer inconveniente.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -844,11 +844,11 @@ msgstr "" "recente do Enlightenment.
Isto é mau e, por precaução, as definições " "originais
foram restauradas.
Desculpe qualquer inconveniente.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Erro ao escrever as definições do Enlightenment." -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -859,14 +859,15 @@ msgstr "" "
%s

para:
%s

A tarefa foi terminada para sua segurança." "
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -877,19 +878,19 @@ msgstr "" msgid "OK" msgstr "Aceitar" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Definições atualizadas" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "O gestor do ficheiro EET está danificado." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "O ficheiro está vazio." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -897,17 +898,17 @@ msgstr "" "Não pode escrever no ficheiro. Pode ser que o ficheiro
seja só de leitura " "ou que não tenha acesso aos ficheiros." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Ficou sem memória ao preparar o ficheiro.
Por favor liberte espaço de " "memória." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Este é um erro genérico." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -915,59 +916,59 @@ msgstr "" "O ficheiro das definições é muito grande.
Em princípio seria pequeno " "(algumas centenas de KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Possui erros de E/S no disco.
Talvez precise de ser substituído?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Ficou sem espaço ao escrever o ficheiro." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "O ficheiro foi fechado durante a escrita." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Falha ao fazer \"memory-mapping (mmap)\" do ficheiro." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Falha na codificação X509." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Falha de assinatura." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "A assinatura é inválida." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Não assinado." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Opção não implementada." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "O PRNG não foi semeado." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Falha ao codificar." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Falha ao descodificar." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "O erro não é reconhecido pelo Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3913,6 +3914,27 @@ msgstr "Mover/redimensionar itens" msgid "Set Toolbar Contents" msgstr "Definir conteúdo da barra de ferramentas" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Atualizações" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6400,11 +6422,21 @@ msgstr "Desempenho" msgid "Power Management" msgstr "Gestão de energia" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Configuração do ecrã" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Saída" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Bloquear ao iniciar" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 903abb6577..acba23c61b 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 2accc7b10f..9e23c4f2de 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: e17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-20 16:46-0300\n" "Last-Translator: Vinícius dos Santos Oliveira \n" "Language-Team: Brazilian Portuguese\n" @@ -815,7 +815,7 @@ msgstr "Selecionar" msgid "Cancel" msgstr "Cancelar" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -833,7 +833,7 @@ msgstr "" "Mais tarde poderá configurar o Enlightenment à suas preferências." "
Desculpe qualquer inconveniente.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -847,11 +847,11 @@ msgstr "" "recente do Enlightenment.
Isto é mau e por precaução, as definições " "originais foram restauradas.
Desculpe qualquer inconveniente.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Erro ao escrever as definições do Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -862,14 +862,15 @@ msgstr "" "
%s

para:
%s

A tarefa foi terminada para sua segurança." "
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -880,19 +881,19 @@ msgstr "" msgid "OK" msgstr "Aceitar" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Definições atualizadas" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "O identificador do arquivo EET está errado" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "O arquivo está vazio" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -900,17 +901,17 @@ msgstr "" "Não pode escrever no arquivo. Pode ser que o disco seja somente para leitura " "ou que você tenha perdido permissões aos seus arquivos." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Ficou sem memória ao preparar a escrita.
Por favor liberte espaço de " "memória." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Este é um erro genérico" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -918,59 +919,59 @@ msgstr "" "O arquivo das definições é muito grande.
Em princípio seria pequeno " "(algumas centenas de KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Possui erros de E/S no disco.
Talvez precise ser substituído?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Ficou sem espaço ao escrever no arquivo." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "O arquivo foi fechado durante a escrita." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Falha ao fazer \"memory-mapping (mmap)\" do arquivo" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Falha na codificação X509" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Falha de assinatura" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "A assinatura era inválida" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Não assinado" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Opção não implementada" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "O PRNG não foi semeado" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Falha de criptografia (codificação)" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Falha de criptografia (decodificação)" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "O erro não é reconhecido pelo Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3917,6 +3918,27 @@ msgstr "Mover/redimensionar itens" msgid "Set Toolbar Contents" msgstr "Definir conteúdo da barra de ferramentas" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Atualizações" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6403,11 +6425,21 @@ msgstr "Desempenho" msgid "Power Management" msgstr "Gerenciamento de energia" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Configuração de tela" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Saída" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Bloquear ao iniciar" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ro.gmo b/po/ro.gmo index 5d8b7c8cc3..4f827c0394 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index e1b3cb23c8..fe977d35e4 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-11-25 12:09+0000\n" "Last-Translator: Lucian Adrian Grijincu \n" "Language-Team: Romanian \n" @@ -880,7 +880,7 @@ msgstr "Selectați o imagine" msgid "Cancel" msgstr "Renunță" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -891,7 +891,7 @@ msgid "" "the hiccup in your settings.
" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -900,11 +900,11 @@ msgid "" "to
defaults. Sorry for the inconvenience.
" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -912,14 +912,15 @@ msgid "" "
" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -930,22 +931,22 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 #, fuzzy msgid "Settings Upgraded" msgstr "Setări modernizate" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "De fişier EET este rău." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Fisier de date este gol." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -954,19 +955,19 @@ msgstr "" "Fişierul nu poate fi scris. Poate cădiscul este read-only
sau ai pierdut " "permisiunile la fişiere." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "De memorie a fugit în timp ce pregătireade scriere. Vă rugăm să
de " "memorie de până gratuit." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Aceasta este o eroare de generic." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -975,70 +976,70 @@ msgstr "" "Fişier de setări este prea mare.
Ar trebui să fie foarte mici (câteva " "sute de KB de la cea mai mare)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Ai fugit din spaţiu în timp ce scriereafişierului" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Dosarul a fost închis pe ea în timp ce scris." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Memorie - cartografiere (mmap) dinfişierul nu a reuşit." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Codificarea nu a reuşit." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Semnătura nu a reuşit." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Semnătura a fost invalid." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "Nu a semnat." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Nu dispun de pus în aplicare." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "Prng nu a fost însămânţate." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Criptarea a eşuat." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Decriptarea a eşuat." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4167,6 +4168,27 @@ msgstr "" msgid "Set Toolbar Contents" msgstr "Set Cuprins Toolbar" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "de stat" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6960,12 +6982,22 @@ msgstr "performanţă" msgid "Power Management" msgstr "putere de Management" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "screen Saver" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "producţie" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Blocare la pornire" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/ru.gmo b/po/ru.gmo index eefe565bfc..67a49ae42d 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index d5e3ed4f20..2077b98017 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2013-01-22 20:49+0400\n" "Last-Translator: Igor Murzov \n" "Language-Team: ru \n" @@ -816,7 +816,7 @@ msgstr "Выбрать" msgid "Cancel" msgstr "Отменить" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -833,7 +833,7 @@ msgstr "" "
который и был инициализирован. Можете настроить всё заново.
Извините " "за неудобства.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -847,11 +847,11 @@ msgstr "" "места с более новой версий Enlightenment.
Это неправильно, и поэтому ваша " "конфигурация была сброшена
на стандартную. Извините за неудобство.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Проблемы сохранения параметров Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -861,14 +861,15 @@ msgstr "" "Enlightenment обнаружил сбой при перемещении файлов конфигурации
из:
" "%s

в:
%s

Запись была прервана в целях безопасности.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -879,19 +880,19 @@ msgstr "" msgid "OK" msgstr "ОК" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Параметры обновлены" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "Повреждённый указатель ЕЕТ файла." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Файл данных пуст." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -899,16 +900,16 @@ msgstr "" "Не получилось записать файл. Возможно диск защищён от записи,
либо у вас " "нет прав на файлы." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Кончилась память при подготовке к записи.
Пожалуйста освободите память." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Это стандартная ошибка." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -916,59 +917,59 @@ msgstr "" "Файл настроек слишком большой.
Он должен быть гораздо меньше
(максимум " "несколько сотен КБ)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "На диске замечены ошибки ввода-вывода.
Возможно стоит его заменить?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "Закончилось место во время записи файла." -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "Файл был закрыт во время записи." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Отображение файла в память (mmap) не удалось." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Кодирование X509 не удалось." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Подпись ошибочна." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Подпись недействительна." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Не подписано." -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Функция не реализована" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "Не удалось задать начальное значение для ГПСЧ." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Шифрование не удалось." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "Расшифровка не удалось." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Эта ошибка не известна Enlightenment." -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -3909,6 +3910,27 @@ msgstr "Начать перемещение/изменение элементо msgid "Set Toolbar Contents" msgstr "Установка содержимого панели инструментов" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Обновления" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6406,11 +6428,21 @@ msgstr "Производительность" msgid "Power Management" msgstr "Управление питанием" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "Настройка экрана" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Выход" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Блокировать при запуске" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, c-format msgid "Configured Shelves: Display %d" diff --git a/po/sk.gmo b/po/sk.gmo index 9e8de03568..d2b0ce9466 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 105e76a35f..db587547c0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: e HEAD\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-08-07 11:08+0000\n" "Last-Translator: milboy \n" "Language-Team: Slovakian\n" -"Language: \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -851,7 +851,7 @@ msgstr "Vyberte jednu" msgid "Cancel" msgstr "Zrušiť" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -870,7 +870,7 @@ msgstr "" "hodnoty.
Teraz môžete veci nakonfigurovať podľa svojej ľubovôle. " "Ospravedlňujeme sa za nepríjemnosti.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -884,11 +884,11 @@ msgstr "" "verzia Enlightenment.
To je zlé a preventívne bola vaša konfigurácia " "obnovená na predvolené hodnoty.
Ospravedlňujeme sa za nepríjemnosti.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Problémy so zápisom nastavení Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -899,14 +899,15 @@ msgstr "" "zatvorený. To je veľmi nezvyčajné.

Súbor, kde sa chyba vyskytla:
" "%s

Tento súbor bol zmazaný, aby sa
zabránilo poškodeniu údajov.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -917,21 +918,21 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Nastavenia aktualizované" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET popisovač súboru je zlé." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Súbor dát je prázdny." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " @@ -940,17 +941,17 @@ msgstr "" "Súbor nie je zapisovateľný. Možno, že disk je iba na čítanie
alebo ste " "stratili oprávnenie k súborom." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "Pamäť vybehol pri príprave zápisu.
prosím uvoľniť pamäť." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "To je všeobecná chyba." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.
It should be very small (a few hundred KB " @@ -959,71 +960,71 @@ msgstr "" "Súbor nastavení je príliš veľký.
Malo by to byť veľmi malý (niekoľko " "stoviek KB najviac)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Tie došli priestoru pri zápise do súboru" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Súbor bol uzavretý na to pri písaní." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Pamäť - mapping (mmap) súboru zlyhalo." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Kódovanie zlyhalo." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Hibernácia zlyhala" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Podpis bol neplatný." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Žiadne Okná)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Funkcia nie je implementovaná." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG nebol nasadený." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Zastavenie zlyhalo." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Zastavenie zlyhalo." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Vitajte v Enlightenment-e" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4136,6 +4137,27 @@ msgstr "Začať Presúvanie/Zmenu Veľkosti Položiek" msgid "Set Toolbar Contents" msgstr "Nastaviť obsah panela nástrojov" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Stav" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6818,12 +6840,22 @@ msgstr "Výkon" msgid "Power Management" msgstr "Správa napájania" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Šetrič obrazovky" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Výstup" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Obnoviť Regulátor pri Štarte" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -13025,9 +13057,6 @@ msgstr "" #~ msgid "24 Hour Display" #~ msgstr "24 Hodinový Displej" -#~ msgid "Restore Governor on Startup" -#~ msgstr "Obnoviť Regulátor pri Štarte" - #~ msgid "Desktop Name Position" #~ msgstr "Umiestnenie Názvu Plochy" diff --git a/po/sl.gmo b/po/sl.gmo index e4d3e3dd8d..7227293dfe 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index b784c6a18d..f5c3c759b3 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: trunk.HEAD\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2011-03-28 12:04+0100\n" "Last-Translator: Renato Rener \n" "Language-Team: Slovenian \n" @@ -849,7 +849,7 @@ msgstr "Izbiranje" msgid "Cancel" msgstr "Prekliči" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have
been wiped and a " "new set of defaults initialized. This
will happen regularly during " @@ -866,7 +866,7 @@ msgstr "" "nastavitvena datoteka ne vsebuje. Sedaj
pa lahko ponovno nastavite stvari " "po svoje. Opravičujemo se za neprijetnosti.
" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very
strange. This " "should not happen unless you downgraded
Enlightenment or copied the " @@ -881,11 +881,11 @@ msgstr "" "nastavili na privzete vrednosti. Prosimo, sprejmite naše
opravičilo za " "vse neprijetnosti.
" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Težave zapisovanja Enlightenment nastavitev" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files
from:
" @@ -896,14 +896,15 @@ msgstr "" "
%s

v:
%s

Zaradi varnosti je bilo nadaljevanje pisanja " "opuščeno.
" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -914,19 +915,19 @@ msgstr "" msgid "OK" msgstr "V Redu" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Nastavitve posodobljene" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "Oprimek·datoteke·EET je slab." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "Prazna vsebina datoteke" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only
or you lost " "permissions to your files." @@ -934,17 +935,17 @@ msgstr "" "Datoteka ni zapisljiva. Disk je morda le za branje
ali pa ste izgubili " "dovoljenja za vaše datoteke." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.
Please free up memory." msgstr "" "Med pripravo na zapisovanje je zmanjkalo spomina.
Prosimo, sprostite " "nekaj spomina." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "Tole je splošna napaka!" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.
It should be very small (a few hundred KB " "at most)." @@ -952,62 +953,62 @@ msgstr "" "Nastavitvena datoteka je prevelika.
Morala bi biti zelo majhna (največ " "nekaj sto KB)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.
Maybe it needs replacing?" msgstr "Na disku imate I/O napake.
Morda potrebuje zamenjavo?" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Med zapisovanjem datoteke vam je zmanjkalo prostora" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Datoteka je bila zaprta med zapisovanjem" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "Spodletela pomnilniška preslikava (mmap)·datoteke " -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "Spodletelo kodiranje X509" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "Podpisovanje spodletelo" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "Neveljaven podpis" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "Ni podpisano" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "Funkcija ni vgrajena" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "PRNG ni bil sejan" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "Šifriranje spodletelo" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Razšifriranje spodletelo" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Enlightenment te napake ne prepozna" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing
its config file.
" @@ -4083,6 +4084,27 @@ msgstr "Začni Premikanje/Spreminjanje velikosti predmetov" msgid "Set Toolbar Contents" msgstr "Nastavi vsebino Orodne vrstice" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Stanje" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is
not the current latest release.
The " +"latest version is:

%s

Please visit www.enlightenment.org
or " +"update your system packages
to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6729,12 +6751,22 @@ msgstr "Delovanje" msgid "Power Management" msgstr "Upravljanje napajanja" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Ohranjevalnik zaslona" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Izhodno" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Zakleni zaslon ob zagonu" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -8625,9 +8657,9 @@ msgstr "" "hilight> prikaže to stran
<enter> zažene " "dejanje
<ctrl+enter> zažene dejanje in " "nadaljuje
<tab> izbira med zadetki
" -"<ctrl+tab> kompletira vnos (odvisno od vtičnika)" -"
<ctrl+'x'> premik na vtičnik ki se začne z " -"'x'
<ctrl+levo/desno> premikanje med " +"<ctrl+tab> kompletira vnos (odvisno od " +"vtičnika)
<ctrl+'x'> premik na vtičnik ki se " +"začne z 'x'
<ctrl+levo/desno> premikanje med " "vtičniki
<ctrl+gor/dol> pojdi na prvi/zadnji " "predmet
<ctrl+1> načini predogleda (izhod iz " "te strani ;)
<ctrl+2> seznamski način " diff --git a/po/sr.gmo b/po/sr.gmo new file mode 100644 index 0000000000..c77c045e78 Binary files /dev/null and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po new file mode 100644 index 0000000000..2c09662096 --- /dev/null +++ b/po/sr.po @@ -0,0 +1,12051 @@ +# Serbian translation for enlightenment +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the enlightenment package. +# FIRST AUTHOR , 2012. +# Саша Петровић , 2012, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: enlightenment\n" +"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" +"PO-Revision-Date: 2013-06-13 00:17+0200\n" +"Last-Translator: Саша Петровић \n" +"Language-Team: српски <српски >\n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) \n" +"X-Launchpad-Export-Date: 2013-05-11 05:37+0000\n" +"X-Generator: Gtranslator 2.91.6\n" + +#: src/bin/e_about.c:17 +msgid "About Enlightenment" +msgstr "О Просвећењу" + +#: src/bin/e_about.c:20 src/bin/e_actions.c:2992 src/bin/e_config_dialog.c:288 +#: src/bin/e_fm.c:1058 src/bin/e_int_border_menu.c:194 +#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:24 +#: src/modules/conf/e_conf.c:179 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:877 +#: src/modules/everything/evry_plug_windows.c:452 +#: src/modules/fileman/e_fwin.c:2529 src/modules/mixer/app_mixer.c:550 +msgid "Close" +msgstr "Затвори" + +#: src/bin/e_about.c:21 src/bin/e_actions.c:3367 src/bin/e_actions.c:3371 +#: src/bin/e_actions.c:3375 src/bin/e_int_menus.c:223 src/bin/e_main.c:619 +#: src/modules/conf_interaction/e_int_config_mouse.c:192 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:240 +#: src/modules/wizard/page_000.c:34 +msgid "Enlightenment" +msgstr "Просвећење" + +#: src/bin/e_about.c:26 +msgid "" +"Copyright © 2000-2012, by the Enlightenment Development Team</" +"><br><br>We hope you enjoy using this software as much as we enjoyed writing " +"it.<br><br>To contact us please visit:<br><hilight>http://www.enlightenment." +"org</><br><br>" +msgstr "" +"<title>Ауторска права © 2000-2012, развојна дружина " +"Просвећења<br><br>Надамо се да уживате у нашим мекотворинама, као што смо ми " +"уживали у њиховом писању.<br><br>За везу са нама, молимо, посетите:" +"<br><hilight>http://www.enlightenment.org</><br><br>" + +#: src/bin/e_about.c:69 +msgid "<title>The Team</><br><br>" +msgstr "<title>Дружина</><br><br>" + +#: src/bin/e_actions.c:360 +#, c-format +msgid "" +"You are about to kill %s.<br><br>Please keep in mind that all data from this " +"window<br>which has not yet been saved will be lost!<br><br>Are you sure you " +"want to kill this window?" +msgstr "" +"Убићете %s.<br><br>Молим, знајте да ако нису још увек сачувани, сви подаци " +"овог прозора ће<br>бити изгубљени!<br><br>Да ли сте сигурни да желите убити " +"овај прозор?" + +#: src/bin/e_actions.c:372 +msgid "Are you sure you want to kill this window?" +msgstr "Да ли сте сигурни да желите да убијете овај прозор?" + +#: src/bin/e_actions.c:375 src/bin/e_actions.c:2997 +#: src/bin/e_int_border_menu.c:749 +msgid "Kill" +msgstr "Убиј" + +#: src/bin/e_actions.c:377 src/bin/e_actions.c:2128 src/bin/e_actions.c:2222 +#: src/bin/e_actions.c:2282 src/bin/e_actions.c:2342 src/bin/e_actions.c:2407 +#: src/bin/e_actions.c:2472 src/bin/e_confirm_dialog.c:53 +#: src/bin/e_desklock.c:1313 src/bin/e_fm.c:10424 src/bin/e_fm.c:10790 +#: src/bin/e_screensaver.c:191 +#: src/modules/quickaccess/e_mod_quickaccess.c:1267 +msgid "No" +msgstr "Не" + +#: src/bin/e_actions.c:2123 src/bin/e_actions.c:3371 src/bin/e_int_menus.c:252 +msgid "Exit" +msgstr "Напусти" + +#: src/bin/e_actions.c:2124 +msgid "Are you sure you want to exit Enlightenment?" +msgstr "Да ли сте сигурни да сада желите да напустите Просвећење?" + +#: src/bin/e_actions.c:2126 src/bin/e_actions.c:2220 src/bin/e_actions.c:2280 +#: src/bin/e_actions.c:2340 src/bin/e_actions.c:2405 src/bin/e_actions.c:2470 +#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:1311 +#: src/bin/e_fm.c:10427 src/bin/e_screensaver.c:189 +#: src/modules/quickaccess/e_mod_quickaccess.c:1267 +msgid "Yes" +msgstr "Да" + +#: src/bin/e_actions.c:2217 +msgid "Logout" +msgstr "Одјава" + +#: src/bin/e_actions.c:2218 +msgid "Are you sure you want to logout?" +msgstr "Да ли сигурно желите да се одјавите?" + +#: src/bin/e_actions.c:2276 src/bin/e_sys.c:749 +msgid "Power off" +msgstr "Искључи" + +#: src/bin/e_actions.c:2278 +msgid "Are you sure you want to power off your computer?" +msgstr "Да ли сте сигурни да желите да искључите рачунар?" + +#: src/bin/e_actions.c:2337 src/bin/e_actions.c:3414 +msgid "Reboot" +msgstr "Поново покрени" + +#: src/bin/e_actions.c:2338 +msgid "Are you sure you want to reboot your computer?" +msgstr "Да ли сте сигурни да желите поново покренути рачунар?" + +#: src/bin/e_actions.c:2402 src/bin/e_actions.c:3422 +msgid "Suspend" +msgstr "Обустави" + +#: src/bin/e_actions.c:2403 +msgid "Are you sure you want to suspend your computer?" +msgstr "Да ли сте сигурни да желите да обуставите рачунар?" + +#: src/bin/e_actions.c:2467 src/bin/e_actions.c:3426 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:379 +msgid "Hibernate" +msgstr "Замрзни" + +#: src/bin/e_actions.c:2468 +msgid "Are you sure you want to hibernate your computer?" +msgstr "Да ли сте сигурни да желите замрзнути систем?" + +#: src/bin/e_actions.c:2952 src/bin/e_actions.c:2963 src/bin/e_actions.c:2982 +#: src/bin/e_actions.c:2987 src/bin/e_actions.c:2992 src/bin/e_actions.c:2997 +#: src/bin/e_actions.c:3283 src/bin/e_actions.c:3287 src/bin/e_actions.c:3292 +#: src/bin/e_actions.c:3298 src/bin/e_actions.c:3304 src/bin/e_actions.c:3310 +#: src/modules/shot/e_mod_main.c:987 +msgid "Window : Actions" +msgstr "Прозор : радње" + +#: src/bin/e_actions.c:2952 src/bin/e_fm.c:11555 +#: src/bin/e_int_border_menu.c:669 +msgid "Move" +msgstr "Премести" + +#: src/bin/e_actions.c:2963 src/bin/e_int_border_menu.c:683 +msgid "Resize" +msgstr "Промени величину" + +#: src/bin/e_actions.c:2974 src/bin/e_actions.c:3338 src/bin/e_actions.c:3340 +#: src/bin/e_actions.c:3342 src/bin/e_actions.c:3344 src/bin/e_actions.c:3346 +#: src/modules/comp/e_mod_config.c:452 src/modules/comp/e_mod_config.c:757 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:336 +msgid "Menu" +msgstr "Изборник" + +#: src/bin/e_actions.c:2974 +msgid "Window Menu" +msgstr "Изборник прозора" + +#: src/bin/e_actions.c:2982 src/bin/e_int_border_menu.c:1052 +#: src/modules/winlist/e_int_config_winlist.c:216 +msgid "Raise" +msgstr "Издигни" + +#: src/bin/e_actions.c:2987 src/bin/e_int_border_menu.c:1060 +msgid "Lower" +msgstr "Спусти" + +#: src/bin/e_actions.c:3002 src/bin/e_actions.c:3006 src/bin/e_actions.c:3011 +#: src/bin/e_actions.c:3015 src/bin/e_actions.c:3020 src/bin/e_actions.c:3024 +#: src/bin/e_actions.c:3030 src/bin/e_actions.c:3032 src/bin/e_actions.c:3035 +#: src/bin/e_actions.c:3038 src/bin/e_actions.c:3041 src/bin/e_actions.c:3044 +#: src/bin/e_actions.c:3046 src/bin/e_actions.c:3048 src/bin/e_actions.c:3050 +#: src/bin/e_actions.c:3057 src/bin/e_actions.c:3059 src/bin/e_actions.c:3061 +#: src/bin/e_actions.c:3063 src/bin/e_actions.c:3065 src/bin/e_actions.c:3069 +#: src/bin/e_actions.c:3074 src/bin/e_actions.c:3079 src/bin/e_actions.c:3085 +#: src/bin/e_actions.c:3091 +msgid "Window : State" +msgstr "Прозор : стање" + +#: src/bin/e_actions.c:3002 +msgid "Sticky Mode Toggle" +msgstr "Мења стање лепљивости прозора" + +#: src/bin/e_actions.c:3006 +msgid "Sticky Mode Enable" +msgstr "Омогући лепљивост" + +#: src/bin/e_actions.c:3011 +msgid "Iconic Mode Toggle" +msgstr "Мења стање умањености" + +#: src/bin/e_actions.c:3015 +msgid "Iconic Mode Enable" +msgstr "Омогући стање умањености" + +#: src/bin/e_actions.c:3020 +msgid "Fullscreen Mode Toggle" +msgstr "Преко целог екрана" + +#: src/bin/e_actions.c:3024 +msgid "Fullscreen Mode Enable" +msgstr "Омогући приказ преко целог екрана" + +#: src/bin/e_actions.c:3030 src/bin/e_int_border_menu.c:384 +#: src/bin/e_int_border_menu.c:644 +msgid "Maximize" +msgstr "Увећај" + +#: src/bin/e_actions.c:3032 src/bin/e_int_border_menu.c:395 +msgid "Maximize Vertically" +msgstr "Увећај усправно" + +#: src/bin/e_actions.c:3035 src/bin/e_int_border_menu.c:406 +msgid "Maximize Horizontally" +msgstr "Увећај водоравно" + +#: src/bin/e_actions.c:3038 src/bin/e_int_border_menu.c:417 +msgid "Maximize Left" +msgstr "Увећај лево" + +#: src/bin/e_actions.c:3041 src/bin/e_int_border_menu.c:428 +msgid "Maximize Right" +msgstr "Увећај десно" + +#: src/bin/e_actions.c:3044 +msgid "Maximize Fullscreen" +msgstr "Увећај преко целог екрана" + +#: src/bin/e_actions.c:3046 +msgid "Maximize Mode \"Smart\"" +msgstr "„Паметно“ увећавање" + +#: src/bin/e_actions.c:3048 +msgid "Maximize Mode \"Expand\"" +msgstr "„Прошири“ увећање" + +#: src/bin/e_actions.c:3050 +msgid "Maximize Mode \"Fill\"" +msgstr "„Попуни“ увећање" + +#: src/bin/e_actions.c:3057 +msgid "Shade Up Mode Toggle" +msgstr "Мења стање смотавања навише" + +#: src/bin/e_actions.c:3059 +msgid "Shade Down Mode Toggle" +msgstr "Мења стање смотавања наниже" + +#: src/bin/e_actions.c:3061 +msgid "Shade Left Mode Toggle" +msgstr "Мења стање смотавања лево" + +#: src/bin/e_actions.c:3063 +msgid "Shade Right Mode Toggle" +msgstr "Мења стање смотавања десно" + +#: src/bin/e_actions.c:3065 +msgid "Shade Mode Toggle" +msgstr "Мења стање смотавања" + +#: src/bin/e_actions.c:3069 +msgid "Set Shaded State" +msgstr "Постави стање смотавања" + +#: src/bin/e_actions.c:3070 +msgid "syntax: \"(0|1) (up|down|left|right)\"" +msgstr "ниска: „(0|1) (up|down|left|right)“" + +#: src/bin/e_actions.c:3074 +msgid "Toggle Borderless State" +msgstr "Мења стање приказа без оквира" + +#: src/bin/e_actions.c:3079 +msgid "Set Border" +msgstr "Постави оквир" + +#: src/bin/e_actions.c:3085 +msgid "Cycle between Borders" +msgstr "Кружи између оквира" + +#: src/bin/e_actions.c:3091 +msgid "Toggle Pinned State" +msgstr "Мења стање причвршћености прозора" + +#: src/bin/e_actions.c:3096 src/bin/e_actions.c:3098 src/bin/e_actions.c:3100 +#: src/bin/e_actions.c:3102 src/bin/e_actions.c:3104 src/bin/e_actions.c:3110 +#: src/bin/e_actions.c:3115 src/bin/e_actions.c:3121 src/bin/e_actions.c:3126 +#: src/bin/e_actions.c:3132 src/bin/e_actions.c:3138 src/bin/e_actions.c:3140 +#: src/bin/e_actions.c:3142 src/bin/e_actions.c:3144 src/bin/e_actions.c:3146 +#: src/bin/e_actions.c:3148 src/bin/e_actions.c:3150 src/bin/e_actions.c:3152 +#: src/bin/e_actions.c:3154 src/bin/e_actions.c:3156 src/bin/e_actions.c:3158 +#: src/bin/e_actions.c:3160 src/bin/e_actions.c:3162 src/bin/e_actions.c:3168 +#: src/bin/e_actions.c:3170 src/bin/e_actions.c:3172 src/bin/e_actions.c:3174 +#: src/bin/e_actions.c:3176 src/bin/e_actions.c:3182 src/bin/e_actions.c:3188 +#: src/bin/e_actions.c:3194 src/bin/e_actions.c:3199 src/bin/e_actions.c:3201 +#: src/bin/e_actions.c:3203 src/bin/e_actions.c:3205 src/bin/e_actions.c:3207 +#: src/bin/e_actions.c:3209 src/bin/e_actions.c:3211 src/bin/e_actions.c:3213 +#: src/bin/e_actions.c:3215 src/bin/e_actions.c:3217 src/bin/e_actions.c:3219 +#: src/bin/e_actions.c:3221 src/bin/e_actions.c:3223 src/bin/e_actions.c:3438 +#: src/bin/e_actions.c:3443 src/bin/e_int_menus.c:185 +#: src/bin/e_int_shelf_config.c:267 src/modules/comp/e_mod_config.c:444 +#: src/modules/comp/e_mod_config.c:749 +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:101 +#: src/modules/fileman/e_mod_menu.c:426 src/modules/ibox/e_mod_config.c:166 +msgid "Desktop" +msgstr "Радна површ" + +#: src/bin/e_actions.c:3096 +msgid "Flip Desktop Left" +msgstr "Пребаци на радну радну површ лево" + +#: src/bin/e_actions.c:3098 +msgid "Flip Desktop Right" +msgstr "Пребаци на радну површ десно" + +#: src/bin/e_actions.c:3100 +msgid "Flip Desktop Up" +msgstr "Пребаци на радну површ горе" + +#: src/bin/e_actions.c:3102 +msgid "Flip Desktop Down" +msgstr "Пребаци на радну површ доле" + +#: src/bin/e_actions.c:3104 +msgid "Flip Desktop By..." +msgstr "Пребаци на радну површ за..." + +#: src/bin/e_actions.c:3110 +msgid "Flip To Previous Desktop" +msgstr "Пребаци на претходну радну површ" + +#: src/bin/e_actions.c:3115 +msgid "Show The Desktop" +msgstr "Приказује радну површ" + +#: src/bin/e_actions.c:3121 +msgid "Show The Shelf" +msgstr "Приказује полицу" + +#: src/bin/e_actions.c:3126 +msgid "Flip Desktop To..." +msgstr "Пребаци радни простор на..." + +#: src/bin/e_actions.c:3132 +msgid "Flip Desktop Linearly..." +msgstr "Премешта редно радну површ..." + +#: src/bin/e_actions.c:3138 +msgid "Switch To Desktop 0" +msgstr "Пређи на радну површ 0" + +#: src/bin/e_actions.c:3140 +msgid "Switch To Desktop 1" +msgstr "Пређи на радну површ 1" + +#: src/bin/e_actions.c:3142 +msgid "Switch To Desktop 2" +msgstr "Пређи на радну површ 2" + +#: src/bin/e_actions.c:3144 +msgid "Switch To Desktop 3" +msgstr "Пређи на радну површ 3" + +#: src/bin/e_actions.c:3146 +msgid "Switch To Desktop 4" +msgstr "Пређи на радну површ 4" + +#: src/bin/e_actions.c:3148 +msgid "Switch To Desktop 5" +msgstr "Пређи на радну површ 5" + +#: src/bin/e_actions.c:3150 +msgid "Switch To Desktop 6" +msgstr "Пређи на радну површ 6" + +#: src/bin/e_actions.c:3152 +msgid "Switch To Desktop 7" +msgstr "Пређи на радну површ 7" + +#: src/bin/e_actions.c:3154 +msgid "Switch To Desktop 8" +msgstr "Пређи на радну површ 8" + +#: src/bin/e_actions.c:3156 +msgid "Switch To Desktop 9" +msgstr "Пређи на радну површ 9" + +#: src/bin/e_actions.c:3158 +msgid "Switch To Desktop 10" +msgstr "Пређи на радну површ 10" + +#: src/bin/e_actions.c:3160 +msgid "Switch To Desktop 11" +msgstr "Пређи на радну површ 11" + +#: src/bin/e_actions.c:3162 +msgid "Switch To Desktop..." +msgstr "Пређи на радну површ..." + +#: src/bin/e_actions.c:3168 +msgid "Flip Desktop Left (All Screens)" +msgstr "Пребаци на радну површ лево (свих екрана)" + +#: src/bin/e_actions.c:3170 +msgid "Flip Desktop Right (All Screens)" +msgstr "Пребаци на радну површ десно (свих екрана)" + +#: src/bin/e_actions.c:3172 +msgid "Flip Desktop Up (All Screens)" +msgstr "Пребаци на радну површ горе (свих екрана)" + +#: src/bin/e_actions.c:3174 +msgid "Flip Desktop Down (All Screens)" +msgstr "Пребаци на радну површ доле (свих екрана)" + +#: src/bin/e_actions.c:3176 +msgid "Flip Desktop By... (All Screens)" +msgstr "Пребаци радну површ за... (свих екрана)" + +#: src/bin/e_actions.c:3182 +msgid "Flip Desktop To... (All Screens)" +msgstr "Пребаци радну површ на... (свих екрана)" + +#: src/bin/e_actions.c:3188 +msgid "Flip Desktop Linearly... (All Screens)" +msgstr "Пребаци на радну површ редно... (сви екрани)" + +#: src/bin/e_actions.c:3194 +msgid "Flip Desktop In Direction..." +msgstr "Пребаци радну површ у правцу..." + +#: src/bin/e_actions.c:3199 +msgid "Switch To Desktop 0 (All Screens)" +msgstr "Пређи на радну површ 0 (сви екрани)" + +#: src/bin/e_actions.c:3201 +msgid "Switch To Desktop 1 (All Screens)" +msgstr "Пређи на радну површ 1 (сви екрани)" + +#: src/bin/e_actions.c:3203 +msgid "Switch To Desktop 2 (All Screens)" +msgstr "Пређи на радну површ 2 (сви екрани)" + +#: src/bin/e_actions.c:3205 +msgid "Switch To Desktop 3 (All Screens)" +msgstr "Пређи на радну површ 3 (сви екрани)" + +#: src/bin/e_actions.c:3207 +msgid "Switch To Desktop 4 (All Screens)" +msgstr "Пређи на радну површ 4 (сви екрани)" + +#: src/bin/e_actions.c:3209 +msgid "Switch To Desktop 5 (All Screens)" +msgstr "Пређи на радну површ 5 (сви екрани)" + +#: src/bin/e_actions.c:3211 +msgid "Switch To Desktop 6 (All Screens)" +msgstr "Пређи на простор 6 (сви екрани)" + +#: src/bin/e_actions.c:3213 +msgid "Switch To Desktop 7 (All Screens)" +msgstr "Пређи на простор 7 (сви екрани)" + +#: src/bin/e_actions.c:3215 +msgid "Switch To Desktop 8 (All Screens)" +msgstr "Пређи на простор 8 (сви екрани)" + +#: src/bin/e_actions.c:3217 +msgid "Switch To Desktop 9 (All Screens)" +msgstr "Пређи на простор 9 (сви екрани)" + +#: src/bin/e_actions.c:3219 +msgid "Switch To Desktop 10 (All Screens)" +msgstr "Пређи на простор 10 (сви екрани)" + +#: src/bin/e_actions.c:3221 +msgid "Switch To Desktop 11 (All Screens)" +msgstr "Пређи на простор 11 (сви екрани)" + +#: src/bin/e_actions.c:3223 +msgid "Switch To Desktop... (All Screens)" +msgstr "Пређи на простор 12 (сви екрани)" + +#: src/bin/e_actions.c:3229 src/bin/e_actions.c:3233 +#: src/modules/winlist/e_mod_main.c:41 src/modules/winlist/e_mod_main.c:43 +#: src/modules/winlist/e_mod_main.c:45 src/modules/winlist/e_mod_main.c:48 +#: src/modules/winlist/e_mod_main.c:51 src/modules/winlist/e_mod_main.c:54 +#: src/modules/winlist/e_mod_main.c:57 src/modules/winlist/e_mod_main.c:59 +#: src/modules/winlist/e_mod_main.c:61 src/modules/winlist/e_mod_main.c:63 +msgid "Window : List" +msgstr "Прозор : списак" + +#: src/bin/e_actions.c:3229 +msgid "Jump to window..." +msgstr "Скочи на прозор..." + +#: src/bin/e_actions.c:3233 +msgid "Jump to window... or start..." +msgstr "Скочи на прозор... или покрени..." + +#: src/bin/e_actions.c:3240 src/bin/e_actions.c:3242 src/bin/e_actions.c:3244 +#: src/bin/e_actions.c:3250 src/bin/e_actions.c:3252 src/bin/e_actions.c:3254 +#: src/bin/e_actions.c:3259 src/bin/e_actions.c:3262 src/bin/e_actions.c:3265 +#: src/bin/e_actions.c:3267 src/bin/e_actions.c:3269 src/bin/e_actions.c:3271 +#: src/bin/e_actions.c:3274 src/bin/e_actions.c:3276 src/bin/e_actions.c:3278 +#: src/modules/backlight/e_mod_main.c:509 +#: src/modules/conf_display/e_mod_main.c:17 +#: src/modules/conf_randr/e_mod_main.c:19 src/modules/ibox/e_mod_config.c:135 +#: src/modules/shot/e_mod_main.c:745 src/modules/shot/e_mod_main.c:980 +msgid "Screen" +msgstr "Екран" + +#: src/bin/e_actions.c:3240 +msgid "Send Mouse To Screen 0" +msgstr "Пошаљи миша на екран 0" + +#: src/bin/e_actions.c:3242 +msgid "Send Mouse To Screen 1" +msgstr "Пошаљи миша на екран 1" + +#: src/bin/e_actions.c:3244 +msgid "Send Mouse To Screen..." +msgstr "Покажи миша на екран..." + +#: src/bin/e_actions.c:3250 +msgid "Send Mouse Forward 1 Screen" +msgstr "Пошаљи миша на 1 екран унапред" + +#: src/bin/e_actions.c:3252 +msgid "Send Mouse Back 1 Screen" +msgstr "Пошаљи миша на 1 екран уназад" + +#: src/bin/e_actions.c:3254 +msgid "Send Mouse Forward/Back Screens..." +msgstr "Шаље миша на претходни/следећи екран..." + +#: src/bin/e_actions.c:3259 +msgid "Dim" +msgstr "Затамни" + +#: src/bin/e_actions.c:3262 +msgid "Undim" +msgstr "Искључи затамњење" + +#: src/bin/e_actions.c:3265 +msgid "Backlight Set" +msgstr "Постави позадинско осветљење" + +#: src/bin/e_actions.c:3267 +msgid "Backlight Min" +msgstr "Најмање позадинско осветљење" + +#: src/bin/e_actions.c:3269 +msgid "Backlight Mid" +msgstr "Средње позадинско осветљење" + +#: src/bin/e_actions.c:3271 +msgid "Backlight Max" +msgstr "Највише позадинско осветљење" + +#: src/bin/e_actions.c:3274 +msgid "Backlight Adjust" +msgstr "Подеси позадинско осветљење" + +#: src/bin/e_actions.c:3276 +msgid "Backlight Up" +msgstr "Појачај позадинско осветљење" + +#: src/bin/e_actions.c:3278 +msgid "Backlight Down" +msgstr "Смањи позадинско осветљење" + +#: src/bin/e_actions.c:3283 +msgid "Move To Center" +msgstr "Смести у средину" + +#: src/bin/e_actions.c:3287 +msgid "Move To Coordinates..." +msgstr "Помери у положај..." + +#: src/bin/e_actions.c:3292 +msgid "Move By Coordinate Offset..." +msgstr "Помери за померај положаја..." + +#: src/bin/e_actions.c:3298 +msgid "Resize By..." +msgstr "Промени величину за..." + +#: src/bin/e_actions.c:3304 +msgid "Push in Direction..." +msgstr "Помери у правцу..." + +#: src/bin/e_actions.c:3310 +msgid "Drag Icon..." +msgstr "Вуци икону..." + +#: src/bin/e_actions.c:3315 src/bin/e_actions.c:3317 src/bin/e_actions.c:3319 +#: src/bin/e_actions.c:3325 src/bin/e_actions.c:3331 src/bin/e_actions.c:3333 +msgid "Window : Moving" +msgstr "Прозор : померање" + +#: src/bin/e_actions.c:3315 +msgid "To Next Desktop" +msgstr "На следећу радну површ" + +#: src/bin/e_actions.c:3317 +msgid "To Previous Desktop" +msgstr "На претходну радну површ" + +#: src/bin/e_actions.c:3319 +msgid "By Desktop #..." +msgstr "За радну површ #..." + +#: src/bin/e_actions.c:3325 +msgid "To Desktop..." +msgstr "На радну површ..." + +#: src/bin/e_actions.c:3331 +msgid "To Next Screen" +msgstr "На следећи екран" + +#: src/bin/e_actions.c:3333 +msgid "To Previous Screen" +msgstr "На претходни екран" + +#: src/bin/e_actions.c:3338 +msgid "Show Main Menu" +msgstr "Прикажи главни изборник" + +#: src/bin/e_actions.c:3340 +msgid "Show Favorites Menu" +msgstr "Прикажи омиљени изборник" + +#: src/bin/e_actions.c:3342 +msgid "Show All Applications Menu" +msgstr "Прикажи изборник свих програма" + +#: src/bin/e_actions.c:3344 +msgid "Show Clients Menu" +msgstr "Приказује изборник клијента" + +#: src/bin/e_actions.c:3346 +msgid "Show Menu..." +msgstr "Приказује изборник..." + +#: src/bin/e_actions.c:3353 src/bin/e_actions.c:3358 src/bin/e_actions.c:3363 +#: src/modules/conf/e_mod_main.c:272 +#: src/modules/everything/evry_plug_apps.c:1169 +#: src/modules/fileman/e_mod_main.c:55 +msgid "Launch" +msgstr "Покрени" + +#: src/bin/e_actions.c:3353 src/bin/e_int_border_prop.c:468 +msgid "Command" +msgstr "Наредба" + +#: src/bin/e_actions.c:3358 src/bin/e_eap_editor.c:698 +#: src/bin/e_int_border_menu.c:118 +#, c-format +msgid "Application" +msgstr "Програм" + +#: src/bin/e_actions.c:3363 +msgid "New Instance of Focused App" +msgstr "Нови примерак програма у жижи" + +#: src/bin/e_actions.c:3367 src/bin/e_int_menus.c:247 +msgid "Restart" +msgstr "Поново покрени" + +#: src/bin/e_actions.c:3375 +msgid "Exit Now" +msgstr "Изађи сада" + +#: src/bin/e_actions.c:3379 src/bin/e_actions.c:3384 +msgid "Enlightenment : Mode" +msgstr "Просвећење : начин" + +#: src/bin/e_actions.c:3380 +msgid "Presentation Mode Toggle" +msgstr "Прекидач начина рада излагања" + +#: src/bin/e_actions.c:3385 +msgid "Offline Mode Toggle" +msgstr "Прекидач рада ван мреже" + +#: src/bin/e_actions.c:3389 src/bin/e_actions.c:3393 src/bin/e_actions.c:3397 +msgid "Enlightenment : Module" +msgstr "Просвећење : јединица" + +#: src/bin/e_actions.c:3390 +msgid "Enable the named module" +msgstr "Омогући именовану јединицу" + +#: src/bin/e_actions.c:3394 +msgid "Disable the named module" +msgstr "Онемогући именовану јединицу" + +#: src/bin/e_actions.c:3398 +msgid "Toggle the named module" +msgstr "Мења стање именоване јединице" + +#: src/bin/e_actions.c:3402 src/bin/e_actions.c:3406 src/bin/e_actions.c:3410 +#: src/bin/e_actions.c:3414 src/bin/e_actions.c:3418 src/bin/e_actions.c:3422 +#: src/bin/e_actions.c:3426 src/bin/e_actions.c:3430 src/bin/e_configure.c:411 +#: src/bin/e_int_config_modules.c:52 +#: src/modules/conf_applications/e_int_config_apps.c:275 +#: src/modules/conf_display/e_int_config_desklock_fsel.c:87 +#: src/modules/conf_intl/e_int_config_imc.c:808 +#: src/modules/conf_theme/e_int_config_wallpaper.c:427 +#: src/modules/conf_theme/e_int_config_wallpaper.c:581 +#: src/modules/conf_theme/e_int_config_startup.c:258 +#: src/modules/conf_theme/e_int_config_theme.c:732 +#: src/modules/conf_theme/e_int_config_theme.c:1106 +#: src/modules/conf_theme/e_int_config_theme.c:1120 +#: src/modules/gadman/e_mod_config.c:252 src/modules/syscon/e_mod_main.c:31 +#: src/modules/syscon/e_mod_main.c:35 src/modules/syscon/e_mod_main.c:129 +#: src/modules/syscon/e_syscon_gadget.c:141 +msgid "System" +msgstr "Систем" + +#: src/bin/e_actions.c:3402 +msgid "Log Out" +msgstr "Одјава" + +#: src/bin/e_actions.c:3406 +msgid "Power Off Now" +msgstr "Искључи сада" + +#: src/bin/e_actions.c:3410 +msgid "Power Off" +msgstr "Искључи" + +#: src/bin/e_actions.c:3418 +msgid "Suspend Now" +msgstr "Обустави сада" + +#: src/bin/e_actions.c:3430 +msgid "Hibernate Now" +msgstr "Замрзни сада" + +#: src/bin/e_actions.c:3438 +msgid "Lock" +msgstr "Закључај" + +#: src/bin/e_actions.c:3443 src/bin/e_int_menus.c:1327 +msgid "Cleanup Windows" +msgstr "Очисти прозоре" + +# сродно, прегледај прво +#: src/bin/e_actions.c:3448 +msgid "Generic : Actions" +msgstr "Опште : радње" + +#: src/bin/e_actions.c:3448 +msgid "Delayed Action" +msgstr "Одложене радње" + +#: src/bin/e_actions.c:3456 src/bin/e_actions.c:3460 src/bin/e_actions.c:3464 +msgid "Keyboard Layouts" +msgstr "Распореди тастатуре" + +#: src/bin/e_actions.c:3457 +msgid "Use keyboard layout" +msgstr "Користи распоред тастатуре" + +#: src/bin/e_actions.c:3461 +msgid "Next keyboard layout" +msgstr "Наредни распоред тастатуре" + +#: src/bin/e_actions.c:3465 +msgid "Previous keyboard layout" +msgstr "Претходни распоред тастатуре" + +#: src/bin/e_bg.c:22 +msgid "Set As Background" +msgstr "Постави као позадину" + +#: src/bin/e_color_dialog.c:26 +msgid "Color Selector" +msgstr "Бирач боје" + +#: src/bin/e_color_dialog.c:46 +msgid "Select" +msgstr "Изаберите" + +#: src/bin/e_color_dialog.c:47 src/bin/e_eap_editor.c:862 +#: src/bin/e_eap_editor.c:925 src/bin/e_entry_dialog.c:64 src/bin/e_fm.c:9971 +#: src/bin/e_fm_prop.c:625 src/bin/e_import_dialog.c:196 +#: src/bin/e_import_config_dialog.c:541 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:637 +#: src/modules/conf_intl/e_int_config_imc_import.c:124 +#: src/modules/conf_theme/e_int_config_theme_import.c:123 +#: src/modules/fileman/e_int_config_mime_edit.c:316 +#: src/modules/syscon/e_syscon.c:122 +#: src/modules/quickaccess/e_mod_quickaccess.c:319 +#: src/modules/quickaccess/e_mod_quickaccess.c:381 +#: src/modules/shot/e_mod_main.c:291 src/modules/shot/e_mod_main.c:542 +#: src/modules/shot/e_mod_main.c:568 src/modules/shot/e_mod_main.c:804 +#: src/modules/xkbswitch/e_mod_config.c:529 +msgid "Cancel" +msgstr "Откажи" + +#: src/bin/e_config.c:931 +msgid "" +"Settings data needed upgrading. Your old settings have<br>been wiped and a " +"new set of defaults initialized. This<br>will happen regularly during " +"development, so don't report a<br>bug. This simply means Enlightenment needs " +"new settings<br>data by default for usable functionality that your " +"old<br>settings simply lack. This new set of defaults will fix<br>that by " +"adding it in. You can re-configure things now to your<br>liking. Sorry for " +"the hiccup in your settings.<br>" +msgstr "" +"Датотеке поставки требају бити надограђене. Ваше старе поставке " +"су<br>обрисане, а нови скуп задатих поставки је покренут. Ово<br>ће се " +"дешавати редовно током развоја, зато, немојте пријављивати <br>грешку. Ово " +"једноставно значи да Просвећењу требају нови<br>предодређени подаци за " +"корисне радње које<br>стара подешавања једноставно немају. Овај нови скуп " +"задатих поставки ће то<br>поправити њиховим додавањем. Сада можете подесити " +"ствари по својој<br>вољи. Извините због зачкољица у вашим поставкама.<br>" + +#: src/bin/e_config.c:948 +msgid "" +"Your settings are NEWER than Enlightenment. This is very<br>strange. This " +"should not happen unless you downgraded<br>Enlightenment or copied the " +"settings from a place where<br>a newer version of Enlightenment was running. " +"This is bad and<br>as a precaution your settings have been now restored " +"to<br>defaults. Sorry for the inconvenience.<br>" +msgstr "" +"Ваше поставке су НОВИЈЕ од Просвећења. То је врло<br>чудно.То не би требало " +"да се дешава, осим ако сте уназадили<br>Просвећење, или умножили поставке са " +"места<br>где је новије издање Просвећења радило. Ово је лоше, и<br>као " +"предострожност, ваше поставке су враћене на задате<br>вредности. Извините " +"због непријатности.<br>" + +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 +msgid "Enlightenment Settings Write Problems" +msgstr "Потешкоће писања поставки Просвећења" + +#: src/bin/e_config.c:1469 +#, c-format +msgid "" +"Enlightenment has had an error while moving config files<br>from:<br>" +"%s<br><br>to:<br>%s<br><br>The rest of the write has been aborted for safety." +"<br>" +msgstr "" +"Дошло је до грешке приликом премештања датотека поставки Просвећења<br>из:" +"<br>%s<br><br>у<br>%s<br><br>Остатак уписа је отказан због безбедности.<br>" + +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 +#: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 +#: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 +#: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 +#: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 +#: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 +#: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 +#: src/modules/conf_intl/e_int_config_imc_import.c:120 +#: src/modules/conf_theme/e_int_config_theme_import.c:119 +#: src/modules/cpufreq/e_mod_main.c:436 src/modules/cpufreq/e_mod_main.c:465 +#: src/modules/cpufreq/e_mod_main.c:492 +#: src/modules/fileman/e_int_config_mime_edit.c:315 +#: src/modules/xkbswitch/e_mod_config.c:528 +msgid "OK" +msgstr "У реду" + +#: src/bin/e_config.c:1982 +msgid "Settings Upgraded" +msgstr "Поставке су надограђене" + +#: src/bin/e_config.c:2000 +msgid "The EET file handle is bad." +msgstr "Руковање ЕЕТ датотекама је лоше." + +#: src/bin/e_config.c:2004 +msgid "The file data is empty." +msgstr "Датотека података је празна." + +#: src/bin/e_config.c:2008 +msgid "" +"The file is not writable. Perhaps the disk is read-only<br>or you lost " +"permissions to your files." +msgstr "" +"Ова датотека није уписива. Можда је диск само за читање,<br>или сте изгубили " +"овлашћења над датотекама." + +#: src/bin/e_config.c:2012 +msgid "Memory ran out while preparing the write.<br>Please free up memory." +msgstr "" +"Док сам вршио припрему за упис, остало је мало простора у меморији." +"<br>Молим, ослободите простор у меморији." + +#: src/bin/e_config.c:2016 +msgid "This is a generic error." +msgstr "Ово је општа грешка." + +#: src/bin/e_config.c:2020 +msgid "" +"The settings file is too large.<br>It should be very small (a few hundred KB " +"at most)." +msgstr "" +"Датотека поставки је превише велика.<br>Требала би бити врло мала (неколико " +"стотина KB највише)." + +#: src/bin/e_config.c:2024 +msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?" +msgstr "Имате улазно/излазне грешке на диску.<br>Можда га требате заменити?" + +#: src/bin/e_config.c:2028 +msgid "You ran out of space while writing the file." +msgstr "Остали сте без простора на диску приликом уписа датотеке." + +#: src/bin/e_config.c:2032 +msgid "The file was closed while writing." +msgstr "Датотека је затворена за време писања." + +#: src/bin/e_config.c:2036 +msgid "Memory-mapping (mmap) of the file failed." +msgstr "Мапирање меморије (mmap) датотеке није успело." + +#: src/bin/e_config.c:2040 +msgid "X509 Encoding failed." +msgstr "X509 шифровање није успело." + +#: src/bin/e_config.c:2044 +msgid "Signature failed." +msgstr "Потписивање није успело." + +#: src/bin/e_config.c:2048 +msgid "The signature was invalid." +msgstr "Није исправан потпис." + +#: src/bin/e_config.c:2052 +msgid "Not signed." +msgstr "Није потписано." + +#: src/bin/e_config.c:2056 +msgid "Feature not implemented." +msgstr "Није још подржано." + +#: src/bin/e_config.c:2060 +msgid "PRNG was not seeded." +msgstr "Није посејан псеудо насумични број ПРНГ." + +#: src/bin/e_config.c:2064 +msgid "Encryption failed." +msgstr "Није успело шифровање." + +#: src/bin/e_config.c:2068 +msgid "Decryption failed." +msgstr "Дешифровање није успело." + +#: src/bin/e_config.c:2072 +msgid "The error is unknown to Enlightenment." +msgstr "Просвећење не препознаје грешку." + +#: src/bin/e_config.c:2094 +#, c-format +msgid "" +"Enlightenment has had an error while writing<br>its config file.<br>" +"%s<br><br>The file where the error occurred was:<br>%s<br><br>This file has " +"been deleted to avoid corrupt data.<br>" +msgstr "" +"Просвећење је имало грешку приликом уписа <br>њених датотека поставки.<br>" +"%s<br><br>Датотека због које се јавила грешка је:<br>%s<br><br>Ова датотека " +"је избрисана да би се спречио упис неисправних података.<br>" + +#: src/bin/e_config_dialog.c:226 src/modules/battery/e_mod_main.c:817 +#: src/modules/conf/e_mod_main.c:283 +#: src/modules/conf_edgebindings/e_mod_main.c:19 +#: src/modules/conf_paths/e_mod_main.c:17 +#: src/modules/conf_performance/e_mod_main.c:17 +#: src/modules/syscon/e_mod_main.c:36 +msgid "Advanced" +msgstr "Напредно" + +#: src/bin/e_config_dialog.c:255 src/bin/e_eap_editor.c:719 +msgid "Basic" +msgstr "Основно" + +#: src/bin/e_config_dialog.c:280 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:876 +msgid "Apply" +msgstr "Примени" + +#: src/bin/e_configure.c:29 src/modules/conf_shelves/e_mod_main.c:21 +#: src/modules/gadman/e_mod_main.c:23 src/modules/mixer/e_mod_main.c:1280 +#: src/modules/connman/e_mod_main.c:634 +#: src/modules/notification/e_mod_main.c:148 +msgid "Extensions" +msgstr "Проширења" + +#: src/bin/e_configure.c:30 src/bin/e_configure.c:33 src/bin/e_configure.c:280 +#: src/modules/conf_paths/e_int_config_paths.c:80 +#: src/modules/conf_theme/e_int_config_color_classes.c:862 +#: src/modules/conf_theme/e_int_config_fonts.c:98 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:255 +msgid "Modules" +msgstr "Jединице" + +#: src/bin/e_configure.c:403 +msgid "Preferences" +msgstr "Поставке" + +#: src/bin/e_container.c:124 +#, c-format +msgid "Container %d" +msgstr "Садржалац %d" + +#: src/bin/e_desklock.c:236 +msgid "Error - no PAM support" +msgstr "Грешка - нема ПАМ подршке" + +#: src/bin/e_desklock.c:237 +msgid "" +"No PAM support was built into Enlightenment, so<br>desk locking is disabled." +msgstr "" +"Није уграђена ПАМ подршка у Просвећење,<br>тако да ће закључавање радног " +"простора онемогућено." + +#: src/bin/e_desklock.c:301 +msgid "Lock Failed" +msgstr "Закључавање није успело" + +#: src/bin/e_desklock.c:302 +msgid "" +"Locking the desktop failed because some application<br>has grabbed either " +"the keyboard or the mouse or both<br>and their grab is unable to be broken." +msgstr "" +"Закључавање радног простора није успело, зато јер је неки програм " +"<br>захватио тастатуру, миша, или обоје,<br>и његово захват не може бити " +"отклоњен." + +#: src/bin/e_desklock.c:541 +msgid "Please enter your unlock password" +msgstr "Молим, унесите вашу лозинку за откључавање" + +#: src/bin/e_desklock.c:926 +msgid "Authenticating..." +msgstr "Препознавање..." + +#: src/bin/e_desklock.c:931 +msgid "The password you entered is invalid. Try again." +msgstr "Лозинка коју сте унели није исправна. Молим, покушајте поново." + +#: src/bin/e_desklock.c:968 +msgid "Authentication System Error" +msgstr "Системска грешка распознаје" + +#: src/bin/e_desklock.c:969 +#, c-format +msgid "" +"Authentication via PAM had errors setting up the<br>authentication session. " +"The error code was <hilight>%i</hilight>.<br>This is bad and should not be " +"happening. Please report this bug." +msgstr "" +"ПАМ распознавање је грешило при подешавању<br>распознавања сесије. Ова шифра " +"грешке је <hilight>%i</hilight>.<br>То је лоше и не би требало да се дешава. " +"Молим, пријавите ову грешку." + +#: src/bin/e_desklock.c:1302 src/bin/e_screensaver.c:180 +msgid "Activate Presentation Mode?" +msgstr "Покренути начин рада излагања?" + +#: src/bin/e_desklock.c:1305 +msgid "" +"You unlocked your desktop too fast.<br><br>Would you like to enable " +"<b>presentation</b> mode and temporarily disable screen saver, lock and " +"power saving?" +msgstr "" +"Пребрзо сте откључали радни простор.<br><br>Да ли желите да омогућите начин " +"рада <br>излагања<br> и привремено онемогућите чувара екрана, закључавање и " +"штедњу снаге?" + +#: src/bin/e_desklock.c:1315 src/bin/e_screensaver.c:193 +msgid "No, but increase timeout" +msgstr "Не, али повећај време истека" + +#: src/bin/e_desklock.c:1317 src/bin/e_screensaver.c:195 +msgid "No, and stop asking" +msgstr "Не, и престани да ме питаш" + +#: src/bin/e_eap_editor.c:181 +msgid "Incomplete Window Properties" +msgstr "Непотпуне особине прозора" + +#: src/bin/e_eap_editor.c:182 +msgid "" +"The window you are creating an icon for<br>does not contain window name and " +"class<br>properties. Without these, you will have to<br>use the window title " +"instead. This will only<br>work if the window title is the same at<br>the " +"time the window starts up, and does not<br>change." +msgstr "" +"Прозор за који стварате икону<br>не садржи назив прозора и<br>поставке " +"разреда. Без њих, морате <br>користити наслов прозора. Ово ће једино " +"радити<br>ако је наслов прозора исти<br>у време кад се прозор покрене, и " +"ако<br>се не мења." + +#: src/bin/e_eap_editor.c:235 +msgid "Desktop Entry Editor" +msgstr "Уређивач датотека радне површи" + +#: src/bin/e_eap_editor.c:677 src/bin/e_int_border_prop.c:445 +#: src/bin/e_int_border_prop.c:499 src/modules/comp/e_mod_config.c:709 +#: src/modules/conf_intl/e_int_config_imc.c:886 +#: src/modules/conf_menus/e_int_config_menus.c:265 +#: src/modules/ibar/e_mod_config.c:130 +msgid "Name" +msgstr "Назив" + +#: src/bin/e_eap_editor.c:688 src/modules/ibar/e_mod_config.c:134 +msgid "Comment" +msgstr "Напомена" + +#: src/bin/e_eap_editor.c:710 +msgid "URL" +msgstr "Адреса" + +#: src/bin/e_eap_editor.c:732 src/bin/e_eap_editor.c:741 +#: src/bin/e_fm_prop.c:495 src/modules/conf_theme/e_int_config_fonts.c:95 +#: src/modules/fileman/e_int_config_mime_edit.c:145 +msgid "Icon" +msgstr "Иконица" + +#: src/bin/e_eap_editor.c:745 +msgid "Generic Name" +msgstr "Општи назив" + +#: src/bin/e_eap_editor.c:751 +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:103 +msgid "Window Class" +msgstr "Разред прозора" + +#: src/bin/e_eap_editor.c:757 src/modules/fileman/e_int_config_mime.c:170 +msgid "Categories" +msgstr "Врсте" + +#: src/bin/e_eap_editor.c:764 +msgid "Mime Types" +msgstr "МИМЕ врсте" + +#: src/bin/e_eap_editor.c:771 +msgid "Desktop file" +msgstr "Датотека радне површи" + +#: src/bin/e_eap_editor.c:781 src/bin/e_int_border_prop.c:450 +#: src/bin/e_int_border_prop.c:502 src/modules/access/e_mod_config.c:68 +#: src/modules/comp/e_mod_config.c:1527 +#: src/modules/conf_applications/e_int_config_defapps.c:358 +#: src/modules/conf_performance/e_int_config_performance.c:122 +#: src/modules/everything/evry_config.c:378 +#: src/modules/everything/evry_plug_files.c:1477 +#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:226 +#: src/modules/physics/e_mod_config.c:120 +#: src/modules/tiling/e_mod_config.c:180 +msgid "General" +msgstr "Опште" + +#: src/bin/e_eap_editor.c:784 +msgid "Startup Notify" +msgstr "Обавештења при покретању" + +#: src/bin/e_eap_editor.c:786 src/modules/everything/evry_plug_apps.c:1183 +msgid "Run in Terminal" +msgstr "Покрени у терминалу" + +#: src/bin/e_eap_editor.c:788 +msgid "Show in Menus" +msgstr "Прикажи у изборницима" + +#: src/bin/e_eap_editor.c:791 src/bin/e_fm.c:8776 src/bin/e_fm.c:8936 +#: src/bin/e_int_border_remember.c:763 +#: src/modules/xkbswitch/e_mod_config.c:334 +msgid "Options" +msgstr "Могућности" + +#: src/bin/e_eap_editor.c:822 +#, c-format +msgid "Select an Icon for '%s'" +msgstr "Изаберите иконицу за „%s“" + +#: src/bin/e_eap_editor.c:888 +msgid "Select an Executable" +msgstr "Изаберите извршну датотеку" + +#: src/bin/e_entry.c:480 src/bin/e_fm.c:9121 src/bin/e_fm.c:10789 +#: src/bin/e_shelf.c:1792 src/bin/e_shelf.c:2475 +#: src/modules/conf_dialogs/e_int_config_profiles.c:135 +#: src/modules/conf_dialogs/e_int_config_profiles.c:339 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:812 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:201 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:247 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:294 +#: src/modules/conf_paths/e_int_config_env.c:317 +#: src/modules/conf_shelves/e_int_config_shelf.c:139 +#: src/modules/conf_shelves/e_int_config_shelf.c:394 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:141 +#: src/modules/ibar/e_mod_config.c:112 src/modules/ibar/e_mod_config.c:199 +#: src/modules/quickaccess/e_mod_config.c:277 +#: src/modules/quickaccess/e_mod_config.c:307 +msgid "Delete" +msgstr "Обриши" + +#: src/bin/e_entry.c:490 src/bin/e_fm.c:9032 +msgid "Cut" +msgstr "Исеци" + +#: src/bin/e_entry.c:499 src/bin/e_fm.c:9046 src/bin/e_fm.c:11550 +msgid "Copy" +msgstr "Умножи" + +#: src/bin/e_entry.c:509 src/bin/e_fm.c:8837 src/bin/e_fm.c:9059 +msgid "Paste" +msgstr "Прилепи" + +#: src/bin/e_entry.c:520 +msgid "Select All" +msgstr "Означи све" + +#: src/bin/e_exec.c:400 src/bin/e_exec.c:408 src/bin/e_exec.c:419 +#: src/bin/e_exec.c:468 src/bin/e_utils.c:188 +#: src/modules/conf_intl/e_int_config_imc.c:261 +#: src/modules/conf_intl/e_int_config_imc.c:510 +msgid "Run Error" +msgstr "Грешка при извршавању" + +#: src/bin/e_exec.c:401 +msgid "Enlightenment was unable to get current directory" +msgstr "Просвећење није могло да добави тренутну фасциклу" + +#: src/bin/e_exec.c:409 +#, c-format +msgid "Enlightenment was unable to change to directory:<br><br>%s" +msgstr "Просвећење није успело да пређе у фасциклу:<br><br>%s" + +#: src/bin/e_exec.c:420 +#, c-format +msgid "Enlightenment was unable to restore to directory:<br><br>%s" +msgstr "Просвећење није успело да поврати у фасциклу:<br><br>%s" + +#: src/bin/e_exec.c:469 +#, c-format +msgid "Enlightenment was unable to fork a child process:<br><br>%s" +msgstr "Просвећење није успело да раздели потпроцес:<br><br>%s" + +#: src/bin/e_exec.c:604 +msgid "Application run error" +msgstr "Грешка извршења програма" + +#: src/bin/e_exec.c:606 +#, c-format +msgid "" +"Enlightenment was unable to run the application:<br><br>%s<br><br>The " +"application failed to start." +msgstr "" +"Просвећење није успело да изврши програм:<br><br>%s<br><br>Програм није " +"успео да се покрене." + +#: src/bin/e_exec.c:713 +msgid "Application Execution Error" +msgstr "Грешка при извршавању програма" + +#: src/bin/e_exec.c:726 src/bin/e_exec.c:728 +#, c-format +msgid "%s stopped running unexpectedly." +msgstr "%s је неочекивано окончан." + +#: src/bin/e_exec.c:734 +#, c-format +msgid "An exit code of %i was returned from %s." +msgstr "Шифра напуштања %i је враћена из %s." + +#: src/bin/e_exec.c:742 +#, c-format +msgid "%s was interrupted by an Interrupt Signal." +msgstr "%s је окончан знаком прекида." + +#: src/bin/e_exec.c:745 +#, c-format +msgid "%s was interrupted by a Quit Signal." +msgstr "%s је окончан знаком излаза." + +#: src/bin/e_exec.c:749 +#, c-format +msgid "%s was interrupted by an Abort Signal." +msgstr "%s је окончан знаком напуштања." + +#: src/bin/e_exec.c:752 +#, c-format +msgid "%s was interrupted by a Floating Point Error." +msgstr "%s је прекинут грешком у покретном зарезу." + +#: src/bin/e_exec.c:756 +#, c-format +msgid "%s was interrupted by an Uninterruptable Kill Signal." +msgstr "%s је прекинут непрекидним знаком убијања." + +#: src/bin/e_exec.c:760 +#, c-format +msgid "%s was interrupted by a Segmentation Fault." +msgstr "%s је прекинут грешком разграђивања." + +#: src/bin/e_exec.c:764 +#, c-format +msgid "%s was interrupted by a Broken Pipe." +msgstr "%s је прекинут прекидом спојнице." + +#: src/bin/e_exec.c:767 +#, c-format +msgid "%s was interrupted by a Termination Signal." +msgstr "%s је прекинут знаком прекида." + +#: src/bin/e_exec.c:771 +#, c-format +msgid "%s was interrupted by a Bus Error." +msgstr "%s је прекинут грешком у сабирници." + +#: src/bin/e_exec.c:774 +#, c-format +msgid "%s was interrupted by the signal number %i." +msgstr "%s је окончан знаком број %i." + +#: src/bin/e_exec.c:830 +msgid "" +"***The remaining output has been truncated. Save the output to view.***\n" +msgstr "***Остатак излаза је одсечен. Сачувајте излаз за преглед.***\n" + +#: src/bin/e_exec.c:889 src/bin/e_exec.c:967 src/bin/e_exec.c:974 +msgid "Error Logs" +msgstr "Дневник грешака" + +#: src/bin/e_exec.c:895 src/bin/e_exec.c:975 +msgid "There was no error message." +msgstr "Није било поруке у грешци." + +#: src/bin/e_exec.c:899 src/bin/e_exec.c:982 +msgid "Save This Message" +msgstr "Сачувај поруку" + +#: src/bin/e_exec.c:904 src/bin/e_exec.c:907 src/bin/e_exec.c:987 +#: src/bin/e_exec.c:990 +#, c-format +msgid "This error log will be saved as %s/%s.log" +msgstr "Дневник ове грешке ће бити сачуван као %s/%s.log" + +#: src/bin/e_exec.c:933 +msgid "Error Information" +msgstr "Податак о грешци" + +#: src/bin/e_exec.c:941 +msgid "Error Signal Information" +msgstr "Податак о знаку грешке" + +#: src/bin/e_exec.c:951 src/bin/e_exec.c:958 +msgid "Output Data" +msgstr "Излазни подаци" + +#: src/bin/e_exec.c:959 +msgid "There was no output." +msgstr "Није било излаза." + +#: src/bin/e_fm.c:1060 +msgid "Nonexistent path" +msgstr "Непостојећа путања" + +#: src/bin/e_fm.c:1063 +#, c-format +msgid "%s doesn't exist." +msgstr "%s не постоји." + +#: src/bin/e_fm.c:2833 src/bin/e_fm.c:3790 +#, c-format +msgid "%u file" +msgid_plural "%u files" +msgstr[0] "%u датотека" +msgstr[1] "%u датотеке" +msgstr[2] "%u датотека" + +#: src/bin/e_fm.c:3051 +msgid "Mount Error" +msgstr "Грешка при качењу" + +#: src/bin/e_fm.c:3051 +msgid "Can't mount device" +msgstr "Нисам успео да прикачим уређај" + +#: src/bin/e_fm.c:3067 +msgid "Unmount Error" +msgstr "Грешка при откачивању" + +#: src/bin/e_fm.c:3067 +msgid "Can't unmount device" +msgstr "Нисам успео да откачим уређај" + +#: src/bin/e_fm.c:3082 +msgid "Eject Error" +msgstr "Грешка при избацивању" + +#: src/bin/e_fm.c:3082 +msgid "Can't eject device" +msgstr "Нисам успео да избацим уређај" + +#: src/bin/e_fm.c:6593 src/bin/e_fm.c:6626 src/bin/e_fm.c:9506 +#: src/bin/e_fm.c:9518 src/bin/e_fm.c:9621 src/bin/e_fm.c:9626 +#: src/bin/e_fm.c:9642 src/bin/e_fm.c:9647 src/bin/e_fm.c:10274 +#: src/bin/e_fm.c:10277 src/bin/e_fm.c:10280 src/bin/e_fm.c:10307 +#: src/bin/e_fm.c:10311 src/bin/e_fm.c:10314 src/bin/e_fm.c:10372 +#: src/bin/e_fm.c:10597 src/bin/e_fm_prop.c:254 src/bin/e_shelf.c:2343 +msgid "Error" +msgstr "Грешка" + +#: src/bin/e_fm.c:6593 src/bin/e_fm.c:6626 +#, c-format +msgid "The recent DND operation requested for '%s' has failed." +msgstr "Скорашњи захтев радње превуци и спусти за „%s“ није успео." + +#: src/bin/e_fm.c:8694 src/modules/fileman/e_mod_config.c:361 +msgid "Case Sensitive" +msgstr "Разликуј величину слова" + +#: src/bin/e_fm.c:8700 src/modules/fileman/e_mod_config.c:364 +msgid "Sort By Extension" +msgstr "Разврстај према наставку" + +#: src/bin/e_fm.c:8706 src/modules/fileman/e_mod_config.c:367 +msgid "Sort By Modification Time" +msgstr "Поређај према датуму измене" + +#: src/bin/e_fm.c:8712 src/modules/fileman/e_mod_config.c:370 +msgid "Sort By Size" +msgstr "Поређај по величини" + +#: src/bin/e_fm.c:8721 src/modules/fileman/e_mod_config.c:378 +msgid "Directories First" +msgstr "Фасцикле прве" + +#: src/bin/e_fm.c:8727 src/modules/fileman/e_mod_config.c:382 +msgid "Directories Last" +msgstr "Фасцикле задње" + +#: src/bin/e_fm.c:8760 src/bin/e_fm.c:8920 +#: src/modules/fileman/e_mod_config.c:306 +msgid "View Mode" +msgstr "Начин приказа" + +#: src/bin/e_fm.c:8769 src/bin/e_fm.c:8929 +#: src/modules/everything/evry_config.c:503 +#: src/modules/fileman/e_mod_config.c:386 +msgid "Sorting" +msgstr "Редослед" + +#: src/bin/e_fm.c:8787 src/bin/e_fm.c:8947 +msgid "Refresh View" +msgstr "Освежи преглед" + +#: src/bin/e_fm.c:8798 src/bin/e_fm.c:8959 +msgid "New..." +msgstr "Нова..." + +#: src/bin/e_fm.c:8818 src/bin/e_fm.c:8980 src/bin/e_fm.c:9011 +msgid "Actions..." +msgstr "Радње..." + +#: src/bin/e_fm.c:8845 src/bin/e_fm.c:9067 src/bin/e_fm.c:11563 +msgid "Link" +msgstr "Веза" + +#: src/bin/e_fm.c:9129 src/bin/e_fm.c:10426 src/bin/e_shelf.c:2470 +#: src/modules/conf_shelves/e_int_config_shelf.c:142 +#: src/modules/quickaccess/e_mod_config.c:226 +#: src/modules/quickaccess/e_mod_config.c:274 +#: src/modules/quickaccess/e_mod_config.c:304 +msgid "Rename" +msgstr "Преименуј" + +#: src/bin/e_fm.c:9148 +msgid "Unmount" +msgstr "Откачи" + +#: src/bin/e_fm.c:9153 +msgid "Mount" +msgstr "Прикачи" + +#: src/bin/e_fm.c:9158 +msgid "Eject" +msgstr "Избаци" + +#: src/bin/e_fm.c:9173 src/bin/e_int_border_remember.c:742 +#: src/modules/ibar/e_mod_main.c:872 +msgid "Properties" +msgstr "Особине" + +#: src/bin/e_fm.c:9181 +msgid "Application Properties" +msgstr "Својства програма" + +#: src/bin/e_fm.c:9189 src/bin/e_fm_prop.c:115 +msgid "File Properties" +msgstr "Својства датотеке" + +#: src/bin/e_fm.c:9405 +msgid "Use default" +msgstr "Користи подразумевано" + +#: src/bin/e_fm.c:9435 src/modules/fileman/e_mod_config.c:311 +msgid "Grid Icons" +msgstr "Мрежа икона" + +#: src/bin/e_fm.c:9443 src/modules/fileman/e_mod_config.c:313 +msgid "Custom Icons" +msgstr "Прилагођене иконе" + +#: src/bin/e_fm.c:9451 src/modules/everything/evry_config.c:430 +#: src/modules/everything/evry_config.c:460 +#: src/modules/fileman/e_mod_config.c:321 +msgid "List" +msgstr "Списак" + +#: src/bin/e_fm.c:9459 src/modules/everything/evry_config.c:458 +msgid "Default View" +msgstr "Подразумевани приказ" + +#: src/bin/e_fm.c:9481 +#, c-format +msgid "Icon Size (%d)" +msgstr "Величина иконице (%d)" + +#: src/bin/e_fm.c:9506 +msgid "Could not create a directory!" +msgstr "Нисам успео да направим фасциклу!" + +#: src/bin/e_fm.c:9518 +msgid "Could not create a file!" +msgstr "Нисам успео да направим датотеку!" + +#: src/bin/e_fm.c:9532 src/bin/e_fm.c:9557 +#: src/modules/conf_paths/e_int_config_paths.c:206 +msgid "New Directory" +msgstr "Нова фасцикла" + +#: src/bin/e_fm.c:9532 src/bin/e_fm.c:9557 +msgid "New File" +msgstr "Нова датотека" + +#: src/bin/e_fm.c:9621 src/bin/e_fm.c:9642 +msgid "Already creating a new file for this directory!" +msgstr "Већ стварам нову датотеку за ову фасциклу!" + +#: src/bin/e_fm.c:9626 src/bin/e_fm.c:9647 +#, c-format +msgid "%s can't be written to!" +msgstr "%s такође нисам могао уписати!" + +#: src/bin/e_fm.c:9666 +msgid "Directory" +msgstr "Фасцикла" + +#: src/bin/e_fm.c:9671 +#: src/modules/conf_applications/e_int_config_defapps.c:312 +msgid "File" +msgstr "Датотека" + +#: src/bin/e_fm.c:9702 +msgid "Inherit parent settings" +msgstr "Наследи родитељске поставке" + +#: src/bin/e_fm.c:9711 +msgid "Show Hidden Files" +msgstr "Прикажи скривене датотеке" + +#: src/bin/e_fm.c:9723 +msgid "Remember Ordering" +msgstr "Памти распоред" + +#: src/bin/e_fm.c:9732 +msgid "Sort Now" +msgstr "Разврстај сада" + +#: src/bin/e_fm.c:9740 +msgid "Single Click Activation" +msgstr "Један клик за отварање ставки" + +#: src/bin/e_fm.c:9751 src/modules/fileman/e_mod_config.c:398 +msgid "Secure Deletion" +msgstr "Безбедно брисање" + +#: src/bin/e_fm.c:9764 +msgid "File Manager Settings" +msgstr "Поставке управника датотека" + +#: src/bin/e_fm.c:9769 +msgid "File Icon Settings" +msgstr "Поставке иконе датотеке" + +#: src/bin/e_fm.c:9847 src/bin/e_fm.c:10063 +msgid "Set background..." +msgstr "Постави позадину..." + +#: src/bin/e_fm.c:9855 +msgid "Clear background" +msgstr "Очисти позадину" + +#: src/bin/e_fm.c:9862 src/bin/e_fm.c:10091 +msgid "Set overlay..." +msgstr "Постави заклањање..." + +#: src/bin/e_fm.c:9868 +msgid "Clear overlay" +msgstr "Очисти заклањање" + +#: src/bin/e_fm.c:10185 src/bin/e_fm.c:10521 +#, c-format +msgid "Rename %s to:" +msgstr "Преименуј %s у:" + +#: src/bin/e_fm.c:10187 src/bin/e_fm.c:10522 +msgid "Rename File" +msgstr "Преименуј датотеку" + +#: src/bin/e_fm.c:10274 src/bin/e_fm.c:10307 +#, c-format +msgid "%s already exists!" +msgstr "%s већ постоји!" + +#: src/bin/e_fm.c:10277 src/bin/e_fm.c:10311 +#, c-format +msgid "%s could not be renamed because it is protected" +msgstr "Нисам успео преименовати %s јер је заштићен" + +#: src/bin/e_fm.c:10280 src/bin/e_fm.c:10314 +msgid "Internal filemanager error :(" +msgstr "Унутрашња грешка управника датотека :(" + +#: src/bin/e_fm.c:10368 src/bin/e_fm.c:10589 +msgid "Retry" +msgstr "Покушај поново" + +#: src/bin/e_fm.c:10369 src/bin/e_fm.c:10590 src/bin/e_fm.c:11571 +msgid "Abort" +msgstr "Прекини" + +#: src/bin/e_fm.c:10425 +msgid "No to all" +msgstr "Не за све" + +#: src/bin/e_fm.c:10428 +msgid "Yes to all" +msgstr "Да за све" + +#: src/bin/e_fm.c:10431 +msgid "Warning" +msgstr "Упозорење" + +#: src/bin/e_fm.c:10434 +#, c-format +msgid "File already exists, overwrite?<br><hilight>%s</hilight>" +msgstr "Датотека већ постоји, да је заменим?<br><hilight>%s</hilight>" + +#: src/bin/e_fm.c:10592 +msgid "Move Source" +msgstr "Помери извор" + +#: src/bin/e_fm.c:10593 +msgid "Ignore this" +msgstr "Занемари ово" + +#: src/bin/e_fm.c:10594 +msgid "Ignore all" +msgstr "Занемари све" + +#: src/bin/e_fm.c:10599 +#, c-format +msgid "An error occurred while performing an operation.<br>%s" +msgstr "Дошло је до грешке приликом извршавања радње.<br>%s" + +#: src/bin/e_fm.c:10792 +msgid "Confirm Delete" +msgstr "Потврди брисање" + +#: src/bin/e_fm.c:10802 +#, c-format +msgid "Are you sure you want to delete<br><hilight>%s</hilight>?" +msgstr "Да ли сте сигурни да желите обрисати<br><hilight>%s</hilight>?" + +#: src/bin/e_fm.c:10807 +#, c-format +msgid "" +"Are you sure you want to delete<br><hilight>all</hilight> the %d files " +"in<br><hilight>%s</hilight>?" +msgstr "" +"Да ли сте сигурни да желите обрисати<br><hilight>све</hilight> %d датотеке " +"из <br><hilight>%s</hilight>?" + +#: src/bin/e_fm.c:10817 +#, c-format +msgid "" +"Are you sure you want to delete<br>the %d selected file in<br><hilight>%s</" +"hilight>?" +msgid_plural "" +"Are you sure you want to delete<br>the %d selected files in<br><hilight>%s</" +"hilight>?" +msgstr[0] "" +"Да ли сте сигурни да желите обрисати<br> %d означену датотеку из<br><hilight>" +"%s</hilight>?" +msgstr[1] "" +"Да ли сте сигурни да желите обрисати<br> %d означене датотеке из<br><hilight>" +"%s</hilight>?" +msgstr[2] "" +"Да ли сте сигурни да желите обрисати<br> %d означених датотека из " +"<br><hilight>%s</hilight>?" + +#: src/bin/e_fm_device.c:60 +#, c-format +msgid "%s %s—%s" +msgstr "%s %s—%s" + +#: src/bin/e_fm_device.c:67 src/bin/e_fm_device.c:74 +#, c-format +msgid "%s—%s" +msgstr "%s—%s" + +#: src/bin/e_fm_device.c:79 +#, c-format +msgid "Flash Card—%s" +msgstr "Брза картица-%s" + +#: src/bin/e_fm_device.c:81 +#, c-format +msgid "Unknown Volume" +msgstr "Непознати диск" + +#: src/bin/e_fm_device.c:343 +msgid "Removable Device" +msgstr "Уклоњиви уређаји" + +#: src/bin/e_fm_prop.c:255 +#, c-format +msgid "Cannot change permissions: %s" +msgstr "Нисам успео да променим дозволе: %s" + +#: src/bin/e_fm_prop.c:390 src/bin/e_shelf.c:1123 src/bin/e_shelf.c:2363 +#: src/modules/comp/e_mod_config.c:493 +#: src/modules/conf_dialogs/e_int_config_profiles.c:316 +#: src/modules/conf_display/e_int_config_desk.c:186 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:152 +msgid "Name:" +msgstr "Назив:" + +#: src/bin/e_fm_prop.c:397 +msgid "Location:" +msgstr "Место:" + +#: src/bin/e_fm_prop.c:404 src/bin/e_widget_filepreview.c:274 +#: src/bin/e_widget_filepreview.c:331 src/bin/e_widget_filepreview.c:383 +msgid "Size:" +msgstr "Величина:" + +#: src/bin/e_fm_prop.c:411 +msgid "Occupied blocks on disk:" +msgstr "Заузети блокови на диску:" + +#: src/bin/e_fm_prop.c:418 +msgid "Last Accessed:" +msgstr "Последњи приступ:" + +#: src/bin/e_fm_prop.c:425 +msgid "Last Modified:" +msgstr "Последња измена:" + +#: src/bin/e_fm_prop.c:432 +msgid "Last Modified Permissions:" +msgstr "Последње измењене дозволе:" + +#: src/bin/e_fm_prop.c:439 +msgid "File Type:" +msgstr "Врста датотеке:" + +#: src/bin/e_fm_prop.c:446 +msgid "Permissions" +msgstr "Овлашћења" + +#: src/bin/e_fm_prop.c:451 src/bin/e_fm_prop.c:460 src/bin/e_fm_prop.c:469 +msgid "read" +msgstr "читање" + +#: src/bin/e_fm_prop.c:453 src/bin/e_fm_prop.c:462 src/bin/e_fm_prop.c:471 +msgid "write" +msgstr "писање" + +#: src/bin/e_fm_prop.c:455 src/bin/e_fm_prop.c:464 src/bin/e_fm_prop.c:473 +msgid "execute" +msgstr "извршавање" + +#: src/bin/e_fm_prop.c:458 +msgid "Group:" +msgstr "Дружба:" + +#: src/bin/e_fm_prop.c:467 +msgid "Others:" +msgstr "Остали:" + +#: src/bin/e_fm_prop.c:480 src/bin/e_import_config_dialog.c:477 +#: src/bin/e_widget_fsel.c:348 +#: src/modules/conf_theme/e_int_config_transitions.c:218 +#: src/modules/conf_theme/e_int_config_theme.c:1414 +#: src/modules/conf_theme/e_int_config_xsettings.c:513 +msgid "Preview" +msgstr "Преглед" + +#: src/bin/e_fm_prop.c:527 src/modules/comp/e_mod_config.c:1114 +#: src/modules/everything/evry_config.c:426 +msgid "Default" +msgstr "Подразумевано" + +#: src/bin/e_fm_prop.c:530 +msgid "Thumbnail" +msgstr "Умањени преглед" + +#: src/bin/e_fm_prop.c:533 +#: src/modules/conf_display/e_int_config_desklock.c:364 +msgid "Custom" +msgstr "Произвољно" + +#: src/bin/e_fm_prop.c:543 +msgid "Use this icon for all files of this type" +msgstr "Користи ову иконицу за све датотеке ове врсте" + +#: src/bin/e_fm_prop.c:551 +msgid "Link Information" +msgstr "Подаци о вези" + +#: src/bin/e_fm_prop.c:558 +msgid "This link is broken." +msgstr "Ова веза је неисправна." + +#: src/bin/e_fm_prop.c:613 +msgid "Select an Image" +msgstr "Изаберите слику" + +#: src/bin/e_gadcon.c:1402 +msgid "Gadget error" +msgstr "Грешка справице" + +#: src/bin/e_gadcon.c:1402 +#, c-format +msgid "%s does not support disabling autoscrolling" +msgstr "%s не подржава онемогућавање самосталног премицања" + +#: src/bin/e_gadcon.c:1676 src/bin/e_int_border_menu.c:140 +msgid "Move to" +msgstr "Премести у" + +#: src/bin/e_gadcon.c:1744 +msgid "Automatically scroll contents" +msgstr "Самостално премичи садржај" + +#: src/bin/e_gadcon.c:1757 src/modules/gadman/e_mod_gadman.c:1000 +msgid "Plain" +msgstr "једноставан" + +#: src/bin/e_gadcon.c:1770 src/modules/gadman/e_mod_gadman.c:1008 +msgid "Inset" +msgstr "Уметак" + +#: src/bin/e_gadcon.c:1783 src/bin/e_int_config_modules.c:53 +#: src/modules/comp/e_mod_main.c:41 src/modules/conf_theme/e_mod_main.c:229 +#: src/modules/dropshadow/e_mod_main.c:88 src/modules/physics/e_mod_main.c:45 +msgid "Look" +msgstr "Изглед" + +#: src/bin/e_gadcon.c:1795 src/bin/e_widget_config_list.c:66 +#: src/modules/conf_applications/e_int_config_apps.c:270 +#: src/modules/conf_applications/e_int_config_apps.c:291 +#: src/modules/conf_applications/e_int_config_apps.c:311 +#: src/modules/conf_applications/e_int_config_apps_personal.c:97 +#: src/modules/gadman/e_mod_gadman.c:1056 src/modules/ibar/e_mod_main.c:877 +#: src/modules/xkbswitch/e_mod_config.c:267 +msgid "Remove" +msgstr "Уклони" + +#: src/bin/e_gadcon.c:2435 +msgid "Stop moving" +msgstr "Прекини померање" + +#: src/bin/e_gadcon.c:3086 +msgid "Insufficent gadcon support" +msgstr "Недовољна подршка програма gadcon" + +#: src/bin/e_gadcon.c:3087 +#, c-format +msgid "Module %s needs to support %s" +msgstr "Јединица %s је потребна за подршку %s" + +#: src/bin/e_grab_dialog.c:3 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:4 +msgid "" +"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort." +msgstr "" +"Молим, притисните ниску дугмади,<br><br>или <hilight>Излаз</hilight> за " +"одустанак." + +#: src/bin/e_grab_dialog.c:5 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:7 +msgid "" +"Please hold any modifier you want<br>and press any button on your mouse,<br> " +"or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</" +"highlight> to abort." +msgstr "" +"Молим, држите тастер измене који желите<br>и притисните било који тастер " +"миша,<br>или завртите точкић за доделу пречице миша.<br>Притисните " +"<hilight>Излаз</highlight> за одустајање." + +#: src/bin/e_grab_dialog.c:128 +msgid "Mouse Binding Sequence" +msgstr "Ниска пречице миша" + +#: src/bin/e_grab_dialog.c:135 +msgid "Key Binding Sequence" +msgstr "Ниска пречице тастера" + +#: src/bin/e_hints.c:152 +msgid "" +"A previous instance of Enlightenment is still active\n" +"on this screen. Aborting startup.\n" +msgstr "" +"Претходни примерак Просвећења је још увек покренут\n" +"на овом екрану. Обустављам покретање.\n" + +#: src/bin/e_import_dialog.c:74 src/bin/e_import_dialog.c:84 +#: src/bin/e_import_config_dialog.c:352 src/bin/e_import_config_dialog.c:362 +msgid "Import Error" +msgstr "Грешке при увозу" + +#: src/bin/e_import_dialog.c:75 src/bin/e_import_config_dialog.c:353 +msgid "Enlightenment was unable to import the image<br>due to a copy error." +msgstr "Просвећење није успело да увезе слику<br>због грешке при умножавању." + +#: src/bin/e_import_dialog.c:85 src/bin/e_import_config_dialog.c:363 +msgid "" +"Enlightenment was unable to import the image.<br><br>Are you sure this is a " +"valid image?" +msgstr "" +"Просвећење није успело да увезе слику.<br><br>Да ли сте сигурни да је то " +"исправна слика?" + +#: src/bin/e_import_dialog.c:163 +msgid "Select a Picture..." +msgstr "Изаберите слику..." + +#: src/bin/e_import_dialog.c:195 +msgid "Use" +msgstr "Користи" + +#: src/bin/e_import_config_dialog.c:295 +msgid "Picture Import Error" +msgstr "Грешка при увозу слике" + +#: src/bin/e_import_config_dialog.c:296 +msgid "" +"Enlightenment was unable to import the picture<br>due to conversion errors." +msgstr "Просвећење није успело да увезе слику<br>због грешака при претварању." + +#: src/bin/e_import_config_dialog.c:459 +msgid "Import Settings..." +msgstr "Увези поставке..." + +#: src/bin/e_import_config_dialog.c:491 +msgid "Fill and Stretch Options" +msgstr "Могућности попуне и развлачења" + +#: src/bin/e_import_config_dialog.c:493 +msgid "Stretch" +msgstr "Развучено" + +#: src/bin/e_import_config_dialog.c:497 src/bin/e_int_border_prop.c:236 +#, c-format +msgid "Center" +msgstr "По средини" + +#: src/bin/e_import_config_dialog.c:501 +msgid "Tile" +msgstr "Поплочано" + +#: src/bin/e_import_config_dialog.c:506 +msgid "Within" +msgstr "Унутар" + +#: src/bin/e_import_config_dialog.c:510 +msgid "Fill" +msgstr "Попуна" + +#: src/bin/e_import_config_dialog.c:514 +msgid "Pan" +msgstr "Померај" + +#: src/bin/e_import_config_dialog.c:522 +msgid "File Quality" +msgstr "Каквоћа датотеке" + +#: src/bin/e_import_config_dialog.c:523 +msgid "Use original file" +msgstr "Користи изворну датотеку" + +#: src/bin/e_import_config_dialog.c:525 +#, c-format +msgid "%3.0f%%" +msgstr "%3.0f%%" + +#: src/bin/e_import_config_dialog.c:530 +msgid "Fill Color" +msgstr "Боја испуњавања" + +#: src/bin/e_int_border_locks.c:66 +msgid "Window Locks" +msgstr "Закључавање прозора" + +#: src/bin/e_int_border_locks.c:284 +msgid "Generic Locks" +msgstr "Општа закључавања" + +#: src/bin/e_int_border_locks.c:285 +msgid "Prevent this window from moving on its own" +msgstr "Спречите овај прозор да се самостално креће" + +#: src/bin/e_int_border_locks.c:287 +msgid "Prevent this window from being changed by me" +msgstr "Спречи ме да мењам овај прозор" + +#: src/bin/e_int_border_locks.c:289 +msgid "Prevent this window from being closed" +msgstr "Спречите затварање овог прозора" + +#: src/bin/e_int_border_locks.c:291 +msgid "Do not allow the border to change on this window" +msgstr "Не дозволи мењање оквира овог прозора" + +#: src/bin/e_int_border_locks.c:294 +msgid "Remember the locks for this window" +msgstr "Запамти закључавања овог прозора" + +#: src/bin/e_int_border_locks.c:308 src/bin/e_int_border_locks.c:327 +msgid "Prevent Changes In:" +msgstr "Спречи измене у:" + +#: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328 +#: src/bin/e_int_border_remember.c:692 src/bin/e_int_shelf_config.c:194 +msgid "Position" +msgstr "Положај" + +#: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330 +#: src/bin/e_int_border_remember.c:695 src/bin/e_int_shelf_config.c:205 +#: src/modules/conf_interaction/e_int_config_mouse.c:174 +#: src/modules/conf_theme/e_int_config_fonts.c:441 +#: src/modules/conf_theme/e_int_config_fonts.c:660 +msgid "Size" +msgstr "Величина" + +#: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332 +#: src/bin/e_int_border_menu.c:697 src/bin/e_int_border_prop.c:501 +#: src/bin/e_int_border_remember.c:698 src/bin/e_int_shelf_config.c:152 +#: src/modules/conf_window_manipulation/e_int_config_focus.c:298 +msgid "Stacking" +msgstr "Гомилање" + +#: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334 +msgid "Iconified state" +msgstr "Умањено стање" + +#: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336 +#: src/bin/e_int_border_remember.c:710 +msgid "Stickiness" +msgstr "Лепљивост" + +#: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338 +#: src/bin/e_int_border_remember.c:716 +msgid "Shaded state" +msgstr "Смотаност" + +#: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340 +msgid "Maximized state" +msgstr "Увећаност" + +#: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342 +#: src/bin/e_int_border_remember.c:719 +msgid "Fullscreen state" +msgstr "Стање преко целог екрана" + +#: src/bin/e_int_border_locks.c:325 +msgid "Program Locks" +msgstr "Закључавање програма" + +#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:704 +msgid "Border style" +msgstr "Начин оквира" + +#: src/bin/e_int_border_locks.c:346 +msgid "User Locks" +msgstr "Корисничка закључавања" + +#: src/bin/e_int_border_locks.c:348 +msgid "Prevent:" +msgstr "Спречи:" + +#: src/bin/e_int_border_locks.c:349 +msgid "Closing the window" +msgstr "Затварање прозора" + +#: src/bin/e_int_border_locks.c:351 +msgid "Logging out while this window is open" +msgstr "Одјављивање док је овај прозор отворен" + +#: src/bin/e_int_border_locks.c:353 +msgid "Behavior Locks" +msgstr "Закључавање понашања" + +#: src/bin/e_int_border_locks.c:357 +msgid "Remember these Locks" +msgstr "Запамти ова закључавања" + +#: src/bin/e_int_border_menu.c:127 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:332 +msgid "Window" +msgstr "Прозор" + +#: src/bin/e_int_border_menu.c:149 src/bin/e_int_border_menu.c:1012 +msgid "Always on Top" +msgstr "Увек на врху" + +#: src/bin/e_int_border_menu.c:164 src/bin/e_int_border_prop.c:506 +msgid "Sticky" +msgstr "Лепљив" + +#: src/bin/e_int_border_menu.c:178 +msgid "Shade" +msgstr "Смотај" + +#: src/bin/e_int_border_menu.c:371 src/bin/e_int_border_prop.c:511 +#: src/modules/comp/e_mod_config.c:880 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:218 +msgid "Fullscreen" +msgstr "Преко целог екрана" + +#: src/bin/e_int_border_menu.c:439 +msgid "Unmaximize" +msgstr "Поништи увећање" + +#: src/bin/e_int_border_menu.c:581 +msgid "Edit Icon" +msgstr "Измени икону" + +#: src/bin/e_int_border_menu.c:589 +msgid "Create Icon" +msgstr "Направи икону" + +#: src/bin/e_int_border_menu.c:597 +msgid "Add to Favorites Menu" +msgstr "Додај у изборник омиљених" + +#: src/bin/e_int_border_menu.c:602 +msgid "Add to IBar" +msgstr "Додај у Tраку" + +#: src/bin/e_int_border_menu.c:610 +msgid "Create Keyboard Shortcut" +msgstr "Направи пречицу тастатуре" + +#: src/bin/e_int_border_menu.c:656 +#: src/modules/everything/evry_plug_windows.c:438 +msgid "Iconify" +msgstr "Умањи" + +#: src/bin/e_int_border_menu.c:706 +msgid "Skip" +msgstr "Прескочи" + +#: src/bin/e_int_border_menu.c:716 src/modules/conf_theme/e_mod_main.c:226 +msgid "Border" +msgstr "Оквир" + +#: src/bin/e_int_border_menu.c:728 src/bin/e_int_border_remember.c:605 +#: src/bin/e_int_border_remember.c:701 +msgid "Locks" +msgstr "Закључавања" + +#: src/bin/e_int_border_menu.c:736 +#: src/modules/conf_dialogs/e_int_config_dialogs.c:128 +msgid "Remember" +msgstr "Запамти" + +#: src/bin/e_int_border_menu.c:758 +msgid "ICCCM/NetWM" +msgstr "ИЦЦЦМ/НетВМ" + +#: src/bin/e_int_border_menu.c:932 +#, c-format +msgid "Screen %d" +msgstr "Екран %d" + +#: src/bin/e_int_border_menu.c:1023 src/bin/e_int_border_prop.c:157 +#: src/bin/e_int_border_prop.c:179 src/modules/comp/e_mod_config.c:458 +#: src/modules/comp/e_mod_config.c:763 +#: src/modules/conf_theme/e_int_config_fonts.c:100 +#: src/modules/conf_theme/e_int_config_fonts.c:264 +#: src/modules/notification/e_mod_config.c:98 +#, c-format +msgid "Normal" +msgstr "обична" + +#: src/bin/e_int_border_menu.c:1034 +msgid "Always Below" +msgstr "Увек испод" + +#: src/bin/e_int_border_menu.c:1078 +msgid "Pin to Desktop" +msgstr "Залепи на радну површ" + +#: src/bin/e_int_border_menu.c:1089 +msgid "Unpin from Desktop" +msgstr "Откачи од радне површи" + +#: src/bin/e_int_border_menu.c:1179 +msgid "Select Border Style" +msgstr "Одабери изглед оквира" + +#: src/bin/e_int_border_menu.c:1191 +msgid "Use Enlightenment Default Icon Preference" +msgstr "Користи подразумеване поставке икона Просвећења" + +#: src/bin/e_int_border_menu.c:1199 +msgid "Use Application Provided Icon" +msgstr "Користи икону програма" + +#: src/bin/e_int_border_menu.c:1207 +msgid "Use User Defined Icon" +msgstr "Користи кориснички одређене иконе" + +#: src/bin/e_int_border_menu.c:1216 src/bin/e_int_border_remember.c:734 +msgid "Offer Resistance" +msgstr "Понуди одбојност" + +#: src/bin/e_int_border_menu.c:1277 +msgid "Window List" +msgstr "Списак прозора" + +#: src/bin/e_int_border_menu.c:1287 src/modules/pager/e_mod_main.c:265 +#: src/modules/pager/e_mod_main.c:2917 src/modules/pager/e_mod_main.c:2924 +#: src/modules/pager/e_mod_main.c:2931 src/modules/pager/e_mod_main.c:2933 +#: src/modules/pager/e_mod_main.c:2935 src/modules/pager/e_mod_main.c:2937 +#: src/modules/pager/e_mod_main.c:2939 src/modules/pager/e_mod_main.c:2941 +msgid "Pager" +msgstr "Страничник" + +#: src/bin/e_int_border_menu.c:1297 src/modules/wizard/page_180.c:24 +msgid "Taskbar" +msgstr "Трака задатака" + +#: src/bin/e_int_border_prop.c:110 src/bin/e_int_border_prop.c:117 +#: src/bin/e_int_border_prop.c:124 src/bin/e_moveresize.c:96 +#: src/bin/e_moveresize.c:153 src/bin/e_widget_filepreview.c:82 +#, c-format +msgid "%i×%i" +msgstr "%i×%i" + +#: src/bin/e_int_border_prop.c:131 +#, c-format +msgid "%i,%i" +msgstr "%i,%i" + +#: src/bin/e_int_border_prop.c:140 +#, c-format +msgid "%1.3f" +msgstr "%1.3f" + +#: src/bin/e_int_border_prop.c:143 +#, c-format +msgid "%1.3f–%1.3f" +msgstr "%1.3f–%1.3f" + +#: src/bin/e_int_border_prop.c:153 src/bin/e_int_border_prop.c:175 +#, c-format +msgid "Withdrawn" +msgstr "Повучен" + +#: src/bin/e_int_border_prop.c:161 src/bin/e_int_border_prop.c:183 +#, c-format +msgid "Iconic" +msgstr "Умањено" + +#: src/bin/e_int_border_prop.c:216 +#, c-format +msgid "Forget/Unmap" +msgstr "Заборави/одмапирај" + +#: src/bin/e_int_border_prop.c:220 +#, c-format +msgid "Northwest" +msgstr "Северозападни" + +#: src/bin/e_int_border_prop.c:224 +#, c-format +msgid "North" +msgstr "Север" + +#: src/bin/e_int_border_prop.c:228 +#, c-format +msgid "Northeast" +msgstr "Североисточни" + +#: src/bin/e_int_border_prop.c:232 +#, c-format +msgid "West" +msgstr "Запад" + +#: src/bin/e_int_border_prop.c:240 +#, c-format +msgid "East" +msgstr "Исток" + +#: src/bin/e_int_border_prop.c:244 +#, c-format +msgid "Southwest" +msgstr "Југозападни" + +#: src/bin/e_int_border_prop.c:248 +#, c-format +msgid "South" +msgstr "Југ" + +#: src/bin/e_int_border_prop.c:252 +#, c-format +msgid "Southeast" +msgstr "Југоисточни" + +#: src/bin/e_int_border_prop.c:256 +#, c-format +msgid "Static" +msgstr "Статично" + +#: src/bin/e_int_border_prop.c:298 src/modules/clock/e_mod_config.c:103 +#: src/modules/clock/e_mod_config.c:141 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:360 +#: src/modules/conf_performance/e_int_config_powermanagement.c:196 +#: src/modules/conf_theme/e_int_config_fonts.c:689 +#: src/modules/conf_theme/e_int_config_transitions.c:199 +#: src/modules/conf_theme/e_int_config_transitions.c:257 +#: src/modules/conf_theme/e_int_config_transitions.c:289 +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:99 +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:112 +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:126 +msgid "None" +msgstr "без" + +#: src/bin/e_int_border_prop.c:302 +msgid "Above" +msgstr "Изнад" + +#: src/bin/e_int_border_prop.c:306 +msgid "Below" +msgstr "Испод" + +#: src/bin/e_int_border_prop.c:385 +msgid "ICCCM Properties" +msgstr "ИЦЦЦМ својства" + +#: src/bin/e_int_border_prop.c:387 +msgid "NetWM" +msgstr "НетВМ" + +#: src/bin/e_int_border_prop.c:393 +msgid "NetWM Properties" +msgstr "НетВМ својства" + +#: src/bin/e_int_border_prop.c:395 +msgid "ICCCM" +msgstr "ИЦЦЦМ" + +#: src/bin/e_int_border_prop.c:444 src/bin/e_int_border_remember.c:651 +#: src/modules/comp/e_mod_config.c:392 src/modules/comp/e_mod_config.c:698 +#: src/modules/wizard/page_050.c:95 +msgid "Title" +msgstr "Наслов" + +#: src/bin/e_int_border_prop.c:446 src/modules/comp/e_mod_config.c:719 +msgid "Class" +msgstr "Разред" + +#: src/bin/e_int_border_prop.c:447 src/bin/e_int_border_prop.c:500 +msgid "Icon Name" +msgstr "Назив иконе" + +#: src/bin/e_int_border_prop.c:448 +msgid "Machine" +msgstr "Рачунар" + +#: src/bin/e_int_border_prop.c:449 src/modules/comp/e_mod_config.c:728 +msgid "Role" +msgstr "Улога" + +#: src/bin/e_int_border_prop.c:453 +msgid "Minimum Size" +msgstr "Најмања величина" + +#: src/bin/e_int_border_prop.c:454 +msgid "Maximum Size" +msgstr "Највећа величина" + +#: src/bin/e_int_border_prop.c:455 +msgid "Base Size" +msgstr "Основна величина" + +#: src/bin/e_int_border_prop.c:456 +msgid "Resize Steps" +msgstr "Кораци промене величине" + +#: src/bin/e_int_border_prop.c:457 src/modules/wizard/page_050.c:128 +msgid "Sizing" +msgstr "Величина" + +#: src/bin/e_int_border_prop.c:460 +msgid "Aspect Ratio" +msgstr "Размера" + +#: src/bin/e_int_border_prop.c:461 +msgid "Initial State" +msgstr "Почетно стање" + +#: src/bin/e_int_border_prop.c:462 +msgid "State" +msgstr "Стање" + +#: src/bin/e_int_border_prop.c:463 +msgid "Window ID" +msgstr "ЛБ прозора" + +#: src/bin/e_int_border_prop.c:464 +msgid "Window Group" +msgstr "Скупина прозора" + +#: src/bin/e_int_border_prop.c:465 +msgid "Transient For" +msgstr "Несталност за" + +#: src/bin/e_int_border_prop.c:466 +msgid "Client Leader" +msgstr "Клијент вођа" + +#: src/bin/e_int_border_prop.c:467 +msgid "Gravity" +msgstr "Привлачење" + +#: src/bin/e_int_border_prop.c:469 +msgid "States" +msgstr "Стања" + +#: src/bin/e_int_border_prop.c:472 +msgid "Take Focus" +msgstr "Преузми у жижу" + +#: src/bin/e_int_border_prop.c:473 src/modules/comp/e_mod_config.c:831 +msgid "Accepts Focus" +msgstr "Прихвати жижу" + +#: src/bin/e_int_border_prop.c:474 +msgid "Urgent" +msgstr "Важно" + +#: src/bin/e_int_border_prop.c:475 +msgid "Request Delete" +msgstr "Захтевај брисање" + +#: src/bin/e_int_border_prop.c:476 +msgid "Request Position" +msgstr "Захтевај положај" + +#: src/bin/e_int_border_prop.c:477 src/bin/e_int_border_prop.c:512 +#: src/bin/e_int_config_modules.c:58 src/bin/e_int_menus.c:271 +#: src/bin/e_shelf.c:2441 src/modules/backlight/e_mod_main.c:309 +#: src/modules/battery/e_mod_main.c:194 src/modules/clock/e_mod_main.c:361 +#: src/modules/clock/e_mod_main.c:604 src/modules/conf/e_conf.c:136 +#: src/modules/conf/e_conf.c:146 src/modules/conf/e_mod_main.c:101 +#: src/modules/conf_dialogs/e_mod_main.c:17 +#: src/modules/conf_interaction/e_int_config_mouse.c:170 +#: src/modules/conf_shelves/e_int_config_shelf.c:149 +#: src/modules/everything/evry_gadget.c:511 +#: src/modules/everything/evry_gadget.c:695 +#: src/modules/everything/evry_plug_settings.c:183 +#: src/modules/ibar/e_mod_main.c:380 src/modules/ibar/e_mod_main.c:865 +#: src/modules/ibox/e_mod_main.c:302 src/modules/ibox/e_mod_main.c:678 +#: src/modules/pager/e_mod_main.c:877 src/modules/temperature/e_mod_main.c:230 +#: src/modules/mixer/e_mod_main.c:776 src/modules/connman/e_mod_main.c:459 +#: src/modules/tasks/e_mod_main.c:728 src/modules/xkbswitch/e_mod_main.c:321 +#: src/modules/xkbswitch/e_mod_main.c:362 +msgid "Settings" +msgstr "Подешавања" + +#: src/bin/e_int_border_prop.c:505 src/modules/comp/e_mod_config.c:893 +msgid "Modal" +msgstr "Променљив" + +#: src/bin/e_int_border_prop.c:507 +msgid "Shaded" +msgstr "Смотан" + +#: src/bin/e_int_border_prop.c:508 src/bin/e_int_border_remember.c:731 +#: src/modules/quickaccess/e_mod_config.c:342 +msgid "Skip Taskbar" +msgstr "Прескочи траку списка процеса" + +#: src/bin/e_int_border_prop.c:509 src/bin/e_int_border_remember.c:728 +#: src/modules/quickaccess/e_mod_config.c:345 +msgid "Skip Pager" +msgstr "Не приказуј у страничнику" + +#: src/bin/e_int_border_prop.c:510 src/modules/comp/e_mod_config.c:280 +msgid "Hidden" +msgstr "Сакривен" + +#: src/bin/e_int_border_remember.c:89 +msgid "Window Remember" +msgstr "Памти прозор" + +#: src/bin/e_int_border_remember.c:301 +msgid "Window properties are not a unique match" +msgstr "Поставке прозора се не слажу јединствено" + +#: src/bin/e_int_border_remember.c:304 +msgid "" +"You are trying to ask Enlightenment to remember to apply<br>properties (such " +"as size, location, border style etc.) to<br>a window that <hilight>does not " +"have unique properties</hilight>.<br><br>This means it shares Name/Class, " +"Transience, Role etc. properties<br>with more than 1 other window on the " +"screen and remembering<br>properties for this window will apply to all other " +"windows<br>that match these properties.<br><br>This is just a warning in " +"case you did not intend this to happen.<br>If you did, simply press " +"<hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your " +"settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not " +"sure and nothing will be affected." +msgstr "" +"Покушавате тражити од Просвећења да запамти примену<br>особина (као што су " +"величина, место, изглед оквира, итд.) <br>на прозор који <hilight>нема " +"јединствене особине<hilight><br><br>То значи да он дели особине назива/" +"разреда, несталности, улоге,итд.<br>са више од једним другим прозором на " +"екрану и памћењем<br>особина за овај прозор ће се применити за све остале " +"прозоре<br>којима одговарају ова својства.<br><br>Ово је само упозорење за " +"случај да нисте намеравали да се то догоди.<hilight>Примени</hilight> или " +"<hilight>У реду</hilight>дугме<br>,и ваше поставке ће бити сачуване." +"Притисните<hilight>Откажи</hilight>ако <br>нисте сигурни и ништа се неће " +"променити." + +#: src/bin/e_int_border_remember.c:498 +msgid "No match properties set" +msgstr "Нису дате поставке поклапања" + +#: src/bin/e_int_border_remember.c:501 +msgid "" +"You are trying to ask Enlightenment to remember to apply<br>properties (such " +"as size, location, border style etc.) to<br>a window <hilight>without " +"specifying how to remember it</hilight>.<br><br>You must specify at least 1 " +"way of remembering this window." +msgstr "" +"Покушавате да затражите од Просвећења да запамти примену<br>поставки (као " +"што су величина, место, изглед оквира,итд.) на<br>прозор<hilight>без одредби " +"како да их запамти</hilight>.<br><br>Морате одредити најмање 1 особину за " +"памћење овог прозора." + +#: src/bin/e_int_border_remember.c:601 +msgid "Nothing" +msgstr "Ништа" + +#: src/bin/e_int_border_remember.c:603 +msgid "Size and Position" +msgstr "Величина и положај" + +#: src/bin/e_int_border_remember.c:607 +msgid "Size, Position and Locks" +msgstr "Величина, положај и закључавања" + +#: src/bin/e_int_border_remember.c:609 src/modules/conf/e_mod_main.c:252 +#: src/modules/everything/evry_gadget.c:644 +#: src/modules/everything/evry_plug_aggregator.c:313 +#: src/modules/everything/evry_view.c:1618 src/modules/shot/e_mod_main.c:749 +msgid "All" +msgstr "Све" + +#: src/bin/e_int_border_remember.c:627 +msgid "Window name" +msgstr "Име прозора" + +#: src/bin/e_int_border_remember.c:639 +msgid "Window class" +msgstr "Разред прозора" + +#: src/bin/e_int_border_remember.c:663 +msgid "Window Role" +msgstr "Улога прозора" + +#: src/bin/e_int_border_remember.c:675 +msgid "Window type" +msgstr "Врста прозора" + +#: src/bin/e_int_border_remember.c:683 +msgid "wildcard matches are allowed" +msgstr "поклапање џокер знакова је дозвољено" + +#: src/bin/e_int_border_remember.c:685 +msgid "Transience" +msgstr "Несталност" + +#: src/bin/e_int_border_remember.c:688 +msgid "Identifiers" +msgstr "Показатељи" + +#: src/bin/e_int_border_remember.c:707 +msgid "Icon Preference" +msgstr "Поставке икона" + +#: src/bin/e_int_border_remember.c:713 +msgid "Virtual Desktop" +msgstr "Нестварна радна површ" + +#: src/bin/e_int_border_remember.c:722 +msgid "Current Screen" +msgstr "Садашњи екран" + +#: src/bin/e_int_border_remember.c:725 +msgid "Skip Window List" +msgstr "Прескочи списак прозора" + +#: src/bin/e_int_border_remember.c:737 +msgid "Application file or name (.desktop)" +msgstr "Датотека или назив програма (.desktop)" + +#: src/bin/e_int_border_remember.c:745 +msgid "Match only one window" +msgstr "Пореди само са једним прозором" + +#: src/bin/e_int_border_remember.c:749 +msgid "Always focus on start" +msgstr "Увек у жижи на покретању" + +#: src/bin/e_int_border_remember.c:753 +msgid "Keep current properties" +msgstr "Задржавај садашње поставке" + +#: src/bin/e_int_border_remember.c:759 +msgid "Start this program on login" +msgstr "Покрени овај програм при пријави" + +#: src/bin/e_int_config_modules.c:51 +msgid "Utilities" +msgstr "Алатке" + +#: src/bin/e_int_config_modules.c:54 +#: src/modules/everything/evry_plug_files.c:1347 +#: src/modules/everything/evry_plug_files.c:1360 +#: src/modules/everything/evry_plug_files.c:1578 +#: src/modules/fileman/e_mod_main.c:39 +msgid "Files" +msgstr "Датотеке" + +#: src/bin/e_int_config_modules.c:55 src/modules/everything/e_mod_main.c:58 +#: src/modules/quickaccess/e_mod_main.c:35 +msgid "Launcher" +msgstr "Покретач" + +#: src/bin/e_int_config_modules.c:56 +#: src/modules/conf_applications/e_int_config_defapps.c:330 +#: src/modules/conf_theme/e_int_config_fonts.c:57 +msgid "Core" +msgstr "Језгро" + +#: src/bin/e_int_config_modules.c:57 +msgid "Mobile" +msgstr "Мобилни" + +#: src/bin/e_int_config_modules.c:98 +msgid "Module Settings" +msgstr "Поставке јединице" + +#: src/bin/e_int_config_modules.c:200 +msgid "Load" +msgstr "Учитај" + +#: src/bin/e_int_config_modules.c:205 src/bin/e_module.c:533 +msgid "Unload" +msgstr "Избаци из меморије" + +#: src/bin/e_int_config_modules.c:339 src/bin/e_int_config_modules.c:626 +msgid "No modules selected." +msgstr "Нема изабраних јединица." + +#: src/bin/e_int_config_modules.c:624 +msgid "More than one module selected." +msgstr "Више од једне јединице је изабрано." + +#: src/bin/e_int_gadcon_config.c:699 src/bin/e_int_gadcon_config.c:757 +msgid "Remove Gadget" +msgstr "Уклони справицу" + +#: src/bin/e_int_gadcon_config.c:704 +msgid "Loaded Gadgets" +msgstr "Учитај справице" + +#: src/bin/e_int_gadcon_config.c:719 src/bin/e_int_gadcon_config.c:752 +msgid "Add Gadget" +msgstr "Додај справицу" + +#: src/bin/e_int_gadcon_config.c:724 +msgid "Available Gadgets" +msgstr "Доступне справице" + +#: src/bin/e_int_gadcon_config.c:786 +msgid "Shelf Contents" +msgstr "Садржај полице" + +#: src/bin/e_int_gadcon_config.c:792 +msgid "Toolbar Contents" +msgstr "Садржај траке алата" + +#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:256 +msgid "Toolbar Settings" +msgstr "Поставке траке са алатима" + +#: src/bin/e_int_toolbar_config.c:81 +msgid "Layout" +msgstr "Распоред" + +#: src/bin/e_intl.c:353 +msgid "Input Method Error" +msgstr "Грешка оквира начина уноса" + +#: src/bin/e_intl.c:354 +msgid "" +"Error starting the input method executable<br><br>please make sure that your " +"input<br>method configuration is correct and<br>that your " +"configuration's<br>executable is in your PATH<br>" +msgstr "" +"Грешка при покретању извршне датотеке начина уноса,<br><br>молим, проверите " +"да ли су ваше поставке<br>оквира начина уноса исправне, и<br>да је ваша " +"извршна датотека на вашој путањи (PATH)<br>" + +#: src/bin/e_int_menus.c:134 src/modules/syscon/e_int_config_syscon.c:146 +msgid "Main" +msgstr "Главни" + +#: src/bin/e_int_menus.c:157 +#: src/modules/conf_applications/e_int_config_apps.c:69 +#: src/modules/conf_applications/e_mod_main.c:29 +msgid "Favorite Applications" +msgstr "Омиљени програми" + +#: src/bin/e_int_menus.c:168 +#: src/modules/conf_applications/e_int_config_apps.c:295 +#: src/modules/conf_menus/e_int_config_menus.c:260 +#: src/modules/conf_menus/e_int_config_menus.c:283 +#: src/modules/conf_theme/e_int_config_fonts.c:58 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:213 +#: src/modules/everything/evry_plug_apps.c:1140 +#: src/modules/everything/evry_plug_apps.c:1156 +#: src/modules/everything/evry_plug_apps.c:1409 +msgid "Applications" +msgstr "Програми" + +#: src/bin/e_int_menus.c:192 src/bin/e_int_menus.c:1285 +#: src/modules/conf_window_manipulation/e_mod_main.c:17 +#: src/modules/conf_window_remembers/e_mod_main.c:14 +#: src/modules/everything/evry_plug_windows.c:425 +#: src/modules/winlist/e_mod_main.c:27 src/modules/tiling/e_mod_tiling.c:4144 +msgid "Windows" +msgstr "Прозори" + +#: src/bin/e_int_menus.c:202 src/bin/e_int_menus.c:1340 +msgid "Lost Windows" +msgstr "Изгубљени прозори" + +#: src/bin/e_int_menus.c:228 +msgid "About" +msgstr "О програму" + +#: src/bin/e_int_menus.c:233 src/bin/e_theme_about.c:21 +msgid "About Theme" +msgstr "О теми" + +#: src/bin/e_int_menus.c:324 +msgid "Virtual" +msgstr "нестварна" + +#: src/bin/e_int_menus.c:331 src/modules/conf_shelves/e_mod_main.c:23 +#: src/modules/conf_shelves/e_mod_main.c:27 +#: src/modules/conf_shelves/e_mod_main.c:74 +#: src/modules/physics/e_mod_config.c:132 +msgid "Shelves" +msgstr "Полице" + +#: src/bin/e_int_menus.c:340 +msgid "Show/Hide All Windows" +msgstr "Прикажи/сакриј све прозоре" + +#: src/bin/e_int_menus.c:697 +msgid "No applications" +msgstr "Нема програма" + +#: src/bin/e_int_menus.c:914 +msgid "Set Virtual Desktops" +msgstr "Постави нестварне радне површи" + +#: src/bin/e_int_menus.c:1291 src/bin/e_int_menus.c:1484 +msgid "No windows" +msgstr "Без прозора" + +#: src/bin/e_int_menus.c:1397 src/bin/e_int_menus.c:1497 +msgid "Untitled window" +msgstr "Неименовани прозор" + +#: src/bin/e_int_menus.c:1597 src/bin/e_shelf.c:1636 +#: src/modules/conf_shelves/e_int_config_shelf.c:193 +#, c-format +msgid "Shelf %s" +msgstr "Полица %s" + +#: src/bin/e_int_menus.c:1665 +msgid "Add a Shelf" +msgstr "Додај полицу" + +#: src/bin/e_int_menus.c:1672 +msgid "Delete a Shelf" +msgstr "Избриши полицу" + +#: src/bin/e_int_shelf_config.c:44 +#: src/modules/conf_shelves/e_int_config_shelf.c:55 +msgid "Shelf Settings" +msgstr "Поставке полице" + +#: src/bin/e_int_shelf_config.c:143 +msgid "Above Everything" +msgstr "Изнад свега" + +#: src/bin/e_int_shelf_config.c:145 +msgid "Below Windows" +msgstr "Испод прозора" + +#: src/bin/e_int_shelf_config.c:147 +msgid "Below Everything" +msgstr "Испод свега" + +#: src/bin/e_int_shelf_config.c:149 +msgid "Allow windows to overlap the shelf" +msgstr "Дозволи прозорима да прекривају полицу" + +#: src/bin/e_int_shelf_config.c:199 +#, c-format +msgid "Height (%3.0f pixels)" +msgstr "Висина (%3.0f тачака)" + +#: src/bin/e_int_shelf_config.c:202 +msgid "Shrink to Content Width" +msgstr "Умањи на ширину садржаја" + +#: src/bin/e_int_shelf_config.c:213 src/modules/comp/e_mod_config.c:908 +#: src/modules/conf_theme/e_int_config_fonts.c:651 +msgid "Style" +msgstr "Начин" + +#: src/bin/e_int_shelf_config.c:219 +msgid "Auto-hide the shelf" +msgstr "Самостално скривај полицу" + +#: src/bin/e_int_shelf_config.c:224 +msgid "Show on mouse in" +msgstr "Прикажи миша у" + +#: src/bin/e_int_shelf_config.c:228 +msgid "Show on mouse click" +msgstr "Прикажи на клик миша" + +#: src/bin/e_int_shelf_config.c:233 +msgid "Hide timeout" +msgstr "Време истека скривања" + +#: src/bin/e_int_shelf_config.c:237 +#: src/modules/notification/e_mod_config.c:107 +#, c-format +msgid "%.1f seconds" +msgstr "%.1f секунди" + +#: src/bin/e_int_shelf_config.c:243 +msgid "Hide duration" +msgstr "Трајање скривања" + +#: src/bin/e_int_shelf_config.c:247 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:888 +#, c-format +msgid "%.2f seconds" +msgstr "%.2f секунди" + +#: src/bin/e_int_shelf_config.c:252 +msgid "Auto Hide" +msgstr "Самостално скривање" + +#: src/bin/e_int_shelf_config.c:258 +msgid "Show on all Desktops" +msgstr "Прикажи на свим радним просторима" + +#: src/bin/e_int_shelf_config.c:260 +msgid "Show on specified Desktops" +msgstr "Прикажи на одређеној радној површи" + +#: src/bin/e_main.c:225 +msgid "Enlightenment cannot initialize Eina!\n" +msgstr "Просвећење није успело да покрене Eina!\n" + +#: src/bin/e_main.c:231 +msgid "Enlightenment could not create a logging domain!\n" +msgstr "Просвећење није успело да направи област пријаве!\n" + +#: src/bin/e_main.c:278 +msgid "Enlightenment cannot initialize Eet!\n" +msgstr "Просвећење није успело да покрене Eet!\n" + +#: src/bin/e_main.c:287 +msgid "Enlightenment cannot initialize Ecore!\n" +msgstr "Просвећење није успело да покрене Ecore!\n" + +#: src/bin/e_main.c:296 +msgid "Enlightenment cannot initialize EIO!\n" +msgstr "Просвећење није успело да покрене EIO!\n" + +#: src/bin/e_main.c:308 +msgid "" +"Enlightenment cannot set up an exit signal handler.\n" +"Perhaps you are out of memory?" +msgstr "" +"Просвећење није успело да подеси руковаоца знака излаза.\n" +"Можда немате више меморије?" + +#: src/bin/e_main.c:315 +msgid "" +"Enlightenment cannot set up a HUP signal handler.\n" +"Perhaps you are out of memory?" +msgstr "" +"Просвећење није успело да подеси руковаоца знака ХУП убице.\n" +"Можда немате више меморије?" + +#: src/bin/e_main.c:322 +msgid "" +"Enlightenment cannot set up a USER signal handler.\n" +"Perhaps you are out of memory?" +msgstr "" +"Просвећење није успело да подеси руковаоца знака корисника.\n" +"Можда немате више меморије?" + +#: src/bin/e_main.c:331 +msgid "Enlightenment cannot initialize Ecore_File!\n" +msgstr "Просвећење није успело покренути Ecore_File!\n" + +#: src/bin/e_main.c:340 +msgid "Enlightenment cannot initialize Ecore_Con!\n" +msgstr "Просвећење није успело покренути систем Ecore_Con!\n" + +#: src/bin/e_main.c:349 +msgid "Enlightenment cannot initialize Ecore_Ipc!\n" +msgstr "Просвећење није успело покренути систем Ecore_Ipc!\n" + +#: src/bin/e_main.c:360 +msgid "Enlightenment cannot initialize Ecore_X!\n" +msgstr "" +"Просвећење није успело подесити\n" +"Ecore_X!\n" + +#: src/bin/e_main.c:372 +msgid "Enlightenment cannot initialize Ecore_IMF!\n" +msgstr "Просвећење није успело покренути Ecore_IMF!\n" + +#: src/bin/e_main.c:382 +msgid "Enlightenment cannot initialize Ecore_Evas!\n" +msgstr "Просвећење није успело покренути Ecore_Evas!\n" + +#: src/bin/e_main.c:392 +msgid "Enlightenment cannot initialize Elementary!\n" +msgstr "Просвећење није успело да покрене Eлементари!\n" + +#: src/bin/e_main.c:403 +msgid "Enlightenment cannot initialize Emotion!\n" +msgstr "Просвећење није успело да покрене Emotion!\n" + +#: src/bin/e_main.c:418 +msgid "" +"Enlightenment found ecore_evas doesn't support the Software X11\n" +"rendering in Evas. Please check your installation of Evas and\n" +"Ecore and check they support the Software X11 rendering engine." +msgstr "" +"Просвећење је открило да ecore_evas не подржава Икс11\n" +"софтверски приказ у Евасу. Молим, проверите вашу уградњу програма\n" +"Евас и Екор и њихову подршку погона Икс11 софтверског приказа." + +#: src/bin/e_main.c:426 +msgid "" +"Enlightenment found ecore_evas doesn't support the Software Buffer\n" +"rendering in Evas. Please check your installation of Evas and\n" +"Ecore and check they support the Software Buffer rendering engine." +msgstr "" +"Просвећење је открило да ecore_evas не подржава Икс11\n" +"софтверско међумеморисање исцртавања у Евасу. Молим, проверите вашу уградњу " +"програма\n" +"Евас и Екор и њихову подршку погона Икс11 софтверског међумеморисања " +"исцртавања." + +#: src/bin/e_main.c:436 +msgid "Enlightenment cannot initialize Edje!\n" +msgstr "Просвећење није успело да покрене Едје!\n" + +#: src/bin/e_main.c:448 +msgid "Enlightenment cannot initialize E_Intl!\n" +msgstr "Просвећење није успело покренути E_Intl!\n" + +#: src/bin/e_main.c:458 +msgid "" +"Enlightenment cannot initialize its emergency alert system.\n" +"Have you set your DISPLAY variable?" +msgstr "" +"Просвећење није успело да покрене свој систем важних узбуна.\n" +"Да ли сте подесили вашу DISPLAY променљиву?" + +#: src/bin/e_main.c:468 +msgid "Enlightenment cannot initialize E_Xinerama!\n" +msgstr "Просвећење није успело покренути E_Xinerama!\n" + +#: src/bin/e_main.c:486 +msgid "" +"Enlightenment cannot create directories in your home directory.\n" +"Perhaps you have no home directory or the disk is full?" +msgstr "" +"Просвећење није успело да направи фасцикле у вашој личној фасцикли.\n" +"Можда немате личну фасциклу, или је диск препун?" + +#: src/bin/e_main.c:496 +msgid "Enlightenment cannot set up its file registry system.\n" +msgstr "Просвећење није успело да постави свој систем завођења датотека.\n" + +#: src/bin/e_main.c:505 +msgid "Enlightenment cannot set up its config system.\n" +msgstr "Просвећење није успело подесити свој систем поставки.\n" + +#: src/bin/e_main.c:518 +msgid "Enlightenment cannot initialize E_Randr!\n" +msgstr "Просвећење није успело покренути E_Randr!\n" + +#: src/bin/e_main.c:527 +msgid "Enlightenment cannot set up its environment.\n" +msgstr "Просвећење није успело подесити своје окружење.\n" + +#: src/bin/e_main.c:543 +msgid "Enlightenment cannot set up its scale system.\n" +msgstr "Просвећење није успело подесити свој систем размеравања.\n" + +#: src/bin/e_main.c:552 +msgid "Enlightenment cannot set up its pointer system.\n" +msgstr "Просвећење није успело подесити свој систем показивача.\n" + +#: src/bin/e_main.c:561 +msgid "" +"Enlightenment cannot set up paths for finding files.\n" +"Perhaps you are out of memory?" +msgstr "" +"Просвећење није успело да подеси путање за налажење датотека.\n" +"Можда немате више меморије?" + +#: src/bin/e_main.c:578 +msgid "Enlightenment cannot set up its font system.\n" +msgstr "Просвећење није успело подесити свој систем словног лика.\n" + +#: src/bin/e_main.c:595 +msgid "Enlightenment cannot set up its theme system.\n" +msgstr "Просвећење није успело да постави свој систем тема.\n" + +#: src/bin/e_main.c:611 +msgid "Enlightenment cannot set up its init screen.\n" +msgstr "Просвећење није успело да постави свој почетни екран.\n" + +#: src/bin/e_main.c:626 +msgid "Starting International Support" +msgstr "Покретање међународне подршке" + +#: src/bin/e_main.c:630 +msgid "Enlightenment cannot set up its intl system.\n" +msgstr "" +"Просвећење није успело подесити свој систем управљања прозорима intl.\n" + +#: src/bin/e_main.c:639 +msgid "" +"Enlightenment cannot initialize the FDO desktop system.\n" +"Perhaps you lack permissions on ~/.cache/efreet or are\n" +"out of memory or disk space?" +msgstr "" +"Просвећење није успело са покрене ФДО систем радне површи.\n" +"Можда немате овлашћења над ~/.cache/efreet или немате\n" +"меморије или слободног простора." + +#: src/bin/e_main.c:664 +msgid "Setup Screens" +msgstr "Подеси екране" + +#: src/bin/e_main.c:668 +msgid "" +"Enlightenment set up window management for all the screens on your system\n" +"failed. Perhaps another window manager is running?\n" +msgstr "" +"Просвећење није успело да подеси управљање прозорима за све екране.\n" +"Можда је покренут други управник прозора?\n" + +#: src/bin/e_main.c:676 +msgid "Setup ACPI" +msgstr "Подеси АЦПИ" + +#: src/bin/e_main.c:683 +msgid "Setup Backlight" +msgstr "Подеси позадинско светло" + +#: src/bin/e_main.c:687 +msgid "Enlightenment cannot configure the backlight.\n" +msgstr "Просвећење није успело подесити позадинско светло.\n" + +#: src/bin/e_main.c:694 +msgid "Setup Screensaver" +msgstr "Подеси чувар екрана" + +#: src/bin/e_main.c:698 +msgid "Enlightenment cannot configure the X screensaver.\n" +msgstr "Просвећење није успело подесити Икс чувара екрана.\n" + +#: src/bin/e_main.c:705 +msgid "Setup DPMS" +msgstr "Подеси ДПМС" + +#: src/bin/e_main.c:709 +msgid "Enlightenment cannot configure the DPMS settings.\n" +msgstr "Просвећење није успело подесити ДПМС поставке.\n" + +#: src/bin/e_main.c:716 +msgid "Setup Powersave Modes" +msgstr "Подеси начин управљања напајањем" + +#: src/bin/e_main.c:720 +msgid "Enlightenment cannot set up its powersave modes.\n" +msgstr "Просвећење не може подесити свој начин штедње енергије.\n" + +#: src/bin/e_main.c:727 +msgid "Setup Desklock" +msgstr "Подесите сат радне површи" + +#: src/bin/e_main.c:731 +msgid "Enlightenment cannot set up its desk locking system.\n" +msgstr "" +"Просвећење није успело да подеси свој систем закључавања радног простора.\n" + +#: src/bin/e_main.c:738 +msgid "Setup Popups" +msgstr "Подеси искакањa" + +#: src/bin/e_main.c:742 +msgid "Enlightenment cannot set up its popup system.\n" +msgstr "Просвећење није успело подесити свој систем искакања.\n" + +#: src/bin/e_main.c:754 +msgid "Setup Message Bus" +msgstr "Подеси сабирницу порука" + +#: src/bin/e_main.c:761 +msgid "Setup Paths" +msgstr "Подесите путање" + +#: src/bin/e_main.c:767 +msgid "Setup System Controls" +msgstr "Подесите управљање системом" + +#: src/bin/e_main.c:771 +msgid "Enlightenment cannot initialize the System Command system.\n" +msgstr "Просвећење није успело покренути систем наредби.\n" + +#: src/bin/e_main.c:778 +msgid "Setup Actions" +msgstr "Подесите радње" + +#: src/bin/e_main.c:782 +msgid "Enlightenment cannot set up its actions system.\n" +msgstr "Просвећење не може подесити свој систем радњи.\n" + +#: src/bin/e_main.c:789 +msgid "Setup Execution System" +msgstr "Подесите извршни систем" + +#: src/bin/e_main.c:793 +msgid "Enlightenment cannot set up its exec system.\n" +msgstr "Просвећење није успело да постави свој извршни систем.\n" + +#: src/bin/e_main.c:804 +msgid "Setup Filemanager" +msgstr "Подесите управника датотекама" + +#: src/bin/e_main.c:808 +msgid "Enlightenment cannot initialize the File manager.\n" +msgstr "Просвећење не може покренути управника датотека.\n" + +#: src/bin/e_main.c:815 +msgid "Setup Message System" +msgstr "Подесите систем порука" + +#: src/bin/e_main.c:819 +msgid "Enlightenment cannot set up its msg system.\n" +msgstr "Просвећење није успело да покрене свој систем порука.\n" + +#: src/bin/e_main.c:826 +msgid "Setup DND" +msgstr "Подеси систем превлачења и спуштања" + +#: src/bin/e_main.c:830 +msgid "Enlightenment cannot set up its dnd system.\n" +msgstr "Просвећење није успело да подеси свој систем превлачења и спуштања.\n" + +#: src/bin/e_main.c:837 +msgid "Setup Grab Input Handling" +msgstr "Подеси управљање хватањем улаза" + +#: src/bin/e_main.c:841 +msgid "Enlightenment cannot set up its grab input handling system.\n" +msgstr "" +"Просвећење није успело да подеси прихватног руковаоца улазних знакова.\n" + +#: src/bin/e_main.c:848 +msgid "Setup Modules" +msgstr "Подесите јединице" + +#: src/bin/e_main.c:852 src/bin/e_main.c:1034 +msgid "Enlightenment cannot set up its module system.\n" +msgstr "Просвећење не може подесити свој систем јединица.\n" + +#: src/bin/e_main.c:859 +msgid "Setup Remembers" +msgstr "Подесите памћења" + +#: src/bin/e_main.c:863 +msgid "Enlightenment cannot setup remember settings.\n" +msgstr "Просвећење не може подесити поставке памћења.\n" + +#: src/bin/e_main.c:870 +msgid "Setup Color Classes" +msgstr "Подеси разред боја" + +#: src/bin/e_main.c:874 +msgid "Enlightenment cannot set up its color class system.\n" +msgstr "Просвећење није успело да постави свој систем разреда боја.\n" + +#: src/bin/e_main.c:881 +msgid "Setup Gadcon" +msgstr "Подеси управљање справицама (gadcon)" + +#: src/bin/e_main.c:885 +msgid "Enlightenment cannot set up its gadget control system.\n" +msgstr "Просвећење није успело поставити свој систем управљања справицама.\n" + +#: src/bin/e_main.c:892 +msgid "Setup Wallpaper" +msgstr "Подесите слику позадине" + +#: src/bin/e_main.c:896 +msgid "Enlightenment cannot set up its desktop background system.\n" +msgstr "Просвећење није успело да постави свој систем управљања позадином.\n" + +#: src/bin/e_main.c:903 +msgid "Setup Mouse" +msgstr "Подесите миша" + +#: src/bin/e_main.c:907 +msgid "Enlightenment cannot configure the mouse settings.\n" +msgstr "Просвећење није успело да подеси поставке миша.\n" + +#: src/bin/e_main.c:914 +msgid "Enlightenment cannot setup XKB Keyboard layouts.\n" +msgstr "Просвећење није успело да постави ИксКБ распоред тастатуре.\n" + +#: src/bin/e_main.c:920 +msgid "Setup Bindings" +msgstr "Подесите пречице" + +#: src/bin/e_main.c:924 +msgid "Enlightenment cannot set up its bindings system.\n" +msgstr "Просвећење није успело да постави свој систем пречица.\n" + +#: src/bin/e_main.c:931 +msgid "Setup Thumbnailer" +msgstr "Подесите приказивача умањених сличица" + +#: src/bin/e_main.c:935 +msgid "Enlightenment cannot initialize the Thumbnailing system.\n" +msgstr "Просвећење није успело да покрене систем приказа умањених сличица.\n" + +#: src/bin/e_main.c:944 +msgid "Enlightenment cannot initialize the Icon Cache system.\n" +msgstr "Просвећење није успело да покрене систем прихватне меморије икона.\n" + +#: src/bin/e_main.c:953 +msgid "Enlightenment cannot initialize the XSettings system.\n" +msgstr "Просвећење није успело да покрене систем Икспоставки.\n" + +#: src/bin/e_main.c:962 +msgid "Enlightenment cannot initialize the Update system.\n" +msgstr "Просвећење није успело да покрене систем надоградњи.\n" + +#: src/bin/e_main.c:969 +msgid "Setup Desktop Environment" +msgstr "Подесите радно окружење" + +#: src/bin/e_main.c:973 +msgid "Enlightenment cannot initialize its desktop environment.\n" +msgstr "Просвећење није успело да покрене своје радно окружење.\n" + +#: src/bin/e_main.c:980 +msgid "Setup File Ordering" +msgstr "Подесите распоред датотека" + +#: src/bin/e_main.c:984 +msgid "Enlightenment cannot set up its order file system.\n" +msgstr "Просвећење није успело да постави свој систем уређења датотека.\n" + +#: src/bin/e_main.c:999 +msgid "Load Modules" +msgstr "Учитај јединице" + +#: src/bin/e_main.c:1030 +msgid "Setup Shelves" +msgstr "Подесите полице" + +#: src/bin/e_main.c:1041 +msgid "Configure Shelves" +msgstr "Подесите полице" + +#: src/bin/e_main.c:1052 +msgid "Almost Done" +msgstr "Скоро је готово" + +#: src/bin/e_main.c:1212 +#, 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-profile CONF_PROFILE\n" +"\t\tUse the configuration profile CONF_PROFILE instead of the user selected " +"default or just \"default\".\n" +"\t-good\n" +"\t\tBe good.\n" +"\t-evil\n" +"\t\tBe evil.\n" +"\t-psychotic\n" +"\t\tBe psychotic.\n" +"\t-locked\n" +"\t\tStart with desklock on, so password will be asked.\n" +"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n" +"\t\tIf you need this help, you don't need this option.\n" +msgstr "" +"Могућности:\n" +"\t-display ПРИКАЗ\n" +"\t\tПовезује се са екраном назива ПРИКАЗ.\n" +"\t\tНПР: -display :1.0\n" +"\t-fake-xinerama-screen WxH+X+Y\n" +"\t\tДодаје ЛАЖНИ ксинерама екран (уместо правих)\n" +"\t\tса датом размером. Додајте их колико год желите. Сви они\n" +"\t\tзамењују прави ксинерама екране, ако их има. Може\n" +"\t\tбити коришћено за подражавање ксинераме.\n" +"\t\tНПР: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen " +"800x600+800+0\n" +"\t-profile CONF_PROFILE\n" +"\t\tКористи профил поставки CONF_PROFILE уместо кориснички одређеног " +"подразумеваног, или само „подразумеваног“.\n" +"\t-good\n" +"\t\tБуди добар.\n" +"\t-evil\n" +"\t\tБуди зао.\n" +"\t-psychotic\n" +"\t\tБуди откачен.\n" +"\t-locked\n" +"\t\tПочиње са закључаном радном површи, тако да ће бити тражена лозинка.\n" +"\t-ја-стварно-знам-шта-радим-и-прихватам-потпуну-одговорност-за-то\n" +"\t\tАко Вам је портребнаа ова помоћ, ова могућност Вам није потребна.\n" + +#: src/bin/e_main.c:1265 +msgid "" +"You are executing enlightenment directly. This is\n" +"bad. Please do not execute the \"enlightenment\"\n" +"binary. Use the \"enlightenment_start\" launcher. It\n" +"will handle setting up environment variables, paths,\n" +"and launching any other required services etc.\n" +"before enlightenment itself begins running.\n" +msgstr "" +"Извршавате Просвећење непосредно. То није\n" +"добро. Молим, не извршавајте наредбу „enlightenment“.\n" +"Користите покретач „enlightenment_start“. Она \n" +"ће руковати постављањем променљивих окружења,\n" +"путањама и покретањем било које потребне услуге, итд.\n" +"пре покретања самог Просвећења.\n" + +#: src/bin/e_main.c:1546 +msgid "Testing Format Support" +msgstr "Проба подршке за облике" + +#: src/bin/e_main.c:1550 +msgid "" +"Enlightenment found Evas can't create a buffer canvas. Please check\n" +"Evas has Software Buffer engine support.\n" +msgstr "" +"Просвећење је открило да Евас није успео да направи међумеморију исцртавања. " +"Молим, проверите да ли Евас има подршку погона софтверског међумеморисања.\n" + +#: src/bin/e_main.c:1562 +msgid "" +"Enlightenment found Evas can't load SVG files. Check Evas has SVG loader " +"support.\n" +msgstr "" +"Просвећење је открило да Евас не може учитати СВГ датотеке. Проверите да ли " +"Евас има подршку учитавања СВГ датотека.\n" + +#: src/bin/e_main.c:1572 +msgid "" +"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG loader " +"support.\n" +msgstr "" +"Просвећење је открило да Евас не може учитати ЈПЕГ датотеке. Проверите да ли " +"Евас има подршку учитавања ЈПЕГ датотека.\n" + +#: src/bin/e_main.c:1582 +msgid "" +"Enlightenment found Evas can't load PNG files. Check Evas has PNG loader " +"support.\n" +msgstr "" +"Просвећење је открило да Евас не може учитати ПНГ датотеке. Проверите да ли " +"Евас има подршку учитавања ПНГ датотека.\n" + +#: src/bin/e_main.c:1592 +msgid "" +"Enlightenment found Evas can't load EET files. Check Evas has EET loader " +"support.\n" +msgstr "" +"Просвећење је открило да Евас не може учитати ЕЕТ датотеке. Проверите да ли " +"Евас има подршку учитавања ЕЕТ датотека.\n" + +#: src/bin/e_main.c:1606 +msgid "" +"Enlightenment found Evas can't load the 'Sans' font. Check Evas has " +"fontconfig\n" +"support and system fontconfig defines a 'Sans' font.\n" +msgstr "" +"Просвећење је открило да Евас није успела да учита словни лик „Sans“. " +"Проверите да ли Евас има подршку поставки словних ликова\n" +"и да ли системске поставке описују словни лик „Sans“.\n" + +#: src/bin/e_main.c:1814 +#, c-format +msgid "" +"Enlightenment crashed early on start and has<br>been restarted. There was an " +"error loading the<br>module named: %s. This module has been disabled<br>and " +"will not be loaded." +msgstr "" +"Просвећење се срушило одмах по покретању и<br>поново је покренуто. Десила се " +"грешка приликом учитавања<br>јединице назива: %s. Ова јединица је " +"онемогућена<br>и неће бити учитана." + +#: src/bin/e_main.c:1819 src/bin/e_main.c:1836 +msgid "Enlightenment crashed early on start and has been restarted" +msgstr "Просвећење се срушило одмах по покретању и опет је покренуто" + +#: src/bin/e_main.c:1820 +#, c-format +msgid "" +"Enlightenment crashed early on start and has been restarted.<br>There was an " +"error loading the module named: %s<br><br>This module has been disabled and " +"will not be loaded." +msgstr "" +"Просвећење се срушило одмах по покретању и поново је покренуто.<br> Десила " +"се грешка приликом учитавања јединице назива: %s<br><br>. Ова јединица је " +"онемогућена<br>и неће бити учитана." + +#: src/bin/e_main.c:1829 +msgid "" +"Enlightenment crashed early on start and has<br>been restarted. All modules " +"have been disabled<br>and will not be loaded to help remove any " +"problem<br>modules from your configuration. The module<br>configuration " +"dialog should let you select your<br>modules again.\n" +msgstr "" +"Просвећење се срушило одмах по покретању, и поново<br> је покренуто. Све " +"јединице су онемогућене<br>и неће бити учитане да би било лакше " +"уклањање<br>јединица са потешкоћама из ваших поставки. Прозорче " +"поставки<br>јединица ће вам омогућити поновни одабир ваших<br> јединица.\n" + +#: src/bin/e_main.c:1837 +msgid "" +"Enlightenment crashed early on start and has been restarted.<br>All modules " +"have been disabled and will not be loaded to help<br>remove any problem " +"modules from your configuration.<br><br>The module configuration dialog " +"should let you select your<br>modules again." +msgstr "" +"Просвећење се срушило одмах по покретању, и поново је покренуто.<br>Све " +"јединице су онемогућене и неће бити учитане да би било<br> лакше уклањање " +"јединица са потешкоћама из ваших поставки.<br><br> Прозорче поставки " +"јединица ће вам омогућити поновни одабир ваших<br> јединица." + +#: src/bin/e_module.c:100 +#, c-format +msgid "Loading Module: %s" +msgstr "Учитавам јединицу: %s" + +#: src/bin/e_module.c:148 +#, c-format +msgid "" +"There was an error loading the module named: %s<br>No module named %s could " +"be found in the<br>module search directories.<br>" +msgstr "" +"Десила се грешка приликом учитавања јединице назива: %s<br>Нема пронађених " +"јединица са именом %s у<br>фасциклама зa претрагу јединица.<br>" + +#: src/bin/e_module.c:151 src/bin/e_module.c:164 src/bin/e_module.c:182 +msgid "Error loading Module" +msgstr "Грешка приликом учитавања јединице" + +#: src/bin/e_module.c:159 src/bin/e_module.c:176 +#, c-format +msgid "" +"There was an error loading the module named: %s<br>The full path to this " +"module is:<br>%s<br>The error reported was:<br>%s<br>" +msgstr "" +"Десила се грешка приликом учитавања јединице назване: %s<br>Пуна путања до " +"ове јединице је:<br>%s<br>Пријављена је грешка:<br>%s<br>" + +#: src/bin/e_module.c:181 +msgid "Module does not contain all needed functions" +msgstr "Јединица не садржи све потребне функције" + +#: src/bin/e_module.c:196 +#, c-format +msgid "" +"Module API Error<br>Error initializing Module: %s<br>It requires a minimum " +"module API version of: %i.<br>The module API advertized by Enlightenment is: " +"%i.<br>" +msgstr "" +"Десила се грешка јединице АПИ<br>Грешка покретања јединице: %s<br>Потребно " +"најниже АПИ издање је: %i.<br>АПИ јединица Просвећења је %i.<br>" + +#: src/bin/e_module.c:201 +#, c-format +msgid "Enlightenment %s Module" +msgstr "Јединица %s Просвећења" + +#: src/bin/e_module.c:528 +msgid "What action should be taken with this module?<br>" +msgstr "Која радња треба бити предузета са овом јединицом?<br>" + +#: src/bin/e_module.c:534 src/bin/e_shelf.c:1792 +#: src/modules/conf_dialogs/e_int_config_profiles.c:339 +#: src/modules/conf_shelves/e_int_config_shelf.c:394 +#: src/modules/ibar/e_mod_config.c:199 +msgid "Keep" +msgstr "Задржи" + +#: src/bin/e_module.c:783 +msgid "" +"The following modules are not standard ones for<br>Enlightenment and may " +"cause bugs and crashes.<br>Please remove them before reporting any bugs." +"<br><br>The module list is as follows:<br><br>" +msgstr "" +"Следеће јединице нису уобичајене за<br>Просвећење, и могу узроковати грешке " +"и отказе.<br>Молим, уклоните их пре пријаве грешака.<br><br>Списак јединица " +"ј следећи:<br><br>" + +#: src/bin/e_module.c:795 +msgid "Unstable module tainting" +msgstr "Загађење непостојане јединице" + +#: src/bin/e_module.c:799 +msgid "I know" +msgstr "Знам" + +#: src/bin/e_screensaver.c:183 +msgid "" +"You disabled the screensaver too fast.<br><br>Would you like to enable " +"<b>presentation</b> mode and temporarily disable screen saver, lock and " +"power saving?" +msgstr "" +"Превише брзо сте онемогућили чувара екрана.<br><br>Да ли би хтели да " +"омогућите начин рада <b>излагање</b>, и привремено онемогућите чувара " +"екрана, закључавање и чување снаге?" + +#: src/bin/e_shelf.c:67 +msgid "Float" +msgstr "Покретно" + +#: src/bin/e_shelf.c:68 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:230 +#: src/modules/everything/evry_config.c:568 +#: src/modules/gadman/e_mod_gadman.c:1028 +msgid "Horizontal" +msgstr "Водоравно" + +#: src/bin/e_shelf.c:69 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:232 +#: src/modules/everything/evry_config.c:561 +#: src/modules/gadman/e_mod_gadman.c:1036 +msgid "Vertical" +msgstr "Усправно" + +#: src/bin/e_shelf.c:70 +msgid "Left" +msgstr "Лево" + +#: src/bin/e_shelf.c:71 +msgid "Right" +msgstr "Десно" + +#: src/bin/e_shelf.c:72 +msgid "Top" +msgstr "Врх" + +#: src/bin/e_shelf.c:73 +msgid "Bottom" +msgstr "дно" + +#: src/bin/e_shelf.c:74 +msgid "Top-left Corner" +msgstr "горњи леви угао" + +#: src/bin/e_shelf.c:75 +msgid "Top-right Corner" +msgstr "горњи десни угао" + +#: src/bin/e_shelf.c:76 +msgid "Bottom-left Corner" +msgstr "доњи леви угао" + +#: src/bin/e_shelf.c:77 +msgid "Bottom-right Corner" +msgstr "доњи десни угао" + +#: src/bin/e_shelf.c:78 +msgid "Left-top Corner" +msgstr "леви горњи угао" + +#: src/bin/e_shelf.c:79 +msgid "Right-top Corner" +msgstr "десни горњи угао" + +#: src/bin/e_shelf.c:80 +msgid "Left-bottom Corner" +msgstr "леви доњи угао" + +#: src/bin/e_shelf.c:81 +msgid "Right-bottom Corner" +msgstr "десни доњи угао" + +#: src/bin/e_shelf.c:268 src/bin/e_shelf.c:1121 +#, c-format +msgid "Shelf #%d" +msgstr "Полица #%d" + +#: src/bin/e_shelf.c:892 +msgid "Shelf Autohide Error" +msgstr "Грешка самоскривања полице" + +#: src/bin/e_shelf.c:892 +msgid "" +"Shelf autohiding will not work properly<br>with the current configuration; " +"set your shelf to<br>\"Below Everything\" or disable autohiding." +msgstr "" +"Самоскривање полице неће радити правилно<br>са тренутним поставкама; " +"поставите своју полицу на<br>„Испод свега“ или онемогућите самостално " +"скривање." + +#: src/bin/e_shelf.c:1122 +msgid "Add New Shelf" +msgstr "Додај нову полицу" + +#: src/bin/e_shelf.c:1143 +msgid "Shelf Error" +msgstr "Грешка полице" + +#: src/bin/e_shelf.c:1143 +msgid "A shelf with that name already exists!" +msgstr "Полица са тим именом већ постоји!" + +#: src/bin/e_shelf.c:1657 src/bin/e_shelf.c:2486 +msgid "Stop Moving Gadgets" +msgstr "Заустави померање справица" + +#: src/bin/e_shelf.c:1659 src/bin/e_shelf.c:2488 +msgid "Begin Moving Gadgets" +msgstr "Почни померање справица" + +#: src/bin/e_shelf.c:1787 +msgid "Are you sure you want to delete this shelf?" +msgstr "Да ли сте сигурни да желите обрисати ову полицу?" + +#: src/bin/e_shelf.c:1789 +msgid "" +"You requested to delete this shelf.<br><br>Are you sure you want to delete " +"it?" +msgstr "" +"Захтевали сте брисање ове полице.<br><br>Да ли сте сигурни да је желите " +"обрисати?" + +#: src/bin/e_shelf.c:2343 +msgid "A shelf with that name and id already exists!" +msgstr "Полица са тим именом и ЛБ већ постоји!" + +#: src/bin/e_shelf.c:2362 +msgid "Rename Shelf" +msgstr "Преименуј полицу" + +#: src/bin/e_shelf.c:2436 src/modules/conf_shelves/e_int_config_shelf.c:145 +#: src/modules/ibar/e_mod_main.c:859 +msgid "Contents" +msgstr "Садржаји" + +#: src/bin/e_shelf.c:2446 +msgid "Orientation" +msgstr "Усмерење" + +#: src/bin/e_shelf.c:2455 src/modules/quickaccess/e_mod_quickaccess.c:792 +msgid "Autohide" +msgstr "Сам сакриј" + +#: src/bin/e_shelf.c:2462 +msgid "Refresh" +msgstr "Освежи" + +#: src/bin/e_startup.c:66 +#, c-format +msgid "Starting %s" +msgstr "Покрећем %s" + +#: src/bin/e_sys.c:295 +msgid "Checking System Permissions" +msgstr "Проверавам системска овлашћења" + +#: src/bin/e_sys.c:341 src/bin/e_sys.c:352 src/bin/e_sys.c:361 +#: src/bin/e_sys.c:370 +msgid "System Check Done" +msgstr "Провера система је завршена" + +#: src/bin/e_sys.c:438 +#, c-format +msgid "" +"Logout is taking too long.<br>Some applications refuse to close.<br>Do you " +"want to finish the logout<br>anyway without closing these<br>applications " +"first?<br><br>Auto logout in %d seconds." +msgstr "" +"Одјава превише дуго траје.<br>Неки програми одбијају да се затворе.<br>Да ли " +"желите довршити одјаву<br>без претходног затварања ових<br>програма?" +"<br><br>Самостална одјава кроз %d секунди." + +#: src/bin/e_sys.c:498 +msgid "Logout problems" +msgstr "Потешкоће са одјавом" + +#: src/bin/e_sys.c:500 +msgid "Logout now" +msgstr "Одјави се сада" + +#: src/bin/e_sys.c:502 +msgid "Wait longer" +msgstr "Чекај још мало" + +#: src/bin/e_sys.c:504 +msgid "Cancel Logout" +msgstr "Одустани од одјаве" + +#: src/bin/e_sys.c:547 +msgid "Logout in progress" +msgstr "Одјава је у току" + +#: src/bin/e_sys.c:550 +msgid "Logout in progress.<br><hilight>Please wait.</hilight>" +msgstr "Одјава је у току.<br><hilight>Молим, сачекајте.</hilight>" + +#: src/bin/e_sys.c:579 src/bin/e_sys.c:634 +msgid "Enlightenment is busy with another request" +msgstr "Просвећење је заузето другим захтевом" + +#: src/bin/e_sys.c:584 +msgid "" +"Logging out.<br>You cannot perform other system actions<br>once a logout has " +"begun." +msgstr "" +"Одјављујем вас.<br>Не можете изводити друге системске радње<br>кад одјава " +"почне." + +#: src/bin/e_sys.c:591 +msgid "" +"Powering off.<br>You cannot do any other system actions<br>once a shutdown " +"has been started." +msgstr "" +"Искључујем.<br>Не можете изводити друге системске радње<br>кад искључивање " +"почне." + +#: src/bin/e_sys.c:597 +msgid "" +"Resetting.<br>You cannot do any other system actions<br>once a reboot has " +"begun." +msgstr "" +"Поново покрећем.<br>Не можете изводити друге системске радње<br>кад поновно " +"покретање почне." + +#: src/bin/e_sys.c:603 +msgid "" +"Suspending.<br>Until suspend is complete you cannot perform<br>any other " +"system actions." +msgstr "" +"Обустављам.<br>Док се не одради обустава, не можете изводити<br>било које " +"друге системске радње." + +#: src/bin/e_sys.c:609 +msgid "" +"Hibernating.<br>You cannot perform any other system actions<br>until this is " +"complete." +msgstr "" +"Замрзавам.<br>Не можете вршити било које друге системске радње<br>док се ово " +"не доврши." + +#: src/bin/e_sys.c:615 src/bin/e_sys.c:656 +msgid "EEK! This should not happen" +msgstr "Лелеее! Ово не би смело да се деси" + +#: src/bin/e_sys.c:640 +msgid "Power off failed." +msgstr "Искључење није успело." + +#: src/bin/e_sys.c:644 +msgid "Reset failed." +msgstr "Поновно покретање није успело." + +#: src/bin/e_sys.c:648 +msgid "Suspend failed." +msgstr "Обустављање није успело." + +#: src/bin/e_sys.c:652 +msgid "Hibernate failed." +msgstr "Замрзавање није успело." + +#: src/bin/e_sys.c:752 +msgid "Power off.<br><hilight>Please wait.</hilight>" +msgstr "Искључујем.<br><hilight>Молим, сачекајте.</hilight>" + +#: src/bin/e_sys.c:796 +msgid "Resetting" +msgstr "Поново покрећем" + +#: src/bin/e_sys.c:799 +msgid "Resetting.<br><hilight>Please wait.</hilight>" +msgstr "Поново покрећем.<br><hilight>Молим, сачекајте.</hilight>" + +#: src/bin/e_sys.c:851 +msgid "Suspending" +msgstr "Обустављам" + +#: src/bin/e_sys.c:854 +msgid "Suspending.<br><hilight>Please wait.</hilight>" +msgstr "Обустављам.<br><hilight>Молим, сачекајте.</hilight>" + +#: src/bin/e_sys.c:907 +msgid "Hibernating" +msgstr "Замрзавам" + +#: src/bin/e_sys.c:910 +msgid "Hibernating.<br><hilight>Please wait.</hilight>" +msgstr "Замрзавам.<br><hilight>Молим, сачекајте.</hilight>" + +#: src/bin/e_theme_about.c:25 +msgid "Select Theme" +msgstr "Одаберите тему" + +#: src/bin/e_theme.c:37 +msgid "Set As Theme" +msgstr "Постави као тему" + +#: src/bin/e_toolbar.c:246 +msgid "Stop Moving/Resizing Items" +msgstr "Заустави померање/мењање величина ставки" + +#: src/bin/e_toolbar.c:248 +msgid "Begin Moving/Resizing Items" +msgstr "Почни померање/мењање величина ставки" + +#: src/bin/e_toolbar.c:261 +msgid "Set Toolbar Contents" +msgstr "Подеси садржај траке алата" + +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "Подсети ме касније" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "Никад ми не казуј" + +#: src/bin/e_update.c:83 +msgid "Update Notice" +msgstr "Обавештење о мадпградњи" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is<br>not the current latest release.<br>The " +"latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or " +"update your system packages<br>to get a new version." +msgstr "" +"Ово издање Просвећења <br>није тренутно издање. <br>Најновије издање је:" +"<br><br>%s<br><br>Посетите www.enlightenment.org<br>или надоградите свој " +"систем<br>да би добавили најновије издање." + +#: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 +#: src/modules/conf_intl/e_int_config_imc.c:511 +#, c-format +msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>" +msgstr "Просвећење није успело да раздели потпроцес:<br><br>%s<br>" + +#: src/bin/e_utils.c:245 +msgid "Cannot exit - immortal windows." +msgstr "Не могу изаћи - бесмртни прозори." + +#: src/bin/e_utils.c:246 +msgid "" +"Some windows are left still around with the Lifespan lock enabled. This " +"means<br>that Enlightenment will not allow itself to exit until these " +"windows have<br>been closed or have the lifespan lock removed.<br>" +msgstr "" +"Неки прозори су још увек остали са омогућеним кључем животног века. Ово " +"значи <br>да Просвећење неће дозволити себи да изађе док ови прозори не " +"буду<br>затворени или им се откључа животни век.<br>" + +#: src/bin/e_utils.c:860 +#, c-format +msgid "%'.0f bytes" +msgstr "%'.0f bytes" + +#: src/bin/e_utils.c:864 +#, c-format +msgid "%'.0f KiB" +msgstr "%'.0f KiB" + +#: src/bin/e_utils.c:868 +#, c-format +msgid "%'.1f MiB" +msgstr "%'.1f MiB" + +#: src/bin/e_utils.c:872 +#, c-format +msgid "%'.1f GiB" +msgstr "%'.1f GiB" + +#: src/bin/e_utils.c:876 +#, c-format +msgid "%'.1f TiB" +msgstr "%'.1f TiB" + +#: src/bin/e_utils.c:895 +#, c-format +msgid "In the future" +msgstr "У будућности" + +#: src/bin/e_utils.c:899 +#, c-format +msgid "In the last minute" +msgstr "Последњег минута" + +#: src/bin/e_utils.c:903 +#, c-format +msgid "Last year" +msgid_plural "%li Years ago" +msgstr[0] "Пре %li године" +msgstr[1] "Пре %li године" +msgstr[2] "Пре %li година" + +#: src/bin/e_utils.c:908 +#, c-format +msgid "Last month" +msgid_plural "%li Months ago" +msgstr[0] "Пре %li месеца" +msgstr[1] "Пре %li месеца" +msgstr[2] "Пре %li месеци" + +#: src/bin/e_utils.c:913 +#, c-format +msgid "Last week" +msgid_plural "%li Weeks ago" +msgstr[0] "Пре %li седмице" +msgstr[1] "Пре %li седмице" +msgstr[2] "Пре %li седмица" + +#: src/bin/e_utils.c:918 +#, c-format +msgid "Yesterday" +msgid_plural "%li Days ago" +msgstr[0] "Пре %li дана" +msgstr[1] "Пре %li дана" +msgstr[2] "Пре %li дана" + +#: src/bin/e_utils.c:923 +#, c-format +msgid "An hour ago" +msgid_plural "%li Hours ago" +msgstr[0] "Пре %li сата" +msgstr[1] "Пре %li сата" +msgstr[2] "Пре %li сати" + +#: src/bin/e_utils.c:928 +#, c-format +msgid "A minute ago" +msgid_plural "%li Minutes ago" +msgstr[0] "Пре %li минута" +msgstr[1] "Пре %li минута" +msgstr[2] "Пре %li минута" + +#: src/bin/e_utils.c:935 src/bin/e_widget_filepreview.c:538 +#: src/bin/e_widget_filepreview.c:539 src/bin/e_widget_filepreview.c:540 +#: src/bin/e_widget_filepreview.c:571 src/bin/e_widget_filepreview.c:582 +#: src/modules/comp/e_mod_config.c:516 +#: src/modules/conf_dialogs/e_int_config_profiles.c:298 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1218 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:587 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:395 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1170 +#: src/modules/wizard/page_020.c:24 +msgid "Unknown" +msgstr "Непознато" + +#: src/bin/e_utils.c:1006 src/bin/e_utils.c:1014 +msgid "Error creating directory" +msgstr "Грешка при стварању фасцикле" + +#: src/bin/e_utils.c:1006 +#, c-format +msgid "" +"Failed to create directory: %s .<br>Check that you have correct permissions " +"set." +msgstr "" +"Нисам успео да направим фасциклу: %s .<br>Проверите да ли имате правилно " +"постављена овлашћења." + +#: src/bin/e_utils.c:1014 +#, c-format +msgid "Failed to create directory: %s .<br>A file of that name already exists." +msgstr "" +"Нисам успео да направим фасциклу: %s .<br>Датотека са тим именом већ постоји." + +#: src/bin/e_utils.c:1172 +msgid "" +"Configuration data needed upgrading. Your old configuration<br>has been " +"wiped and a new set of defaults initialized. This<br>will happen regularly " +"during development, so don't report a<br>bug. This means the module needs " +"new configuration<br>data by default for usable functionality that your " +"old<br>configuration lacked. This new set of defaults will fix<br>that by " +"adding it in. You can re-configure things now to your<br>liking. Sorry for " +"the hiccup in your configuration.<br>" +msgstr "" +"Датотеке поставки требају бити надограђене. Ваше старе поставке<br> су " +"обрисане, а нови скуп задатих поставки је покренут. Ово<br>ће се дешавати " +"редовно током развоја, зато, немојте пријављивати <br>грешку. Ово " +"једноставно значи да Просвећењу требају нови<br>предодређени подаци за " +"корисне радње које ваше<br>старе поставке једноставно немају. Овај нови скуп " +"задатих поставки ће то<br>поправити њиховим додавањем. Сада можете подесити " +"ствари по својој<br>вољи. Извините због зачкољица у вашим поставкама.<br>" + +#: src/bin/e_utils.c:1181 src/bin/e_utils.c:1205 +#, c-format +msgid "%s Configuration Updated" +msgstr "%s поставки је освежено" + +#: src/bin/e_utils.c:1194 +msgid "" +"Your module configuration is NEWER than the module version. This is " +"very<br>strange. This should not happen unless you downgraded<br>the module " +"or copied the configuration from a place where<br>a newer version of the " +"module was running. This is bad and<br>as a precaution your configuration " +"has been now restored to<br>defaults. Sorry for the inconvenience.<br>" +msgstr "" +"Ваше поставке јединица су НОВИЈЕ од издања јединица. Ово је врло<br>чудно. " +"То се не би требало дешавати, осим ако сте разградили<br>јединицу, или " +"умножили поставке са места где<br>ради новије издање јединице. Ово је лоше, " +"и,<br>као предострожност, ваше поставке су враћене на<br>почетне вредности. " +"Извините због непријатности.<br>" + +#: src/bin/e_utils.c:1288 +#, c-format +msgid "Never" +msgstr "Никад" + +#: src/bin/e_utils.c:1292 +#, c-format +msgid "A second" +msgid_plural "%li Seconds" +msgstr[0] "%li сакунда" +msgstr[1] "%li секунде" +msgstr[2] "%li секунди" + +#: src/bin/e_utils.c:1296 +#, c-format +msgid "One year" +msgid_plural "%li Years" +msgstr[0] "%li година" +msgstr[1] "%li године" +msgstr[2] "%li година" + +#: src/bin/e_utils.c:1301 +#, c-format +msgid "One month" +msgid_plural "%li Months" +msgstr[0] "%li месец" +msgstr[1] "%li месеца" +msgstr[2] "%li месеци" + +#: src/bin/e_utils.c:1306 +#, c-format +msgid "One week" +msgid_plural "%li Weeks" +msgstr[0] "%li седмица" +msgstr[1] "%li седмице" +msgstr[2] "%li седмица" + +#: src/bin/e_utils.c:1311 +#, c-format +msgid "One day" +msgid_plural "%li Days" +msgstr[0] "%li дан" +msgstr[1] "%li дана" +msgstr[2] "%li дана" + +#: src/bin/e_utils.c:1316 +#, c-format +msgid "An hour" +msgid_plural "%li Hours" +msgstr[0] "%li сат" +msgstr[1] "%li сата" +msgstr[2] "%li сати" + +#: src/bin/e_utils.c:1321 +#, c-format +msgid "A minute" +msgid_plural "%li Minutes" +msgstr[0] "%li минут" +msgstr[1] "%li минута" +msgstr[2] "%li минута" + +#: src/bin/e_widget_config_list.c:60 src/modules/comp/e_mod_config.c:1092 +#: src/modules/conf_applications/e_int_config_apps.c:266 +#: src/modules/conf_applications/e_int_config_apps.c:287 +#: src/modules/conf_applications/e_int_config_apps_personal.c:93 +#: src/modules/conf_dialogs/e_int_config_profiles.c:133 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:809 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:197 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:244 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:292 +#: src/modules/conf_paths/e_int_config_env.c:311 +#: src/modules/conf_shelves/e_int_config_shelf.c:137 +#: src/modules/ibar/e_mod_config.c:110 +#: src/modules/xkbswitch/e_mod_config.c:262 +msgid "Add" +msgstr "Додај" + +#: src/bin/e_widget_config_list.c:80 src/modules/comp/e_mod_config.c:1088 +#: src/modules/conf_applications/e_int_config_apps.c:303 +#: src/modules/xkbswitch/e_mod_config.c:250 +msgid "Up" +msgstr "Горе" + +#: src/bin/e_widget_config_list.c:86 src/modules/comp/e_mod_config.c:1090 +#: src/modules/conf_applications/e_int_config_apps.c:307 +#: src/modules/xkbswitch/e_mod_config.c:256 +msgid "Down" +msgstr "Доле" + +#: src/bin/e_widget_csel.c:195 +msgid "R" +msgstr "R" + +#: src/bin/e_widget_csel.c:195 +msgid "G" +msgstr "G" + +#: src/bin/e_widget_csel.c:195 +msgid "B" +msgstr "B" + +#: src/bin/e_widget_csel.c:195 +msgid "H" +msgstr "H" + +#: src/bin/e_widget_csel.c:195 +msgid "S" +msgstr "S" + +#: src/bin/e_widget_csel.c:195 +msgid "V" +msgstr "V" + +#: src/bin/e_widget_csel.c:274 +msgid "Alpha" +msgstr "Провидност" + +#: src/bin/e_widget_filepreview.c:81 src/bin/e_widget_filepreview.c:382 +msgid "Resolution:" +msgstr "Размера приказа:" + +#: src/bin/e_widget_filepreview.c:89 +msgid "Mime-type:" +msgstr "МИМЕ врста:" + +#: src/bin/e_widget_filepreview.c:267 +#, c-format +msgid "%3.1f%%" +msgstr "%3.1f%%" + +#: src/bin/e_widget_filepreview.c:273 +msgid "Length:" +msgstr "Трајање:" + +#: src/bin/e_widget_filepreview.c:330 +msgid "Used:" +msgstr "Заузето:" + +#: src/bin/e_widget_filepreview.c:332 +msgid "Reserved:" +msgstr "Чувано:" + +#: src/bin/e_widget_filepreview.c:333 +msgid "Mount status:" +msgstr "Стање качења:" + +#: src/bin/e_widget_filepreview.c:335 src/modules/comp/e_mod_config.c:487 +#: src/modules/mixer/app_mixer.c:424 +msgid "Type:" +msgstr "Врста:" + +#: src/bin/e_widget_filepreview.c:385 +msgid "Owner:" +msgstr "Власник:" + +#: src/bin/e_widget_filepreview.c:386 +msgid "Permissions:" +msgstr "Овлашћења:" + +#: src/bin/e_widget_filepreview.c:387 +msgid "Modified:" +msgstr "Измењена:" + +#: src/bin/e_widget_filepreview.c:525 src/bin/e_widget_filepreview.c:691 +#: src/bin/e_widget_filepreview.c:700 src/bin/e_widget_filepreview.c:709 +#, c-format +msgid "Read Only" +msgstr "Само за читање" + +#: src/bin/e_widget_filepreview.c:527 src/bin/e_widget_filepreview.c:716 +msgid "Read-Write" +msgstr "Читање и писање" + +#: src/bin/e_widget_filepreview.c:530 src/bin/e_widget_filepreview.c:541 +msgid "Unmounted" +msgstr "Откачено" + +#: src/bin/e_widget_filepreview.c:640 +#, c-format +msgid "You" +msgstr "Ви" + +#: src/bin/e_widget_filepreview.c:689 +#, c-format +msgid "Protected" +msgstr "Чуван" + +#: src/bin/e_widget_filepreview.c:698 src/bin/e_widget_filepreview.c:707 +#, c-format +msgid "Forbidden" +msgstr "Забрањен" + +#: src/bin/e_widget_fsel.c:334 +msgid "Add to Favorites" +msgstr "Додај у омиљене" + +#: src/bin/e_widget_fsel.c:339 +#: src/modules/conf_display/e_int_config_desklock_fsel.c:91 +#: src/modules/conf_intl/e_int_config_imc.c:815 +#: src/modules/conf_theme/e_int_config_startup.c:266 +#: src/modules/conf_theme/e_int_config_theme.c:739 +#: src/modules/gadman/e_mod_config.c:256 +msgid "Go up a Directory" +msgstr "Иди у родитељску фасциклу" + +#: src/modules/access/e_mod_config.c:33 +msgid "Access Settings" +msgstr "Приступ поставкама" + +#: src/modules/backlight/e_mod_main.c:422 +#: src/modules/conf_display/e_mod_main.c:36 +msgid "Backlight" +msgstr "Позадинско светло" + +#: src/modules/backlight/e_mod_main.c:509 +msgid "Backlight Controls" +msgstr "Управљање позадинским светлом" + +#: src/modules/battery/e_mod_config.c:64 +msgid "Battery Monitor Settings" +msgstr "Поставке надгледања батерије" + +#: src/modules/battery/e_mod_config.c:134 +msgid "Show alert when battery is low" +msgstr "Прикажи упозорење кад је батерија празна" + +#: src/modules/battery/e_mod_config.c:138 +msgid "Use desktop notifications for alert" +msgstr "Користи обавештења површи за упозорења" + +#: src/modules/battery/e_mod_config.c:235 +msgid "Check every:" +msgstr "Провери сваких:" + +#: src/modules/battery/e_mod_config.c:237 +#: src/modules/conf_performance/e_int_config_performance.c:128 +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:109 +#: src/modules/temperature/e_mod_config.c:233 +#, c-format +msgid "%1.0f ticks" +msgstr "%1.0f откуцаја" + +#: src/modules/battery/e_mod_config.c:242 +msgid "Suspend when below:" +msgstr "Обустави кад је испод:" + +#: src/modules/battery/e_mod_config.c:245 +msgid "Hibernate when below:" +msgstr "Замрзни кад је испод:" + +#: src/modules/battery/e_mod_config.c:248 +msgid "Shutdown when below:" +msgstr "Искључи кад је испод:" + +#: src/modules/battery/e_mod_config.c:251 +#: src/modules/battery/e_mod_config.c:270 +#, c-format +msgid "%1.0f %%" +msgstr "%1.0f %%" + +#: src/modules/battery/e_mod_config.c:255 +msgid "Polling" +msgstr "Извлачење" + +#: src/modules/battery/e_mod_config.c:259 +msgid "Show low battery alert" +msgstr "Прикажи упозорење кад је батерија празна" + +#: src/modules/battery/e_mod_config.c:263 +msgid "Alert when at:" +msgstr "Упозори кад је на:" + +#: src/modules/battery/e_mod_config.c:266 +#, c-format +msgid "%1.0f min" +msgstr "%1.0f min" + +#: src/modules/battery/e_mod_config.c:274 +msgid "Auto dismiss in..." +msgstr "Сам откажи у..." + +#: src/modules/battery/e_mod_config.c:279 +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:101 +#, c-format +msgid "%1.0f s" +msgstr "%1.0f s" + +#: src/modules/battery/e_mod_config.c:286 +msgid "Alert" +msgstr "Упозорење" + +#: src/modules/battery/e_mod_config.c:292 +msgid "Auto Detect" +msgstr "Сам препознај" + +#: src/modules/battery/e_mod_config.c:295 +#: src/modules/conf_applications/e_mod_main.c:60 +#: src/modules/conf_display/e_mod_main.c:40 +#: src/modules/conf_theme/e_mod_main.c:222 +#: src/modules/temperature/e_mod_config.c:269 +msgid "Internal" +msgstr "унутрашњи" + +#: src/modules/battery/e_mod_config.c:299 +#: src/modules/temperature/e_mod_config.c:271 +msgid "udev" +msgstr "удев" + +#: src/modules/battery/e_mod_config.c:302 +msgid "Fuzzy Mode" +msgstr "Нејасан начин" + +#: src/modules/battery/e_mod_config.c:306 +msgid "HAL" +msgstr "ХАЛ" + +#: src/modules/battery/e_mod_config.c:311 +#: src/modules/temperature/e_mod_config.c:273 +msgid "Hardware" +msgstr "Тврдотворина" + +#: src/modules/battery/e_mod_main.c:152 src/modules/battery/e_mod_main.c:455 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:354 +msgid "Battery" +msgstr "Батерија" + +#: src/modules/battery/e_mod_main.c:200 +msgid "Power Management Timing" +msgstr "Заказивање управника напајања" + +#: src/modules/battery/e_mod_main.c:458 src/modules/battery/e_mod_main.c:493 +msgid "Your battery is low!" +msgstr "Ваша батерија је скоро празна!" + +#: src/modules/battery/e_mod_main.c:459 src/modules/battery/e_mod_main.c:495 +msgid "AC power is recommended." +msgstr "Препоручено је наизменично напајање." + +#: src/modules/battery/e_mod_main.c:589 +msgid "N/A" +msgstr "Нема података" + +#: src/modules/battery/e_mod_main.c:693 src/modules/battery/e_mod_main.c:695 +#: src/modules/battery/e_mod_main.c:702 src/modules/battery/e_mod_main.c:704 +msgid "ERROR" +msgstr "ГРЕШКА" + +#: src/modules/battery/e_mod_main.c:819 +msgid "Battery Meter" +msgstr "Мерач батерије" + +#: src/modules/clock/e_mod_config.c:36 +msgid "Clock Settings" +msgstr "Поставке часовника" + +#: src/modules/clock/e_mod_config.c:83 src/modules/clock/e_mod_main.c:709 +#: src/modules/clock/e_mod_main.c:868 +msgid "Clock" +msgstr "Часовник" + +#: src/modules/clock/e_mod_config.c:86 +msgid "Analog" +msgstr "Аналогни" + +#: src/modules/clock/e_mod_config.c:88 +msgid "Digital" +msgstr "Бројчани" + +#: src/modules/clock/e_mod_config.c:90 +msgid "Seconds" +msgstr "Секунде" + +#: src/modules/clock/e_mod_config.c:93 +msgid "12 h" +msgstr "12-о часовни" + +#: src/modules/clock/e_mod_config.c:95 +msgid "24 h" +msgstr "24-ро часовни" + +#: src/modules/clock/e_mod_config.c:100 +msgid "Date" +msgstr "Датум" + +#: src/modules/clock/e_mod_config.c:105 +msgid "Full" +msgstr "Потпуно" + +#: src/modules/clock/e_mod_config.c:107 +msgid "Numbers" +msgstr "Бројеви" + +#: src/modules/clock/e_mod_config.c:109 +msgid "Date Only" +msgstr "Само датум" + +#: src/modules/clock/e_mod_config.c:114 +msgid "Week" +msgstr "Седмица" + +#: src/modules/clock/e_mod_config.c:116 src/modules/clock/e_mod_config.c:129 +#: src/modules/start/e_mod_main.c:168 +msgid "Start" +msgstr "Почетак" + +#: src/modules/clock/e_mod_config.c:127 +msgid "Weekend" +msgstr "Крај седмице" + +#: src/modules/clock/e_mod_config.c:138 +msgid "Days" +msgstr "Дани" + +#: src/modules/clock/e_mod_main.c:868 +msgid "Toggle calendar" +msgstr "Прекидач календара" + +#: src/modules/comp/e_mod_comp.c:3655 src/modules/comp/e_mod_comp.c:3677 +#: src/modules/comp/e_mod_comp.c:4090 src/modules/comp/e_mod_comp.c:4100 +msgid "Compositor Error" +msgstr "Грешка слагања приказа." + +#: src/modules/comp/e_mod_comp.c:3656 +msgid "Another compositor is already running<br>on your display server." +msgstr "На служитељу приказа је у погону неки други слагач приказа." + +#: src/modules/comp/e_mod_comp.c:3678 +msgid "" +"Your display server does not support the<br>compositor overlay window. This " +"is needed<br>for it to function." +msgstr "" +"Овај служитељ приказа не подржава<br> прозор наднесеног прозора. Да би " +"радио, неопходно је да га подржава." + +#: src/modules/comp/e_mod_comp.c:3752 +msgid "Compositor Warning" +msgstr "Упозорење слагања приказа." + +#: src/modules/comp/e_mod_comp.c:3753 +msgid "" +"Your display driver does not support OpenGL, or<br>no OpenGL engines were " +"compiled or installed for<br>Evas or Ecore-Evas. Falling back to software " +"engine." +msgstr "" +"Ваш управљачки програм приказа не подржава ОпенГЛ, или<br>нема преведених и " +"уграђених ОпенГЛ погона за<br>Евас или Екор-Евас. Враћам на погон " +"мекотворином." + +#: src/modules/comp/e_mod_comp.c:4091 +msgid "" +"Your display server does not support XComposite,<br>or Ecore-X was built " +"without XComposite support.<br>Note that for composite support you will also " +"need<br>XRender and XFixes support in X11 and Ecore." +msgstr "" +"Ваш служитељ приказа не подржава XComposite,<br>или је Ecore-X грађен без " +"подршке Икс слагања.<br>Знајте да вам за подршку слагања такође " +"треба<br>XRender и XFixes подршка у Икс11 и Екору." + +#: src/modules/comp/e_mod_comp.c:4101 +msgid "" +"Your display server does not support XDamage<br>or Ecore was built without " +"XDamage support." +msgstr "" +"Ваш служитељ приказа не подржава XDamage<br>или је Ecore грађено без XDamage " +"подршке." + +#: src/modules/comp/e_mod_config.c:106 +msgid "Composite Settings" +msgstr "Поставке слагања" + +#: src/modules/comp/e_mod_config.c:265 +msgid "Visible" +msgstr "Видљиво" + +#: src/modules/comp/e_mod_config.c:270 +msgid "Focus-Out" +msgstr "Избаци из жиже" + +#: src/modules/comp/e_mod_config.c:275 +msgid "Focus-In" +msgstr "Прими у жижу" + +#: src/modules/comp/e_mod_config.c:440 src/modules/comp/e_mod_config.c:470 +#: src/modules/comp/e_mod_config.c:744 src/modules/comp/e_mod_config.c:795 +msgid "Unused" +msgstr "Неискоришћено" + +#: src/modules/comp/e_mod_config.c:442 src/modules/comp/e_mod_config.c:747 +msgid "Combo" +msgstr "Прозорче избора" + +#: src/modules/comp/e_mod_config.c:446 src/modules/comp/e_mod_config.c:751 +#: src/modules/comp/e_mod_config.c:818 +msgid "Dialog" +msgstr "Прозорче" + +#: src/modules/comp/e_mod_config.c:448 src/modules/comp/e_mod_config.c:753 +msgid "Dock" +msgstr "Док" + +#: src/modules/comp/e_mod_config.c:450 src/modules/comp/e_mod_config.c:755 +msgid "Drag and Drop" +msgstr "Превуци и спусти" + +#: src/modules/comp/e_mod_config.c:454 src/modules/comp/e_mod_config.c:759 +msgid "Menu (Dropdown)" +msgstr "Изборник (приручни)" + +#: src/modules/comp/e_mod_config.c:456 src/modules/comp/e_mod_config.c:761 +msgid "Menu (Popup)" +msgstr "Изборник (искакање)" + +#: src/modules/comp/e_mod_config.c:460 src/modules/comp/e_mod_config.c:765 +#: src/modules/notification/e_mod_main.c:151 +msgid "Notification" +msgstr "Обавештења" + +#: src/modules/comp/e_mod_config.c:462 src/modules/comp/e_mod_config.c:767 +msgid "Splash" +msgstr "Поздравни екран" + +#: src/modules/comp/e_mod_config.c:464 src/modules/comp/e_mod_config.c:769 +#: src/modules/fileman/e_mod_config.c:345 +msgid "Toolbar" +msgstr "Алатница" + +#: src/modules/comp/e_mod_config.c:466 src/modules/comp/e_mod_config.c:771 +msgid "Tooltip" +msgstr "Облачић" + +#: src/modules/comp/e_mod_config.c:468 src/modules/comp/e_mod_config.c:773 +msgid "Utility" +msgstr "Прибор" + +#: src/modules/comp/e_mod_config.c:481 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:168 +msgid "Title:" +msgstr "Наслов:" + +#: src/modules/comp/e_mod_config.c:483 src/modules/comp/e_mod_config.c:489 +#: src/modules/comp/e_mod_config.c:495 src/modules/comp/e_mod_config.c:501 +#: src/modules/comp/e_mod_config.c:507 +msgid " / " +msgstr " / " + +#: src/modules/comp/e_mod_config.c:499 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:160 +msgid "Class:" +msgstr "Разред:" + +#: src/modules/comp/e_mod_config.c:505 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:176 +msgid "Role:" +msgstr "Улога:" + +#: src/modules/comp/e_mod_config.c:511 +msgid "Style:" +msgstr "Начин:" + +#: src/modules/comp/e_mod_config.c:681 +msgid "Edit Match" +msgstr "Уреди поклапање" + +#: src/modules/comp/e_mod_config.c:733 +msgid "Names" +msgstr "Имена" + +#: src/modules/comp/e_mod_config.c:780 +#: src/modules/conf_applications/e_int_config_defapps.c:335 +msgid "Types" +msgstr "Врсте" + +#: src/modules/comp/e_mod_config.c:797 +msgid "On" +msgstr "Укључен" + +#: src/modules/comp/e_mod_config.c:799 +#: src/modules/conf_display/e_int_config_desks.c:213 +#: src/modules/everything/evry_config.c:495 +msgid "Off" +msgstr "Искључи" + +#: src/modules/comp/e_mod_config.c:805 +msgid "Borderless" +msgstr "Безивични" + +#: src/modules/comp/e_mod_config.c:844 +msgid "Virtual Keyboard" +msgstr "Тастатура на екрану" + +#: src/modules/comp/e_mod_config.c:857 +msgid "Quick Panel" +msgstr "Брза полица" + +#: src/modules/comp/e_mod_config.c:868 +msgid "ARGB" +msgstr "АРГБ" + +#: src/modules/comp/e_mod_config.c:904 +msgid "Flags" +msgstr "Заставице" + +#: src/modules/comp/e_mod_config.c:1094 +msgid "Del" +msgstr "Бриши" + +#: src/modules/comp/e_mod_config.c:1096 src/modules/mixer/app_mixer.c:445 +msgid "Edit" +msgstr "Уреди" + +#: src/modules/comp/e_mod_config.c:1118 +#: src/modules/conf_applications/e_mod_main.c:18 +msgid "Apps" +msgstr "Програми" + +#: src/modules/comp/e_mod_config.c:1122 +msgid "E" +msgstr "Е" + +#: src/modules/comp/e_mod_config.c:1126 +msgid "Over" +msgstr "Преко" + +#: src/modules/comp/e_mod_config.c:1130 +#: src/modules/conf_menus/e_int_config_menus.c:277 +#: src/modules/conf_menus/e_mod_main.c:17 +msgid "Menus" +msgstr "Изборници" + +#: src/modules/comp/e_mod_config.c:1160 +msgid "Smooth scaling" +msgstr "Глатко размеравање" + +#: src/modules/comp/e_mod_config.c:1163 +msgid "Styles" +msgstr "Начини" + +#: src/modules/comp/e_mod_config.c:1169 +msgid "Effects" +msgstr "Утисци" + +#: src/modules/comp/e_mod_config.c:1173 +msgid "Sync windows" +msgstr "Усклади прозоре" + +#: src/modules/comp/e_mod_config.c:1175 +msgid "Loose sync" +msgstr "Одустани од усклађивања" + +#: src/modules/comp/e_mod_config.c:1177 +msgid "Grab Server during draw" +msgstr "Захвати служитеља приликом исцртавања" + +#: src/modules/comp/e_mod_config.c:1179 +msgid "Initial draw timeout for newly mapped windows" +msgstr "Време истека почетка исцртавања за нове мапиране прозоре" + +#: src/modules/comp/e_mod_config.c:1181 +#, c-format +msgid "%1.2f Seconds" +msgstr "%1.2f секунди" + +#: src/modules/comp/e_mod_config.c:1183 +msgid "Sync" +msgstr "Усклађивање" + +#: src/modules/comp/e_mod_config.c:1188 src/modules/comp/e_mod_config.c:1532 +msgid "Software" +msgstr "Мекотворина" + +#: src/modules/comp/e_mod_config.c:1194 src/modules/comp/e_mod_config.c:1538 +msgid "OpenGL" +msgstr "ОпенГЛ" + +#: src/modules/comp/e_mod_config.c:1197 +msgid "OpenGL options" +msgstr "ОпенГЛ.могућности" + +#: src/modules/comp/e_mod_config.c:1199 src/modules/comp/e_mod_config.c:1512 +msgid "Tear-free updates (VSynced)" +msgstr "Надоградње приказа без цепања (VSynced)" + +#: src/modules/comp/e_mod_config.c:1201 +msgid "Texture from pixmap" +msgstr "Текстура из мапе тачака" + +#: src/modules/comp/e_mod_config.c:1208 +msgid "Assume swapping method:" +msgstr "Претпостави начин замене меморије:" + +#: src/modules/comp/e_mod_config.c:1211 +msgid "Auto" +msgstr "Самостално" + +#: src/modules/comp/e_mod_config.c:1213 +msgid "Invalidate (full redraw)" +msgstr "Поништавање (потпуно прекрајање)" + +#: src/modules/comp/e_mod_config.c:1215 +msgid "Copy from back to front" +msgstr "Умножи одстрага напред" + +#: src/modules/comp/e_mod_config.c:1217 +msgid "Double buffered swaps" +msgstr "Двоструко међумеморисана заменска меморија" + +#: src/modules/comp/e_mod_config.c:1219 +msgid "Triple buffered swaps" +msgstr "Троструко међумеморисана заменска меморија" + +#: src/modules/comp/e_mod_config.c:1229 +#: src/modules/conf_performance/e_mod_main.c:19 +msgid "Engine" +msgstr "Погон" + +#: src/modules/comp/e_mod_config.c:1233 +msgid "Send flush" +msgstr "Пошаљи испирање (flush)" + +#: src/modules/comp/e_mod_config.c:1235 +msgid "Send dump" +msgstr "Пошаљи одбацивање (dump)" + +#: src/modules/comp/e_mod_config.c:1237 src/modules/comp/e_mod_config.c:1518 +msgid "Don't composite fullscreen windows" +msgstr "Немој слагати прозоре преко целог екрана" + +#: src/modules/comp/e_mod_config.c:1265 +msgid "Memory" +msgstr "Меморија" + +#: src/modules/comp/e_mod_config.c:1313 +msgid "Show Framerate" +msgstr "Прикажи брзину сличица" + +#: src/modules/comp/e_mod_config.c:1315 +msgid "Rolling average frame count" +msgstr "Измењива просечна брзина сличица" + +#: src/modules/comp/e_mod_config.c:1317 +#, c-format +msgid "%1.0f Frames" +msgstr "%1.0f сличица" + +#: src/modules/comp/e_mod_config.c:1321 +msgid "Corner" +msgstr "Угао" + +#: src/modules/comp/e_mod_config.c:1324 +msgid "Top Left" +msgstr "Горе лево" + +#: src/modules/comp/e_mod_config.c:1327 +msgid "Top Right" +msgstr "Горе десно" + +#: src/modules/comp/e_mod_config.c:1330 +msgid "Bottom Left" +msgstr "Доле лево" + +#: src/modules/comp/e_mod_config.c:1333 +msgid "Bottom Right" +msgstr "Доле десно" + +#: src/modules/comp/e_mod_config.c:1338 +msgid "Debug" +msgstr "Налажење грешака" + +#: src/modules/comp/e_mod_config.c:1515 +msgid "Smooth scaling of window content" +msgstr "Глатко размеравање садржаја прозора" + +#: src/modules/comp/e_mod_config.c:1521 +msgid "Select default style" +msgstr "Одредите подразумевани начин" + +#: src/modules/comp/e_mod_config.c:1542 +msgid "To reset compositor:" +msgstr "За враћање управника слагања на задато:" + +#: src/modules/comp/e_mod_config.c:1544 +msgid "Ctrl+Alt+Shift+Home" +msgstr "Ктрл+Мења+Више+Лична" + +#: src/modules/comp/e_mod_config.c:1547 +msgid "Rendering" +msgstr "Приказ" + +#: src/modules/comp/e_mod_main.c:43 src/modules/comp/e_mod_main.c:74 +msgid "Composite" +msgstr "Слагање приказа" + +#: src/modules/comp/e_mod_main.c:75 +msgid "" +"Dropshadow module is incompatible<br>with compositing. Disabling " +"the<br>Dropshadow module." +msgstr "" +"Јединица бацања сене није у сагласности<br>са слагањем приказа. " +"Онемогућавам<br>јединицу бацања сенке." + +#: src/modules/conf/e_mod_config.c:35 src/modules/conf/e_mod_main.c:285 +#: src/modules/conf/e_mod_main.c:299 +msgid "Configuration Panel" +msgstr "Плоча поставки" + +#: src/modules/conf/e_mod_config.c:65 +msgid "Show configurations in menu" +msgstr "Прикажи поставке у изборнику" + +#: src/modules/conf/e_mod_main.c:272 src/modules/conf/e_mod_main.c:276 +#: src/modules/conf/e_mod_main.c:452 +msgid "Settings Panel" +msgstr "Плоча поставки" + +#: src/modules/conf/e_mod_main.c:421 +#: src/modules/conf_display/e_int_config_screensaver.c:206 +msgid "Presentation" +msgstr "Излагање" + +#: src/modules/conf/e_mod_main.c:428 +msgid "Offline" +msgstr "Ван везе" + +#: src/modules/conf/e_mod_main.c:457 +msgid "Modes" +msgstr "Начини" + +#: src/modules/conf_applications/e_int_config_apps.c:84 +#: src/modules/conf_applications/e_int_config_apps.c:98 +#: src/modules/conf_applications/e_mod_main.c:33 +msgid "IBar Applications" +msgstr "Програми иTраке" + +#: src/modules/conf_applications/e_int_config_apps.c:113 +#: src/modules/conf_applications/e_mod_main.c:49 +msgid "Startup Applications" +msgstr "Почетни програми" + +#: src/modules/conf_applications/e_int_config_apps.c:129 +#: src/modules/conf_applications/e_mod_main.c:45 +msgid "Restart Applications" +msgstr "Поново покрени програме" + +#: src/modules/conf_applications/e_int_config_apps.c:144 +#: src/modules/conf_applications/e_mod_main.c:37 +msgid "Screen Lock Applications" +msgstr "Програми за закључавање екрана" + +#: src/modules/conf_applications/e_int_config_apps.c:159 +#: src/modules/conf_applications/e_mod_main.c:41 +msgid "Screen Unlock Applications" +msgstr "Програми за откључавање екрана" + +#: src/modules/conf_applications/e_int_config_apps.c:315 +msgid "Order" +msgstr "Распоред" + +#: src/modules/conf_applications/e_int_config_apps_personal.c:39 +#: src/modules/conf_applications/e_mod_main.c:25 +msgid "Personal Application Launchers" +msgstr "Лични покретачи програма" + +#: src/modules/conf_applications/e_int_config_defapps.c:74 +#: src/modules/conf_applications/e_int_config_defapps.c:304 +#: src/modules/conf_applications/e_mod_main.c:53 +msgid "Default Applications" +msgstr "Подразумевани програми" + +#: src/modules/conf_applications/e_int_config_defapps.c:297 +msgid "Custom Browser Command" +msgstr "Прилагођена наредба прегледника" + +#: src/modules/conf_applications/e_int_config_defapps.c:310 +msgid "Browser" +msgstr "Прегледник" + +#: src/modules/conf_applications/e_int_config_defapps.c:311 +msgid "E-Mail" +msgstr "Електронска пошта" + +#: src/modules/conf_applications/e_int_config_defapps.c:313 +msgid "Trash" +msgstr "Смеће" + +#: src/modules/conf_applications/e_int_config_defapps.c:314 +msgid "Terminal" +msgstr "Терминал" + +#: src/modules/conf_applications/e_int_config_defapps.c:322 +#: src/modules/conf_applications/e_int_config_defapps.c:350 +msgid "Selected Application" +msgstr "Означени програм" + +#: src/modules/conf_applications/e_int_config_deskenv.c:38 +#: src/modules/conf_applications/e_mod_main.c:57 +msgid "Desktop Environments" +msgstr "Радна окружења" + +#: src/modules/conf_applications/e_int_config_deskenv.c:93 +msgid "Execution" +msgstr "Извршење" + +#: src/modules/conf_applications/e_int_config_deskenv.c:94 +msgid "Only launch single instances" +msgstr "Покрећи само по један примерак" + +#: src/modules/conf_applications/e_int_config_deskenv.c:99 +msgid "X11 Basics" +msgstr "Икс11 основе" + +#: src/modules/conf_applications/e_int_config_deskenv.c:100 +msgid "Load X Resources" +msgstr "Учитај Икс изворе" + +#: src/modules/conf_applications/e_int_config_deskenv.c:103 +msgid "Load X Modifier Map" +msgstr "Учитај мапу Икс измењивача" + +#: src/modules/conf_applications/e_int_config_deskenv.c:108 +msgid "Major Desktops" +msgstr "Велика радна окружења" + +#: src/modules/conf_applications/e_int_config_deskenv.c:109 +msgid "Start GNOME services on login" +msgstr "Покрени Гномове услуге при пријави" + +#: src/modules/conf_applications/e_int_config_deskenv.c:112 +msgid "Start KDE services on login" +msgstr "Покрени КДЕ услуге при пријави" + +#: src/modules/conf_applications/e_mod_main.c:21 +msgid "Create Application Launcher" +msgstr "Направите покретач програма" + +#: src/modules/conf_applications/e_mod_main.c:62 +msgid "IBar Other" +msgstr "Остало о Tраци" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:53 +msgid "Profile Selector" +msgstr "Изабирач профила" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:106 +msgid "Available Profiles" +msgstr "Доступни профили" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:122 +#: src/modules/wizard/page_020.c:115 +msgid "Select a profile" +msgstr "Одаберите профил" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:138 +msgid "Scratch" +msgstr "Означи" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:141 +msgid "Reset" +msgstr "Врати на задате вредности" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:292 +#, c-format +msgid "Selected profile: %s" +msgstr "Одабрани профил: %s" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:315 +msgid "Add New Profile" +msgstr "Додај нови профил" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:336 +#, c-format +msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?" +msgstr "Желите избрисати профил „%s“.<br><br>Да ли сте сигурни?" + +#: src/modules/conf_dialogs/e_int_config_profiles.c:338 +msgid "Are you sure you want to delete this profile?" +msgstr "Да ли сте сигурни да желите избрисати овај профил?" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:38 +msgid "Dialog Settings" +msgstr "Поставке прозорчића за потврду" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:109 +#: src/modules/conf_performance/e_int_config_engine.c:86 +#: src/modules/conf_theme/e_int_config_fonts.c:674 +#: src/modules/everything/evry_config.c:519 src/modules/ibox/e_mod_config.c:97 +#: src/modules/mixer/conf_gadget.c:192 src/modules/mixer/conf_module.c:91 +msgid "General Settings" +msgstr "Опште поставке" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:111 +msgid "Disable Confirmation Dialogs" +msgstr "Онемогући прозорчиће потврде" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:113 +msgid "Normal Windows" +msgstr "Уобичајени прозори" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:120 +msgid "Default Settings Dialogs Mode" +msgstr "Подразумевани начин поставки прозорчића потврде" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:122 +#: src/modules/conf_dialogs/e_int_config_dialogs.c:166 +msgid "Basic Mode" +msgstr "Основни начин" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:124 +#: src/modules/conf_dialogs/e_int_config_dialogs.c:168 +msgid "Advanced Mode" +msgstr "Напредни начин" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:129 +msgid "Remember size and position of dialogs" +msgstr "Запамти величину и положај прозорчића потврде" + +#: src/modules/conf_dialogs/e_int_config_dialogs.c:163 +msgid "Default Dialog Mode" +msgstr "Подразумевани начин прозорчића потврде" + +#: src/modules/conf_dialogs/e_mod_main.c:18 +msgid "Dialogs" +msgstr "Прозорчићи потврде" + +#: src/modules/conf_dialogs/e_mod_main.c:19 +msgid "Profiles" +msgstr "Профили" + +#: src/modules/conf_display/e_int_config_desks.c:52 +#: src/modules/pager/e_mod_main.c:885 +msgid "Virtual Desktops Settings" +msgstr "Поставке нестварних радних површи" + +#: src/modules/conf_display/e_int_config_desks.c:168 +msgid "Number of Desktops" +msgstr "Број нестварних радних површи" + +#: src/modules/conf_display/e_int_config_desks.c:171 +msgid "Click to change wallpaper" +msgstr "Кликните за промену позадине" + +#: src/modules/conf_display/e_int_config_desks.c:178 +#: src/modules/conf_display/e_int_config_desks.c:183 +#: src/modules/conf_display/e_int_config_desklock.c:300 +#: src/modules/conf_interaction/e_int_config_mouse.c:222 +#: src/modules/conf_interaction/e_int_config_mouse.c:228 +#: src/modules/everything/evry_config.c:405 +#: src/modules/everything/evry_config.c:547 +#: src/modules/everything/evry_config.c:554 +#: src/modules/everything/evry_config.c:580 +#: src/modules/everything/evry_config.c:587 +#: src/modules/fileman/e_mod_config.c:327 +#: src/modules/syscon/e_int_config_syscon.c:148 +#: src/modules/syscon/e_int_config_syscon.c:153 +#: src/modules/syscon/e_int_config_syscon.c:158 +#: src/modules/tiling/e_mod_config.c:129 +#, c-format +msgid "%1.0f" +msgstr "%1.0f" + +#: src/modules/conf_display/e_int_config_desks.c:190 +msgid "Desktop Flip" +msgstr "Пребацивање радних површи" + +#: src/modules/conf_display/e_int_config_desks.c:191 +msgid "Flip when dragging objects to the screen edge" +msgstr "Пребаци приликом вучења предмета на ивицу екрана" + +#: src/modules/conf_display/e_int_config_desks.c:194 +msgid "Wrap desktops around when flipping" +msgstr "Преломи радне површи около при пребацивању" + +#: src/modules/conf_display/e_int_config_desks.c:200 +#: src/modules/conf_display/e_int_config_desk.c:192 +msgid "Desktop Window Profile" +msgstr "Профил прозора радне површи" + +#: src/modules/conf_display/e_int_config_desks.c:202 +msgid "Use desktop window profile" +msgstr "Користи профил прозора радне површи" + +#: src/modules/conf_display/e_int_config_desks.c:208 +msgid "Desktops" +msgstr "Радне површи" + +#: src/modules/conf_display/e_int_config_desks.c:216 +msgid "Pane" +msgstr "Клизно окно" + +#: src/modules/conf_display/e_int_config_desks.c:219 +msgid "Zoom" +msgstr "Увећање" + +#: src/modules/conf_display/e_int_config_desks.c:223 +msgid "Animation speed" +msgstr "Брзина анимације" + +#: src/modules/conf_display/e_int_config_desks.c:226 +#: src/modules/conf_performance/e_int_config_powermanagement.c:204 +#: src/modules/conf_window_manipulation/e_int_config_focus.c:279 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:252 +#, c-format +msgid "%1.1f s" +msgstr "%1.1f s" + +#: src/modules/conf_display/e_int_config_desks.c:231 +msgid "Flip Animation" +msgstr "Анимација пребацивања" + +#: src/modules/conf_display/e_int_config_desk.c:54 +msgid "Desk Settings" +msgstr "Поставке радне површи" + +#: src/modules/conf_display/e_int_config_desk.c:185 +msgid "Desktop Name" +msgstr "Назив радне површи" + +#: src/modules/conf_display/e_int_config_desk.c:193 +msgid "Profile Name:" +msgstr "Назив профила:" + +#: src/modules/conf_display/e_int_config_desk.c:200 +msgid "Desktop Wallpaper" +msgstr "Позадина радне површи" + +#: src/modules/conf_display/e_int_config_desk.c:206 +#: src/modules/fileman/e_int_config_mime.c:184 +msgid "Set" +msgstr "Постави" + +#: src/modules/conf_display/e_int_config_desklock_fsel.c:41 +msgid "Select a Background..." +msgstr "Изаберите позадину..." + +#: src/modules/conf_display/e_int_config_desklock_fsel.c:84 +#: src/modules/conf_intl/e_int_config_imc.c:803 +#: src/modules/conf_theme/e_int_config_wallpaper.c:423 +#: src/modules/conf_theme/e_int_config_wallpaper.c:577 +#: src/modules/conf_theme/e_int_config_startup.c:253 +#: src/modules/conf_theme/e_int_config_theme.c:728 +#: src/modules/conf_theme/e_int_config_theme.c:1103 +#: src/modules/conf_theme/e_int_config_theme.c:1112 +#: src/modules/gadman/e_mod_config.c:248 +msgid "Personal" +msgstr "Лично" + +#: src/modules/conf_display/e_int_config_desklock.c:80 +msgid "Screen Lock Settings" +msgstr "Поставке закључавања екрана" + +#: src/modules/conf_display/e_int_config_desklock.c:222 +msgid "Lock on Startup" +msgstr "Закључај по покретању" + +#: src/modules/conf_display/e_int_config_desklock.c:225 +msgid "Lock on Suspend" +msgstr "Закључај при обустави" + +#: src/modules/conf_display/e_int_config_desklock.c:229 +msgid "Custom Screenlock Command" +msgstr "Прилагођена наредба закључавања екрана" + +#: src/modules/conf_display/e_int_config_desklock.c:233 +msgid "Use Custom Screenlock Command" +msgstr "Користи прилагођену наредбу закључавања екрана" + +#: src/modules/conf_display/e_int_config_desklock.c:236 +msgid "Locking" +msgstr "Закључавање" + +#: src/modules/conf_display/e_int_config_desklock.c:278 +msgid "Keyboard Layout" +msgstr "Распоред тастатуре" + +#: src/modules/conf_display/e_int_config_desklock.c:284 +msgid "Show on all screens" +msgstr "Прикажи на свим екранима" + +#: src/modules/conf_display/e_int_config_desklock.c:289 +msgid "Show on current screen" +msgstr "Прикажи на садашњем екрану" + +#: src/modules/conf_display/e_int_config_desklock.c:294 +msgid "Show on screen #:" +msgstr "Прикажи не екрану #:" + +#: src/modules/conf_display/e_int_config_desklock.c:304 +msgid "Login Box" +msgstr "Прозорче за пријаву" + +#: src/modules/conf_display/e_int_config_desklock.c:309 +msgid "Lock after X screensaver activates" +msgstr "Закључај после покретања Икс чувара екрана" + +#: src/modules/conf_display/e_int_config_desklock.c:315 +#: src/modules/conf_display/e_int_config_desklock.c:340 +#: src/modules/conf_display/e_int_config_screensaver.c:183 +#: src/modules/conf_display/e_int_config_screensaver.c:200 +#: src/modules/fileman/e_mod_config.c:416 +#, c-format +msgid "%1.0f seconds" +msgstr "%1.0f секунди" + +#: src/modules/conf_display/e_int_config_desklock.c:321 +msgid "Lock when idle time exceeded" +msgstr "Закључај кад истекне време мировања" + +#: src/modules/conf_display/e_int_config_desklock.c:326 +#: src/modules/conf_display/e_int_config_screensaver.c:166 +#, c-format +msgid "%1.0f minutes" +msgstr "%1.0f минута" + +#: src/modules/conf_display/e_int_config_desklock.c:331 +msgid "Timers" +msgstr "Мерачи времена" + +#: src/modules/conf_display/e_int_config_desklock.c:336 +#: src/modules/conf_display/e_int_config_screensaver.c:195 +msgid "Suggest if deactivated before" +msgstr "Предложи ако се искључи пре" + +#: src/modules/conf_display/e_int_config_desklock.c:345 +msgid "Presentation Mode" +msgstr "Начин рада излагања" + +#: src/modules/conf_display/e_int_config_desklock.c:352 +#: src/modules/gadman/e_mod_config.c:210 +msgid "Theme Defined" +msgstr "Описано темом" + +#: src/modules/conf_display/e_int_config_desklock.c:356 +msgid "Theme Wallpaper" +msgstr "Позадина из теме" + +#: src/modules/conf_display/e_int_config_desklock.c:360 +msgid "Current Wallpaper" +msgstr "Садашња позадина" + +#: src/modules/conf_display/e_int_config_desklock.c:386 +#: src/modules/conf_theme/e_mod_main.c:34 +#: src/modules/conf_theme/e_mod_main.c:224 +#: src/modules/conf_theme/e_mod_main.c:231 +#: src/modules/conf_theme/e_mod_main.c:260 +msgid "Wallpaper" +msgstr "Слика за позадину" + +#: src/modules/conf_display/e_int_config_screensaver.c:58 +msgid "Screen Saver Settings" +msgstr "Поставке чувара екрана" + +#: src/modules/conf_display/e_int_config_screensaver.c:158 +msgid "Enable screen blanking" +msgstr "Омогући затамњење екрана" + +#: src/modules/conf_display/e_int_config_screensaver.c:163 +#: src/modules/syscon/e_int_config_syscon.c:167 +msgid "Timeout" +msgstr "Време истека" + +#: src/modules/conf_display/e_int_config_screensaver.c:171 +msgid "Suspend on blank" +msgstr "Обустави при затамњењу" + +#: src/modules/conf_display/e_int_config_screensaver.c:175 +msgid "Suspend even if AC" +msgstr "Обустави чак и ако је на мрежном напајању" + +#: src/modules/conf_display/e_int_config_screensaver.c:180 +msgid "Suspend delay" +msgstr "Одлагање обуставе" + +#: src/modules/conf_display/e_int_config_screensaver.c:188 +#: src/modules/conf_display/e_mod_main.c:32 +msgid "Blanking" +msgstr "Затамњивање" + +#: src/modules/conf_display/e_int_config_screensaver.c:192 +msgid "Presentation mode enabled" +msgstr "Начин рада излагање је омогућен" + +#: src/modules/conf_display/e_int_config_dpms.c:44 +msgid "Backlight Settings" +msgstr "Поставке позадинског осветљења" + +#: src/modules/conf_display/e_int_config_dpms.c:150 +msgid "Normal Backlight" +msgstr "Уобичајено позадинско осветљење" + +#: src/modules/conf_display/e_int_config_dpms.c:152 +#: src/modules/conf_display/e_int_config_dpms.c:158 +#, c-format +msgid "%3.0f" +msgstr "%3.0f" + +#: src/modules/conf_display/e_int_config_dpms.c:156 +msgid "Dim Backlight" +msgstr "Пригушено позадинско осветљење" + +#: src/modules/conf_display/e_int_config_dpms.c:162 +msgid "Idle Fade Time" +msgstr "Време до почетка изблеђивања" + +#: src/modules/conf_display/e_int_config_dpms.c:164 +#, c-format +msgid "%1.0f second(s)" +msgstr "%1.0f секунд(и)" + +#: src/modules/conf_display/e_int_config_dpms.c:170 +msgid "Fade Time" +msgstr "Време утапања" + +#: src/modules/conf_display/e_int_config_dpms.c:172 +#, c-format +msgid "%1.1f second(s)" +msgstr "%1.1f секунд(и)" + +#: src/modules/conf_display/e_mod_main.c:21 +#: src/modules/tiling/e_mod_config.c:198 +msgid "Virtual Desktops" +msgstr "Нестварне радне површи" + +#: src/modules/conf_display/e_mod_main.c:28 +msgid "Screen Lock" +msgstr "Закључавање екрана" + +#: src/modules/conf_display/e_mod_main.c:44 +msgid "Desk" +msgstr "Радни сто" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:4 +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:11 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:3 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:462 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:3 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:7 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:3 +msgid "<None>" +msgstr "<Ништа>" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:5 +msgid "" +"Please select an edge,<br>or click <hilight>Close</hilight> to abort." +"<br><br>You can either specify a delay of this<br> action using the slider, " +"or make it<br>respond to edge clicks:" +msgstr "" +"Молим, изаберите ивицу,<br>или кликните <hilight>Затворите</hilight> за " +"напуштање.<br><br>Можете чак и одредити кашњење ове<br>радње користећи " +"клизач, или начинити га<br>да одговара на клик по ивицама:" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105 +msgid "Edge Bindings Settings" +msgstr "Поставке пречица ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258 +#: src/modules/conf_edgebindings/e_mod_main.c:21 +msgid "Edge Bindings" +msgstr "Пречице ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:251 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:298 +#: src/modules/conf_paths/e_int_config_env.c:314 +msgid "Modify" +msgstr "Измените" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:816 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:255 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:302 +msgid "Delete All" +msgstr "Обриши све" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:820 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:259 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:306 +msgid "Restore Default Bindings" +msgstr "Врати задате пречице" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:825 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:209 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:264 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:312 +msgid "Action" +msgstr "Радња" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290 +msgid "Mouse Button" +msgstr "Дугме миша" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:296 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:832 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:216 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:271 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:319 +msgid "Action Params" +msgstr "Одреднице радње" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:306 +msgid "General Options" +msgstr "Опште могућности" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:307 +msgid "Allow binding activation with fullscreen windows" +msgstr "Дозволи покретање пречицама са прозорима преко пуног екрана" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:309 +msgid "Allow binding activation with multiple screens (DANGEROUS!)" +msgstr "Дозволи покретање пречицама са више екрана (ОПАСНО!)" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:874 +msgid "Edge Binding Sequence" +msgstr "Низ пречица ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:893 +msgid "Clickable edge" +msgstr "Кликћућа ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1214 +msgid "Edge Binding Error" +msgstr "Грешка пречица ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1215 +#, c-format +msgid "" +"The edge binding that you chose is already used by<br><hilight>%s</hilight> " +"action.<br>Please choose another edge to bind." +msgstr "" +"Пречица ивица коју сте изабрали је већ у употреби за радњу<br><hilight>%s</" +"hilight>.<br>Молим, изаберите другу ивицу за пречицу." + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1350 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1305 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1337 +msgid "CTRL" +msgstr "КТРЛ" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1355 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1310 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1342 +msgid "ALT" +msgstr "МЕЊА" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1361 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1316 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1348 +msgid "SHIFT" +msgstr "ПОМАК" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1367 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1322 +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1354 +msgid "WIN" +msgstr "СУПЕР" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1377 +msgid "Left Edge" +msgstr "Лева ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1381 +msgid "Top Edge" +msgstr "Горња ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1385 +msgid "Right Edge" +msgstr "Десна ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1389 +msgid "Bottom Edge" +msgstr "Доња ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1393 +msgid "Top Left Edge" +msgstr "Горња лева ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1397 +msgid "Top Right Edge" +msgstr "Горња десна ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1401 +msgid "Bottom Right Edge" +msgstr "Доња десна ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1405 +msgid "Bottom Left Edge" +msgstr "Доња лева ивица" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419 +#, c-format +msgid "(left clickable)" +msgstr "(лева кликћућа)" + +#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421 +#, c-format +msgid "(clickable)" +msgstr "(кликћућа)" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574 +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:584 +msgid "Signal Binding Error" +msgstr "Грешка доделе пречице" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:574 +msgid "Signal and Source must NOT be blank!" +msgstr "Знак и извор НЕ могу бити празни!" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:585 +#, c-format +msgid "" +"The signal and source that you entered are already used by<br><hilight>%s</" +"hilight> action.<br>" +msgstr "" +"Знак и извор које сте унели су већ у употреби за радњу <br><hilight>%s</" +"hilight>.<br>" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:634 +msgid "Add Signal Binding" +msgstr "Додај знак пречице" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:645 +msgid "Source:" +msgstr "Извор:" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:650 +msgid "Signal:" +msgstr "Знак:" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:804 +#: src/modules/conf_edgebindings/e_mod_main.c:25 +msgid "Signal Bindings" +msgstr "Знаковне пречице" + +#: src/modules/conf_edgebindings/e_int_config_signalbindings.c:865 +msgid "Signal Bindings Settings" +msgstr "Поставке пречице знака" + +#: src/modules/conf_edgebindings/e_mod_main.c:17 +#: src/modules/conf_interaction/e_mod_main.c:17 +#: src/modules/conf_keybindings/e_mod_main.c:17 +#: src/modules/mixer/app_mixer.c:308 src/modules/mixer/app_mixer.c:326 +#: src/modules/xkbswitch/e_mod_main.c:71 +msgid "Input" +msgstr "Улаз" + +#: src/modules/conf_interaction/e_int_config_interaction.c:36 +msgid "Interaction Settings" +msgstr "Поставке општења" + +#: src/modules/conf_interaction/e_int_config_interaction.c:95 +msgid "Thumbscroll" +msgstr "Премицање палцем" + +#: src/modules/conf_interaction/e_int_config_interaction.c:97 +msgid "Enable Thumbscroll" +msgstr "Омогући премицање палцем" + +#: src/modules/conf_interaction/e_int_config_interaction.c:102 +msgid "Threshold for a thumb drag" +msgstr "Задршка премицања мишем" + +#: src/modules/conf_interaction/e_int_config_interaction.c:105 +#: src/modules/conf_interaction/e_int_config_mouse.c:178 +#, c-format +msgid "%1.0f pixels" +msgstr "%1.0f тачака" + +#: src/modules/conf_interaction/e_int_config_interaction.c:110 +msgid "Threshold for applying drag momentum" +msgstr "Задршка пре примене тренутка вучења" + +#: src/modules/conf_interaction/e_int_config_interaction.c:113 +#, c-format +msgid "%1.0f pixels/s" +msgstr "%1.0f тачке/ака" + +#: src/modules/conf_interaction/e_int_config_interaction.c:119 +msgid "Friction slowdown" +msgstr "Трење успоравања" + +#: src/modules/conf_interaction/e_int_config_interaction.c:122 +#: src/modules/conf_performance/e_int_config_powermanagement.c:243 +#, c-format +msgid "%1.2f s" +msgstr "%1.2f s" + +#: src/modules/conf_interaction/e_int_config_mouse.c:47 +msgid "Mouse Settings" +msgstr "Поставке миша" + +#: src/modules/conf_interaction/e_int_config_mouse.c:166 +msgid "Show Cursor" +msgstr "Прикажи показивач" + +#: src/modules/conf_interaction/e_int_config_mouse.c:183 +#: src/modules/conf_theme/e_mod_main.c:163 +#: src/modules/conf_theme/e_mod_main.c:234 +#: src/modules/conf_theme/e_mod_main.c:263 +msgid "Theme" +msgstr "Тема" + +#: src/modules/conf_interaction/e_int_config_mouse.c:187 +msgid "X" +msgstr "Икс" + +#: src/modules/conf_interaction/e_int_config_mouse.c:197 +msgid "Idle effects" +msgstr "Дејства мироваања" + +#: src/modules/conf_interaction/e_int_config_mouse.c:203 +msgid "Cursor" +msgstr "Показивач" + +#: src/modules/conf_interaction/e_int_config_mouse.c:210 +msgid "Mouse Hand" +msgstr "Рука миша" + +#: src/modules/conf_interaction/e_int_config_mouse.c:218 +msgid "Mouse Acceleration" +msgstr "Убрзање миша" + +#: src/modules/conf_interaction/e_int_config_mouse.c:220 +msgid "Acceleration" +msgstr "Убрзање" + +#: src/modules/conf_interaction/e_int_config_mouse.c:226 +msgid "Threshold" +msgstr "Праг" + +#: src/modules/conf_interaction/e_int_config_mouse.c:233 +#: src/modules/conf_interaction/e_mod_main.c:24 +msgid "Mouse" +msgstr "Миш" + +#: src/modules/conf_interaction/e_mod_main.c:20 +msgid "Touch" +msgstr "Додир" + +#: src/modules/conf_intl/e_int_config_imc.c:103 +#: src/modules/conf_intl/e_mod_main.c:28 +msgid "Input Method Settings" +msgstr "Поставке начина уноса" + +#: src/modules/conf_intl/e_int_config_imc.c:279 +msgid "Input Method Selector" +msgstr "Одређивач начина уноса" + +#: src/modules/conf_intl/e_int_config_imc.c:282 +#: src/modules/conf_intl/e_int_config_imc.c:870 +msgid "Use No Input Method" +msgstr "Не користи начине уноса" + +#: src/modules/conf_intl/e_int_config_imc.c:289 +#: src/modules/conf_intl/e_int_config_imc.c:935 +msgid "Setup Selected Input Method" +msgstr "Подеси начин уноса" + +#: src/modules/conf_intl/e_int_config_imc.c:875 +msgid "New" +msgstr "Нови" + +#: src/modules/conf_intl/e_int_config_imc.c:879 +msgid "Import..." +msgstr "Увeзи..." + +#: src/modules/conf_intl/e_int_config_imc.c:883 +msgid "Input Method Parameters" +msgstr "Одреднице начина уноса" + +#: src/modules/conf_intl/e_int_config_imc.c:893 +msgid "Execute Command" +msgstr "Изврши наредбу" + +#: src/modules/conf_intl/e_int_config_imc.c:900 +msgid "Setup Command" +msgstr "Подеси наредбу" + +#: src/modules/conf_intl/e_int_config_imc.c:909 +msgid "Exported Environment Variables" +msgstr "Извезене променљиве окружења" + +#: src/modules/conf_intl/e_int_config_imc_import.c:67 +msgid "Select an Input Method Settings..." +msgstr "Одреди поставке начина уноса..." + +#: src/modules/conf_intl/e_int_config_imc_import.c:283 +#: src/modules/conf_intl/e_int_config_imc_import.c:299 +msgid "Input Method Config Import Error" +msgstr "Грешка увоза поставки начина уноса" + +#: src/modules/conf_intl/e_int_config_imc_import.c:284 +msgid "" +"Enlightenment was unable to import the configuration.<br><br>Are you sure " +"this is really a valid configuration?" +msgstr "" +"Просвећење није упело да увезе поставке.<br><br>Да ли сте сигурни да је су " +"то стварно исправне поставке?" + +#: src/modules/conf_intl/e_int_config_imc_import.c:300 +msgid "" +"Enlightenment was unable to import the configuration<br>due to a copy error." +msgstr "" +"Просвећење није успело да увезе поставке<br>због грешке при умножавању." + +#: src/modules/conf_intl/e_int_config_intl.c:598 +#: src/modules/conf_intl/e_mod_main.c:20 +msgid "Language Settings" +msgstr "Језичке поставке" + +#: src/modules/conf_intl/e_int_config_intl.c:621 +#: src/modules/conf_intl/e_mod_main.c:24 +msgid "Desklock Language Settings" +msgstr "Језичке поставке часовника" + +#: src/modules/conf_intl/e_int_config_intl.c:954 +#, c-format +msgid "" +"You have some extra locale environment<br>variables set that may interfere " +"with<br>correct display of your chosen language.<br>If you don't want these " +"affected, use the<br>Environment variable settings to unset them.<br>The " +"variables that may affect you are<br>as follows:<br>%s" +msgstr "" +"Имате вишак поставки променљивих окружења<br>локализације које се могу " +"сукобити са<br>правилним приказом вашег одабраног језика.<br>Уколико не " +"желите ову појаву, користите<br>поставке променљиве окружења да их поништите." +"<br>Променљиве које вам могу сметати су<br>следеће:<br>%s" + +#: src/modules/conf_intl/e_int_config_intl.c:962 +msgid "Possible Locale problems" +msgstr "Могући проблеми локализације" + +#: src/modules/conf_intl/e_int_config_intl.c:1032 +#: src/modules/conf_intl/e_int_config_intl.c:1123 +msgid "Language Selector" +msgstr "Изабирач језика" + +#: src/modules/conf_intl/e_int_config_intl.c:1062 +#: src/modules/conf_intl/e_int_config_intl.c:1511 +#: src/modules/conf_menus/e_int_config_menus.c:169 +#: src/modules/wizard/page_010.c:169 +msgid "System Default" +msgstr "Подразумеване вредности система" + +#: src/modules/conf_intl/e_int_config_intl.c:1096 +#: src/modules/conf_intl/e_int_config_intl.c:1174 +msgid "Locale Selected" +msgstr "Локализација је изабрана" + +#: src/modules/conf_intl/e_int_config_intl.c:1097 +#: src/modules/conf_intl/e_int_config_intl.c:1175 +msgid "Locale" +msgstr "Локализација" + +#: src/modules/conf_intl/e_mod_main.c:17 src/modules/wizard/page_010.c:160 +msgid "Language" +msgstr "Језик" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:71 +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:190 +#: src/modules/conf_keybindings/e_mod_main.c:29 +msgid "ACPI Bindings" +msgstr "АЦПИ пречице" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:349 +msgid "AC Adapter Unplugged" +msgstr "Исправљач струје извучен" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:350 +msgid "AC Adapter Plugged" +msgstr "Исправљач струје убачен" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:351 +msgid "Ac Adapter" +msgstr "Струјни исправљач" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:356 +msgid "Button" +msgstr "Дугме" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:358 +msgid "Fan" +msgstr "Хладњак" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:361 +msgid "Lid Unknown" +msgstr "Непознати поклопац" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:362 +msgid "Lid Closed" +msgstr "Поклопац затворен" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:363 +msgid "Lid Opened" +msgstr "Поклопац отворен" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:364 +msgid "Lid" +msgstr "Поклопац" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:367 +msgid "Power Button" +msgstr "Дугме за укључивање" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:369 +msgid "Processor" +msgstr "Процесор" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:371 +msgid "Sleep Button" +msgstr "Дугме спавања" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:373 +msgid "Thermal" +msgstr "Температура" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:375 +msgid "Video" +msgstr "Видео" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:377 +msgid "Wifi" +msgstr "Бежична веза" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:381 +msgid "Zoom Out" +msgstr "Удаљи" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:383 +msgid "Zoom In" +msgstr "Приближи" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:385 +msgid "Brightness Down" +msgstr "Смањи осветљење" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:387 +msgid "Brightness Up" +msgstr "Повећај осветљење" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:389 +msgid "Assist" +msgstr "Помоћ" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:391 +msgid "S1" +msgstr "S1" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:393 +msgid "Vaio" +msgstr "Vaio" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:497 +msgid "ACPI Binding" +msgstr "АЦПИ пречице" + +#: src/modules/conf_keybindings/e_int_config_acpibindings.c:500 +msgid "" +"Please trigger the ACPI event you wish to bind to, <br><br>or " +"<hilight>Escape</hilight> to abort." +msgstr "" +"Молим, окините АЦПИ догађај којем желите додати пречицу, <br><br>или " +"<hilight>Изађи</hilight> за одустанак." + +#: src/modules/conf_keybindings/e_int_config_keybindings.c:8 +msgid "Single key" +msgstr "Један тастер" + +#: src/modules/conf_keybindings/e_int_config_keybindings.c:106 +msgid "Key Bindings Settings" +msgstr "Поставке пречице тастера" + +#: src/modules/conf_keybindings/e_int_config_keybindings.c:239 +#: src/modules/conf_keybindings/e_mod_main.c:21 +msgid "Key Bindings" +msgstr "Пречице тастатуре" + +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1165 +msgid "Binding Key Error" +msgstr "Грешка тастера пречице" + +#: src/modules/conf_keybindings/e_int_config_keybindings.c:1166 +#, c-format +msgid "" +"The binding key sequence, that you choose, is already used by <br><hilight>" +"%s</hilight> action.<br>Please choose another binding key sequence." +msgstr "" +"Низ дугмади пречице који сте изабрали је већ у употреби за <br><hilight>%s</" +"hilight> радњу.<br>Молим, изаберите други низ дугмади за пречицу." + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:109 +msgid "Mouse Bindings Settings" +msgstr "Поставке пречица миша" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:247 +msgid "" +"Unable to set a mouse wheel binding without modifiers<br>on a window: " +"conflict with existing edje signal bindings.<br>FIXME!!!" +msgstr "" +"Нисам успео да поставим пречицу точкића миша без тастера измењивача<br>на " +"прозору:сукоб са постојећим знацима за пречице едје.<br>ПОПРАВИ МЕ!!!" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:250 +msgid "Mouse Binding Error" +msgstr "Грешка пречице миша" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:286 +#: src/modules/conf_keybindings/e_mod_main.c:25 +msgid "Mouse Bindings" +msgstr "Пречице миша" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:326 +msgid "Action Context" +msgstr "Објашњење радњи" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:328 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:348 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:352 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:356 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:360 +msgid "Any" +msgstr "Било који" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:340 +msgid "Win List" +msgstr "Списак прозора" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:344 +#: src/modules/pager/e_mod_config.c:141 src/modules/pager/e_mod_config.c:261 +msgid "Popup" +msgstr "Искакање" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:348 +msgid "Zone" +msgstr "Област" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:352 +msgid "Container" +msgstr "Садржалац" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:356 +msgid "Manager" +msgstr "Управник" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:745 +msgid "Mouse Buttons" +msgstr "Дугмад миша" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:805 +msgid "Mouse Wheels" +msgstr "Точкићи миша" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1178 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1196 +#: src/modules/pager/e_mod_config.c:373 src/modules/pager/e_mod_config.c:399 +#, c-format +msgid "Left button" +msgstr "Лево дугме" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1180 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1194 +#: src/modules/pager/e_mod_config.c:378 src/modules/pager/e_mod_config.c:394 +#, c-format +msgid "Right button" +msgstr "Десно дугме" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1183 +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1199 +#: src/modules/pager/e_mod_config.c:383 src/modules/pager/e_mod_config.c:404 +#: src/modules/pager/e_mod_config.c:409 +#, c-format +msgid "Button %i" +msgstr "Дугме %i" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1189 +#: src/modules/pager/e_mod_config.c:388 +#, c-format +msgid "Middle button" +msgstr "Средње дугме" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1211 +#, c-format +msgid "Extra button (%d)" +msgstr "Додатно дугме (%d)" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1227 +msgid "Mouse Wheel Up" +msgstr "Точкић миша навише" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1229 +msgid "Mouse Wheel Down" +msgstr "Точкић миша наниже" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1233 +#, c-format +msgid "Extra Wheel (%d) Up" +msgstr "Додатни точкић (%d) навише" + +#: src/modules/conf_keybindings/e_int_config_mousebindings.c:1235 +#, c-format +msgid "Extra Wheel (%d) Down" +msgstr "Додатни точкић (%d) наниже" + +#: src/modules/conf_menus/e_int_config_menus.c:38 +#: src/modules/conf_menus/e_mod_main.c:18 +msgid "Menu Settings" +msgstr "Поставке изборника" + +#: src/modules/conf_menus/e_int_config_menus.c:174 +msgid "Enlightenment Default" +msgstr "Подразумеване поставке Просвећења" + +#: src/modules/conf_menus/e_int_config_menus.c:182 +msgid "Personal Default" +msgstr "Личне подразумеване поставке" + +#: src/modules/conf_menus/e_int_config_menus.c:257 +msgid "Main Menu" +msgstr "Главни изборник" + +#: src/modules/conf_menus/e_int_config_menus.c:258 +#: src/modules/fileman/e_mod_menu.c:434 +msgid "Favorites" +msgstr "Омиљено" + +#: src/modules/conf_menus/e_int_config_menus.c:264 +msgid "Applications Display" +msgstr "Приказ програма" + +#: src/modules/conf_menus/e_int_config_menus.c:267 +#: src/modules/ibar/e_mod_config.c:138 +msgid "Generic" +msgstr "Општи" + +#: src/modules/conf_menus/e_int_config_menus.c:269 +msgid "Comments" +msgstr "Примедбе" + +#: src/modules/conf_menus/e_int_config_menus.c:273 +#: src/modules/gadman/e_mod_config.c:232 src/modules/gadman/e_mod_main.c:25 +#: src/modules/gadman/e_mod_main.c:76 src/modules/gadman/e_mod_main.c:83 +#: src/modules/gadman/e_mod_main.c:203 +#: src/modules/xkbswitch/e_mod_config.c:298 +msgid "Gadgets" +msgstr "Справице" + +#: src/modules/conf_menus/e_int_config_menus.c:274 +msgid "Show gadget settings in top-level" +msgstr "Прикажи поставке справица на вршном слоју" + +#: src/modules/conf_menus/e_int_config_menus.c:287 +msgid "Margin" +msgstr "Ивице" + +#: src/modules/conf_menus/e_int_config_menus.c:289 +#: src/modules/conf_menus/e_int_config_menus.c:294 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:186 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:195 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:204 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:257 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:262 +#, c-format +msgid "%2.0f pixels" +msgstr "%2.0f тачака" + +#: src/modules/conf_menus/e_int_config_menus.c:292 +msgid "Cursor Margin" +msgstr "Ивица показивача" + +#: src/modules/conf_menus/e_int_config_menus.c:297 +msgid "Autoscroll" +msgstr "Самостално премицање" + +#: src/modules/conf_menus/e_int_config_menus.c:301 +msgid "Menu Scroll Speed" +msgstr "Брзина премицања изборника" + +#: src/modules/conf_menus/e_int_config_menus.c:303 +#, c-format +msgid "%5.0f pixels/s" +msgstr "%5.0f тачка/е/ака" + +#: src/modules/conf_menus/e_int_config_menus.c:306 +msgid "Fast Mouse Move Threshold" +msgstr "Задршка брзог кретања мишем" + +#: src/modules/conf_menus/e_int_config_menus.c:308 +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:197 +#, c-format +msgid "%4.0f pixels/s" +msgstr "%4.0f тачка/е/ака" + +#: src/modules/conf_menus/e_int_config_menus.c:311 +msgid "Click Drag Timeout" +msgstr "Задршка вучења кликом" + +#: src/modules/conf_menus/e_int_config_menus.c:313 +#, c-format +msgid "%2.2f s" +msgstr "%2.2f s" + +#: src/modules/conf_menus/e_int_config_menus.c:316 +#: src/modules/conf_window_manipulation/e_int_config_focus.c:341 +#: src/modules/notification/e_mod_config.c:141 +msgid "Miscellaneous" +msgstr "Разно" + +#: src/modules/conf_paths/e_int_config_paths.c:59 +msgid "Search Path Settings" +msgstr "Поставке путање претраге" + +#: src/modules/conf_paths/e_int_config_paths.c:70 +msgid "Data" +msgstr "Подаци" + +#: src/modules/conf_paths/e_int_config_paths.c:72 +msgid "Images" +msgstr "Слике" + +#: src/modules/conf_paths/e_int_config_paths.c:74 +#: src/modules/conf_theme/e_int_config_fonts.c:433 +#: src/modules/conf_theme/e_mod_main.c:243 +msgid "Fonts" +msgstr "Словни ликови" + +#: src/modules/conf_paths/e_int_config_paths.c:76 +#: src/modules/conf_theme/e_int_config_theme.c:1394 +#: src/modules/conf_theme/e_mod_main.c:172 +msgid "Themes" +msgstr "Теме" + +#: src/modules/conf_paths/e_int_config_paths.c:78 +#: src/modules/conf_theme/e_int_config_xsettings.c:540 +#: src/modules/everything/evry_config.c:438 +#: src/modules/everything/evry_config.c:464 +msgid "Icons" +msgstr "Иконе" + +#: src/modules/conf_paths/e_int_config_paths.c:82 +msgid "Backgrounds" +msgstr "Позадине" + +#: src/modules/conf_paths/e_int_config_paths.c:84 +msgid "Messages" +msgstr "Поруке" + +#: src/modules/conf_paths/e_int_config_paths.c:166 +msgid "Enlightenment Paths" +msgstr "Путање просвећења" + +#: src/modules/conf_paths/e_int_config_paths.c:197 +msgid "Default Directories" +msgstr "Подразумеване фасцикле" + +#: src/modules/conf_paths/e_int_config_paths.c:204 +msgid "User Defined Directories" +msgstr "Кориснички одређене фасцикле" + +#: src/modules/conf_paths/e_int_config_env.c:36 +#: src/modules/conf_paths/e_mod_main.c:24 +msgid "Environment Variables" +msgstr "Променљиве окружења" + +#: src/modules/conf_paths/e_int_config_env.c:306 +msgid "Unset" +msgstr "Уклони вредност" + +#: src/modules/conf_paths/e_mod_main.c:20 +msgid "Search Directories" +msgstr "Фасцикле претраге" + +#: src/modules/conf_performance/e_int_config_engine.c:37 +msgid "Engine Settings" +msgstr "Поставке погона" + +#: src/modules/conf_performance/e_int_config_engine.c:87 +#: src/modules/conf_performance/e_int_config_engine.c:108 +msgid "Use ARGB instead of shaped windows" +msgstr "Користи АРГБ уместо обликованих прозора" + +#: src/modules/conf_performance/e_int_config_engine.c:110 +msgid "" +"You have chosen to enable ARGB composite support,<br>but your current screen " +"does not support composite.<br><br>Are you sure you wish to enable ARGB " +"support?" +msgstr "" +"Изабрали сте да омогућите АРБГ подршку слагања,<br>али, ваш тренутни екран " +"нема подршку слагања.<br><br>Да ли сте сигурни да желите омогућити АРГБ " +"подршку?" + +#: src/modules/conf_performance/e_int_config_engine.c:114 +msgid "Enable" +msgstr "Омогући" + +#: src/modules/conf_performance/e_int_config_performance.c:36 +msgid "Performance Settings" +msgstr "Поставке учинковитости" + +#: src/modules/conf_performance/e_int_config_performance.c:107 +msgid "Framerate" +msgstr "Проток сличица" + +#: src/modules/conf_performance/e_int_config_performance.c:109 +#, c-format +msgid "%1.0f fps" +msgstr "%1.0f кпс" + +#: src/modules/conf_performance/e_int_config_performance.c:113 +msgid "Application priority" +msgstr "Предност програма" + +#: src/modules/conf_performance/e_int_config_performance.c:119 +msgid "Allow module load delay" +msgstr "Дозволи јединици касније учитавање" + +#: src/modules/conf_performance/e_int_config_performance.c:126 +msgid "Cache flush interval" +msgstr "Време пражњења међумеморије" + +#: src/modules/conf_performance/e_int_config_performance.c:132 +msgid "Font cache size" +msgstr "Величина међумеморије за словни лик" + +#: src/modules/conf_performance/e_int_config_performance.c:134 +#, c-format +msgid "%1.1f MiB" +msgstr "%1.1f MiB" + +#: src/modules/conf_performance/e_int_config_performance.c:138 +msgid "Image cache size" +msgstr "Величина међумеморије за слике" + +#: src/modules/conf_performance/e_int_config_performance.c:140 +#: src/modules/fileman/e_mod_config.c:410 +#, c-format +msgid "%1.0f MiB" +msgstr "%1.0f MiB" + +#: src/modules/conf_performance/e_int_config_performance.c:144 +msgid "Caches" +msgstr "Оставе" + +#: src/modules/conf_performance/e_int_config_performance.c:148 +msgid "Number of Edje files to cache" +msgstr "Број едје за смештај у оставу" + +#: src/modules/conf_performance/e_int_config_performance.c:150 +#, c-format +msgid "%1.0f files" +msgstr "%1.0f датотека" + +#: src/modules/conf_performance/e_int_config_performance.c:154 +msgid "Number of Edje collections to cache" +msgstr "Број збирки едје за смештај у оставу" + +#: src/modules/conf_performance/e_int_config_performance.c:156 +#, c-format +msgid "%1.0f collections" +msgstr "%1.0f збирака" + +#: src/modules/conf_performance/e_int_config_performance.c:159 +msgid "Edje Cache" +msgstr "Едје остава" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:41 +msgid "Power Management Settings" +msgstr "Поставке управљања напајањем" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:120 +msgid "Levels Allowed" +msgstr "Дозвољени степени" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:129 +msgid "Time to defer power-hungry tasks" +msgstr "Време одлагања између задатака гладних потрошње" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:140 +msgid "Min" +msgstr "Најмање" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:148 +msgid "Max" +msgstr "Највише" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:157 +msgid "Level" +msgstr "Степен" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:166 +msgid "e.g. Saving to disk" +msgstr "нпр. чување на диску" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:235 +#: src/modules/shot/e_mod_main.c:731 +#: src/modules/notification/e_mod_config.c:96 +msgid "Low" +msgstr "низак" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:274 +#: src/modules/dropshadow/e_mod_config.c:124 src/modules/shot/e_mod_main.c:729 +msgid "Medium" +msgstr "осредњи" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:282 +#: src/modules/conf_performance/e_int_config_powermanagement.c:321 +#: src/modules/conf_performance/e_int_config_powermanagement.c:360 +#, c-format +msgid "%.0f s" +msgstr "%.0f s" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:313 +#: src/modules/shot/e_mod_main.c:727 +msgid "High" +msgstr "висок" + +#: src/modules/conf_performance/e_int_config_powermanagement.c:352 +msgid "Extreme" +msgstr "сулуд" + +#: src/modules/conf_performance/e_mod_main.c:18 +msgid "Performance" +msgstr "Учинковитост" + +#: src/modules/conf_performance/e_mod_main.c:20 +msgid "Power Management" +msgstr "Управљање потрошњом" + +#: src/modules/conf_randr/e_int_config_randr.c:48 +#: src/modules/conf_randr/e_mod_main.c:24 +msgid "Screen Setup" +msgstr "Поставке екрана" + +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Излаз" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "Поврати по покретању" + +#: src/modules/conf_shelves/e_int_config_shelf.c:129 +#, c-format +msgid "Configured Shelves: Display %d" +msgstr "Подешене полице: приказ %d" + +#: src/modules/conf_shelves/e_int_config_shelf.c:390 +#, c-format +msgid "Are you sure you want to delete \"%s\"?" +msgstr "Да ли сте сигурни да желите да избришете „%s“?" + +#: src/modules/conf_shelves/e_int_config_shelf.c:393 +msgid "Confirm Shelf Deletion" +msgstr "Потврди брисање полице" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:103 +msgid "Wallpaper Settings" +msgstr "Поставке позадине" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:433 +#: src/modules/conf_theme/e_int_config_wallpaper.c:587 +msgid "Go up a directory" +msgstr "Иди у родитељску фасциклу" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:465 +#: src/modules/conf_theme/e_int_config_wallpaper.c:612 +msgid "Use Theme Wallpaper" +msgstr "Користи слику за позадине из теме" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:470 +#: src/modules/conf_theme/e_int_config_wallpaper.c:617 +msgid "Picture..." +msgstr "Слика..." + +#: src/modules/conf_theme/e_int_config_wallpaper.c:633 +msgid "Where to place the Wallpaper" +msgstr "Где сместити слику позадине" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:634 +msgid "All Desktops" +msgstr "све површи" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:636 +msgid "This Desktop" +msgstr "ова површ" + +#: src/modules/conf_theme/e_int_config_wallpaper.c:638 +msgid "This Screen" +msgstr "овај екран" + +#: src/modules/conf_theme/e_int_config_borders.c:30 +#: src/modules/conf_theme/e_int_config_borders.c:209 +msgid "Default Border Style" +msgstr "Подразумевани приказ оквира" + +#: src/modules/conf_theme/e_int_config_borders.c:50 +msgid "Window Border Selection" +msgstr "Одабир оквира прозора" + +#: src/modules/conf_theme/e_int_config_borders.c:255 +msgid "Remember this Border for this window next time it appears" +msgstr "Запамти овај оквир овог прозора за свој следећи приказ" + +#: src/modules/conf_theme/e_int_config_color_classes.c:78 +msgid "Border Title" +msgstr "Наслов оквира прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:79 +msgid "Border Title Active" +msgstr "Наслов радног прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:80 +msgid "Border Frame" +msgstr "Оквир" + +#: src/modules/conf_theme/e_int_config_color_classes.c:81 +msgid "Border Frame Active" +msgstr "Радни ивични оквир" + +#: src/modules/conf_theme/e_int_config_color_classes.c:82 +msgid "Error Text" +msgstr "Текстуална грешка" + +#: src/modules/conf_theme/e_int_config_color_classes.c:83 +msgid "Menu Background Base" +msgstr "Позадинска основа изборника" + +#: src/modules/conf_theme/e_int_config_color_classes.c:84 +#: src/modules/conf_theme/e_int_config_fonts.c:61 +msgid "Menu Title" +msgstr "Наслов изборника" + +#: src/modules/conf_theme/e_int_config_color_classes.c:85 +msgid "Menu Title Active" +msgstr "Радни наслов изборника" + +#: src/modules/conf_theme/e_int_config_color_classes.c:86 +#: src/modules/conf_theme/e_int_config_fonts.c:60 +msgid "Menu Item" +msgstr "Ставка изборника" + +#: src/modules/conf_theme/e_int_config_color_classes.c:87 +msgid "Menu Item Active" +msgstr "Радна ставка изборника" + +#: src/modules/conf_theme/e_int_config_color_classes.c:88 +msgid "Menu Item Disabled" +msgstr "Онемогућена ставка изборника" + +#: src/modules/conf_theme/e_int_config_color_classes.c:89 +#: src/modules/conf_theme/e_int_config_fonts.c:65 +msgid "Move Text" +msgstr "Помери текст" + +#: src/modules/conf_theme/e_int_config_color_classes.c:90 +#: src/modules/conf_theme/e_int_config_fonts.c:66 +msgid "Resize Text" +msgstr "Промени величину текста" + +#: src/modules/conf_theme/e_int_config_color_classes.c:91 +msgid "Winlist Item" +msgstr "Ставка списка прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:92 +msgid "Winlist Item Active" +msgstr "Покренута ставка списка прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:93 +msgid "Winlist Label" +msgstr "Ознака списка прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:94 +#: src/modules/conf_theme/e_int_config_fonts.c:67 +msgid "Winlist Title" +msgstr "Наслов списка прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:95 +msgid "Dialog Background Base" +msgstr "Позадинска основа прозорчића потврде" + +#: src/modules/conf_theme/e_int_config_color_classes.c:96 +msgid "Shelf Background Base" +msgstr "Основа позадине полице" + +#: src/modules/conf_theme/e_int_config_color_classes.c:97 +msgid "File Manager Background Base" +msgstr "Позадинска подршка управника датотека" + +#: src/modules/conf_theme/e_int_config_color_classes.c:102 +#: src/modules/conf_window_manipulation/e_int_config_focus.c:265 +#: src/modules/winlist/e_int_config_winlist.c:214 +msgid "Focus" +msgstr "Жижа" + +#: src/modules/conf_theme/e_int_config_color_classes.c:103 +#: src/modules/conf_theme/e_int_config_fonts.c:71 +msgid "Button Text" +msgstr "Текст дугмета" + +#: src/modules/conf_theme/e_int_config_color_classes.c:104 +msgid "Button Text Disabled" +msgstr "Текст дугмета је онемогућен" + +#: src/modules/conf_theme/e_int_config_color_classes.c:105 +msgid "Check Text" +msgstr "Дугме провере" + +#: src/modules/conf_theme/e_int_config_color_classes.c:106 +msgid "Check Text Disabled" +msgstr "Дугме провере је онемогућено" + +#: src/modules/conf_theme/e_int_config_color_classes.c:107 +msgid "Entry Text" +msgstr "Текст уноса" + +#: src/modules/conf_theme/e_int_config_color_classes.c:108 +msgid "Entry Text Disabled" +msgstr "Текст уноса је онемогућен" + +#: src/modules/conf_theme/e_int_config_color_classes.c:109 +msgid "Label Text" +msgstr "Текст ознаке" + +#: src/modules/conf_theme/e_int_config_color_classes.c:110 +msgid "List Item Text Selected" +msgstr "Текст ставке списка је означен" + +#: src/modules/conf_theme/e_int_config_color_classes.c:111 +msgid "List Item Text (Even)" +msgstr "Текст ставке списка (парана)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:112 +msgid "List Item Background Base (Even)" +msgstr "Позадинска основа ставке списка (паран)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:113 +msgid "List Item Text (Odd)" +msgstr "Текст ставке списка (непаран)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:114 +msgid "List Item Background Base (Odd)" +msgstr "Позадинска основа ставке списка (непарана)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:115 +msgid "List Header Text (Even)" +msgstr "Текста заглавља списка (паран)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:116 +msgid "List Header Background Base (Even)" +msgstr "Позадинска основа заглавља списка (парна)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:117 +msgid "List Header Text (Odd)" +msgstr "Текста заглавља списка (непаран)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:119 +msgid "List Header Background Base (Odd)" +msgstr "Позадинска основа заглавља списка (непарна)" + +#: src/modules/conf_theme/e_int_config_color_classes.c:120 +msgid "Radio Text" +msgstr "Текст радио дугмета" + +#: src/modules/conf_theme/e_int_config_color_classes.c:121 +msgid "Radio Text Disabled" +msgstr "Текст радио дугмета је онемогућен" + +#: src/modules/conf_theme/e_int_config_color_classes.c:122 +msgid "Slider Text" +msgstr "Текст клизача" + +#: src/modules/conf_theme/e_int_config_color_classes.c:123 +msgid "Slider Text Disabled" +msgstr "Текст клизача је онемогућен" + +#: src/modules/conf_theme/e_int_config_color_classes.c:124 +msgid "Frame Background Base" +msgstr "Позадинска основа оквира" + +#: src/modules/conf_theme/e_int_config_color_classes.c:125 +msgid "Scroller Frame Background Base" +msgstr "Позадинска основа шине оквира" + +#: src/modules/conf_theme/e_int_config_color_classes.c:130 +msgid "Module Label" +msgstr "Јединица ознаке" + +#: src/modules/conf_theme/e_int_config_color_classes.c:131 +msgid "Composite Focus-out Color" +msgstr "Боја слагања при напуштању жиже" + +#: src/modules/conf_theme/e_int_config_color_classes.c:163 +#: src/modules/conf_theme/e_mod_main.c:240 +msgid "Colors" +msgstr "Боје" + +#: src/modules/conf_theme/e_int_config_color_classes.c:271 +#, c-format +msgid "Color class: %s" +msgstr "Разред боја: %s" + +#: src/modules/conf_theme/e_int_config_color_classes.c:278 +#, c-format +msgid "Selected %u mixed colors classes" +msgstr "Означено је %u мешаних разреда боја" + +#: src/modules/conf_theme/e_int_config_color_classes.c:281 +#, c-format +msgid "Selected %u unset colors classes" +msgstr "Означено је %u неподешених разреда боја" + +#: src/modules/conf_theme/e_int_config_color_classes.c:284 +#, c-format +msgid "Selected %u uniform colors classes" +msgstr "Означено је %u једнообразних разреда боја" + +#: src/modules/conf_theme/e_int_config_color_classes.c:288 +#: src/modules/conf_theme/e_int_config_color_classes.c:548 +msgid "No selected color class" +msgstr "Нема изабраног разреда боја" + +#: src/modules/conf_theme/e_int_config_color_classes.c:551 +msgid "Custom colors" +msgstr "Прилагођене боје" + +#: src/modules/conf_theme/e_int_config_color_classes.c:557 +msgid "Object:" +msgstr "Предмет:" + +#: src/modules/conf_theme/e_int_config_color_classes.c:563 +msgid "Outline:" +msgstr "Обрис:" + +#: src/modules/conf_theme/e_int_config_color_classes.c:569 +msgid "Shadow:" +msgstr "Сена:" + +#: src/modules/conf_theme/e_int_config_color_classes.c:601 +msgid "Text with applied colors." +msgstr "Текст са додатим бојама." + +#: src/modules/conf_theme/e_int_config_color_classes.c:607 +msgid "Colors depend on theme capabilities." +msgstr "Боје зависе од могућности теме." + +#: src/modules/conf_theme/e_int_config_color_classes.c:858 +msgid "Window Manager" +msgstr "Управник прозора" + +#: src/modules/conf_theme/e_int_config_color_classes.c:860 +#: src/modules/conf_theme/e_int_config_fonts.c:81 +msgid "Widgets" +msgstr "Справице површи" + +#: src/modules/conf_theme/e_int_config_color_classes.c:866 +msgid "Others" +msgstr "Друго" + +#: src/modules/conf_theme/e_int_config_fonts.c:59 +msgid "Title Bar" +msgstr "Трака наслова" + +#: src/modules/conf_theme/e_int_config_fonts.c:62 +msgid "Textblock Plain" +msgstr "Уобичајен део текста" + +#: src/modules/conf_theme/e_int_config_fonts.c:63 +msgid "Textblock Light" +msgstr "Узак део текста" + +#: src/modules/conf_theme/e_int_config_fonts.c:64 +msgid "Textblock Big" +msgstr "Велики део текста" + +#: src/modules/conf_theme/e_int_config_fonts.c:68 +msgid "Settings Heading" +msgstr "Поставке заглавља" + +#: src/modules/conf_theme/e_int_config_fonts.c:69 +msgid "About Title" +msgstr "О наслову" + +#: src/modules/conf_theme/e_int_config_fonts.c:70 +msgid "About Version" +msgstr "О издању" + +#: src/modules/conf_theme/e_int_config_fonts.c:72 +msgid "Desklock Title" +msgstr "Наслов сата површи" + +#: src/modules/conf_theme/e_int_config_fonts.c:73 +msgid "Desklock Password" +msgstr "Лозинка сата површи" + +#: src/modules/conf_theme/e_int_config_fonts.c:74 +msgid "Dialog Error" +msgstr "Грешка прозорчића потврде" + +#: src/modules/conf_theme/e_int_config_fonts.c:75 +msgid "Exebuf Command" +msgstr "Егзебаф наредба" + +#: src/modules/conf_theme/e_int_config_fonts.c:76 +msgid "Splash Title" +msgstr "Наслов поздравног приказа" + +#: src/modules/conf_theme/e_int_config_fonts.c:77 +msgid "Splash Text" +msgstr "Текст поздравног приказа" + +#: src/modules/conf_theme/e_int_config_fonts.c:78 +msgid "Splash Version" +msgstr "Издање поздравног приказа" + +#: src/modules/conf_theme/e_int_config_fonts.c:79 +msgid "Digital Clock" +msgstr "Бројчани часовник" + +#: src/modules/conf_theme/e_int_config_fonts.c:82 +msgid "Entry" +msgstr "Улаз" + +#: src/modules/conf_theme/e_int_config_fonts.c:83 +msgid "Frame" +msgstr "Оквир" + +#: src/modules/conf_theme/e_int_config_fonts.c:84 +msgid "Label" +msgstr "Ознаке" + +#: src/modules/conf_theme/e_int_config_fonts.c:85 +msgid "Buttons" +msgstr "Дугмад" + +#: src/modules/conf_theme/e_int_config_fonts.c:86 +msgid "Slider" +msgstr "Клизач" + +#: src/modules/conf_theme/e_int_config_fonts.c:87 +msgid "Radio Buttons" +msgstr "Радио дугмад" + +#: src/modules/conf_theme/e_int_config_fonts.c:88 +msgid "Check Buttons" +msgstr "Дугме за ознаку" + +#: src/modules/conf_theme/e_int_config_fonts.c:89 +msgid "Text List Item" +msgstr "Текст ставке списка" + +#: src/modules/conf_theme/e_int_config_fonts.c:90 +msgid "List Item" +msgstr "Ставка списка" + +#: src/modules/conf_theme/e_int_config_fonts.c:91 +msgid "List Header" +msgstr "Заглавље списка" + +#: src/modules/conf_theme/e_int_config_fonts.c:93 +msgid "Filemanager" +msgstr "Управник датотека" + +#: src/modules/conf_theme/e_int_config_fonts.c:94 +msgid "Typebuf" +msgstr "Врста међуспремника" + +#: src/modules/conf_theme/e_int_config_fonts.c:96 +msgid "Desktop Icon" +msgstr "Икона површи" + +#: src/modules/conf_theme/e_int_config_fonts.c:99 +#: src/modules/conf_theme/e_int_config_fonts.c:258 +msgid "Small" +msgstr "мalа" + +#: src/modules/conf_theme/e_int_config_fonts.c:101 +msgid "Large" +msgstr "велика" + +#: src/modules/conf_theme/e_int_config_fonts.c:102 +msgid "Small Styled" +msgstr "мала налицкана" + +#: src/modules/conf_theme/e_int_config_fonts.c:103 +msgid "Normal Styled" +msgstr "обична налицкана" + +#: src/modules/conf_theme/e_int_config_fonts.c:104 +msgid "Large Styled" +msgstr "Велика налицкана" + +#: src/modules/conf_theme/e_int_config_fonts.c:167 +msgid "Font Settings" +msgstr "Поставке словног лика" + +#: src/modules/conf_theme/e_int_config_fonts.c:252 +msgid "Tiny" +msgstr "мајушни" + +#: src/modules/conf_theme/e_int_config_fonts.c:270 +msgid "Big" +msgstr "велики" + +#: src/modules/conf_theme/e_int_config_fonts.c:276 +msgid "Really Big" +msgstr "врло велики" + +#: src/modules/conf_theme/e_int_config_fonts.c:282 +msgid "Huge" +msgstr "огроман" + +#: src/modules/conf_theme/e_int_config_fonts.c:291 +#, c-format +msgid "%d pixel" +msgid_plural "%d pixels" +msgstr[0] "%d тачка" +msgstr[1] "%d тачке" +msgstr[2] "%d тачака" + +#: src/modules/conf_theme/e_int_config_fonts.c:427 +msgid "Enable Custom Font Classes" +msgstr "Омогући прилагођене разреде словног лика" + +#: src/modules/conf_theme/e_int_config_fonts.c:449 +#: src/modules/conf_theme/e_int_config_fonts.c:669 +msgid "English 012 #!? 日本語 にほんご ソフト 中文 華語 한국" +msgstr "English 012 #!? 日本語 にほんご ソフト 中文 華語 한국" + +#: src/modules/conf_theme/e_int_config_fonts.c:628 +msgid "Font Classes" +msgstr "Разреди словног лика" + +#: src/modules/conf_theme/e_int_config_fonts.c:635 +msgid "Enable Font Class" +msgstr "Омогући разред словног лика" + +#: src/modules/conf_theme/e_int_config_fonts.c:642 +msgid "Font" +msgstr "Словни лик" + +#: src/modules/conf_theme/e_int_config_fonts.c:678 +msgid "Hinting" +msgstr "Наговештавање" + +#: src/modules/conf_theme/e_int_config_fonts.c:681 +msgid "Bytecode" +msgstr "Битни код" + +#: src/modules/conf_theme/e_int_config_fonts.c:685 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:280 +#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:265 +msgid "Automatic" +msgstr "Самостално" + +#: src/modules/conf_theme/e_int_config_fonts.c:694 +msgid "Font Fallbacks" +msgstr "Заменски словни лик" + +#: src/modules/conf_theme/e_int_config_fonts.c:695 +msgid "Fallback Name" +msgstr "Име заменског" + +#: src/modules/conf_theme/e_int_config_fonts.c:707 +msgid "Enable Fallbacks" +msgstr "Омогући заменске поставке" + +#: src/modules/conf_theme/e_int_config_fonts.c:716 +msgid "Hinting / Fallbacks" +msgstr "Наговештавање / заменско" + +#: src/modules/conf_theme/e_int_config_scale.c:132 +msgid "Factor" +msgstr "Множилац" + +#: src/modules/conf_theme/e_int_config_scale.c:180 +msgid "Scale Settings" +msgstr "Поставке размера" + +#: src/modules/conf_theme/e_int_config_scale.c:232 +msgid "DPI Scaling" +msgstr "Размера ТПИ" + +#: src/modules/conf_theme/e_int_config_scale.c:302 +msgid "Don't Scale" +msgstr "Немој размеравати" + +#: src/modules/conf_theme/e_int_config_scale.c:305 +msgid "Scale relative to screen DPI" +msgstr "Размери у односу на ТПИ" + +#: src/modules/conf_theme/e_int_config_scale.c:310 +#, c-format +msgid "Base DPI (Currently %i DPI)" +msgstr "Основна ТПИ (тренутно %i ТПИ)" + +#: src/modules/conf_theme/e_int_config_scale.c:314 +#, c-format +msgid "%1.0f DPI" +msgstr "%1.0f ТПИ" + +#: src/modules/conf_theme/e_int_config_scale.c:318 +msgid "Custom scaling factor" +msgstr "Прилагођени умножак размере" + +#: src/modules/conf_theme/e_int_config_scale.c:321 +#, c-format +msgid "%1.2f x" +msgstr "%1.2f x" + +#: src/modules/conf_theme/e_int_config_scale.c:325 +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:216 +msgid "Policy" +msgstr "Смернице" + +#: src/modules/conf_theme/e_int_config_scale.c:330 +msgid "Minimum" +msgstr "најмање" + +#: src/modules/conf_theme/e_int_config_scale.c:333 +#: src/modules/conf_theme/e_int_config_scale.c:340 +#, c-format +msgid "%1.2f times" +msgstr "%1.2f пута" + +#: src/modules/conf_theme/e_int_config_scale.c:337 +msgid "Maximum" +msgstr "највеће" + +#: src/modules/conf_theme/e_int_config_scale.c:344 +msgid "Constraints" +msgstr "Ограничења" + +#: src/modules/conf_theme/e_int_config_startup.c:38 +msgid "Startup Settings" +msgstr "Поставке самосталног покретања при пријави" + +#: src/modules/conf_theme/e_int_config_startup.c:317 +msgid "Show Splash Screen on Login" +msgstr "Прикажи поздравни приказ при пријави" + +#: src/modules/conf_theme/e_int_config_transitions.c:46 +msgid "Transition Settings" +msgstr "Поставке прелаза" + +#: src/modules/conf_theme/e_int_config_transitions.c:173 +msgid "Events" +msgstr "Догађаји" + +#: src/modules/conf_theme/e_int_config_transitions.c:181 +#: src/modules/conf_theme/e_mod_main.c:255 +msgid "Startup" +msgstr "Покретање по пријави" + +#: src/modules/conf_theme/e_int_config_transitions.c:182 +msgid "Desk Change" +msgstr "Промена радне површи" + +#: src/modules/conf_theme/e_int_config_transitions.c:183 +msgid "Background Change" +msgstr "Промена позадине" + +#: src/modules/conf_theme/e_int_config_transitions.c:191 +#: src/modules/conf_theme/e_mod_main.c:249 +msgid "Transitions" +msgstr "Прелази" + +#: src/modules/conf_theme/e_int_config_theme.c:369 +msgid "Theme Selector" +msgstr "Изабирач тема" + +#: src/modules/conf_theme/e_int_config_theme.c:610 +msgid "Theme File Error" +msgstr "Грешка датотеке теме" + +#: src/modules/conf_theme/e_int_config_theme.c:611 +#, c-format +msgid "%s is probably not an E17 theme!" +msgstr "%s вероватно није E17 тема!" + +#: src/modules/conf_theme/e_int_config_theme.c:773 +msgid " Import..." +msgstr " Увези..." + +#: src/modules/conf_theme/e_int_config_theme.c:1385 +msgid "Theme Categories" +msgstr "Врсте тема" + +#: src/modules/conf_theme/e_int_config_theme.c:1403 +msgid "Assign" +msgstr "Додели" + +#: src/modules/conf_theme/e_int_config_theme.c:1406 +msgid "Clear" +msgstr "Очисти" + +#: src/modules/conf_theme/e_int_config_theme.c:1409 +msgid "Clear All" +msgstr "Очисти све" + +#: src/modules/conf_theme/e_int_config_theme_import.c:66 +msgid "Select a Theme..." +msgstr "Изаберите тему..." + +#: src/modules/conf_theme/e_int_config_theme_import.c:283 +#: src/modules/conf_theme/e_int_config_theme_import.c:292 +msgid "Theme Import Error" +msgstr "Грешка увоза теме" + +#: src/modules/conf_theme/e_int_config_theme_import.c:284 +msgid "" +"Enlightenment was unable to import the theme.<br><br>Are you sure this is " +"really a valid theme?" +msgstr "" +"Просвећење није успело да увезе тему.<br><br>Да ли сте сигурни да је то " +"заиста одговарајућа тема?" + +#: src/modules/conf_theme/e_int_config_theme_import.c:293 +msgid "Enlightenment was unable to import the theme<br>due to a copy error." +msgstr "Просвећење није успело да увезе тему.<br>због грешке при умножавању." + +#: src/modules/conf_theme/e_int_config_xsettings.c:61 +msgid "Application Theme Settings" +msgstr "Поставке тема програма" + +#: src/modules/conf_theme/e_int_config_xsettings.c:488 +msgid "Match Enlightenment theme if possible" +msgstr "Уклопи тему просвећења ако је изводљиво" + +#: src/modules/conf_theme/e_int_config_xsettings.c:497 +msgid "Enable X Application Settings" +msgstr "Омогући поставке Икс програма" + +#: src/modules/conf_theme/e_int_config_xsettings.c:501 +msgid "GTK Applications" +msgstr "ГТК програми" + +#: src/modules/conf_theme/e_int_config_xsettings.c:532 +msgid "Enable icon theme for applications" +msgstr "Омогући тему икона за програме" + +#: src/modules/conf_theme/e_int_config_xsettings.c:536 +msgid "Enable icon theme for Enlightenment" +msgstr "Омогући тему икона за Просвећење" + +#: src/modules/conf_theme/e_mod_main.c:237 +msgid "Application Theme" +msgstr "Тема програма" + +#: src/modules/conf_theme/e_mod_main.c:246 +msgid "Borders" +msgstr "Оквири" + +#: src/modules/conf_theme/e_mod_main.c:252 +msgid "Scaling" +msgstr "Размера" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:36 +msgid "Window List Menu Settings" +msgstr "Поставке листа изборника прозора" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:97 +msgid "Group By" +msgstr "Разврстај по" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:105 +msgid "Include windows from other screens" +msgstr "Укључује прозоре са осталих екрана" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:110 +msgid "Separate Groups By" +msgstr "Раздвоји врсте по" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:114 +msgid "Using separator bars" +msgstr "користећи раздвојне траке" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:117 +msgid "Using menus" +msgstr "користећи изборник" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:121 +msgid "Grouping" +msgstr "разврставање" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:128 +msgid "Alphabetical" +msgstr "Абецедно" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:131 +msgid "Window stacking layer" +msgstr "Слој слагања прозора" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:134 +msgid "Most recently used" +msgstr "Најскорије употребљавани" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:137 +msgid "Sort Order" +msgstr "Правило разврставања" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:142 +msgid "Group with owning desktop" +msgstr "Разврстај по припадности радној површи" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:145 +msgid "Group with current desktop" +msgstr "Разврстај по тренутној радној површи" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:148 +msgid "Separate group" +msgstr "Раздвоји врсту" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:151 +msgid "Warp to owning desktop" +msgstr "Извитопери по припадајућој радној површи" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:154 +msgid "Iconified Windows" +msgstr "Умањени прозори" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:158 +msgid "Limit caption length" +msgstr "Ограничи дужину натписа" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:161 +#, c-format +msgid "%1.0f Chars" +msgstr "%1.0f знака" + +#: src/modules/conf_window_manipulation/e_int_config_clientlist.c:165 +msgid "Captions" +msgstr "Натписи" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:47 +#: src/modules/conf_window_manipulation/e_mod_main.c:18 +msgid "Window Display" +msgstr "Приказ прозора" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:134 +msgid "Border Icon" +msgstr "Ивица икона" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:136 +msgid "User defined" +msgstr "Кориснички одређено" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:138 +msgid "Application provided" +msgstr "Обезбеђено програмски" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:142 +msgid "Move Geometry" +msgstr "Размера померања" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:143 +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:154 +msgid "Display information" +msgstr "Приказ података" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:146 +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:157 +msgid "Follows the window" +msgstr "Узми прозор у жижу" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:153 +msgid "Resize Geometry" +msgstr "Размера промене величине" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:163 +#: src/modules/fileman/e_mod_config.c:356 +#: src/modules/winlist/e_int_config_winlist.c:210 +#: src/modules/tasks/e_mod_config.c:86 +msgid "Display" +msgstr "Приказ" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:168 +msgid "Placement" +msgstr "Смештај" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:170 +msgid "Smart Placement" +msgstr "Паметан смештај" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:173 +msgid "Don't hide Gadgets" +msgstr "Не скривај справице" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:176 +msgid "Place at mouse pointer" +msgstr "Смести испод миша" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:179 +msgid "Place manually with the mouse" +msgstr "Смети ручно мишем" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:182 +msgid "Group with windows of the same application" +msgstr "Удружуј прозоре истог програма" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:186 +msgid "Switch to desktop of new window" +msgstr "Промени на радни простор новог прозора" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:189 +msgid "New Windows" +msgstr "Нови прозори" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:194 +msgid "Animate" +msgstr "Анимирај" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:206 +msgid "Linear" +msgstr "Редно" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:211 +msgid "Accelerate, then decelerate" +msgstr "Убрзај, па успори" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:216 +msgid "Accelerate" +msgstr "Убрзај" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:221 +msgid "Decelerate" +msgstr "Успори" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:226 +msgid "Pronounced Accelerate" +msgstr "Нагло убрзај" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:231 +msgid "Pronounced Decelerate" +msgstr "Нагло успори" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:236 +msgid "Pronounced Accelerate, then decelerate" +msgstr "Нагло убрзај, па успори" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:241 +msgid "Bounce" +msgstr "Одскок" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:246 +msgid "Bounce more" +msgstr "Још одскачи" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:251 +msgid "Shading" +msgstr "Смотавање" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:261 +msgid "Keep windows within the visual screen limits" +msgstr "Држи прозоре на видљиве границе екрана" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:264 +msgid "Allow windows partly out of the visual screen limits" +msgstr "Дозволи делимичан прелаз прозора ван видљиве границе екрана" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:267 +msgid "Allow windows completely out of visual screen limits" +msgstr "Дозволи потпуни прелаз прозорима ван видљиве границе екрана" + +#: src/modules/conf_window_manipulation/e_int_config_window_display.c:270 +msgid "Screen Limits" +msgstr "Границе екрана" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:58 +msgid "Focus Settings" +msgstr "Поставке жиже" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:220 +msgid "Click Window to Focus" +msgstr "Клик на прозор за жижу" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:222 +msgid "Window under the Mouse" +msgstr "Прозор под мишем" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:224 +msgid "Most recent Window under the Mouse" +msgstr "Претходни прозор под мишем" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:227 +#: src/modules/conf_window_manipulation/e_int_config_focus.c:272 +msgid "Raise windows on mouse over" +msgstr "Издигни прозоре надношењем миша" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:246 +#: src/modules/wizard/page_060.c:33 +msgid "Click" +msgstr "кликом" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:248 +msgid "Pointer" +msgstr "Показивач" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:250 +msgid "Sloppy" +msgstr "Немаран" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:253 +msgid "New Window Focus" +msgstr "Жижа на нови прозор" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:255 +msgid "No window" +msgstr "Без прозора" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:257 +msgid "All windows" +msgstr "Сви прозори" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:259 +msgid "Only dialogs" +msgstr "Само прозорчићи потврде" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:261 +msgid "Only dialogs with focused parent" +msgstr "Само прозорчићи потврде са родитељским прозором у жижи" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:271 +msgid "Autoraise" +msgstr "Самостално издизање" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:275 +msgid "Delay before raising:" +msgstr "Одгађање издизања:" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:289 +msgid "Raise Window" +msgstr "Издигни прозор" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:291 +msgid "Raise when starting to move or resize" +msgstr "Издигни при померању или промени величине" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:294 +msgid "Raise when focusing" +msgstr "Издигни при стављању у жижу" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:302 +msgid "Active Window Hint Policy" +msgstr "Смернице наговештаја радних прозора" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:304 +msgid "Ignore hint" +msgstr "Занемари наговеештаје" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:306 +msgid "Animate on hint" +msgstr "Анимирај наговештаје" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:308 +msgid "Activate on hint" +msgstr "Покрени на наговештај" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:310 +msgid "Hints" +msgstr "Наговештаји" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:314 +msgid "Other Settings" +msgstr "Друге поставкее" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:315 +msgid "Always pass click events to programs" +msgstr "Увек преноси догађаје клика програмима" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:318 +msgid "Click raises the window" +msgstr "Клик издиже прозор" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:321 +msgid "Click focuses the window" +msgstr "Клик ставља прозор у жижу" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:324 +msgid "Refocus last window on desktop switch" +msgstr "Стави у жижу последњи прозор при промени радне површи" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:327 +msgid "Focus last focused window on lost focus" +msgstr "Пребаци последњи прозор у жижу при губљењу жиже" + +#: src/modules/conf_window_manipulation/e_int_config_focus.c:337 +msgid "Slide pointer to a new window which is focused" +msgstr "Клизни показивачем на нови прозор у жижи" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:66 +#: src/modules/conf_window_manipulation/e_mod_main.c:20 +msgid "Window Geometry" +msgstr "Размера прозора" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:180 +msgid "Resist obstacles" +msgstr "Отпор препрекама" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:182 +msgid "Other windows" +msgstr "Остали прозори" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:191 +msgid "Edge of the screen" +msgstr "Ивица екрана" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:200 +msgid "Desktop gadgets" +msgstr "Справице радне површи" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:211 +msgid "Resistance" +msgstr "Одбојност" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:221 +msgid "Smart expansion" +msgstr "Паметно ширење" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:225 +msgid "Fill available space" +msgstr "Испуни доступно место" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:228 +msgid "Direction" +msgstr "Правац" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:234 +msgid "Both" +msgstr "Оба" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:237 +msgid "Manipulation" +msgstr "Управљање" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:238 +msgid "Allow manipulation of maximized windows" +msgstr "Дозволи управљање увећаним прозорима" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:241 +msgid "Allow windows above fullscreen window" +msgstr "Дозволи прозоре изнад прозора преко целог екрана" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:245 +msgid "Maximization" +msgstr "Увећавање" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:250 +msgid "Automatically accept changes after:" +msgstr "Самостално прихвати промене после:" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:255 +msgid "Move by" +msgstr "Помери за" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:260 +msgid "Resize by" +msgstr "Промени величину за" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:265 +#: src/modules/wizard/page_011.c:142 src/modules/xkbswitch/e_mod_main.c:74 +#: src/modules/xkbswitch/e_mod_main.c:252 +msgid "Keyboard" +msgstr "Тастатура" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:271 +msgid "Limit resize to useful geometry" +msgstr "ограничи промену величине на корисну сразмеру" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:274 +msgid "Move after resize" +msgstr "Помери после промене величине" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:277 +msgid "Adjust windows on shelf hide" +msgstr "Прилагоди прозоре при скривању полице" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:285 +msgid "Follow Move" +msgstr "Прати покрет" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:288 +msgid "Follow Resize" +msgstr "Прати промену величине" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:291 +msgid "Follow Raise" +msgstr "Прати издизање" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:294 +msgid "Follow Lower" +msgstr "Прати спуштање" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:297 +msgid "Follow Layer" +msgstr "Прати слој" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:300 +msgid "Follow Desktop" +msgstr "Прати радну површ" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:303 +msgid "Follow Iconify" +msgstr "Прати умањење" + +#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:307 +#: src/modules/quickaccess/e_mod_config.c:312 +msgid "Transients" +msgstr "Прелази" + +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:39 +#: src/modules/conf_window_manipulation/e_mod_main.c:22 +msgid "Window Process Management" +msgstr "Управа обрадом прозора" + +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:95 +msgid "Kill process if unclosable" +msgstr "Убиј незатворив процес" + +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:97 +msgid "Kill process instead of client" +msgstr "Убиј процес уместо клијента" + +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:99 +msgid "Kill timeout:" +msgstr "Одлагање убиства:" + +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:105 +msgid "Ping clients" +msgstr "Упит ка клијенту" + +#: src/modules/conf_window_manipulation/e_int_config_window_process.c:107 +msgid "Ping interval:" +msgstr "Учесталост упита:" + +#: src/modules/conf_window_manipulation/e_mod_main.c:19 +#: src/modules/wizard/page_060.c:27 +msgid "Window Focus" +msgstr "Жижа прозора" + +#: src/modules/conf_window_manipulation/e_mod_main.c:21 +msgid "Window List Menu" +msgstr "Изборник списка прозора" + +#: src/modules/conf_window_remembers/e_int_config_remembers.c:35 +#: src/modules/conf_window_remembers/e_mod_main.c:17 +msgid "Window Remembers" +msgstr "Памћења прозора" + +#: src/modules/conf_window_remembers/e_int_config_remembers.c:134 +msgid "Remember internal dialogs" +msgstr "Запамти означавања унутрашњих прозорчића" + +#: src/modules/conf_window_remembers/e_int_config_remembers.c:137 +msgid "Remember file manager windows" +msgstr "Упамти прозоре управника датотека" + +#: src/modules/conf_window_remembers/e_int_config_remembers.c:151 +msgid "Details" +msgstr "Појединости" + +#: src/modules/conf_window_remembers/e_int_config_remembers.c:336 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:338 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:340 +#: src/modules/conf_window_remembers/e_int_config_remembers.c:342 +msgid "No selection" +msgstr "Ништа није означено" + +#: src/modules/cpufreq/e_mod_main.c:136 +msgid "Cpufreq" +msgstr "Учесталост процесора" + +#: src/modules/cpufreq/e_mod_main.c:183 +msgid "Fast (4 ticks)" +msgstr "Брзо (4 откуцаја)" + +#: src/modules/cpufreq/e_mod_main.c:190 +msgid "Medium (8 ticks)" +msgstr "Средње (8 откуцаја)" + +#: src/modules/cpufreq/e_mod_main.c:197 +msgid "Normal (32 ticks)" +msgstr "Обично (32 откуцаја)" + +#: src/modules/cpufreq/e_mod_main.c:204 +msgid "Slow (64 ticks)" +msgstr "Споро (64 откуцаја)" + +#: src/modules/cpufreq/e_mod_main.c:211 +msgid "Very Slow (256 ticks)" +msgstr "Врло споро (256 откуцаја)" + +#: src/modules/cpufreq/e_mod_main.c:227 +msgid "Manual" +msgstr "Ручно" + +#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:267 +msgid "Lower Power Automatic" +msgstr "Самостална нижа потрошња" + +#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:269 +msgid "Automatic Interactive" +msgstr "Самостална садејствујућа" + +#: src/modules/cpufreq/e_mod_main.c:235 src/modules/cpufreq/e_mod_main.c:271 +msgid "Minimum Speed" +msgstr "Најмања брзина" + +#: src/modules/cpufreq/e_mod_main.c:237 src/modules/cpufreq/e_mod_main.c:273 +msgid "Maximum Speed" +msgstr "Највећа брзина" + +#: src/modules/cpufreq/e_mod_main.c:250 +msgid "Restore CPU Power Policy" +msgstr "Врати смернице потрошњом процесора на задато" + +#: src/modules/cpufreq/e_mod_main.c:288 +msgid "Automatic powersaving" +msgstr "Самостална штедња снаге" + +#: src/modules/cpufreq/e_mod_main.c:311 +#, c-format +msgid "%i MHz" +msgstr "%i MHz" + +#: src/modules/cpufreq/e_mod_main.c:313 +#, c-format +msgid "%'.1f GHz" +msgstr "%'.1f GHz" + +#: src/modules/cpufreq/e_mod_main.c:334 +msgid "Time Between Updates" +msgstr "Време између освежавања" + +#: src/modules/cpufreq/e_mod_main.c:340 +msgid "Set CPU Power Policy" +msgstr "Постави смернице потрошњом процесора" + +#: src/modules/cpufreq/e_mod_main.c:347 +msgid "Set CPU Speed" +msgstr "Подесите брзину процесора" + +#: src/modules/cpufreq/e_mod_main.c:353 +msgid "Powersaving behavior" +msgstr "Понашање штедње снаге" + +#: src/modules/cpufreq/e_mod_main.c:433 +msgid "" +"There was an error trying to set the<br>cpu frequency governor via the " +"module's<br>setfreq utility." +msgstr "" +"Десила се грешка приликом покушаја подешавања<br>владања учесталости " +"процесора преко јединице<br>за поставку учесталости процесора." + +#: src/modules/cpufreq/e_mod_main.c:461 +msgid "" +"Your kernel does not support setting the<br>CPU frequency at all. You may be " +"missing<br>Kernel modules or features, or your CPU<br>simply does not " +"support this feature." +msgstr "" +"Ваше језгро не подржава подешавања<br>учесталости процесора. Можда вам " +"недостаје<br>јединица језгра или њена могућност, или ваш " +"процесор<br>једноставно нема подршку за такву примену." + +#: src/modules/cpufreq/e_mod_main.c:489 +msgid "" +"There was an error trying to set the<br>cpu frequency setting via the " +"module's<br>setfreq utility." +msgstr "" +"Десила се грешка приликом покушаја подешавања<br>поставки учесталости " +"процесора преко јединице<br>за поставку учесталости процесора." + +#: src/modules/cpufreq/e_mod_main.c:1157 +msgid "Cpufreq Error" +msgstr "Грешка Учесталости процесора" + +#: src/modules/cpufreq/e_mod_main.c:1158 +msgid "" +"The freqset binary in the cpufreq module<br>directory cannot be found (stat " +"failed)" +msgstr "" +"Програм учесталост процесора у фасцикли<br>јединице учесталости процесора " +"није пронађен (stat није успео)" + +#: src/modules/cpufreq/e_mod_main.c:1165 +msgid "Cpufreq Permissions Error" +msgstr "Грешка овлашћења учесталости процесора" + +#: src/modules/cpufreq/e_mod_main.c:1166 +#, c-format +msgid "" +"The freqset binary in the cpufreq module<br>is not owned by root or does not " +"have the<br>setuid bit set. Please ensure this is the<br>case. For example:" +"<br><br>sudo chown root %s<br>sudo chmod u+s,a+x %s<br>" +msgstr "" +"Бинарна датотека у јединици управљања учесталошћу<br>није у власништву " +"кореног корисника, или нема<br>подешен бит власништва. Молим, проверите да " +"ли је<br>тако. На пример:<br><br>sudo chown root %s<br>sudo chmod u+s,a+x " +"%s<br>" + +#: src/modules/dropshadow/e_mod_config.c:38 +msgid "Dropshadow Settings" +msgstr "Поставке бацања сене" + +#: src/modules/dropshadow/e_mod_config.c:106 src/modules/shot/e_mod_main.c:721 +msgid "Quality" +msgstr "Квалитет" + +#: src/modules/dropshadow/e_mod_config.c:109 +msgid "High Quality" +msgstr "Висок квалитет" + +#: src/modules/dropshadow/e_mod_config.c:111 +msgid "Medium Quality" +msgstr "Средњи квалитет" + +#: src/modules/dropshadow/e_mod_config.c:113 +msgid "Low Quality" +msgstr "Низак квалитет" + +#: src/modules/dropshadow/e_mod_config.c:117 +msgid "Blur Type" +msgstr "Врста замућења" + +#: src/modules/dropshadow/e_mod_config.c:120 +msgid "Very Fuzzy" +msgstr "Врло нејасно" + +#: src/modules/dropshadow/e_mod_config.c:122 +msgid "Fuzzy" +msgstr "Нејасно" + +#: src/modules/dropshadow/e_mod_config.c:126 +msgid "Sharp" +msgstr "Оштро" + +#: src/modules/dropshadow/e_mod_config.c:128 +msgid "Very Sharp" +msgstr "Врло оштро" + +#: src/modules/dropshadow/e_mod_config.c:132 +msgid "Shadow Distance" +msgstr "Удаљеност сене" + +#: src/modules/dropshadow/e_mod_config.c:135 +msgid "Very Far" +msgstr "Врло далеко" + +#: src/modules/dropshadow/e_mod_config.c:137 +msgid "Far" +msgstr "Далеко" + +#: src/modules/dropshadow/e_mod_config.c:139 +msgid "Near" +msgstr "Близу" + +#: src/modules/dropshadow/e_mod_config.c:141 +msgid "Very Near" +msgstr "Врло близу" + +#: src/modules/dropshadow/e_mod_config.c:143 +msgid "Extremely Near" +msgstr "Превише близу" + +#: src/modules/dropshadow/e_mod_config.c:145 +msgid "Underneath" +msgstr "Испод" + +#: src/modules/dropshadow/e_mod_config.c:149 +msgid "Shadow Darkness" +msgstr "Мрачност сене" + +#: src/modules/dropshadow/e_mod_config.c:152 +msgid "Very Dark" +msgstr "Врло тамна" + +#: src/modules/dropshadow/e_mod_config.c:154 +msgid "Dark" +msgstr "Тамна" + +#: src/modules/dropshadow/e_mod_config.c:156 +msgid "Light" +msgstr "Светла" + +#: src/modules/dropshadow/e_mod_config.c:158 +msgid "Very Light" +msgstr "Врло светла" + +#: src/modules/dropshadow/e_mod_main.c:89 +msgid "Dropshadow" +msgstr "Бацање сене" + +#: src/modules/everything/e_mod_main.c:49 +#: src/modules/everything/evry_plugin.c:179 +msgid "Everything Launcher" +msgstr "Покретач свега" + +#: src/modules/everything/e_mod_main.c:50 +msgid "Show Everything Launcher" +msgstr "Прикажи покретач свега" + +#: src/modules/everything/e_mod_main.c:64 +msgid "Everything Configuration" +msgstr "Поставке свега" + +#: src/modules/everything/e_mod_main.c:408 +msgid "Everything Module" +msgstr "Јединица свега" + +#: src/modules/everything/e_mod_main.c:599 +msgid "Run Everything" +msgstr "Покрени све" + +#: src/modules/everything/evry_config.c:78 +msgid "Everything Settings" +msgstr "Поставке свега" + +#: src/modules/everything/evry_config.c:364 +msgid "Available Plugins" +msgstr "Доступни прикључци" + +#: src/modules/everything/evry_config.c:370 +msgid "Move Up" +msgstr "Помери навише" + +#: src/modules/everything/evry_config.c:373 +msgid "Move Down" +msgstr "Помери ниже" + +#: src/modules/everything/evry_config.c:379 +#: src/modules/connman/e_mod_main.c:323 +msgid "Configure" +msgstr "Подеси" + +#: src/modules/everything/evry_config.c:385 +msgid "Enabled" +msgstr "Омогућен" + +#: src/modules/everything/evry_config.c:391 +msgid "Show in \"All\"" +msgstr "Прикажи у „Све“" + +#: src/modules/everything/evry_config.c:397 +msgid "Show in top-level" +msgstr "Прикажи на вршном слоју" + +#: src/modules/everything/evry_config.c:403 +msgid "Minimum characters for search" +msgstr "Најмањи број знакова за претрагу" + +#: src/modules/everything/evry_config.c:412 +msgid "Plugin Trigger" +msgstr "Прикључак окидач" + +#: src/modules/everything/evry_config.c:417 +msgid "Search only when triggered" +msgstr "Претражуј само кад је окинуто" + +#: src/modules/everything/evry_config.c:424 +msgid "Plugin View" +msgstr "Преглед прикључака" + +#: src/modules/everything/evry_config.c:434 +#: src/modules/everything/evry_config.c:462 +msgid "Detailed" +msgstr "приказ појединости" + +#: src/modules/everything/evry_config.c:467 +msgid "Animate scrolling" +msgstr "Анимирај премицање" + +#: src/modules/everything/evry_config.c:474 +msgid "Up/Down select next item in icon view" +msgstr "Горе/доле означи следећу ставку у умањеном приказу" + +#: src/modules/everything/evry_config.c:483 +msgid "Hide input when inactive" +msgstr "Сакриј унос кад није покренут" + +#: src/modules/everything/evry_config.c:488 +msgid "Hide list" +msgstr "Сакриј списак" + +#: src/modules/everything/evry_config.c:493 +msgid "Quick Navigation" +msgstr "Брзо управљање" + +#: src/modules/everything/evry_config.c:497 +msgid "Emacs style (ALT + n,p,f,b,m,i)" +msgstr "Емакс начин (МЕЊА+ н,п,ф,б,м,и)" + +#: src/modules/everything/evry_config.c:499 +msgid "Vi style (ALT + h,j,k,l,n,p,m,i)" +msgstr "Ви начин (МЕЊА + х,ј,к,л,н.п,м,и)" + +#: src/modules/everything/evry_config.c:505 +msgid "No Sorting" +msgstr "Без разврставања" + +#: src/modules/everything/evry_config.c:508 +msgid "By usage" +msgstr "По коришћењу" + +#: src/modules/everything/evry_config.c:511 +msgid "Most used" +msgstr "Највише коришћени" + +#: src/modules/everything/evry_config.c:514 +msgid "Last used" +msgstr "Последње коришћени" + +#: src/modules/everything/evry_config.c:526 +msgid "Subject Plugins" +msgstr "Прикључци вршиоца радње" + +#: src/modules/everything/evry_config.c:530 +msgid "Action Plugins" +msgstr "Прикључци радње" + +#: src/modules/everything/evry_config.c:534 +msgid "Object Plugins" +msgstr "Прикључци примаоца радње" + +#: src/modules/everything/evry_config.c:537 +#: src/modules/everything/evry_config.c:736 +msgid "Plugins" +msgstr "Прикључци" + +#: src/modules/everything/evry_config.c:544 +msgid "Popup Size" +msgstr "Величина искакања" + +#: src/modules/everything/evry_config.c:545 +#: src/modules/everything/evry_config.c:578 +msgid "Popup Width" +msgstr "Ширина искакања" + +#: src/modules/everything/evry_config.c:552 +#: src/modules/everything/evry_config.c:585 +msgid "Popup Height" +msgstr "Висина искакања" + +#: src/modules/everything/evry_config.c:560 +msgid "Popup Align" +msgstr "Поравнање искакања" + +#: src/modules/everything/evry_config.c:563 +#: src/modules/everything/evry_config.c:570 +#: src/modules/winlist/e_int_config_winlist.c:238 +#: src/modules/winlist/e_int_config_winlist.c:251 +#: src/modules/winlist/e_int_config_winlist.c:292 +#: src/modules/winlist/e_int_config_winlist.c:297 +#, c-format +msgid "%1.2f" +msgstr "%1.2f" + +#: src/modules/everything/evry_config.c:577 +msgid "Edge Popup Size" +msgstr "Величина ивица искакања" + +#: src/modules/everything/evry_config.c:594 +#: src/modules/winlist/e_int_config_winlist.c:286 +msgid "Geometry" +msgstr "Геометрија" + +#: src/modules/everything/evry_config.c:631 +msgid "Everything Collection" +msgstr "Збирка свега" + +#: src/modules/everything/evry_gadget.c:169 +msgid "Everything Starter" +msgstr "Покретач свега" + +#: src/modules/everything/evry_gadget.c:587 +msgid "Everything Gadgets" +msgstr "Справице свега" + +#: src/modules/everything/evry_gadget.c:685 +msgid "Plugin" +msgstr "Прикључак" + +#: src/modules/everything/evry_plug_actions.c:172 +msgid "Actions" +msgstr "Радње" + +#: src/modules/everything/evry_plug_aggregator.c:122 +#, c-format +msgid "%d item" +msgid_plural "%d items" +msgstr[0] "%d ставка" +msgstr[1] "%d ставке" +msgstr[2] "%d ставки" + +#: src/modules/everything/evry_plug_aggregator.c:302 +msgid "No plugins loaded" +msgstr "Нема учитаних прикључака" + +#: src/modules/everything/evry_plug_apps.c:1148 +msgid "Exebuf" +msgstr "Егзебаф" + +#: src/modules/everything/evry_plug_apps.c:1163 +#: src/modules/everything/evry_plug_apps.c:1210 +#: src/modules/fileman/e_fwin.c:2160 src/modules/fileman/e_fwin.c:2526 +msgid "Open with..." +msgstr "Отвори са..." + +#: src/modules/everything/evry_plug_apps.c:1176 +msgid "Open File..." +msgstr "Отвори датотеку..." + +#: src/modules/everything/evry_plug_apps.c:1190 +msgid "Edit Application Entry" +msgstr "Уреди ставку програма" + +#: src/modules/everything/evry_plug_apps.c:1197 +msgid "New Application Entry" +msgstr "Нова ставка програма" + +#: src/modules/everything/evry_plug_apps.c:1204 +msgid "Run with Sudo" +msgstr "Покрени са судо" + +#: src/modules/everything/evry_plug_apps.c:1217 +#: src/modules/fileman/e_fwin.c:249 +msgid "Open Terminal here" +msgstr "Овде отвори терминал" + +#: src/modules/everything/evry_plug_apps.c:1223 +msgid "Run Executable" +msgstr "Покрени извршну датотеку" + +#: src/modules/everything/evry_plug_apps.c:1301 +#: src/modules/everything/evry_plug_apps.c:1428 +msgid "Everything Applications" +msgstr "Програми свега" + +#: src/modules/everything/evry_plug_apps.c:1332 +msgid "Commands" +msgstr "Наредбе" + +#: src/modules/everything/evry_plug_apps.c:1333 +msgid "Terminal Command" +msgstr "Наредба терминала" + +#: src/modules/everything/evry_plug_apps.c:1338 +msgid "Sudo GUI" +msgstr "Графички судо" + +#: src/modules/everything/evry_plug_apps.c:1409 +#: src/modules/everything/evry_plug_collection.c:146 +#: src/modules/everything/evry_plug_files.c:1578 +msgid "Everything Plugin" +msgstr "Прикључак свега" + +#: src/modules/everything/evry_plug_calc.c:265 +msgid "Calculator" +msgstr "Рачунар" + +#: src/modules/everything/evry_plug_clipboard.c:33 +msgid "Copy to Clipboard" +msgstr "Умножи у оставу исечака" + +#: src/modules/everything/evry_plug_files.c:1317 +msgid "Copy To ..." +msgstr "Умножи у ..." + +#: src/modules/everything/evry_plug_files.c:1322 +msgid "Move To ..." +msgstr "Премести у ..." + +#: src/modules/everything/evry_plug_files.c:1327 +msgid "Move to Trash" +msgstr "Премести у смеће" + +#: src/modules/everything/evry_plug_files.c:1331 +msgid "Open Directory" +msgstr "Отвори фасциклу" + +#: src/modules/everything/evry_plug_files.c:1335 +msgid "Sort by Date" +msgstr "Поређај по датуму" + +#: src/modules/everything/evry_plug_files.c:1340 +msgid "Sort by Name" +msgstr "Поређај по називу" + +#: src/modules/everything/evry_plug_files.c:1373 +#: src/modules/everything/evry_plug_files.c:1385 +msgid "Recent Files" +msgstr "Скорашње датотеке" + +#: src/modules/everything/evry_plug_files.c:1457 +#: src/modules/everything/evry_plug_files.c:1600 +msgid "Everything Files" +msgstr "Датотеке свега" + +#: src/modules/everything/evry_plug_files.c:1484 +msgid "Show recent files" +msgstr "Прикажи скорашње датотеке" + +#: src/modules/everything/evry_plug_files.c:1488 +msgid "Search recent files" +msgstr "Тражи скорашње документе" + +#: src/modules/everything/evry_plug_files.c:1492 +msgid "Search cached files" +msgstr "Тражи датотеке у остави" + +#: src/modules/everything/evry_plug_files.c:1496 +msgid "Cache visited directories" +msgstr "Стави у оставу посећене датотеке" + +#: src/modules/everything/evry_plug_files.c:1500 +msgid "Clear cache" +msgstr "Очисти међумеморију" + +#: src/modules/everything/evry_plug_settings.c:187 +msgid "Show Dialog" +msgstr "Прикажи прозорче потврде" + +#: src/modules/everything/evry_plug_text.c:63 +#: src/modules/everything/evry_plug_text.c:66 +msgid "Text" +msgstr "Текст" + +#: src/modules/everything/evry_plug_windows.c:430 +msgid "Switch to Window" +msgstr "Пребаци се на прозор" + +#: src/modules/everything/evry_plug_windows.c:445 +msgid "Toggle Fullscreen" +msgstr "Прекидач за приказ преко целог екрана" + +#: src/modules/everything/evry_plug_windows.c:459 +msgid "Send to Desktop" +msgstr "Пошаљи на радну површ" + +#: src/modules/everything/evry_plugin.c:177 +#: src/modules/everything/evry_plugin.c:208 +#, c-format +msgid "Show %s Plugin" +msgstr "Прикажи прикључак %s" + +#: src/modules/everything/evry_plugin.c:187 +#, c-format +msgid "Browse %s" +msgstr "Прегледај %s" + +#: src/modules/everything/evry_view_help.c:67 +msgid "" +" Ok, here comes the explanation of <hilight>everything</hilight>...<br> " +"Just type a few letters of the thing you are looking for. <br> Use cursor " +"<hilight><up/down></hilight> to choose from the list of things.<br> " +"Press <hilight><tab></hilight> to select an action, then press " +"<hilight><return></hilight>.<br> This page will not show up next time " +"you run <hilight>everything</hilight>.<br> <hilight><Esc></hilight> " +"close this Dialog<br> <hilight><?></hilight> show this page<br> " +"<hilight><return></hilight> run action<br> <hilight><ctrl" +"+return></hilight> run action and continue<br> <hilight><tab></" +"hilight> toggle between selectors<br> <hilight><ctrl+tab></hilight> " +"complete input (depends on plugin)<br> <hilight><ctrl+'x'></" +"hilight> jump to plugin beginning with 'x'<br> <hilight><ctrl+left/" +"right></hilight> cycle through plugins<br> <hilight><ctrl+up/" +"down></hilight> go to first/last item<br> <hilight><ctrl+1></" +"hilight> toggle view modes (exit this page ;)<br> <hilight><ctrl+2>" +"</hilight> toggle list view modes<br> <hilight><ctrl+3></hilight> " +"toggle thumb view modes" +msgstr "" +" У реду, ево објашења за <hilight>све</hilight>...<br> Само укуцајте " +"неколико слова ставке коју тражите. <br> Користите показивач <hilight><" +"горе/доле></hilight> за одабир из списка ставки.<br> Притисните " +"<hilight><табулатор></hilight> за одабир радње, затим притисните " +"<hilight><врати></hilight>.<br> Ова страница се неће појавити кад " +"следећи пут покренете <hilight>све</hilight>.<br> <hilight><изађи></" +"hilight> затвара ово прозорче<br> <hilight><?></hilight> приказује " +"ову страницу<br> <hilight><врати></hilight> покреће радњу<br> " +"<hilight><ктрл+врати></hilight> покреће радњу и наставља<br> " +"<hilight><ктрл+„а“></hilight> скаче на прикључак који почиње са " +"„а“<br> <hilight><ктрл+лево/десно></hilight> кружи кроз " +"прикључке<br> <hilight><ктрл+горе/доле></hilight> иде на прву/" +"последњу ставку<br> <hilight><ктрл+1></hilight> мења видљивост " +"прегледа (затвара ову страницу)<br> <hilight><ктрл+2></hilight> " +"мења начин прегледа списка<br> <hilight><ктрл+3></hilight> је " +"прекидач начина прегледа са сличицама" + +#: src/modules/everything/evry_view_tabs.c:93 +msgid "Back" +msgstr "Назад" + +#: src/modules/fileman/e_fwin.c:2051 +msgid "Other application..." +msgstr "Остали програми..." + +#: src/modules/fileman/e_fwin.c:2114 +msgid "Go To Parent Directory" +msgstr "Иди у родитељску фасциклу" + +# :) +#: src/modules/fileman/e_fwin.c:2124 +msgid "Clone Window" +msgstr "Направи прозору близанца" + +#: src/modules/fileman/e_fwin.c:2130 +msgid "Copy Path" +msgstr "Умножи путању" + +#: src/modules/fileman/e_fwin.c:2146 +msgid "Run" +msgstr "Покрени" + +#: src/modules/fileman/e_fwin.c:2153 src/modules/fileman/e_fwin.c:2527 +msgid "Open" +msgstr "Отвори" + +#: src/modules/fileman/e_fwin.c:2556 src/modules/fileman/e_fwin.c:2581 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d датотека" +msgstr[1] "%d датотеке" +msgstr[2] "%d датотека" + +#: src/modules/fileman/e_fwin.c:2599 +msgid "Known Applications" +msgstr "Познати Програми" + +#: src/modules/fileman/e_fwin.c:2609 +msgid "Suggested Applications" +msgstr "Предложени програми" + +#: src/modules/fileman/e_fwin.c:2644 +msgid "All Applications" +msgstr "Сви програми" + +#: src/modules/fileman/e_fwin.c:2667 +msgid "Custom Command" +msgstr "Прилагођена наредба" + +#: src/modules/fileman/e_fwin.c:2962 +#: src/modules/fileman_opinfo/e_mod_main.c:105 +#, c-format +msgid "Copying is aborted" +msgstr "Умножавање је опозвано" + +#: src/modules/fileman/e_fwin.c:2966 +#: src/modules/fileman_opinfo/e_mod_main.c:109 +#, c-format +msgid "Moving is aborted" +msgstr "Премештање је опозвано" + +#: src/modules/fileman/e_fwin.c:2970 +#: src/modules/fileman_opinfo/e_mod_main.c:113 +#, c-format +msgid "Deleting is aborted" +msgstr "Брисање је опозвано" + +#: src/modules/fileman/e_fwin.c:2974 +#: src/modules/fileman_opinfo/e_mod_main.c:117 +#, c-format +msgid "Secure deletion is aborted" +msgstr "Безбедно брисање је опозвано" + +#: src/modules/fileman/e_fwin.c:2978 +#: src/modules/fileman_opinfo/e_mod_main.c:121 +#, c-format +msgid "Unknown operation from slave is aborted" +msgstr "Непозната радња потчињеног је отказана" + +#: src/modules/fileman/e_fwin.c:2988 +#: src/modules/fileman_opinfo/e_mod_main.c:131 +#, c-format +msgid "Copy of %s done" +msgstr "Умножавање %s је завршено" + +#: src/modules/fileman/e_fwin.c:2990 +#: src/modules/fileman_opinfo/e_mod_main.c:133 +#, c-format +msgid "Copying %s (eta: %s)" +msgstr "Умножавам %s (преостаје: %s)" + +#: src/modules/fileman/e_fwin.c:2995 +#: src/modules/fileman_opinfo/e_mod_main.c:139 +#, c-format +msgid "Move of %s done" +msgstr "Премештање %s је завршено" + +#: src/modules/fileman/e_fwin.c:2997 +#: src/modules/fileman_opinfo/e_mod_main.c:141 +#, c-format +msgid "Moving %s (eta: %s)" +msgstr "Moving %s (преостаје: %s)" + +#: src/modules/fileman/e_fwin.c:3002 +#: src/modules/fileman_opinfo/e_mod_main.c:147 +#, c-format +msgid "Delete done" +msgstr "Брисање завршено" + +#: src/modules/fileman/e_fwin.c:3004 +#: src/modules/fileman_opinfo/e_mod_main.c:149 +#, c-format +msgid "Deleting files..." +msgstr "Бришем датотеке..." + +#: src/modules/fileman/e_fwin.c:3009 +#: src/modules/fileman_opinfo/e_mod_main.c:154 +#, c-format +msgid "Secure delete done" +msgstr "Безбедно брисање урађено" + +#: src/modules/fileman/e_fwin.c:3011 +#: src/modules/fileman_opinfo/e_mod_main.c:156 +#, c-format +msgid "Securely deleting files..." +msgstr "Безбедно брисање датотека..." + +#: src/modules/fileman/e_fwin.c:3015 +#: src/modules/fileman_opinfo/e_mod_main.c:160 +#, c-format +msgid "Unknown operation from slave %d" +msgstr "Непозната радња потчињеног %d" + +#: src/modules/fileman/e_fwin_nav.c:450 +msgid "EFM Navigation" +msgstr "УДП вожња" + +#: src/modules/fileman/e_int_config_mime.c:60 +#: src/modules/fileman/e_mod_main.c:44 +msgid "File Icons" +msgstr "Иконе датотека" + +#: src/modules/fileman/e_int_config_mime.c:177 +msgid "File Types" +msgstr "Врсте датотека" + +#: src/modules/fileman/e_int_config_mime_edit.c:69 +msgid "File Icon" +msgstr "Икона датотеке" + +#: src/modules/fileman/e_int_config_mime_edit.c:136 +msgid "Basic Info" +msgstr "Основни подаци" + +#: src/modules/fileman/e_int_config_mime_edit.c:137 +msgid "Mime:" +msgstr "МИМЕ врста:" + +#: src/modules/fileman/e_int_config_mime_edit.c:147 +msgid "Use Generated Thumbnail" +msgstr "Користи створену умањену сличицу" + +#: src/modules/fileman/e_int_config_mime_edit.c:150 +msgid "Use Theme Icon" +msgstr "Користи тему икона" + +#: src/modules/fileman/e_int_config_mime_edit.c:153 +msgid "Use Edje File" +msgstr "Користи едје датотеку" + +#: src/modules/fileman/e_int_config_mime_edit.c:156 +msgid "Use Image" +msgstr "користи слику" + +#: src/modules/fileman/e_int_config_mime_edit.c:159 +msgid "Use Default" +msgstr "Користи подразумевано" + +#: src/modules/fileman/e_int_config_mime_edit.c:299 +msgid "Select an Edje file" +msgstr "Означите едје датотеку" + +#: src/modules/fileman/e_int_config_mime_edit.c:301 +msgid "Select an image" +msgstr "Одаберите слику" + +#: src/modules/fileman/e_mod_config.c:122 +msgid "Fileman Settings" +msgstr "Поставке Датотекара" + +#: src/modules/fileman/e_mod_config.c:325 +msgid "Icon Size" +msgstr "Величина икона" + +#: src/modules/fileman/e_mod_config.c:331 +msgid "View" +msgstr "Преглед" + +#: src/modules/fileman/e_mod_config.c:336 +msgid "File Extensions" +msgstr "Наставци датотека" + +#: src/modules/fileman/e_mod_config.c:339 +msgid "Full Path In Title" +msgstr "Потпуна путања у наслову" + +#: src/modules/fileman/e_mod_config.c:342 +msgid "Icons On Desktop" +msgstr "Иконе на радној површи" + +#: src/modules/fileman/e_mod_config.c:348 +msgid "Sidebar" +msgstr "Бочна површ" + +#: src/modules/fileman/e_mod_config.c:389 +msgid "Open Dirs In Place" +msgstr "Отвори фасцикле на месту" + +#: src/modules/fileman/e_mod_config.c:392 +msgid "Use Single Click" +msgstr "Један клик за отварање ставки" + +#: src/modules/fileman/e_mod_config.c:395 +msgid "'cp+rm' instead of 'mv'" +msgstr "„cp+rm“ уместо „mv“" + +#: src/modules/fileman/e_mod_config.c:401 +msgid "Use Alternate Selection Modifiers" +msgstr "Користи заменске измењиваче за означавање" + +#: src/modules/fileman/e_mod_config.c:404 +msgid "Allow Navigation On Desktop" +msgstr "Дозволи управљање на радној површи" + +#: src/modules/fileman/e_mod_config.c:408 +msgid "Max File Size For Thumbnailing" +msgstr "Највећа величина датотека за приказ умањених сличица" + +#: src/modules/fileman/e_mod_config.c:414 +msgid "Spring Delay" +msgstr "Одгода отскока" + +#: src/modules/fileman/e_mod_config.c:419 +#: src/modules/quickaccess/e_mod_config.c:252 +#: src/modules/quickaccess/e_mod_config.c:348 +msgid "Behavior" +msgstr "Понашање" + +#: src/modules/fileman/e_mod_config.c:428 +#: src/modules/fileman/e_mod_config.c:431 +#: src/modules/fileman/e_mod_config.c:434 +#: src/modules/fileman/e_mod_config.c:437 +#: src/modules/gadman/e_mod_config.c:208 +msgid "Mode" +msgstr "Начин" + +#: src/modules/fileman/e_mod_config.c:443 +msgid "Show device icons on desktop" +msgstr "Приказуј иконе уређаја на радној површи" + +#: src/modules/fileman/e_mod_config.c:446 +msgid "Mount volumes on insert" +msgstr "Прикачи спољне уређаје по убацивању" + +#: src/modules/fileman/e_mod_config.c:449 +msgid "Open filemanager on mount" +msgstr "Отвори управника датотека при качењу" + +#: src/modules/fileman/e_mod_config.c:453 +msgid "Device" +msgstr "Уређај" + +#: src/modules/fileman/e_mod_config.c:457 +msgid "Show tooltip" +msgstr "Прикажи напомену" + +#: src/modules/fileman/e_mod_config.c:461 +msgid "Tooltip delay" +msgstr "Кашњење напомене" + +#: src/modules/fileman/e_mod_config.c:463 +#: src/modules/syscon/e_int_config_syscon.c:169 +#, c-format +msgid "%1.1f" +msgstr "%1.1f" + +#: src/modules/fileman/e_mod_config.c:467 +msgid "Tooltip size (Screen percentage)" +msgstr "Величина напомена (по проценту екранаског заузећа)" + +#: src/modules/fileman/e_mod_config.c:469 +#, c-format +msgid "%2.0f" +msgstr "%2.0f" + +#: src/modules/fileman/e_mod_config.c:473 +msgid "Tooltips" +msgstr "Напомене" + +#: src/modules/fileman/e_mod_main.c:41 src/modules/fileman/e_mod_main.c:55 +msgid "File Manager" +msgstr "Управник датотека" + +#: src/modules/fileman/e_mod_main.c:58 +msgid "Navigate" +msgstr "Управљајте" + +#: src/modules/fileman/e_mod_main.c:275 +msgid "Fileman" +msgstr "Датотекар" + +#: src/modules/fileman/e_mod_menu.c:239 +msgid "No listable items" +msgstr "Нема ставки за листање" + +#: src/modules/fileman/e_mod_menu.c:318 +msgid "GTK Bookmarks" +msgstr "ГТК обележивачи" + +#: src/modules/fileman/e_mod_menu.c:412 +msgid "Current Directory" +msgstr "Садашња фасцикла" + +#: src/modules/fileman/e_mod_menu.c:418 +msgid "Home" +msgstr "Лична фасцикла" + +#: src/modules/fileman/e_mod_menu.c:448 +msgid "Root" +msgstr "Корен" + +#: src/modules/fileman/e_mod_menu.c:488 +msgid "Navigate..." +msgstr "Управљајте..." + +#: src/modules/fileman_opinfo/e_mod_main.c:347 +#, c-format +msgid "Processing %d operation" +msgid_plural "Processing %d operations" +msgstr[0] "Изводим %d радњу" +msgstr[1] "Изводим %d радње" +msgstr[2] "Изводим %d радњи" + +#: src/modules/fileman_opinfo/e_mod_main.c:351 +msgid "Filemanager is idle" +msgstr "Управник датотека мирује" + +#: src/modules/fileman_opinfo/e_mod_main.c:439 +msgid "EFM Operation Info" +msgstr "УДП подаци о радњи" + +#: src/modules/gadman/e_mod_config.c:21 src/modules/gadman/e_mod_config.c:229 +msgid "Background" +msgstr "Позадина" + +#: src/modules/gadman/e_mod_config.c:22 +msgid "Hover (Key Toggle)" +msgstr "Надношење (прекидач је дугме)" + +#: src/modules/gadman/e_mod_config.c:79 src/modules/gadman/e_mod_config.c:156 +#: src/modules/gadman/e_mod_main.c:163 +msgid "Desktop Gadgets" +msgstr "Справице површи" + +#: src/modules/gadman/e_mod_config.c:179 +msgid "Available Layers" +msgstr "Доступни слојеви" + +#: src/modules/gadman/e_mod_config.c:189 +msgid "Configure Layer" +msgstr "Прилагоди слојеве" + +#: src/modules/gadman/e_mod_config.c:203 +msgid "Layers" +msgstr "Слојеви" + +#: src/modules/gadman/e_mod_config.c:213 src/modules/gadman/e_mod_config.c:245 +msgid "Custom Image" +msgstr "Прилагођена слика" + +#: src/modules/gadman/e_mod_config.c:217 src/modules/gadman/e_mod_config.c:238 +msgid "Custom Color" +msgstr "Прилагођена боја" + +#: src/modules/gadman/e_mod_config.c:221 +msgid "Transparent" +msgstr "Провидно" + +#: src/modules/gadman/e_mod_config.c:228 +#: src/modules/winlist/e_int_config_winlist.c:256 +msgid "Animations" +msgstr "Анимације" + +#: src/modules/gadman/e_mod_config.c:302 +msgid "Background Options" +msgstr "Могућности позадине" + +#: src/modules/gadman/e_mod_gadman.c:990 +msgid "Begin move/resize" +msgstr "Почни померање/промену величине" + +#: src/modules/gadman/e_mod_gadman.c:1020 +msgid "Free" +msgstr "Слободно" + +#: src/modules/gadman/e_mod_gadman.c:1044 +msgid "Appearance" +msgstr "Изглед" + +#: src/modules/gadman/e_mod_gadman.c:1065 +msgid "Add other gadgets" +msgstr "Додај друге справице" + +#: src/modules/gadman/e_mod_main.c:83 +msgid "Show/hide gadgets" +msgstr "Прикажи/сакриј справице" + +#: src/modules/gadman/e_mod_main.c:183 +msgid "Change Gadgets" +msgstr "Промени справице" + +#: src/modules/winlist/e_int_config_winlist.c:58 +msgid "Window Switcher Settings" +msgstr "Поставке измењивача прозора" + +#: src/modules/winlist/e_int_config_winlist.c:190 +msgid "Windows from other desks" +msgstr "Прозори са других простора" + +#: src/modules/winlist/e_int_config_winlist.c:193 +msgid "Windows from other screens" +msgstr "Прозори са других екрана" + +#: src/modules/winlist/e_int_config_winlist.c:196 +msgid "Iconified" +msgstr "Умањено" + +#: src/modules/winlist/e_int_config_winlist.c:200 +msgid "Iconified from other desks" +msgstr "Умањено у односу на друге радне просторе" + +#: src/modules/winlist/e_int_config_winlist.c:205 +msgid "Iconified from other screens" +msgstr "Умањено у односу на друге екране" + +#: src/modules/winlist/e_int_config_winlist.c:218 +msgid "Uniconify/Unshade" +msgstr "Поништи умањење/одмотај" + +#: src/modules/winlist/e_int_config_winlist.c:220 +msgid "Warp mouse while selecting" +msgstr "Извитопери миша приликом одабира" + +#: src/modules/winlist/e_int_config_winlist.c:224 +msgid "Warp mouse at end" +msgstr "Извитопери миша на крају" + +#: src/modules/winlist/e_int_config_winlist.c:228 +msgid "Jump to desk" +msgstr "Скочи на радну површ" + +#: src/modules/winlist/e_int_config_winlist.c:230 +msgid "Selecting" +msgstr "Означавање" + +#: src/modules/winlist/e_int_config_winlist.c:234 +msgid "Warp speed" +msgstr "Брзина витоперења" + +#: src/modules/winlist/e_int_config_winlist.c:242 +msgid "Scroll Animation" +msgstr "Анимација премицања" + +#: src/modules/winlist/e_int_config_winlist.c:247 +msgid "Scroll speed" +msgstr "Брзина премицања" + +#: src/modules/winlist/e_int_config_winlist.c:260 +msgid "Minimum width" +msgstr "Најмања ширина" + +#: src/modules/winlist/e_int_config_winlist.c:262 +#: src/modules/winlist/e_int_config_winlist.c:269 +#: src/modules/winlist/e_int_config_winlist.c:275 +#: src/modules/winlist/e_int_config_winlist.c:282 +#, c-format +msgid "%4.0f" +msgstr "%4.0f" + +#: src/modules/winlist/e_int_config_winlist.c:267 +msgid "Maximum width" +msgstr "Највећа ширина" + +#: src/modules/winlist/e_int_config_winlist.c:273 +msgid "Minimum height" +msgstr "Најмања висина" + +#: src/modules/winlist/e_int_config_winlist.c:280 +msgid "Maximum height" +msgstr "Највећа висина" + +#: src/modules/winlist/e_int_config_winlist.c:290 +msgid "Horizontal alignment" +msgstr "Водоравно поравнање" + +#: src/modules/winlist/e_int_config_winlist.c:295 +msgid "Vertical alignment" +msgstr "Усправно поравнање" + +#: src/modules/winlist/e_int_config_winlist.c:300 +msgid "Alignment" +msgstr "Поравнање" + +#: src/modules/winlist/e_mod_main.c:28 +msgid "Window Switcher" +msgstr "Измењивач прозора" + +#: src/modules/winlist/e_mod_main.c:41 +msgid "Next Window" +msgstr "Наредни прозор" + +#: src/modules/winlist/e_mod_main.c:43 +msgid "Previous Window" +msgstr "Претходни прозор" + +#: src/modules/winlist/e_mod_main.c:46 +msgid "Next window of same class" +msgstr "Наредни прозор истог разреда" + +#: src/modules/winlist/e_mod_main.c:49 +msgid "Previous window of same class" +msgstr "Претходни прозор истог разреда" + +#: src/modules/winlist/e_mod_main.c:52 +msgid "Next window class" +msgstr "Наредни разред прозора" + +#: src/modules/winlist/e_mod_main.c:55 +msgid "Previous window class" +msgstr "Претходни разред прозора" + +#: src/modules/winlist/e_mod_main.c:57 +msgid "Window on the Left" +msgstr "Прозор с’ лева" + +#: src/modules/winlist/e_mod_main.c:59 +msgid "Window Down" +msgstr "Прозор испод" + +#: src/modules/winlist/e_mod_main.c:61 +msgid "Window Up" +msgstr "Прозор изнад" + +#: src/modules/winlist/e_mod_main.c:63 +msgid "Window on the Right" +msgstr "Прозор с’ десна" + +#: src/modules/winlist/e_mod_main.c:209 src/modules/winlist/e_mod_main.c:215 +#: src/modules/winlist/e_mod_main.c:221 +msgid "Winlist Error" +msgstr "Грешка списка прозора" + +#: src/modules/winlist/e_mod_main.c:209 +msgid "Winlist cannot be activated from an edge binding" +msgstr "Списак прозора не може бити покренут пречицом ивица" + +#: src/modules/winlist/e_mod_main.c:215 +msgid "Winlist cannot be activated from a signal binding" +msgstr "Списак прозора не може бити покренут знаковном пречицом" + +#: src/modules/winlist/e_mod_main.c:221 +msgid "Winlist cannot be activated from an ACPI binding" +msgstr "Списак прозора не може бити покренут АЦПИ пречицом" + +#: src/modules/winlist/e_winlist.c:171 +msgid "Select a window" +msgstr "Означи прозор" + +#: src/modules/ibar/e_mod_config.c:54 +msgid "IBar Settings" +msgstr "Поставке Tраке" + +#: src/modules/ibar/e_mod_config.c:102 +msgid "Selected source" +msgstr "Означени извор" + +#: src/modules/ibar/e_mod_config.c:114 +msgid "Setup" +msgstr "Подеси" + +#: src/modules/ibar/e_mod_config.c:123 +msgid "Icon Labels" +msgstr "Натписи икона" + +#: src/modules/ibar/e_mod_config.c:124 +msgid "Show icon label" +msgstr "Прикажи натписе икона" + +#: src/modules/ibar/e_mod_config.c:144 +msgid "Misc" +msgstr "Разно" + +#: src/modules/ibar/e_mod_config.c:145 +msgid "Lock icon move" +msgstr "Закључај померање икона" + +#: src/modules/ibar/e_mod_config.c:147 +msgid "Track launch" +msgstr "Покретање траке" + +#: src/modules/ibar/e_mod_config.c:179 +msgid "Create new IBar source" +msgstr "Направи нови извор Tраке" + +#: src/modules/ibar/e_mod_config.c:180 +msgid "Enter a name for this new source:" +msgstr "Унесите име за овај нови извор:" + +#: src/modules/ibar/e_mod_config.c:194 +#, c-format +msgid "" +"You requested to delete \"%s\".<br><br>Are you sure you want to delete this " +"bar source?" +msgstr "" +"Захтевали сте брисање „%s“.<br><br>Да ли сте сигурни да желите избрисати " +"овај извор траке?" + +#: src/modules/ibar/e_mod_config.c:198 +msgid "Are you sure you want to delete this bar source?" +msgstr "Да ли сте сигурни да желите избрисати овај извор траке?" + +#: src/modules/ibar/e_mod_main.c:285 src/modules/ibar/e_mod_main.c:1802 +msgid "IBar" +msgstr "Tрака" + +#: src/modules/ibar/e_mod_main.c:848 +msgid "Create new Icon" +msgstr "Прави нову икону" + +#: src/modules/ibar/e_mod_main.c:882 +#, c-format +msgid "Icon %s" +msgstr "Икона %s" + +#: src/modules/ibar/e_mod_main.c:1802 +msgid "Focus IBar" +msgstr "Узми Tраку у жижу" + +#: src/modules/ibox/e_mod_config.c:49 +msgid "IBox Settings" +msgstr "Поставке Икутије" + +#: src/modules/ibox/e_mod_config.c:98 +msgid "Expand When On Desktop" +msgstr "Прошири кад је на радној површи" + +#: src/modules/ibox/e_mod_config.c:101 +msgid "Show Icon Label" +msgstr "Прикажи натпис иконе" + +#: src/modules/ibox/e_mod_config.c:105 +msgid "Display Name" +msgstr "Приказује име" + +#: src/modules/ibox/e_mod_config.c:110 +msgid "Display Title" +msgstr "Приказује наслов" + +#: src/modules/ibox/e_mod_config.c:115 +msgid "Display Class" +msgstr "Приказује разред" + +#: src/modules/ibox/e_mod_config.c:120 +msgid "Display Icon Name" +msgstr "Приказуј име иконе" + +#: src/modules/ibox/e_mod_config.c:125 +msgid "Display Border Caption" +msgstr "Приказује наслов оквира" + +#: src/modules/ibox/e_mod_config.c:155 +msgid "Show windows from all screens" +msgstr "Приказује прозоре са свих екрана" + +#: src/modules/ibox/e_mod_config.c:160 +msgid "Show windows from current screen" +msgstr "Приказује прозоре са тренутног екрана" + +#: src/modules/ibox/e_mod_config.c:169 src/modules/tasks/e_mod_config.c:87 +msgid "Show windows from all desktops" +msgstr "Приказује прозоре са свих радних површи" + +#: src/modules/ibox/e_mod_config.c:174 +msgid "Show windows from active desktop" +msgstr "Приказује прозоре са тренутне радне побрши" + +#: src/modules/ibox/e_mod_main.c:219 +msgid "IBox" +msgstr "Икутија" + +#: src/modules/pager/e_mod_config.c:76 +msgid "Pager Settings" +msgstr "Поставке страничника" + +#: src/modules/pager/e_mod_config.c:130 src/modules/pager/e_mod_config.c:189 +msgid "Flip desktop on mouse wheel" +msgstr "Пребаци радну површ точкићем миша" + +#: src/modules/pager/e_mod_config.c:133 src/modules/pager/e_mod_config.c:192 +msgid "Always show desktop names" +msgstr "Увек приказуј називе радних површи" + +#: src/modules/pager/e_mod_config.c:136 src/modules/pager/e_mod_config.c:195 +msgid "Live preview" +msgstr "Преглед уживо" + +#: src/modules/pager/e_mod_config.c:142 src/modules/pager/e_mod_config.c:231 +msgid "Show popup on desktop change" +msgstr "Прикажи искакање при промени радне површи" + +#: src/modules/pager/e_mod_config.c:145 +msgid "Show popup for urgent windows" +msgstr "Прикажи искакање важних прозора" + +#: src/modules/pager/e_mod_config.c:198 +msgid "Resistance to dragging" +msgstr "Отпор повлачењу" + +#: src/modules/pager/e_mod_config.c:200 src/modules/pager/e_mod_config.c:239 +#: src/modules/pager/e_mod_config.c:258 +#, c-format +msgid "%.0f px" +msgstr "%.0f px" + +#: src/modules/pager/e_mod_config.c:205 +msgid "Select and Slide button" +msgstr "Дугме означавања и клизања" + +#: src/modules/pager/e_mod_config.c:207 src/modules/pager/e_mod_config.c:215 +#: src/modules/pager/e_mod_config.c:221 src/modules/pager/e_mod_config.c:368 +#, c-format +msgid "Click to set" +msgstr "Кликните за подешавање" + +#: src/modules/pager/e_mod_config.c:213 +msgid "Drag and Drop button" +msgstr "Дугме превлачења и спуштања" + +#: src/modules/pager/e_mod_config.c:219 +msgid "Drag whole desktop" +msgstr "Вуче целу радну површ" + +#: src/modules/pager/e_mod_config.c:235 +msgid "Popup pager height" +msgstr "Висина искакања страничника" + +#: src/modules/pager/e_mod_config.c:245 +msgid "Popup duration" +msgstr "Трајање искакања" + +#: src/modules/pager/e_mod_config.c:249 src/modules/pager/e_mod_config.c:286 +#, c-format +msgid "%1.1f seconds" +msgstr "%1.1f секунди" + +#: src/modules/pager/e_mod_config.c:256 +msgid "Pager action popup height" +msgstr "Висина искакања радњи страничника" + +#: src/modules/pager/e_mod_config.c:266 +msgid "Show popup for urgent window" +msgstr "Прикажи искакање важних прозора" + +#: src/modules/pager/e_mod_config.c:270 +msgid "Urgent popup sticks on screen" +msgstr "Важна искакања залепи на екран" + +#: src/modules/pager/e_mod_config.c:276 +msgid "Show popup for focused windows" +msgstr "Прикажи искакања за прозоре у жижи" + +#: src/modules/pager/e_mod_config.c:282 +msgid "Urgent popup duration" +msgstr "Трајање важних искакања" + +#: src/modules/pager/e_mod_config.c:293 +msgid "Urgent Windows" +msgstr "Важни Прозори" + +#: src/modules/pager/e_mod_config.c:461 +msgid "Attention" +msgstr "Пажња" + +#: src/modules/pager/e_mod_config.c:462 +msgid "" +"You cannot use the right mouse button in the<br>shelf for this as it is " +"already taken by internal<br>code for context menus.<br>This button only " +"works in the popup." +msgstr "" +"Не можете употребити десно дугме миша у<br>полици за ово, јер је већ заузето " +"унутрашњом<br>шифром за приручне изборнике.<br>Ово дугме само ради у " +"искачућим прозорима." + +#: src/modules/pager/e_mod_main.c:2924 +msgid "Show Pager Popup" +msgstr "Прикажи искакање страничника" + +#: src/modules/pager/e_mod_main.c:2931 +msgid "Popup Desk Right" +msgstr "Скочи на радну површ десно" + +#: src/modules/pager/e_mod_main.c:2933 +msgid "Popup Desk Left" +msgstr "Скочи на радну површ лево" + +#: src/modules/pager/e_mod_main.c:2935 +msgid "Popup Desk Up" +msgstr "Скочи на радну површ изнад" + +#: src/modules/pager/e_mod_main.c:2937 +msgid "Popup Desk Down" +msgstr "Скочи на радну површ доле" + +#: src/modules/pager/e_mod_main.c:2939 +msgid "Popup Desk Next" +msgstr "Скочи на следећу радну површ" + +#: src/modules/pager/e_mod_main.c:2941 +msgid "Popup Desk Previous" +msgstr "скочи на претходну радну површ" + +#: src/modules/physics/e_mod_config.c:46 +msgid "Physics Settings" +msgstr "Поставке физике" + +#: src/modules/physics/e_mod_config.c:107 +msgid "Physics delay after drag" +msgstr "Физичко кашњење после превлачења" + +#: src/modules/physics/e_mod_config.c:109 +#, c-format +msgid "%2.0f Frames" +msgstr "%2.0f сличица" + +#: src/modules/physics/e_mod_config.c:111 +msgid "Maximum window mass" +msgstr "Највећа маса прозора" + +#: src/modules/physics/e_mod_config.c:113 +#, c-format +msgid "%2.1f kg" +msgstr "%2.1f kg" + +#: src/modules/physics/e_mod_config.c:115 +msgid "Desktop gravity" +msgstr "Тежа радне површи" + +#: src/modules/physics/e_mod_config.c:117 +#, c-format +msgid "%1.1f m/s^2" +msgstr "%1.1f m/s^2" + +#: src/modules/physics/e_mod_config.c:126 +msgid "Disable Movement" +msgstr "Онемогући покрете" + +#: src/modules/physics/e_mod_config.c:129 +msgid "Disable Rotation" +msgstr "Онемогући обртање" + +#: src/modules/physics/e_mod_config.c:137 +msgid "Ignore Fullscreen" +msgstr "Занемари прозоре преко целог екрана" + +#: src/modules/physics/e_mod_config.c:140 +msgid "Ignore Maximized" +msgstr "Занемари увећане прозоре" + +#: src/modules/physics/e_mod_config.c:143 +msgid "Ignore Shelves" +msgstr "Занемари полице" + +#: src/modules/physics/e_mod_config.c:146 +msgid "Ignore" +msgstr "Занемари" + +#: src/modules/physics/e_mod_main.c:29 src/modules/physics/e_mod_main.c:47 +#: src/modules/physics/e_mod_main.c:54 +msgid "Physics" +msgstr "Физика" + +#: src/modules/physics/e_mod_main.c:30 +msgid "" +"Cowardly refusing to battle<br>with the Tiling module for control<br>of your " +"windows. There can be only one!" +msgstr "" +"Кукавички одбијам да се борим<br>са јединицом поплочавања за " +"управљање<br>Вашим прозорима. Може бити само један!" + +#: src/modules/physics/e_mod_main.c:68 +msgid "Physics Error" +msgstr "Грешка физике" + +#: src/modules/physics/e_mod_main.c:68 +msgid "The physics module could not be started" +msgstr "Нисам успео покренути јединицу физике" + +#: src/modules/syscon/e_int_config_syscon.c:43 +msgid "Syscon Settings" +msgstr "Сискон поставке" + +#: src/modules/syscon/e_int_config_syscon.c:151 +msgid "Secondary" +msgstr "Заменско" + +#: src/modules/syscon/e_int_config_syscon.c:156 +msgid "Extra" +msgstr "Додатно" + +#: src/modules/syscon/e_int_config_syscon.c:161 +msgid "Icon Sizes" +msgstr "Величина икона" + +#: src/modules/syscon/e_int_config_syscon.c:165 +msgid "Do default action after timeout" +msgstr "Изведи подразумевану радњу после истека времена" + +#: src/modules/syscon/e_int_config_syscon.c:172 +msgid "Default Action" +msgstr "Подразумевана радња" + +#: src/modules/syscon/e_mod_main.c:31 +msgid "System Controls" +msgstr "Управљачи система" + +#: src/modules/syscon/e_mod_main.c:37 +msgid "Syscon" +msgstr "Сискон" + +#: src/modules/syscon/e_syscon_gadget.c:72 +msgid "Show Menu" +msgstr "Приказуј изборник" + +#: src/modules/temperature/e_mod_config.c:56 +msgid "Temperature Settings" +msgstr "Поставке температуре" + +#: src/modules/temperature/e_mod_config.c:217 +msgid "Sensors" +msgstr "Осетници" + +#: src/modules/temperature/e_mod_config.c:223 +msgid "Celsius" +msgstr "Целзијус" + +#: src/modules/temperature/e_mod_config.c:226 +msgid "Fahrenheit" +msgstr "Фаренхајт" + +#: src/modules/temperature/e_mod_config.c:229 +msgid "Display Units" +msgstr "Прикажи јединице" + +#: src/modules/temperature/e_mod_config.c:236 +msgid "Check Interval" +msgstr "Учесталост провере" + +#: src/modules/temperature/e_mod_config.c:240 +msgid "High Temperature" +msgstr "Висока температура" + +#: src/modules/temperature/e_mod_config.c:244 +#: src/modules/temperature/e_mod_config.c:256 +#: src/modules/temperature/e_mod_config.c:314 +#: src/modules/temperature/e_mod_config.c:315 +#, c-format +msgid "%1.0f F" +msgstr "%1.0f F" + +#: src/modules/temperature/e_mod_config.c:248 +#: src/modules/temperature/e_mod_config.c:260 +#: src/modules/temperature/e_mod_config.c:325 +#: src/modules/temperature/e_mod_config.c:326 +#, c-format +msgid "%1.0f C" +msgstr "%1.0f C" + +#: src/modules/temperature/e_mod_config.c:252 +msgid "Low Temperature" +msgstr "Ниска температура" + +# Кој‘ зна да ли је исправно... +#: src/modules/temperature/e_mod_config.c:264 +msgid "Temperatures" +msgstr "Температуре" + +#: src/modules/temperature/e_mod_main.c:173 +msgid "Temperature" +msgstr "Температура" + +#: src/modules/wizard/e_wizard.c:232 src/modules/wizard/e_wizard.c:261 +msgid "Next" +msgstr "Следеће" + +#: src/modules/wizard/e_wizard.c:266 +msgid "Please Wait..." +msgstr "Молим, сачекајте..." + +#: src/modules/wizard/e_wizard.c:314 +msgid "Welcome to Enlightenment" +msgstr "Добродошли у Просвећење" + +#: src/modules/wizard/page_010.c:161 src/modules/wizard/page_011.c:143 +#: src/modules/wizard/page_020.c:52 +msgid "Select one" +msgstr "Изаберите једну" + +#: src/modules/wizard/page_020.c:51 +msgid "Profile" +msgstr "Профил" + +#: src/modules/wizard/page_040.c:36 +msgid "Adding missing App files" +msgstr "Додаје недостајуће датотеке програма" + +#: src/modules/wizard/page_050.c:130 +msgid "Select preferred size" +msgstr "Означите жељену величину" + +#: src/modules/wizard/page_060.c:29 +msgid "Focus by ..." +msgstr "Узми у жижу ..." + +#: src/modules/wizard/page_060.c:36 +msgid "Mouse Over" +msgstr "надношењем миша" + +#: src/modules/wizard/page_110.c:13 +msgid "Network Management" +msgstr "Управљање мрежом" + +#: src/modules/wizard/page_110.c:17 +msgid "Connman network service not found" +msgstr "Конман услуга умрежавања није пронађена" + +#: src/modules/wizard/page_110.c:20 +msgid "Install Connman for network management support" +msgstr "Уградите Конмана за подршку управљања мрежом" + +#: src/modules/wizard/page_110.c:23 +msgid "Connman support disabled" +msgstr "Конман подршка је онемогућена" + +#: src/modules/wizard/page_110.c:26 +msgid "Install/Enable Connman for network management support" +msgstr "Уградите/омогућите Конмана за подршку управљања мрежом" + +#: src/modules/wizard/page_110.c:156 +msgid "Checking to see if Connman exists" +msgstr "Провера за постојањем Конмана" + +#: src/modules/wizard/page_150.c:92 +msgid "Compositing" +msgstr "Слагање приказа" + +#: src/modules/wizard/page_150.c:94 +msgid "Transparent windows and effects" +msgstr "Провидни прозори и утисци" + +#: src/modules/wizard/page_150.c:100 +msgid "" +"Compositing provides translucency<br>for windows, window effects " +"like<br>fading in and out and zooming<br>when they appear and dissapear." +"<br>It is highly recommended to<br>enable this for a better<br>experience, " +"but it comes at a<br>cost. It requires extra CPU<br>or a GLSL Shader capable " +"GPU<br>with well written drivers.<br>It also will add between 10 to<br>100 " +"MB to the memory needed<br>for Enlightenment." +msgstr "" +"Слагање приказа омогућава провидност<br>за прозоре, утиске прозора " +"као<br>што је утапање или исчезавање, и увећавање<br>кад се појављују или " +"нестају.<br>Врло је препоручљиво одабрати ово<br>за боље искуство, али<br> " +"постоји цена за то. Захтева више<br>напрезања процесора <br>или видео " +"картицу способну за ГЛСЛ сенчење<br>са добро написаним управљачким " +"програмима.<br>Такође ће захтевати између 10 до<br>100 MB више меморије " +"потребне<br>за Просвећење." + +#: src/modules/wizard/page_150.c:117 +msgid "Enable Compositing" +msgstr "Омогући слагање приказа" + +#: src/modules/wizard/page_150.c:122 +msgid "Hardware Accelerated (OpenGL)" +msgstr "хардверски убрзано (ОпенГЛ)" + +#: src/modules/wizard/page_150.c:125 +msgid "Tear-free Rendering (OpenGL only)" +msgstr "приказ без цепања (само ОпенГЛ)" + +#: src/modules/wizard/page_170.c:24 +msgid "Updates" +msgstr "Надоградње" + +#: src/modules/wizard/page_170.c:26 +msgid "Check for available updates" +msgstr "Провери доступне ндоградње" + +#: src/modules/wizard/page_170.c:32 +msgid "" +"Enlightenment can check for new<br>versions, updates, security " +"and<br>bugfixes, as well as available add-ons.<br><br>This is very useful, " +"because it lets<br>you know about available bug fixes and<br>security fixes " +"when they happen. As a<br>result, Enlightenment will connect " +"to<br>enlightenment.org and transmit some<br>information, much like any web " +"browser<br>might do. No personal information such as<br>username, password " +"or any personal files<br>will be transmitted. If you don't like this," +"<br>please disable this below. It is highly<br>advised that you do not " +"disable this as it<br>may leave you vulnerable or having to live<br>with " +"bugs." +msgstr "" +"Просвећење може проверавати да ли има<br>nових издања, надоградњи, " +"безбедносних и<br>дугих исправки грешака, као и доступних прикључака." +"<br><br>Ово је врло корисно, зато јер вас<br>обавештава о " +"исправкама<br>грешака и сигурносних пропуста када се<br> објаве. Као " +"производ<br>тога, Просвећење ће наставити<br> сa повезивањем на " +"enlightenment.org и <br>преносити неке податке као неки<br>веб прегледници. " +"Лични подаци, лозинке и личне<br>датотеке неће бити преношене. Уколико вам " +"се то не свиђа,<br>молим, онемогућите ово испод. Врло је препоручиво " +"да<br>не онемогућавате ово јер може<br>довести до рањивости или суживота " +"<br>са грешкама." + +#: src/modules/wizard/page_170.c:53 +msgid "Enable update checking" +msgstr "Омогући проверу надоградњи" + +#: src/modules/wizard/page_180.c:26 +msgid "Information" +msgstr "Обавештења" + +#: src/modules/wizard/page_180.c:32 +msgid "A taskbar can be added to<br>show open windows and applications." +msgstr "" +"Трака задатака може бити додата за <b>приказивање отворених прозора и " +"програма." + +#: src/modules/wizard/page_180.c:38 +msgid "Enable Taskbar" +msgstr "Омогући траку задатака" + +#: src/modules/mixer/app_mixer.c:192 +msgid "Capture" +msgstr "Снимање" + +#: src/modules/mixer/app_mixer.c:194 +msgid "Playback" +msgstr "Извођење" + +#: src/modules/mixer/app_mixer.c:314 +msgid "Output" +msgstr "Излаз" + +#: src/modules/mixer/app_mixer.c:393 +msgid "Cards" +msgstr "Картице" + +#: src/modules/mixer/app_mixer.c:406 src/modules/mixer/conf_gadget.c:279 +msgid "Channels" +msgstr "Канали" + +#: src/modules/mixer/app_mixer.c:416 +msgid "Card:" +msgstr "Картица:" + +#: src/modules/mixer/app_mixer.c:420 +msgid "Channel:" +msgstr "Канал:" + +#: src/modules/mixer/app_mixer.c:428 +msgid "Left:" +msgstr "Леви:" + +#: src/modules/mixer/app_mixer.c:433 +msgid "Right:" +msgstr "Десни:" + +#: src/modules/mixer/app_mixer.c:438 src/modules/mixer/e_mod_main.c:696 +msgid "Mute" +msgstr "Утишај" + +#: src/modules/mixer/app_mixer.c:441 src/modules/mixer/conf_gadget.c:195 +msgid "Lock Sliders" +msgstr "Закључај клизаче" + +#: src/modules/mixer/conf_gadget.c:201 +msgid "Show both sliders when locked" +msgstr "Прикажи оба клизача кад су закључани" + +#: src/modules/mixer/conf_gadget.c:206 +msgid "Show Popup on volume change via keybindings" +msgstr "Прикажи искачући прозор при промени гласноће преко пречица тастера" + +#: src/modules/mixer/conf_gadget.c:317 +msgid "Sound Cards" +msgstr "Звучне картице" + +#: src/modules/mixer/conf_gadget.c:378 +msgid "Mixer Settings" +msgstr "Поставке мешача" + +#: src/modules/mixer/conf_module.c:93 +msgid "Mixer to use for global actions:" +msgstr "Мешач за коришћење општих радњи:" + +#: src/modules/mixer/conf_module.c:117 +msgid "Display desktop notifications on volume change" +msgstr "Прикажи обавештења површи при промени гласноће" + +#: src/modules/mixer/conf_module.c:153 +msgid "Launch mixer..." +msgstr "Покрени мешач..." + +#: src/modules/mixer/conf_module.c:188 +msgid "Mixer Module Settings" +msgstr "Поставке јединице мешача" + +#: src/modules/mixer/e_mod_main.c:14 src/modules/mixer/e_mod_main.c:69 +msgid "Mixer" +msgstr "Мешач звука" + +# Требало би да се односи на звук по положају поруке +#: src/modules/mixer/e_mod_main.c:56 +msgid "New volume" +msgstr "Нова гласноћа" + +#: src/modules/mixer/e_mod_main.c:69 +msgid "Volume changed" +msgstr "Гласноћа је промењена" + +#: src/modules/mixer/e_mod_main.c:188 +msgid "Mixer Settings Updated" +msgstr "Унапређене поставке мешача" + +#: src/modules/mixer/e_mod_main.c:1357 +msgid "Mixer Module" +msgstr "Јединица мешача" + +#: src/modules/mixer/e_mod_main.c:1385 +msgid "Increase Volume" +msgstr "Појачај гласноћу" + +#: src/modules/mixer/e_mod_main.c:1386 +msgid "Decrease Volume" +msgstr "Смањи гласноћу" + +#: src/modules/mixer/e_mod_main.c:1387 +msgid "Mute Volume" +msgstr "Утишај гласноћу" + +#: src/modules/connman/e_mod_main.c:10 +msgid "Connection Manager" +msgstr "Управник веза" + +#: src/modules/connman/e_mod_main.c:237 +msgid "Missing Application" +msgstr "Недостаје програм" + +#: src/modules/connman/e_mod_main.c:238 +msgid "" +"This module wants to execute an external application EConnMan that does not " +"exist.<br>Please install <b>EConnMan</b> application." +msgstr "" +"Ова јединица покушава извршити спољњи програм Ekonman који не постоји." +"<br>Молим, уградите <br>EConnMan</b>програм." + +#: src/modules/connman/e_mod_main.c:315 +msgid "Wifi On" +msgstr "Вифи омогући" + +#: src/modules/quickaccess/e_mod_config.c:226 +msgid "Enter a unique name for this entry" +msgstr "Унесите јединствено име за ову ставку" + +#: src/modules/quickaccess/e_mod_config.c:247 +msgid "Disable Warning Dialogs" +msgstr "Онемогући прозорчиће упозорења" + +#: src/modules/quickaccess/e_mod_config.c:249 +msgid "Disable Startup Tutorial" +msgstr "Онемогући упутство при пријави" + +#: src/modules/quickaccess/e_mod_config.c:283 +msgid "Entries" +msgstr "Ставке" + +#: src/modules/quickaccess/e_mod_config.c:336 +msgid "Hide Instead Of Raising" +msgstr "Сакриј уместо издизања" + +#: src/modules/quickaccess/e_mod_config.c:339 +msgid "Hide If Focus Lost" +msgstr "Сакриј ако је изгубљена жижа" + +#: src/modules/quickaccess/e_mod_config.c:564 +msgid "Quickaccess Settings" +msgstr "Поставке брзог приступа" + +#: src/modules/quickaccess/e_mod_main.c:37 +#: src/modules/quickaccess/e_mod_main.c:47 +#: src/modules/quickaccess/e_mod_quickaccess.c:7 +msgid "Quickaccess" +msgstr "Брзи приступ" + +#: src/modules/quickaccess/e_mod_quickaccess.c:8 +msgid "Toggle Visibility" +msgstr "Мења видљивост" + +#: src/modules/quickaccess/e_mod_quickaccess.c:9 +msgid "Add Quickaccess For Current Window" +msgstr "Додај брзи приступ тренутном прозору" + +#: src/modules/quickaccess/e_mod_quickaccess.c:10 +msgid "Remove Quickaccess From Current Window" +msgstr "Уклони брзи приступ тренутном прозору" + +#: src/modules/quickaccess/e_mod_quickaccess.c:265 +#: src/modules/quickaccess/e_mod_quickaccess.c:343 +#: src/modules/quickaccess/e_mod_quickaccess.c:350 +#: src/modules/quickaccess/e_mod_quickaccess.c:376 +#: src/modules/quickaccess/e_mod_quickaccess.c:392 +#: src/modules/quickaccess/e_mod_quickaccess.c:487 +msgid "Quickaccess Error" +msgstr "Грешка брзог приступа" + +#: src/modules/quickaccess/e_mod_quickaccess.c:265 +#: src/modules/quickaccess/e_mod_quickaccess.c:392 +msgid "Could not determine command for starting this application!" +msgstr "Нисам успео да одредим наредбу за покретање овог програма!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:304 +msgid "" +"The relaunch option is meant to be used<br>with terminal applications to " +"create a persistent<br>terminal which reopens when closed, generally " +"seen<br>in quake-style drop-down terminals.<br>Either the selected " +"application is not a terminal<br>or the cmdline flag for changing the " +"terminal's window<br>name is not known. Feel free to submit a bug report if " +"this<br>is a terminal which can change its window name.<br>Alternatively, " +"you can add a data.item to" +msgstr "" +"Могућност поновног покретања се користи са<br>програмима у терминалау за " +"стварање трајног<br>терминала који се поново покреће када је затворен, као " +"код<br>квејк падајућих терминала.<br>Или изабрани програм није терминал," +"<br>или одредба наредбене линије за промену назива<br> терминала није " +"позната. Слободно пријавите грешку ако је овај<br>терминал са могућношћу " +"промене назива.<br>Заменски, можете додати data.item на" + +#: src/modules/quickaccess/e_mod_quickaccess.c:314 +msgid "Like so:" +msgstr "Као и:" + +#: src/modules/quickaccess/e_mod_quickaccess.c:316 +#: src/modules/quickaccess/e_mod_quickaccess.c:835 +#: src/modules/quickaccess/e_mod_quickaccess.c:935 +#: src/modules/quickaccess/e_mod_quickaccess.c:974 +#: src/modules/quickaccess/e_mod_quickaccess.c:1003 +#: src/modules/quickaccess/e_mod_quickaccess.c:1015 +#: src/modules/quickaccess/e_mod_quickaccess.c:1031 +#: src/modules/quickaccess/e_mod_quickaccess.c:1196 +#: src/modules/quickaccess/e_mod_quickaccess.c:1226 +#: src/modules/quickaccess/e_mod_quickaccess.c:1247 +#: src/modules/quickaccess/e_mod_quickaccess.c:1264 +msgid "Quickaccess Help" +msgstr "Помоћ за брзи приступ" + +#: src/modules/quickaccess/e_mod_quickaccess.c:343 +msgid "Cannot set relaunch for window without name and class!" +msgstr "Нисам успео да подесим поновно покретање прозора без назива и разреда." + +#: src/modules/quickaccess/e_mod_quickaccess.c:350 +msgid "Cannot set relaunch for internal E dialog!" +msgstr "Нисам успео да подесим поновно покретање за унутрашњи Е прозор!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:368 +#, c-format +msgid "" +"The selected window created with name:<br>%s<br>and class:<br>%s<br>could " +"not be found in the Quickaccess app database<br>This means that either the " +"app is unknown to us<br>or it is not intended for use with this option." +"<br>Please choose an action to take:" +msgstr "" +"Изабрани прозор створен под именом :<br>%s<br> и разредом:<br>%s<br>, нисам " +"успео да пронађем у остави података брзог приступа<br>То значи да нам је " +"програм непознат<br>или да није намењен употреби са овом могућношћу." +"<br>Молим, изаберите радњу која ће се извршити:" + +#: src/modules/quickaccess/e_mod_quickaccess.c:379 +#: src/modules/quickaccess/e_mod_quickaccess.c:977 +#: src/modules/quickaccess/e_mod_quickaccess.c:1018 +#: src/modules/quickaccess/e_mod_quickaccess.c:1230 +#: src/modules/quickaccess/e_mod_quickaccess.c:1253 +msgid "Continue" +msgstr "Настави" + +#: src/modules/quickaccess/e_mod_quickaccess.c:380 +msgid "More Help" +msgstr "Још помоћи" + +#: src/modules/quickaccess/e_mod_quickaccess.c:487 +msgid "The requested Quickaccess entry does not exist!" +msgstr "Тражена ставка брзог приступа не постоји!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:654 +msgid "Keybind Error" +msgstr "Грешка пречице тастатуре" + +#: src/modules/quickaccess/e_mod_quickaccess.c:654 +msgid "The keybinding you have entered is already in use!" +msgstr "Пречица тастатуре коју сте унели је већ у употреби!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:798 +msgid "Hide Instead Of Raise" +msgstr "Сакриј уместо издизања" + +#: src/modules/quickaccess/e_mod_quickaccess.c:805 +msgid "Jump Mode" +msgstr "Начин скакања" + +#: src/modules/quickaccess/e_mod_quickaccess.c:814 +msgid "Relaunch When Closed" +msgstr "Поново покрени кад је затворен" + +#: src/modules/quickaccess/e_mod_quickaccess.c:821 +msgid "Transient" +msgstr "Непостојан" + +#: src/modules/quickaccess/e_mod_quickaccess.c:828 +msgid "Remove Quickaccess" +msgstr "Уклони брзи приступ" + +#: src/modules/quickaccess/e_mod_quickaccess.c:856 +msgid "Quickaccess..." +msgstr "Брзи приступ..." + +#: src/modules/quickaccess/e_mod_quickaccess.c:862 +msgid "Add Quickaccess" +msgstr "Додај брзи приступ" + +#: src/modules/quickaccess/e_mod_quickaccess.c:936 +msgid "" +"The options found in the Quickaccess menu are as follows:" +"<br><hilight>Autohide</hilight> - hide the window whenever it loses " +"focus<br><hilight>Hide Instead of Raise</hilight> - Hide window when " +"activated without focus<br><hilight>Jump Mode</hilight> - Switch to window's " +"desk and raise instead of showing/hiding<br><hilight>Relaunch When Closed</" +"hilight> - Run the entry's command again when its window " +"exits<br><hilight>Transient</hilight> - Remember only this instance of the " +"window (not permanent)" +msgstr "" +"У изборнику брзог приступа се налазе следеће могућности:" +"<br><hilight>Самоскривање</hilight> - сакриј прозор кад год испадне из " +"жиже<br><hilight>Сакриј уместо издизања</hilight> - Сакриј прозор кад је " +"покренут и није у жижи<br><hilight>Начин скакања</hilight> - Пребаци на " +"радну површ прозора и издигни уместо приказа/скривања<br><hilight>ПОново " +"покрени кад је затворен</hilight> - Покрени наредбу ставке поново кад се њен " +"прозор затвори<br><hilight>Непостојан</hilight> - Запамти само овај примерак " +"прозора (не стално)" + +#: src/modules/quickaccess/e_mod_quickaccess.c:975 +msgid "You deleted it on your own, you rascal!<br>Way to go!" +msgstr "Сами сте га обрисали, мангупчино!<br>Тако се то ради!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:977 +#: src/modules/quickaccess/e_mod_quickaccess.c:1018 +#: src/modules/quickaccess/e_mod_quickaccess.c:1230 +#: src/modules/quickaccess/e_mod_quickaccess.c:1253 +msgid "Stop" +msgstr "Заустави" + +#: src/modules/quickaccess/e_mod_quickaccess.c:994 +msgid "Great! Activate the Quickaccess entry again to show it!" +msgstr "Одлично! Покрените опет ставку брзог приступа за њен приказ!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:996 +msgid "Great! Activate the Quickaccess entry again to hide it!" +msgstr "Одлично! Покрените опет ставку брзог приступа за њено скривање!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:1016 +msgid "Well done.<br>Now to delete the entry we just made..." +msgstr "Лепо одрађено.<br>Сада обришите ставку коју сте управо направили..." + +#: src/modules/quickaccess/e_mod_quickaccess.c:1032 +msgid "" +"The demo dialog has been bound to the keys you pressed.<br>Try pressing the " +"same keys!" +msgstr "" +"Низ дугмади које сте притиснули су пречица показног<br>прозора.<br>Покушајте " +"притиснути исти низ дугмади!" + +#: src/modules/quickaccess/e_mod_quickaccess.c:1197 +msgid "" +"The newly displayed window will activate<br>the Quickaccess binding sequence." +msgstr "Новоприказани прозор ће покренути<br>низ пречице брзог приступа." + +#: src/modules/quickaccess/e_mod_quickaccess.c:1204 +msgid "Quickaccess Demo" +msgstr "Увод у брзи приступ" + +#: src/modules/quickaccess/e_mod_quickaccess.c:1205 +msgid "This is a demo dialog used in the Quickaccess tutorial" +msgstr "Ово је показни прозор коришћен у објашњењу брзог приступа" + +#: src/modules/quickaccess/e_mod_quickaccess.c:1227 +msgid "" +"Quickaccess entries can be created from<br>the border menu of any window." +"<br>Click Continue to see a demonstration." +msgstr "" +"Ставке брзог приступа могу бити направљен из<br>изборника ивица било ког " +"прозора.<br>Кликните на настави да би видели показни пример." + +#: src/modules/quickaccess/e_mod_quickaccess.c:1248 +msgid "" +"Quickaccess is a way of binding user-selected<br>windows and applications to " +"keyboard shortcuts.<br>Once a Quickaccess entry has been created,<br>the " +"associated window can be returned to immediately<br>on demand by pushing the " +"keyboard shortcut." +msgstr "" +"Брзи приступ је начин задавања пречица тастатуре<br>кориснички изабраних " +"прозора и програма.<br>Кад ставка брзог приступа буде направљена," +"<br>удружени прозор може бити враћен одмах на захтев<br>притискањем пречице " +"тастатуре." + +#: src/modules/quickaccess/e_mod_quickaccess.c:1265 +msgid "" +"This appears to be your first time using the Quickaccess module.<br>Would " +"you like some usage tips?" +msgstr "" +"Изгледа као да први пут користите јединицу брзог приступа.<br>Да ли желите " +"неке савете за употребу?" + +#: src/modules/quickaccess/e_mod_quickaccess.c:1312 +msgid "quick access name/identifier" +msgstr "назив/показатељ брзог приступа" + +#: src/modules/systray/e_mod_main.c:497 src/modules/systray/e_mod_main.c:949 +msgid "Systray Error" +msgstr "Грешка системске касете" + +#: src/modules/systray/e_mod_main.c:498 +msgid "Systray cannot set its background invisible to match its shelf." +msgstr "" +"Системска касета не може поставити своју позадину провидном да би се " +"изгледом уклопила својој полици." + +#: src/modules/systray/e_mod_main.c:940 +msgid "Another systray exists" +msgstr "Нека друга системска касета постоји" + +#: src/modules/systray/e_mod_main.c:941 +msgid "There can be only one systray gadget and another one already exists." +msgstr "" +"Може бити само једна справица системске касете, а нека друга већ постоји." + +#: src/modules/systray/e_mod_main.c:950 +msgid "Systray cannot work in a shelf that is set to below everything." +msgstr "" +"Системска касета не може радити на полици која је постављена испод свега." + +#: src/modules/systray/e_mod_main.c:1161 +msgid "Systray" +msgstr "Системска касета" + +#: src/modules/shot/e_mod_main.c:176 src/modules/shot/e_mod_main.c:210 +msgid "Error saving screenshot file" +msgstr "Грешка при чувању датотеке снимка екрана" + +#: src/modules/shot/e_mod_main.c:177 src/modules/shot/e_mod_main.c:211 +#, c-format +msgid "Path: %s" +msgstr "Путања: %s" + +#: src/modules/shot/e_mod_main.c:228 +msgid "Error - Unknown format" +msgstr "Грешка - непознати облик" + +#: src/modules/shot/e_mod_main.c:229 +msgid "" +"File has an unspecified extension.<br>Please use '.jpg' or '.png' " +"extensions<br>only as other formats are not<br>supported currently." +msgstr "" +"Датотека нема одговарајући наставак.<br>Молим, користите само „.jpg“ или „." +"png“ наставке<br>јер остали облици тренутно<br>нису подржани." + +#: src/modules/shot/e_mod_main.c:277 +msgid "Select screenshot save location" +msgstr "Подесите одредиште за чување снимака" + +#: src/modules/shot/e_mod_main.c:289 src/modules/shot/e_mod_main.c:800 +msgid "Save" +msgstr "Сачувај" + +#: src/modules/shot/e_mod_main.c:387 +#, c-format +msgid "Uploaded %s / %s" +msgstr "Отпремљено %s / %s" + +#: src/modules/shot/e_mod_main.c:407 +msgid "Error - Upload Failed" +msgstr "Грешка - отпремање није успело" + +#: src/modules/shot/e_mod_main.c:408 +#, c-format +msgid "Upload failed with status code:<br>%i" +msgstr "Отпремање није успело уз шифру стања:<br>%i" + +#: src/modules/shot/e_mod_main.c:452 +msgid "Error - Can't create file" +msgstr "Грешка - Нисам успео да направим датотеку" + +#: src/modules/shot/e_mod_main.c:453 +#, c-format +msgid "Cannot create temporary file '%s': %s" +msgstr "Нисам успео да направим привремену датотеку „%s“: %s" + +#: src/modules/shot/e_mod_main.c:471 +msgid "Error - Can't open file" +msgstr "Грешка - нисам успео да отворим датотеку" + +#: src/modules/shot/e_mod_main.c:472 +#, c-format +msgid "Cannot open temporary file '%s': %s" +msgstr "Нисам успео да отворим привремену датотеку „%s„ : %s" + +#: src/modules/shot/e_mod_main.c:480 +msgid "Error - Bad size" +msgstr "Грешка - лоша величина" + +#: src/modules/shot/e_mod_main.c:481 +#, c-format +msgid "Cannot get size of file '%s'" +msgstr "Нисам успео да добавим величину датотеке „%s“" + +#: src/modules/shot/e_mod_main.c:491 +msgid "Error - Can't allocate memory" +msgstr "Грешка - нисам успео да обезбедим меморију" + +#: src/modules/shot/e_mod_main.c:492 +#, c-format +msgid "Cannot allocate memory for picture: %s" +msgstr "Нисам успео доделити меморију слици: %s" + +#: src/modules/shot/e_mod_main.c:499 +msgid "Error - Can't read picture" +msgstr "Грешка - Нисам успео да прочитам слику" + +#: src/modules/shot/e_mod_main.c:500 +msgid "Cannot read picture" +msgstr "Нисам успео да прочитам слику" + +#: src/modules/shot/e_mod_main.c:522 +msgid "Uploading screenshot" +msgstr "Отпремање снимка" + +#: src/modules/shot/e_mod_main.c:527 +msgid "Uploading ..." +msgstr "Отпремам ..." + +#: src/modules/shot/e_mod_main.c:532 +msgid "Screenshot is available at this location:" +msgstr "Снима екрана је доступан на овом месту:" + +#: src/modules/shot/e_mod_main.c:541 +msgid "Hide" +msgstr "Сакриј" + +#: src/modules/shot/e_mod_main.c:565 +msgid "Confirm Share" +msgstr "Потврди дељење" + +#: src/modules/shot/e_mod_main.c:566 +msgid "" +"This image will be uploaded<br>to enlightenment.org. It will be publicly " +"visible." +msgstr "" +"Ова слика ће бити отпремљена<br>на enlightenment.org. Биће јавно видљива." + +#: src/modules/shot/e_mod_main.c:568 +msgid "Confirm" +msgstr "Потврди" + +#: src/modules/shot/e_mod_main.c:669 +msgid "Where to put Screenshot..." +msgstr "Где сместити слике екрана..." + +#: src/modules/shot/e_mod_main.c:725 +msgid "Perfect" +msgstr "савршен" + +#: src/modules/shot/e_mod_main.c:802 +msgid "Share" +msgstr "Дели" + +#: src/modules/shot/e_mod_main.c:939 src/modules/shot/e_mod_main.c:987 +msgid "Take Shot" +msgstr "Направи снимак" + +#: src/modules/shot/e_mod_main.c:950 src/modules/shot/e_mod_main.c:980 +#: src/modules/shot/e_mod_main.c:991 +msgid "Take Screenshot" +msgstr "Направи снимак екрана" + +#: src/modules/shot/e_mod_main.c:968 +msgid "Shot Error" +msgstr "Грешка снимка" + +#: src/modules/shot/e_mod_main.c:969 +msgid "Cannot initialize network" +msgstr "Нисам успео да покренем мрежу" + +# Процеси? +#: src/modules/tasks/e_mod_main.c:318 src/modules/tasks/e_mod_main.c:735 +msgid "Tasks" +msgstr "Задаци" + +#: src/modules/tasks/e_mod_config.c:34 +msgid "Tasks Configuration" +msgstr "Поставке задатака" + +#: src/modules/tasks/e_mod_config.c:90 +msgid "Show icon only" +msgstr "Само прикажи иконе" + +#: src/modules/tasks/e_mod_config.c:94 +msgid "Show text only" +msgstr "Прикажи само тект" + +#: src/modules/tasks/e_mod_config.c:98 +msgid "Item width" +msgstr "Ширина ставки" + +#: src/modules/tasks/e_mod_config.c:100 src/modules/tasks/e_mod_config.c:105 +#, c-format +msgid "%1.0f px" +msgstr "%1.0f px" + +#: src/modules/tasks/e_mod_config.c:103 +msgid "Item height" +msgstr "Висина ставки" + +#: src/modules/tiling/e_mod_config.c:135 +msgid "columns" +msgstr "ступци" + +#: src/modules/tiling/e_mod_config.c:137 +msgid "rows" +msgstr "редови" + +#: src/modules/tiling/e_mod_config.c:182 +msgid "Tile dialog windows as well" +msgstr "Поплочавај и прозоре потврђивања" + +#: src/modules/tiling/e_mod_config.c:185 +msgid "Show window titles" +msgstr "Прикажи наслове прозора" + +#: src/modules/tiling/e_mod_config.c:189 +msgid "Key hints" +msgstr "Кључни савети" + +#: src/modules/tiling/e_mod_config.c:200 +msgid "Number of columns used to tile per desk (0 → tiling disabled):" +msgstr "" +"Број коришћених колона за поплочавање по радном простору (0 → поплочавање " +"онемогућено):" + +#: src/modules/tiling/e_mod_config.c:353 +msgid "Tiling Configuration" +msgstr "Поставке поплочавања" + +#: src/modules/tiling/e_mod_tiling.c:4082 +#: src/modules/tiling/e_mod_tiling.c:4146 +msgid "Tiling" +msgstr "Поплочавање" + +#: src/modules/tiling/e_mod_tiling.c:4089 +msgid "Toggle floating" +msgstr "Прекидач плутања" + +#: src/modules/tiling/e_mod_tiling.c:4092 +msgid "Add a stack" +msgstr "Додај стог" + +#: src/modules/tiling/e_mod_tiling.c:4095 +msgid "Remove a stack" +msgstr "Уклони стог" + +#: src/modules/tiling/e_mod_tiling.c:4098 +msgid "Toggle between rows and columns" +msgstr "Мењај између редова и колона" + +#: src/modules/tiling/e_mod_tiling.c:4101 +msgid "Swap a window with an other" +msgstr "Замени прозор са другим" + +#: src/modules/tiling/e_mod_tiling.c:4105 +msgid "Move window" +msgstr "Премешта прозор" + +#: src/modules/tiling/e_mod_tiling.c:4108 +msgid "Move window to the left" +msgstr "Помери прозор улево" + +#: src/modules/tiling/e_mod_tiling.c:4111 +msgid "Move window to the right" +msgstr "Помери прозор удесно" + +#: src/modules/tiling/e_mod_tiling.c:4114 +msgid "Move window up" +msgstr "Помери прозор горе" + +#: src/modules/tiling/e_mod_tiling.c:4117 +msgid "Move window down" +msgstr "Помери прозор доле" + +#: src/modules/tiling/e_mod_tiling.c:4121 +msgid "Adjust transitions" +msgstr "Подеси прелазе" + +#: src/modules/tiling/e_mod_tiling.c:4124 +msgid "Focus a particular window" +msgstr "Стави одређени прозор у жижу" + +#: src/modules/tiling/e_mod_tiling.c:4128 +msgid "Send to upper right corner" +msgstr "Пошаљи у горњи десни угао" + +#: src/modules/tiling/e_mod_tiling.c:4131 +msgid "Send to upper left corner" +msgstr "Пошаљи у горњи леви угао" + +#: src/modules/tiling/e_mod_tiling.c:4134 +msgid "Send to lower right corner" +msgstr "Пошаљи у доњи десни угао" + +#: src/modules/tiling/e_mod_tiling.c:4137 +msgid "Send to lower left corner" +msgstr "Пошаљи у доњи леви угао" + +#: src/modules/xkbswitch/e_mod_config.c:73 +msgid "Keyboard Settings" +msgstr "Поставке тастатуре" + +#: src/modules/xkbswitch/e_mod_config.c:276 +msgid "Configurations" +msgstr "Поставке" + +#: src/modules/xkbswitch/e_mod_config.c:285 +msgid "Models" +msgstr "Модели" + +#: src/modules/xkbswitch/e_mod_config.c:300 +msgid "Label only" +msgstr "Само ознаке" + +#: src/modules/xkbswitch/e_mod_config.c:483 +msgid "Add New Configuration" +msgstr "Додај нову поставку" + +#: src/modules/xkbswitch/e_mod_config.c:496 +msgid "Available" +msgstr "Доступан" + +#: src/modules/xkbswitch/e_mod_config.c:503 +msgid "Model" +msgstr "Модел" + +#: src/modules/xkbswitch/e_mod_config.c:510 +msgid "Variant" +msgstr "Подврста" + +#: src/modules/notification/e_mod_main.c:66 +msgid "Enter Presentation Mode" +msgstr "Покрени начин рада излагање" + +#: src/modules/notification/e_mod_main.c:67 +msgid "" +"Enlightenment is in <b>presentation</b> mode.<br>During presentation mode, " +"screen saver, lock and power saving will be disabled so you are not " +"interrupted." +msgstr "" +"Просвећење је у начину рада <b>излагања.</b> Током начина рада излагања, " +"чувар екрана, закључавање и штедња снаге ће бити онемогућене, да не би били " +"ометани." + +#: src/modules/notification/e_mod_main.c:73 +msgid "Exited Presentation Mode" +msgstr "Изашао сам из начина рада излагања" + +#: src/modules/notification/e_mod_main.c:74 +msgid "" +"Presentation mode is over.<br>Now screen saver, lock and power saving " +"settings will be restored." +msgstr "" +"Начин рада излагања је завршен.<br>Сада ће поставке чувара екрана, " +"закључавања и штедње снаге бити враћене." + +#: src/modules/notification/e_mod_main.c:89 +msgid "Enter Offline Mode" +msgstr "Покрени рад ван мреже" + +#: src/modules/notification/e_mod_main.c:90 +msgid "" +"Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules " +"that use network will stop polling remote services." +msgstr "" +"Просвећење је у стању <b>ван мреже</b>. <br>За време рада ван мреже, " +"јединице које користе мрежу ће обуставити добављање удаљених услуга." + +#: src/modules/notification/e_mod_main.c:96 +msgid "Exited Offline Mode" +msgstr "Изишао сам из рада ван мреже" + +#: src/modules/notification/e_mod_main.c:97 +msgid "" +"Now in <b>online</b> mode.<br>Now modules that use network will resume " +"regular tasks." +msgstr "" +"Сада сам у стању <b>на мрежи</b>. Јединице<br>које користе мрежу ће " +"наставити са редовним задацима." + +#: src/modules/notification/e_mod_main.c:172 +msgid "Notification Module" +msgstr "Јединица обавештења" + +#: src/modules/notification/e_mod_main.c:192 +msgid "Error During DBus Init!" +msgstr "Грешка приликом покретања Д-сабирнице!" + +#: src/modules/notification/e_mod_main.c:193 +msgid "" +"Error during DBus init! Please check if dbus is correctly installed and " +"running." +msgstr "" +"Грешка приликом покретања Д-сабирнице! Молим, проверите да ли је dbus " +"правилно уграђен, и у погону." + +#: src/modules/notification/e_mod_config.c:45 +msgid "Notification Settings" +msgstr "Поставке обавштења" + +#: src/modules/notification/e_mod_config.c:93 +msgid "Urgency" +msgstr "Важност" + +#: src/modules/notification/e_mod_config.c:94 +msgid "Levels of urgency to display:" +msgstr "Степено важности за приказ:" + +#: src/modules/notification/e_mod_config.c:100 +msgid "Critical" +msgstr "опасна" + +#: src/modules/notification/e_mod_config.c:104 +msgid "Default Timeout" +msgstr "Подразумевано време истека" + +#: src/modules/notification/e_mod_config.c:105 +msgid "Force timeout for all notifications" +msgstr "Присили време истека свих обавештења" + +#: src/modules/notification/e_mod_config.c:122 +msgid "Popup Corner" +msgstr "Ћоше искакања" + +#: src/modules/notification/e_mod_config.c:124 +msgid "Top left" +msgstr "Горе лево" + +#: src/modules/notification/e_mod_config.c:126 +msgid "Top right" +msgstr "Горе десно" + +#: src/modules/notification/e_mod_config.c:128 +msgid "Bottom left" +msgstr "Доле лево" + +#: src/modules/notification/e_mod_config.c:130 +msgid "Bottom right" +msgstr "Доле десно" + +#: src/modules/notification/e_mod_config.c:142 +msgid "Ignore replace ID" +msgstr "Занемари замену ЛБ" + +#: src/modules/notification/e_mod_config.c:144 +msgid "Use multiple monitor geometry" +msgstr "Користи вишеструку размеру екрана" + +#~ msgid "" +#~ "<title>Copyright © 2000-2013, by the Enlightenment Development Team</" +#~ "><br><br>We hope you enjoy using this software as much as we enjoyed " +#~ "writing it.<br><br>To contact us please visit:<br><hilight>http://www." +#~ "enlightenment.org</><br><br>" +#~ msgstr "" +#~ "<title>Ауторска права © 2000-2013, развојна дружина " +#~ "Просвећења<br><br>Надамо се да уживате у нашим мекотворинама, као што смо " +#~ "ми уживали у њиховом писању.<br><br>За везу са нама, молимо, посетите:" +#~ "<br><hilight>http://www.enlightenment.org</><br><br>" + +#~ msgid "Use fast composite effects for windows" +#~ msgstr "Употребљавај брзе утиске слагања за прозоре" + +#~ msgid "composite" +#~ msgstr "слагање" + +#~ msgid "border" +#~ msgstr "ивица" + +#~ msgid "theme" +#~ msgstr "тема" + +#~ msgid "animate" +#~ msgstr "оживи" + +#~ msgid "Use fast composite effects for menus" +#~ msgstr "Користи брзе утиске слагања за изборнике" + +#~ msgid "menu" +#~ msgstr "изборник" + +#~ msgid "Use fast composite effects for popups" +#~ msgstr "Употребљавај брзе утиске слагања за искачуће прозоре" + +#~ msgid "popup" +#~ msgstr "искачући прозори" + +#~ msgid "Use fast composite effects for objects" +#~ msgstr "Употребљавај брзе утиске слагања за предмете" + +#~ msgid "" +#~ "Use fast composite effects for override-redirect windows (tooltips and " +#~ "such)" +#~ msgstr "" +#~ "Употребљавај брзе утиске слагања за надглашавања-преусмерења прозора " +#~ "(напомене и слично)" + +#~ msgid "Disable composite effects for windows" +#~ msgstr "Онемогући утиске слагања за прозоре" + +#~ msgid "Disable composite effects for menus" +#~ msgstr "Онемогући утиске слагања за изборнике" + +#~ msgid "Disable composite effects for popups" +#~ msgstr "Онемогући утиске слагања за искачуће прозоре" + +#~ msgid "Disable composite effects for objects" +#~ msgstr "Онемогући утиске брзог слагања предметима" + +#~ msgid "" +#~ "Disable composite effects for override-redirect windows (tooltips and " +#~ "such)" +#~ msgstr "" +#~ "Онемогући утиске слагања за надглашавања-преусмерења (напомене и слично)" + +#~ msgid "Disable composite effects for the screen" +#~ msgstr "Онемогући утиске слагања за екран" + +#~ msgid "screen" +#~ msgstr "екран" + +#~ msgid "" +#~ "This option disables composite effects from themes, such as animating the " +#~ "screen fade when blanking" +#~ msgstr "" +#~ "Ово онемогућује утиске слагања из тема, као што су оживљавање утапања " +#~ "екрана при чишћењу" + +#~ msgid "Compositing engine" +#~ msgstr "Погон слагања" + +#~ msgid "Default window composite effect" +#~ msgstr "Подразумевани утисак слагања прозора" + +#~ msgid "Smooth scaling of composited window content" +#~ msgstr "Глатко размеравање слагања садржаја прозора" + +#~ msgid "Sync composited windows" +#~ msgstr "Усклађуј слагане прозоре" + +#~ msgid "Loose sync composited windows" +#~ msgstr "Не усклађуј слагане прозоре" + +#~ msgid "Grab server during rendering of composited windows" +#~ msgstr "Захвати служитеља приликом исцртавања слаганих прозора" + +#~ msgid "Initial draw timeout for newly-mapped composited windows" +#~ msgstr "Време истека почетног исцртавања за новосмештене слагане прозоре" + +#~ msgid "delay" +#~ msgstr "одгода" + +#~ msgid "%1.2f seconds" +#~ msgstr "%1.2f секунди" + +#~ msgid "Tear-free compositing (VSYNC)" +#~ msgstr "Слагање приказа без цепања (VSYNC)" + +#~ msgid "Texture from pixmap rendering for composite" +#~ msgstr "Исцртавање текстура из мапе тачака за слагање приказа" + +#~ msgid "Composite swapping method" +#~ msgstr "Начин замене меморије слагања" + +#~ msgid "Send flush when compositing windows" +#~ msgstr "Пошаљи испирање (flush) при слагању прозора" + +#~ msgid "Send dump when compositing windows" +#~ msgstr "Пошаљи одбацивање (dump) при слагању прозора" + +#~ msgid "Show framerate when compositing windows" +#~ msgstr "Приказуј брзину протока сличица при слагању приказа прозора" + +#~ msgid "Rolling average for fps display when compositing" +#~ msgstr "Покретни просек за приказ сличица по секунди при слагању приказа" + +#~ msgid "%1.0f frames" +#~ msgstr "%1.0f сличица" + +#~ msgid "Composite framerate display corner" +#~ msgstr "Угао за приказ брзине протока сличица" + +#~ msgid "windows" +#~ msgstr "прозори" + +#~ msgid "Compositor" +#~ msgstr "Управник слагања" + +#~ msgid "Change current window opacity" +#~ msgstr "Измени тренутну непровидност прозора" + +#~ msgid "Set current window opacity" +#~ msgstr "Постави тренутну непровидност прозора" + +#~ msgid "" +#~ "Your bindings settings version does not match the current settings " +#~ "version.<br>As a result, all bindings have been reloaded from defaults." +#~ "<br>Sorry for the inconvenience.<br>" +#~ msgstr "" +#~ "Издање поставке пречица се не поклапа са тренутним издањем поставки." +#~ "<br>Као производ, за све пречице су поново учитане подразумеване " +#~ "вредности.<br>Извините због непријатности.<br>" + +#~ msgid "none" +#~ msgstr "ништа" + +#~ msgid "Show splash screen on startup" +#~ msgstr "Прикажи поздравни приказ при покретању" + +#~ msgid "startup" +#~ msgstr "почетни" + +#~ msgid "Startup splash theme" +#~ msgstr "Тема поздравног приказа" + +#~ msgid "Startup transition effect" +#~ msgstr "Утисак прелаза поздравног приказа" + +#~ msgid "transition" +#~ msgstr "прелаз" + +#~ msgid "Desk change transition effect" +#~ msgstr "Утисак приликом промене радне површи" + +#~ msgid "vdesk" +#~ msgstr "нестварна радна површ" + +#~ msgid "Wallpaper change transition effect" +#~ msgstr "Утисак преласка при промени позадине" + +#~ msgid "wallpaper" +#~ msgstr "слика позадине" + +#~ msgid "Default desktop wallpaper" +#~ msgstr "Подразумевана слика позадине" + +#~ msgid "Default desktop name" +#~ msgstr "Подразумевано име радне површи" + +#~ msgid "desktop" +#~ msgstr "радна површ" + +#~ msgid "name" +#~ msgstr "име" + +#~ msgid "Used in Pager displays" +#~ msgstr "Коришћено у приказама страничника" + +#~ msgid "Menu scroll speed" +#~ msgstr "Брзина премицања изборника" + +#~ msgid "scroll" +#~ msgstr "премицање" + +#~ msgid "speed" +#~ msgstr "брзина" + +#~ msgid "Speed at which the menus move onto screen if offscreen" +#~ msgstr "Брзина при којој се изборници мичу на екран ако су ван њега" + +#~ msgid "Menu fast move threshold" +#~ msgstr "Задршка брзог кретања изборника" + +#~ msgid "move" +#~ msgstr "померање" + +#~ msgid "" +#~ "Moving the mouse faster than this speed over a menu causes menu items to " +#~ "not be selected" +#~ msgstr "" +#~ "Брже кретање миша од ове брзине изнад изборника узрокује да ставке " +#~ "изборника не бивају изабране" + +#~ msgid "Menu mouse deactivate delay" +#~ msgstr "Задршка искључивања изборника миша" + +#~ msgid "drag" +#~ msgstr "превлачење" + +#~ msgid "" +#~ "The minimum time before a menu can be closed by clicking the mouse " +#~ "outside the menu" +#~ msgstr "" +#~ "Најмање време пре кога изборник не може бити затворен кликом миша ван " +#~ "изборника" + +#~ msgid "Menu autoscroll margin" +#~ msgstr "Руб самосталног премицања изборника" + +#~ msgid "" +#~ "The distance from the edge of the screen before menus begin to move away " +#~ "from the edge" +#~ msgstr "" +#~ "Растојање од ивице екрана испод које изборници почињу да се удаљавају од " +#~ "ивице" + +#~ msgid "Menu autoscroll cursor margin" +#~ msgstr "Руб показивача самосталног премицања изборника" + +#~ msgid "mouse" +#~ msgstr "миш" + +#~ msgid "pointer" +#~ msgstr "показивач" + +#~ msgid "" +#~ "The distance of the mouse pointer from the edge of the screen before " +#~ "menus begin to move away from the edge" +#~ msgstr "" +#~ "Растојање показивача миша од ивице екрана испод ког изборници почињу да " +#~ "се удаљавају од ивице" + +#~ msgid "Enable window shading animation" +#~ msgstr "Омогући утисак смотавања прозора" + +#~ msgid "shade" +#~ msgstr "смотавање" + +#~ msgid "Window shade animation type" +#~ msgstr "Врста утиска смотавања прозора" + +#~ msgid "Window shade animation speed" +#~ msgstr "Брзина утиска смотавања прозора" + +#~ msgid "The framerate at which animations in Enlightenment occur" +#~ msgstr "Проток сличица на којем се јављају утисци у Просвећењу" + +#~ msgid "Application exec priority" +#~ msgstr "Предност извршења програма" + +#~ msgid "application" +#~ msgstr "програм" + +#~ msgid "exec" +#~ msgstr "извршавање" + +#~ msgid "priority" +#~ msgstr "предност" + +#~ msgid "cache" +#~ msgstr "међумеморија" + +#~ msgid "image" +#~ msgstr "слика" + +#~ msgid "size" +#~ msgstr "величина" + +#~ msgid "font" +#~ msgstr "словни лик" + +#~ msgid "Edje cache size" +#~ msgstr "Величина међумеморије за Едје" + +#~ msgid "edje" +#~ msgstr "едје" + +#~ msgid "Edje collection cache size" +#~ msgstr "Величина међумеморије збирке едје" + +#~ msgid "Cache flushing interval" +#~ msgstr "Време пражњења међумеморије" + +#~ msgid "Horizontal virtual desktop count" +#~ msgstr "Број водоравних нестварних површи" + +#~ msgid "Vertical virtual desktop count" +#~ msgstr "Број усправних нестварних површи" + +#~ msgid "Edge flip while dragging" +#~ msgstr "Пребацивање преко ивице при превлачењу" + +#~ msgid "edge" +#~ msgstr "ивица" + +#~ msgid "flip" +#~ msgstr "пребацивање" + +#~ msgid "binding" +#~ msgstr "пречица" + +#~ msgid "" +#~ "Enable edge binding functionality while dragging objects to screen edge" +#~ msgstr "Омогући пречице ивица при превлачењу предмета ивицама екрана" + +#~ msgid "Use shaped windows instead of ARGB" +#~ msgstr "Користи обликоване прозоре уместо АРГБ" + +#~ msgid "Module settings" +#~ msgstr "Поставке јединице" + +#~ msgid "module" +#~ msgstr "јединица" + +#~ msgid "Disable module delay" +#~ msgstr "Онемогући задршку јединице" + +#~ msgid "" +#~ "If enabled, this causes E to load all modules at once during startup " +#~ "instead of loading them incrementally" +#~ msgstr "" +#~ "Ако је омогућено, ово узрокује Е да учита све јединице одједном приликом " +#~ "покретања уместо њиховог постепеног учитавања" + +#~ msgid "Window placement policy" +#~ msgstr "Смернице смештаја прозора" + +#~ msgid "placement" +#~ msgstr "смештај" + +#~ msgid "Determines where and how new windows are placed when created" +#~ msgstr "Одређује где и како смештати нове прозоре при њиховом образовању" + +#~ msgid "Group new windows from same application" +#~ msgstr "Удружуј нове прозоре истог програма" + +#~ msgid "Switch to desk of new window" +#~ msgstr "Пређи на радни простор новог прозора" + +#~ msgid "Window focus policy" +#~ msgstr "Смернице жиже прозора" + +#~ msgid "focus" +#~ msgstr "жижа" + +#~ msgid "New window focus policy" +#~ msgstr "Смернице жиже новог прозора" + +#~ msgid "Pass click to unfocused windows" +#~ msgstr "Шаље клик прозору који није у жижи" + +#~ msgid "click" +#~ msgstr "клик" + +#~ msgid "" +#~ "When clicking an unfocused window, pass this click through to the " +#~ "application instead of only using it to focus the window" +#~ msgstr "" +#~ "Приликом клика на прозор који није у жижи, шаље клик кроз програм уместо " +#~ "његове употребе само за узимање прозора у жижу" + +#~ msgid "Policy when applications request focus" +#~ msgstr "Смернице приликом захтева програма за жижом" + +#~ msgid "Always raise window when clicked" +#~ msgstr "Увек издигни прозор при клику" + +#~ msgid "raise" +#~ msgstr "издизање" + +#~ msgid "Always focus window when clicked" +#~ msgstr "Увек узимај прозор у жижу при клику" + +#~ msgid "Enable window autoraise" +#~ msgstr "Омогући самоиздизање прозора" + +#~ msgid "Window autoraise delay" +#~ msgstr "Задршка самоиздизања прозора" + +#~ msgid "Revert window focus on desk switch" +#~ msgstr "Врати жижу прозора при преласку са површи на површ" + +#~ msgid "Revert window focus on window hide or close" +#~ msgstr "Врати жижу прозору при скривању или затварању прозора" + +#~ msgid "Warp pointer to new windows and away from closed windows" +#~ msgstr "" +#~ "Изобличи показивач на новом прозору и при напуштању прозора који се " +#~ "затварају" + +#~ msgid "warp" +#~ msgstr "изобличавање" + +#~ msgid "Prevent all forms of pointer warping" +#~ msgstr "Спречи све облике изобличавања показивача" + +#~ msgid "Speed to move pointer when warping between windows" +#~ msgstr "Брзина померања показивача приликом изобличавања између прозора" + +#~ msgid "Windows raise on mouse move/resize" +#~ msgstr "Издизање прозора приликом померања/промене величине" + +#~ msgid "resize" +#~ msgstr "промена величине" + +#~ msgid "Windows raise when focused" +#~ msgstr "Издижи прозоре приликом узимања у жижу" + +#~ msgid "Shelf gadget resistance" +#~ msgstr "Отпор справица полице" + +#~ msgid "gadget" +#~ msgstr "справица" + +#~ msgid "resist" +#~ msgstr "отпор" + +#~ msgid "shelf" +#~ msgstr "полица" + +#~ msgid "Enable resistance when dragging windows" +#~ msgstr "Омогући отпор при превлачењу прозора" + +#~ msgid "Window resistance against screen edges" +#~ msgstr "Отпор прозора ивицама екрана" + +#~ msgid "Window resistance against other windows" +#~ msgstr "Отпор прозора другим прозорима" + +#~ msgid "Window resistance against desktop gadgets" +#~ msgstr "Отпор прозора справицама површи" + +#~ msgid "Ensure initial placement of windows inside useful geometry" +#~ msgstr "Обезбеди почетан смештај прозорима у корисној размери" + +#~ msgid "" +#~ "Useful geometry is calculated as the screen size minus the geometry of " +#~ "any shelves which do not allow windows to overlap them.This option " +#~ "ensures that non-user placement of windows will be inside the useful " +#~ "geometry of the current screen" +#~ msgstr "" +#~ "Корисна размера се рачуна као величина екрана мање размера било које " +#~ "полице која не дозвољава прозорима да је прекрију. Ово омогућује да " +#~ "смештај прозора без корисничког утицаја буде унутар корисне размере " +#~ "тренутног екрана" + +#~ msgid "Limit window autoresizing to useful geometry" +#~ msgstr "Ограничи промену величине прозора на корисну размеру" + +#~ msgid "" +#~ "Useful geometry is calculated as the screen size minus the geometry of " +#~ "any shelves which do not allow windows to overlap them" +#~ msgstr "" +#~ "Корисна размера се рачуна као величина екрана мање размера било које " +#~ "полице која не дозвољава прозорима да је прекрију" + +#~ msgid "Winlist moves pointer to currently selected window while selecting" +#~ msgstr "" +#~ "Списак прозора премешта показивач на тренутно изабрани прозор приликом " +#~ "његовог одабира" + +#~ msgid "winlist" +#~ msgstr "списак прозора" + +#~ msgid "" +#~ "Winlist moves pointer to currently selected window after winlist closes" +#~ msgstr "" +#~ "Списак прозора премешта показивач на тренутно изабрани прозор након " +#~ "затварања списка прозора" + +#~ msgid "Disable pointer warping on winlist directional focus change" +#~ msgstr "" +#~ "Онемогући изобличавање показивача на промени жиже списка прозора по правцу" + +#~ msgid "" +#~ "This option, when enabled, disables pointer warping only when switching " +#~ "windows using a directional winlist action (up/down/left/right)" +#~ msgstr "" +#~ "Када је ово омогућено, онемогућује изобличавање показивача само при " +#~ "преласку прозора употребом радње преласка списком прозора по правцу(горе/" +#~ "доле/лево/десно)" + +#~ msgid "Enable winlist scroll animation" +#~ msgstr "Омогући утисак премицања списку прозора" + +#~ msgid "Winlist scroll speed" +#~ msgstr "Брзина списка прозора" + +#~ msgid "Winlist shows iconified windows" +#~ msgstr "Списак прозора приказује умањене прозоре" + +#~ msgid "minimize" +#~ msgstr "умањивање" + +#~ msgid "Winlist shows iconified windows from other desks" +#~ msgstr "Списак прозора приказује умањене прозоре са других радних површи" + +#~ msgid "Winlist shows iconified windows from other screens" +#~ msgstr "Списак прозора приказује умањене прозоре са других екрана" + +#~ msgid "Winlist shows windows from other desks" +#~ msgstr "Списак прозора приказује прозоре са других радних површи" + +#~ msgid "Winlist shows windows from other screens" +#~ msgstr "Списак прозора приказује прозоре са других екрана" + +#~ msgid "Winlist uniconifies and unshades windows while selecting" +#~ msgstr "Списак прозора поништава умањење и размотава прозоре при одабиру" + +#~ msgid "Winlist switches desks while selecting" +#~ msgstr "Списак прозора прелази по површима приликом одабира" + +#~ msgid "Winlist focuses windows while selecting" +#~ msgstr "Списак прозора узима прозоре у жижу приликом одабира" + +#~ msgid "Winlist raises windows while selecting" +#~ msgstr "Списак прозора издиже прозоре приликом одабира" + +#~ msgid "Winlist horizontal alignment" +#~ msgstr "Водоравно поравнање списка прозора" + +#~ msgid "Winlist vertical alignment" +#~ msgstr "Усправно поравнање списка прозора" + +#~ msgid "Winlist width" +#~ msgstr "Ширина списка прозора" + +#~ msgid "Winlist height" +#~ msgstr "Висина списка прозора" + +#~ msgid "Winlist minimum width" +#~ msgstr "Најмања ширина списка прозора" + +#~ msgid "Winlist minimum height" +#~ msgstr "Најмања висина списка прозора" + +#~ msgid "Winlist maximum width" +#~ msgstr "Највећа ширина списка прозора" + +#~ msgid "Winlist maximum height" +#~ msgstr "Највећа висина списка прозора" + +#~ msgid "Fullscreen window policy" +#~ msgstr "Смернице приказа прозора преко целог екрана" + +#~ msgid "fullscreen" +#~ msgstr "цео екран" + +#~ msgid "Window maximize policy" +#~ msgstr "Смернице увећаних прозора" + +#~ msgid "maximize" +#~ msgstr "увећање" + +#~ msgid "Allow moving of maximized windows" +#~ msgstr "Дозволи померање увећаних прозора" + +#~ msgid "Adjust windows on shelf toggle" +#~ msgstr "Прекидач прилагођавања прозора полици" + +#~ msgid "" +#~ "When using an autohiding shelf, this option causes maximized windows to " +#~ "expand and contract to fill the space that the shelf occupies when it " +#~ "hides" +#~ msgstr "" +#~ "При употреби самоскривајуће полице, ова могућност узрокује проширење и " +#~ "скупљање увећаних прозора до попуне простора који полица заузима при " +#~ "њеном скривању" + +#~ msgid "Allow windows above fullscreen windows" +#~ msgstr "Дозволи прозоре изнад прозора преко целог екрана" + +#~ msgid "Kill window if process not responding to close" +#~ msgstr "Убиј прозор ако процес не одговара на затварање" + +#~ msgid "kill" +#~ msgstr "убиј" + +#~ msgid "Window kill delay" +#~ msgstr "Задршка пре убиства прозора" + +#~ msgid "Enable window client pinging" +#~ msgstr "Омогући цимање клијента прозора" + +#~ msgid "Window client ping interval (CPU ticks)" +#~ msgstr "Учесталост цимања клијента прозора (у откуцајима процесора)" + +#~ msgid "Remember internal window geometry" +#~ msgstr "Памти размеру својих прозора" + +#~ msgid "remember" +#~ msgstr "памћење" + +#~ msgid "" +#~ "This option causes E to remember the geometry of its internal dialogs and " +#~ "windows, NOT including filemanager windows" +#~ msgstr "" +#~ "Ова могућност узрокује да Е памти размеру својих унутрашњих прозора, НЕ " +#~ "укључујући прозоре управника датотека" + +#~ msgid "Remember internal filemanager window geometry" +#~ msgstr "Памти размеру прозора свог управника датотека" + +#~ msgid "files" +#~ msgstr "датотеке" + +#~ msgid "" +#~ "This option causes E to remember the geometry of its internal filemanager " +#~ "windows, NOT including dialog windows, based on the directory the window " +#~ "is showing" +#~ msgstr "" +#~ "Ова могућност узрокује да Е памти размеру прозора свог управника " +#~ "датотека, НЕ укључујући остале прозоре, засноване на фасцикли коју " +#~ "показује прозор" + +#~ msgid "Remember internal filemanager window geometry globally" +#~ msgstr "Памти општу размеру прозора свог управника датотека" + +#~ msgid "" +#~ "This option causes E to remember the geometry of its internal filemanager " +#~ "windows globally instead of using the target directory" +#~ msgstr "" +#~ "Ова могућност узрокује да Е памти општу размеру прозора свог управника " +#~ "датотека уместо да користи циљну фасциклу" + +#~ msgid "Window position info follows window when moving" +#~ msgstr "Обавештење о положају прозора прати прозор приликом премештања" + +#~ msgid "Window geometry info follows window when resizing" +#~ msgstr "" +#~ "Обавештење о размери прозора прати прозор приликом његове измене величине" + +#~ msgid "Window position info visible when moving" +#~ msgstr "Обавештење о положају прозора је видљиво при премештању" + +#~ msgid "Window geometry info visible when resizing" +#~ msgstr "Обавештење о размери прозора је видљиво приликом промене величине" + +#~ msgid "Transient windows follow movement of their child" +#~ msgstr "Непостајани прозори прате премештање свог потомка" + +#~ msgid "transient" +#~ msgstr "непостојан" + +#~ msgid "Transient windows follow resize of their child" +#~ msgstr "Непостојани прозори прате промену величине свог потомка" + +#~ msgid "Transient windows follow raise of their child" +#~ msgstr "Непостојани прозори прате издизање свог потомка" + +#~ msgid "Transient windows follow lower of their child" +#~ msgstr "Непостојани прозори прате спуштање свог потомка" + +#~ msgid "Transient windows follow layer change of their child" +#~ msgstr "Непостојани прозори прате измену слоја свог потомка" + +#~ msgid "Transient windows follow desk change of their child" +#~ msgstr "Непостојани прозори прате промену радне површи свог потомка" + +#~ msgid "Transient windows follow iconification of their child" +#~ msgstr "Непостојани прозори прате умањење свог потомка" + +#~ msgid "Disable icons in menus" +#~ msgstr "Онемогући иконе у изборницима" + +#~ msgid "Application menus shows Name field" +#~ msgstr "Изборници програм приказују поље назива" + +#~ msgid "This information is taken from the related .desktop file" +#~ msgstr "Овај податак се узима из одговарајуће .desktop датотеке" + +#~ msgid "Application menus shows Generic field" +#~ msgstr "Изборници програма приказују поље сродности" + +#~ msgid "Application menus shows Comment field" +#~ msgstr "Изборници програма приказују поље напомене" + +#~ msgid "Show Favorite Applications in the main menu" +#~ msgstr "Приказуј омиљене програме у главном изборнику" + +#~ msgid "Show Applications in the main menu" +#~ msgstr "Приказуј програме у главном изборнику" + +#~ msgid "Show gadget settings in top-level gadget menu" +#~ msgstr "Приказуј поставке справица у вршном слоју изборнику справица" + +#~ msgid "Launch commands with this command" +#~ msgstr "Покрени наредбе овом наредбом" + +#~ msgid "Command used to launch files and applications" +#~ msgstr "Наредба која се користи за покретање датотека и програма" + +#~ msgid "Window borders use application icon" +#~ msgstr "Оквири прозора користе иконе програма" + +#~ msgid "" +#~ "Applications provide their own icons. If this option is not set, E will " +#~ "use internal theme icons instead of the application-provided icon" +#~ msgstr "" +#~ "Програми обезбеђују сопствене иконе. Ако ова могућност није постављена, Е " +#~ "ће користити унутрашњу тему икона уместо иконе обезбеђене од стране " +#~ "програма" + +#~ msgid "Disable confirmation dialogs" +#~ msgstr "Онемогући прозорчиће потврде" + +#~ msgid "confirm" +#~ msgstr "потврда" + +#~ msgid "dialog" +#~ msgstr "прозорче" + +#~ msgid "" +#~ "This option suppresses all confirmation dialogs and assumes that the user " +#~ "has clicked the confirm option" +#~ msgstr "" +#~ "Ова могућност потискује све прозорчиће потврде и претпоставља да је " +#~ "корисник кликнуо на могућност потврде" + +#~ msgid "Configuration dialogs automatically apply their changes" +#~ msgstr "Прозорчићи потврде самостално примењују своје измене" + +#~ msgid "settings" +#~ msgstr "поставке" + +#~ msgid "" +#~ "This option causes any configuration options to be applied immediately " +#~ "when changed instead of requiring the 'Apply' button to be clicked" +#~ msgstr "" +#~ "Ова могућност узрокује да се све могућности поставки примењују одмах " +#~ "пошто се измене, уместо потребе да се кликне на дугме „Примени“" + +#~ msgid "Configuration dialogs show advanced view by default" +#~ msgstr "Прозорчићи поставки подразумевано приказују напредан преглед" + +#~ msgid "" +#~ "Configurations dialogs can have basic and advanced views; this option " +#~ "causes all configuration dialogs to show the advanced view by default" +#~ msgstr "" +#~ "Прозорчићи поставки могу имати основни и напредни преглед; ова могућност " +#~ "узрокује да сви прозорчићи поставки приказују напредни преглед " +#~ "подразумевано" + +#~ msgid "Configuration dialog windows are normal windows" +#~ msgstr "Прозорчићи поставки су уобичајени прозори" + +#~ msgid "" +#~ "This option causes configuration dialogs to be normal windows instead of " +#~ "dialog windows" +#~ msgstr "" +#~ "Ова могућност узрокује да прозори поставки буду обични прозори уместо " +#~ "прозорчића потврде" + +#~ msgid "Set font hinting mode" +#~ msgstr "Постави начин рада наговештавање словног лика" + +#~ msgid "hinting" +#~ msgstr "наговештавање" + +#~ msgid "Use custom command for desklock" +#~ msgstr "Користи прилагођену наредбу за закључавање радног простора" + +#~ msgid "desklock" +#~ msgstr "закључавање радног простора" + +#~ msgid "This option allows an external application to manage desklock" +#~ msgstr "" +#~ "Ова могућност дозвољава да спољни програми управљају закључавањем радног " +#~ "простора" + +#~ msgid "Custom desklock command" +#~ msgstr "Прилагођена наредба закључавања радног простора" + +#~ msgid "Desklock login box shows on which screen?" +#~ msgstr "" +#~ "На којем екрану се приказује прозорче за откључавање радног простора?" + +#~ msgid "Desklock activates on login" +#~ msgstr "Закључавање радног простора по пријави" + +#~ msgid "Desklock activates on resume from suspend" +#~ msgstr "Закључавање радног простора се укључује по повратку из обуставе" + +#~ msgid "Desklock activates during screensaver" +#~ msgstr "Закључавање радног простора се покреће за време рада чувара екрана" + +#~ msgid "screensaver" +#~ msgstr "чувар·екрана" + +#~ msgid "Desklock activates X seconds after screensaver activates" +#~ msgstr "" +#~ "Закључавање радног простора се покреће X секунди после покретања чувара " +#~ "екрана" + +#~ msgid "Desklock activates when idle" +#~ msgstr "Закључавање радног простора се покреће за време мировања" + +#~ msgid "Desklock activates when idle for X seconds" +#~ msgstr "" +#~ "Закључавање радног простора се покреће у стању мировања после X секунди" + +#~ msgid "Use custom desklock wallpaper" +#~ msgstr "Користи произвољну слику за закључавање радног простора" + +#~ msgid "Prompt for desklock timer delay if deactivated quickly" +#~ msgstr "" +#~ "Упитај за време задршке закључавања радног простора ако се прерано покреће" + +#~ msgid "Desklock quick deactivation timer delay" +#~ msgstr "Временска задршка брзог откључавање радног простора" + +#~ msgid "Enable screensaver" +#~ msgstr "Омогући чувара екрана" + +#~ msgid "Screensaver activates when idle for X seconds" +#~ msgstr "Чувар екрана се покреће после X секунди стања мировања" + +#~ msgid "Prompt for screensaver timer delay if deactivated quickly" +#~ msgstr "Упитај за временску задршку чувара екрана ако се искључи пребрзо" + +#~ msgid "Screensaver quick deactivation timer delay" +#~ msgstr "Временска задршка брзог искључивања чувара екрана" + +#~ msgid "Suspend when screensaver activates" +#~ msgstr "Обустави по покретању чувара екрана" + +#~ msgid "Suspend when screensaver activates even if on AC" +#~ msgstr "" +#~ "Обустави по покретању чувара екрана чак и ако је на мрежном напајању" + +#~ msgid "Screensaver suspend delay" +#~ msgstr "Задршка чувара екрана" + +#~ msgid "Window list menu grouping policy" +#~ msgstr "Смернице здруживања изборника списка прозора" + +#~ msgid "Window list menu includes windows from all screens" +#~ msgstr "Изборник списка прозора укључује прозоре са свих екрана" + +#~ msgid "Window list menu separator policy" +#~ msgstr "Смернице одвајања изборника списка прозора" + +#~ msgid "Window list menu sort policy" +#~ msgstr "Смернице разврставања изборника списка прозора" + +#~ msgid "Window list menu iconified window grouping policy" +#~ msgstr "Смернице здруживања изборника списка прозора умањених прозора" + +#~ msgid "Window list menu warps to desktop of selected iconified window" +#~ msgstr "" +#~ "Изборник списка прозора се прелама на радну површ изабраног умањеног " +#~ "прозора" + +#~ msgid "Enable window list menu length limit" +#~ msgstr "Омогући ограничење дужине списка изборника списка прозора" + +#~ msgid "Window list menu length limit (characters)" +#~ msgstr "Ограничење дужине списка изборника списка прозора (знакова)" + +#~ msgid "Use Enlightenment theme cursor" +#~ msgstr "Користи тему показивача Просвећења" + +#~ msgid "Mouse cursor size" +#~ msgstr "Величина теме показивача миша" + +#~ msgid "Show mouse cursor" +#~ msgstr "Прикажи показивач миша" + +#~ msgid "Enable idle effects for mouse cursor" +#~ msgstr "Омогући утиске мировања показивача миша" + +#~ msgid "Enable left-handed mouse" +#~ msgstr "Омогући леворуко коришћење миша" + +#~ msgid "Mouse acceleration threshold" +#~ msgstr "Задршка убрзања кретања мишем" + +#~ msgid "Enable desk flip between last and first desks" +#~ msgstr "Омогући пребацивање са последње на прву радну површ" + +#~ msgid "Enable desk flipping with fullscreen windows" +#~ msgstr "омогући пребацивање површи са прозорима преко целог екрана" + +#~ msgid "Enable desk flipping with multiple monitors (DANGEROUS)" +#~ msgstr "Омогући пребацивање површи са вишеструким екранима (ОПАСНО)" + +#~ msgid "Desk flip animation type" +#~ msgstr "Врста утиска пребацивања површи" + +#~ msgid "Default window border style" +#~ msgstr "Подразумевани изглед оквира прозора" + +#~ msgid "Window screen limit policy" +#~ msgstr "Смернице ограничења прозора у односу на екран" + +#~ msgid "Thumbnailing process priority" +#~ msgstr "Предност поступка умањивања сличица" + +#~ msgid "" +#~ "Enlightenment runs its own thumbnailing daemon in the background. This " +#~ "option configures the priority of that process" +#~ msgstr "" +#~ "Просвећење користи сопственог домара за стварање умањених сличица у " +#~ "позадини. Ова могућност поставља предност тог поступка" + +#~ msgid "Enable click-to-drag scrolling (thumbscrolling)" +#~ msgstr "Омогући премицање кликом за превлачење (премицање прстом)" + +#~ msgid "Thumbscroll threshold" +#~ msgstr "Задршка премицања прстом" + +#~ msgid "Thumbscroll momentum threshold" +#~ msgstr "Задршка убрзања премицања прстом" + +#~ msgid "Thumbscroll resistance" +#~ msgstr "Отпор премицања прстом" + +#~ msgid "Show files on desktop" +#~ msgstr "Приказуј датотеке на радној површи" + +#~ msgid "Filemanager uses single click to activate" +#~ msgstr "Управник датотека користи један клик за покретање" + +#~ msgid "Filemanager shows removable devices on desktop" +#~ msgstr "Управник датотека приказује уклоњиве уређаје на радној површи" + +#~ msgid "Filemanager automatically mounts removable devices when attached" +#~ msgstr "Управник датотека самостално качи уклоњиве уређаје када се утакну" + +#~ msgid "Filemanager automatically opens removable devices when attached" +#~ msgstr "Управник датотека самостално отвара уклоњиве уређаје када се утакну" + +#~ msgid "Filemanager always performs `cp+rm` instead of `mv`" +#~ msgstr "Управник датотека увек извршава „cp+rm“ уместо „mv“" + +#~ msgid "Filemanager deletes files securely" +#~ msgstr "Управник датотека безбедно брише датотеке" + +#~ msgid "Only show label on keyboard gadgets instead of flags" +#~ msgstr "Приказуј само ознаку на справицама тастатуре уместо застава" + +#~ msgid "key" +#~ msgstr "дугме" + +#~ msgid "Do not apply any keyboard layout settings" +#~ msgstr "Не примењуј никакве поставке распореда тастатуре" + +#~ msgid "Window change timeout when moving or resizing using keyboard" +#~ msgstr "" +#~ "Време истека измене прозора приликом премештања или промене величине " +#~ "употребом тастатуре" + +#~ msgid "Window horizontal movement speed when using keyboard" +#~ msgstr "Водоравна брзина кретања прозора употребом тастатуре" + +#~ msgid "Window vertical movement speed when using keyboard" +#~ msgstr "Усправна брзина кретања прозора употребом тастатуре" + +#~ msgid "Window horizontal resize speed when using keyboard" +#~ msgstr "Водоравна брзина промене величине прозора употребом тастатуре" + +#~ msgid "Overall scaling factor" +#~ msgstr "Свеобухватни множилац размере" + +#~ msgid "scale" +#~ msgstr "размера" + +#~ msgid "Use screen DPI for scaling" +#~ msgstr "Користи ТПИ екрана за размеру" + +#~ msgid "Use custom DPI for scaling" +#~ msgstr "Користи прилагођене ТПИ за размеру" + +#~ msgid "Custom DPI to use when scaling" +#~ msgstr "Прилагођене ТПИ при размеравању" + +#~ msgid "System Console primary action icon size" +#~ msgstr "Системска конзола величине иконе примарне радње" + +#~ msgid "syscon" +#~ msgstr "сискон" + +#~ msgid "System Console secondary action icon size" +#~ msgstr "Системска конзола величине иконе секундарне радње" + +#~ msgid "System Console extra action icon size" +#~ msgstr "Системска конзола величине иконе додатне радње" + +#~ msgid "System Console idle timeout" +#~ msgstr "Системска конзола истека времена неактивности" + +#~ msgid "System Console performs default action after idle timeout" +#~ msgstr "" +#~ "Системска конзола изводи подразумевану радњу после истека времена " +#~ "неактивности" + +#~ msgid "input" +#~ msgstr "унос" + +#~ msgid "Backlight \"normal\" brightness" +#~ msgstr "„Уобичајено“ позадинско светло" + +#~ msgid "backlight" +#~ msgstr "позадинско светло" + +#~ msgid "Backlight \"dim\" brightness" +#~ msgstr "Осветљење „затамњења“ позадинског светла" + +#~ msgid "Backlight transition length" +#~ msgstr "Дужина прелаза позадинског светла" + +#~ msgid "Backlight dims after idle" +#~ msgstr "Позадинско светло се затамњује после неактивности" + +#~ msgid "Backlight idle delay" +#~ msgstr "Задршка мировања позадинског светла" + +#~ msgid "Load ~/.Xresources on startup" +#~ msgstr "Учитај ~/.Xresources при покретању" + +#~ msgid "environment" +#~ msgstr "окружење" + +#~ msgid "Load ~/.Xmodmap" +#~ msgstr "Учитај ~/.Xmodmap" + +#~ msgid "Run gnome-settings-daemon" +#~ msgstr "Изврши домара Гномових поставки (gnome-settings-daemon)" + +#~ msgid "Run kdeinit" +#~ msgstr "Изврши kdeinit" + +#~ msgid "Enable GTK application settings" +#~ msgstr "Омогући поставке ГТК програма" + +#~ msgid "xsettings" +#~ msgstr "икспоставке" + +#~ msgid "Try setting GTK theme to match E17 theme" +#~ msgstr "Покушај поставити ГТК тему да одговара Е17 теми" + +#~ msgid "GTK theme name" +#~ msgstr "Име ГТК теме" + +#~ msgid "Enable use of icon theme for applications" +#~ msgstr "Укључи употребу теме икона за програме" + +#~ msgid "Icon theme" +#~ msgstr "Тема икона" + +#~ msgid "Icon theme overrides E17 internal theme icons" +#~ msgstr "Тема икона надглашава Е17 унутрашњу тему икона" + +#~ msgid "Always launch applications as single-instance" +#~ msgstr "Увек покрећи програме у једном примерку" + +#~ msgid "appearance" +#~ msgstr "изглед" + +#~ msgid "applications" +#~ msgstr "програми" + +#~ msgid "menus" +#~ msgstr "изборници" + +#~ msgid "advanced" +#~ msgstr "напредно" + +#~ msgid "framerate" +#~ msgstr "проток сличица" + +#~ msgid "profile" +#~ msgstr "профил" + +#~ msgid "window" +#~ msgstr "прозор" + +#~ msgid "launch" +#~ msgstr "покретање" + +#~ msgid "icon" +#~ msgstr "иконица" + +#~ msgid "style" +#~ msgstr "начин" + +#~ msgid "cursor" +#~ msgstr "показивач" + +#~ msgid "iconif" +#~ msgstr "умањење" + +#~ msgid "Opacity" +#~ msgstr "Непровидност" + +#~ msgid "Setup Toolbars" +#~ msgstr "Подесите траке алата" + +#~ msgid "Enlightenment cannot set up its toolbars.\n" +#~ msgstr "Просвећење није успело да постави своје траке алата.\n" + +#~ msgid "Enlightenment cannot setup compositing.\n" +#~ msgstr "Просвећење није успело да постави слагање приказа.\n" + +#~ msgid "Module Error" +#~ msgstr "Грешка јединице" + +#~ msgid "" +#~ "The composite module cannot be loaded;Enlightenment is already composited." +#~ msgstr "" +#~ "Нисам успео да учитам јединицу слагања приказа;Просвећење већ слаже " +#~ "приказ." + +#~ msgid "Application Menu" +#~ msgstr "Изборник програма" + +#~ msgid "Reject" +#~ msgstr "Одбаци" + +#~ msgid "Pin Code Requested" +#~ msgstr "Потребна је ПИН шифра" + +#~ msgid "" +#~ "Enter the PinCode above. It should have 1-16 characters and can be " +#~ "alphanumeric." +#~ msgstr "" +#~ "Унесите ПИН шифру изнад. Требало би да има 1-16 знакова и треба бити " +#~ "састављена из бојки и слова." + +#~ msgid "Passkey Requested" +#~ msgstr "Потребна је шифра" + +#~ msgid "" +#~ "Enter the Passkey above. It should be a numeric value between 0-999999." +#~ msgstr "" +#~ "Унесите шифру изнад. Требало би да састављена од бројева у распону " +#~ "0-999999." + +#~ msgid "%d keys were typed on %s. Passkey is %06d" +#~ msgstr "%d знакова је куцано на %s. Шифра је %06d." + +#~ msgid "Display Passkey" +#~ msgstr "Прикажи шифру" + +#~ msgid "Pincode for %s is %s" +#~ msgstr "ПИН шифра за %s је %s" + +#~ msgid "Display Pincode" +#~ msgstr "Прикажи ПИН шифру" + +#~ msgid "%06d is the passkey presented in %s?" +#~ msgstr "%06d је лозинка представљена у %s?" + +#~ msgid "Confirm Request" +#~ msgstr "Потврдите захтев" + +#~ msgid "Grant permission for %s to connect?" +#~ msgstr "Одобрити дозволу за повезивање %s?" + +#~ msgid "Authorize Connection" +#~ msgstr "Овластите повезивање" + +#~ msgid "Grant" +#~ msgstr "Одобри" + +#~ msgid "Bluez Error" +#~ msgstr "Грешка Блуеза" + +#~ msgid "Searching for Devices..." +#~ msgstr "Тражим уређаје..." + +#~ msgid "Adapter Settings" +#~ msgstr "Поставке примопрадајника" + +#~ msgid "Powered" +#~ msgstr "Укључен" + +#~ msgid "Pairable" +#~ msgstr "Упарив" + +#~ msgid "Adapters Available" +#~ msgstr "Доступни примопредајници" + +#~ msgid "Paired Devices" +#~ msgstr "Упарени уређаји" + +#~ msgid "Disconnect" +#~ msgstr "Прекини везу" + +#~ msgid "Connect" +#~ msgstr "Повежи се" + +#~ msgid "Forget" +#~ msgstr "Заборави" + +#~ msgid "Lock on disconnect" +#~ msgstr "Закључај по прекиду везе" + +#~ msgid "Unlock on disconnect" +#~ msgstr "Откључај по прекиду везе" + +#~ msgid "Bluez4" +#~ msgstr "Блуез4" + +#~ msgid "Search New Devices" +#~ msgstr "Тражи нове уређаје" + +#~ msgid "An error has ocurred" +#~ msgstr "Десила се грешка" + +#~ msgid "Property of %s changed, but could not be read" +#~ msgstr "Својство %s је измењено, али не може бити читано" + +#~ msgid "Error reading list of devices" +#~ msgstr "Десила се грешка приликом читања списка уређаја" + +#~ msgid "Error reading list of adapters" +#~ msgstr "Десила се грешка приликом читања списка примопредајника" + +#~ msgid "Error reading path of Default Adapter" +#~ msgstr "" +#~ "Десила се грешка приликом читања путање за подразумеваним примопредајником" + +#~ msgid "Error reading path of Removed Adapter" +#~ msgstr "Десила се грешка приликом читања путање уклоњеног примопредајника" + +#~ msgid "Error reading path of Added Adapter" +#~ msgstr "Десила се грешка приликом читања путање додатог примопредајника" + +#~ msgid "%a, %e %b, %Y" +#~ msgstr "%a, %e %b, %Y" + +#~ msgid "%a, %x" +#~ msgstr "%a, %x" + +#~ msgid "conf module cannot be loaded when conf2 module is already loaded!" +#~ msgstr "" +#~ "јединица conf не може бити учитана ако је јединица conf2 већ учитана!" + +#~ msgid "Control Panel" +#~ msgstr "Управљачка плоча" + +#~ msgid "Search: " +#~ msgstr "Тражи: " + +#~ msgid "Discard" +#~ msgstr "Одбаци" + +#~ msgid "Configuration" +#~ msgstr "Поставке" + +#~ msgid "conf2 module cannot be loaded when conf module is already loaded!" +#~ msgstr "" +#~ "јединица conf2 не може бити учитана ако је јединица conf већ учитана" + +#~ msgid "new app launcher" +#~ msgstr "покретач нових програма" + +#~ msgid "Create a new application launcher" +#~ msgstr "Направите нови покретач програма" + +#~ msgid "apps" +#~ msgstr "програми" + +#~ msgid "Application launchers" +#~ msgstr "Покретачи програма" + +#~ msgid "favorite apps" +#~ msgstr "Омиљени програми" + +#~ msgid "Favorite applications" +#~ msgstr "Омиљени програми" + +#~ msgid "ibar apps" +#~ msgstr "програми траке" + +#~ msgid "Ibar applications" +#~ msgstr "програми траке" + +#~ msgid "desklock apps" +#~ msgstr "програми закључавања радног простора" + +#~ msgid "Desk lock applications" +#~ msgstr "Програми закључавања радног простора" + +#~ msgid "deskunlock apps" +#~ msgstr "програми откључавања радног простора" + +#~ msgid "Desk unlock applications" +#~ msgstr "Програми откључавања радног простора" + +#~ msgid "restart apps" +#~ msgstr "програми поновног покретања" + +#~ msgid "Enlightenment restart applications" +#~ msgstr "Програми поновног покретања Просвећења" + +#~ msgid "startup apps" +#~ msgstr "почетни програми" + +#~ msgid "Enlightenment start applications" +#~ msgstr "Почетни програми Просвећења" + +#~ msgid "default apps" +#~ msgstr "подразумевани програми" + +#~ msgid "Enlightenment default applications" +#~ msgstr "Подразумевани програми Просвећења" + +#~ msgid "Drag only" +#~ msgstr "Само превлачење" + +#~ msgid "key bindings" +#~ msgstr "пречице дугмади" + +#~ msgid "Key binding settings" +#~ msgstr "Поставке пречица дугмади" + +#~ msgid "mouse bindings" +#~ msgstr "пречице миша" + +#~ msgid "Mouse binding settings" +#~ msgstr "Поставке пречица миша" + +#~ msgid "ACPI bindings" +#~ msgstr "АЦПИ пречице" + +#~ msgid "ACPI binding settings" +#~ msgstr "Поставке АЦПИ пречица" + +#~ msgid "acpi" +#~ msgstr "ацпи" + +#~ msgid "edge bindings" +#~ msgstr "пречице ивица" + +#~ msgid "Screen edge binding settings" +#~ msgstr "Поставке пречица ивица екрана" + +#~ msgid "signal bindings" +#~ msgstr "знаковне пречице" + +#~ msgid "Edje signal binding settings" +#~ msgstr "Поставке пречица знакова Едје" + +#~ msgid "Edit window matches" +#~ msgstr "Уреди поклапање прозора" + +#~ msgid "Fast Effects" +#~ msgstr "Брзи утисци" + +#~ msgid "Enable fast composite effects for windows" +#~ msgstr "Омогућите брзе утиске слагања за прозоре" + +#~ msgid "Enable fast composite effects for menus" +#~ msgstr "Омогућите брзе утиске слагања за изборнике" + +#~ msgid "Enable fast composite effects for popups" +#~ msgstr "Омогућите брзе утиске слагања за искачуће поруке" + +#~ msgid "Enable fast composite effects for objects" +#~ msgstr "Омогући утиске брзог слагања предметима" + +#~ msgid "Enable fast composite effects for overrides" +#~ msgstr "Омогући брзе утиске слагања за замене" + +#~ msgid "Disable Effects" +#~ msgstr "Онемогући утиске" + +#~ msgid "Disable composite effects for overrides" +#~ msgstr "Онемогући утиске слагања за замене" + +#~ msgid "Disable composite effects for screen" +#~ msgstr "Онемогући утиске слагања за екран" + +#~ msgid "Enable \"fast\" composite effects" +#~ msgstr "Омогући „брзе“ утиске слагања" + +#~ msgid "Disable composite effects" +#~ msgstr "Онемогући утиске слагања" + +#~ msgid "Composite Style Settings" +#~ msgstr "Поставке начина слагања" + +#~ msgid "comp_settings" +#~ msgstr "поставке _слагања" + +#~ msgid "Advanced composite settings panel" +#~ msgstr "Напредна плоча поставки слагања" + +#~ msgid "profiles" +#~ msgstr "профили" + +#~ msgid "Enlightenment profile settings" +#~ msgstr "Поставке профила Просвећења" + +#~ msgid "Dimming" +#~ msgstr "Затамњивање" + +#~ msgid "language" +#~ msgstr "језик" + +#~ msgid "Language settings" +#~ msgstr "Подешавања језика" + +#~ msgid "desklock language" +#~ msgstr "језик часовника површи" + +#~ msgid "Desklock language settings" +#~ msgstr "Поставке језика часовника површи" + +#~ msgid "input method" +#~ msgstr "начин уноса" + +#~ msgid "Input method settings" +#~ msgstr "Поставке начина уноса" + +#~ msgid "search directories" +#~ msgstr "фасцикле претраге" + +#~ msgid "Search directory settings" +#~ msgstr "Поставке фасцикла претраге" + +#~ msgid "environment variables" +#~ msgstr "променљиве окружања" + +#~ msgid "Environment variable settings" +#~ msgstr "Поставке променљиве окружања" + +#~ msgid "randr" +#~ msgstr "рандр" + +#~ msgid "Screen resolution and orientation settings" +#~ msgstr "Поставке размере и усмерења екрана" + +#~ msgid "shelves" +#~ msgstr "полице" + +#~ msgid "Shelf settings" +#~ msgstr "Поставке полице" + +#~ msgid "themes" +#~ msgstr "теме" + +#~ msgid "Enlightenment theme settings" +#~ msgstr "Поставке теме Просвећења" + +#~ msgid "Desktop wallpaper settings" +#~ msgstr "Поставке слике позадинe" + +#~ msgid "colors" +#~ msgstr "боје" + +#~ msgid "Enlightenment color settings" +#~ msgstr "Поставке боје Просвећења" + +#~ msgid "color" +#~ msgstr "боја" + +#~ msgid "fonts" +#~ msgstr "словни ликови" + +#~ msgid "Enlightenment font settings" +#~ msgstr "Поставке словних ликова Просвећења" + +#~ msgid "Loading files..." +#~ msgstr "Учитавам датотеке..." + +#~ msgid "Wallpaper 2" +#~ msgstr "Позадина 2" + +#~ msgid "Focus Policy" +#~ msgstr "Смернице жиже" + +#~ msgid "Warping" +#~ msgstr "Изобличавање" + +#~ msgid "Don't remember file manager windows by directory" +#~ msgstr "Не памти прозоре управника датотека по фасциклама" + +#~ msgid "window remembers" +#~ msgstr "Памћење прозора" + +#~ msgid "Window remember settings" +#~ msgstr "Поставке памћења прозора" + +#~ msgid "Everything launcher settings" +#~ msgstr "ПОставке покретача свега" + +#~ msgid "everything" +#~ msgstr "све" + +#~ msgid "filemanager" +#~ msgstr "управник датотека" + +#~ msgid "file manager" +#~ msgstr "управник датотека" + +#~ msgid "Default view mode" +#~ msgstr "Задати начин приказа" + +#~ msgid "Icon size" +#~ msgstr "Величина икона" + +#~ msgid "Show file extensions" +#~ msgstr "Прикажи наставке датотека" + +#~ msgid "Show full path in filemanager window titles" +#~ msgstr "Прикажи потпуну путању у насловима прозора управника датотека" + +#~ msgid "Show path toolbar in filemanager windows" +#~ msgstr "Прикажи траку алата путање у прозорима управника датотека" + +#~ msgid "Filemanager path toolbar position" +#~ msgstr "Положај трак алата путање управника датотека" + +#~ msgid "Show favorites sidebar in filemanager windows" +#~ msgstr "Прикажи бочну траку омиљених у прозорима управника датотека" + +#~ msgid "Ignore letter case when sorting files" +#~ msgstr "Занемари величину слова при распореду датотека" + +#~ msgid "Group files by extension" +#~ msgstr "Поређај датотеке по наставку" + +#~ msgid "Sort files by modification time" +#~ msgstr "Поређај датотеке по времену измене" + +#~ msgid "Sort files by size" +#~ msgstr "Поређај датотеке по величини" + +#~ msgid "Sort directories first" +#~ msgstr "Поређај прво фасцикле" + +#~ msgid "Sort directories last" +#~ msgstr "Поређај фасцикле задње" + +#~ msgid "Open directories in place" +#~ msgstr "Отвори фасциклена месту" + +#~ msgid "Use single click to open files" +#~ msgstr "Користи једноклик за отварање фасцикли" + +#~ msgid "Use alternate (Mac-style) selection modifiers" +#~ msgstr "Користи заменски начин измењивача одабира (Меков начин)" + +#~ msgid "Allow navigation on desktop" +#~ msgstr "Доволи управљање на радној површи" + +#~ msgid "" +#~ "Normally, icons on the desktop come from $XDG_HOME_DIR/Desktop[-$SCREEN]. " +#~ "With this option enabled, the desktop can freely change directories using " +#~ "the Navigate menu or type buffer." +#~ msgstr "" +#~ "Обично, иконе да радној површи су из $XDG_HOME_DIR/Desktop[-$SCREEN]. " +#~ "Када се ово омогући, радна површ може слободно мењати фасцикле користећи " +#~ "изборник управљања или прихватну меморију врста." + +#~ msgid "Maximum file size for which thumbnails should be generated" +#~ msgstr "" +#~ "Највећа величина датотеке за коју би требало правити сличице умањеног " +#~ "приказа" + +#~ msgid "Spring folder delay" +#~ msgstr "Кашњење гибања фасцикле" + +#~ msgid "" +#~ "A \"spring folder\" is the action that occurs when dragging a file onto a " +#~ "folder: the folder will \"spring\" open and create a new window to " +#~ "continue the drag operation in." +#~ msgstr "" +#~ "Гибање фасцикле је радња која се врши приликом превлачења датотеке у " +#~ "фасциклу: фасцикла ће се „гибањем“ отворити и направити нови прозор за " +#~ "наставак радње превлачења у њу." + +#~ msgid "File icons" +#~ msgstr "Иконе датотека" + +#~ msgid "Boost" +#~ msgstr "Појачање" + +#~ msgid "Switch" +#~ msgstr "Прекидач" + +#~ msgid "Music controller" +#~ msgstr "Управљач музике" + +#~ msgid "Music Player" +#~ msgstr "Музички програм" + +#~ msgid "" +#~ "* Your player must be configured to export the DBus interface MPRIS2." +#~ msgstr "" +#~ "* Извођач музике мора бити подешен да извози сучење на МПРИС2 Д-сабирницу" + +#~ msgid "Pause music when screen is locked" +#~ msgstr "Застани са музиком када ја екран закључан" + +#~ msgid "Music control Settings" +#~ msgstr "Поставке управљања музиком" + +#~ msgid "Screen Policy" +#~ msgstr "Смернице екрана" + +#~ msgid "Primary screen" +#~ msgstr "Главни екран" + +#~ msgid "Current screen" +#~ msgstr "Тренутни екран" + +#~ msgid "All screens" +#~ msgstr "Сви екрани" + +#~ msgid "Xinerama" +#~ msgstr "Ксинерама" + +#~ msgid "Error during notification server initialization" +#~ msgstr "Десила се грешка приликом покретања услуге обавштења" + +#~ msgid "Display low urgency notifications" +#~ msgstr "Прикажи обавештења ниске важности" + +#~ msgid "notification" +#~ msgstr "обавештење" + +#~ msgid "Display normal urgency notifications" +#~ msgstr "Прикажи обавештења уобичајене важности" + +#~ msgid "Display high urgency notifications" +#~ msgstr "Прикажи обавештења високе важности" + +#~ msgid "Force a specified timeout on all notifications" +#~ msgstr "Присили одређено време истека трајања за сва обавештења" + +#~ msgid "Timeout to force on notifications" +#~ msgstr "Време истека присиле над обавештењима" + +#~ msgid "Screen(s) on which to display notifications" +#~ msgstr "Екран(и) на којем ће се приказивати обавештења" + +#~ msgid "Corner in which to display notifications" +#~ msgstr "Угао за приказ обавештења" + +#~ msgid "%.0f pixels" +#~ msgstr "%.0f тачака" + +#~ msgid "Quickaccess settings panel" +#~ msgstr "Плоча поставки брзог приступа" + +#~ msgid "quickaccess" +#~ msgstr "брзи приступ" + +#~ msgid "Hide windows on activate instead of raising" +#~ msgstr "Скривај прозоре при покретању умасто издизања" + +#~ msgid "" +#~ "By default, activating a Quickaccess binding when the window is behind " +#~ "other windows will raise the window. This option changes that behavior to " +#~ "hide the window instead." +#~ msgstr "" +#~ "Задато је да пречица брзог приступа издиже прозор ако се он налази иза " +#~ "других прозора. Ова могућност мења то понашање у скривање прозора." + +#~ msgid "Hide windows when focus is lost" +#~ msgstr "Сакривај прозоре кад се изгубе из жиже" + +#~ msgid "" +#~ "This option causes Quickaccess windows to automatically hide when they " +#~ "lose focus" +#~ msgstr "" +#~ "Ова могућност узрокује прозоре брзог приступа да се самостално сакрију " +#~ "кад се изгубе из жиже" + +#~ msgid "Skip taskbar" +#~ msgstr "Прескочи траку задатака" + +#~ msgid "This option causes Quickaccess windows to not show up in taskbars" +#~ msgstr "" +#~ "Ова могућност узрокује да се прозори брзог приступа не појављују у траци " +#~ "задатака" + +#~ msgid "Skip pager" +#~ msgstr "Прескочи страничник" + +#~ msgid "This option causes Quickaccess windows to not show up in pagers" +#~ msgstr "" +#~ "Ова могућност узрокује да се прозори брзог приступа не појављују у " +#~ "страничнику" + +#~ msgid "Tiling settings" +#~ msgstr "Поставке поплочавања" + +#~ msgid "tiling" +#~ msgstr "поплочавање" + +#~ msgid "Tile dialog windows" +#~ msgstr "Прозори поставки поплочавања" + +#~ msgid "Show window titles when tiling" +#~ msgstr "Приказуј наслове прозора при поплочавању" + +#~ msgid "Tiling key hints" +#~ msgstr "Наговештаји дугмади поплочавања" + +#~ msgid "Disable mouse warp on directional focus change" +#~ msgstr "Онемогући прелом миша при промени жиже по смеру" + +#~ msgid "Do not apply any keyboard settings ever" +#~ msgstr "Не ориењуј никад никакве поставке тастатуре" + +#~ msgid "Label only in gadgets" +#~ msgstr "Ознаке само на справицама површи" + +#~ msgid "xkb layouts" +#~ msgstr "икскб распореди" + +#~ msgid "Keyboard layout settings" +#~ msgstr "Поставке распореда тастатуре" + +#~ msgid "NONE" +#~ msgstr "НИШТА" diff --git a/po/sv.gmo b/po/sv.gmo index 02fabbf178..a21a7c2c2c 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index c5af05cdbf..318cdd7656 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment E17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-03-08 02:01+0000\n" "Last-Translator: ersi <Unknown>\n" "Language-Team: Swedish\n" -"Language: \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -866,7 +866,7 @@ msgstr "Välj en" msgid "Cancel" msgstr "Avbryt" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have<br>been wiped and a " "new set of defaults initialized. This<br>will happen regularly during " @@ -877,7 +877,7 @@ msgid "" "the hiccup in your settings.<br>" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very<br>strange. This " "should not happen unless you downgraded<br>Enlightenment or copied the " @@ -886,11 +886,11 @@ msgid "" "to<br>defaults. Sorry for the inconvenience.<br>" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files<br>from:<br>" @@ -898,14 +898,15 @@ msgid "" "<br>" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -916,21 +917,21 @@ msgstr "" msgid "OK" msgstr "OK" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Inställningar uppdaterade" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET filhandtag är dÃ¥ligt." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Filen data är tom." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only<br>or you lost " @@ -939,17 +940,17 @@ msgstr "" "Filen är inte skrivbar. Kanske skivan är skrivskyddad<br>eller om du " "förlorat behörighet till dina filer." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.<br>Please free up memory." msgstr "Minne sprang ut medan du förbereder skriva.<br>Frigör minne." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Detta är en generisk fel." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.<br>It should be very small (a few hundred KB " @@ -958,71 +959,71 @@ msgstr "" "Inställningsfilen är för stor.<br>Det bör vara mycket liten (nÃ¥gra hundra KB " "som mest)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Du sprang ut ur rummet medan du skriver filen" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Ärendet avslutades pÃ¥ den medan du skriver." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Memory -mapping (mmap) för filen misslyckades." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Kodning misslyckats." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Signatur misslyckades." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Signaturen var ogiltigt." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Inga fönster)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Har inte genomförts." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG inte ympades." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Kryptering misslyckades." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Beskrivning: Otillgänglig" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Välkommen till Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing<br>its config file.<br>" @@ -4167,6 +4168,27 @@ msgstr "Flytta/ändra storlek pÃ¥ moduler" msgid "Set Toolbar Contents" msgstr "Ställ VerktygsfältsinnehÃ¥ll" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "TillstÃ¥nd" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is<br>not the current latest release.<br>The " +"latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or " +"update your system packages<br>to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6889,12 +6911,22 @@ msgstr "Prestanda" msgid "Power Management" msgstr "Power Management" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Skärmsläckare" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "utsignal" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Återställ Governor vid start" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" @@ -12866,9 +12898,6 @@ msgstr "" #~ msgid "24 Hour Display" #~ msgstr "24 timmars visning" -#~ msgid "Restore Governor on Startup" -#~ msgstr "Återställ Governor vid start" - #~ msgid "Desktop Name Position" #~ msgstr "Position pÃ¥ skrivbordsnamn" diff --git a/po/tr.gmo b/po/tr.gmo index 807f34c84a..bdd34c89bf 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 10b83e2526..12e974f4e7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: E17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2010-02-18 15:21+0200\n" "Last-Translator: H. Ä°brahim Güngör <h.ibrahim.gungor@gmail.com>\n" "Language-Team: Turkish <kde-i18n-doc@kde.org>\n" @@ -853,7 +853,7 @@ msgstr "Birini seç" msgid "Cancel" msgstr "Ä°ptal" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have<br>been wiped and a " "new set of defaults initialized. This<br>will happen regularly during " @@ -864,7 +864,7 @@ msgid "" "the hiccup in your settings.<br>" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very<br>strange. This " "should not happen unless you downgraded<br>Enlightenment or copied the " @@ -873,11 +873,11 @@ msgid "" "to<br>defaults. Sorry for the inconvenience.<br>" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Enlightenment Ayarları Yazma Sorunları" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files<br>from:<br>" @@ -885,14 +885,15 @@ msgid "" "<br>" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -903,21 +904,21 @@ msgstr "" msgid "OK" msgstr "Tamam" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Ayarlar Yükseltildi" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET dosya tanıtıcısı kötü." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Dosya veri boş." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only<br>or you lost " @@ -926,17 +927,17 @@ msgstr "" "Dosya yazılabilir değil. Belki disk salt okunur<br>veya dosyalarınızı " "izinleri kaybetti." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.<br>Please free up memory." msgstr "Yazma hazırlarken Bellek tükendi.<br>özgür kadar hafıza olun." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Bu genel bir hatadır." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.<br>It should be very small (a few hundred KB " @@ -944,71 +945,71 @@ msgid "" msgstr "" "Ayarlar dosyası çok büyük.<br>Bu (en az birkaç yüz KB) çok küçük olmalıdır." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Dosya yazarken boşluk bitti" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Yazarkendosyası kapanmıştır." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Dosyanın bellek eşleme (mmap) başarısız oldu." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 Kodlama başarısız oldu." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Uykuya alma başarısız." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Imza geçersiz oldu." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Pencere Yok)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Uygulanmadı bulunuyor." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG seeded değildi." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Askıya alma başarısız." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Askıya alma başarısız." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Enlightenment'a Hoş Geldiniz" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing<br>its config file.<br>" @@ -4032,6 +4033,27 @@ msgstr "Nesneleri Taşımaya/Boyutlandırmaya Başla" msgid "Set Toolbar Contents" msgstr "Araç Çubuğu İçeriğini Ayarla" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Durum" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is<br>not the current latest release.<br>The " +"latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or " +"update your system packages<br>to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6671,12 +6693,22 @@ msgstr "Performans" msgid "Power Management" msgstr "Güç Yönetimi" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Ekran Koruyucu" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Çıktı" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Başlangıçta kilitleme" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/uk.gmo b/po/uk.gmo index ead6a489bb..4100658e7d 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 7b18e45abc..44d8037f21 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: e.HEAD\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2009-12-13 21:16+0000\n" "Last-Translator: Sergio Gavrylov <sergiovana@bigmir.net>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -850,7 +850,7 @@ msgstr "Вибрати один" msgid "Cancel" msgstr "Скасувати" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have<br>been wiped and a " "new set of defaults initialized. This<br>will happen regularly during " @@ -868,7 +868,7 @@ msgstr "" "виправлений<br>шляхом додавання старих. Ви можете повторно налаштувати " "систему<br>за власним смаком. Вибачте за незручності<br>." -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very<br>strange. This " "should not happen unless you downgraded<br>Enlightenment or copied the " @@ -882,11 +882,11 @@ msgstr "" "версією Enlightenment.<br>Це неправильно, тому ваша конфігурація<br " ">відновлена до стандартної. Вибачте за незручності.<br>" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Проблеми під час збереження параметрів Enlightenment" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, fuzzy, c-format msgid "" "Enlightenment has had an error while moving config files<br>from:<br>" @@ -897,14 +897,15 @@ msgstr "" "ньому. Це дуже дивно.<br><br>Файл, в якому сталася помилка:<br>%s<br><br>Цей " "файл був вилучений, щоб уникнути недостовірних даних.<br>" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -915,21 +916,21 @@ msgstr "" msgid "OK" msgstr "Гаразд" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "Параметри оновлено" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 #, fuzzy msgid "The EET file handle is bad." msgstr "EET дескриптор файлу погано." -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 #, fuzzy msgid "The file data is empty." msgstr "Файл даних порожній." -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 #, fuzzy msgid "" "The file is not writable. Perhaps the disk is read-only<br>or you lost " @@ -938,17 +939,17 @@ msgstr "" "Файл не доступний для запису. Можливо , диск тільки для читання<br>або ви " "втратили дозволів на файли." -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 #, fuzzy msgid "Memory ran out while preparing the write.<br>Please free up memory." msgstr "Пам'ять вибіг при підготовці запису.<br>ласка вільної пам'яті вгору." -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 #, fuzzy msgid "This is a generic error." msgstr "Це загальна помилка." -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 #, fuzzy msgid "" "The settings file is too large.<br>It should be very small (a few hundred KB " @@ -957,71 +958,71 @@ msgstr "" "Налаштування файлу занадто великий.<br>Це має бути дуже маленьким (кілька " "сотень Кб в більшості)." -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 #, fuzzy msgid "You ran out of space while writing the file." msgstr "Ви вибігли з простору під час запису файлу" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 #, fuzzy msgid "The file was closed while writing." msgstr "Файл був закритий, на ньому під час запису." -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 #, fuzzy msgid "Memory-mapping (mmap) of the file failed." msgstr "Memory -відображення (спроектована) файлу не вдалося." -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 #, fuzzy msgid "X509 Encoding failed." msgstr "X509 кодування не вдалася." -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 #, fuzzy msgid "Signature failed." msgstr "Помилка під час переходу в режим сну." -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 #, fuzzy msgid "The signature was invalid." msgstr "Підпис недійсною." -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 #, fuzzy msgid "Not signed." msgstr "(Немає вікон)" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 #, fuzzy msgid "Feature not implemented." msgstr "Функція не реалізована." -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 #, fuzzy msgid "PRNG was not seeded." msgstr "PRNG не була заповнена." -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 #, fuzzy msgid "Encryption failed." msgstr "Помилка під час переходу в режим очікування." -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 #, fuzzy msgid "Decryption failed." msgstr "Помилка під час переходу в режим очікування." -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 #, fuzzy msgid "The error is unknown to Enlightenment." msgstr "Ласкаво просимо до Enlightenment" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, fuzzy, c-format msgid "" "Enlightenment has had an error while writing<br>its config file.<br>" @@ -4107,6 +4108,27 @@ msgstr "Почати переміщення/зміну розміру елеме msgid "Set Toolbar Contents" msgstr "Налаштувати вміст панелі інструментів" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "Стан" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is<br>not the current latest release.<br>The " +"latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or " +"update your system packages<br>to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6756,12 +6778,22 @@ msgstr "Продуктивність" msgid "Power Management" msgstr "Керування живленням" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 #, fuzzy msgid "Screen Setup" msgstr "Зберігач екрана" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "Вихід" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "Блокування при запуску" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 90c5a25550..7c2749ea9b 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index 87184d69e8..bedaa5dcf2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-20 22:40+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -817,7 +817,7 @@ msgstr "选择" msgid "Cancel" msgstr "取消" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have<br>been wiped and a " "new set of defaults initialized. This<br>will happen regularly during " @@ -832,7 +832,7 @@ msgstr "" "Enlightenment 需要新的设置，来使用新增功能，<br>新的默认设置会增加进来。<br>" "您也可以现在就重新设置各项。<br>很抱歉要让您重新设置。" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very<br>strange. This " "should not happen unless you downgraded<br>Enlightenment or copied the " @@ -844,11 +844,11 @@ msgstr "" "Enlightenment，或者复制了一个新版的 Enlightenment。<br>这很糟糕，为了防止出" "错，已经恢复为初始值。<br>很抱歉不得不这样做。<br>" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "Enlightenment 写入设置出错" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files<br>from:<br>" @@ -858,14 +858,15 @@ msgstr "" "Enlightenment 在将 <br>%s<br><br> 的配置文件移动至 <br>%s<br><br> 时出错，其" "他写操作已安全中止。<br>" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -876,91 +877,91 @@ msgstr "" msgid "OK" msgstr "确定" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "设置已经升级" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "EET 文件句柄非法。" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "该文件数据为空。" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only<br>or you lost " "permissions to your files." msgstr "文件不可写，原因可能是磁盘为只读或者您失去了操作权限。" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.<br>Please free up memory." msgstr "准备写入时内存不足。<br>请释放内存。" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "这是个一般性错误。" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.<br>It should be very small (a few hundred KB " "at most)." msgstr "设置文件太大了。<br>它应该很小的（最多几百 KB)。" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?" msgstr "磁盘有 I/O 错误。<br> 可能需要更换磁盘？" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "写文件时空间已满。" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "写入文件时文件已关闭。" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "内存映射(mmap)该文件出错。" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "X509 编码失败。" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "签名失败。" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "签名无效。" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "未签名。" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "特性未实现。" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "PRNG 未初始化。" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "加密失败。" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "解密失败。" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "Enlightenment 未知错误。" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing<br>its config file.<br>" @@ -3836,6 +3837,27 @@ msgstr "开始移动/缩放项目" msgid "Set Toolbar Contents" msgstr "设置工具条内容" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "更新" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is<br>not the current latest release.<br>The " +"latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or " +"update your system packages<br>to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6301,11 +6323,21 @@ msgstr "性能" msgid "Power Management" msgstr "电源管理" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "屏幕设置" +#: src/modules/conf_randr/e_int_config_randr.c:123 +#, fuzzy +msgid "Primary Output" +msgstr "输出" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +#, fuzzy +msgid "Restore On Startup" +msgstr "启动时锁定" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index b1b0e2e161..5bcfca7ade 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 1dc500107e..8debe49c36 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,11 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment DR17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2013-05-11 17:07-0300\n" +"POT-Creation-Date: 2013-08-02 14:37-0300\n" "PO-Revision-Date: 2012-12-08 23:27+1200\n" "Last-Translator: Sam Lin <semin2006@gmail.com>\n" "Language-Team: none\n" -"Language: \n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -810,7 +810,7 @@ msgstr "選取" msgid "Cancel" msgstr "取消" -#: src/bin/e_config.c:1045 +#: src/bin/e_config.c:931 msgid "" "Settings data needed upgrading. Your old settings have<br>been wiped and a " "new set of defaults initialized. This<br>will happen regularly during " @@ -821,7 +821,7 @@ msgid "" "the hiccup in your settings.<br>" msgstr "" -#: src/bin/e_config.c:1062 +#: src/bin/e_config.c:948 msgid "" "Your settings are NEWER than Enlightenment. This is very<br>strange. This " "should not happen unless you downgraded<br>Enlightenment or copied the " @@ -830,11 +830,11 @@ msgid "" "to<br>defaults. Sorry for the inconvenience.<br>" msgstr "" -#: src/bin/e_config.c:1580 src/bin/e_config.c:2209 +#: src/bin/e_config.c:1466 src/bin/e_config.c:2091 msgid "Enlightenment Settings Write Problems" msgstr "" -#: src/bin/e_config.c:1583 +#: src/bin/e_config.c:1469 #, c-format msgid "" "Enlightenment has had an error while moving config files<br>from:<br>" @@ -842,14 +842,15 @@ msgid "" "<br>" msgstr "" -#: src/bin/e_config.c:1593 src/bin/e_config.c:2222 +#: src/bin/e_config.c:1479 src/bin/e_config.c:2104 #: src/bin/e_config_dialog.c:278 src/bin/e_eap_editor.c:860 #: src/bin/e_eap_editor.c:923 src/bin/e_entry_dialog.c:63 src/bin/e_exec.c:613 #: src/bin/e_fm.c:9970 src/bin/e_fm.c:10696 src/bin/e_fm_prop.c:624 #: src/bin/e_import_config_dialog.c:540 src/bin/e_int_border_remember.c:318 #: src/bin/e_int_border_remember.c:507 src/bin/e_module.c:431 #: src/bin/e_module.c:798 src/bin/e_sys.c:618 src/bin/e_sys.c:659 -#: src/bin/e_utils.c:695 src/modules/comp/e_mod_config.c:914 +#: src/bin/e_update.c:76 src/bin/e_utils.c:695 +#: src/modules/comp/e_mod_config.c:914 #: src/modules/conf_edgebindings/e_int_config_signalbindings.c:636 #: src/modules/conf_intl/e_int_config_imc_import.c:120 #: src/modules/conf_theme/e_int_config_theme_import.c:119 @@ -860,91 +861,91 @@ msgstr "" msgid "OK" msgstr "確定" -#: src/bin/e_config.c:2100 +#: src/bin/e_config.c:1982 msgid "Settings Upgraded" msgstr "設定已更新" -#: src/bin/e_config.c:2118 +#: src/bin/e_config.c:2000 msgid "The EET file handle is bad." msgstr "" -#: src/bin/e_config.c:2122 +#: src/bin/e_config.c:2004 msgid "The file data is empty." msgstr "該檔案日期為空白。" -#: src/bin/e_config.c:2126 +#: src/bin/e_config.c:2008 msgid "" "The file is not writable. Perhaps the disk is read-only<br>or you lost " "permissions to your files." msgstr "無法寫入該檔案。有可能是該磁碟為唯讀<br>或者您喪失了該檔案的權限。" -#: src/bin/e_config.c:2130 +#: src/bin/e_config.c:2012 msgid "Memory ran out while preparing the write.<br>Please free up memory." msgstr "準備進行寫入時記憶體耗盡。<br>請清出記憶體。" -#: src/bin/e_config.c:2134 +#: src/bin/e_config.c:2016 msgid "This is a generic error." msgstr "" -#: src/bin/e_config.c:2138 +#: src/bin/e_config.c:2020 msgid "" "The settings file is too large.<br>It should be very small (a few hundred KB " "at most)." msgstr "該設定檔太大。該檔案大小應該很小(頂多數百KB)。" -#: src/bin/e_config.c:2142 +#: src/bin/e_config.c:2024 msgid "You have I/O errors on the disk.<br>Maybe it needs replacing?" msgstr "" -#: src/bin/e_config.c:2146 +#: src/bin/e_config.c:2028 msgid "You ran out of space while writing the file." msgstr "" -#: src/bin/e_config.c:2150 +#: src/bin/e_config.c:2032 msgid "The file was closed while writing." msgstr "" -#: src/bin/e_config.c:2154 +#: src/bin/e_config.c:2036 msgid "Memory-mapping (mmap) of the file failed." msgstr "" -#: src/bin/e_config.c:2158 +#: src/bin/e_config.c:2040 msgid "X509 Encoding failed." msgstr "X509編碼失敗。" -#: src/bin/e_config.c:2162 +#: src/bin/e_config.c:2044 msgid "Signature failed." msgstr "簽署失敗。" -#: src/bin/e_config.c:2166 +#: src/bin/e_config.c:2048 msgid "The signature was invalid." msgstr "該簽署無效。" -#: src/bin/e_config.c:2170 +#: src/bin/e_config.c:2052 msgid "Not signed." msgstr "尚未簽署。" -#: src/bin/e_config.c:2174 +#: src/bin/e_config.c:2056 msgid "Feature not implemented." msgstr "" -#: src/bin/e_config.c:2178 +#: src/bin/e_config.c:2060 msgid "PRNG was not seeded." msgstr "" -#: src/bin/e_config.c:2182 +#: src/bin/e_config.c:2064 msgid "Encryption failed." msgstr "加密失敗。" -#: src/bin/e_config.c:2186 +#: src/bin/e_config.c:2068 msgid "Decryption failed." msgstr "解碼失敗。" -#: src/bin/e_config.c:2190 +#: src/bin/e_config.c:2072 msgid "The error is unknown to Enlightenment." msgstr "" -#: src/bin/e_config.c:2212 +#: src/bin/e_config.c:2094 #, c-format msgid "" "Enlightenment has had an error while writing<br>its config file.<br>" @@ -3764,6 +3765,27 @@ msgstr "開始移動或改變項目大小" msgid "Set Toolbar Contents" msgstr "" +#: src/bin/e_update.c:78 +msgid "Bother me later" +msgstr "" + +#: src/bin/e_update.c:80 +msgid "Never tell me" +msgstr "" + +#: src/bin/e_update.c:83 +#, fuzzy +msgid "Update Notice" +msgstr "更新檔" + +#: src/bin/e_update.c:87 +#, c-format +msgid "" +"Your enlightenment version is<br>not the current latest release.<br>The " +"latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or " +"update your system packages<br>to get a new version." +msgstr "" + #: src/bin/e_utils.c:189 src/modules/conf_intl/e_int_config_imc.c:262 #: src/modules/conf_intl/e_int_config_imc.c:511 #, c-format @@ -6209,11 +6231,19 @@ msgstr "效能" msgid "Power Management" msgstr "電源管理" -#: src/modules/conf_randr/e_int_config_randr.c:46 +#: src/modules/conf_randr/e_int_config_randr.c:48 #: src/modules/conf_randr/e_mod_main.c:24 msgid "Screen Setup" msgstr "螢幕設定" +#: src/modules/conf_randr/e_int_config_randr.c:123 +msgid "Primary Output" +msgstr "" + +#: src/modules/conf_randr/e_int_config_randr.c:141 +msgid "Restore On Startup" +msgstr "" + #: src/modules/conf_shelves/e_int_config_shelf.c:129 #, fuzzy, c-format msgid "Configured Shelves: Display %d" diff --git a/src/Makefile.in b/src/Makefile.in index 22b64e35c6..510bc589e5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -71,21 +98,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -93,9 +127,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -452,22 +506,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -482,57 +539,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -548,12 +560,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -565,15 +572,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -582,6 +585,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -743,22 +761,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 8867f95137..e1256550d5 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -289,14 +289,6 @@ e_popup.c \ e_powersave.c \ e_prefix.c \ e_randr.c \ -e_randr_serialization.c \ -e_randr_11.c \ -e_randr_11_serialization.c \ -e_randr_12.c \ -e_randr_12_output.c \ -e_randr_12_crtc.c \ -e_randr_12_ask_dialog.c \ -e_randr_12_serialization.c \ e_remember.c \ e_resist.c \ e_scale.c \ @@ -442,6 +434,3 @@ install-data-hook: endif installed_headersdir = $(prefix)/include/enlightenment installed_headers_DATA = $(ENLIGHTENMENTHEADERS) - -EXTRA_DIST = \ - e_randr_private.h diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in index fc3260c0eb..dbda8780b0 100644 --- a/src/bin/Makefile.in +++ b/src/bin/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,23 +16,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -61,8 +88,8 @@ internal_bin_PROGRAMS = enlightenment_fm_op$(EXEEXT) \ enlightenment_static_grabber$(EXEEXT) $(am__EXEEXT_1) @HAVE_EEZE_TRUE@am__append_1 = enlightenment_backlight subdir = src/bin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/e_fm_shared_types.h.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/e_fm_shared_types.h.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -169,14 +196,6 @@ am__objects_2 = enlightenment-e_about.$(OBJEXT) \ enlightenment-e_powersave.$(OBJEXT) \ enlightenment-e_prefix.$(OBJEXT) \ enlightenment-e_randr.$(OBJEXT) \ - enlightenment-e_randr_serialization.$(OBJEXT) \ - enlightenment-e_randr_11.$(OBJEXT) \ - enlightenment-e_randr_11_serialization.$(OBJEXT) \ - enlightenment-e_randr_12.$(OBJEXT) \ - enlightenment-e_randr_12_output.$(OBJEXT) \ - enlightenment-e_randr_12_crtc.$(OBJEXT) \ - enlightenment-e_randr_12_ask_dialog.$(OBJEXT) \ - enlightenment-e_randr_12_serialization.$(OBJEXT) \ enlightenment-e_remember.$(OBJEXT) \ enlightenment-e_resist.$(OBJEXT) \ enlightenment-e_scale.$(OBJEXT) \ @@ -238,6 +257,7 @@ enlightenment_DEPENDENCIES = AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = enlightenment_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(enlightenment_LDFLAGS) $(LDFLAGS) -o $@ @@ -313,6 +333,18 @@ am_enlightenment_thumb_OBJECTS = e_sha1.$(OBJEXT) \ e_thumb_main.$(OBJEXT) e_user.$(OBJEXT) enlightenment_thumb_OBJECTS = $(am_enlightenment_thumb_OBJECTS) enlightenment_thumb_DEPENDENCIES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -325,20 +357,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(enlightenment_SOURCES) $(enlightenment_alert_SOURCES) \ $(enlightenment_backlight_SOURCES) \ $(enlightenment_filemanager_SOURCES) \ @@ -355,13 +383,14 @@ DIST_SOURCES = $(enlightenment_SOURCES) $(enlightenment_alert_SOURCES) \ $(enlightenment_start_SOURCES) \ $(enlightenment_static_grabber_SOURCES) \ $(enlightenment_sys_SOURCES) $(enlightenment_thumb_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -397,9 +426,29 @@ am__uninstall_files_from_dir = { \ DATA = $(installed_headers_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -982,14 +1031,6 @@ e_popup.c \ e_powersave.c \ e_prefix.c \ e_randr.c \ -e_randr_serialization.c \ -e_randr_11.c \ -e_randr_11_serialization.c \ -e_randr_12.c \ -e_randr_12_output.c \ -e_randr_12_crtc.c \ -e_randr_12_ask_dialog.c \ -e_randr_12_serialization.c \ e_remember.c \ e_resist.c \ e_scale.c \ @@ -1115,9 +1156,6 @@ enlightenment_static_grabber_CFLAGS = @E_GRABBER_CFLAGS@ setuid_root_mode = a=rx,u+xs installed_headersdir = $(prefix)/include/enlightenment installed_headers_DATA = $(ENLIGHTENMENTHEADERS) -EXTRA_DIST = \ - e_randr_private.h - all: all-recursive .SUFFIXES: @@ -1163,10 +1201,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -1187,7 +1227,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -1209,10 +1250,12 @@ install-internal_binPROGRAMS: $(internal_bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -1233,7 +1276,8 @@ uninstall-internal_binPROGRAMS: @list='$(internal_bin_PROGRAMS)'; test -n "$(internal_bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(internal_bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(internal_bindir)" && rm -f $$files @@ -1246,39 +1290,51 @@ clean-internal_binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + enlightenment$(EXEEXT): $(enlightenment_OBJECTS) $(enlightenment_DEPENDENCIES) $(EXTRA_enlightenment_DEPENDENCIES) @rm -f enlightenment$(EXEEXT) $(AM_V_CCLD)$(enlightenment_LINK) $(enlightenment_OBJECTS) $(enlightenment_LDADD) $(LIBS) + enlightenment_alert$(EXEEXT): $(enlightenment_alert_OBJECTS) $(enlightenment_alert_DEPENDENCIES) $(EXTRA_enlightenment_alert_DEPENDENCIES) @rm -f enlightenment_alert$(EXEEXT) $(AM_V_CCLD)$(enlightenment_alert_LINK) $(enlightenment_alert_OBJECTS) $(enlightenment_alert_LDADD) $(LIBS) + enlightenment_backlight$(EXEEXT): $(enlightenment_backlight_OBJECTS) $(enlightenment_backlight_DEPENDENCIES) $(EXTRA_enlightenment_backlight_DEPENDENCIES) @rm -f enlightenment_backlight$(EXEEXT) $(AM_V_CCLD)$(enlightenment_backlight_LINK) $(enlightenment_backlight_OBJECTS) $(enlightenment_backlight_LDADD) $(LIBS) + enlightenment_filemanager$(EXEEXT): $(enlightenment_filemanager_OBJECTS) $(enlightenment_filemanager_DEPENDENCIES) $(EXTRA_enlightenment_filemanager_DEPENDENCIES) @rm -f enlightenment_filemanager$(EXEEXT) $(AM_V_CCLD)$(enlightenment_filemanager_LINK) $(enlightenment_filemanager_OBJECTS) $(enlightenment_filemanager_LDADD) $(LIBS) + enlightenment_fm_op$(EXEEXT): $(enlightenment_fm_op_OBJECTS) $(enlightenment_fm_op_DEPENDENCIES) $(EXTRA_enlightenment_fm_op_DEPENDENCIES) @rm -f enlightenment_fm_op$(EXEEXT) $(AM_V_CCLD)$(LINK) $(enlightenment_fm_op_OBJECTS) $(enlightenment_fm_op_LDADD) $(LIBS) + enlightenment_imc$(EXEEXT): $(enlightenment_imc_OBJECTS) $(enlightenment_imc_DEPENDENCIES) $(EXTRA_enlightenment_imc_DEPENDENCIES) @rm -f enlightenment_imc$(EXEEXT) $(AM_V_CCLD)$(LINK) $(enlightenment_imc_OBJECTS) $(enlightenment_imc_LDADD) $(LIBS) + enlightenment_init$(EXEEXT): $(enlightenment_init_OBJECTS) $(enlightenment_init_DEPENDENCIES) $(EXTRA_enlightenment_init_DEPENDENCIES) @rm -f enlightenment_init$(EXEEXT) $(AM_V_CCLD)$(LINK) $(enlightenment_init_OBJECTS) $(enlightenment_init_LDADD) $(LIBS) + enlightenment_open$(EXEEXT): $(enlightenment_open_OBJECTS) $(enlightenment_open_DEPENDENCIES) $(EXTRA_enlightenment_open_DEPENDENCIES) @rm -f enlightenment_open$(EXEEXT) $(AM_V_CCLD)$(enlightenment_open_LINK) $(enlightenment_open_OBJECTS) $(enlightenment_open_LDADD) $(LIBS) + enlightenment_start$(EXEEXT): $(enlightenment_start_OBJECTS) $(enlightenment_start_DEPENDENCIES) $(EXTRA_enlightenment_start_DEPENDENCIES) @rm -f enlightenment_start$(EXEEXT) $(AM_V_CCLD)$(enlightenment_start_LINK) $(enlightenment_start_OBJECTS) $(enlightenment_start_LDADD) $(LIBS) + enlightenment_static_grabber$(EXEEXT): $(enlightenment_static_grabber_OBJECTS) $(enlightenment_static_grabber_DEPENDENCIES) $(EXTRA_enlightenment_static_grabber_DEPENDENCIES) @rm -f enlightenment_static_grabber$(EXEEXT) $(AM_V_CCLD)$(enlightenment_static_grabber_LINK) $(enlightenment_static_grabber_OBJECTS) $(enlightenment_static_grabber_LDADD) $(LIBS) + enlightenment_sys$(EXEEXT): $(enlightenment_sys_OBJECTS) $(enlightenment_sys_DEPENDENCIES) $(EXTRA_enlightenment_sys_DEPENDENCIES) @rm -f enlightenment_sys$(EXEEXT) $(AM_V_CCLD)$(enlightenment_sys_LINK) $(enlightenment_sys_OBJECTS) $(enlightenment_sys_LDADD) $(LIBS) + enlightenment_thumb$(EXEEXT): $(enlightenment_thumb_OBJECTS) $(enlightenment_thumb_DEPENDENCIES) $(EXTRA_enlightenment_thumb_DEPENDENCIES) @rm -f enlightenment_thumb$(EXEEXT) $(AM_V_CCLD)$(LINK) $(enlightenment_thumb_OBJECTS) $(enlightenment_thumb_LDADD) $(LIBS) @@ -1390,14 +1446,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_powersave.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_prefix.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_11.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_11_serialization.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_12.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_12_crtc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_12_output.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_12_serialization.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_randr_serialization.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_remember.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_resist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enlightenment-e_scale.Po@am__quote@ @@ -2773,118 +2821,6 @@ enlightenment-e_randr.obj: e_randr.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr.obj `if test -f 'e_randr.c'; then $(CYGPATH_W) 'e_randr.c'; else $(CYGPATH_W) '$(srcdir)/e_randr.c'; fi` -enlightenment-e_randr_serialization.o: e_randr_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_serialization.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_serialization.Tpo -c -o enlightenment-e_randr_serialization.o `test -f 'e_randr_serialization.c' || echo '$(srcdir)/'`e_randr_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_serialization.Tpo $(DEPDIR)/enlightenment-e_randr_serialization.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_serialization.c' object='enlightenment-e_randr_serialization.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_serialization.o `test -f 'e_randr_serialization.c' || echo '$(srcdir)/'`e_randr_serialization.c - -enlightenment-e_randr_serialization.obj: e_randr_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_serialization.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_serialization.Tpo -c -o enlightenment-e_randr_serialization.obj `if test -f 'e_randr_serialization.c'; then $(CYGPATH_W) 'e_randr_serialization.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_serialization.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_serialization.Tpo $(DEPDIR)/enlightenment-e_randr_serialization.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_serialization.c' object='enlightenment-e_randr_serialization.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_serialization.obj `if test -f 'e_randr_serialization.c'; then $(CYGPATH_W) 'e_randr_serialization.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_serialization.c'; fi` - -enlightenment-e_randr_11.o: e_randr_11.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_11.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_11.Tpo -c -o enlightenment-e_randr_11.o `test -f 'e_randr_11.c' || echo '$(srcdir)/'`e_randr_11.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_11.Tpo $(DEPDIR)/enlightenment-e_randr_11.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_11.c' object='enlightenment-e_randr_11.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_11.o `test -f 'e_randr_11.c' || echo '$(srcdir)/'`e_randr_11.c - -enlightenment-e_randr_11.obj: e_randr_11.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_11.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_11.Tpo -c -o enlightenment-e_randr_11.obj `if test -f 'e_randr_11.c'; then $(CYGPATH_W) 'e_randr_11.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_11.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_11.Tpo $(DEPDIR)/enlightenment-e_randr_11.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_11.c' object='enlightenment-e_randr_11.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_11.obj `if test -f 'e_randr_11.c'; then $(CYGPATH_W) 'e_randr_11.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_11.c'; fi` - -enlightenment-e_randr_11_serialization.o: e_randr_11_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_11_serialization.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_11_serialization.Tpo -c -o enlightenment-e_randr_11_serialization.o `test -f 'e_randr_11_serialization.c' || echo '$(srcdir)/'`e_randr_11_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_11_serialization.Tpo $(DEPDIR)/enlightenment-e_randr_11_serialization.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_11_serialization.c' object='enlightenment-e_randr_11_serialization.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_11_serialization.o `test -f 'e_randr_11_serialization.c' || echo '$(srcdir)/'`e_randr_11_serialization.c - -enlightenment-e_randr_11_serialization.obj: e_randr_11_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_11_serialization.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_11_serialization.Tpo -c -o enlightenment-e_randr_11_serialization.obj `if test -f 'e_randr_11_serialization.c'; then $(CYGPATH_W) 'e_randr_11_serialization.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_11_serialization.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_11_serialization.Tpo $(DEPDIR)/enlightenment-e_randr_11_serialization.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_11_serialization.c' object='enlightenment-e_randr_11_serialization.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_11_serialization.obj `if test -f 'e_randr_11_serialization.c'; then $(CYGPATH_W) 'e_randr_11_serialization.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_11_serialization.c'; fi` - -enlightenment-e_randr_12.o: e_randr_12.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12.Tpo -c -o enlightenment-e_randr_12.o `test -f 'e_randr_12.c' || echo '$(srcdir)/'`e_randr_12.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12.Tpo $(DEPDIR)/enlightenment-e_randr_12.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12.c' object='enlightenment-e_randr_12.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12.o `test -f 'e_randr_12.c' || echo '$(srcdir)/'`e_randr_12.c - -enlightenment-e_randr_12.obj: e_randr_12.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12.Tpo -c -o enlightenment-e_randr_12.obj `if test -f 'e_randr_12.c'; then $(CYGPATH_W) 'e_randr_12.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12.Tpo $(DEPDIR)/enlightenment-e_randr_12.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12.c' object='enlightenment-e_randr_12.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12.obj `if test -f 'e_randr_12.c'; then $(CYGPATH_W) 'e_randr_12.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12.c'; fi` - -enlightenment-e_randr_12_output.o: e_randr_12_output.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_output.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_output.Tpo -c -o enlightenment-e_randr_12_output.o `test -f 'e_randr_12_output.c' || echo '$(srcdir)/'`e_randr_12_output.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_output.Tpo $(DEPDIR)/enlightenment-e_randr_12_output.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_output.c' object='enlightenment-e_randr_12_output.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_output.o `test -f 'e_randr_12_output.c' || echo '$(srcdir)/'`e_randr_12_output.c - -enlightenment-e_randr_12_output.obj: e_randr_12_output.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_output.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_output.Tpo -c -o enlightenment-e_randr_12_output.obj `if test -f 'e_randr_12_output.c'; then $(CYGPATH_W) 'e_randr_12_output.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_output.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_output.Tpo $(DEPDIR)/enlightenment-e_randr_12_output.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_output.c' object='enlightenment-e_randr_12_output.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_output.obj `if test -f 'e_randr_12_output.c'; then $(CYGPATH_W) 'e_randr_12_output.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_output.c'; fi` - -enlightenment-e_randr_12_crtc.o: e_randr_12_crtc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_crtc.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_crtc.Tpo -c -o enlightenment-e_randr_12_crtc.o `test -f 'e_randr_12_crtc.c' || echo '$(srcdir)/'`e_randr_12_crtc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_crtc.Tpo $(DEPDIR)/enlightenment-e_randr_12_crtc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_crtc.c' object='enlightenment-e_randr_12_crtc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_crtc.o `test -f 'e_randr_12_crtc.c' || echo '$(srcdir)/'`e_randr_12_crtc.c - -enlightenment-e_randr_12_crtc.obj: e_randr_12_crtc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_crtc.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_crtc.Tpo -c -o enlightenment-e_randr_12_crtc.obj `if test -f 'e_randr_12_crtc.c'; then $(CYGPATH_W) 'e_randr_12_crtc.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_crtc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_crtc.Tpo $(DEPDIR)/enlightenment-e_randr_12_crtc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_crtc.c' object='enlightenment-e_randr_12_crtc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_crtc.obj `if test -f 'e_randr_12_crtc.c'; then $(CYGPATH_W) 'e_randr_12_crtc.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_crtc.c'; fi` - -enlightenment-e_randr_12_ask_dialog.o: e_randr_12_ask_dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_ask_dialog.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Tpo -c -o enlightenment-e_randr_12_ask_dialog.o `test -f 'e_randr_12_ask_dialog.c' || echo '$(srcdir)/'`e_randr_12_ask_dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Tpo $(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_ask_dialog.c' object='enlightenment-e_randr_12_ask_dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_ask_dialog.o `test -f 'e_randr_12_ask_dialog.c' || echo '$(srcdir)/'`e_randr_12_ask_dialog.c - -enlightenment-e_randr_12_ask_dialog.obj: e_randr_12_ask_dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_ask_dialog.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Tpo -c -o enlightenment-e_randr_12_ask_dialog.obj `if test -f 'e_randr_12_ask_dialog.c'; then $(CYGPATH_W) 'e_randr_12_ask_dialog.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_ask_dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Tpo $(DEPDIR)/enlightenment-e_randr_12_ask_dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_ask_dialog.c' object='enlightenment-e_randr_12_ask_dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_ask_dialog.obj `if test -f 'e_randr_12_ask_dialog.c'; then $(CYGPATH_W) 'e_randr_12_ask_dialog.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_ask_dialog.c'; fi` - -enlightenment-e_randr_12_serialization.o: e_randr_12_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_serialization.o -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_serialization.Tpo -c -o enlightenment-e_randr_12_serialization.o `test -f 'e_randr_12_serialization.c' || echo '$(srcdir)/'`e_randr_12_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_serialization.Tpo $(DEPDIR)/enlightenment-e_randr_12_serialization.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_serialization.c' object='enlightenment-e_randr_12_serialization.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_serialization.o `test -f 'e_randr_12_serialization.c' || echo '$(srcdir)/'`e_randr_12_serialization.c - -enlightenment-e_randr_12_serialization.obj: e_randr_12_serialization.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_randr_12_serialization.obj -MD -MP -MF $(DEPDIR)/enlightenment-e_randr_12_serialization.Tpo -c -o enlightenment-e_randr_12_serialization.obj `if test -f 'e_randr_12_serialization.c'; then $(CYGPATH_W) 'e_randr_12_serialization.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_serialization.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_randr_12_serialization.Tpo $(DEPDIR)/enlightenment-e_randr_12_serialization.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='e_randr_12_serialization.c' object='enlightenment-e_randr_12_serialization.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o enlightenment-e_randr_12_serialization.obj `if test -f 'e_randr_12_serialization.c'; then $(CYGPATH_W) 'e_randr_12_serialization.c'; else $(CYGPATH_W) '$(srcdir)/e_randr_12_serialization.c'; fi` - enlightenment-e_remember.o: e_remember.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(enlightenment_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT enlightenment-e_remember.o -MD -MP -MF $(DEPDIR)/enlightenment-e_remember.Tpo -c -o enlightenment-e_remember.o `test -f 'e_remember.c' || echo '$(srcdir)/'`e_remember.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/enlightenment-e_remember.Tpo $(DEPDIR)/enlightenment-e_remember.Po @@ -3823,22 +3759,25 @@ uninstall-installed_headersDATA: dir='$(DESTDIR)$(installed_headersdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -3853,57 +3792,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -3919,12 +3813,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -3936,15 +3825,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -3953,6 +3838,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -4126,13 +4026,13 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-installed_headersDATA \ uninstall-internal_binPROGRAMS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-internal_binPROGRAMS clean-libtool ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic \ + clean-internal_binPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-data-hook install-dvi \ @@ -4144,9 +4044,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-installed_headersDATA \ installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-installed_headersDATA \ - uninstall-internal_binPROGRAMS + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-installed_headersDATA uninstall-internal_binPROGRAMS @HAVE_EEZE_TRUE@install-data-hook: @HAVE_EEZE_TRUE@ @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true diff --git a/src/bin/e_border.h b/src/bin/e_border.h index af42464fff..29fe8dd8aa 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -839,5 +839,18 @@ extern EAPI int E_EVENT_BORDER_PROPERTY; extern EAPI int E_EVENT_BORDER_FULLSCREEN; extern EAPI int E_EVENT_BORDER_UNFULLSCREEN; +/* macro for finding misuse of changed flag */ +#if 0 +# define BD_CHANGED(BD) \ + do { \ + if (e_object_is_del(E_OBJECT(BD))) \ + EINA_LOG_CRIT("CHANGED SET ON DELETED BORDER!"); \ + BD->changed = 1; \ + INF("%s:%d - BD CHANGED: %p", __FILE__, __LINE__, BD); \ + } while (0) +#else +# define BD_CHANGED(BD) BD->changed = 1 +#endif + #endif #endif diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 9fedb4117d..c949ece1a7 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -6,10 +6,6 @@ #define DEF_MENUCLICK 0.25 #endif -#define RANDR_SERIALIZED_SETUP_11 ((int)((1 << 16) | 1)) -#define RANDR_SERIALIZED_SETUP_12 ((int)((1 << 16) | 2)) -#define RANDR_SERIALIZED_SETUP_13 ((int)((1 << 16) | 3)) - EAPI E_Config * e_config = NULL; static int _e_config_revisions = 9; @@ -50,15 +46,6 @@ static E_Config_DD *_e_config_shelf_desk_edd = NULL; static E_Config_DD *_e_config_mime_icon_edd = NULL; static E_Config_DD *_e_config_syscon_action_edd = NULL; static E_Config_DD *_e_config_env_var_edd = NULL; -static E_Config_DD *_e_config_randr_size_edd = NULL; -static E_Config_DD *_e_config_randr_edid_hash_edd = NULL; -static E_Config_DD *_e_config_randr_serialized_setup_edd = NULL; -static E_Config_DD *_e_config_randr_serialized_setup_11_edd = NULL; -static E_Config_DD *_e_config_randr_serialized_setup_12_edd = NULL; -static E_Config_DD *_e_config_randr_serialized_output_policy_edd = NULL; -static E_Config_DD *_e_config_randr_serialized_output_edd = NULL; -static E_Config_DD *_e_config_randr_mode_info_edd = NULL; -static E_Config_DD *_e_config_randr_serialized_crtc_edd = NULL; static E_Config_DD *_e_config_xkb_layout_edd = NULL; static E_Config_DD *_e_config_xkb_option_edd = NULL; @@ -452,103 +439,6 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, val, STR); E_CONFIG_VAL(D, T, unset, UCHAR); - _e_config_randr_size_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Screen_Size", Ecore_X_Randr_Screen_Size); -#undef T -#undef D -#define T Ecore_X_Randr_Screen_Size -#define D _e_config_randr_size_edd - E_CONFIG_VAL(D, T, width, INT); - E_CONFIG_VAL(D, T, height, INT); - - _e_config_randr_edid_hash_edd = E_CONFIG_DD_NEW("E_Randr_Edid_Hash", E_Randr_Edid_Hash); -#undef T -#undef D -#define T E_Randr_Edid_Hash -#define D _e_config_randr_edid_hash_edd - E_CONFIG_VAL(D, T, hash, INT); - - _e_config_randr_serialized_setup_11_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_11", E_Randr_Serialized_Setup_11); -#undef T -#undef D -#define T E_Randr_Serialized_Setup_11 -#define D _e_config_randr_serialized_setup_11_edd - E_CONFIG_VAL(D, T, size.width, INT); - E_CONFIG_VAL(D, T, size.height, INT); - E_CONFIG_VAL(D, T, size.width_mm, INT); - E_CONFIG_VAL(D, T, size.height_mm, INT); - E_CONFIG_VAL(D, T, orientation, INT); - E_CONFIG_VAL(D, T, refresh_rate, SHORT); - - _e_config_randr_serialized_output_policy_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output_Policy", E_Randr_Serialized_Output_Policy); -#undef T -#undef D -#define T E_Randr_Serialized_Output_Policy -#define D _e_config_randr_serialized_output_policy_edd - E_CONFIG_VAL(D, T, name, STR); - E_CONFIG_VAL(D, T, policy, INT); - - _e_config_randr_serialized_output_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Output", E_Randr_Serialized_Output); -#undef T -#undef D -#define T E_Randr_Serialized_Output -#define D _e_config_randr_serialized_output_edd - E_CONFIG_VAL(D, T, name, STR); - E_CONFIG_VAL(D, T, backlight_level, DOUBLE); - - _e_config_randr_mode_info_edd = E_CONFIG_DD_NEW("Ecore_X_Randr_Mode_Info", Ecore_X_Randr_Mode_Info); -#undef T -#undef D -#define T Ecore_X_Randr_Mode_Info -#define D _e_config_randr_mode_info_edd - E_CONFIG_VAL(D, T, xid, INT); - E_CONFIG_VAL(D, T, width, UINT); - E_CONFIG_VAL(D, T, height, UINT); - E_CONFIG_VAL(D, T, dotClock, LL); - E_CONFIG_VAL(D, T, hSyncStart, UINT); - E_CONFIG_VAL(D, T, hSyncEnd, UINT); - E_CONFIG_VAL(D, T, hTotal, UINT); - E_CONFIG_VAL(D, T, hSkew, UINT); - E_CONFIG_VAL(D, T, vSyncStart, UINT); - E_CONFIG_VAL(D, T, vSyncEnd, UINT); - E_CONFIG_VAL(D, T, vTotal, UINT); - E_CONFIG_VAL(D, T, name, STR); - E_CONFIG_VAL(D, T, nameLength, UINT); - /* Work around a possible ABI break due to poor type choice. */ - if (sizeof (int) == sizeof (unsigned long)) - E_CONFIG_VAL(D, T, modeFlags, INT); - else if (sizeof (unsigned long long) == sizeof (unsigned long)) - E_CONFIG_VAL(D, T, modeFlags, LL); - - _e_config_randr_serialized_crtc_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Crtc", E_Randr_Serialized_Crtc); -#undef T -#undef D -#define T E_Randr_Serialized_Crtc -#define D _e_config_randr_serialized_crtc_edd - E_CONFIG_LIST(D, T, outputs, _e_config_randr_serialized_output_edd); - E_CONFIG_SUB(D, T, mode_info, _e_config_randr_mode_info_edd); - E_CONFIG_VAL(D, T, index, INT); - E_CONFIG_VAL(D, T, pos.x, INT); - E_CONFIG_VAL(D, T, pos.y, INT); - E_CONFIG_VAL(D, T, orientation, INT); - - _e_config_randr_serialized_setup_12_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup_12", E_Randr_Serialized_Setup_12); -#undef T -#undef D -#define T E_Randr_Serialized_Setup_12 -#define D _e_config_randr_serialized_setup_12_edd - E_CONFIG_VAL(D, T, timestamp, DOUBLE); - E_CONFIG_LIST(D, T, crtcs, _e_config_randr_serialized_crtc_edd); - E_CONFIG_LIST(D, T, edid_hashes, _e_config_randr_edid_hash_edd); - - _e_config_randr_serialized_setup_edd = E_CONFIG_DD_NEW("E_Randr_Serialized_Setup", E_Randr_Serialized_Setup); -#undef T -#undef D -#define T E_Randr_Serialized_Setup -#define D _e_config_randr_serialized_setup_edd - E_CONFIG_SUB(D, T, serialized_setup_11, _e_config_randr_serialized_setup_11_edd); - E_CONFIG_LIST(D, T, serialized_setups_12, _e_config_randr_serialized_setup_12_edd); - E_CONFIG_LIST(D, T, outputs_policies, _e_config_randr_serialized_output_policy_edd); - _e_config_xkb_layout_edd = E_CONFIG_DD_NEW("E_Config_XKB_Layout", E_Config_XKB_Layout); #undef T @@ -723,9 +613,6 @@ _e_config_edd_init(Eina_Bool old) E_CONFIG_VAL(D, T, desklock_ask_presentation, UCHAR); E_CONFIG_VAL(D, T, desklock_ask_presentation_timeout, DOUBLE); - //randr specifics - E_CONFIG_SUB(D, T, randr_serialized_setup, _e_config_randr_serialized_setup_edd); - E_CONFIG_VAL(D, T, screensaver_enable, INT); E_CONFIG_VAL(D, T, screensaver_timeout, INT); E_CONFIG_VAL(D, T, screensaver_interval, INT); @@ -933,7 +820,6 @@ _e_config_edd_shutdown(void) E_CONFIG_DD_FREE(_e_config_env_var_edd); E_CONFIG_DD_FREE(_e_config_xkb_layout_edd); E_CONFIG_DD_FREE(_e_config_xkb_option_edd); - //E_CONFIG_DD_FREE(_e_config_randr_serialized_setup_edd); } /* externally accessible functions */ @@ -2072,10 +1958,6 @@ _e_config_free(E_Config *ecf) if (sca->icon) eina_stringshare_del(sca->icon); E_FREE(sca); } - if (ecf->randr_serialized_setup) - { - e_randr_serialized_setup_free(ecf->randr_serialized_setup); - } EINA_LIST_FREE(ecf->env_vars, evr) { if (evr->var) eina_stringshare_del(evr->var); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 1d5d7ecbba..44ce8fc1dd 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -234,8 +234,6 @@ struct _E_Config int mouse_accel_denominator; // GUI int mouse_accel_threshold; // GUI - E_Randr_Serialized_Setup *randr_serialized_setup; // GUI - int border_raise_on_mouse_action; // GUI int border_raise_on_focus; // GUI int desk_flip_wrap; // GUI diff --git a/src/bin/e_fm/Makefile.in b/src/bin/e_fm/Makefile.in index 5b113c585f..e21824c5b1 100644 --- a/src/bin/e_fm/Makefile.in +++ b/src/bin/e_fm/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,7 +82,8 @@ internal_bin_PROGRAMS = enlightenment_fm$(EXEEXT) @HAVE_EEZE_MOUNT_TRUE@am__append_1 = @EEZE_CFLAGS@ @EET_CFLAGS@ @HAVE_EEZE_MOUNT_TRUE@am__append_2 = @EEZE_LIBS@ @EET_LIBS@ subdir = src/bin/e_fm -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \ $(top_srcdir)/m4/ac_attribute.m4 \ @@ -95,6 +123,19 @@ enlightenment_fm_DEPENDENCIES = AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -107,20 +148,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(enlightenment_fm_SOURCES) DIST_SOURCES = $(am__enlightenment_fm_SOURCES_DIST) am__can_run_installinfo = \ @@ -128,6 +165,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -499,10 +553,12 @@ install-internal_binPROGRAMS: $(internal_bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -523,7 +579,8 @@ uninstall-internal_binPROGRAMS: @list='$(internal_bin_PROGRAMS)'; test -n "$(internal_bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(internal_bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(internal_bindir)" && rm -f $$files @@ -536,6 +593,7 @@ clean-internal_binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + enlightenment_fm$(EXEEXT): $(enlightenment_fm_OBJECTS) $(enlightenment_fm_DEPENDENCIES) $(EXTRA_enlightenment_fm_DEPENDENCIES) @rm -f enlightenment_fm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(enlightenment_fm_OBJECTS) $(enlightenment_fm_LDADD) $(LIBS) @@ -654,26 +712,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -685,15 +732,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -702,6 +745,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -847,19 +905,20 @@ uninstall-am: uninstall-internal_binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-internal_binPROGRAMS clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-internal_binPROGRAMS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-internal_binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-internal_binPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-internal_binPROGRAMS install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-internal_binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 0bf4b7f2c2..186c97a99e 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -82,7 +82,7 @@ e_module_all_load(void) EINA_LIST_FOREACH(e_config->modules, l, em) { if (!em) continue; - if ((em->delayed) && (em->enabled) & (!e_config->no_module_delay)) + if ((em->delayed) && (em->enabled) && (!e_config->no_module_delay)) { if (!_e_module_idler) _e_module_idler = ecore_idle_enterer_add(_e_module_cb_idler, NULL); diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c index 3c78a00673..0386a50de6 100644 --- a/src/bin/e_randr.c +++ b/src/bin/e_randr.c @@ -1,158 +1,1302 @@ -/* - * vim:ts=8:sw=3:sts=8:expandtab:cino=>5n-3f0^-2{2 - */ #include "e.h" -#include "e_randr_private.h" -#define ECORE_X_RANDR_1_1 ((1 << 16) | 1) -#define ECORE_X_RANDR_1_2 ((1 << 16) | 2) -#define ECORE_X_RANDR_1_3 ((1 << 16) | 3) +/* local function prototypes */ +static Eina_Bool _e_randr_config_load(void); +static void _e_randr_config_new(void); +static void _e_randr_config_free(void); +static Eina_Bool _e_randr_config_cb_timer(void *data); +static void _e_randr_config_restore(void); +static Eina_Bool _e_randr_config_crtc_update(E_Randr_Crtc_Config *cfg); +static Eina_Bool _e_randr_config_output_update(E_Randr_Output_Config *cfg); +static E_Randr_Crtc_Config *_e_randr_config_output_crtc_find(E_Randr_Output_Config *cfg); +static Ecore_X_Randr_Mode _e_randr_config_output_preferred_mode_get(E_Randr_Output_Config *cfg); +static E_Randr_Output_Config *_e_randr_config_output_new(unsigned int id); +static E_Randr_Crtc_Config *_e_randr_config_crtc_find(Ecore_X_Randr_Crtc crtc); +static E_Randr_Output_Config *_e_randr_config_output_find(Ecore_X_Randr_Output output); +static void _e_randr_config_screen_size_calculate(int *sw, int *sh); +static void _e_randr_config_mode_geometry(Ecore_X_Randr_Mode mode, Ecore_X_Randr_Orientation orient, Eina_Rectangle *rect); -#define Ecore_X_Randr_None 0 -#define Ecore_X_Randr_Unset -1 +static Eina_Bool _e_randr_event_cb_screen_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_randr_event_cb_crtc_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); +static Eina_Bool _e_randr_event_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event); -/* - * Save mechanism: - * Single monitor: - * - Save monitor using the resolution - * - * Multiple monitors: - * - Use the EDID information to make sure we restore the right monitor. - * - Depend on the sequence in which the XIDs are returned provided by the X - * server. This means that relative indexes are used for setup store/restore. - * - */ +/* local variables */ +static Eina_List *_randr_event_handlers = NULL; +static E_Config_DD *_e_randr_edd = NULL; +static E_Config_DD *_e_randr_crtc_edd = NULL; +static E_Config_DD *_e_randr_output_edd = NULL; -static Eina_Bool _init(void); -static void _shutdown(void); -static Eina_Bool _screen_info_refresh(void); -static Eina_Bool _e_event_config_loaded_cb(void *data, int type, void *e); -static void _event_listeners_add(void); -static void _event_listeners_remove(void); +/* external variables */ +EAPI E_Randr_Config *e_randr_cfg = NULL; -EAPI E_Randr_Screen_Info e_randr_screen_info; -static Eina_List *_event_handlers = NULL; +/* private internal functions */ +EINTERN Eina_Bool +e_randr_init(void) +{ + /* check if randr is available */ + if (!ecore_x_randr_query()) return EINA_FALSE; + + /* try to load config */ + if (!_e_randr_config_load()) + { + /* NB: We should probably print an error here */ + return EINA_FALSE; + } -EAPI Eina_Bool -e_randr_screen_info_refresh(void) + /* tell randr that we are interested in receiving events + * + * NB: Requires RandR >= 1.2 */ + if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2) + { + Ecore_X_Window root = 0; + + if ((root = ecore_x_window_root_first_get())) + ecore_x_randr_events_select(root, EINA_TRUE); + + /* setup randr event listeners */ + E_LIST_HANDLER_APPEND(_randr_event_handlers, + ECORE_X_EVENT_SCREEN_CHANGE, + _e_randr_event_cb_screen_change, NULL); + E_LIST_HANDLER_APPEND(_randr_event_handlers, + ECORE_X_EVENT_RANDR_CRTC_CHANGE, + _e_randr_event_cb_crtc_change, NULL); + E_LIST_HANDLER_APPEND(_randr_event_handlers, + ECORE_X_EVENT_RANDR_OUTPUT_CHANGE, + _e_randr_event_cb_output_change, NULL); + } + + return EINA_TRUE; +} + +EINTERN int +e_randr_shutdown(void) { - return _screen_info_refresh(); + /* check if randr is available */ + if (!ecore_x_randr_query()) return 1; + + if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2) + { + Ecore_X_Window root = 0; + + /* remove randr event listeners */ + E_FREE_LIST(_randr_event_handlers, ecore_event_handler_del); + + /* tell randr that we are not interested in receiving events anymore */ + if ((root = ecore_x_window_root_first_get())) + ecore_x_randr_events_select(root, EINA_FALSE); + } + + E_CONFIG_DD_FREE(_e_randr_output_edd); + E_CONFIG_DD_FREE(_e_randr_crtc_edd); + E_CONFIG_DD_FREE(_e_randr_edd); + + return 1; } -EINTERN Eina_Bool -e_randr_init(void) +/* public API functions */ +EAPI Eina_Bool +e_randr_config_save(void) { - return _init(); + /* save the new config */ + return e_config_domain_save("e_randr", _e_randr_edd, e_randr_cfg); } -EINTERN int -e_randr_shutdown(void) +/* local functions */ +static Eina_Bool +_e_randr_config_load(void) { - _shutdown(); - return 1; + E_Randr_Output_Config eroc; + Eina_Bool do_restore = EINA_TRUE; + + /* define edd for output config */ + _e_randr_output_edd = + E_CONFIG_DD_NEW("E_Randr_Output_Config", E_Randr_Output_Config); +#undef T +#undef D +#define T E_Randr_Output_Config +#define D _e_randr_output_edd + E_CONFIG_VAL(D, T, xid, UINT); + E_CONFIG_VAL(D, T, crtc, UINT); + E_CONFIG_VAL(D, T, policy, UINT); + E_CONFIG_VAL(D, T, primary, UCHAR); + eet_data_descriptor_element_add(D, "edid", EET_T_UCHAR, EET_G_VAR_ARRAY, + (char *)(&(eroc.edid)) - (char *)(&(eroc)), + (char *)(&(eroc.edid_count)) - + (char *)(&(eroc)), NULL, NULL); + eet_data_descriptor_element_add(D, "clones", EET_T_UINT, EET_G_VAR_ARRAY, + (char *)(&(eroc.clones)) - (char *)(&(eroc)), + (char *)(&(eroc.clone_count)) - + (char *)(&(eroc)), NULL, NULL); + E_CONFIG_VAL(D, T, connected, UCHAR); + E_CONFIG_VAL(D, T, exists, UCHAR); + + /* define edd for crtc config */ + _e_randr_crtc_edd = + E_CONFIG_DD_NEW("E_Randr_Crtc_Config", E_Randr_Crtc_Config); +#undef T +#undef D +#define T E_Randr_Crtc_Config +#define D _e_randr_crtc_edd + E_CONFIG_VAL(D, T, xid, UINT); + E_CONFIG_VAL(D, T, x, INT); + E_CONFIG_VAL(D, T, y, INT); + E_CONFIG_VAL(D, T, width, INT); + E_CONFIG_VAL(D, T, height, INT); + E_CONFIG_VAL(D, T, orient, UINT); + E_CONFIG_VAL(D, T, mode, UINT); + E_CONFIG_VAL(D, T, exists, UCHAR); + E_CONFIG_LIST(D, T, outputs, _e_randr_output_edd); + + /* define edd for randr config */ + _e_randr_edd = E_CONFIG_DD_NEW("E_Randr_Config", E_Randr_Config); +#undef T +#undef D +#define T E_Randr_Config +#define D _e_randr_edd + E_CONFIG_VAL(D, T, version, INT); + E_CONFIG_VAL(D, T, screen.width, INT); + E_CONFIG_VAL(D, T, screen.height, INT); + E_CONFIG_LIST(D, T, crtcs, _e_randr_crtc_edd); + E_CONFIG_VAL(D, T, restore, UCHAR); + E_CONFIG_VAL(D, T, poll_interval, INT); + E_CONFIG_VAL(D, T, config_timestamp, ULL); + E_CONFIG_VAL(D, T, primary, INT); + + /* try to load the randr config */ + if ((e_randr_cfg = e_config_domain_load("e_randr", _e_randr_edd))) + { + /* check randr config version */ + if (e_randr_cfg->version < (E_RANDR_CONFIG_FILE_EPOCH * 1000000)) + { + /* config is too old */ + do_restore = EINA_FALSE; + _e_randr_config_free(); + ecore_timer_add(1.0, _e_randr_config_cb_timer, + _("Settings data needed upgrading. Your old settings have<br>" + "been wiped and a new set of defaults initialized. This<br>" + "will happen regularly during development, so don't report a<br>" + "bug. This simply means Enlightenment needs new settings<br>" + "data by default for usable functionality that your old<br>" + "settings simply lack. This new set of defaults will fix<br>" + "that by adding it in. You can re-configure things now to your<br>" + "liking. Sorry for the hiccup in your settings.<br>")); + } + else if (e_randr_cfg->version > E_RANDR_CONFIG_FILE_VERSION) + { + /* config is too new */ + do_restore = EINA_FALSE; + _e_randr_config_free(); + ecore_timer_add(1.0, _e_randr_config_cb_timer, + _("Your settings are NEWER than Enlightenment. This is very<br>" + "strange. This should not happen unless you downgraded<br>" + "Enlightenment or copied the settings from a place where<br>" + "a newer version of Enlightenment was running. This is bad and<br>" + "as a precaution your settings have been now restored to<br>" + "defaults. Sorry for the inconvenience.<br>")); + } + } + + /* if config was too old or too new, then reload a fresh one */ + if (!e_randr_cfg) + { + do_restore = EINA_FALSE; + _e_randr_config_new(); + } + + /* e_randr_config_new could return without actually creating a new config */ + if (!e_randr_cfg) return EINA_FALSE; + + if ((do_restore) && (e_randr_cfg->restore)) + _e_randr_config_restore(); + + return EINA_TRUE; +} + +static void +_e_randr_config_new(void) +{ + Ecore_X_Window root = 0; + Ecore_X_Randr_Crtc *crtcs = NULL; + int ncrtcs = 0, i = 0; + + /* create new randr cfg */ + if (!(e_randr_cfg = E_NEW(E_Randr_Config, 1))) + return; + + /* set version */ + e_randr_cfg->version = E_RANDR_CONFIG_FILE_VERSION; + + /* by default, restore config */ + e_randr_cfg->restore = EINA_TRUE; + + /* by default, use 4 sec poll interval */ + e_randr_cfg->poll_interval = 32; + + /* grab the root window once */ + root = ecore_x_window_root_first_get(); + + /* get which output is primary */ + e_randr_cfg->primary = ecore_x_randr_primary_output_get(root); + + /* record the current screen size in our config */ + ecore_x_randr_screen_current_size_get(root, &e_randr_cfg->screen.width, + &e_randr_cfg->screen.height, + NULL, NULL); + + /* try to get the list of crtcs from x */ + if ((crtcs = ecore_x_randr_crtcs_get(root, &ncrtcs))) + { + /* loop the crtcs */ + for (i = 0; i < ncrtcs; i++) + { + E_Randr_Crtc_Config *crtc_cfg = NULL; + Ecore_X_Randr_Output *outputs = NULL; + int noutputs = 0; + + /* try to create new crtc config */ + if (!(crtc_cfg = E_NEW(E_Randr_Crtc_Config, 1))) + continue; + + /* assign the xid */ + crtc_cfg->xid = crtcs[i]; + crtc_cfg->exists = EINA_TRUE; + + /* fill in crtc_cfg values from X */ + _e_randr_config_crtc_update(crtc_cfg); + + /* try to get any outputs on this crtc */ + if ((outputs = + ecore_x_randr_crtc_outputs_get(root, crtcs[i], &noutputs))) + { + int j = 0; + + for (j = 0; j < noutputs; j++) + { + E_Randr_Output_Config *output_cfg = NULL; + + /* try to create new output config */ + if (!(output_cfg = _e_randr_config_output_new(outputs[j]))) + continue; + + /* assign crtc for this output */ + output_cfg->crtc = crtcs[i]; + output_cfg->exists = EINA_TRUE; + if ((e_randr_cfg->primary) && + ((int)outputs[j] == e_randr_cfg->primary)) + output_cfg->primary = EINA_TRUE; + + if (!e_randr_cfg->primary) + { + /* X has no primary output set */ + if (j == 0) + { + /* if no primary is set, then we should + * use the first output listed by xrandr */ + output_cfg->primary = EINA_TRUE; + e_randr_cfg->primary = (int)outputs[j]; + + ecore_x_randr_primary_output_set(root, + e_randr_cfg->primary); + } + } + + /* add this output to the list for this crtc */ + crtc_cfg->outputs = + eina_list_append(crtc_cfg->outputs, output_cfg); + } + + free(outputs); + } + + /* append this crtc config to randr config */ + e_randr_cfg->crtcs = + eina_list_append(e_randr_cfg->crtcs, crtc_cfg); + } + + free(crtcs); + } + + /* update recorded config timestamp */ + e_randr_cfg->config_timestamp = ecore_x_randr_config_timestamp_get(root); + + /* set limits */ + E_CONFIG_LIMIT(e_randr_cfg->poll_interval, 1, 1024); + + /* save the new config */ + e_randr_config_save(); } -static Eina_Bool -_init(void) +static void +_e_randr_config_free(void) { - if (!e_randr_screen_info_refresh()) - return EINA_FALSE; - _event_listeners_add(); + E_Randr_Crtc_Config *crtc = NULL; + + /* safety check */ + if (!e_randr_cfg) return; - if (e_config->randr_serialized_setup) + /* loop the config crtcs and free them */ + EINA_LIST_FREE(e_randr_cfg->crtcs, crtc) { - e_randr_try_restore_configuration(); + E_Randr_Output_Config *output = NULL; - if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) + /* loop the config outputs on this crtc and free them */ + EINA_LIST_FREE(crtc->outputs, output) { - if (e_config->randr_serialized_setup->outputs_policies) - _12_policies_restore(); + if (output->clones) free(output->clones); + if (output->edid) free(output->edid); + + E_FREE(output); } + + E_FREE(crtc); } - return EINA_TRUE; + /* free the config */ + E_FREE(e_randr_cfg); +} + +static Eina_Bool +_e_randr_config_cb_timer(void *data) +{ + e_util_dialog_show(_("Randr Settings Upgraded"), "%s", (char *)data); + return EINA_FALSE; +} + +static void +_e_randr_config_restore(void) +{ + Ecore_X_Window root = 0; + Ecore_X_Randr_Crtc *crtcs; + /* Ecore_X_Randr_Output primary = 0; */ + int ncrtcs = 0; + int sw = 0, sh = 0, cw = 0, ch = 0; + + printf("E_RANDR CONFIG RESTORE\n"); + + /* grab the X server so that we can apply settings without triggering + * any randr event updates until we are done */ + ecore_x_grab(); + + /* get existing primary output */ + /* primary = ecore_x_randr_primary_output_get(root); */ + + /* get existing screen size */ + ecore_x_randr_screen_current_size_get(root, &cw, &ch, NULL, NULL); + + /* calculate new screen size */ + _e_randr_config_screen_size_calculate(&sw, &sh); + printf("\tCalculated Screen Size: %d %d\n", sw, sh); + + /* get the root window */ + root = ecore_x_window_root_first_get(); + + /* get a list of crtcs from X */ + if ((crtcs = ecore_x_randr_crtcs_get(root, &ncrtcs))) + { + Ecore_X_Randr_Output *outputs; + int c = 0, noutputs = 0; + + /* loop the X crtcs */ + for (c = 0; c < ncrtcs; c++) + { + E_Randr_Crtc_Config *cfg; + Evas_Coord x = 0, y = 0, w = 0, h = 0; + Ecore_X_Randr_Mode mode = 0; + Ecore_X_Randr_Orientation orient = + ECORE_X_RANDR_ORIENTATION_ROT_0; + Eina_Rectangle rect; + + /* Firstly, disable any crtcs which are disabled in our config OR + * which are larger than the target size */ + + /* try to find this crtc in our config */ + if ((cfg = _e_randr_config_crtc_find(crtcs[c]))) + { + x = cfg->x; + y = cfg->y; + w = cfg->width; + h = cfg->height; + mode = cfg->mode; + orient = cfg->orient; + } + else + { + /* this crtc is not in our config. get values from X */ +#if ((ECORE_VERSION_MAJOR >= 1) && (ECORE_VERSION_MINOR >= 8)) + Ecore_X_Randr_Crtc_Info *cinfo; + + /* get crtc info from X */ + if ((cinfo = ecore_x_randr_crtc_info_get(root, crtcs[c]))) + { + x = cinfo->x; + y = cinfo->y; + w = cinfo->width; + h = cinfo->height; + mode = cinfo->mode; + orient = cinfo->rotation; + + ecore_x_randr_crtc_info_free(cinfo); + } +#else + /* get geometry of this crtc */ + ecore_x_randr_crtc_geometry_get(root, crtcs[c], + &x, &y, &w, &h); + + /* get mode */ + mode = ecore_x_randr_crtc_mode_get(root, crtcs[c]); + + /* get orientation */ + orient = ecore_x_randr_crtc_orientation_get(root, crtcs[c]); +#endif + } + + /* at this point, we should have geometry, mode and orientation. + * We can now proceed to calculate crtc size */ + _e_randr_config_mode_geometry(mode, orient, &rect); + + x += rect.x; + y += rect.y; + w = rect.w; + h = rect.h; + + /* if it fits within the screen and is "enabled", skip it */ + if (((x + w) <= sw) && ((y + h) <= sh) && (mode != 0)) + continue; + + /* it does not fit or disabled in our config. disable it in X */ + ecore_x_randr_crtc_settings_set(root, crtcs[c], NULL, 0, 0, 0, 0, + ECORE_X_RANDR_ORIENTATION_ROT_0); + } + + /* apply the new screen size */ + if ((sw != cw) || (sh != ch)) + ecore_x_randr_screen_current_size_set(root, sw, sh, -1, -1); + + /* apply any stored crtc settings */ + for (c = 0; c < ncrtcs; c++) + { + E_Randr_Crtc_Config *cfg; + + /* try to find this crtc in our config */ + if ((cfg = _e_randr_config_crtc_find(crtcs[c]))) + { + Eina_List *l, *valid = NULL; + E_Randr_Output_Config *output_cfg; + Ecore_X_Randr_Output *coutputs; + int count = 0; + + /* loop any outputs in this crtc cfg */ + EINA_LIST_FOREACH(cfg->outputs, l, output_cfg) + { + Ecore_X_Randr_Connection_Status status = + ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN; + + /* get connection status */ + status = + ecore_x_randr_output_connection_status_get(root, + output_cfg->xid); + + /* skip this output if it is not connected */ + if (status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) + continue; + + /* append to the list of valid outputs */ + valid = eina_list_append(valid, output_cfg); + } + + count = eina_list_count(valid); + + /* try to allocate space for x randr outputs */ + if ((coutputs = calloc(count, sizeof(Ecore_X_Randr_Output)))) + { + int o = 0; + + /* for each entry in valid outputs, place in X list */ + EINA_LIST_FOREACH(valid, l, output_cfg) + { + coutputs[o] = output_cfg->xid; + o++; + } + + } + + /* apply our stored crtc settings */ + ecore_x_randr_crtc_settings_set(root, crtcs[c], coutputs, + count, cfg->x, cfg->y, + cfg->mode, cfg->orient); + + /* cleanup */ + eina_list_free(valid); + free(coutputs); + } + } + + /* free list of crtcs */ + free(crtcs); + + /* apply primary if we have one set */ + if (e_randr_cfg->primary) + { + Eina_Bool primary_set = EINA_FALSE; + + /* get list of valid outputs */ + if ((outputs = ecore_x_randr_outputs_get(root, &noutputs))) + { + /* loop valid outputs and check that our primary exists */ + for (c = 0; c < noutputs; c++) + { + Ecore_X_Randr_Connection_Status status = + ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN; + + /* skip if this output is not one we are looking for */ + if ((int)outputs[c] != e_randr_cfg->primary) + continue; + + /* check that this output is actually connected */ + status = + ecore_x_randr_output_connection_status_get(root, + outputs[c]); + + /* if it is actually connected, set primary */ + if (status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) + { + ecore_x_randr_primary_output_set(root, outputs[c]); + primary_set = EINA_TRUE; + break; + } + } + + /* free list of outputs */ + free(outputs); + } + + /* fallback to no primary */ + if (!primary_set) + ecore_x_randr_primary_output_set(root, 0); + } + else + ecore_x_randr_primary_output_set(root, 0); + } + + /* release the server grab */ + ecore_x_ungrab(); +} + +static Eina_Bool +_e_randr_event_cb_screen_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) +{ + Ecore_X_Event_Screen_Change *ev; + Eina_Bool changed = EINA_FALSE; + Ecore_X_Randr_Output primary = 0; + + ev = event; + + printf("E_RANDR Event: Screen Change: %d %d\n", + ev->size.width, ev->size.height); + + /* check if this event's root window is Our root window */ + if (ev->root != e_manager_current_get()->root) + return ECORE_CALLBACK_RENEW; + + primary = ecore_x_randr_primary_output_get(ev->root); + + if (e_randr_cfg->primary != (int)primary) + { + e_randr_cfg->primary = (int)primary; + changed = EINA_TRUE; + } + + if (e_randr_cfg->screen.width != ev->size.width) + { + printf("\tWidth Changed\n"); + e_randr_cfg->screen.width = ev->size.width; + changed = EINA_TRUE; + } + + if (e_randr_cfg->screen.height != ev->size.height) + { + printf("\tHeight Changed\n"); + e_randr_cfg->screen.height = ev->size.height; + changed = EINA_TRUE; + } + + if (e_randr_cfg->config_timestamp != ev->config_time) + { + printf("\tConfig Timestamp Changed\n"); + e_randr_cfg->config_timestamp = ev->config_time; + changed = EINA_TRUE; + } + + if (changed) e_randr_config_save(); + + return ECORE_CALLBACK_RENEW; +} + +static Eina_Bool +_e_randr_event_cb_crtc_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) +{ + Ecore_X_Event_Randr_Crtc_Change *ev; + Eina_List *l = NULL; + E_Randr_Crtc_Config *crtc_cfg; + Eina_Bool crtc_new = EINA_FALSE; + Eina_Bool crtc_found = EINA_FALSE; + Eina_Bool crtc_changed = EINA_FALSE; + + ev = event; + + /* loop our crtc configs and try to find this one */ + EINA_LIST_FOREACH(e_randr_cfg->crtcs, l, crtc_cfg) + { + /* skip if not this crtc */ + if (crtc_cfg->xid != ev->crtc) continue; + + crtc_found = EINA_TRUE; + break; + } + + if (!crtc_found) + { + /* if this crtc is not found in our config, create it */ + if ((crtc_cfg = E_NEW(E_Randr_Crtc_Config, 1))) + { + /* assign id */ + crtc_cfg->xid = ev->crtc; + crtc_cfg->exists = EINA_TRUE; + + crtc_new = EINA_TRUE; + + /* append to randr cfg */ + e_randr_cfg->crtcs = + eina_list_append(e_randr_cfg->crtcs, crtc_cfg); + } + } + + /* check (and update if needed) our crtc config + * NB: This will fill in any new ones also */ + crtc_changed = _e_randr_config_crtc_update(crtc_cfg); + + /* save the config if anything changed or we added a new one */ + if ((crtc_changed) || (crtc_new)) + { + printf("E_RANDR Event: Crtc Change\n"); + printf("\tCrtc: %d Changed or New. Saving Config\n", ev->crtc); + e_randr_config_save(); + } + + return ECORE_CALLBACK_RENEW; } -static void -_shutdown(void) +static Eina_Bool +_e_randr_event_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { - if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) + Ecore_X_Event_Randr_Output_Change *ev; + Eina_List *l = NULL; + E_Randr_Crtc_Config *crtc_cfg; + E_Randr_Output_Config *output_cfg; + Eina_Bool output_new = EINA_FALSE; + Eina_Bool output_found = EINA_FALSE; + Eina_Bool output_changed = EINA_FALSE; + Eina_Bool output_removed = EINA_FALSE; + + ev = event; + + /* check if this event's root window is Our root window */ + if (ev->win != e_manager_current_get()->root) + return ECORE_CALLBACK_RENEW; + + printf("E_RANDR Event: Output Change\n"); + printf("\tOutput: %d\n", ev->output); + + if (ev->crtc) + printf("\t\tCrtc: %lu\n", (unsigned long)ev->crtc); + else + printf("\t\tNo Crtc\n"); + + printf("\t\tMode: %d\n", ev->mode); + + if (ev->connection == 0) + printf("\t\tOutput Connected\n"); + else if (ev->connection == 1) + printf("\t\tOutput Disconnected\n"); + + /* loop our crtcs and try to find this output */ + printf("\tLooping Our Crtc Configs\n"); + EINA_LIST_FOREACH(e_randr_cfg->crtcs, l, crtc_cfg) { - _11_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_11); - e_randr_screen_info.rrvd_info.randr_info_11 = NULL; + Eina_List *ll; + + /* loop the outputs in our crtc cfg and try to find this one */ + printf("\t\tLooping Our Output Configs on this Crtc: %d\n", crtc_cfg->xid); + EINA_LIST_FOREACH(crtc_cfg->outputs, ll, output_cfg) + { + /* try to find this output */ + if (output_cfg->xid != ev->output) continue; + + /* FIXME: NB: Hmmm, we may need to also compare edids here (not just X id) */ + + printf("\t\t\tFound Output %d on Crtc: %d\n", output_cfg->xid, output_cfg->crtc); + output_found = EINA_TRUE; + + /* is this output still on the same crtc ? */ + if (output_cfg->crtc != ev->crtc) + { + printf("\t\t\t\tOutput Moved Crtc or Removed\n"); + + /* if event crtc is 0, then this output is not assigned to any crtc, + * so we need to remove it from any existing crtc_cfg Outputs. + * + * NB: In a typical scenario, we would remove and free this output cfg, + * HOWEVER we will NOT do that here. Reasoning is that if someone + * replugs this output, we can restore any saved config. + * + * NB: Do not call _e_randr_config_output_update in this case as that will + * overwrite any of our saved config + * + * So for now, just disable it in config by setting exists == FALSE */ + if (!ev->crtc) + { + /* free this output_cfg */ + /* if (output_cfg->clones) free(output_cfg->clones); */ + /* if (output_cfg->edid) free(output_cfg->edid); */ + /* E_FREE(output_cfg); */ + + /* remove from this crtc */ + /* crtc_cfg->outputs = eina_list_remove_list(crtc_cfg->outputs, ll); */ + + /* just mark it as not existing */ + output_cfg->exists = EINA_FALSE; + + /* set flag */ + output_removed = EINA_TRUE; + } + else + { + /* output moved to new crtc */ + printf("\t\t\tOutput Moved to New Crtc\n"); + } + } + else + { + printf("\t\t\t\tOutput On Same Crtc\n"); + + /* check (and update if needed) our output config */ + output_changed = _e_randr_config_output_update(output_cfg); + } + + if (output_found) break; + } + + if (output_found) break; } - else if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) + + /* if the output was not found above, and it is plugged in, + * then we need to create a new one */ + if ((!output_found) && (ev->connection == 0)) { - _12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12); - e_randr_screen_info.rrvd_info.randr_info_12 = NULL; + printf("\tOutput Not Found In Config: %d\n", ev->output); + printf("\t\tCreate New Output Config\n"); + + if ((output_cfg = _e_randr_config_output_new(ev->output))) + { + output_new = EINA_TRUE; + + /* since this is a new output cfg, the above + * output_update function (inside new) will set 'exists' to false + * because no crtc has been assigned yet. + * + * We need to find a valid crtc for this output and set the + * 'crtc' and 'exists' properties */ + if ((crtc_cfg = _e_randr_config_output_crtc_find(output_cfg))) + { + Ecore_X_Randr_Mode mode; + int ocount, c = 0; + + /* we found a valid crtc for this output */ + output_cfg->crtc = crtc_cfg->xid; + output_cfg->exists = (output_cfg->crtc != 0); + + printf("\t\t\tOutput Crtc Is: %d\n", output_cfg->crtc); + + /* get the preferred mode for this output */ + if ((mode = _e_randr_config_output_preferred_mode_get(output_cfg))) + { + Evas_Coord mw = 0, mh = 0; + + /* get the size of this mode */ + ecore_x_randr_mode_size_get(ev->win, mode, &mw, &mh); + + /* update crtc config with this mode info */ + crtc_cfg->mode = mode; + crtc_cfg->width = mw; + crtc_cfg->height = mh; + } + + /* append this output_cfg to the crtc_cfg list of outputs */ + crtc_cfg->outputs = + eina_list_append(crtc_cfg->outputs, output_cfg); + + /* tell X about this new output */ + ocount = eina_list_count(crtc_cfg->outputs); + printf("\tNum Outputs: %d\n", ocount); + + if (ocount > 0) + { + Ecore_X_Randr_Output *couts; + Eina_List *o; + E_Randr_Output_Config *out; + + couts = malloc(ocount * sizeof(Ecore_X_Randr_Output)); + EINA_LIST_FOREACH(crtc_cfg->outputs, o, out) + { + couts[c] = out->xid; + c++; + } + + printf("\tCrtc Settings: %d %d %d %d\n", crtc_cfg->xid, + crtc_cfg->x, crtc_cfg->y, crtc_cfg->mode); + + ecore_x_randr_crtc_settings_set(ev->win, crtc_cfg->xid, + couts, ocount, + crtc_cfg->x, + crtc_cfg->y, + crtc_cfg->mode, + crtc_cfg->orient); + free(couts); + } + } + } + } + + /* save the config if anything changed or we added a new one */ + if ((output_changed) || (output_new) || (output_removed)) + { + printf("\t\t\t\tOutput Changed, Added, or Removed. Saving Config\n"); + e_randr_config_save(); } - _event_listeners_remove(); + + /* if we added or removed any outputs, we need to reset */ + if ((output_new) || (output_removed)) + ecore_x_randr_screen_reset(ev->win); + + return ECORE_CALLBACK_RENEW; } +/* This function compares our crtc config against what X has and updates our + * view of this crtc. It returns EINA_TRUE is anything changed + * + * NB: This Does Not Handle Outputs on the Crtc.*/ +static Eina_Bool +_e_randr_config_crtc_update(E_Randr_Crtc_Config *cfg) +{ + Ecore_X_Window root = 0; + Eina_Bool ret = EINA_FALSE; + + /* grab the root window */ + root = ecore_x_window_root_first_get(); + + Ecore_X_Randr_Crtc_Info *cinfo; + + /* get crtc info from X */ + if ((cinfo = ecore_x_randr_crtc_info_get(root, cfg->xid))) + { + /* check for changes */ + if ((cfg->x != cinfo->x) || (cfg->y != cinfo->y) || + (cfg->width != (int)cinfo->width) || (cfg->height != (int)cinfo->height) || + (cfg->mode != cinfo->mode) || (cfg->orient != cinfo->rotation)) + { + cfg->x = cinfo->x; + cfg->y = cinfo->y; + cfg->width = cinfo->width; + cfg->height = cinfo->height; + cfg->mode = cinfo->mode; + cfg->orient = cinfo->rotation; + + ret = EINA_TRUE; + } + + ecore_x_randr_crtc_info_free(cinfo); + } + return ret; +} -/** - * @return EINA_TRUE if info could be refreshed, else EINA_FALSE - */ -static Eina_Bool -_screen_info_refresh(void) +static Eina_Bool +_e_randr_config_output_update(E_Randr_Output_Config *cfg) { - Ecore_X_Window *roots; - Ecore_X_Window root; - int n; + Ecore_X_Window root = 0; + Eina_Bool ret = EINA_FALSE; + Ecore_X_Randr_Output primary = 0; + Ecore_X_Randr_Crtc crtc; + Ecore_X_Randr_Connection_Status status; + /* int clone_count = 0; */ - EINA_SAFETY_ON_FALSE_RETURN_VAL(ecore_x_randr_query(), EINA_FALSE); + /* grab the root window */ + root = ecore_x_window_root_first_get(); - if (!(roots = ecore_x_window_root_list(&n))) return EINA_FALSE; - /* first (and only) root window */ - root = roots[0]; - free(roots); + /* get which output is primary */ + primary = ecore_x_randr_primary_output_get(root); - e_randr_screen_info.randr_version = ecore_x_randr_version_get(); - e_randr_screen_info.root = root; - e_randr_screen_info.rrvd_info.randr_info_11 = NULL; + /* set this output policy */ + cfg->policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE; - // Value set/retrieval helper functions - if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) + /* get if this output is the primary */ + if (cfg->primary != ((cfg->xid == primary))) { - return _11_screen_info_refresh(); + cfg->primary = ((cfg->xid == primary)); + ret = EINA_TRUE; } - else if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) + + /* get the crtc for this output */ + crtc = ecore_x_randr_output_crtc_get(root, cfg->xid); + if (cfg->crtc != crtc) { - return _12_screen_info_refresh(); + cfg->crtc = crtc; + ret = EINA_TRUE; } - return EINA_FALSE; + /* does it exist in X ?? */ + if (cfg->exists != (crtc != 0)) + { + cfg->exists = (crtc != 0); + ret = EINA_TRUE; + } + + /* record the edid for this output */ + /* cfg->edid = ecore_x_randr_output_edid_get(root, cfg->xid, &cfg->edid_count); */ + + /* get the clones for this output */ + /* cfg->clones = */ + /* ecore_x_randr_output_clones_get(root, cfg->xid, &clone_count); */ + /* cfg->clone_count = (unsigned long)clone_count; */ + + status = ecore_x_randr_output_connection_status_get(root, cfg->xid); + if (cfg->connected != (status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)) + { + cfg->connected = (status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED); + ret = EINA_TRUE; + } + + return ret; } -static Eina_Bool -_e_event_config_loaded_cb(void *data __UNUSED__, int type, void *ev __UNUSED__) +static E_Randr_Crtc_Config * +_e_randr_config_output_crtc_find(E_Randr_Output_Config *cfg) { - if (type != E_EVENT_CONFIG_LOADED) return EINA_TRUE; + Ecore_X_Window root = 0; + E_Randr_Crtc_Config *crtc_cfg = NULL; + Ecore_X_Randr_Crtc *possible; + int num = 0, i = 0; + Eina_List *l; + Eina_Bool crtc_found = EINA_FALSE; + + /* grab the root window */ + root = ecore_x_window_root_first_get(); + + /* get a list of possible crtcs for this output */ + if (!(possible = + ecore_x_randr_output_possible_crtcs_get(root, cfg->xid, &num))) + return NULL; - return e_randr_try_restore_configuration(); + if (num == 0) + { + if (possible) free(possible); + return NULL; + } + + /* loop the possible crtcs */ + for (i = 0; i < num; i++) + { + /* loop our crtc configs and try to find this one */ + EINA_LIST_FOREACH(e_randr_cfg->crtcs, l, crtc_cfg) + { + /* skip if not the one we are looking for */ + if (crtc_cfg->xid != possible[i]) continue; + + /* check if this crtc already has outputs assigned. + * skip if it does because we are trying to find a free crtc */ + if (eina_list_count(crtc_cfg->outputs) > 0) continue; + + crtc_found = EINA_TRUE; + break; + } + + if (crtc_found) break; + } + + free(possible); + + if (crtc_found) return crtc_cfg; + + return NULL; +} + +static Ecore_X_Randr_Mode +_e_randr_config_output_preferred_mode_get(E_Randr_Output_Config *cfg) +{ + Ecore_X_Window root = 0; + Ecore_X_Randr_Mode *modes; + Ecore_X_Randr_Mode mode; + int n = 0, p = 0; + + /* grab the root window */ + root = ecore_x_window_root_first_get(); + + /* get the list of modes for this output */ + if (!(modes = ecore_x_randr_output_modes_get(root, cfg->xid, &n, &p))) + return 0; + + if (n == 0) + { + if (modes) free(modes); + return 0; + } + + mode = modes[p - 1]; + free(modes); + + return mode; +} + +static E_Randr_Output_Config * +_e_randr_config_output_new(unsigned int id) +{ + E_Randr_Output_Config *cfg = NULL; + + if ((cfg = E_NEW(E_Randr_Output_Config, 1))) + { + /* assign output xid */ + cfg->xid = id; + + /* check (and update if needed) our output config */ + _e_randr_config_output_update(cfg); + } + + return cfg; +} + +static E_Randr_Crtc_Config * +_e_randr_config_crtc_find(Ecore_X_Randr_Crtc crtc) +{ + Eina_List *l; + E_Randr_Crtc_Config *crtc_cfg; + + EINA_LIST_FOREACH(e_randr_cfg->crtcs, l, crtc_cfg) + { + if (crtc_cfg->xid == crtc) + return crtc_cfg; + } + + return NULL; +} + +static E_Randr_Output_Config * +_e_randr_config_output_find(Ecore_X_Randr_Output output) +{ + Eina_List *l; + E_Randr_Crtc_Config *crtc_cfg; + E_Randr_Output_Config *output_cfg; + + EINA_LIST_FOREACH(e_randr_cfg->crtcs, l, crtc_cfg) + { + Eina_List *ll; + + EINA_LIST_FOREACH(crtc_cfg->outputs, ll, output_cfg) + { + if (output_cfg->xid == output) + return output_cfg; + } + } + + return NULL; } -static void -_event_listeners_add(void) +static void +_e_randr_config_screen_size_calculate(int *sw, int *sh) { - _event_handlers = eina_list_append(_event_handlers, ecore_event_handler_add(E_EVENT_CONFIG_LOADED, _e_event_config_loaded_cb, NULL)); + Ecore_X_Window root = 0; + Ecore_X_Randr_Output *outputs; + int noutputs = 0; + int minw = 0, minh = 0; + int maxw = 0, maxh = 0; + + /* get the root window */ + root = ecore_x_window_root_first_get(); + + /* get the min and max screen size */ + ecore_x_randr_screen_size_range_get(root, &minw, &minh, &maxw, &maxh); + + /* get outputs from X */ + if ((outputs = ecore_x_randr_outputs_get(root, &noutputs))) + { + int i = 0; + + /* loop X outputs */ + for (i = 0; i < noutputs; i++) + { + E_Randr_Output_Config *output_cfg; + Ecore_X_Randr_Connection_Status status = + ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN; + Ecore_X_Randr_Orientation orient = + ECORE_X_RANDR_ORIENTATION_ROT_0; + Ecore_X_Randr_Mode mode = 0; + int x = 0, y = 0, w = 0, h = 0; + Eina_Rectangle rect; + + /* get connection status */ + status = + ecore_x_randr_output_connection_status_get(root, outputs[i]); + + /* skip this output if it is not connected */ + if (status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) + continue; + + /* see if we have this output in our config */ + if ((output_cfg = _e_randr_config_output_find(outputs[i]))) + { + E_Randr_Crtc_Config *crtc_cfg; + + /* try to find the crtc config for this output */ + if ((crtc_cfg = _e_randr_config_crtc_find(output_cfg->crtc))) + { + /* if this crtc is disabled in our config, skip it + * + * NB: Since we will end up disabling this crtc, then + * we should not use it to calculate screen size */ + if (!crtc_cfg->mode) continue; + + /* get geometry and mode */ + x = crtc_cfg->x; + y = crtc_cfg->y; + w = crtc_cfg->width; + h = crtc_cfg->height; + mode = crtc_cfg->mode; + orient = crtc_cfg->orient; + } + } + + /* if we have no config for this output. get values from X */ + if ((!w) || (!h)) + { + Ecore_X_Randr_Crtc crtc = 0; + + crtc = ecore_x_randr_output_crtc_get(root, outputs[i]); + +#if ((ECORE_VERSION_MAJOR >= 1) && (ECORE_VERSION_MINOR >= 8)) + Ecore_X_Randr_Crtc_Info *cinfo; + + /* get crtc info from X */ + if ((cinfo = ecore_x_randr_crtc_info_get(root, crtc))) + { + x = cinfo->x; + y = cinfo->y; + w = cinfo->width; + h = cinfo->height; + mode = cinfo->mode; + orient = cinfo->rotation; + + ecore_x_randr_crtc_info_free(cinfo); + } +#else + /* get geometry of this crtc */ + ecore_x_randr_crtc_geometry_get(root, crtc, &x, &y, &w, &h); + + /* get mode */ + mode = ecore_x_randr_crtc_mode_get(root, crtc); - if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) + /* get orientation */ + orient = ecore_x_randr_crtc_orientation_get(root, crtc); +#endif + } + + /* at this point, we should have geometry, mode and orientation. + * We can now proceed to calculate screen size */ + + _e_randr_config_mode_geometry(mode, orient, &rect); + + x += rect.x; + y += rect.y; + w = rect.w; + h = rect.h; + + if ((x + w) > *sw) + *sw = (x + w); + if ((y + h) > *sh) + *sh = (y + h); + } + + /* free any space allocated */ + free(outputs); + } + + if ((*sw > maxw) || (*sh > maxh)) + { + printf("Calculated Screen Size %dx%d is Larger Than Max %dx%d!!!\n", + *sw, *sh, maxw, maxh); + } + else { - _12_event_listeners_add(); + if (*sw < minw) *sw = minw; + if (*sh < minh) *sh = minh; } } -// "Free" helper functions -static void -_event_listeners_remove(void) +static void +_e_randr_config_mode_geometry(Ecore_X_Randr_Mode mode, Ecore_X_Randr_Orientation orient, Eina_Rectangle *rect) { - Ecore_Event_Handler *_event_handler = NULL; - EINA_LIST_FREE (_event_handlers, _event_handler) - ecore_event_handler_del(_event_handler); + Ecore_X_Window root = 0; + Evas_Point p[4]; + int mw = 0, mh = 0; + int mode_width = 0, mode_height = 0; + int i = 0; + Eina_Rectangle tmp; - if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) + /* get the root window */ + root = ecore_x_window_root_first_get(); + + /* get the size of this mode */ + ecore_x_randr_mode_size_get(root, mode, &mode_width, &mode_height); + + /* based on orientation, calculate mode sizes */ + switch (orient) + { + case ECORE_X_RANDR_ORIENTATION_ROT_0: + case ECORE_X_RANDR_ORIENTATION_ROT_180: + mw = mode_width; + mh = mode_height; + break; + case ECORE_X_RANDR_ORIENTATION_ROT_90: + case ECORE_X_RANDR_ORIENTATION_ROT_270: + mw = mode_height; + mh = mode_width; + break; + default: + break; + } + + p[0].x = 0; + p[0].y = 0; + p[1].x = mw; + p[1].y = 0; + p[2].x = mw; + p[2].y = mh; + p[3].x = 0; + p[3].y = mh; + + for (i = 0; i < 4; i++) { - _12_event_listeners_remove(); + double x = 0.0, y = 0.0; + + x = p[i].x; + y = p[i].y; + + eina_rectangle_coords_from(&tmp, floor(x), floor(y), ceil(x), ceil(y)); + if (i == 0) + *rect = tmp; + else + { + if (tmp.x < rect->x) rect->x = tmp.x; + if (tmp.y < rect->y) rect->y = tmp.y; + if (tmp.w > rect->w) rect->w = tmp.w; + if (tmp.h > rect->h) rect->h = tmp.h; + } } } diff --git a/src/bin/e_randr.h b/src/bin/e_randr.h index 361760e7a6..4bae8ba1ae 100644 --- a/src/bin/e_randr.h +++ b/src/bin/e_randr.h @@ -1,200 +1,70 @@ #ifdef E_TYPEDEFS -typedef struct _E_Randr_Crtc_Info E_Randr_Crtc_Info; -typedef struct _E_Randr_Edid_Hash E_Randr_Edid_Hash; -typedef struct _E_Randr_Monitor_Info E_Randr_Monitor_Info; -typedef struct _E_Randr_Output_Info E_Randr_Output_Info; -typedef struct _E_Randr_Screen_Info_11 E_Randr_Screen_Info_11; -typedef struct _E_Randr_Screen_Info_12 E_Randr_Screen_Info_12; -typedef union _E_Randr_Screen_RRVD_Info E_Randr_Screen_RRVD_Info; -typedef struct _E_Randr_Screen_Info E_Randr_Screen_Info; -typedef struct _E_Randr_Serialized_Output_Policy E_Randr_Serialized_Output_Policy; -typedef struct _E_Randr_Serialized_Output E_Randr_Serialized_Output; -typedef struct _E_Randr_Serialized_Crtc E_Randr_Serialized_Crtc; -typedef struct _E_Randr_Serialized_Setup_11 E_Randr_Serialized_Setup_11; -typedef struct _E_Randr_Serialized_Setup_12 E_Randr_Serialized_Setup_12; -typedef struct _E_Randr_Serialized_Setup E_Randr_Serialized_Setup; - -typedef enum _E_Randr_Configuration_Store_Modifier -{ - E_RANDR_CONFIGURATION_STORE_POLICIES = (1 << 0), - E_RANDR_CONFIGURATION_STORE_RESOLUTIONS = (1 << 1), - E_RANDR_CONFIGURATION_STORE_ARRANGEMENT = (1 << 2), - E_RANDR_CONFIGURATION_STORE_ORIENTATIONS = (1 << 3), - E_RANDR_CONFIGURATION_STORE_ALL = ( - E_RANDR_CONFIGURATION_STORE_POLICIES - | E_RANDR_CONFIGURATION_STORE_RESOLUTIONS - | E_RANDR_CONFIGURATION_STORE_ARRANGEMENT - | E_RANDR_CONFIGURATION_STORE_ORIENTATIONS) -} E_Randr_Configuration_Store_Modifier; +typedef struct _E_Randr_Output_Config E_Randr_Output_Config; +typedef struct _E_Randr_Crtc_Config E_Randr_Crtc_Config; +typedef struct _E_Randr_Config E_Randr_Config; #else -#ifndef E_RANDR_H -#define E_RANDR_H - -struct _E_Randr_Crtc_Info -{ - Ecore_X_Randr_Crtc xid; - Eina_Rectangle geometry; - Eina_Rectangle panning; - Eina_Rectangle tracking; - Eina_Rectangle border; - Ecore_X_Randr_Orientation current_orientation; - Ecore_X_Randr_Orientation orientations; - Ecore_X_Randr_Crtc_Gamma **gamma_ramps; - int gamma_ramp_size; - Eina_List *outputs; - Eina_List *possible_outputs; - Eina_List *outputs_common_modes; - Ecore_X_Randr_Mode_Info *current_mode; -}; - -struct _E_Randr_Edid_Hash -{ - int hash; -}; - -struct _E_Randr_Monitor_Info -{ - Eina_List *modes; - Eina_List *preferred_modes; - Ecore_X_Randr_Screen_Size size_mm; - unsigned char *edid; - unsigned long edid_length; - E_Randr_Edid_Hash edid_hash; - int max_backlight; - double backlight_level; -}; - -struct _E_Randr_Output_Info -{ - Ecore_X_Randr_Output xid; - Eina_Stringshare *name; - int name_length; - E_Randr_Crtc_Info *crtc; - Eina_List *wired_clones; - Ecore_X_Randr_Signal_Format signalformats; - Ecore_X_Randr_Signal_Format signalformat; - int connector_number; - Ecore_X_Randr_Connector_Type connector_type; - Ecore_X_Randr_Connection_Status connection_status; - Ecore_X_Randr_Output_Policy policy; - Eina_List *possible_crtcs; - Eina_List *compatibility_list; - Ecore_X_Render_Subpixel_Order subpixel_order; - /* - * Attached Monitor specific: - */ - E_Randr_Monitor_Info *monitor; -}; - -struct _E_Randr_Screen_Info_11 -{ - Ecore_X_Randr_Screen_Size_MM *sizes; - int nsizes; - int csize_index; - Ecore_X_Randr_Orientation corientation; - Ecore_X_Randr_Orientation orientations; - Ecore_X_Randr_Refresh_Rate **rates; - int *nrates; // size is nsizes - Ecore_X_Randr_Refresh_Rate current_rate; -}; +# ifndef E_RANDR_H +# define E_RANDR_H -struct _E_Randr_Screen_Info_12 -{ - Ecore_X_Randr_Screen_Size min_size; - Ecore_X_Randr_Screen_Size max_size; - Ecore_X_Randr_Screen_Size current_size; - Eina_List *modes; - Eina_List *crtcs; - Eina_List *outputs; - E_Randr_Output_Info *primary_output; - Ecore_X_Randr_Relative_Alignment alignment; -}; +#define E_RANDR_VERSION_1_1 ((1 << 16) | 1) +#define E_RANDR_VERSION_1_2 ((1 << 16) | 2) +#define E_RANDR_VERSION_1_3 ((1 << 16) | 3) +#define E_RANDR_VERSION_1_4 ((1 << 16) | 4) -//RRVD == RandR(R) Version Depended -union _E_Randr_Screen_RRVD_Info -{ - E_Randr_Screen_Info_11 *randr_info_11; - E_Randr_Screen_Info_12 *randr_info_12; -}; +#define E_RANDR_CONFIG_FILE_EPOCH 1 +#define E_RANDR_CONFIG_FILE_GENERATION 3 +#define E_RANDR_CONFIG_FILE_VERSION \ + ((E_RANDR_CONFIG_FILE_EPOCH * 1000000) + E_RANDR_CONFIG_FILE_GENERATION) -struct _E_Randr_Screen_Info +struct _E_Randr_Output_Config { - Ecore_X_Window root; - int randr_version; - E_Randr_Screen_RRVD_Info rrvd_info; + unsigned int xid; // ecore_x_randr output id (xid) + unsigned int crtc; // ecore_x_randr crtc id (xid) + unsigned int policy; // value of the ecore_x_randr_output_policy + unsigned char primary; // flag to indicate if primary output + unsigned long edid_count; // monitor's edid length + unsigned char *edid; // monitor's edid + unsigned int *clones; // array of clones (each element of type ecore_x_randr output id (xid) + unsigned long clone_count; // number of clones + unsigned char connected; // connection status 0 == connected, 1 == disconnected + unsigned char exists; // is this output present in X ? }; -//Following stuff is just for configuration purposes - -struct _E_Randr_Serialized_Output_Policy +struct _E_Randr_Crtc_Config { - Eina_Stringshare *name; - Ecore_X_Randr_Output_Policy policy; + unsigned int xid; // ecore_x_randr crtc id (xid) + int x, y, width, height; // geometry + unsigned int orient; // value of the ecore_x_randr_orientation + unsigned int mode; // ecore_x_randr mode id (xid) + unsigned char exists; // is this crtc present in X ? + Eina_List *outputs; // list of outputs for this crtc }; -struct _E_Randr_Serialized_Output +struct _E_Randr_Config { - Eina_Stringshare *name; - double backlight_level; -}; + int version; // INTERNAL CONFIG VERSION -struct _E_Randr_Serialized_Crtc -{ - int index; - //List of E_Randr_Serialized_Output objects that were used on the same output - Eina_List *outputs; - Evas_Coord_Point pos; - Ecore_X_Randr_Orientation orientation; - //the serialized mode_info - Ecore_X_Randr_Mode_Info *mode_info; -}; + struct + { + int width, height; // geometry + } screen; -struct _E_Randr_Serialized_Setup_12 -{ - double timestamp; - //List of E_Randr_Serialized_Crtc objects Eina_List *crtcs; - /* - * List of E_Randr_Edid_Hash elements of all connected monitors - */ - Eina_List *edid_hashes; -}; - -struct _E_Randr_Serialized_Setup_11 -{ - Ecore_X_Randr_Screen_Size_MM size; - Ecore_X_Randr_Refresh_Rate refresh_rate; - Ecore_X_Randr_Orientation orientation; -}; -struct _E_Randr_Serialized_Setup -{ - E_Randr_Serialized_Setup_11 *serialized_setup_11; - //List of E_Randr_Serialized_Setup_12 objects - Eina_List *serialized_setups_12; - //List of E_Randr_Serialized_Output_Policy objects - Eina_List *outputs_policies; + int poll_interval; + unsigned char restore; + unsigned long config_timestamp; + int primary; }; -EAPI Eina_Bool e_randr_screen_info_refresh(void); -EAPI void e_randr_store_configuration(E_Randr_Configuration_Store_Modifier modifier); -EAPI void e_randr_11_store_configuration(E_Randr_Configuration_Store_Modifier modifier); -EAPI Eina_Bool e_randr_try_restore_configuration(void); - EINTERN Eina_Bool e_randr_init(void); EINTERN int e_randr_shutdown(void); -EINTERN E_Randr_Serialized_Setup *e_randr_serialized_setup_new(void); -EINTERN void e_randr_serialized_setup_free(E_Randr_Serialized_Setup *ss); -EINTERN void e_randr_11_serialized_setup_free(E_Randr_Serialized_Setup_11 *ss_11); -EINTERN void e_randr_12_serialized_setup_free(E_Randr_Serialized_Setup_12 *ss_12); -EINTERN void e_randr_12_serialized_output_policy_free(E_Randr_Serialized_Output_Policy *policy); -EINTERN Eina_Bool e_randr_12_try_enable_output(E_Randr_Output_Info *output_info, Ecore_X_Randr_Output_Policy policy, Eina_Bool force); -EINTERN void e_randr_12_ask_dialog_new(E_Randr_Output_Info *oi); +EAPI Eina_Bool e_randr_config_save(void); -EAPI extern E_Randr_Screen_Info e_randr_screen_info; +extern EAPI E_Randr_Config *e_randr_cfg; -#endif +# endif #endif diff --git a/src/bin/e_randr_11.c b/src/bin/e_randr_11.c deleted file mode 100644 index 2b8192e48e..0000000000 --- a/src/bin/e_randr_11.c +++ /dev/null @@ -1,88 +0,0 @@ -#include "e_randr_private.h" -#include "e_randr.h" - -//New helper functions -/** - * @brief allocate and initialize a new E_Randr_Screen_Info_11 element - * @return E_Randr_Screen_Info_11 elements or in case it could - * not be created and properly initialized, NULL - */ -E_Randr_Screen_Info_11 * -_11_screen_info_new(void) -{ - E_Randr_Screen_Info_11 *randr_info_11 = NULL; - Ecore_X_Randr_Screen_Size_MM *sizes = NULL; - Ecore_X_Randr_Refresh_Rate *rates = NULL; - int i, nsizes; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_11_NO, NULL); - - randr_info_11 = E_NEW(E_Randr_Screen_Info_11, 1); - - randr_info_11->csize_index = Ecore_X_Randr_Unset; - randr_info_11->corientation = Ecore_X_Randr_Unset; - randr_info_11->orientations = Ecore_X_Randr_Unset; - randr_info_11->current_rate = Ecore_X_Randr_Unset; - - if (!(sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info.root, &nsizes))) - goto _info_11_new_fail; - randr_info_11->sizes = sizes, randr_info_11->nsizes = nsizes; - ecore_x_randr_screen_primary_output_current_size_get(e_randr_screen_info.root, NULL, NULL, NULL, NULL, &(randr_info_11->csize_index)); - randr_info_11->corientation = ecore_x_randr_screen_primary_output_orientation_get(e_randr_screen_info.root); - randr_info_11->orientations = ecore_x_randr_screen_primary_output_orientations_get(e_randr_screen_info.root); - randr_info_11->rates = malloc(sizeof(Ecore_X_Randr_Refresh_Rate*) * nsizes); - randr_info_11->nrates = malloc(sizeof(int) * nsizes); - for (i = 0; i < nsizes; i++) - { - if (!(rates = ecore_x_randr_screen_primary_output_refresh_rates_get(e_randr_screen_info.root, i, &randr_info_11->nrates[i]))) - goto _info_11_new_fail; - randr_info_11->rates[i] = rates; - } - randr_info_11->current_rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(e_randr_screen_info.root); - - return randr_info_11; - -_info_11_new_fail: - if (randr_info_11) - { - free(randr_info_11->rates); - free(randr_info_11->nrates); - } - free(sizes); - free(randr_info_11); - return NULL; -} - -//Free helper functions -/** - * @param screen_info the screen info to be freed. - */ -void -_11_screen_info_free(E_Randr_Screen_Info_11 *screen_info) -{ - int x; - - EINA_SAFETY_ON_NULL_RETURN(screen_info); - - for (x = 0; x < screen_info->nsizes; x++) - free(screen_info->rates[x]); - free(screen_info->sizes); - free(screen_info); -} - -/***************************************************************** - * - * Init. and Shutdown code - * - ***************************************************************** - */ -Eina_Bool -_11_screen_info_refresh(void) -{ - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_11_NO, EINA_FALSE); - - _11_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_11); - e_randr_screen_info.rrvd_info.randr_info_11 = _11_screen_info_new(); - - return (e_randr_screen_info.rrvd_info.randr_info_11 != NULL); -} diff --git a/src/bin/e_randr_11_serialization.c b/src/bin/e_randr_11_serialization.c deleted file mode 100644 index 8a2a111957..0000000000 --- a/src/bin/e_randr_11_serialization.c +++ /dev/null @@ -1,139 +0,0 @@ -#include "e_randr_private.h" -#include "e_randr.h" - -/********************************************************************** - * - * Storage/Restorage of setups - * - ********************************************************************** - */ - -//New helper functions - -E_Randr_Serialized_Setup_11 * -_serialized_setup_11_new(void) -{ - E_Randr_Serialized_Setup_11 *ss; - Ecore_X_Randr_Screen_Size_MM *size; - Ecore_X_Randr_Orientation ori = ECORE_X_RANDR_ORIENTATION_ROT_0; - Ecore_X_Randr_Refresh_Rate rate = 0; - - ss = malloc(sizeof(*ss)); - - if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) - { - if (e_randr_screen_info.rrvd_info.randr_info_11->csize_index >= e_randr_screen_info.rrvd_info.randr_info_11->nsizes) goto _serialized_setup_11_new_failed_free_ss; - size = e_randr_screen_info.rrvd_info.randr_info_11->sizes + e_randr_screen_info.rrvd_info.randr_info_11->csize_index; - if (!size) goto _serialized_setup_11_new_failed_free_ss;; - rate = e_randr_screen_info.rrvd_info.randr_info_11->current_rate; - ori = e_randr_screen_info.rrvd_info.randr_info_11->corientation; - ss->size.width = size->width; - ss->size.width_mm = size->width_mm; - ss->size.height = size->height; - ss->size.height_mm = size->height_mm; - } - else if (e_randr_screen_info.randr_version > ECORE_X_RANDR_1_1) - { - ecore_x_randr_screen_primary_output_current_size_get(e_randr_screen_info.root, &ss->size.width, &ss->size.height, &ss->size.width_mm, &ss->size.height_mm, NULL); - rate = ecore_x_randr_screen_primary_output_current_refresh_rate_get(e_randr_screen_info.root); - ori = ecore_x_randr_screen_primary_output_orientation_get(e_randr_screen_info.root); - } - - ss->refresh_rate = rate; - ss->orientation = ori; - - return ss; - -_serialized_setup_11_new_failed_free_ss: - free(ss); - return NULL; -} - -//Update/value set helper functions -E_Randr_Serialized_Setup_11 * -_serialized_setup_11_update(E_Randr_Serialized_Setup_11 *ss_11) -{ - if (ss_11) - e_randr_11_serialized_setup_free(ss_11); - - ss_11 = _serialized_setup_11_new(); - - return ss_11; -} - -void -_11_store_configuration(E_Randr_Configuration_Store_Modifier modifier __UNUSED__) -{ - if (!e_config->randr_serialized_setup) - e_config->randr_serialized_setup = e_randr_serialized_setup_new(); - - if (e_config->randr_serialized_setup->serialized_setup_11) - e_config->randr_serialized_setup->serialized_setup_11 = _serialized_setup_11_update(e_config->randr_serialized_setup->serialized_setup_11); - else - e_config->randr_serialized_setup->serialized_setup_11 = _serialized_setup_11_new(); -} - - -EAPI void e_randr_11_store_configuration(E_Randr_Configuration_Store_Modifier modifier __UNUSED__) -{ - _11_store_configuration(modifier); - e_config_save_queue(); -} - -//Free helper functions -void -_e_randr_serialized_setup_11_free(E_Randr_Serialized_Setup_11 *ss11) -{ - free(ss11); -} - -EINTERN void -e_randr_11_serialized_setup_free(E_Randr_Serialized_Setup_11 *ss_11) -{ - _e_randr_serialized_setup_11_free(ss_11); -} - -Eina_Bool -_11_try_restore_configuration(void) -{ - Ecore_X_Randr_Screen_Size_MM *stored_size, *sizes = NULL; - int i = 0, nsizes; - -#define SIZE_EQUAL(size) \ - ((stored_size->width == (size).width) \ - && (stored_size->height == (size).height) \ - && (stored_size->width_mm == (size).width_mm) \ - && (stored_size->height_mm == (size).height_mm)) - - if (!e_config->randr_serialized_setup->serialized_setup_11) return EINA_FALSE; - stored_size = &e_config->randr_serialized_setup->serialized_setup_11->size; - if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) - { - int x; - for (x = 0; x < e_randr_screen_info.rrvd_info.randr_info_11->nsizes; x++) - { - if (SIZE_EQUAL(e_randr_screen_info.rrvd_info.randr_info_11->sizes[x])) - { - return ecore_x_randr_screen_primary_output_size_set(e_randr_screen_info.root, i); - } - i++; - } - } - else if (e_randr_screen_info.randr_version > ECORE_X_RANDR_1_1) - { - sizes = ecore_x_randr_screen_primary_output_sizes_get(e_randr_screen_info.root, &nsizes); - for (i = 0; i < nsizes; i++) - { - if (SIZE_EQUAL(sizes[i])) - { - free(sizes); - return ecore_x_randr_screen_primary_output_size_set(e_randr_screen_info.root, i); - } - } - } -#undef SIZE_EQUAL - - free(sizes); - - return EINA_FALSE; -} diff --git a/src/bin/e_randr_12.c b/src/bin/e_randr_12.c deleted file mode 100644 index c731681214..0000000000 --- a/src/bin/e_randr_12.c +++ /dev/null @@ -1,823 +0,0 @@ -#include "e.h" -#include "e_randr_private.h" - -#define POLLINTERVAL 128 - -// Set functions for the global e_randr_screen_info struct -static void _screen_primary_output_assign(E_Randr_Output_Info *removed); - -// Init helper functions -static void _outputs_init(void); -static void _crtcs_init(void); -static Eina_Bool _structs_init(void); - -// Retrieval helper functions -static Ecore_X_Randr_Mode_Info *_mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode); - -// Event helper functions -static Eina_Bool _x_poll_cb(void *data __UNUSED__); -static Eina_Bool _crtc_change_event_cb(void *data, int type, void *e); -static Eina_Bool _output_change_event_cb(void *data, int type, void *e); -static Eina_Bool _output_property_change_event_cb(void *data, int type, void *e); - -static Ecore_Poller *poller = NULL; -static Eina_List *_event_handlers = NULL; -static const char *_CONNECTION_STATES_STRINGS[] = {"CONNECTED", "DISCONNECTED", "UNKNOWN"}; -static const char *_POLICIES_STRINGS[] = {"ABOVE", "RIGHT", "BELOW", "LEFT", "CLONE", "NONE"}; - -//"New" helper functions -/** - * @return array of E_Randr_Screen_Info_12 elements, or in case not all could - * be created or parameter 'nrequested'==0, NULL - */ -static E_Randr_Screen_Info_12 * -_screen_info_12_new(void) -{ - E_Randr_Screen_Info_12 *randr_info_12 = NULL; - - EINA_SAFETY_ON_TRUE_RETURN_VAL((e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2), NULL); - - randr_info_12 = E_NEW(E_Randr_Screen_Info_12, 1); - - randr_info_12->min_size.width = Ecore_X_Randr_Unset; - randr_info_12->min_size.height = Ecore_X_Randr_Unset; - randr_info_12->max_size.width = Ecore_X_Randr_Unset; - randr_info_12->max_size.height = Ecore_X_Randr_Unset; - randr_info_12->current_size.width = Ecore_X_Randr_Unset; - randr_info_12->current_size.height = Ecore_X_Randr_Unset; - randr_info_12->crtcs = NULL; - randr_info_12->outputs = NULL; - randr_info_12->modes = NULL; - randr_info_12->primary_output = NULL; - randr_info_12->alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE; - - ecore_x_randr_screen_size_range_get(e_randr_screen_info.root, - &randr_info_12->min_size.width, - &randr_info_12->min_size.height, - &randr_info_12->max_size.width, - &randr_info_12->max_size.height); - ecore_x_randr_screen_current_size_get(e_randr_screen_info.root, - &randr_info_12->current_size.width, - &randr_info_12->current_size.height, - NULL, NULL); - - return randr_info_12; -} - -static Eina_Bool -_structs_init(void) -{ - //Output stuff - Ecore_X_Randr_Output *outputs; - E_Randr_Output_Info *output_info = NULL; - int noutputs = 0; - //CRTC stuff - Ecore_X_Randr_Crtc *crtcs = NULL; - E_Randr_Crtc_Info *crtc_info = NULL; - int ncrtcs = 0; - //Modes stuff - Ecore_X_Randr_Mode_Info **modes = NULL; - int nmodes = 0; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, EINA_FALSE); - - outputs = ecore_x_randr_outputs_get(e_randr_screen_info.root, &noutputs); - if (noutputs == 0) return EINA_FALSE; - - while (--noutputs >= 0) - { - output_info = _output_info_new(outputs[noutputs]); - if (output_info) - e_randr_screen_info.rrvd_info.randr_info_12->outputs = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->outputs, output_info); - } - free(outputs); - - crtcs = ecore_x_randr_crtcs_get(e_randr_screen_info.root, &ncrtcs); - if (ncrtcs == 0) return EINA_FALSE; - - while (--ncrtcs >= 0) - { - crtc_info = _crtc_info_new(crtcs[ncrtcs]); - e_randr_screen_info.rrvd_info.randr_info_12->crtcs = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, crtc_info); - } - free(crtcs); - - modes = ecore_x_randr_modes_info_get(e_randr_screen_info.root, &nmodes); - if (nmodes == 0) return EINA_FALSE; - - while (--nmodes >= 0) - { - e_randr_screen_info.rrvd_info.randr_info_12->modes = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->modes, modes[nmodes]); - } - - free(modes); - _outputs_init(); - _crtcs_init(); - - return EINA_TRUE; -} - -//Set value / retrieval helper functions - -static void -_crtcs_init(void) -{ - E_Randr_Crtc_Info *crtc = NULL; - Eina_List *iter; - - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc) - _crtc_refs_set(crtc); -} - -static void -_outputs_init(void) -{ - E_Randr_Output_Info *output = NULL; - Eina_List *iter; - - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, iter, output) - { - _output_refs_set(output); - if (output->connection_status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) - { - _monitor_info_free(output->monitor); - output->monitor = _monitor_info_new(output); - } - } -} - -static void -_screen_primary_output_assign(E_Randr_Output_Info *removed) -{ - Eina_List *iter; - E_Randr_Output_Info *primary_output = NULL, *output_info; - - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO_OUTPUTS); - - if (e_randr_screen_info.rrvd_info.randr_info_12->primary_output && (removed != e_randr_screen_info.rrvd_info.randr_info_12->primary_output)) return; - if (!(primary_output = _12_screen_info_output_info_get(ecore_x_randr_primary_output_get(e_randr_screen_info.root)))) - { - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, iter, output_info) - { - if (!output_info || (output_info->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) || !output_info->crtc || !output_info->crtc->current_mode) continue; - primary_output = output_info; - break; - } - } - e_randr_screen_info.rrvd_info.randr_info_12->primary_output = primary_output; -} - -//"Free" helper functions - -/** - * @param screen_info the screen info to be freed. - */ -void -_12_screen_info_free(E_Randr_Screen_Info_12 *screen_info) -{ - Ecore_X_Randr_Mode_Info *mode_info; - E_Randr_Crtc_Info *crtc_info; - E_Randr_Output_Info *output_info; - - EINA_SAFETY_ON_NULL_RETURN(screen_info); - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); - - EINA_LIST_FREE(screen_info->crtcs, crtc_info) - _crtc_info_free(crtc_info); - - EINA_LIST_FREE(screen_info->outputs, output_info) - _output_info_free(output_info); - - EINA_LIST_FREE(screen_info->modes, mode_info) - ecore_x_randr_mode_info_free(mode_info); - - free(screen_info); -} - -/* - ********************************************* - * - * Getter functions for e_randr_screen_info struct - * - * ******************************************** - */ -Ecore_X_Randr_Mode_Info * -_12_screen_info_mode_info_get(const Ecore_X_Randr_Mode mode) -{ - Eina_List *iter; - Ecore_X_Randr_Mode_Info *mode_info; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO_MODE(mode), NULL); - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->modes, iter, mode_info) - { - if (mode_info && (mode_info->xid == mode)) return mode_info; - } - return NULL; -} - -E_Randr_Output_Info * -_12_screen_info_output_info_get(const Ecore_X_Randr_Output output) -{ - Eina_List *iter; - E_Randr_Output_Info *output_info; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO_OUTPUTS, NULL); - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, iter, output_info) - { - if (output_info && (output_info->xid == output)) return output_info; - } - return NULL; -} - -E_Randr_Crtc_Info * -_12_screen_info_crtc_info_get(const Ecore_X_Randr_Crtc crtc) -{ - Eina_List *iter; - E_Randr_Crtc_Info *crtc_info; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO_CRTCS, NULL); - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc_info) - { - if (crtc_info && (crtc_info->xid == crtc)) return crtc_info; - } - return NULL; -} - -Eina_Bool -_12_screen_info_edid_is_available(const E_Randr_Edid_Hash *hash) -{ - Eina_List *iter; - E_Randr_Output_Info *output_info; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO_OUTPUTS, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(hash, EINA_FALSE); - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, iter, output_info) - { - if (!output_info || !output_info->monitor) - continue; - if (output_info->monitor->edid_hash.hash == hash->hash) - return EINA_TRUE; - } - return EINA_FALSE; -} - -/* - * returns a mode within a given list of modes that is gemetrically identical. - * If none is found, NULL is returned. - */ -static Ecore_X_Randr_Mode_Info * -_mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode) -{ - Eina_List *iter; - Ecore_X_Randr_Mode_Info *mode_info; - - EINA_LIST_FOREACH(modes, iter, mode_info) - { - if ((mode_info->width == mode->width) && (mode_info->height == mode->height)) - return mode_info; - } - return NULL; -} - -/***************************************************************** - * - * Init. and Shutdown code - * - ***************************************************************** - */ -Eina_Bool -_12_screen_info_refresh(void) -{ - EINA_SAFETY_ON_TRUE_RETURN_VAL((e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2), EINA_FALSE); - - if (e_randr_screen_info.rrvd_info.randr_info_12) - _12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12); - if (!(e_randr_screen_info.rrvd_info.randr_info_12 = _screen_info_12_new()) || - !_structs_init()) - return EINA_FALSE; - - _screen_primary_output_assign(NULL); - - return EINA_TRUE; -} - -/****************************************************************** - * - * Event code - * - ****************************************************************** - */ - -static Eina_Bool -_x_poll_cb(void *data __UNUSED__) -{ - if (!e_randr_screen_info.rrvd_info.randr_info_12) - { - poller = NULL; - return ECORE_CALLBACK_CANCEL; - } - - ecore_x_randr_screen_primary_output_orientations_get(e_randr_screen_info.root); - - return ECORE_CALLBACK_RENEW; -} - -void -_12_event_listeners_add(void) -{ - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); - - ecore_x_randr_events_select(e_randr_screen_info.root, EINA_TRUE); - _event_handlers = eina_list_append(_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_CRTC_CHANGE, _crtc_change_event_cb, NULL)); - _event_handlers = eina_list_append(_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_OUTPUT_CHANGE, _output_change_event_cb, NULL)); - _event_handlers = eina_list_append(_event_handlers, ecore_event_handler_add(ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY, _output_property_change_event_cb, NULL)); - // WORKAROUND problem of X not sending events - poller = ecore_poller_add(ECORE_POLLER_CORE, POLLINTERVAL, _x_poll_cb, NULL); -} - -/* Usually events are triggered in the following order. - * (Dis)connect Display Scenario: - * 1.) ECORE_X_EVENT_OUTPUT_CHANGE //Triggered, when a display is connected to an - * output - * 2.) ECORE_X_EVENT_CRTC_CHANGE //Triggered when the CRTC mode is changed (eg. - * enabled by e.g. e_randr or xrandr) - * 3.) ECORE_X_EVENT_OUTPUT_CHANGE //Triggered for each output changed by the - * preceeding enabling. - * - * When the mode of a CRTC is changed only events 2 and 3 are triggered - * - */ -static Eina_Bool -_output_change_event_cb(void *data __UNUSED__, int type, void *ev) -{ - Ecore_X_Event_Randr_Output_Change *oce = (Ecore_X_Event_Randr_Output_Change *)ev; - E_Randr_Output_Info *output_info = NULL; - E_Randr_Crtc_Info *crtc_info = NULL; - Eina_Bool policy_success = EINA_FALSE, con_state_changed = EINA_FALSE; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_RENEW); - EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_OUTPUT_CHANGE), ECORE_CALLBACK_RENEW); - - /* event information: - Ecore_X_Window win; - Ecore_X_Randr_Output output; - Ecore_X_Randr_Crtc crtc; - Ecore_X_Randr_Mode mode; - Ecore_X_Randr_Orientation orientation; - Ecore_X_Randr_Connection_Status connection; - Ecore_X_Render_Subpixel_Order subpixel_order; - */ - - EINA_SAFETY_ON_FALSE_RETURN_VAL((output_info = _12_screen_info_output_info_get(oce->output)), ECORE_CALLBACK_RENEW); - - DBG("E_RANDR: Output event: \n" - "\t\t: relative to win: %d\n" - "\t\t: output (xid): %d\n" - "\t\t: used by crtc (xid): %d\n" - "\t\t: mode: %d\n" - "\t\t: orientation: %d\n" - "\t\t: connection state: %s\n" - "\t\t: subpixel_order: %d", - oce->win, - oce->output, - oce->crtc, - oce->mode, - oce->orientation, - _CONNECTION_STATES_STRINGS[oce->connection], - oce->subpixel_order); - - crtc_info = _12_screen_info_crtc_info_get(oce->crtc); - //WORKAROUND - //Reason: Missing events, when an output is moved from one CRTC to - // another - if (output_info->crtc && (crtc_info != output_info->crtc)) - output_info->crtc->outputs = eina_list_remove(output_info->crtc->outputs, output_info); - //END WORKAROUND - output_info->crtc = crtc_info; - - //Update mode references in case a mode was added manually - if (output_info->monitor) - { - eina_list_free(output_info->monitor->modes); - output_info->monitor->modes = NULL; - eina_list_free(output_info->monitor->preferred_modes); - output_info->monitor->preferred_modes = NULL; - _monitor_modes_refs_set(output_info->monitor, output_info->xid); - //Also update common modes of the used CRTC - if (crtc_info && crtc_info->current_mode) - { - eina_list_free(crtc_info->outputs); - crtc_info->outputs = NULL; - eina_list_free(crtc_info->outputs_common_modes); - crtc_info->outputs_common_modes = NULL; - _crtc_outputs_refs_set(crtc_info); - } - } - - con_state_changed = (Eina_Bool)(output_info->connection_status != oce->connection); - output_info->connection_status = oce->connection; - output_info->subpixel_order = oce->subpixel_order; - - if (con_state_changed) - { - _monitor_info_free(output_info->monitor); - output_info->monitor = NULL; - - if (oce->connection == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) - { - //New device connected! - output_info->monitor = _monitor_info_new(output_info); - INF("E_RANDR: Output %d was newly connected.", output_info->xid); - - //only try to enable the monitor if there is no serialized setup - if (!_12_try_restore_configuration()) - { - policy_success = e_randr_12_try_enable_output(output_info, output_info->policy, EINA_FALSE); //maybe give a success message? - INF("E_RANDR: Policy \"%s\" was enforced %ssuccesfully.", _POLICIES_STRINGS[output_info->policy - 1], (policy_success ? "" : "un")); - } - } - else - { - //connection_state is 'unknown' or 'disconnected': treat as disconnected! - if (output_info->crtc) - { - output_info->crtc->outputs = eina_list_remove(output_info->crtc->outputs, output_info); - //in case this output was the last one connected on a CRTC, - //disable it again - if (eina_list_count(output_info->crtc->outputs) == 0) - { - //in case it was the only output running on this CRTC, disable - //it. - ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, output_info->crtc->xid, NULL, Ecore_X_Randr_None, Ecore_X_Randr_None); - } - } - //retry to find a suiting serialized setup for the remaining - //connected monitors - _12_try_restore_configuration(); - } - } - - return ECORE_CALLBACK_RENEW; -} - -static Eina_Bool -_crtc_change_event_cb(void *data __UNUSED__, int type, void *ev) -{ - Ecore_X_Event_Randr_Crtc_Change *cce = (Ecore_X_Event_Randr_Crtc_Change *)ev; - E_Randr_Crtc_Info *crtc_info; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_RENEW); - EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_CRTC_CHANGE), ECORE_CALLBACK_RENEW); - - /* event information: - Ecore_X_Window win; - Ecore_X_Randr_Crtc crtc; - Ecore_X_Randr_Mode mode; - Ecore_X_Randr_Orientation orientation; - int x; - int y; - int width; - int height; - */ - DBG("E_RANDR: CRTC event: \n" - "\t\t: relative to win: %d\n" - "\t\t: crtc (xid): %d\n" - "\t\t: mode (xid): %d\n" - "\t\t: orientation: %d\n" - "\t\t: x: %d\n" - "\t\t: y: %d\n" - "\t\t: width: %d\n" - "\t\t: height: %d", - cce->win, - cce->crtc, - cce->mode, - cce->orientation, - cce->geo.x, - cce->geo.y, - cce->geo.w, - cce->geo.h); - - crtc_info = _12_screen_info_crtc_info_get(cce->crtc); - EINA_SAFETY_ON_NULL_RETURN_VAL(crtc_info, ECORE_CALLBACK_RENEW); - - crtc_info->current_mode = _12_screen_info_mode_info_get(cce->mode); - crtc_info->current_orientation = cce->orientation; - crtc_info->geometry.x = cce->geo.x; - crtc_info->geometry.y = cce->geo.y; - crtc_info->geometry.w = cce->geo.w; - crtc_info->geometry.h = cce->geo.h; - - //update screensize if necessary - e_randr_screen_info.rrvd_info.randr_info_12->current_size.width = MAX((cce->geo.x + cce->geo.w), e_randr_screen_info.rrvd_info.randr_info_12->current_size.width); - e_randr_screen_info.rrvd_info.randr_info_12->current_size.height = MAX((cce->geo.y + cce->geo.h), e_randr_screen_info.rrvd_info.randr_info_12->current_size.height); - - //update output data - eina_list_free(crtc_info->outputs); - crtc_info->outputs = NULL; - eina_list_free(crtc_info->outputs_common_modes); - crtc_info->outputs_common_modes = NULL; - - //if still enabled, update references to outputs - if (crtc_info->current_mode) - { - eina_list_free(crtc_info->outputs); - crtc_info->outputs = NULL; - eina_list_free(crtc_info->outputs_common_modes); - crtc_info->outputs_common_modes = NULL; - _crtc_outputs_refs_set(crtc_info); - } - - //crop the screen - ecore_x_randr_screen_reset(e_randr_screen_info.root); - - return ECORE_CALLBACK_RENEW; -} - -static Eina_Bool -_output_property_change_event_cb(void *data __UNUSED__, int type, void *ev) -{ - Ecore_X_Event_Randr_Output_Property_Notify *opce = (Ecore_X_Event_Randr_Output_Property_Notify *)ev; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_RENEW); - EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY), ECORE_CALLBACK_RENEW); - - /* event information: - Ecore_X_Window win; - Ecore_X_Randr_Output output; - Ecore_X_Atom property; - Ecore_X_Time time; - Ecore_X_Randr_Property_Change state; - */ - EINA_SAFETY_ON_FALSE_RETURN_VAL((_12_screen_info_output_info_get(opce->output)), ECORE_CALLBACK_RENEW); - - return ECORE_CALLBACK_RENEW; -} - -/* - * Try to enable this output on an unoccupied CRTC. 'Force' in this context - * means, that if there are only occupied CRTCs, we disable another output to - * enable this one. If not forced we will - if we don't find an unoccupied CRTC - * - try to share the output of a CRTC with other outputs already using it - * (clone). - */ -EINTERN Eina_Bool -e_randr_12_try_enable_output(E_Randr_Output_Info *output_info, Ecore_X_Randr_Output_Policy policy, Eina_Bool force) -{ - Eina_List *iter, *outputs_list = NULL, *common_modes = NULL; - E_Randr_Crtc_Info *crtc_info = NULL, *usable_crtc = NULL; - const E_Randr_Crtc_Info *crtc_rel = NULL; - E_Randr_Output_Info *primary_output; - Ecore_X_Randr_Output *outputs; - Ecore_X_Randr_Mode_Info *mode_info; - int dx = Ecore_X_Randr_None, dy = Ecore_X_Randr_None; - Eina_Bool ret = EINA_TRUE; - - EINA_SAFETY_ON_NULL_RETURN_VAL(output_info, EINA_FALSE); - EINA_SAFETY_ON_TRUE_RETURN_VAL((output_info->crtc && output_info->crtc->current_mode), EINA_FALSE); - - /* - * Try to find a usable crtc for this output. Either unused or forced. - */ - EINA_LIST_FOREACH(output_info->possible_crtcs, iter, crtc_info) - { - if (!crtc_info->current_mode || !crtc_info->outputs || force) - { - usable_crtc = crtc_info; - break; - } - } - - /* - * apparently we don't have a CRTC to make use of the device - */ - if (!usable_crtc) - return EINA_FALSE; - - //get the CRTC we will refer to, dependend on policy - switch (policy) - { - case ECORE_X_RANDR_OUTPUT_POLICY_NONE: - return EINA_TRUE; - - case ECORE_X_RANDR_OUTPUT_POLICY_ASK: - e_randr_12_ask_dialog_new(output_info); - return EINA_TRUE; //This is a bit incorrect (dialog feedback is async), but probably not worth a lock. - - case ECORE_X_RANDR_OUTPUT_POLICY_CLONE: - /* - * Order of approaches to enable a clone (of the primary output): - * - * 0. Get Primary output from Server - * 1. Try to add new Output to primary output's CRTC, using the mode used - * by the primary output - * 2. Try to enable clone in the same - * 2a. exact mode or a - * 2b. geometrically identical mode - * 3. Find a most high resolution mode in common to enable on primary output's CRTC and the new - * output's CRTC - * 4. fail. - */ - //Assign new output, if necessary - _screen_primary_output_assign(output_info); - if ((primary_output = e_randr_screen_info.rrvd_info.randr_info_12->primary_output)) - { - if (primary_output->crtc && primary_output->crtc->current_mode && eina_list_data_find(output_info->monitor->modes, primary_output->crtc->current_mode)) - { - /* - * mode currently used by primary output's CRTC is also supported by the new output - */ - if (eina_list_data_find(primary_output->crtc->possible_outputs, output_info) && eina_list_data_find(output_info->monitor->modes, primary_output->crtc->current_mode)) - { - /* - * 1. Try to add new Output to primary output's CRTC, using the mode used - * by the primary output - * TODO: check with compatibility list in RandRR >= 1.3 - * if available - * - * The new output is also usable by the primary output's - * CRTC. Try to enable this output together with the already - * enabled outputs on the CRTC in already used mode. - */ - outputs_list = primary_output->crtc->outputs; - outputs_list = eina_list_append(outputs_list, output_info); - outputs = _outputs_to_array(outputs_list); - primary_output->crtc->outputs = NULL; - ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, primary_output->crtc->xid, outputs, eina_list_count(outputs_list), primary_output->crtc->current_mode->xid); - free(outputs); - eina_list_free(outputs_list); - return ret; - } - else - { - /* - * 2. Try to enable clone in the same - */ - - /* - * 2a. exact mode. - */ - ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, primary_output->crtc->current_mode->xid); - ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment); - return ret; - } - } - else - { - /* - * 2b. geometrically identical mode - */ - if (primary_output->crtc && (mode_info = _mode_geo_identical_find(output_info->monitor->modes, primary_output->crtc->current_mode))) - { - ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid); - ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment); - return ret; - } - /* - * 3. Find the highest resolution mode common to enable on primary output's CRTC and the new one. - */ - if (((outputs_list = eina_list_append(outputs_list, primary_output)) && (outputs_list = eina_list_append(outputs_list, output_info)))) - { - if (primary_output->crtc) - { - common_modes = _outputs_common_modes_get(outputs_list, primary_output->crtc->current_mode); - if ((mode_info = eina_list_nth(common_modes, 0))) - { - eina_list_free(common_modes); - INF("Will try to set mode: %dx%d for primary and clone.", mode_info->width, mode_info->height); - ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, primary_output->crtc->xid, ((Ecore_X_Randr_Output *)Ecore_X_Randr_Unset), Ecore_X_Randr_Unset, mode_info->xid); - ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid); - ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment); - } - } - eina_list_free(outputs_list); - } - } - } - else - ERR("E_RANDR: Failed to clone, because of missing or disabled primary output!"); - /* - * 4. FAIL - */ - break; - - default: - //enable and position according to used policies - if (!(mode_info = ((Ecore_X_Randr_Mode_Info *)eina_list_data_get(output_info->monitor->preferred_modes)))) - { - ERR("E_RANDR: Could not enable output(%d), as it has no preferred modes (and there for none at all)!", output_info->xid); - ret = EINA_FALSE; - break; - } - - //get the crtc we will place our's relative to. If it's NULL, this is the - //only output attached, work done. - if (!(crtc_rel = _crtc_according_to_policy_get(usable_crtc, policy))) - { - INF("E_RANDR: CRTC %d enabled. No other CRTC had to be moved.", usable_crtc->xid); - ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid); - return ret; - } - - //Calculate new CRTC's position according to policy - switch (policy) - { - case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE: - usable_crtc->geometry.x = crtc_rel->geometry.x; - usable_crtc->geometry.y = 0; - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT: - usable_crtc->geometry.x = (crtc_rel->geometry.x + crtc_rel->geometry.w); - usable_crtc->geometry.y = crtc_rel->geometry.y; - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_BELOW: - usable_crtc->geometry.x = crtc_rel->geometry.x; - usable_crtc->geometry.y = (crtc_rel->geometry.y + crtc_rel->geometry.h); - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_LEFT: - usable_crtc->geometry.y = crtc_rel->geometry.y; - usable_crtc->geometry.x = 0; - break; - - default: - usable_crtc->geometry.y = 0; - usable_crtc->geometry.x = 0; - } - - if ((ret &= ecore_x_randr_crtc_settings_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, usable_crtc->geometry.x, usable_crtc->geometry.y, mode_info->xid, ECORE_X_RANDR_ORIENTATION_ROT_0))) - { - //WORKAROUND - //Reason: the CRTC event, that'd bring the new info about the set - //mode is arriving too late here. - usable_crtc->current_mode = mode_info; - usable_crtc->geometry.w = mode_info->width; - usable_crtc->geometry.h = mode_info->height; - //WORKAROUND END - - INF("E_RANDR: Moved CRTC %d has geometry (x,y,wxh): %d, %d, %dx%d.", usable_crtc->xid, usable_crtc->geometry.x, usable_crtc->geometry.y, usable_crtc->geometry.w, usable_crtc->geometry.h); - //following is policy dependend. - switch (policy) - { - case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE: - dy = (crtc_rel->geometry.y - usable_crtc->geometry.h); - if (dy < 0) - { - //virtual move (move other CRTCs as nessesary) - dy = -dy; - ret &= ecore_x_randr_move_all_crtcs_but(e_randr_screen_info.root, - &usable_crtc->xid, - 1, - dx, - dy); - INF("E_RANDR: Moving all CRTCs but %d, by %dx%d delta.", usable_crtc->xid, dx, dy); - } - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_LEFT: - dx = (crtc_rel->geometry.x - usable_crtc->geometry.w); - if (dx < 0) - { - //virtual move (move other CRTCs as nessesary) - dx = -dx; - ret &= ecore_x_randr_move_all_crtcs_but(e_randr_screen_info.root, - &usable_crtc->xid, - 1, - dx, - dy); - INF("E_RANDR: Moving all CRTCs but %d, by %dx%d delta.", usable_crtc->xid, dx, dy); - } - break; - - default: - break; - } - } - } - - if (ret) - ecore_x_randr_screen_reset(e_randr_screen_info.root); - - return ret; -} - -void -_12_event_listeners_remove(void) -{ - Ecore_Event_Handler *_event_handler = NULL; - - EINA_LIST_FREE(_event_handlers, _event_handler) - ecore_event_handler_del(_event_handler); - ecore_poller_del(poller); - poller = NULL; -} - diff --git a/src/bin/e_randr_12_ask_dialog.c b/src/bin/e_randr_12_ask_dialog.c deleted file mode 100644 index 1934342908..0000000000 --- a/src/bin/e_randr_12_ask_dialog.c +++ /dev/null @@ -1,81 +0,0 @@ -#include "e.h" - -static void _e_randr_ask_cb(void *data, E_Dialog *dia); - -static void e_randr_12_memorize_monitor_dialog_new(void); -static void _e_randr_ask_memorize_monitor_cb(void *data, E_Dialog *dia); - -static E_Randr_Output_Info *_ask_output_info = NULL; - -EINTERN void e_randr_12_ask_dialog_new(E_Randr_Output_Info *oi) -{ - E_Dialog *dia = NULL; - - if (!oi) return; - dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_randr_ask"); - if (!dia) return; - - _ask_output_info = oi; - e_dialog_title_set(dia, _("Position of New Monitor")); - e_dialog_icon_set(dia, "display", 64); - e_dialog_text_set(dia, _("<b>Where</b> should the newly connected monitor be put?")); - e_dialog_button_add(dia, _("Left"), "stock-left", _e_randr_ask_cb, (void*)ECORE_X_RANDR_OUTPUT_POLICY_LEFT); - e_dialog_button_add(dia, _("Right"), "stock-right", _e_randr_ask_cb, (void*)ECORE_X_RANDR_OUTPUT_POLICY_RIGHT); - e_dialog_button_add(dia, _("Above"), "stock-top", _e_randr_ask_cb, (void*)ECORE_X_RANDR_OUTPUT_POLICY_ABOVE); - e_dialog_button_add(dia, _("Below"), "stock-bottom", _e_randr_ask_cb, (void*)ECORE_X_RANDR_OUTPUT_POLICY_BELOW); - e_dialog_button_focus_num(dia, 1); - e_win_centered_set(dia->win, 1); - e_dialog_show(dia); -} - -static void -_e_randr_ask_cb(void *data __UNUSED__, E_Dialog *dia) -{ - Ecore_X_Randr_Output_Policy pos = (Ecore_X_Randr_Output_Policy)data; - Eina_Bool successful = EINA_FALSE; - - if (!_ask_output_info) - goto _close_ret; - - successful = e_randr_12_try_enable_output(_ask_output_info, pos, EINA_FALSE); - - if (successful) - e_randr_12_memorize_monitor_dialog_new(); - - _ask_output_info = NULL; - -_close_ret: - e_object_del(E_OBJECT(dia)); -} - -static void e_randr_12_memorize_monitor_dialog_new(void) -{ - E_Dialog *dia = NULL; - - dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_randr_ask"); - if (!dia) return; - - e_dialog_title_set(dia, _("Memorize This Monitor?")); - e_dialog_icon_set(dia, "display", 64); - e_dialog_text_set(dia, _("Should the position of this monitor be <b>memorized</b>?")); - e_dialog_button_add(dia, _("Yes"), "stock-yes", _e_randr_ask_memorize_monitor_cb, (void*)EINA_TRUE); - e_dialog_button_add(dia, _("No"), "stock-no", _e_randr_ask_memorize_monitor_cb, (void*)EINA_FALSE); - e_dialog_button_focus_num(dia, 1); - e_win_centered_set(dia->win, 1); - e_dialog_show(dia); -} - -static void -_e_randr_ask_memorize_monitor_cb(void *data, E_Dialog *dia) -{ - Eina_Bool memorize = (Eina_Bool)(intptr_t)data; - const E_Randr_Configuration_Store_Modifier modifier = ( - E_RANDR_CONFIGURATION_STORE_RESOLUTIONS - | E_RANDR_CONFIGURATION_STORE_ARRANGEMENT - | E_RANDR_CONFIGURATION_STORE_ORIENTATIONS); - - if (memorize) - e_randr_store_configuration(modifier); - - e_object_del(E_OBJECT(dia)); -} diff --git a/src/bin/e_randr_12_crtc.c b/src/bin/e_randr_12_crtc.c deleted file mode 100644 index fd7850ac9c..0000000000 --- a/src/bin/e_randr_12_crtc.c +++ /dev/null @@ -1,274 +0,0 @@ -#include "e_randr_private.h" -#include "e_randr.h" - -// E_Randr_Crtc_Info helper functions -/* static Eina_Bool _crtc_mode_intersects_crtcs(E_Randr_Crtc_Info *crtc_info, Ecore_X_Randr_Mode_Info *mode); */ -/* static Eina_Bool _crtc_outputs_mode_max_set(E_Randr_Crtc_Info *crtc_info); */ - -void -_crtc_outputs_refs_set(E_Randr_Crtc_Info *crtc_info) -{ - E_Randr_Output_Info *output_info = NULL; - Ecore_X_Randr_Output *outputs = NULL; - int noutputs = 0; - - EINA_SAFETY_ON_NULL_RETURN(crtc_info); - - outputs = ecore_x_randr_crtc_outputs_get(e_randr_screen_info.root, crtc_info->xid, &noutputs); - - while (--noutputs >= 0) - { - output_info = _12_screen_info_output_info_get(outputs[noutputs]); - if (!output_info) - { - ERR("E_RANDR: Could not find output struct for output %d.", outputs[noutputs]); - continue; - } - crtc_info->outputs = eina_list_append(crtc_info->outputs, output_info); - } - free(outputs); - E_FREE_LIST(crtc_info->outputs_common_modes, ecore_x_randr_mode_info_free); - crtc_info->outputs_common_modes = _outputs_common_modes_get(crtc_info->outputs, NULL); -} - -void -_crtc_refs_set(E_Randr_Crtc_Info *crtc_info) -{ - Ecore_X_Randr_Mode mode = Ecore_X_Randr_None; - Ecore_X_Randr_Mode_Info *mode_info = NULL; - Ecore_X_Randr_Output *poutputs = NULL; - E_Randr_Output_Info *output_info = NULL; - int npoutputs = 0; - - EINA_SAFETY_ON_NULL_RETURN(crtc_info); - - mode = ecore_x_randr_crtc_mode_get(e_randr_screen_info.root, crtc_info->xid); - if (!(mode_info = _12_screen_info_mode_info_get(mode)) && (mode != Ecore_X_Randr_None)) - { - //Mode does not equal "disabled" and is unknown to the global structure, so add it - mode_info = ecore_x_randr_mode_info_get(e_randr_screen_info.root, mode); - e_randr_screen_info.rrvd_info.randr_info_12->modes = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->modes, mode_info); - } - crtc_info->current_mode = mode_info; - - poutputs = ecore_x_randr_crtc_possible_outputs_get(e_randr_screen_info.root, crtc_info->xid, &npoutputs); - - while (--npoutputs >= 0) - { - output_info = _12_screen_info_output_info_get(poutputs[npoutputs]); - if (!output_info) - { - ERR("E_RANDR: Could not find output struct for output %d.", poutputs[npoutputs]); - continue; - } - crtc_info->possible_outputs = eina_list_append(crtc_info->possible_outputs, output_info); - } - free(poutputs); - - _crtc_outputs_refs_set(crtc_info); -} - -/** - * @brief Allocate and init with values. - * @param crtc the crtc the display is queried for. If Ecore_X_Randr_None is - * given, a struct with only the xid will be set - * @return E_Randr_Crtc_Info element - */ -E_Randr_Crtc_Info * -_crtc_info_new(Ecore_X_Randr_Crtc crtc) -{ - E_Randr_Crtc_Info *crtc_info = NULL; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, NULL); - - crtc_info = E_NEW(E_Randr_Crtc_Info, 1); - - crtc_info->xid = crtc; - crtc_info->panning.x = Ecore_X_Randr_Unset; - crtc_info->panning.y = Ecore_X_Randr_Unset; - crtc_info->panning.w = Ecore_X_Randr_Unset; - crtc_info->panning.h = Ecore_X_Randr_Unset; - crtc_info->tracking.x = Ecore_X_Randr_Unset; - crtc_info->tracking.y = Ecore_X_Randr_Unset; - crtc_info->tracking.w = Ecore_X_Randr_Unset; - crtc_info->tracking.h = Ecore_X_Randr_Unset; - crtc_info->border.x = Ecore_X_Randr_Unset; - crtc_info->border.y = Ecore_X_Randr_Unset; - crtc_info->border.w = Ecore_X_Randr_Unset; - crtc_info->border.h = Ecore_X_Randr_Unset; - - crtc_info->gamma_ramps = NULL; - crtc_info->gamma_ramp_size = Ecore_X_Randr_Unset; - crtc_info->outputs = NULL; - crtc_info->possible_outputs = NULL; - crtc_info->outputs_common_modes = NULL; - crtc_info->current_mode = NULL; - - ecore_x_randr_crtc_geometry_get(e_randr_screen_info.root, crtc_info->xid, &crtc_info->geometry.x, &crtc_info->geometry.y, &crtc_info->geometry.w, &crtc_info->geometry.h); - crtc_info->current_orientation = ecore_x_randr_crtc_orientation_get(e_randr_screen_info.root, crtc_info->xid); - crtc_info->orientations = ecore_x_randr_crtc_orientations_get(e_randr_screen_info.root, crtc_info->xid); - - return crtc_info; -} - -/** - * @param crtc_info the crtc info to be freed. - */ -void -_crtc_info_free(E_Randr_Crtc_Info *crtc_info) -{ - if (!crtc_info) return; - - free(crtc_info->gamma_ramps); - crtc_info->outputs = eina_list_free(crtc_info->outputs); - crtc_info->possible_outputs = eina_list_free(crtc_info->possible_outputs); - free(crtc_info); -} - -/* - * returns EINA_TRUE if given CRTC would intersect with other CRTCs if set to - * given mode - */ -/* static Eina_Bool */ -/* _crtc_mode_intersects_crtcs(E_Randr_Crtc_Info *crtc_info, Ecore_X_Randr_Mode_Info *mode) */ -/* { */ -/* Eina_List *iter; */ -/* E_Randr_Crtc_Info *tmp; */ -/* int width, height; */ - -/* EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, tmp) */ -/* { */ -/* if ((tmp == crtc_info) || */ -/* ((tmp->geometry.w <= 0) || (tmp->geometry.h <= 0))) */ -/* continue; */ -/* width = (mode->width > INT_MAX) ? INT_MAX : mode->width; */ -/* height = (mode->height > INT_MAX) ? INT_MAX : mode->height; */ -/* if (E_INTERSECTS(crtc_info->geometry.x, crtc_info->geometry.y, */ -/* width, height, tmp->geometry.x, */ -/* tmp->geometry.y, tmp->geometry.w, tmp->geometry.h) */ -/* && ((crtc_info->geometry.x != tmp->geometry.x) && */ -/* (crtc_info->geometry.y != tmp->geometry.y))) */ -/* return EINA_TRUE; */ -/* } */ -/* return EINA_FALSE; */ -/* } */ - -/* - * reconfigures a CRTC enabling the highest resolution amongst its outputs, - * without touching any other CRTC currently activated - */ -/* static Eina_Bool */ -/* _crtc_outputs_mode_max_set(E_Randr_Crtc_Info *crtc_info) */ -/* { */ -/* Ecore_X_Randr_Mode_Info *mode_info; */ -/* Eina_List *iter; */ -/* Eina_Bool ret = EINA_TRUE; */ -/* Ecore_X_Randr_Output *outputs; */ - -/* if (!crtc_info || !crtc_info->outputs || !crtc_info->outputs_common_modes) return EINA_FALSE; */ - -/* EINA_LIST_REVERSE_FOREACH(crtc_info->outputs_common_modes, iter, mode_info) */ -/* { */ -/* if (!_crtc_mode_intersects_crtcs(crtc_info, mode_info)) */ -/* break; */ -/* } */ -/* if (!mode_info) */ -/* { */ -/* //eina_list_free(crtc_info->outputs_common_modes); */ -/* return EINA_FALSE; */ -/* } */ -/* if ((outputs = _outputs_to_array(crtc_info->outputs))) */ -/* { */ -/* ret = ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, crtc_info->xid, outputs, eina_list_count(crtc_info->outputs), mode_info->xid); */ -/* free(outputs); */ -/* } */ -/* //eina_list_free(crtc_info->outputs_common_modes); */ -/* //crtc_info->outputs_common_modes = NULL; */ - -/* ecore_x_randr_screen_reset(e_randr_screen_info.root); */ - -/* return ret; */ -/* } */ - -/* - * this retrieves a CRTC depending on a policy. - * Note that this is enlightenment specific! Enlightenment doesn't 'allow' zones - * to overlap. Thus we always use the output with the most extreme position - * instead of trying to fill gaps like tetris. Though this could be done by - * simply implementing another policy. - * - * Simply put: get the - * -right - * -left - * -top - * -bottom - * most CRTC and return it. - */ -const E_Randr_Crtc_Info * -_crtc_according_to_policy_get(E_Randr_Crtc_Info *but, Ecore_X_Randr_Output_Policy policy) -{ - Eina_List *iter, *possible_crtcs = NULL; - E_Randr_Crtc_Info *crtc_info, *ret = NULL; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO_CRTCS, NULL); - - //get any crtc that besides 'but' to start with - possible_crtcs = eina_list_clone(e_randr_screen_info.rrvd_info.randr_info_12->crtcs); - possible_crtcs = eina_list_remove(possible_crtcs, but); - - if ((eina_list_count(possible_crtcs) == 0) && (policy != ECORE_X_RANDR_OUTPUT_POLICY_CLONE)) - { - eina_list_free(possible_crtcs); - return NULL; - } - - // get an initial value for ret - ret = (E_Randr_Crtc_Info*)eina_list_last_data_get(possible_crtcs); - - switch (policy) - { - case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE: - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc_info) - { - if (crtc_info->geometry.y < ret->geometry.y) - ret = crtc_info; - } - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT: - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc_info) - { - if ((crtc_info->geometry.x + crtc_info->geometry.w) > - (ret->geometry.x + ret->geometry.w)) - ret = crtc_info; - } - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_BELOW: - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc_info) - { - if ((crtc_info->geometry.y + crtc_info->geometry.h) > - (ret->geometry.y + ret->geometry.h)) - ret = crtc_info; - } - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_LEFT: - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc_info) - { - if (crtc_info->geometry.x < ret->geometry.x) - ret = crtc_info; - } - break; - - case ECORE_X_RANDR_OUTPUT_POLICY_CLONE: - ret = (e_randr_screen_info.rrvd_info.randr_info_12->primary_output) ? e_randr_screen_info.rrvd_info.randr_info_12->primary_output->crtc : NULL; - break; - - default: - break; - } - - eina_list_free(possible_crtcs); - return ret; -} diff --git a/src/bin/e_randr_12_output.c b/src/bin/e_randr_12_output.c deleted file mode 100644 index 52e673eb14..0000000000 --- a/src/bin/e_randr_12_output.c +++ /dev/null @@ -1,239 +0,0 @@ -#include "e_randr_private.h" -#include "e_randr.h" - -E_Randr_Monitor_Info *_monitor_info_new(E_Randr_Output_Info *output_info); -static int _modes_size_sort_cb(const void *d1, const void *d2); - -void -_monitor_modes_refs_set(E_Randr_Monitor_Info *mi, Ecore_X_Randr_Output o) -{ - Ecore_X_Randr_Mode *modes = NULL; - Ecore_X_Randr_Mode_Info *mode_info = NULL; - int nmodes = 0, npreferred = 0; - - EINA_SAFETY_ON_NULL_RETURN(mi); - EINA_SAFETY_ON_TRUE_RETURN(o == Ecore_X_Randr_None); - - // Add (preferred) modes - modes = ecore_x_randr_output_modes_get(e_randr_screen_info.root, o, &nmodes, &npreferred); - while (--nmodes >= 0) - { - if (!modes[nmodes]) continue; - if (!(mode_info = _12_screen_info_mode_info_get(modes[nmodes]))) - { - //Mode unknown to the global structure, so add it - mode_info = ecore_x_randr_mode_info_get(e_randr_screen_info.root, modes[nmodes]); - e_randr_screen_info.rrvd_info.randr_info_12->modes = eina_list_append(e_randr_screen_info.rrvd_info.randr_info_12->modes, mode_info); - } - mi->modes = eina_list_prepend(mi->modes, mode_info); - if (nmodes <= npreferred) - mi->preferred_modes = eina_list_prepend(mi->preferred_modes, mode_info); - } - free(modes); -} - -/** - * @brief Allocates a new E_Randr_Monitor_Info struct and initializes it with - * default values. - * @return E_Randr_Monitor_Info element, or if it could not be - * created, NULL - */ -E_Randr_Monitor_Info * -_monitor_info_new(E_Randr_Output_Info *oi) -{ - E_Randr_Monitor_Info *mi = NULL; - - EINA_SAFETY_ON_NULL_RETURN_VAL(oi, NULL); - - mi = E_NEW(E_Randr_Monitor_Info, 1); - - // Set some default values - mi->modes = NULL; - mi->preferred_modes = NULL; - mi->size_mm.width = Ecore_X_Randr_Unset; - mi->size_mm.height = Ecore_X_Randr_Unset; - mi->edid = NULL; - mi->edid_length = 0; - mi->edid_hash.hash = 0; - mi->max_backlight = Ecore_X_Randr_Unset; - mi->backlight_level = 0.0; - - _monitor_modes_refs_set(mi, oi->xid); - - ecore_x_randr_output_size_mm_get(e_randr_screen_info.root, oi->xid, &mi->size_mm.width, &mi->size_mm.height); - mi->edid = ecore_x_randr_output_edid_get(e_randr_screen_info.root, oi->xid, &mi->edid_length); - if (mi->edid_length > 0) - mi->edid_hash.hash = eina_hash_superfast((char *)mi->edid, mi->edid_length); - - return mi; -} - -/** - * @brief Frees E_Randr_Monitor_Info structure - */ -void -_monitor_info_free(E_Randr_Monitor_Info *monitor_info) -{ - if (!monitor_info) - return; - - eina_list_free(monitor_info->modes); - eina_list_free(monitor_info->preferred_modes); - free(monitor_info->edid); - free(monitor_info); -} - -/** - * @brief allocates a struct and fills it with default values. - * @param output the output the display is queried for. If Ecore_X_Randr_None is - * given, a struct with only the xid will be set - * @return E_Randr_Output_Info element - */ -E_Randr_Output_Info * -_output_info_new(Ecore_X_Randr_Output output) -{ - E_Randr_Output_Info *output_info = NULL; - char *str; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, NULL); - - output_info = E_NEW(E_Randr_Output_Info, 1); - - output_info->xid = output; - - //Use default values - output_info->crtc = NULL; - output_info->wired_clones = NULL; - output_info->possible_crtcs = NULL; - output_info->signalformats = Ecore_X_Randr_Unset; - output_info->signalformat = Ecore_X_Randr_Unset; - output_info->connector_number = 0; - output_info->monitor = NULL; - output_info->connector_type = Ecore_X_Randr_Unset; - output_info->policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE; - output_info->compatibility_list = NULL; - output_info->subpixel_order = Ecore_X_Randr_Unset; - - str = ecore_x_randr_output_name_get(e_randr_screen_info.root, output_info->xid, &output_info->name_length); - output_info->name = eina_stringshare_add(str); - free(str); - output_info->connection_status = ecore_x_randr_output_connection_status_get(e_randr_screen_info.root, output_info->xid); - - return output_info; -} - -void -_output_info_free(E_Randr_Output_Info *output_info) -{ - EINA_SAFETY_ON_NULL_RETURN(output_info); - - eina_list_free(output_info->wired_clones); - eina_list_free(output_info->possible_crtcs); - eina_list_free(output_info->compatibility_list); - eina_stringshare_del(output_info->name); - _monitor_info_free(output_info->monitor); - output_info->monitor = NULL; - free(output_info); -} - -void -_output_refs_set(E_Randr_Output_Info *output_info) -{ - Ecore_X_Randr_Crtc crtc, *crtcs = NULL; - E_Randr_Crtc_Info *crtc_info; - int ncrtcs = 0; - - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); - EINA_SAFETY_ON_NULL_RETURN(output_info); - - eina_list_free(output_info->possible_crtcs); - - //Add possible crtcs - crtcs = ecore_x_randr_output_possible_crtcs_get(e_randr_screen_info.root, output_info->xid, &ncrtcs); - while (--ncrtcs >= 0) - { - if (!(crtc_info = _12_screen_info_crtc_info_get(crtcs[ncrtcs]))) - continue; - output_info->possible_crtcs = eina_list_append(output_info->possible_crtcs, crtc_info); - } - free(crtcs); - - crtc = ecore_x_randr_output_crtc_get(e_randr_screen_info.root, output_info->xid); - output_info->crtc = _12_screen_info_crtc_info_get(crtc); - - if (output_info->connection_status == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) - output_info->monitor = _monitor_info_new(output_info); - else - output_info->monitor = NULL; -} - -Ecore_X_Randr_Output * -_outputs_to_array(Eina_List *outputs_info) -{ - Ecore_X_Randr_Output *ret = NULL; - E_Randr_Output_Info *output_info; - Eina_List *output_iter; - int i = 0; - - if (!outputs_info || !(ret = malloc(sizeof(Ecore_X_Randr_Output) * eina_list_count(outputs_info)))) return NULL; - EINA_LIST_FOREACH(outputs_info, output_iter, output_info) - /* output_info == NULL should _not_ be possible! */ - ret[i++] = output_info ? output_info->xid : Ecore_X_Randr_None; - return ret; -} - -/* - * returns a list of modes common ammongst the given outputs, - * optionally limited by max_size_mode. If none are found, NULL is returned. - */ -Eina_List -*_outputs_common_modes_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *max_size_mode) -{ - Eina_List *common_modes = NULL, *mode_iter, *output_iter, *mode_next, *output_next; - E_Randr_Output_Info *output_info; - Ecore_X_Randr_Mode_Info *mode_info; - - EINA_SAFETY_ON_NULL_RETURN_VAL(outputs, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(e_randr_screen_info.rrvd_info.randr_info_12->modes, NULL); - - //create a list of all common modes - common_modes = eina_list_clone(e_randr_screen_info.rrvd_info.randr_info_12->modes); - common_modes = eina_list_sort(common_modes, 0, _modes_size_sort_cb); - - EINA_LIST_FOREACH_SAFE(common_modes, mode_iter, mode_next, mode_info) - { - EINA_LIST_FOREACH_SAFE(outputs, output_iter, output_next, output_info) - { - if (!output_info || !output_info->monitor) - continue; - if (!eina_list_data_find(output_info->monitor->modes, mode_info)) - common_modes = eina_list_remove(common_modes, mode_info); - } - } - - if (max_size_mode) - { - //remove all modes that are larger than max_size_mode - EINA_LIST_FOREACH_SAFE(common_modes, mode_iter, mode_next, mode_info) - { - if (_modes_size_sort_cb((void *)max_size_mode, (void *)mode_info) < 0) - common_modes = eina_list_remove(common_modes, mode_info); - } - } - - //sort modes desc. by their sizes - common_modes = eina_list_reverse(common_modes); - - return common_modes; -} - -static int -_modes_size_sort_cb(const void *d1, const void *d2) -{ - Ecore_X_Randr_Mode_Info *mode1 = ((Ecore_X_Randr_Mode_Info *)d1), *mode2 = ((Ecore_X_Randr_Mode_Info *)d2); - - if (!d1) return 1; - if (!d2) return -1; - - return (mode1->width * mode1->height) - (mode2->width * mode2->height); -} diff --git a/src/bin/e_randr_12_serialization.c b/src/bin/e_randr_12_serialization.c deleted file mode 100644 index cd39d30d71..0000000000 --- a/src/bin/e_randr_12_serialization.c +++ /dev/null @@ -1,598 +0,0 @@ -#include "e_randr_private.h" -#include "e_randr.h" - -#define MODE_STR_LENGTH_MAX 100 - -static const char *_POLICIES_STRINGS[] = {"ABOVE", "RIGHT", "BELOW", "LEFT", "CLONE", "NONE"}; - -static E_Randr_Serialized_Crtc *_serialized_crtc_new(E_Randr_Crtc_Info *crtc_info); -static inline int _sort_by_number_of_edids(const void *d1, const void *d2); -static inline Eina_List *_find_matching_outputs(Eina_List *sois); -static inline E_Randr_Crtc_Info *_find_matching_crtc(E_Randr_Serialized_Crtc *sc); -static inline Ecore_X_Randr_Mode_Info *_find_matching_mode_info(Ecore_X_Randr_Mode_Info *mode); - -/********************************************************************** - * - * Storage/Restorage of setups - * - ********************************************************************** - */ - -/* - * Layout: - * - * Serialized_Setup_12 { - * - timestamp - * - List<Serialized_CRTC> - * - List<EDID> - * } - * Serialized_Crtc { - * - index - * - List<Serialized_Output> - * - pos - * - orientation - * - mode - * } - * Serialized_Output { - * - name - * - name_length - * - serialized_edid - * - backlight_level - * } - * Serialized_EDID { - * - edid_hash - * } - * - */ -//"Free" helper functions - -void -_serialized_output_free(E_Randr_Serialized_Output *so) -{ - EINA_SAFETY_ON_NULL_RETURN(so); - - eina_stringshare_del(so->name); - - free(so); -} - -void -_serialized_output_policy_free(E_Randr_Serialized_Output_Policy *sop) -{ - EINA_SAFETY_ON_NULL_RETURN(sop); - - eina_stringshare_del(sop->name); - free(sop); -} - -EINTERN void -e_randr_12_serialized_output_policy_free(E_Randr_Serialized_Output_Policy *policy) -{ - _serialized_output_policy_free(policy); -} - -void -_mode_info_free(Ecore_X_Randr_Mode_Info *mode_info) -{ - EINA_SAFETY_ON_NULL_RETURN(mode_info); - - eina_stringshare_del(mode_info->name); - free(mode_info); -} - -void -_serialized_crtc_free(E_Randr_Serialized_Crtc *sc) -{ - E_Randr_Serialized_Output *so; - - EINA_SAFETY_ON_NULL_RETURN(sc); - - EINA_LIST_FREE (sc->outputs, so) - _serialized_output_free(so); - _mode_info_free(sc->mode_info); - free(sc); -} - -//"New" helper functions - -/** - * @brief Seeks given data in the list and returns the index - * of the first element equaling @data - * @param list The list to be examined - * @param data The data to be found - * @return if found, the index of the list node. Else -1. - */ -int -_eina_list_data_index_get(const Eina_List *list, const void *data) -{ - Eina_List *iter; - void *ndata; - int i = 0; - - EINA_LIST_REVERSE_FOREACH(list, iter, ndata) - { - if (ndata == data) - return i; - else - i++; - } - - return -1; -} - -Ecore_X_Randr_Mode_Info -*_mode_info_clone(const Ecore_X_Randr_Mode_Info *src) -{ - Ecore_X_Randr_Mode_Info *mi = NULL; - - EINA_SAFETY_ON_NULL_RETURN_VAL(src, NULL); - - mi = E_NEW(Ecore_X_Randr_Mode_Info, 1); - - mi->xid = src->xid; - mi->width = src->width; - mi->height = src->height; - mi->dotClock = src->dotClock; - mi->hSyncStart = src->hSyncStart; - mi->hSyncEnd = src->hSyncEnd; - mi->hTotal = src->hTotal; - mi->hSkew = src->hSkew; - mi->vSyncStart = src->vSyncStart; - mi->vSyncEnd = src->vSyncEnd; - mi->vTotal = src->vTotal; - if (src->nameLength > 0) - { - mi->name = (char*)eina_stringshare_add(src->name); - } - mi->nameLength = src->nameLength; - mi->modeFlags = src->modeFlags; - - return mi; -} - -E_Randr_Edid_Hash -*_monitor_edid_hash_clone(E_Randr_Monitor_Info *mi) -{ - E_Randr_Edid_Hash *edid_hash; - - EINA_SAFETY_ON_NULL_RETURN_VAL(mi, NULL); - EINA_SAFETY_ON_TRUE_RETURN_VAL((mi->edid_hash.hash == 0), NULL); - edid_hash = malloc(sizeof(E_Randr_Edid_Hash)); - - edid_hash->hash = mi->edid_hash.hash; - - return edid_hash; -} - -Eina_List * -_outputs_policies_list_new(Eina_List *outputs) -{ - E_Randr_Serialized_Output_Policy *sop; - Eina_List *iter, *list = NULL; - E_Randr_Output_Info *oi; - - EINA_SAFETY_ON_NULL_RETURN_VAL(outputs, NULL); - - EINA_LIST_FOREACH(outputs, iter, oi) - { - if (!oi->name) continue; - - sop = E_NEW(E_Randr_Serialized_Output_Policy, 1); - sop->name = eina_stringshare_add(oi->name); - sop->policy = oi->policy; - list = eina_list_append(list, sop); - } - - return list; -} - -E_Randr_Serialized_Output * -_serialized_output_new(E_Randr_Output_Info *output_info) -{ - E_Randr_Serialized_Output *so; - - EINA_SAFETY_ON_NULL_RETURN_VAL(output_info, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(output_info->name, NULL); - - so = E_NEW(E_Randr_Serialized_Output, 1); - - so->name = eina_stringshare_add(output_info->name); - if (output_info->monitor) - { - so->backlight_level = output_info->monitor->backlight_level; - } - else - { - so->backlight_level = Ecore_X_Randr_Unset; - } - - return so; -} - -E_Randr_Serialized_Crtc * -_serialized_crtc_new(E_Randr_Crtc_Info *crtc_info) -{ - E_Randr_Serialized_Crtc *sc = NULL; - E_Randr_Serialized_Output *so = NULL; - E_Randr_Output_Info *output_info = NULL; - Eina_List *iter; - - EINA_SAFETY_ON_NULL_RETURN_VAL(crtc_info, NULL); - - sc = E_NEW(E_Randr_Serialized_Crtc, 1); - - //Get relative index of CRTC - sc->index = _eina_list_data_index_get(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, crtc_info); - - //Create list of serialized outputs - EINA_LIST_FOREACH(crtc_info->outputs, iter, output_info) - { - if (!(so = _serialized_output_new(output_info))) - continue; - sc->outputs = eina_list_append(sc->outputs, so); - INF("E_RANDR:\t Serialized output %s.", so->name); - } - sc->pos.x = crtc_info->geometry.x; - sc->pos.y = crtc_info->geometry.y; - sc->orientation = crtc_info->current_orientation; - //Clone mode - sc->mode_info = _mode_info_clone(crtc_info->current_mode); - - return sc; -} - -E_Randr_Serialized_Setup_12 * -_12_serialized_setup_new(void) -{ - E_Randr_Serialized_Setup_12 *ss = NULL; - Eina_List *iter; - E_Randr_Crtc_Info *ci; - E_Randr_Output_Info *oi; - E_Randr_Serialized_Crtc *sc; - E_Randr_Edid_Hash *edid_hash; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(e_randr_screen_info.rrvd_info.randr_info_12->outputs, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, NULL); - - ss = E_NEW(E_Randr_Serialized_Setup_12, 1); - - ss->timestamp = ecore_time_get(); - - //Add CRTCs and their configuration - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, ci) - { - if (!(sc = _serialized_crtc_new(ci))) continue; - ss->crtcs = eina_list_append(ss->crtcs, sc); - INF("E_RANDR: Serialized CRTC %d (index %d) in mode %s.", ci->xid, sc->index, (sc->mode_info ? sc->mode_info->name : "(disabled)")); - } - - /* - * Add EDID hashes of connected outputs - * for easier comparison during - * setup restoration - */ - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, iter, oi) - { - if (oi->connection_status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) - continue; - if (!(edid_hash = _monitor_edid_hash_clone(oi->monitor))) - continue; - ss->edid_hashes = eina_list_append(ss->edid_hashes, edid_hash); - } - - return ss; -} - -//Update (also retrieval) helper functions - -E_Randr_Serialized_Setup_12 * -_matching_serialized_setup_get(Eina_List *setups_12) -{ - E_Randr_Serialized_Setup_12 *ss_12; - Eina_List *setups_iter, *edid_iter; - E_Randr_Edid_Hash *edid_hash; - - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(setups_12, NULL); - - //Sort list of setups by the number of monitors involved - setups_12 = eina_list_sort(setups_12, 0, _sort_by_number_of_edids); - - EINA_LIST_FOREACH(setups_12, setups_iter, ss_12) - { - //1. Make sure: #outputs >= #serialized EDIDs - if (eina_list_count(e_randr_screen_info.rrvd_info.randr_info_12->outputs) < eina_list_count(ss_12->edid_hashes)) - continue; - //2. Compare #CRTCs - if (eina_list_count(e_randr_screen_info.rrvd_info.randr_info_12->crtcs) != eina_list_count(ss_12->crtcs)) - continue; - - //3. Find all serialized EDIDs - EINA_LIST_FOREACH(ss_12->edid_hashes, edid_iter, edid_hash) - { - if (!_12_screen_info_edid_is_available(edid_hash)) - goto _setup_12_skip; - } - - //4. All EDIDs found? Great, let's go! - return ss_12; -_setup_12_skip: - continue; - } - - // None found! - return NULL; -} - -Eina_List * -_outputs_policies_update(Eina_List *sops) -{ - E_Randr_Serialized_Output_Policy *sop; - - EINA_LIST_FREE (sops, sop) - { - _serialized_output_policy_free(sop); - } - - return _outputs_policies_list_new(e_randr_screen_info.rrvd_info.randr_info_12->outputs); -} - -Eina_List * -_12_serialized_setup_update(Eina_List *setups_12) -{ - E_Randr_Serialized_Setup_12 *ss_12; - - if (setups_12) - { - /* - * try to find the setup with the same monitors - * connected in order to replace it - */ - if ((ss_12 = _matching_serialized_setup_get(setups_12))) - { - INF("E_RANDR: Found stored configuration that matches current setup. It was created at %f. Freeing it...", ss_12->timestamp); - setups_12 = eina_list_remove(setups_12, ss_12); - _12_serialized_setup_free(ss_12); - } - } - ss_12 = _12_serialized_setup_new(); - setups_12 = eina_list_append(setups_12, ss_12); - - return setups_12; -} - -void -_12_policies_restore(void) -{ - E_Randr_Output_Info *output; - E_Randr_Serialized_Output_Policy *sop; - Eina_List *iter, *iter2; - - EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); - EINA_SAFETY_ON_NULL_RETURN(e_config->randr_serialized_setup); - EINA_SAFETY_ON_NULL_RETURN(e_config->randr_serialized_setup->outputs_policies); - - // Restore policies - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, iter, output) - { - EINA_LIST_FOREACH(e_config->randr_serialized_setup->outputs_policies, iter2, sop) - { - if (!strncmp(sop->name, output->name, output->name_length)) - { - output->policy = sop->policy; - INF("E_RANDR: Policy \"%s\" for output \"%s\" restored.", _POLICIES_STRINGS[sop->policy - 1], output->name); - } - } - } -} - -Eina_Bool -_12_try_restore_configuration(void) -{ - E_Randr_Serialized_Setup_12 *ss_12; - E_Randr_Serialized_Crtc *sc; - E_Randr_Crtc_Info *ci; - Ecore_X_Randr_Output *outputs_array; - E_Randr_Output_Info *output_info; - Ecore_X_Randr_Mode_Info *mi = NULL; - Ecore_X_Randr_Mode mode = 0; - Eina_List *iter, *outputs_list, *outputs_iter; - Eina_Bool ret = EINA_TRUE; - - EINA_SAFETY_ON_NULL_RETURN_VAL(e_config, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(e_config->randr_serialized_setup, EINA_FALSE); - - if (!(ss_12 = _matching_serialized_setup_get(e_config->randr_serialized_setup->serialized_setups_12))) - return EINA_FALSE; - - INF("E_RANDR: Found matching serialized setup."); - EINA_LIST_FOREACH(ss_12->crtcs, iter, sc) - { - ci = _find_matching_crtc(sc); - if (!ci) - { - ERR("E_RANDR: Cannot find a matching CRTC for serialized CRTC index %d.", sc->index); - return EINA_FALSE; - } - outputs_list = _find_matching_outputs(sc->outputs); - outputs_array = _outputs_to_array(outputs_list); - - if (!sc->mode_info) - { - INF("E_RANDR: \tSerialized mode was disabled."); - mode = Ecore_X_Randr_None; - } - else if ((mi = _find_matching_mode_info(sc->mode_info))) - { - INF("E_RANDR: \tSerialized mode is now known under the name %s.", mi->name); - mode = mi->xid; - } - else if (mi) /* FIXME: this is impossible, so whoever wrote it probably meant something else */ - { - // The serialized mode is no longer available - mi->name = malloc(MODE_STR_LENGTH_MAX); - //IMPROVABLE: Use random string, like mktemp for files - snprintf(mi->name, (MODE_STR_LENGTH_MAX - 1), "%ux%u,%lu,%lu", sc->mode_info->width, sc->mode_info->height, sc->mode_info->dotClock, sc->mode_info->modeFlags); - mi = sc->mode_info; - mode = ecore_x_randr_mode_info_add(e_randr_screen_info.root, mi); - if (mode == Ecore_X_Randr_None) - { - eina_list_free(outputs_list); - free(outputs_array); - continue; - } - EINA_LIST_FOREACH(outputs_list, outputs_iter, output_info) - ecore_x_randr_output_mode_add(output_info->xid, mode); - INF("E_RANDR: \tSerialized mode was added to the server manually using the name %s.", mi->name); - } - - // DEBUG - if (mi) - DBG("E_RANDR: \tRestoring CRTC %d (index %d) in mode %s.", ci->xid, sc->index, (mode == Ecore_X_Randr_None) ? "(disabled)" : mi->name); - DBG("E_RANDR: \t\tUsed outputs:"); - EINA_LIST_FOREACH(outputs_list, outputs_iter, output_info) - DBG("\t\t%s", output_info->name); - // DEBUG END - - ret &= ecore_x_randr_crtc_settings_set(e_randr_screen_info.root, ci->xid, outputs_array, eina_list_count(outputs_list), sc->pos.x, sc->pos.y, mode, sc->orientation); - eina_list_free(outputs_list); - free(outputs_array); - } - return ret; -} - -void -_12_serialized_setup_free(E_Randr_Serialized_Setup_12 *ss_12) -{ - E_Randr_Serialized_Crtc *sc; - E_Randr_Edid_Hash *edid_hash; - - if (!ss_12) return; - - EINA_LIST_FREE (ss_12->crtcs, sc) - { - _serialized_crtc_free(sc); - } - EINA_LIST_FREE (ss_12->edid_hashes, edid_hash) - free(edid_hash); - - free(ss_12); -} - -EINTERN void -e_randr_12_serialized_setup_free(E_Randr_Serialized_Setup_12 *ss_12) -{ - _12_serialized_setup_free(ss_12); -} - -void -_12_store_configuration(E_Randr_Configuration_Store_Modifier modifier) -{ - if (modifier & (E_RANDR_CONFIGURATION_STORE_RESOLUTIONS | E_RANDR_CONFIGURATION_STORE_ARRANGEMENT | E_RANDR_CONFIGURATION_STORE_ORIENTATIONS)) - { - e_config->randr_serialized_setup->serialized_setups_12 = _12_serialized_setup_update(e_config->randr_serialized_setup->serialized_setups_12); - } - - if (modifier & E_RANDR_CONFIGURATION_STORE_POLICIES) - { - //update output policies - e_config->randr_serialized_setup->outputs_policies = _outputs_policies_update(e_config->randr_serialized_setup->outputs_policies); - } -} - -//Retrievel functions for the current e_randr_screen_info context - -// Find entities for restoration in current e_randr_screen_info context -static E_Randr_Crtc_Info * -_find_matching_crtc(E_Randr_Serialized_Crtc *sc) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(sc, NULL); - EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, NULL); - - INF("E_RANDR: Setup restore.. Runtime system knows about %d CRTCs. Requested CRTC has index %d", eina_list_count(e_randr_screen_info.rrvd_info.randr_info_12->crtcs), sc->index); - return eina_list_nth(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, sc->index); -} - -/** - * @brief Creates list of E_Randr_Output_Info* elements for list of - * E_Randr_Serialized_Output* objects. - * @param sois list of E_Randr_Serialized_Output* elements - * @return List of E_Randr_Output* elements or NULL, if not all outputs could be - * found or monitors are connected to different outputs - */ -static Eina_List * -_find_matching_outputs(Eina_List *sois) -{ - Eina_List *r_output_iter, *s_output_iter, *list = NULL; - E_Randr_Output_Info *oi; - E_Randr_Serialized_Output *so; - - EINA_LIST_FOREACH(sois, s_output_iter, so) - { - INF("E_RANDR: \tLooking for serialized output \"%s\"", so->name); - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->outputs, r_output_iter, oi) - { - INF("E_RANDR: \t\tComparing to output \"%s\"", oi->name); - if (!strncmp(so->name, oi->name, oi->name_length)) - { - - list = eina_list_append(list, oi); - break; - } - } - } - if (list && (eina_list_count(sois) != eina_list_count(list))) - { - eina_list_free(list); - list = NULL; - } - - return list; -} - -static Ecore_X_Randr_Mode_Info * -_find_matching_mode_info(Ecore_X_Randr_Mode_Info *mode) -{ - Eina_List *iter; - Ecore_X_Randr_Mode_Info *mi = NULL; - - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->modes, iter, mi) - { - if (!strncmp(mode->name, mi->name, mode->nameLength)) - return mi; - } - EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->modes, iter, mi) - { -#define EQL(arg) (mi->arg == mode->arg) - if (EQL(width) && - EQL(height) && - EQL(dotClock) && - EQL(hSyncStart) && - EQL(hSyncEnd) && - EQL(hTotal) && - EQL(hSkew) && - EQL(vSyncStart) && - EQL(vSyncEnd) && - EQL(vTotal) && - EQL(modeFlags)) - return mi; -#undef EQL - } - return NULL; -} - -static int -_sort_by_number_of_edids(const void *d1, const void *d2) -{ - const E_Randr_Serialized_Setup_12 *ss1 = (const E_Randr_Serialized_Setup_12*)d1; - const E_Randr_Serialized_Setup_12 *ss2 = (const E_Randr_Serialized_Setup_12*)d2; - - EINA_SAFETY_ON_NULL_RETURN_VAL(ss1, 1); - EINA_SAFETY_ON_NULL_RETURN_VAL(ss2, -1); - - if (eina_list_count(ss2->edid_hashes) > eina_list_count(ss1->edid_hashes)) - return 1; - else - return -1; -} diff --git a/src/bin/e_randr_private.h b/src/bin/e_randr_private.h deleted file mode 100644 index cada26aa2a..0000000000 --- a/src/bin/e_randr_private.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifdef E_TYPEDEFS - -#else -#ifndef E_RANDR_PRIVATE_H -#define E_RANDR_PRIVATE_H - -#include "e.h" - -#define ECORE_X_RANDR_1_1 ((1 << 16) | 1) -#define ECORE_X_RANDR_1_2 ((1 << 16) | 2) -#define ECORE_X_RANDR_1_3 ((1 << 16) | 3) - -#define Ecore_X_Randr_Unset -1 -#define Ecore_X_Randr_None 0 - -#define E_RANDR_11_NO ((e_randr_screen_info.randr_version < ECORE_X_RANDR_1_1) || !e_randr_screen_info.rrvd_info.randr_info_11) -#define E_RANDR_12_NO ((e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2) || !e_randr_screen_info.rrvd_info.randr_info_12) -#define E_RANDR_12_NO_CRTCS (E_RANDR_12_NO || !e_randr_screen_info.rrvd_info.randr_info_12->crtcs) -#define E_RANDR_12_NO_CRTC(crtc) (E_RANDR_12_NO || !e_randr_screen_info.rrvd_info.randr_info_12->crtcs || (crtc == Ecore_X_Randr_None)) -#define E_RANDR_12_NO_OUTPUTS (E_RANDR_12_NO || !e_randr_screen_info.rrvd_info.randr_info_12->outputs) -#define E_RANDR_12_NO_OUTPUT(output) (E_RANDR_12_NO || !e_randr_screen_info.rrvd_info.randr_info_12->outputs || (output == Ecore_X_Randr_None)) -#define E_RANDR_12_NO_MODES (E_RANDR_12_NO || !e_randr_screen_info.rrvd_info.randr_info_12->modes) -#define E_RANDR_12_NO_MODE(mode) (E_RANDR_12_NO || !e_randr_screen_info.rrvd_info.randr_info_12->modes || (mode == Ecore_X_Randr_None)) - -// RandRR == 1.1 -E_Randr_Screen_Info_11 *_11_screen_info_new(void); -void _11_screen_info_free(E_Randr_Screen_Info_11 *screen_info_11); -Eina_Bool _11_screen_info_refresh(void); -Eina_Bool _11_try_restore_configuration(void); -void _11_store_configuration(E_Randr_Configuration_Store_Modifier modifier); - -// RandRR >= 1.2 -E_Randr_Screen_Info_12 *_12_screen_info_new(void); -void _12_screen_info_free(E_Randr_Screen_Info_12 *screen_info_12); -Eina_Bool _12_screen_info_refresh(void); -void _12_policies_restore(void); -void _12_event_listeners_add(void); -void _12_event_listeners_remove(void); -// Retrieval functions -Ecore_X_Randr_Mode_Info *_12_screen_info_mode_info_get(const Ecore_X_Randr_Mode mode); -E_Randr_Crtc_Info *_12_screen_info_crtc_info_get(const Ecore_X_Randr_Crtc crtc); -E_Randr_Output_Info *_12_screen_info_output_info_get(const Ecore_X_Randr_Output output); -Eina_Bool _12_screen_info_edid_is_available(const E_Randr_Edid_Hash *hash); -// (Re)store data -E_Randr_Serialized_Setup_12 *_12_serialized_setup_new(void); -void _12_serialized_setup_free(E_Randr_Serialized_Setup_12 *ss_12); -Eina_Bool _12_try_restore_configuration(void); -void _12_store_configuration(E_Randr_Configuration_Store_Modifier modifier); - -// >= 1.2 Substructures helper functions -E_Randr_Monitor_Info *_monitor_info_new(E_Randr_Output_Info *output_info); -void _monitor_info_free(E_Randr_Monitor_Info *monitor_info); -void _monitor_modes_refs_set(E_Randr_Monitor_Info *mi, Ecore_X_Randr_Output output); -E_Randr_Output_Info *_output_info_new(Ecore_X_Randr_Output output); -void _output_info_free(E_Randr_Output_Info *output_info); -void _output_refs_set(E_Randr_Output_Info *output_info); -Ecore_X_Randr_Output *_outputs_to_array(Eina_List *outputs_info); -Eina_List *_outputs_common_modes_get(Eina_List *outputs, Ecore_X_Randr_Mode_Info *max_size_mode); - -E_Randr_Crtc_Info * _crtc_info_new(Ecore_X_Randr_Crtc crtc); -void _crtc_info_free(E_Randr_Crtc_Info *crtc_info); -void _crtc_refs_set(E_Randr_Crtc_Info *crtc_info); -void _crtc_outputs_refs_set(E_Randr_Crtc_Info *crtc_info); -const E_Randr_Crtc_Info *_crtc_according_to_policy_get(E_Randr_Crtc_Info *but, Ecore_X_Randr_Output_Policy policy); - -#endif -#endif diff --git a/src/bin/e_randr_serialization.c b/src/bin/e_randr_serialization.c deleted file mode 100644 index 19a94fe464..0000000000 --- a/src/bin/e_randr_serialization.c +++ /dev/null @@ -1,81 +0,0 @@ -#include "e_randr_private.h" -#include "e_randr.h" - -#define ECORE_X_RANDR_1_1 ((1 << 16) | 1) -#define ECORE_X_RANDR_1_2 ((1 << 16) | 2) -#define ECORE_X_RANDR_1_3 ((1 << 16) | 3) - -/********************************************************************** - * - * Storage/Restorage of setups - * - ********************************************************************** - */ - -EAPI void -e_randr_store_configuration(E_Randr_Configuration_Store_Modifier modifier) -{ - if (!e_config->randr_serialized_setup) - e_config->randr_serialized_setup = e_randr_serialized_setup_new(); - - fprintf(stderr, "E_RANDR: Configuration shall be stored using the following modifier:%s\n%s%s%s%s", - ((!modifier) ? "NONE" : ""), - ((modifier & E_RANDR_CONFIGURATION_STORE_POLICIES) ? "\tPOLICIES\n" : ""), - ((modifier & E_RANDR_CONFIGURATION_STORE_RESOLUTIONS) ? "\tRESOLUTIONS\n" : ""), - ((modifier & E_RANDR_CONFIGURATION_STORE_ARRANGEMENT) ? "\tARRANGEMENTS\n" : ""), - ((modifier & E_RANDR_CONFIGURATION_STORE_ORIENTATIONS) ? "\tORIENTATIONS\n" : "")); - - if (e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) - { - _11_store_configuration(modifier); - } - else if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) - { - _12_store_configuration(modifier); - } - e_config_save_queue(); -} - -EAPI Eina_Bool -e_randr_try_restore_configuration(void) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(e_config, EINA_FALSE); - if (!e_config->randr_serialized_setup) return EINA_FALSE; - - if ((e_randr_screen_info.randr_version == ECORE_X_RANDR_1_1) || - ((e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_1) && e_config->randr_serialized_setup->serialized_setup_11 && !e_config->randr_serialized_setup->serialized_setups_12)) // either be 1.1 or maybe we have stored a resolution using the old conf_display dialog (which uses randr 1.1) - return _11_try_restore_configuration(); - else if (e_randr_screen_info.randr_version >= ECORE_X_RANDR_1_2) - return _12_try_restore_configuration(); - - return EINA_FALSE; -} - -EINTERN E_Randr_Serialized_Setup * -e_randr_serialized_setup_new(void) -{ - return E_NEW(E_Randr_Serialized_Setup, 1); -} - -EINTERN void -e_randr_serialized_setup_free(E_Randr_Serialized_Setup *ss) -{ - E_Randr_Serialized_Setup_12 *serialized_setup_12 = NULL; - E_Randr_Serialized_Output_Policy *serialized_output_policy = NULL; - - EINA_SAFETY_ON_NULL_RETURN(ss); - - e_randr_11_serialized_setup_free(ss->serialized_setup_11); - if (ss->serialized_setups_12) - { - EINA_LIST_FREE(ss->serialized_setups_12, serialized_setup_12) - { - e_randr_12_serialized_setup_free(serialized_setup_12); - } - } - EINA_LIST_FREE(ss->outputs_policies, serialized_output_policy) - { - e_randr_12_serialized_output_policy_free(serialized_output_policy); - } - free(ss); -} diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 321a634a90..65cf6310cf 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -723,6 +723,7 @@ _e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__, void *border) } bd->changes.size = 1; bd->changes.shape = 1; + BD_CHANGED(bd); } if ((rem->apply & E_REMEMBER_APPLY_POS) && (!bd->re_manage)) { @@ -836,6 +837,7 @@ _e_remember_cb_hook_pre_post_fetch(void *data __UNUSED__, void *border) bd->y += bd->zone->y; bd->placed = 1; bd->changes.pos = 1; + BD_CHANGED(bd); } if (rem->apply & E_REMEMBER_APPLY_LAYER) { diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c index 178a4aec3f..c6059843e3 100644 --- a/src/bin/e_widget.c +++ b/src/bin/e_widget.c @@ -244,7 +244,7 @@ e_widget_focus_jump(Evas_Object *obj, int forward) Evas_Object *sobj = NULL; int focus_next = 0; - if (!sd->focused) + if ((!sd->disabled) && (!sd->focused)) { e_widget_focus_set(obj, forward); sd->focused = 1; @@ -258,7 +258,7 @@ e_widget_focus_jump(Evas_Object *obj, int forward) EINA_LIST_FOREACH(sd->subobjs, l, sobj) { if (!e_widget_can_focus_get(sobj)) continue; - if ((focus_next) && (!e_widget_disabled_get(sobj))) + if (focus_next) { /* the previous focused item was unfocused - so focus * the next one (that can be focused) */ @@ -450,7 +450,11 @@ e_widget_disabled_set(Evas_Object *obj, int disabled) if (!o) break; parent = o; } - e_widget_focus_jump(parent, 1); + if (!e_widget_focus_jump(parent, 1)) + { + sd->focused = 0; + if (sd->focus_func) sd->focus_func(obj); + } } if (sd->disable_func) sd->disable_func(obj); } diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in index 5541b9f35d..d463a7deb4 100644 --- a/src/modules/Makefile.in +++ b/src/modules/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,51 +80,50 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_everything_headers_DATA_DIST) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile_access.am $(srcdir)/Makefile_backlight.am \ - $(srcdir)/Makefile_battery.am $(srcdir)/Makefile_clock.am \ - $(srcdir)/Makefile_comp.am $(srcdir)/Makefile_conf.am \ +DIST_COMMON = $(srcdir)/Makefile_connman.am $(srcdir)/Makefile_ibar.am \ + $(srcdir)/Makefile_dropshadow.am $(srcdir)/Makefile_clock.am \ + $(srcdir)/Makefile_pager.am $(srcdir)/Makefile_battery.am \ + $(srcdir)/Makefile_temperature.am \ + $(srcdir)/Makefile_notification.am \ + $(srcdir)/Makefile_cpufreq.am $(srcdir)/Makefile_ibox.am \ + $(srcdir)/Makefile_start.am $(srcdir)/Makefile_winlist.am \ + $(srcdir)/Makefile_fileman.am \ + $(srcdir)/Makefile_fileman_opinfo.am \ + $(srcdir)/Makefile_wizard.am $(srcdir)/Makefile_conf.am \ + $(srcdir)/Makefile_conf_wallpaper2.am \ + $(srcdir)/Makefile_conf_theme.am \ + $(srcdir)/Makefile_conf_intl.am $(srcdir)/Makefile_msgbus.am \ $(srcdir)/Makefile_conf_applications.am \ - $(srcdir)/Makefile_conf_dialogs.am \ $(srcdir)/Makefile_conf_display.am \ - $(srcdir)/Makefile_conf_edgebindings.am \ - $(srcdir)/Makefile_conf_interaction.am \ - $(srcdir)/Makefile_conf_intl.am \ + $(srcdir)/Makefile_conf_shelves.am \ $(srcdir)/Makefile_conf_keybindings.am \ + $(srcdir)/Makefile_conf_edgebindings.am \ + $(srcdir)/Makefile_conf_window_remembers.am \ + $(srcdir)/Makefile_conf_window_manipulation.am \ $(srcdir)/Makefile_conf_menus.am \ - $(srcdir)/Makefile_conf_paths.am \ + $(srcdir)/Makefile_conf_dialogs.am \ $(srcdir)/Makefile_conf_performance.am \ - $(srcdir)/Makefile_conf_randr.am \ - $(srcdir)/Makefile_conf_shelves.am \ - $(srcdir)/Makefile_conf_theme.am \ - $(srcdir)/Makefile_conf_wallpaper2.am \ - $(srcdir)/Makefile_conf_window_manipulation.am \ - $(srcdir)/Makefile_conf_window_remembers.am \ - $(srcdir)/Makefile_connman.am $(srcdir)/Makefile_cpufreq.am \ - $(srcdir)/Makefile_dropshadow.am \ - $(srcdir)/Makefile_everything.am $(srcdir)/Makefile_fileman.am \ - $(srcdir)/Makefile_fileman_opinfo.am \ - $(srcdir)/Makefile_gadman.am $(srcdir)/Makefile_ibar.am \ - $(srcdir)/Makefile_ibox.am \ - $(srcdir)/Makefile_illume-bluetooth.am \ - $(srcdir)/Makefile_illume-home-toggle.am \ + $(srcdir)/Makefile_conf_paths.am \ + $(srcdir)/Makefile_conf_interaction.am \ + $(srcdir)/Makefile_conf_randr.am $(srcdir)/Makefile_gadman.am \ + $(srcdir)/Makefile_mixer.am $(srcdir)/Makefile_illume2.am \ $(srcdir)/Makefile_illume-home.am \ + $(srcdir)/Makefile_illume-home-toggle.am \ + $(srcdir)/Makefile_illume-softkey.am \ + $(srcdir)/Makefile_illume-keyboard.am \ $(srcdir)/Makefile_illume-indicator.am \ $(srcdir)/Makefile_illume-kbd-toggle.am \ - $(srcdir)/Makefile_illume-keyboard.am \ $(srcdir)/Makefile_illume-mode-toggle.am \ - $(srcdir)/Makefile_illume-softkey.am \ - $(srcdir)/Makefile_illume2.am $(srcdir)/Makefile_mixer.am \ - $(srcdir)/Makefile_msgbus.am \ - $(srcdir)/Makefile_notification.am $(srcdir)/Makefile_pager.am \ + $(srcdir)/Makefile_illume-bluetooth.am \ + $(srcdir)/Makefile_syscon.am $(srcdir)/Makefile_everything.am \ + $(srcdir)/Makefile_systray.am $(srcdir)/Makefile_comp.am \ $(srcdir)/Makefile_physics.am \ $(srcdir)/Makefile_quickaccess.am $(srcdir)/Makefile_shot.am \ - $(srcdir)/Makefile_start.am $(srcdir)/Makefile_syscon.am \ - $(srcdir)/Makefile_systray.am $(srcdir)/Makefile_tasks.am \ - $(srcdir)/Makefile_temperature.am $(srcdir)/Makefile_tiling.am \ - $(srcdir)/Makefile_winlist.am $(srcdir)/Makefile_wizard.am \ - $(srcdir)/Makefile_xkbswitch.am + $(srcdir)/Makefile_backlight.am $(srcdir)/Makefile_tasks.am \ + $(srcdir)/Makefile_xkbswitch.am $(srcdir)/Makefile_tiling.am \ + $(srcdir)/Makefile_access.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/depcomp \ + $(am__dist_everything_headers_DATA_DIST) @USE_MODULE_CONNMAN_TRUE@am__append_1 = $(connman_DATA) @USE_MODULE_IBAR_TRUE@am__append_2 = $(ibar_DATA) @USE_MODULE_DROPSHADOW_TRUE@am__append_3 = $(dropshadow_DATA) @@ -392,6 +418,7 @@ access_module_la_OBJECTS = $(am_access_module_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = @USE_MODULE_ACCESS_TRUE@am_access_module_la_rpath = -rpath \ @USE_MODULE_ACCESS_TRUE@ $(accesspkgdir) backlight_module_la_LIBADD = @@ -1331,6 +1358,18 @@ am__temperature_tempget_SOURCES_DIST = temperature/tempget.c @USE_MODULE_TEMPERATURE_TRUE@ temperature/tempget.$(OBJEXT) temperature_tempget_OBJECTS = $(am_temperature_tempget_OBJECTS) temperature_tempget_DEPENDENCIES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -1343,20 +1382,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(access_module_la_SOURCES) $(backlight_module_la_SOURCES) \ $(battery_module_la_SOURCES) $(clock_module_la_SOURCES) \ $(comp_module_la_SOURCES) $(conf_module_la_SOURCES) \ @@ -1496,13 +1531,14 @@ DIST_SOURCES = $(am__access_module_la_SOURCES_DIST) \ $(am__battery_batget_SOURCES_DIST) \ $(am__cpufreq_freqset_SOURCES_DIST) \ $(am__temperature_tempget_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1536,9 +1572,29 @@ DATA = $(access_DATA) $(backlight_DATA) $(battery_DATA) $(clock_DATA) \ $(wizard_desks_DATA) $(wizard_desktop_DATA) $(xkbswitch_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -2718,6 +2774,7 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-accesspkgLTLIBRARIES: $(accesspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(accesspkg_LTLIBRARIES)'; test -n "$(accesspkgdir)" || list=; \ @@ -2744,12 +2801,15 @@ uninstall-accesspkgLTLIBRARIES: clean-accesspkgLTLIBRARIES: -test -z "$(accesspkg_LTLIBRARIES)" || rm -f $(accesspkg_LTLIBRARIES) - @list='$(accesspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(accesspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-backlightpkgLTLIBRARIES: $(backlightpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(backlightpkg_LTLIBRARIES)'; test -n "$(backlightpkgdir)" || list=; \ @@ -2776,12 +2836,15 @@ uninstall-backlightpkgLTLIBRARIES: clean-backlightpkgLTLIBRARIES: -test -z "$(backlightpkg_LTLIBRARIES)" || rm -f $(backlightpkg_LTLIBRARIES) - @list='$(backlightpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(backlightpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-batterypkgLTLIBRARIES: $(batterypkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(batterypkg_LTLIBRARIES)'; test -n "$(batterypkgdir)" || list=; \ @@ -2808,12 +2871,15 @@ uninstall-batterypkgLTLIBRARIES: clean-batterypkgLTLIBRARIES: -test -z "$(batterypkg_LTLIBRARIES)" || rm -f $(batterypkg_LTLIBRARIES) - @list='$(batterypkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(batterypkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-clockpkgLTLIBRARIES: $(clockpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(clockpkg_LTLIBRARIES)'; test -n "$(clockpkgdir)" || list=; \ @@ -2840,12 +2906,15 @@ uninstall-clockpkgLTLIBRARIES: clean-clockpkgLTLIBRARIES: -test -z "$(clockpkg_LTLIBRARIES)" || rm -f $(clockpkg_LTLIBRARIES) - @list='$(clockpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(clockpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-comppkgLTLIBRARIES: $(comppkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(comppkg_LTLIBRARIES)'; test -n "$(comppkgdir)" || list=; \ @@ -2872,12 +2941,15 @@ uninstall-comppkgLTLIBRARIES: clean-comppkgLTLIBRARIES: -test -z "$(comppkg_LTLIBRARIES)" || rm -f $(comppkg_LTLIBRARIES) - @list='$(comppkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(comppkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_applicationspkgLTLIBRARIES: $(conf_applicationspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_applicationspkg_LTLIBRARIES)'; test -n "$(conf_applicationspkgdir)" || list=; \ @@ -2904,12 +2976,15 @@ uninstall-conf_applicationspkgLTLIBRARIES: clean-conf_applicationspkgLTLIBRARIES: -test -z "$(conf_applicationspkg_LTLIBRARIES)" || rm -f $(conf_applicationspkg_LTLIBRARIES) - @list='$(conf_applicationspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_applicationspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_dialogspkgLTLIBRARIES: $(conf_dialogspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_dialogspkg_LTLIBRARIES)'; test -n "$(conf_dialogspkgdir)" || list=; \ @@ -2936,12 +3011,15 @@ uninstall-conf_dialogspkgLTLIBRARIES: clean-conf_dialogspkgLTLIBRARIES: -test -z "$(conf_dialogspkg_LTLIBRARIES)" || rm -f $(conf_dialogspkg_LTLIBRARIES) - @list='$(conf_dialogspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_dialogspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_displaypkgLTLIBRARIES: $(conf_displaypkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_displaypkg_LTLIBRARIES)'; test -n "$(conf_displaypkgdir)" || list=; \ @@ -2968,12 +3046,15 @@ uninstall-conf_displaypkgLTLIBRARIES: clean-conf_displaypkgLTLIBRARIES: -test -z "$(conf_displaypkg_LTLIBRARIES)" || rm -f $(conf_displaypkg_LTLIBRARIES) - @list='$(conf_displaypkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_displaypkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_edgebindingspkgLTLIBRARIES: $(conf_edgebindingspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_edgebindingspkg_LTLIBRARIES)'; test -n "$(conf_edgebindingspkgdir)" || list=; \ @@ -3000,12 +3081,15 @@ uninstall-conf_edgebindingspkgLTLIBRARIES: clean-conf_edgebindingspkgLTLIBRARIES: -test -z "$(conf_edgebindingspkg_LTLIBRARIES)" || rm -f $(conf_edgebindingspkg_LTLIBRARIES) - @list='$(conf_edgebindingspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_edgebindingspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_interactionpkgLTLIBRARIES: $(conf_interactionpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_interactionpkg_LTLIBRARIES)'; test -n "$(conf_interactionpkgdir)" || list=; \ @@ -3032,12 +3116,15 @@ uninstall-conf_interactionpkgLTLIBRARIES: clean-conf_interactionpkgLTLIBRARIES: -test -z "$(conf_interactionpkg_LTLIBRARIES)" || rm -f $(conf_interactionpkg_LTLIBRARIES) - @list='$(conf_interactionpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_interactionpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_intlpkgLTLIBRARIES: $(conf_intlpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_intlpkg_LTLIBRARIES)'; test -n "$(conf_intlpkgdir)" || list=; \ @@ -3064,12 +3151,15 @@ uninstall-conf_intlpkgLTLIBRARIES: clean-conf_intlpkgLTLIBRARIES: -test -z "$(conf_intlpkg_LTLIBRARIES)" || rm -f $(conf_intlpkg_LTLIBRARIES) - @list='$(conf_intlpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_intlpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_keybindingspkgLTLIBRARIES: $(conf_keybindingspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_keybindingspkg_LTLIBRARIES)'; test -n "$(conf_keybindingspkgdir)" || list=; \ @@ -3096,12 +3186,15 @@ uninstall-conf_keybindingspkgLTLIBRARIES: clean-conf_keybindingspkgLTLIBRARIES: -test -z "$(conf_keybindingspkg_LTLIBRARIES)" || rm -f $(conf_keybindingspkg_LTLIBRARIES) - @list='$(conf_keybindingspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_keybindingspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_menuspkgLTLIBRARIES: $(conf_menuspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_menuspkg_LTLIBRARIES)'; test -n "$(conf_menuspkgdir)" || list=; \ @@ -3128,12 +3221,15 @@ uninstall-conf_menuspkgLTLIBRARIES: clean-conf_menuspkgLTLIBRARIES: -test -z "$(conf_menuspkg_LTLIBRARIES)" || rm -f $(conf_menuspkg_LTLIBRARIES) - @list='$(conf_menuspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_menuspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_pathspkgLTLIBRARIES: $(conf_pathspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_pathspkg_LTLIBRARIES)'; test -n "$(conf_pathspkgdir)" || list=; \ @@ -3160,12 +3256,15 @@ uninstall-conf_pathspkgLTLIBRARIES: clean-conf_pathspkgLTLIBRARIES: -test -z "$(conf_pathspkg_LTLIBRARIES)" || rm -f $(conf_pathspkg_LTLIBRARIES) - @list='$(conf_pathspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_pathspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_performancepkgLTLIBRARIES: $(conf_performancepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_performancepkg_LTLIBRARIES)'; test -n "$(conf_performancepkgdir)" || list=; \ @@ -3192,12 +3291,15 @@ uninstall-conf_performancepkgLTLIBRARIES: clean-conf_performancepkgLTLIBRARIES: -test -z "$(conf_performancepkg_LTLIBRARIES)" || rm -f $(conf_performancepkg_LTLIBRARIES) - @list='$(conf_performancepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_performancepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_randrpkgLTLIBRARIES: $(conf_randrpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_randrpkg_LTLIBRARIES)'; test -n "$(conf_randrpkgdir)" || list=; \ @@ -3224,12 +3326,15 @@ uninstall-conf_randrpkgLTLIBRARIES: clean-conf_randrpkgLTLIBRARIES: -test -z "$(conf_randrpkg_LTLIBRARIES)" || rm -f $(conf_randrpkg_LTLIBRARIES) - @list='$(conf_randrpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_randrpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_shelvespkgLTLIBRARIES: $(conf_shelvespkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_shelvespkg_LTLIBRARIES)'; test -n "$(conf_shelvespkgdir)" || list=; \ @@ -3256,12 +3361,15 @@ uninstall-conf_shelvespkgLTLIBRARIES: clean-conf_shelvespkgLTLIBRARIES: -test -z "$(conf_shelvespkg_LTLIBRARIES)" || rm -f $(conf_shelvespkg_LTLIBRARIES) - @list='$(conf_shelvespkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_shelvespkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_themepkgLTLIBRARIES: $(conf_themepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_themepkg_LTLIBRARIES)'; test -n "$(conf_themepkgdir)" || list=; \ @@ -3288,12 +3396,15 @@ uninstall-conf_themepkgLTLIBRARIES: clean-conf_themepkgLTLIBRARIES: -test -z "$(conf_themepkg_LTLIBRARIES)" || rm -f $(conf_themepkg_LTLIBRARIES) - @list='$(conf_themepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_themepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_wallpaper2pkgLTLIBRARIES: $(conf_wallpaper2pkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_wallpaper2pkg_LTLIBRARIES)'; test -n "$(conf_wallpaper2pkgdir)" || list=; \ @@ -3320,12 +3431,15 @@ uninstall-conf_wallpaper2pkgLTLIBRARIES: clean-conf_wallpaper2pkgLTLIBRARIES: -test -z "$(conf_wallpaper2pkg_LTLIBRARIES)" || rm -f $(conf_wallpaper2pkg_LTLIBRARIES) - @list='$(conf_wallpaper2pkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_wallpaper2pkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_window_manipulationpkgLTLIBRARIES: $(conf_window_manipulationpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_window_manipulationpkg_LTLIBRARIES)'; test -n "$(conf_window_manipulationpkgdir)" || list=; \ @@ -3352,12 +3466,15 @@ uninstall-conf_window_manipulationpkgLTLIBRARIES: clean-conf_window_manipulationpkgLTLIBRARIES: -test -z "$(conf_window_manipulationpkg_LTLIBRARIES)" || rm -f $(conf_window_manipulationpkg_LTLIBRARIES) - @list='$(conf_window_manipulationpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_window_manipulationpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-conf_window_rememberspkgLTLIBRARIES: $(conf_window_rememberspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(conf_window_rememberspkg_LTLIBRARIES)'; test -n "$(conf_window_rememberspkgdir)" || list=; \ @@ -3384,12 +3501,15 @@ uninstall-conf_window_rememberspkgLTLIBRARIES: clean-conf_window_rememberspkgLTLIBRARIES: -test -z "$(conf_window_rememberspkg_LTLIBRARIES)" || rm -f $(conf_window_rememberspkg_LTLIBRARIES) - @list='$(conf_window_rememberspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(conf_window_rememberspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-confpkgLTLIBRARIES: $(confpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(confpkg_LTLIBRARIES)'; test -n "$(confpkgdir)" || list=; \ @@ -3416,12 +3536,15 @@ uninstall-confpkgLTLIBRARIES: clean-confpkgLTLIBRARIES: -test -z "$(confpkg_LTLIBRARIES)" || rm -f $(confpkg_LTLIBRARIES) - @list='$(confpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(confpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-connmanpkgLTLIBRARIES: $(connmanpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(connmanpkg_LTLIBRARIES)'; test -n "$(connmanpkgdir)" || list=; \ @@ -3448,12 +3571,15 @@ uninstall-connmanpkgLTLIBRARIES: clean-connmanpkgLTLIBRARIES: -test -z "$(connmanpkg_LTLIBRARIES)" || rm -f $(connmanpkg_LTLIBRARIES) - @list='$(connmanpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(connmanpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-cpufreqpkgLTLIBRARIES: $(cpufreqpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(cpufreqpkg_LTLIBRARIES)'; test -n "$(cpufreqpkgdir)" || list=; \ @@ -3480,12 +3606,15 @@ uninstall-cpufreqpkgLTLIBRARIES: clean-cpufreqpkgLTLIBRARIES: -test -z "$(cpufreqpkg_LTLIBRARIES)" || rm -f $(cpufreqpkg_LTLIBRARIES) - @list='$(cpufreqpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(cpufreqpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-dropshadowpkgLTLIBRARIES: $(dropshadowpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(dropshadowpkg_LTLIBRARIES)'; test -n "$(dropshadowpkgdir)" || list=; \ @@ -3512,12 +3641,15 @@ uninstall-dropshadowpkgLTLIBRARIES: clean-dropshadowpkgLTLIBRARIES: -test -z "$(dropshadowpkg_LTLIBRARIES)" || rm -f $(dropshadowpkg_LTLIBRARIES) - @list='$(dropshadowpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(dropshadowpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-everythingpkgLTLIBRARIES: $(everythingpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(everythingpkg_LTLIBRARIES)'; test -n "$(everythingpkgdir)" || list=; \ @@ -3544,12 +3676,15 @@ uninstall-everythingpkgLTLIBRARIES: clean-everythingpkgLTLIBRARIES: -test -z "$(everythingpkg_LTLIBRARIES)" || rm -f $(everythingpkg_LTLIBRARIES) - @list='$(everythingpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(everythingpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-fileman_opinfopkgLTLIBRARIES: $(fileman_opinfopkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(fileman_opinfopkg_LTLIBRARIES)'; test -n "$(fileman_opinfopkgdir)" || list=; \ @@ -3576,12 +3711,15 @@ uninstall-fileman_opinfopkgLTLIBRARIES: clean-fileman_opinfopkgLTLIBRARIES: -test -z "$(fileman_opinfopkg_LTLIBRARIES)" || rm -f $(fileman_opinfopkg_LTLIBRARIES) - @list='$(fileman_opinfopkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(fileman_opinfopkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-filemanpkgLTLIBRARIES: $(filemanpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(filemanpkg_LTLIBRARIES)'; test -n "$(filemanpkgdir)" || list=; \ @@ -3608,12 +3746,15 @@ uninstall-filemanpkgLTLIBRARIES: clean-filemanpkgLTLIBRARIES: -test -z "$(filemanpkg_LTLIBRARIES)" || rm -f $(filemanpkg_LTLIBRARIES) - @list='$(filemanpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(filemanpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-gadmanpkgLTLIBRARIES: $(gadmanpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(gadmanpkg_LTLIBRARIES)'; test -n "$(gadmanpkgdir)" || list=; \ @@ -3640,12 +3781,15 @@ uninstall-gadmanpkgLTLIBRARIES: clean-gadmanpkgLTLIBRARIES: -test -z "$(gadmanpkg_LTLIBRARIES)" || rm -f $(gadmanpkg_LTLIBRARIES) - @list='$(gadmanpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(gadmanpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-ibarpkgLTLIBRARIES: $(ibarpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(ibarpkg_LTLIBRARIES)'; test -n "$(ibarpkgdir)" || list=; \ @@ -3672,12 +3816,15 @@ uninstall-ibarpkgLTLIBRARIES: clean-ibarpkgLTLIBRARIES: -test -z "$(ibarpkg_LTLIBRARIES)" || rm -f $(ibarpkg_LTLIBRARIES) - @list='$(ibarpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(ibarpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-iboxpkgLTLIBRARIES: $(iboxpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(iboxpkg_LTLIBRARIES)'; test -n "$(iboxpkgdir)" || list=; \ @@ -3704,12 +3851,15 @@ uninstall-iboxpkgLTLIBRARIES: clean-iboxpkgLTLIBRARIES: -test -z "$(iboxpkg_LTLIBRARIES)" || rm -f $(iboxpkg_LTLIBRARIES) - @list='$(iboxpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(iboxpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume2pkgLTLIBRARIES: $(illume2pkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume2pkg_LTLIBRARIES)'; test -n "$(illume2pkgdir)" || list=; \ @@ -3736,12 +3886,15 @@ uninstall-illume2pkgLTLIBRARIES: clean-illume2pkgLTLIBRARIES: -test -z "$(illume2pkg_LTLIBRARIES)" || rm -f $(illume2pkg_LTLIBRARIES) - @list='$(illume2pkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume2pkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume2policyillumeLTLIBRARIES: $(illume2policyillume_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume2policyillume_LTLIBRARIES)'; test -n "$(illume2policyillumedir)" || list=; \ @@ -3768,12 +3921,15 @@ uninstall-illume2policyillumeLTLIBRARIES: clean-illume2policyillumeLTLIBRARIES: -test -z "$(illume2policyillume_LTLIBRARIES)" || rm -f $(illume2policyillume_LTLIBRARIES) - @list='$(illume2policyillume_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume2policyillume_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume2policytabletLTLIBRARIES: $(illume2policytablet_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume2policytablet_LTLIBRARIES)'; test -n "$(illume2policytabletdir)" || list=; \ @@ -3800,12 +3956,15 @@ uninstall-illume2policytabletLTLIBRARIES: clean-illume2policytabletLTLIBRARIES: -test -z "$(illume2policytablet_LTLIBRARIES)" || rm -f $(illume2policytablet_LTLIBRARIES) - @list='$(illume2policytablet_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume2policytablet_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_bluetoothpkgLTLIBRARIES: $(illume_bluetoothpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_bluetoothpkg_LTLIBRARIES)'; test -n "$(illume_bluetoothpkgdir)" || list=; \ @@ -3832,12 +3991,15 @@ uninstall-illume_bluetoothpkgLTLIBRARIES: clean-illume_bluetoothpkgLTLIBRARIES: -test -z "$(illume_bluetoothpkg_LTLIBRARIES)" || rm -f $(illume_bluetoothpkg_LTLIBRARIES) - @list='$(illume_bluetoothpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_bluetoothpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_home_togglepkgLTLIBRARIES: $(illume_home_togglepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_home_togglepkg_LTLIBRARIES)'; test -n "$(illume_home_togglepkgdir)" || list=; \ @@ -3864,12 +4026,15 @@ uninstall-illume_home_togglepkgLTLIBRARIES: clean-illume_home_togglepkgLTLIBRARIES: -test -z "$(illume_home_togglepkg_LTLIBRARIES)" || rm -f $(illume_home_togglepkg_LTLIBRARIES) - @list='$(illume_home_togglepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_home_togglepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_homepkgLTLIBRARIES: $(illume_homepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_homepkg_LTLIBRARIES)'; test -n "$(illume_homepkgdir)" || list=; \ @@ -3896,12 +4061,15 @@ uninstall-illume_homepkgLTLIBRARIES: clean-illume_homepkgLTLIBRARIES: -test -z "$(illume_homepkg_LTLIBRARIES)" || rm -f $(illume_homepkg_LTLIBRARIES) - @list='$(illume_homepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_homepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_indicatorpkgLTLIBRARIES: $(illume_indicatorpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_indicatorpkg_LTLIBRARIES)'; test -n "$(illume_indicatorpkgdir)" || list=; \ @@ -3928,12 +4096,15 @@ uninstall-illume_indicatorpkgLTLIBRARIES: clean-illume_indicatorpkgLTLIBRARIES: -test -z "$(illume_indicatorpkg_LTLIBRARIES)" || rm -f $(illume_indicatorpkg_LTLIBRARIES) - @list='$(illume_indicatorpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_indicatorpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_kbd_togglepkgLTLIBRARIES: $(illume_kbd_togglepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_kbd_togglepkg_LTLIBRARIES)'; test -n "$(illume_kbd_togglepkgdir)" || list=; \ @@ -3960,12 +4131,15 @@ uninstall-illume_kbd_togglepkgLTLIBRARIES: clean-illume_kbd_togglepkgLTLIBRARIES: -test -z "$(illume_kbd_togglepkg_LTLIBRARIES)" || rm -f $(illume_kbd_togglepkg_LTLIBRARIES) - @list='$(illume_kbd_togglepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_kbd_togglepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_keyboardpkgLTLIBRARIES: $(illume_keyboardpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_keyboardpkg_LTLIBRARIES)'; test -n "$(illume_keyboardpkgdir)" || list=; \ @@ -3992,12 +4166,15 @@ uninstall-illume_keyboardpkgLTLIBRARIES: clean-illume_keyboardpkgLTLIBRARIES: -test -z "$(illume_keyboardpkg_LTLIBRARIES)" || rm -f $(illume_keyboardpkg_LTLIBRARIES) - @list='$(illume_keyboardpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_keyboardpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_mode_togglepkgLTLIBRARIES: $(illume_mode_togglepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_mode_togglepkg_LTLIBRARIES)'; test -n "$(illume_mode_togglepkgdir)" || list=; \ @@ -4024,12 +4201,15 @@ uninstall-illume_mode_togglepkgLTLIBRARIES: clean-illume_mode_togglepkgLTLIBRARIES: -test -z "$(illume_mode_togglepkg_LTLIBRARIES)" || rm -f $(illume_mode_togglepkg_LTLIBRARIES) - @list='$(illume_mode_togglepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_mode_togglepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-illume_softkeypkgLTLIBRARIES: $(illume_softkeypkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(illume_softkeypkg_LTLIBRARIES)'; test -n "$(illume_softkeypkgdir)" || list=; \ @@ -4056,12 +4236,15 @@ uninstall-illume_softkeypkgLTLIBRARIES: clean-illume_softkeypkgLTLIBRARIES: -test -z "$(illume_softkeypkg_LTLIBRARIES)" || rm -f $(illume_softkeypkg_LTLIBRARIES) - @list='$(illume_softkeypkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(illume_softkeypkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-mixerpkgLTLIBRARIES: $(mixerpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(mixerpkg_LTLIBRARIES)'; test -n "$(mixerpkgdir)" || list=; \ @@ -4088,12 +4271,15 @@ uninstall-mixerpkgLTLIBRARIES: clean-mixerpkgLTLIBRARIES: -test -z "$(mixerpkg_LTLIBRARIES)" || rm -f $(mixerpkg_LTLIBRARIES) - @list='$(mixerpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(mixerpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-msgbuspkgLTLIBRARIES: $(msgbuspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(msgbuspkg_LTLIBRARIES)'; test -n "$(msgbuspkgdir)" || list=; \ @@ -4120,12 +4306,15 @@ uninstall-msgbuspkgLTLIBRARIES: clean-msgbuspkgLTLIBRARIES: -test -z "$(msgbuspkg_LTLIBRARIES)" || rm -f $(msgbuspkg_LTLIBRARIES) - @list='$(msgbuspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(msgbuspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-notificationpkgLTLIBRARIES: $(notificationpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(notificationpkg_LTLIBRARIES)'; test -n "$(notificationpkgdir)" || list=; \ @@ -4152,12 +4341,15 @@ uninstall-notificationpkgLTLIBRARIES: clean-notificationpkgLTLIBRARIES: -test -z "$(notificationpkg_LTLIBRARIES)" || rm -f $(notificationpkg_LTLIBRARIES) - @list='$(notificationpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(notificationpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-pagerpkgLTLIBRARIES: $(pagerpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(pagerpkg_LTLIBRARIES)'; test -n "$(pagerpkgdir)" || list=; \ @@ -4184,12 +4376,15 @@ uninstall-pagerpkgLTLIBRARIES: clean-pagerpkgLTLIBRARIES: -test -z "$(pagerpkg_LTLIBRARIES)" || rm -f $(pagerpkg_LTLIBRARIES) - @list='$(pagerpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(pagerpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-physicspkgLTLIBRARIES: $(physicspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(physicspkg_LTLIBRARIES)'; test -n "$(physicspkgdir)" || list=; \ @@ -4216,12 +4411,15 @@ uninstall-physicspkgLTLIBRARIES: clean-physicspkgLTLIBRARIES: -test -z "$(physicspkg_LTLIBRARIES)" || rm -f $(physicspkg_LTLIBRARIES) - @list='$(physicspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(physicspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-quickaccesspkgLTLIBRARIES: $(quickaccesspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(quickaccesspkg_LTLIBRARIES)'; test -n "$(quickaccesspkgdir)" || list=; \ @@ -4248,12 +4446,15 @@ uninstall-quickaccesspkgLTLIBRARIES: clean-quickaccesspkgLTLIBRARIES: -test -z "$(quickaccesspkg_LTLIBRARIES)" || rm -f $(quickaccesspkg_LTLIBRARIES) - @list='$(quickaccesspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(quickaccesspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-shotpkgLTLIBRARIES: $(shotpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(shotpkg_LTLIBRARIES)'; test -n "$(shotpkgdir)" || list=; \ @@ -4280,12 +4481,15 @@ uninstall-shotpkgLTLIBRARIES: clean-shotpkgLTLIBRARIES: -test -z "$(shotpkg_LTLIBRARIES)" || rm -f $(shotpkg_LTLIBRARIES) - @list='$(shotpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(shotpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-startpkgLTLIBRARIES: $(startpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(startpkg_LTLIBRARIES)'; test -n "$(startpkgdir)" || list=; \ @@ -4312,12 +4516,15 @@ uninstall-startpkgLTLIBRARIES: clean-startpkgLTLIBRARIES: -test -z "$(startpkg_LTLIBRARIES)" || rm -f $(startpkg_LTLIBRARIES) - @list='$(startpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(startpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-sysconpkgLTLIBRARIES: $(sysconpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(sysconpkg_LTLIBRARIES)'; test -n "$(sysconpkgdir)" || list=; \ @@ -4344,12 +4551,15 @@ uninstall-sysconpkgLTLIBRARIES: clean-sysconpkgLTLIBRARIES: -test -z "$(sysconpkg_LTLIBRARIES)" || rm -f $(sysconpkg_LTLIBRARIES) - @list='$(sysconpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(sysconpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-systraypkgLTLIBRARIES: $(systraypkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(systraypkg_LTLIBRARIES)'; test -n "$(systraypkgdir)" || list=; \ @@ -4376,12 +4586,15 @@ uninstall-systraypkgLTLIBRARIES: clean-systraypkgLTLIBRARIES: -test -z "$(systraypkg_LTLIBRARIES)" || rm -f $(systraypkg_LTLIBRARIES) - @list='$(systraypkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(systraypkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-taskspkgLTLIBRARIES: $(taskspkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(taskspkg_LTLIBRARIES)'; test -n "$(taskspkgdir)" || list=; \ @@ -4408,12 +4621,15 @@ uninstall-taskspkgLTLIBRARIES: clean-taskspkgLTLIBRARIES: -test -z "$(taskspkg_LTLIBRARIES)" || rm -f $(taskspkg_LTLIBRARIES) - @list='$(taskspkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(taskspkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-temperaturepkgLTLIBRARIES: $(temperaturepkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(temperaturepkg_LTLIBRARIES)'; test -n "$(temperaturepkgdir)" || list=; \ @@ -4440,12 +4656,15 @@ uninstall-temperaturepkgLTLIBRARIES: clean-temperaturepkgLTLIBRARIES: -test -z "$(temperaturepkg_LTLIBRARIES)" || rm -f $(temperaturepkg_LTLIBRARIES) - @list='$(temperaturepkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(temperaturepkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-tilingpkgLTLIBRARIES: $(tilingpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(tilingpkg_LTLIBRARIES)'; test -n "$(tilingpkgdir)" || list=; \ @@ -4472,12 +4691,15 @@ uninstall-tilingpkgLTLIBRARIES: clean-tilingpkgLTLIBRARIES: -test -z "$(tilingpkg_LTLIBRARIES)" || rm -f $(tilingpkg_LTLIBRARIES) - @list='$(tilingpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(tilingpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-winlistpkgLTLIBRARIES: $(winlistpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(winlistpkg_LTLIBRARIES)'; test -n "$(winlistpkgdir)" || list=; \ @@ -4504,12 +4726,15 @@ uninstall-winlistpkgLTLIBRARIES: clean-winlistpkgLTLIBRARIES: -test -z "$(winlistpkg_LTLIBRARIES)" || rm -f $(winlistpkg_LTLIBRARIES) - @list='$(winlistpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(winlistpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-wizardpkgLTLIBRARIES: $(wizardpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(wizardpkg_LTLIBRARIES)'; test -n "$(wizardpkgdir)" || list=; \ @@ -4536,12 +4761,15 @@ uninstall-wizardpkgLTLIBRARIES: clean-wizardpkgLTLIBRARIES: -test -z "$(wizardpkg_LTLIBRARIES)" || rm -f $(wizardpkg_LTLIBRARIES) - @list='$(wizardpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(wizardpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-xkbswitchpkgLTLIBRARIES: $(xkbswitchpkg_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(xkbswitchpkg_LTLIBRARIES)'; test -n "$(xkbswitchpkgdir)" || list=; \ @@ -4568,12 +4796,14 @@ uninstall-xkbswitchpkgLTLIBRARIES: clean-xkbswitchpkgLTLIBRARIES: -test -z "$(xkbswitchpkg_LTLIBRARIES)" || rm -f $(xkbswitchpkg_LTLIBRARIES) - @list='$(xkbswitchpkg_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(xkbswitchpkg_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } access/$(am__dirstamp): @$(MKDIR_P) access @: > access/$(am__dirstamp) @@ -4584,6 +4814,7 @@ access/e_mod_main.lo: access/$(am__dirstamp) \ access/$(DEPDIR)/$(am__dirstamp) access/e_mod_config.lo: access/$(am__dirstamp) \ access/$(DEPDIR)/$(am__dirstamp) + access/module.la: $(access_module_la_OBJECTS) $(access_module_la_DEPENDENCIES) $(EXTRA_access_module_la_DEPENDENCIES) access/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_access_module_la_rpath) $(access_module_la_OBJECTS) $(access_module_la_LIBADD) $(LIBS) backlight/$(am__dirstamp): @@ -4594,6 +4825,7 @@ backlight/$(DEPDIR)/$(am__dirstamp): @: > backlight/$(DEPDIR)/$(am__dirstamp) backlight/e_mod_main.lo: backlight/$(am__dirstamp) \ backlight/$(DEPDIR)/$(am__dirstamp) + backlight/module.la: $(backlight_module_la_OBJECTS) $(backlight_module_la_DEPENDENCIES) $(EXTRA_backlight_module_la_DEPENDENCIES) backlight/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_backlight_module_la_rpath) $(backlight_module_la_OBJECTS) $(backlight_module_la_LIBADD) $(LIBS) battery/$(am__dirstamp): @@ -4612,6 +4844,7 @@ battery/battery_module_la-e_mod_openbsd.lo: battery/$(am__dirstamp) \ battery/$(DEPDIR)/$(am__dirstamp) battery/battery_module_la-e_mod_dbus.lo: battery/$(am__dirstamp) \ battery/$(DEPDIR)/$(am__dirstamp) + battery/module.la: $(battery_module_la_OBJECTS) $(battery_module_la_DEPENDENCIES) $(EXTRA_battery_module_la_DEPENDENCIES) battery/$(am__dirstamp) $(AM_V_CCLD)$(battery_module_la_LINK) $(am_battery_module_la_rpath) $(battery_module_la_OBJECTS) $(battery_module_la_LIBADD) $(LIBS) clock/$(am__dirstamp): @@ -4624,6 +4857,7 @@ clock/e_mod_main.lo: clock/$(am__dirstamp) \ clock/$(DEPDIR)/$(am__dirstamp) clock/e_mod_config.lo: clock/$(am__dirstamp) \ clock/$(DEPDIR)/$(am__dirstamp) + clock/module.la: $(clock_module_la_OBJECTS) $(clock_module_la_DEPENDENCIES) $(EXTRA_clock_module_la_DEPENDENCIES) clock/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_clock_module_la_rpath) $(clock_module_la_OBJECTS) $(clock_module_la_LIBADD) $(LIBS) comp/$(am__dirstamp): @@ -4658,6 +4892,7 @@ comp/e_mod_comp_wl_buffer.lo: comp/$(am__dirstamp) \ comp/$(DEPDIR)/$(am__dirstamp) comp/e_mod_comp_wl_region.lo: comp/$(am__dirstamp) \ comp/$(DEPDIR)/$(am__dirstamp) + comp/module.la: $(comp_module_la_OBJECTS) $(comp_module_la_DEPENDENCIES) $(EXTRA_comp_module_la_DEPENDENCIES) comp/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_comp_module_la_rpath) $(comp_module_la_OBJECTS) $(comp_module_la_LIBADD) $(LIBS) conf/$(am__dirstamp): @@ -4671,6 +4906,7 @@ conf/e_mod_main.lo: conf/$(am__dirstamp) \ conf/e_conf.lo: conf/$(am__dirstamp) conf/$(DEPDIR)/$(am__dirstamp) conf/e_mod_config.lo: conf/$(am__dirstamp) \ conf/$(DEPDIR)/$(am__dirstamp) + conf/module.la: $(conf_module_la_OBJECTS) $(conf_module_la_DEPENDENCIES) $(EXTRA_conf_module_la_DEPENDENCIES) conf/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_module_la_rpath) $(conf_module_la_OBJECTS) $(conf_module_la_LIBADD) $(LIBS) conf_applications/$(am__dirstamp): @@ -4693,6 +4929,7 @@ conf_applications/e_int_config_deskenv.lo: \ conf_applications/e_int_config_apps_personal.lo: \ conf_applications/$(am__dirstamp) \ conf_applications/$(DEPDIR)/$(am__dirstamp) + conf_applications/module.la: $(conf_applications_module_la_OBJECTS) $(conf_applications_module_la_DEPENDENCIES) $(EXTRA_conf_applications_module_la_DEPENDENCIES) conf_applications/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_applications_module_la_rpath) $(conf_applications_module_la_OBJECTS) $(conf_applications_module_la_LIBADD) $(LIBS) conf_dialogs/$(am__dirstamp): @@ -4707,6 +4944,7 @@ conf_dialogs/e_int_config_dialogs.lo: conf_dialogs/$(am__dirstamp) \ conf_dialogs/$(DEPDIR)/$(am__dirstamp) conf_dialogs/e_int_config_profiles.lo: conf_dialogs/$(am__dirstamp) \ conf_dialogs/$(DEPDIR)/$(am__dirstamp) + conf_dialogs/module.la: $(conf_dialogs_module_la_OBJECTS) $(conf_dialogs_module_la_DEPENDENCIES) $(EXTRA_conf_dialogs_module_la_DEPENDENCIES) conf_dialogs/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_dialogs_module_la_rpath) $(conf_dialogs_module_la_OBJECTS) $(conf_dialogs_module_la_LIBADD) $(LIBS) conf_display/$(am__dirstamp): @@ -4733,6 +4971,7 @@ conf_display/e_int_config_desks.lo: conf_display/$(am__dirstamp) \ conf_display/$(DEPDIR)/$(am__dirstamp) conf_display/e_int_config_desk.lo: conf_display/$(am__dirstamp) \ conf_display/$(DEPDIR)/$(am__dirstamp) + conf_display/module.la: $(conf_display_module_la_OBJECTS) $(conf_display_module_la_DEPENDENCIES) $(EXTRA_conf_display_module_la_DEPENDENCIES) conf_display/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_display_module_la_rpath) $(conf_display_module_la_OBJECTS) $(conf_display_module_la_LIBADD) $(LIBS) conf_edgebindings/$(am__dirstamp): @@ -4749,6 +4988,7 @@ conf_edgebindings/e_int_config_edgebindings.lo: \ conf_edgebindings/e_int_config_signalbindings.lo: \ conf_edgebindings/$(am__dirstamp) \ conf_edgebindings/$(DEPDIR)/$(am__dirstamp) + conf_edgebindings/module.la: $(conf_edgebindings_module_la_OBJECTS) $(conf_edgebindings_module_la_DEPENDENCIES) $(EXTRA_conf_edgebindings_module_la_DEPENDENCIES) conf_edgebindings/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_edgebindings_module_la_rpath) $(conf_edgebindings_module_la_OBJECTS) $(conf_edgebindings_module_la_LIBADD) $(LIBS) conf_interaction/$(am__dirstamp): @@ -4765,6 +5005,7 @@ conf_interaction/e_int_config_interaction.lo: \ conf_interaction/e_int_config_mouse.lo: \ conf_interaction/$(am__dirstamp) \ conf_interaction/$(DEPDIR)/$(am__dirstamp) + conf_interaction/module.la: $(conf_interaction_module_la_OBJECTS) $(conf_interaction_module_la_DEPENDENCIES) $(EXTRA_conf_interaction_module_la_DEPENDENCIES) conf_interaction/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_interaction_module_la_rpath) $(conf_interaction_module_la_OBJECTS) $(conf_interaction_module_la_LIBADD) $(LIBS) conf_intl/$(am__dirstamp): @@ -4781,6 +5022,7 @@ conf_intl/e_int_config_imc_import.lo: conf_intl/$(am__dirstamp) \ conf_intl/$(DEPDIR)/$(am__dirstamp) conf_intl/e_int_config_imc.lo: conf_intl/$(am__dirstamp) \ conf_intl/$(DEPDIR)/$(am__dirstamp) + conf_intl/module.la: $(conf_intl_module_la_OBJECTS) $(conf_intl_module_la_DEPENDENCIES) $(EXTRA_conf_intl_module_la_DEPENDENCIES) conf_intl/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_intl_module_la_rpath) $(conf_intl_module_la_OBJECTS) $(conf_intl_module_la_LIBADD) $(LIBS) conf_keybindings/$(am__dirstamp): @@ -4800,6 +5042,7 @@ conf_keybindings/e_int_config_mousebindings.lo: \ conf_keybindings/e_int_config_acpibindings.lo: \ conf_keybindings/$(am__dirstamp) \ conf_keybindings/$(DEPDIR)/$(am__dirstamp) + conf_keybindings/module.la: $(conf_keybindings_module_la_OBJECTS) $(conf_keybindings_module_la_DEPENDENCIES) $(EXTRA_conf_keybindings_module_la_DEPENDENCIES) conf_keybindings/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_keybindings_module_la_rpath) $(conf_keybindings_module_la_OBJECTS) $(conf_keybindings_module_la_LIBADD) $(LIBS) conf_menus/$(am__dirstamp): @@ -4812,6 +5055,7 @@ conf_menus/e_mod_main.lo: conf_menus/$(am__dirstamp) \ conf_menus/$(DEPDIR)/$(am__dirstamp) conf_menus/e_int_config_menus.lo: conf_menus/$(am__dirstamp) \ conf_menus/$(DEPDIR)/$(am__dirstamp) + conf_menus/module.la: $(conf_menus_module_la_OBJECTS) $(conf_menus_module_la_DEPENDENCIES) $(EXTRA_conf_menus_module_la_DEPENDENCIES) conf_menus/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_menus_module_la_rpath) $(conf_menus_module_la_OBJECTS) $(conf_menus_module_la_LIBADD) $(LIBS) conf_paths/$(am__dirstamp): @@ -4826,6 +5070,7 @@ conf_paths/e_int_config_paths.lo: conf_paths/$(am__dirstamp) \ conf_paths/$(DEPDIR)/$(am__dirstamp) conf_paths/e_int_config_env.lo: conf_paths/$(am__dirstamp) \ conf_paths/$(DEPDIR)/$(am__dirstamp) + conf_paths/module.la: $(conf_paths_module_la_OBJECTS) $(conf_paths_module_la_DEPENDENCIES) $(EXTRA_conf_paths_module_la_DEPENDENCIES) conf_paths/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_paths_module_la_rpath) $(conf_paths_module_la_OBJECTS) $(conf_paths_module_la_LIBADD) $(LIBS) conf_performance/$(am__dirstamp): @@ -4845,6 +5090,7 @@ conf_performance/e_int_config_engine.lo: \ conf_performance/e_int_config_powermanagement.lo: \ conf_performance/$(am__dirstamp) \ conf_performance/$(DEPDIR)/$(am__dirstamp) + conf_performance/module.la: $(conf_performance_module_la_OBJECTS) $(conf_performance_module_la_DEPENDENCIES) $(EXTRA_conf_performance_module_la_DEPENDENCIES) conf_performance/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_performance_module_la_rpath) $(conf_performance_module_la_OBJECTS) $(conf_performance_module_la_LIBADD) $(LIBS) conf_randr/$(am__dirstamp): @@ -4861,6 +5107,7 @@ conf_randr/e_smart_randr.lo: conf_randr/$(am__dirstamp) \ conf_randr/$(DEPDIR)/$(am__dirstamp) conf_randr/e_smart_monitor.lo: conf_randr/$(am__dirstamp) \ conf_randr/$(DEPDIR)/$(am__dirstamp) + conf_randr/module.la: $(conf_randr_module_la_OBJECTS) $(conf_randr_module_la_DEPENDENCIES) $(EXTRA_conf_randr_module_la_DEPENDENCIES) conf_randr/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_randr_module_la_rpath) $(conf_randr_module_la_OBJECTS) $(conf_randr_module_la_LIBADD) $(LIBS) conf_shelves/$(am__dirstamp): @@ -4873,6 +5120,7 @@ conf_shelves/e_mod_main.lo: conf_shelves/$(am__dirstamp) \ conf_shelves/$(DEPDIR)/$(am__dirstamp) conf_shelves/e_int_config_shelf.lo: conf_shelves/$(am__dirstamp) \ conf_shelves/$(DEPDIR)/$(am__dirstamp) + conf_shelves/module.la: $(conf_shelves_module_la_OBJECTS) $(conf_shelves_module_la_DEPENDENCIES) $(EXTRA_conf_shelves_module_la_DEPENDENCIES) conf_shelves/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_shelves_module_la_rpath) $(conf_shelves_module_la_OBJECTS) $(conf_shelves_module_la_LIBADD) $(LIBS) conf_theme/$(am__dirstamp): @@ -4903,6 +5151,7 @@ conf_theme/e_int_config_wallpaper.lo: conf_theme/$(am__dirstamp) \ conf_theme/$(DEPDIR)/$(am__dirstamp) conf_theme/e_int_config_xsettings.lo: conf_theme/$(am__dirstamp) \ conf_theme/$(DEPDIR)/$(am__dirstamp) + conf_theme/module.la: $(conf_theme_module_la_OBJECTS) $(conf_theme_module_la_DEPENDENCIES) $(EXTRA_conf_theme_module_la_DEPENDENCIES) conf_theme/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_theme_module_la_rpath) $(conf_theme_module_la_OBJECTS) $(conf_theme_module_la_LIBADD) $(LIBS) conf_wallpaper2/$(am__dirstamp): @@ -4916,6 +5165,7 @@ conf_wallpaper2/e_mod_main.lo: conf_wallpaper2/$(am__dirstamp) \ conf_wallpaper2/e_int_config_wallpaper.lo: \ conf_wallpaper2/$(am__dirstamp) \ conf_wallpaper2/$(DEPDIR)/$(am__dirstamp) + conf_wallpaper2/module.la: $(conf_wallpaper2_module_la_OBJECTS) $(conf_wallpaper2_module_la_DEPENDENCIES) $(EXTRA_conf_wallpaper2_module_la_DEPENDENCIES) conf_wallpaper2/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_wallpaper2_module_la_rpath) $(conf_wallpaper2_module_la_OBJECTS) $(conf_wallpaper2_module_la_LIBADD) $(LIBS) conf_window_manipulation/$(am__dirstamp): @@ -4942,6 +5192,7 @@ conf_window_manipulation/e_int_config_focus.lo: \ conf_window_manipulation/e_int_config_clientlist.lo: \ conf_window_manipulation/$(am__dirstamp) \ conf_window_manipulation/$(DEPDIR)/$(am__dirstamp) + conf_window_manipulation/module.la: $(conf_window_manipulation_module_la_OBJECTS) $(conf_window_manipulation_module_la_DEPENDENCIES) $(EXTRA_conf_window_manipulation_module_la_DEPENDENCIES) conf_window_manipulation/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_window_manipulation_module_la_rpath) $(conf_window_manipulation_module_la_OBJECTS) $(conf_window_manipulation_module_la_LIBADD) $(LIBS) conf_window_remembers/$(am__dirstamp): @@ -4956,6 +5207,7 @@ conf_window_remembers/e_mod_main.lo: \ conf_window_remembers/e_int_config_remembers.lo: \ conf_window_remembers/$(am__dirstamp) \ conf_window_remembers/$(DEPDIR)/$(am__dirstamp) + conf_window_remembers/module.la: $(conf_window_remembers_module_la_OBJECTS) $(conf_window_remembers_module_la_DEPENDENCIES) $(EXTRA_conf_window_remembers_module_la_DEPENDENCIES) conf_window_remembers/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_conf_window_remembers_module_la_rpath) $(conf_window_remembers_module_la_OBJECTS) $(conf_window_remembers_module_la_LIBADD) $(LIBS) connman/$(am__dirstamp): @@ -4972,6 +5224,7 @@ connman/connman_module_la-e_connman.lo: connman/$(am__dirstamp) \ connman/$(DEPDIR)/$(am__dirstamp) connman/connman_module_la-agent.lo: connman/$(am__dirstamp) \ connman/$(DEPDIR)/$(am__dirstamp) + connman/module.la: $(connman_module_la_OBJECTS) $(connman_module_la_DEPENDENCIES) $(EXTRA_connman_module_la_DEPENDENCIES) connman/$(am__dirstamp) $(AM_V_CCLD)$(connman_module_la_LINK) $(am_connman_module_la_rpath) $(connman_module_la_OBJECTS) $(connman_module_la_LIBADD) $(LIBS) cpufreq/$(am__dirstamp): @@ -4982,6 +5235,7 @@ cpufreq/$(DEPDIR)/$(am__dirstamp): @: > cpufreq/$(DEPDIR)/$(am__dirstamp) cpufreq/e_mod_main.lo: cpufreq/$(am__dirstamp) \ cpufreq/$(DEPDIR)/$(am__dirstamp) + cpufreq/module.la: $(cpufreq_module_la_OBJECTS) $(cpufreq_module_la_DEPENDENCIES) $(EXTRA_cpufreq_module_la_DEPENDENCIES) cpufreq/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_cpufreq_module_la_rpath) $(cpufreq_module_la_OBJECTS) $(cpufreq_module_la_LIBADD) $(LIBS) dropshadow/$(am__dirstamp): @@ -4994,6 +5248,7 @@ dropshadow/e_mod_main.lo: dropshadow/$(am__dirstamp) \ dropshadow/$(DEPDIR)/$(am__dirstamp) dropshadow/e_mod_config.lo: dropshadow/$(am__dirstamp) \ dropshadow/$(DEPDIR)/$(am__dirstamp) + dropshadow/module.la: $(dropshadow_module_la_OBJECTS) $(dropshadow_module_la_DEPENDENCIES) $(EXTRA_dropshadow_module_la_DEPENDENCIES) dropshadow/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_dropshadow_module_la_rpath) $(dropshadow_module_la_OBJECTS) $(dropshadow_module_la_LIBADD) $(LIBS) everything/$(am__dirstamp): @@ -5044,6 +5299,7 @@ everything/evry_plug_settings.lo: everything/$(am__dirstamp) \ everything/$(DEPDIR)/$(am__dirstamp) everything/evry_plug_calc.lo: everything/$(am__dirstamp) \ everything/$(DEPDIR)/$(am__dirstamp) + everything/module.la: $(everything_module_la_OBJECTS) $(everything_module_la_DEPENDENCIES) $(EXTRA_everything_module_la_DEPENDENCIES) everything/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_everything_module_la_rpath) $(everything_module_la_OBJECTS) $(everything_module_la_LIBADD) $(LIBS) fileman/$(am__dirstamp): @@ -5068,6 +5324,7 @@ fileman/e_mod_dbus.lo: fileman/$(am__dirstamp) \ fileman/$(DEPDIR)/$(am__dirstamp) fileman/e_mod_menu.lo: fileman/$(am__dirstamp) \ fileman/$(DEPDIR)/$(am__dirstamp) + fileman/module.la: $(fileman_module_la_OBJECTS) $(fileman_module_la_DEPENDENCIES) $(EXTRA_fileman_module_la_DEPENDENCIES) fileman/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_fileman_module_la_rpath) $(fileman_module_la_OBJECTS) $(fileman_module_la_LIBADD) $(LIBS) fileman_opinfo/$(am__dirstamp): @@ -5078,6 +5335,7 @@ fileman_opinfo/$(DEPDIR)/$(am__dirstamp): @: > fileman_opinfo/$(DEPDIR)/$(am__dirstamp) fileman_opinfo/e_mod_main.lo: fileman_opinfo/$(am__dirstamp) \ fileman_opinfo/$(DEPDIR)/$(am__dirstamp) + fileman_opinfo/module.la: $(fileman_opinfo_module_la_OBJECTS) $(fileman_opinfo_module_la_DEPENDENCIES) $(EXTRA_fileman_opinfo_module_la_DEPENDENCIES) fileman_opinfo/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_fileman_opinfo_module_la_rpath) $(fileman_opinfo_module_la_OBJECTS) $(fileman_opinfo_module_la_LIBADD) $(LIBS) gadman/$(am__dirstamp): @@ -5092,6 +5350,7 @@ gadman/e_mod_config.lo: gadman/$(am__dirstamp) \ gadman/$(DEPDIR)/$(am__dirstamp) gadman/e_mod_gadman.lo: gadman/$(am__dirstamp) \ gadman/$(DEPDIR)/$(am__dirstamp) + gadman/module.la: $(gadman_module_la_OBJECTS) $(gadman_module_la_DEPENDENCIES) $(EXTRA_gadman_module_la_DEPENDENCIES) gadman/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_gadman_module_la_rpath) $(gadman_module_la_OBJECTS) $(gadman_module_la_LIBADD) $(LIBS) ibar/$(am__dirstamp): @@ -5104,6 +5363,7 @@ ibar/e_mod_main.lo: ibar/$(am__dirstamp) \ ibar/$(DEPDIR)/$(am__dirstamp) ibar/e_mod_config.lo: ibar/$(am__dirstamp) \ ibar/$(DEPDIR)/$(am__dirstamp) + ibar/module.la: $(ibar_module_la_OBJECTS) $(ibar_module_la_DEPENDENCIES) $(EXTRA_ibar_module_la_DEPENDENCIES) ibar/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_ibar_module_la_rpath) $(ibar_module_la_OBJECTS) $(ibar_module_la_LIBADD) $(LIBS) ibox/$(am__dirstamp): @@ -5116,6 +5376,7 @@ ibox/e_mod_main.lo: ibox/$(am__dirstamp) \ ibox/$(DEPDIR)/$(am__dirstamp) ibox/e_mod_config.lo: ibox/$(am__dirstamp) \ ibox/$(DEPDIR)/$(am__dirstamp) + ibox/module.la: $(ibox_module_la_OBJECTS) $(ibox_module_la_DEPENDENCIES) $(EXTRA_ibox_module_la_DEPENDENCIES) ibox/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_ibox_module_la_rpath) $(ibox_module_la_OBJECTS) $(ibox_module_la_LIBADD) $(LIBS) illume-bluetooth/$(am__dirstamp): @@ -5126,6 +5387,7 @@ illume-bluetooth/$(DEPDIR)/$(am__dirstamp): @: > illume-bluetooth/$(DEPDIR)/$(am__dirstamp) illume-bluetooth/e_mod_main.lo: illume-bluetooth/$(am__dirstamp) \ illume-bluetooth/$(DEPDIR)/$(am__dirstamp) + illume-bluetooth/module.la: $(illume_bluetooth_module_la_OBJECTS) $(illume_bluetooth_module_la_DEPENDENCIES) $(EXTRA_illume_bluetooth_module_la_DEPENDENCIES) illume-bluetooth/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_bluetooth_module_la_rpath) $(illume_bluetooth_module_la_OBJECTS) $(illume_bluetooth_module_la_LIBADD) $(LIBS) illume-home-toggle/$(am__dirstamp): @@ -5136,6 +5398,7 @@ illume-home-toggle/$(DEPDIR)/$(am__dirstamp): @: > illume-home-toggle/$(DEPDIR)/$(am__dirstamp) illume-home-toggle/e_mod_main.lo: illume-home-toggle/$(am__dirstamp) \ illume-home-toggle/$(DEPDIR)/$(am__dirstamp) + illume-home-toggle/module.la: $(illume_home_toggle_module_la_OBJECTS) $(illume_home_toggle_module_la_DEPENDENCIES) $(EXTRA_illume_home_toggle_module_la_DEPENDENCIES) illume-home-toggle/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_home_toggle_module_la_rpath) $(illume_home_toggle_module_la_OBJECTS) $(illume_home_toggle_module_la_LIBADD) $(LIBS) illume-home/$(am__dirstamp): @@ -5150,6 +5413,7 @@ illume-home/e_mod_config.lo: illume-home/$(am__dirstamp) \ illume-home/$(DEPDIR)/$(am__dirstamp) illume-home/e_busycover.lo: illume-home/$(am__dirstamp) \ illume-home/$(DEPDIR)/$(am__dirstamp) + illume-home/module.la: $(illume_home_module_la_OBJECTS) $(illume_home_module_la_DEPENDENCIES) $(EXTRA_illume_home_module_la_DEPENDENCIES) illume-home/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_home_module_la_rpath) $(illume_home_module_la_OBJECTS) $(illume_home_module_la_LIBADD) $(LIBS) illume-indicator/$(am__dirstamp): @@ -5166,6 +5430,7 @@ illume-indicator/e_mod_ind_win.lo: illume-indicator/$(am__dirstamp) \ illume-indicator/$(DEPDIR)/$(am__dirstamp) illume-indicator/e_mod_notify.lo: illume-indicator/$(am__dirstamp) \ illume-indicator/$(DEPDIR)/$(am__dirstamp) + illume-indicator/module.la: $(illume_indicator_module_la_OBJECTS) $(illume_indicator_module_la_DEPENDENCIES) $(EXTRA_illume_indicator_module_la_DEPENDENCIES) illume-indicator/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_indicator_module_la_rpath) $(illume_indicator_module_la_OBJECTS) $(illume_indicator_module_la_LIBADD) $(LIBS) illume-kbd-toggle/$(am__dirstamp): @@ -5176,6 +5441,7 @@ illume-kbd-toggle/$(DEPDIR)/$(am__dirstamp): @: > illume-kbd-toggle/$(DEPDIR)/$(am__dirstamp) illume-kbd-toggle/e_mod_main.lo: illume-kbd-toggle/$(am__dirstamp) \ illume-kbd-toggle/$(DEPDIR)/$(am__dirstamp) + illume-kbd-toggle/module.la: $(illume_kbd_toggle_module_la_OBJECTS) $(illume_kbd_toggle_module_la_DEPENDENCIES) $(EXTRA_illume_kbd_toggle_module_la_DEPENDENCIES) illume-kbd-toggle/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_kbd_toggle_module_la_rpath) $(illume_kbd_toggle_module_la_OBJECTS) $(illume_kbd_toggle_module_la_LIBADD) $(LIBS) illume-keyboard/$(am__dirstamp): @@ -5196,6 +5462,7 @@ illume-keyboard/e_kbd_send.lo: illume-keyboard/$(am__dirstamp) \ illume-keyboard/$(DEPDIR)/$(am__dirstamp) illume-keyboard/e_mod_config.lo: illume-keyboard/$(am__dirstamp) \ illume-keyboard/$(DEPDIR)/$(am__dirstamp) + illume-keyboard/module.la: $(illume_keyboard_module_la_OBJECTS) $(illume_keyboard_module_la_DEPENDENCIES) $(EXTRA_illume_keyboard_module_la_DEPENDENCIES) illume-keyboard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_keyboard_module_la_rpath) $(illume_keyboard_module_la_OBJECTS) $(illume_keyboard_module_la_LIBADD) $(LIBS) illume-mode-toggle/$(am__dirstamp): @@ -5206,6 +5473,7 @@ illume-mode-toggle/$(DEPDIR)/$(am__dirstamp): @: > illume-mode-toggle/$(DEPDIR)/$(am__dirstamp) illume-mode-toggle/e_mod_main.lo: illume-mode-toggle/$(am__dirstamp) \ illume-mode-toggle/$(DEPDIR)/$(am__dirstamp) + illume-mode-toggle/module.la: $(illume_mode_toggle_module_la_OBJECTS) $(illume_mode_toggle_module_la_DEPENDENCIES) $(EXTRA_illume_mode_toggle_module_la_DEPENDENCIES) illume-mode-toggle/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_mode_toggle_module_la_rpath) $(illume_mode_toggle_module_la_OBJECTS) $(illume_mode_toggle_module_la_LIBADD) $(LIBS) illume-softkey/$(am__dirstamp): @@ -5220,6 +5488,7 @@ illume-softkey/e_mod_sft_win.lo: illume-softkey/$(am__dirstamp) \ illume-softkey/$(DEPDIR)/$(am__dirstamp) illume-softkey/e_mod_config.lo: illume-softkey/$(am__dirstamp) \ illume-softkey/$(DEPDIR)/$(am__dirstamp) + illume-softkey/module.la: $(illume_softkey_module_la_OBJECTS) $(illume_softkey_module_la_DEPENDENCIES) $(EXTRA_illume_softkey_module_la_DEPENDENCIES) illume-softkey/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume_softkey_module_la_rpath) $(illume_softkey_module_la_OBJECTS) $(illume_softkey_module_la_LIBADD) $(LIBS) illume2/$(am__dirstamp): @@ -5250,6 +5519,7 @@ illume2/e_mod_policy.lo: illume2/$(am__dirstamp) \ illume2/$(DEPDIR)/$(am__dirstamp) illume2/e_mod_config.lo: illume2/$(am__dirstamp) \ illume2/$(DEPDIR)/$(am__dirstamp) + illume2/module.la: $(illume2_module_la_OBJECTS) $(illume2_module_la_DEPENDENCIES) $(EXTRA_illume2_module_la_DEPENDENCIES) illume2/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_illume2_module_la_rpath) $(illume2_module_la_OBJECTS) $(illume2_module_la_LIBADD) $(LIBS) illume2/policies/illume/$(am__dirstamp): @@ -5264,6 +5534,7 @@ illume2/policies/illume/illume2_policies_illume_illume_la-policy.lo: \ illume2/policies/illume/illume2_policies_illume_illume_la-illume.lo: \ illume2/policies/illume/$(am__dirstamp) \ illume2/policies/illume/$(DEPDIR)/$(am__dirstamp) + illume2/policies/illume/illume.la: $(illume2_policies_illume_illume_la_OBJECTS) $(illume2_policies_illume_illume_la_DEPENDENCIES) $(EXTRA_illume2_policies_illume_illume_la_DEPENDENCIES) illume2/policies/illume/$(am__dirstamp) $(AM_V_CCLD)$(illume2_policies_illume_illume_la_LINK) $(am_illume2_policies_illume_illume_la_rpath) $(illume2_policies_illume_illume_la_OBJECTS) $(illume2_policies_illume_illume_la_LIBADD) $(LIBS) illume2/policies/tablet/$(am__dirstamp): @@ -5278,6 +5549,7 @@ illume2/policies/tablet/illume2_policies_tablet_tablet_la-policy.lo: \ illume2/policies/tablet/illume2_policies_tablet_tablet_la-tablet.lo: \ illume2/policies/tablet/$(am__dirstamp) \ illume2/policies/tablet/$(DEPDIR)/$(am__dirstamp) + illume2/policies/tablet/tablet.la: $(illume2_policies_tablet_tablet_la_OBJECTS) $(illume2_policies_tablet_tablet_la_DEPENDENCIES) $(EXTRA_illume2_policies_tablet_tablet_la_DEPENDENCIES) illume2/policies/tablet/$(am__dirstamp) $(AM_V_CCLD)$(illume2_policies_tablet_tablet_la_LINK) $(am_illume2_policies_tablet_tablet_la_rpath) $(illume2_policies_tablet_tablet_la_OBJECTS) $(illume2_policies_tablet_tablet_la_LIBADD) $(LIBS) mixer/$(am__dirstamp): @@ -5310,6 +5582,7 @@ mixer/mixer_module_la-sys_alsa.lo: mixer/$(am__dirstamp) \ mixer/$(DEPDIR)/$(am__dirstamp) mixer/mixer_module_la-sys_dummy.lo: mixer/$(am__dirstamp) \ mixer/$(DEPDIR)/$(am__dirstamp) + mixer/module.la: $(mixer_module_la_OBJECTS) $(mixer_module_la_DEPENDENCIES) $(EXTRA_mixer_module_la_DEPENDENCIES) mixer/$(am__dirstamp) $(AM_V_CCLD)$(mixer_module_la_LINK) $(am_mixer_module_la_rpath) $(mixer_module_la_OBJECTS) $(mixer_module_la_LIBADD) $(LIBS) msgbus/$(am__dirstamp): @@ -5326,6 +5599,7 @@ msgbus/msgbus_desktop.lo: msgbus/$(am__dirstamp) \ msgbus/$(DEPDIR)/$(am__dirstamp) msgbus/msgbus_lang.lo: msgbus/$(am__dirstamp) \ msgbus/$(DEPDIR)/$(am__dirstamp) + msgbus/module.la: $(msgbus_module_la_OBJECTS) $(msgbus_module_la_DEPENDENCIES) $(EXTRA_msgbus_module_la_DEPENDENCIES) msgbus/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_msgbus_module_la_rpath) $(msgbus_module_la_OBJECTS) $(msgbus_module_la_LIBADD) $(LIBS) notification/$(am__dirstamp): @@ -5340,6 +5614,7 @@ notification/e_mod_config.lo: notification/$(am__dirstamp) \ notification/$(DEPDIR)/$(am__dirstamp) notification/e_mod_popup.lo: notification/$(am__dirstamp) \ notification/$(DEPDIR)/$(am__dirstamp) + notification/module.la: $(notification_module_la_OBJECTS) $(notification_module_la_DEPENDENCIES) $(EXTRA_notification_module_la_DEPENDENCIES) notification/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_notification_module_la_rpath) $(notification_module_la_OBJECTS) $(notification_module_la_LIBADD) $(LIBS) pager/$(am__dirstamp): @@ -5352,6 +5627,7 @@ pager/e_mod_main.lo: pager/$(am__dirstamp) \ pager/$(DEPDIR)/$(am__dirstamp) pager/e_mod_config.lo: pager/$(am__dirstamp) \ pager/$(DEPDIR)/$(am__dirstamp) + pager/module.la: $(pager_module_la_OBJECTS) $(pager_module_la_DEPENDENCIES) $(EXTRA_pager_module_la_DEPENDENCIES) pager/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_pager_module_la_rpath) $(pager_module_la_OBJECTS) $(pager_module_la_LIBADD) $(LIBS) physics/$(am__dirstamp): @@ -5368,6 +5644,7 @@ physics/e_mod_physics_cfdata.lo: physics/$(am__dirstamp) \ physics/$(DEPDIR)/$(am__dirstamp) physics/e_mod_physics.lo: physics/$(am__dirstamp) \ physics/$(DEPDIR)/$(am__dirstamp) + physics/module.la: $(physics_module_la_OBJECTS) $(physics_module_la_DEPENDENCIES) $(EXTRA_physics_module_la_DEPENDENCIES) physics/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_physics_module_la_rpath) $(physics_module_la_OBJECTS) $(physics_module_la_LIBADD) $(LIBS) quickaccess/$(am__dirstamp): @@ -5386,6 +5663,7 @@ quickaccess/e_quickaccess_bindings.lo: quickaccess/$(am__dirstamp) \ quickaccess/$(DEPDIR)/$(am__dirstamp) quickaccess/e_quickaccess_db.lo: quickaccess/$(am__dirstamp) \ quickaccess/$(DEPDIR)/$(am__dirstamp) + quickaccess/module.la: $(quickaccess_module_la_OBJECTS) $(quickaccess_module_la_DEPENDENCIES) $(EXTRA_quickaccess_module_la_DEPENDENCIES) quickaccess/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_quickaccess_module_la_rpath) $(quickaccess_module_la_OBJECTS) $(quickaccess_module_la_LIBADD) $(LIBS) shot/$(am__dirstamp): @@ -5396,6 +5674,7 @@ shot/$(DEPDIR)/$(am__dirstamp): @: > shot/$(DEPDIR)/$(am__dirstamp) shot/e_mod_main.lo: shot/$(am__dirstamp) \ shot/$(DEPDIR)/$(am__dirstamp) + shot/module.la: $(shot_module_la_OBJECTS) $(shot_module_la_DEPENDENCIES) $(EXTRA_shot_module_la_DEPENDENCIES) shot/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_shot_module_la_rpath) $(shot_module_la_OBJECTS) $(shot_module_la_LIBADD) $(LIBS) start/$(am__dirstamp): @@ -5406,6 +5685,7 @@ start/$(DEPDIR)/$(am__dirstamp): @: > start/$(DEPDIR)/$(am__dirstamp) start/e_mod_main.lo: start/$(am__dirstamp) \ start/$(DEPDIR)/$(am__dirstamp) + start/module.la: $(start_module_la_OBJECTS) $(start_module_la_DEPENDENCIES) $(EXTRA_start_module_la_DEPENDENCIES) start/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_start_module_la_rpath) $(start_module_la_OBJECTS) $(start_module_la_LIBADD) $(LIBS) syscon/$(am__dirstamp): @@ -5422,6 +5702,7 @@ syscon/e_syscon.lo: syscon/$(am__dirstamp) \ syscon/$(DEPDIR)/$(am__dirstamp) syscon/e_syscon_gadget.lo: syscon/$(am__dirstamp) \ syscon/$(DEPDIR)/$(am__dirstamp) + syscon/module.la: $(syscon_module_la_OBJECTS) $(syscon_module_la_DEPENDENCIES) $(EXTRA_syscon_module_la_DEPENDENCIES) syscon/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_syscon_module_la_rpath) $(syscon_module_la_OBJECTS) $(syscon_module_la_LIBADD) $(LIBS) systray/$(am__dirstamp): @@ -5432,6 +5713,7 @@ systray/$(DEPDIR)/$(am__dirstamp): @: > systray/$(DEPDIR)/$(am__dirstamp) systray/e_mod_main.lo: systray/$(am__dirstamp) \ systray/$(DEPDIR)/$(am__dirstamp) + systray/module.la: $(systray_module_la_OBJECTS) $(systray_module_la_DEPENDENCIES) $(EXTRA_systray_module_la_DEPENDENCIES) systray/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_systray_module_la_rpath) $(systray_module_la_OBJECTS) $(systray_module_la_LIBADD) $(LIBS) tasks/$(am__dirstamp): @@ -5444,6 +5726,7 @@ tasks/e_mod_main.lo: tasks/$(am__dirstamp) \ tasks/$(DEPDIR)/$(am__dirstamp) tasks/e_mod_config.lo: tasks/$(am__dirstamp) \ tasks/$(DEPDIR)/$(am__dirstamp) + tasks/module.la: $(tasks_module_la_OBJECTS) $(tasks_module_la_DEPENDENCIES) $(EXTRA_tasks_module_la_DEPENDENCIES) tasks/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_tasks_module_la_rpath) $(tasks_module_la_OBJECTS) $(tasks_module_la_LIBADD) $(LIBS) temperature/$(am__dirstamp): @@ -5460,6 +5743,7 @@ temperature/e_mod_tempget.lo: temperature/$(am__dirstamp) \ temperature/$(DEPDIR)/$(am__dirstamp) temperature/e_mod_udev.lo: temperature/$(am__dirstamp) \ temperature/$(DEPDIR)/$(am__dirstamp) + temperature/module.la: $(temperature_module_la_OBJECTS) $(temperature_module_la_DEPENDENCIES) $(EXTRA_temperature_module_la_DEPENDENCIES) temperature/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_temperature_module_la_rpath) $(temperature_module_la_OBJECTS) $(temperature_module_la_LIBADD) $(LIBS) tiling/$(am__dirstamp): @@ -5472,6 +5756,7 @@ tiling/e_mod_tiling.lo: tiling/$(am__dirstamp) \ tiling/$(DEPDIR)/$(am__dirstamp) tiling/e_mod_config.lo: tiling/$(am__dirstamp) \ tiling/$(DEPDIR)/$(am__dirstamp) + tiling/module.la: $(tiling_module_la_OBJECTS) $(tiling_module_la_DEPENDENCIES) $(EXTRA_tiling_module_la_DEPENDENCIES) tiling/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_tiling_module_la_rpath) $(tiling_module_la_OBJECTS) $(tiling_module_la_LIBADD) $(LIBS) winlist/$(am__dirstamp): @@ -5486,6 +5771,7 @@ winlist/e_int_config_winlist.lo: winlist/$(am__dirstamp) \ winlist/$(DEPDIR)/$(am__dirstamp) winlist/e_winlist.lo: winlist/$(am__dirstamp) \ winlist/$(DEPDIR)/$(am__dirstamp) + winlist/module.la: $(winlist_module_la_OBJECTS) $(winlist_module_la_DEPENDENCIES) $(EXTRA_winlist_module_la_DEPENDENCIES) winlist/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_winlist_module_la_rpath) $(winlist_module_la_OBJECTS) $(winlist_module_la_LIBADD) $(LIBS) wizard/$(am__dirstamp): @@ -5498,92 +5784,114 @@ wizard/e_mod_main.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) wizard/e_wizard.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/module.la: $(wizard_module_la_OBJECTS) $(wizard_module_la_DEPENDENCIES) $(EXTRA_wizard_module_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_module_la_rpath) $(wizard_module_la_OBJECTS) $(wizard_module_la_LIBADD) $(LIBS) wizard/page_000.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_000.la: $(wizard_page_000_la_OBJECTS) $(wizard_page_000_la_DEPENDENCIES) $(EXTRA_wizard_page_000_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_000_la_rpath) $(wizard_page_000_la_OBJECTS) $(wizard_page_000_la_LIBADD) $(LIBS) wizard/page_010.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_010.la: $(wizard_page_010_la_OBJECTS) $(wizard_page_010_la_DEPENDENCIES) $(EXTRA_wizard_page_010_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_010_la_rpath) $(wizard_page_010_la_OBJECTS) $(wizard_page_010_la_LIBADD) $(LIBS) wizard/page_011.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_011.la: $(wizard_page_011_la_OBJECTS) $(wizard_page_011_la_DEPENDENCIES) $(EXTRA_wizard_page_011_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_011_la_rpath) $(wizard_page_011_la_OBJECTS) $(wizard_page_011_la_LIBADD) $(LIBS) wizard/page_020.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_020.la: $(wizard_page_020_la_OBJECTS) $(wizard_page_020_la_DEPENDENCIES) $(EXTRA_wizard_page_020_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_020_la_rpath) $(wizard_page_020_la_OBJECTS) $(wizard_page_020_la_LIBADD) $(LIBS) wizard/page_030.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_030.la: $(wizard_page_030_la_OBJECTS) $(wizard_page_030_la_DEPENDENCIES) $(EXTRA_wizard_page_030_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_030_la_rpath) $(wizard_page_030_la_OBJECTS) $(wizard_page_030_la_LIBADD) $(LIBS) wizard/page_040.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_040.la: $(wizard_page_040_la_OBJECTS) $(wizard_page_040_la_DEPENDENCIES) $(EXTRA_wizard_page_040_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_040_la_rpath) $(wizard_page_040_la_OBJECTS) $(wizard_page_040_la_LIBADD) $(LIBS) wizard/page_050.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_050.la: $(wizard_page_050_la_OBJECTS) $(wizard_page_050_la_DEPENDENCIES) $(EXTRA_wizard_page_050_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_050_la_rpath) $(wizard_page_050_la_OBJECTS) $(wizard_page_050_la_LIBADD) $(LIBS) wizard/page_060.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_060.la: $(wizard_page_060_la_OBJECTS) $(wizard_page_060_la_DEPENDENCIES) $(EXTRA_wizard_page_060_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_060_la_rpath) $(wizard_page_060_la_OBJECTS) $(wizard_page_060_la_LIBADD) $(LIBS) wizard/page_070.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_070.la: $(wizard_page_070_la_OBJECTS) $(wizard_page_070_la_DEPENDENCIES) $(EXTRA_wizard_page_070_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_070_la_rpath) $(wizard_page_070_la_OBJECTS) $(wizard_page_070_la_LIBADD) $(LIBS) wizard/page_080.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_080.la: $(wizard_page_080_la_OBJECTS) $(wizard_page_080_la_DEPENDENCIES) $(EXTRA_wizard_page_080_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_080_la_rpath) $(wizard_page_080_la_OBJECTS) $(wizard_page_080_la_LIBADD) $(LIBS) wizard/page_090.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_090.la: $(wizard_page_090_la_OBJECTS) $(wizard_page_090_la_DEPENDENCIES) $(EXTRA_wizard_page_090_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_090_la_rpath) $(wizard_page_090_la_OBJECTS) $(wizard_page_090_la_LIBADD) $(LIBS) wizard/page_100.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_100.la: $(wizard_page_100_la_OBJECTS) $(wizard_page_100_la_DEPENDENCIES) $(EXTRA_wizard_page_100_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_100_la_rpath) $(wizard_page_100_la_OBJECTS) $(wizard_page_100_la_LIBADD) $(LIBS) wizard/page_110.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_110.la: $(wizard_page_110_la_OBJECTS) $(wizard_page_110_la_DEPENDENCIES) $(EXTRA_wizard_page_110_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_110_la_rpath) $(wizard_page_110_la_OBJECTS) $(wizard_page_110_la_LIBADD) $(LIBS) wizard/page_120.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_120.la: $(wizard_page_120_la_OBJECTS) $(wizard_page_120_la_DEPENDENCIES) $(EXTRA_wizard_page_120_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_120_la_rpath) $(wizard_page_120_la_OBJECTS) $(wizard_page_120_la_LIBADD) $(LIBS) wizard/page_130.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_130.la: $(wizard_page_130_la_OBJECTS) $(wizard_page_130_la_DEPENDENCIES) $(EXTRA_wizard_page_130_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_130_la_rpath) $(wizard_page_130_la_OBJECTS) $(wizard_page_130_la_LIBADD) $(LIBS) wizard/page_140.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_140.la: $(wizard_page_140_la_OBJECTS) $(wizard_page_140_la_DEPENDENCIES) $(EXTRA_wizard_page_140_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_140_la_rpath) $(wizard_page_140_la_OBJECTS) $(wizard_page_140_la_LIBADD) $(LIBS) wizard/wizard_page_150_la-page_150.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) wizard/wizard_page_150_la-e_mod_comp_cfdata.lo: \ wizard/$(am__dirstamp) wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_150.la: $(wizard_page_150_la_OBJECTS) $(wizard_page_150_la_DEPENDENCIES) $(EXTRA_wizard_page_150_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_150_la_rpath) $(wizard_page_150_la_OBJECTS) $(wizard_page_150_la_LIBADD) $(LIBS) wizard/page_160.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_160.la: $(wizard_page_160_la_OBJECTS) $(wizard_page_160_la_DEPENDENCIES) $(EXTRA_wizard_page_160_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_160_la_rpath) $(wizard_page_160_la_OBJECTS) $(wizard_page_160_la_LIBADD) $(LIBS) wizard/page_170.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_170.la: $(wizard_page_170_la_OBJECTS) $(wizard_page_170_la_DEPENDENCIES) $(EXTRA_wizard_page_170_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_170_la_rpath) $(wizard_page_170_la_OBJECTS) $(wizard_page_170_la_LIBADD) $(LIBS) wizard/page_180.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_180.la: $(wizard_page_180_la_OBJECTS) $(wizard_page_180_la_DEPENDENCIES) $(EXTRA_wizard_page_180_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_180_la_rpath) $(wizard_page_180_la_OBJECTS) $(wizard_page_180_la_LIBADD) $(LIBS) wizard/page_200.lo: wizard/$(am__dirstamp) \ wizard/$(DEPDIR)/$(am__dirstamp) + wizard/page_200.la: $(wizard_page_200_la_OBJECTS) $(wizard_page_200_la_DEPENDENCIES) $(EXTRA_wizard_page_200_la_DEPENDENCIES) wizard/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_wizard_page_200_la_rpath) $(wizard_page_200_la_OBJECTS) $(wizard_page_200_la_LIBADD) $(LIBS) xkbswitch/$(am__dirstamp): @@ -5598,6 +5906,7 @@ xkbswitch/e_mod_config.lo: xkbswitch/$(am__dirstamp) \ xkbswitch/$(DEPDIR)/$(am__dirstamp) xkbswitch/e_mod_parse.lo: xkbswitch/$(am__dirstamp) \ xkbswitch/$(DEPDIR)/$(am__dirstamp) + xkbswitch/module.la: $(xkbswitch_module_la_OBJECTS) $(xkbswitch_module_la_DEPENDENCIES) $(EXTRA_xkbswitch_module_la_DEPENDENCIES) xkbswitch/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_xkbswitch_module_la_rpath) $(xkbswitch_module_la_OBJECTS) $(xkbswitch_module_la_LIBADD) $(LIBS) install-batgetPROGRAMS: $(batget_PROGRAMS) @@ -5609,10 +5918,12 @@ install-batgetPROGRAMS: $(batget_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -5633,7 +5944,8 @@ uninstall-batgetPROGRAMS: @list='$(batget_PROGRAMS)'; test -n "$(batgetdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(batgetdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(batgetdir)" && rm -f $$files @@ -5655,10 +5967,12 @@ install-freqsetPROGRAMS: $(freqset_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -5679,7 +5993,8 @@ uninstall-freqsetPROGRAMS: @list='$(freqset_PROGRAMS)'; test -n "$(freqsetdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(freqsetdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(freqsetdir)" && rm -f $$files @@ -5701,10 +6016,12 @@ install-tempgetPROGRAMS: $(tempget_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -5725,7 +6042,8 @@ uninstall-tempgetPROGRAMS: @list='$(tempget_PROGRAMS)'; test -n "$(tempgetdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(tempgetdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(tempgetdir)" && rm -f $$files @@ -5740,517 +6058,141 @@ clean-tempgetPROGRAMS: rm -f $$list battery/batget.$(OBJEXT): battery/$(am__dirstamp) \ battery/$(DEPDIR)/$(am__dirstamp) + battery/batget$(EXEEXT): $(battery_batget_OBJECTS) $(battery_batget_DEPENDENCIES) $(EXTRA_battery_batget_DEPENDENCIES) battery/$(am__dirstamp) @rm -f battery/batget$(EXEEXT) $(AM_V_CCLD)$(battery_batget_LINK) $(battery_batget_OBJECTS) $(battery_batget_LDADD) $(LIBS) cpufreq/cpufreq_freqset-freqset.$(OBJEXT): cpufreq/$(am__dirstamp) \ cpufreq/$(DEPDIR)/$(am__dirstamp) + cpufreq/freqset$(EXEEXT): $(cpufreq_freqset_OBJECTS) $(cpufreq_freqset_DEPENDENCIES) $(EXTRA_cpufreq_freqset_DEPENDENCIES) cpufreq/$(am__dirstamp) @rm -f cpufreq/freqset$(EXEEXT) $(AM_V_CCLD)$(cpufreq_freqset_LINK) $(cpufreq_freqset_OBJECTS) $(cpufreq_freqset_LDADD) $(LIBS) temperature/tempget.$(OBJEXT): temperature/$(am__dirstamp) \ temperature/$(DEPDIR)/$(am__dirstamp) + temperature/tempget$(EXEEXT): $(temperature_tempget_OBJECTS) $(temperature_tempget_DEPENDENCIES) $(EXTRA_temperature_tempget_DEPENDENCIES) temperature/$(am__dirstamp) @rm -f temperature/tempget$(EXEEXT) $(AM_V_CCLD)$(LINK) $(temperature_tempget_OBJECTS) $(temperature_tempget_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f access/e_mod_config.$(OBJEXT) - -rm -f access/e_mod_config.lo - -rm -f access/e_mod_main.$(OBJEXT) - -rm -f access/e_mod_main.lo - -rm -f backlight/e_mod_main.$(OBJEXT) - -rm -f backlight/e_mod_main.lo - -rm -f battery/batget.$(OBJEXT) - -rm -f battery/battery_module_la-e_mod_config.$(OBJEXT) - -rm -f battery/battery_module_la-e_mod_config.lo - -rm -f battery/battery_module_la-e_mod_dbus.$(OBJEXT) - -rm -f battery/battery_module_la-e_mod_dbus.lo - -rm -f battery/battery_module_la-e_mod_main.$(OBJEXT) - -rm -f battery/battery_module_la-e_mod_main.lo - -rm -f battery/battery_module_la-e_mod_openbsd.$(OBJEXT) - -rm -f battery/battery_module_la-e_mod_openbsd.lo - -rm -f battery/battery_module_la-e_mod_udev.$(OBJEXT) - -rm -f battery/battery_module_la-e_mod_udev.lo - -rm -f clock/e_mod_config.$(OBJEXT) - -rm -f clock/e_mod_config.lo - -rm -f clock/e_mod_main.$(OBJEXT) - -rm -f clock/e_mod_main.lo - -rm -f comp/e_mod_comp.$(OBJEXT) - -rm -f comp/e_mod_comp.lo - -rm -f comp/e_mod_comp_cfdata.$(OBJEXT) - -rm -f comp/e_mod_comp_cfdata.lo - -rm -f comp/e_mod_comp_update.$(OBJEXT) - -rm -f comp/e_mod_comp_update.lo - -rm -f comp/e_mod_comp_wl.$(OBJEXT) - -rm -f comp/e_mod_comp_wl.lo - -rm -f comp/e_mod_comp_wl_buffer.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_buffer.lo - -rm -f comp/e_mod_comp_wl_comp.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_comp.lo - -rm -f comp/e_mod_comp_wl_input.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_input.lo - -rm -f comp/e_mod_comp_wl_output.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_output.lo - -rm -f comp/e_mod_comp_wl_region.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_region.lo - -rm -f comp/e_mod_comp_wl_shell.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_shell.lo - -rm -f comp/e_mod_comp_wl_surface.$(OBJEXT) - -rm -f comp/e_mod_comp_wl_surface.lo - -rm -f comp/e_mod_config.$(OBJEXT) - -rm -f comp/e_mod_config.lo - -rm -f comp/e_mod_main.$(OBJEXT) - -rm -f comp/e_mod_main.lo - -rm -f conf/e_conf.$(OBJEXT) - -rm -f conf/e_conf.lo - -rm -f conf/e_mod_config.$(OBJEXT) - -rm -f conf/e_mod_config.lo - -rm -f conf/e_mod_main.$(OBJEXT) - -rm -f conf/e_mod_main.lo - -rm -f conf_applications/e_int_config_apps.$(OBJEXT) - -rm -f conf_applications/e_int_config_apps.lo - -rm -f conf_applications/e_int_config_apps_personal.$(OBJEXT) - -rm -f conf_applications/e_int_config_apps_personal.lo - -rm -f conf_applications/e_int_config_defapps.$(OBJEXT) - -rm -f conf_applications/e_int_config_defapps.lo - -rm -f conf_applications/e_int_config_deskenv.$(OBJEXT) - -rm -f conf_applications/e_int_config_deskenv.lo - -rm -f conf_applications/e_mod_main.$(OBJEXT) - -rm -f conf_applications/e_mod_main.lo - -rm -f conf_dialogs/e_int_config_dialogs.$(OBJEXT) - -rm -f conf_dialogs/e_int_config_dialogs.lo - -rm -f conf_dialogs/e_int_config_profiles.$(OBJEXT) - -rm -f conf_dialogs/e_int_config_profiles.lo - -rm -f conf_dialogs/e_mod_main.$(OBJEXT) - -rm -f conf_dialogs/e_mod_main.lo - -rm -f conf_display/e_int_config_desk.$(OBJEXT) - -rm -f conf_display/e_int_config_desk.lo - -rm -f conf_display/e_int_config_desklock.$(OBJEXT) - -rm -f conf_display/e_int_config_desklock.lo - -rm -f conf_display/e_int_config_desklock_fsel.$(OBJEXT) - -rm -f conf_display/e_int_config_desklock_fsel.lo - -rm -f conf_display/e_int_config_desks.$(OBJEXT) - -rm -f conf_display/e_int_config_desks.lo - -rm -f conf_display/e_int_config_display.$(OBJEXT) - -rm -f conf_display/e_int_config_display.lo - -rm -f conf_display/e_int_config_dpms.$(OBJEXT) - -rm -f conf_display/e_int_config_dpms.lo - -rm -f conf_display/e_int_config_screensaver.$(OBJEXT) - -rm -f conf_display/e_int_config_screensaver.lo - -rm -f conf_display/e_mod_main.$(OBJEXT) - -rm -f conf_display/e_mod_main.lo - -rm -f conf_edgebindings/e_int_config_edgebindings.$(OBJEXT) - -rm -f conf_edgebindings/e_int_config_edgebindings.lo - -rm -f conf_edgebindings/e_int_config_signalbindings.$(OBJEXT) - -rm -f conf_edgebindings/e_int_config_signalbindings.lo - -rm -f conf_edgebindings/e_mod_main.$(OBJEXT) - -rm -f conf_edgebindings/e_mod_main.lo - -rm -f conf_interaction/e_int_config_interaction.$(OBJEXT) - -rm -f conf_interaction/e_int_config_interaction.lo - -rm -f conf_interaction/e_int_config_mouse.$(OBJEXT) - -rm -f conf_interaction/e_int_config_mouse.lo - -rm -f conf_interaction/e_mod_main.$(OBJEXT) - -rm -f conf_interaction/e_mod_main.lo - -rm -f conf_intl/e_int_config_imc.$(OBJEXT) - -rm -f conf_intl/e_int_config_imc.lo - -rm -f conf_intl/e_int_config_imc_import.$(OBJEXT) - -rm -f conf_intl/e_int_config_imc_import.lo - -rm -f conf_intl/e_int_config_intl.$(OBJEXT) - -rm -f conf_intl/e_int_config_intl.lo - -rm -f conf_intl/e_mod_main.$(OBJEXT) - -rm -f conf_intl/e_mod_main.lo - -rm -f conf_keybindings/e_int_config_acpibindings.$(OBJEXT) - -rm -f conf_keybindings/e_int_config_acpibindings.lo - -rm -f conf_keybindings/e_int_config_keybindings.$(OBJEXT) - -rm -f conf_keybindings/e_int_config_keybindings.lo - -rm -f conf_keybindings/e_int_config_mousebindings.$(OBJEXT) - -rm -f conf_keybindings/e_int_config_mousebindings.lo - -rm -f conf_keybindings/e_mod_main.$(OBJEXT) - -rm -f conf_keybindings/e_mod_main.lo - -rm -f conf_menus/e_int_config_menus.$(OBJEXT) - -rm -f conf_menus/e_int_config_menus.lo - -rm -f conf_menus/e_mod_main.$(OBJEXT) - -rm -f conf_menus/e_mod_main.lo - -rm -f conf_paths/e_int_config_env.$(OBJEXT) - -rm -f conf_paths/e_int_config_env.lo - -rm -f conf_paths/e_int_config_paths.$(OBJEXT) - -rm -f conf_paths/e_int_config_paths.lo - -rm -f conf_paths/e_mod_main.$(OBJEXT) - -rm -f conf_paths/e_mod_main.lo - -rm -f conf_performance/e_int_config_engine.$(OBJEXT) - -rm -f conf_performance/e_int_config_engine.lo - -rm -f conf_performance/e_int_config_performance.$(OBJEXT) - -rm -f conf_performance/e_int_config_performance.lo - -rm -f conf_performance/e_int_config_powermanagement.$(OBJEXT) - -rm -f conf_performance/e_int_config_powermanagement.lo - -rm -f conf_performance/e_mod_main.$(OBJEXT) - -rm -f conf_performance/e_mod_main.lo - -rm -f conf_randr/e_int_config_randr.$(OBJEXT) - -rm -f conf_randr/e_int_config_randr.lo - -rm -f conf_randr/e_mod_main.$(OBJEXT) - -rm -f conf_randr/e_mod_main.lo - -rm -f conf_randr/e_smart_monitor.$(OBJEXT) - -rm -f conf_randr/e_smart_monitor.lo - -rm -f conf_randr/e_smart_randr.$(OBJEXT) - -rm -f conf_randr/e_smart_randr.lo - -rm -f conf_shelves/e_int_config_shelf.$(OBJEXT) - -rm -f conf_shelves/e_int_config_shelf.lo - -rm -f conf_shelves/e_mod_main.$(OBJEXT) - -rm -f conf_shelves/e_mod_main.lo - -rm -f conf_theme/e_int_config_borders.$(OBJEXT) - -rm -f conf_theme/e_int_config_borders.lo - -rm -f conf_theme/e_int_config_color_classes.$(OBJEXT) - -rm -f conf_theme/e_int_config_color_classes.lo - -rm -f conf_theme/e_int_config_fonts.$(OBJEXT) - -rm -f conf_theme/e_int_config_fonts.lo - -rm -f conf_theme/e_int_config_scale.$(OBJEXT) - -rm -f conf_theme/e_int_config_scale.lo - -rm -f conf_theme/e_int_config_startup.$(OBJEXT) - -rm -f conf_theme/e_int_config_startup.lo - -rm -f conf_theme/e_int_config_theme.$(OBJEXT) - -rm -f conf_theme/e_int_config_theme.lo - -rm -f conf_theme/e_int_config_theme_import.$(OBJEXT) - -rm -f conf_theme/e_int_config_theme_import.lo - -rm -f conf_theme/e_int_config_transitions.$(OBJEXT) - -rm -f conf_theme/e_int_config_transitions.lo - -rm -f conf_theme/e_int_config_wallpaper.$(OBJEXT) - -rm -f conf_theme/e_int_config_wallpaper.lo - -rm -f conf_theme/e_int_config_xsettings.$(OBJEXT) - -rm -f conf_theme/e_int_config_xsettings.lo - -rm -f conf_theme/e_mod_main.$(OBJEXT) - -rm -f conf_theme/e_mod_main.lo - -rm -f conf_wallpaper2/e_int_config_wallpaper.$(OBJEXT) - -rm -f conf_wallpaper2/e_int_config_wallpaper.lo - -rm -f conf_wallpaper2/e_mod_main.$(OBJEXT) - -rm -f conf_wallpaper2/e_mod_main.lo - -rm -f conf_window_manipulation/e_int_config_clientlist.$(OBJEXT) - -rm -f conf_window_manipulation/e_int_config_clientlist.lo - -rm -f conf_window_manipulation/e_int_config_focus.$(OBJEXT) - -rm -f conf_window_manipulation/e_int_config_focus.lo - -rm -f conf_window_manipulation/e_int_config_window_display.$(OBJEXT) - -rm -f conf_window_manipulation/e_int_config_window_display.lo - -rm -f conf_window_manipulation/e_int_config_window_geometry.$(OBJEXT) - -rm -f conf_window_manipulation/e_int_config_window_geometry.lo - -rm -f conf_window_manipulation/e_int_config_window_process.$(OBJEXT) - -rm -f conf_window_manipulation/e_int_config_window_process.lo - -rm -f conf_window_manipulation/e_mod_main.$(OBJEXT) - -rm -f conf_window_manipulation/e_mod_main.lo - -rm -f conf_window_remembers/e_int_config_remembers.$(OBJEXT) - -rm -f conf_window_remembers/e_int_config_remembers.lo - -rm -f conf_window_remembers/e_mod_main.$(OBJEXT) - -rm -f conf_window_remembers/e_mod_main.lo - -rm -f connman/connman_module_la-agent.$(OBJEXT) - -rm -f connman/connman_module_la-agent.lo - -rm -f connman/connman_module_la-e_connman.$(OBJEXT) - -rm -f connman/connman_module_la-e_connman.lo - -rm -f connman/connman_module_la-e_mod_config.$(OBJEXT) - -rm -f connman/connman_module_la-e_mod_config.lo - -rm -f connman/connman_module_la-e_mod_main.$(OBJEXT) - -rm -f connman/connman_module_la-e_mod_main.lo - -rm -f cpufreq/cpufreq_freqset-freqset.$(OBJEXT) - -rm -f cpufreq/e_mod_main.$(OBJEXT) - -rm -f cpufreq/e_mod_main.lo - -rm -f dropshadow/e_mod_config.$(OBJEXT) - -rm -f dropshadow/e_mod_config.lo - -rm -f dropshadow/e_mod_main.$(OBJEXT) - -rm -f dropshadow/e_mod_main.lo - -rm -f everything/e_mod_main.$(OBJEXT) - -rm -f everything/e_mod_main.lo - -rm -f everything/evry.$(OBJEXT) - -rm -f everything/evry.lo - -rm -f everything/evry_config.$(OBJEXT) - -rm -f everything/evry_config.lo - -rm -f everything/evry_gadget.$(OBJEXT) - -rm -f everything/evry_gadget.lo - -rm -f everything/evry_history.$(OBJEXT) - -rm -f everything/evry_history.lo - -rm -f everything/evry_plug_actions.$(OBJEXT) - -rm -f everything/evry_plug_actions.lo - -rm -f everything/evry_plug_aggregator.$(OBJEXT) - -rm -f everything/evry_plug_aggregator.lo - -rm -f everything/evry_plug_apps.$(OBJEXT) - -rm -f everything/evry_plug_apps.lo - -rm -f everything/evry_plug_calc.$(OBJEXT) - -rm -f everything/evry_plug_calc.lo - -rm -f everything/evry_plug_clipboard.$(OBJEXT) - -rm -f everything/evry_plug_clipboard.lo - -rm -f everything/evry_plug_collection.$(OBJEXT) - -rm -f everything/evry_plug_collection.lo - -rm -f everything/evry_plug_files.$(OBJEXT) - -rm -f everything/evry_plug_files.lo - -rm -f everything/evry_plug_settings.$(OBJEXT) - -rm -f everything/evry_plug_settings.lo - -rm -f everything/evry_plug_text.$(OBJEXT) - -rm -f everything/evry_plug_text.lo - -rm -f everything/evry_plug_windows.$(OBJEXT) - -rm -f everything/evry_plug_windows.lo - -rm -f everything/evry_plugin.$(OBJEXT) - -rm -f everything/evry_plugin.lo - -rm -f everything/evry_util.$(OBJEXT) - -rm -f everything/evry_util.lo - -rm -f everything/evry_view.$(OBJEXT) - -rm -f everything/evry_view.lo - -rm -f everything/evry_view_help.$(OBJEXT) - -rm -f everything/evry_view_help.lo - -rm -f everything/evry_view_tabs.$(OBJEXT) - -rm -f everything/evry_view_tabs.lo - -rm -f everything/md5.$(OBJEXT) - -rm -f everything/md5.lo - -rm -f fileman/e_fwin.$(OBJEXT) - -rm -f fileman/e_fwin.lo - -rm -f fileman/e_fwin_nav.$(OBJEXT) - -rm -f fileman/e_fwin_nav.lo - -rm -f fileman/e_int_config_mime.$(OBJEXT) - -rm -f fileman/e_int_config_mime.lo - -rm -f fileman/e_int_config_mime_edit.$(OBJEXT) - -rm -f fileman/e_int_config_mime_edit.lo - -rm -f fileman/e_mod_config.$(OBJEXT) - -rm -f fileman/e_mod_config.lo - -rm -f fileman/e_mod_dbus.$(OBJEXT) - -rm -f fileman/e_mod_dbus.lo - -rm -f fileman/e_mod_main.$(OBJEXT) - -rm -f fileman/e_mod_main.lo - -rm -f fileman/e_mod_menu.$(OBJEXT) - -rm -f fileman/e_mod_menu.lo - -rm -f fileman_opinfo/e_mod_main.$(OBJEXT) - -rm -f fileman_opinfo/e_mod_main.lo - -rm -f gadman/e_mod_config.$(OBJEXT) - -rm -f gadman/e_mod_config.lo - -rm -f gadman/e_mod_gadman.$(OBJEXT) - -rm -f gadman/e_mod_gadman.lo - -rm -f gadman/e_mod_main.$(OBJEXT) - -rm -f gadman/e_mod_main.lo - -rm -f ibar/e_mod_config.$(OBJEXT) - -rm -f ibar/e_mod_config.lo - -rm -f ibar/e_mod_main.$(OBJEXT) - -rm -f ibar/e_mod_main.lo - -rm -f ibox/e_mod_config.$(OBJEXT) - -rm -f ibox/e_mod_config.lo - -rm -f ibox/e_mod_main.$(OBJEXT) - -rm -f ibox/e_mod_main.lo - -rm -f illume-bluetooth/e_mod_main.$(OBJEXT) - -rm -f illume-bluetooth/e_mod_main.lo - -rm -f illume-home-toggle/e_mod_main.$(OBJEXT) - -rm -f illume-home-toggle/e_mod_main.lo - -rm -f illume-home/e_busycover.$(OBJEXT) - -rm -f illume-home/e_busycover.lo - -rm -f illume-home/e_mod_config.$(OBJEXT) - -rm -f illume-home/e_mod_config.lo - -rm -f illume-home/e_mod_main.$(OBJEXT) - -rm -f illume-home/e_mod_main.lo - -rm -f illume-indicator/e_mod_config.$(OBJEXT) - -rm -f illume-indicator/e_mod_config.lo - -rm -f illume-indicator/e_mod_ind_win.$(OBJEXT) - -rm -f illume-indicator/e_mod_ind_win.lo - -rm -f illume-indicator/e_mod_main.$(OBJEXT) - -rm -f illume-indicator/e_mod_main.lo - -rm -f illume-indicator/e_mod_notify.$(OBJEXT) - -rm -f illume-indicator/e_mod_notify.lo - -rm -f illume-kbd-toggle/e_mod_main.$(OBJEXT) - -rm -f illume-kbd-toggle/e_mod_main.lo - -rm -f illume-keyboard/e_kbd_buf.$(OBJEXT) - -rm -f illume-keyboard/e_kbd_buf.lo - -rm -f illume-keyboard/e_kbd_dict.$(OBJEXT) - -rm -f illume-keyboard/e_kbd_dict.lo - -rm -f illume-keyboard/e_kbd_int.$(OBJEXT) - -rm -f illume-keyboard/e_kbd_int.lo - -rm -f illume-keyboard/e_kbd_send.$(OBJEXT) - -rm -f illume-keyboard/e_kbd_send.lo - -rm -f illume-keyboard/e_mod_config.$(OBJEXT) - -rm -f illume-keyboard/e_mod_config.lo - -rm -f illume-keyboard/e_mod_main.$(OBJEXT) - -rm -f illume-keyboard/e_mod_main.lo - -rm -f illume-mode-toggle/e_mod_main.$(OBJEXT) - -rm -f illume-mode-toggle/e_mod_main.lo - -rm -f illume-softkey/e_mod_config.$(OBJEXT) - -rm -f illume-softkey/e_mod_config.lo - -rm -f illume-softkey/e_mod_main.$(OBJEXT) - -rm -f illume-softkey/e_mod_main.lo - -rm -f illume-softkey/e_mod_sft_win.$(OBJEXT) - -rm -f illume-softkey/e_mod_sft_win.lo - -rm -f illume2/e_illume.$(OBJEXT) - -rm -f illume2/e_illume.lo - -rm -f illume2/e_mod_config.$(OBJEXT) - -rm -f illume2/e_mod_config.lo - -rm -f illume2/e_mod_config_animation.$(OBJEXT) - -rm -f illume2/e_mod_config_animation.lo - -rm -f illume2/e_mod_config_policy.$(OBJEXT) - -rm -f illume2/e_mod_config_policy.lo - -rm -f illume2/e_mod_config_windows.$(OBJEXT) - -rm -f illume2/e_mod_config_windows.lo - -rm -f illume2/e_mod_kbd.$(OBJEXT) - -rm -f illume2/e_mod_kbd.lo - -rm -f illume2/e_mod_kbd_device.$(OBJEXT) - -rm -f illume2/e_mod_kbd_device.lo - -rm -f illume2/e_mod_main.$(OBJEXT) - -rm -f illume2/e_mod_main.lo - -rm -f illume2/e_mod_policy.$(OBJEXT) - -rm -f illume2/e_mod_policy.lo - -rm -f illume2/e_mod_quickpanel.$(OBJEXT) - -rm -f illume2/e_mod_quickpanel.lo - -rm -f illume2/e_mod_select_window.$(OBJEXT) - -rm -f illume2/e_mod_select_window.lo - -rm -f illume2/policies/illume/illume2_policies_illume_illume_la-illume.$(OBJEXT) - -rm -f illume2/policies/illume/illume2_policies_illume_illume_la-illume.lo - -rm -f illume2/policies/illume/illume2_policies_illume_illume_la-policy.$(OBJEXT) - -rm -f illume2/policies/illume/illume2_policies_illume_illume_la-policy.lo - -rm -f illume2/policies/tablet/illume2_policies_tablet_tablet_la-policy.$(OBJEXT) - -rm -f illume2/policies/tablet/illume2_policies_tablet_tablet_la-policy.lo - -rm -f illume2/policies/tablet/illume2_policies_tablet_tablet_la-tablet.$(OBJEXT) - -rm -f illume2/policies/tablet/illume2_policies_tablet_tablet_la-tablet.lo - -rm -f mixer/mixer_module_la-app_mixer.$(OBJEXT) - -rm -f mixer/mixer_module_la-app_mixer.lo - -rm -f mixer/mixer_module_la-conf_gadget.$(OBJEXT) - -rm -f mixer/mixer_module_la-conf_gadget.lo - -rm -f mixer/mixer_module_la-conf_module.$(OBJEXT) - -rm -f mixer/mixer_module_la-conf_module.lo - -rm -f mixer/mixer_module_la-e_mod_main.$(OBJEXT) - -rm -f mixer/mixer_module_la-e_mod_main.lo - -rm -f mixer/mixer_module_la-msg.$(OBJEXT) - -rm -f mixer/mixer_module_la-msg.lo - -rm -f mixer/mixer_module_la-pa.$(OBJEXT) - -rm -f mixer/mixer_module_la-pa.lo - -rm -f mixer/mixer_module_la-serial.$(OBJEXT) - -rm -f mixer/mixer_module_la-serial.lo - -rm -f mixer/mixer_module_la-sink.$(OBJEXT) - -rm -f mixer/mixer_module_la-sink.lo - -rm -f mixer/mixer_module_la-sys_alsa.$(OBJEXT) - -rm -f mixer/mixer_module_la-sys_alsa.lo - -rm -f mixer/mixer_module_la-sys_dummy.$(OBJEXT) - -rm -f mixer/mixer_module_la-sys_dummy.lo - -rm -f mixer/mixer_module_la-sys_pulse.$(OBJEXT) - -rm -f mixer/mixer_module_la-sys_pulse.lo - -rm -f mixer/mixer_module_la-tag.$(OBJEXT) - -rm -f mixer/mixer_module_la-tag.lo - -rm -f msgbus/e_mod_main.$(OBJEXT) - -rm -f msgbus/e_mod_main.lo - -rm -f msgbus/msgbus_audit.$(OBJEXT) - -rm -f msgbus/msgbus_audit.lo - -rm -f msgbus/msgbus_desktop.$(OBJEXT) - -rm -f msgbus/msgbus_desktop.lo - -rm -f msgbus/msgbus_lang.$(OBJEXT) - -rm -f msgbus/msgbus_lang.lo - -rm -f notification/e_mod_config.$(OBJEXT) - -rm -f notification/e_mod_config.lo - -rm -f notification/e_mod_main.$(OBJEXT) - -rm -f notification/e_mod_main.lo - -rm -f notification/e_mod_popup.$(OBJEXT) - -rm -f notification/e_mod_popup.lo - -rm -f pager/e_mod_config.$(OBJEXT) - -rm -f pager/e_mod_config.lo - -rm -f pager/e_mod_main.$(OBJEXT) - -rm -f pager/e_mod_main.lo - -rm -f physics/e_mod_config.$(OBJEXT) - -rm -f physics/e_mod_config.lo - -rm -f physics/e_mod_main.$(OBJEXT) - -rm -f physics/e_mod_main.lo - -rm -f physics/e_mod_physics.$(OBJEXT) - -rm -f physics/e_mod_physics.lo - -rm -f physics/e_mod_physics_cfdata.$(OBJEXT) - -rm -f physics/e_mod_physics_cfdata.lo - -rm -f quickaccess/e_mod_config.$(OBJEXT) - -rm -f quickaccess/e_mod_config.lo - -rm -f quickaccess/e_mod_main.$(OBJEXT) - -rm -f quickaccess/e_mod_main.lo - -rm -f quickaccess/e_mod_quickaccess.$(OBJEXT) - -rm -f quickaccess/e_mod_quickaccess.lo - -rm -f quickaccess/e_quickaccess_bindings.$(OBJEXT) - -rm -f quickaccess/e_quickaccess_bindings.lo - -rm -f quickaccess/e_quickaccess_db.$(OBJEXT) - -rm -f quickaccess/e_quickaccess_db.lo - -rm -f shot/e_mod_main.$(OBJEXT) - -rm -f shot/e_mod_main.lo - -rm -f start/e_mod_main.$(OBJEXT) - -rm -f start/e_mod_main.lo - -rm -f syscon/e_int_config_syscon.$(OBJEXT) - -rm -f syscon/e_int_config_syscon.lo - -rm -f syscon/e_mod_main.$(OBJEXT) - -rm -f syscon/e_mod_main.lo - -rm -f syscon/e_syscon.$(OBJEXT) - -rm -f syscon/e_syscon.lo - -rm -f syscon/e_syscon_gadget.$(OBJEXT) - -rm -f syscon/e_syscon_gadget.lo - -rm -f systray/e_mod_main.$(OBJEXT) - -rm -f systray/e_mod_main.lo - -rm -f tasks/e_mod_config.$(OBJEXT) - -rm -f tasks/e_mod_config.lo - -rm -f tasks/e_mod_main.$(OBJEXT) - -rm -f tasks/e_mod_main.lo - -rm -f temperature/e_mod_config.$(OBJEXT) - -rm -f temperature/e_mod_config.lo - -rm -f temperature/e_mod_main.$(OBJEXT) - -rm -f temperature/e_mod_main.lo - -rm -f temperature/e_mod_tempget.$(OBJEXT) - -rm -f temperature/e_mod_tempget.lo - -rm -f temperature/e_mod_udev.$(OBJEXT) - -rm -f temperature/e_mod_udev.lo - -rm -f temperature/tempget.$(OBJEXT) - -rm -f tiling/e_mod_config.$(OBJEXT) - -rm -f tiling/e_mod_config.lo - -rm -f tiling/e_mod_tiling.$(OBJEXT) - -rm -f tiling/e_mod_tiling.lo - -rm -f winlist/e_int_config_winlist.$(OBJEXT) - -rm -f winlist/e_int_config_winlist.lo - -rm -f winlist/e_mod_main.$(OBJEXT) - -rm -f winlist/e_mod_main.lo - -rm -f winlist/e_winlist.$(OBJEXT) - -rm -f winlist/e_winlist.lo - -rm -f wizard/e_mod_main.$(OBJEXT) - -rm -f wizard/e_mod_main.lo - -rm -f wizard/e_wizard.$(OBJEXT) - -rm -f wizard/e_wizard.lo - -rm -f wizard/page_000.$(OBJEXT) - -rm -f wizard/page_000.lo - -rm -f wizard/page_010.$(OBJEXT) - -rm -f wizard/page_010.lo - -rm -f wizard/page_011.$(OBJEXT) - -rm -f wizard/page_011.lo - -rm -f wizard/page_020.$(OBJEXT) - -rm -f wizard/page_020.lo - -rm -f wizard/page_030.$(OBJEXT) - -rm -f wizard/page_030.lo - -rm -f wizard/page_040.$(OBJEXT) - -rm -f wizard/page_040.lo - -rm -f wizard/page_050.$(OBJEXT) - -rm -f wizard/page_050.lo - -rm -f wizard/page_060.$(OBJEXT) - -rm -f wizard/page_060.lo - -rm -f wizard/page_070.$(OBJEXT) - -rm -f wizard/page_070.lo - -rm -f wizard/page_080.$(OBJEXT) - -rm -f wizard/page_080.lo - -rm -f wizard/page_090.$(OBJEXT) - -rm -f wizard/page_090.lo - -rm -f wizard/page_100.$(OBJEXT) - -rm -f wizard/page_100.lo - -rm -f wizard/page_110.$(OBJEXT) - -rm -f wizard/page_110.lo - -rm -f wizard/page_120.$(OBJEXT) - -rm -f wizard/page_120.lo - -rm -f wizard/page_130.$(OBJEXT) - -rm -f wizard/page_130.lo - -rm -f wizard/page_140.$(OBJEXT) - -rm -f wizard/page_140.lo - -rm -f wizard/page_160.$(OBJEXT) - -rm -f wizard/page_160.lo - -rm -f wizard/page_170.$(OBJEXT) - -rm -f wizard/page_170.lo - -rm -f wizard/page_180.$(OBJEXT) - -rm -f wizard/page_180.lo - -rm -f wizard/page_200.$(OBJEXT) - -rm -f wizard/page_200.lo - -rm -f wizard/wizard_page_150_la-e_mod_comp_cfdata.$(OBJEXT) - -rm -f wizard/wizard_page_150_la-e_mod_comp_cfdata.lo - -rm -f wizard/wizard_page_150_la-page_150.$(OBJEXT) - -rm -f wizard/wizard_page_150_la-page_150.lo - -rm -f xkbswitch/e_mod_config.$(OBJEXT) - -rm -f xkbswitch/e_mod_config.lo - -rm -f xkbswitch/e_mod_main.$(OBJEXT) - -rm -f xkbswitch/e_mod_main.lo - -rm -f xkbswitch/e_mod_parse.$(OBJEXT) - -rm -f xkbswitch/e_mod_parse.lo + -rm -f access/*.$(OBJEXT) + -rm -f access/*.lo + -rm -f backlight/*.$(OBJEXT) + -rm -f backlight/*.lo + -rm -f battery/*.$(OBJEXT) + -rm -f battery/*.lo + -rm -f clock/*.$(OBJEXT) + -rm -f clock/*.lo + -rm -f comp/*.$(OBJEXT) + -rm -f comp/*.lo + -rm -f conf/*.$(OBJEXT) + -rm -f conf/*.lo + -rm -f conf_applications/*.$(OBJEXT) + -rm -f conf_applications/*.lo + -rm -f conf_dialogs/*.$(OBJEXT) + -rm -f conf_dialogs/*.lo + -rm -f conf_display/*.$(OBJEXT) + -rm -f conf_display/*.lo + -rm -f conf_edgebindings/*.$(OBJEXT) + -rm -f conf_edgebindings/*.lo + -rm -f conf_interaction/*.$(OBJEXT) + -rm -f conf_interaction/*.lo + -rm -f conf_intl/*.$(OBJEXT) + -rm -f conf_intl/*.lo + -rm -f conf_keybindings/*.$(OBJEXT) + -rm -f conf_keybindings/*.lo + -rm -f conf_menus/*.$(OBJEXT) + -rm -f conf_menus/*.lo + -rm -f conf_paths/*.$(OBJEXT) + -rm -f conf_paths/*.lo + -rm -f conf_performance/*.$(OBJEXT) + -rm -f conf_performance/*.lo + -rm -f conf_randr/*.$(OBJEXT) + -rm -f conf_randr/*.lo + -rm -f conf_shelves/*.$(OBJEXT) + -rm -f conf_shelves/*.lo + -rm -f conf_theme/*.$(OBJEXT) + -rm -f conf_theme/*.lo + -rm -f conf_wallpaper2/*.$(OBJEXT) + -rm -f conf_wallpaper2/*.lo + -rm -f conf_window_manipulation/*.$(OBJEXT) + -rm -f conf_window_manipulation/*.lo + -rm -f conf_window_remembers/*.$(OBJEXT) + -rm -f conf_window_remembers/*.lo + -rm -f connman/*.$(OBJEXT) + -rm -f connman/*.lo + -rm -f cpufreq/*.$(OBJEXT) + -rm -f cpufreq/*.lo + -rm -f dropshadow/*.$(OBJEXT) + -rm -f dropshadow/*.lo + -rm -f everything/*.$(OBJEXT) + -rm -f everything/*.lo + -rm -f fileman/*.$(OBJEXT) + -rm -f fileman/*.lo + -rm -f fileman_opinfo/*.$(OBJEXT) + -rm -f fileman_opinfo/*.lo + -rm -f gadman/*.$(OBJEXT) + -rm -f gadman/*.lo + -rm -f ibar/*.$(OBJEXT) + -rm -f ibar/*.lo + -rm -f ibox/*.$(OBJEXT) + -rm -f ibox/*.lo + -rm -f illume-bluetooth/*.$(OBJEXT) + -rm -f illume-bluetooth/*.lo + -rm -f illume-home-toggle/*.$(OBJEXT) + -rm -f illume-home-toggle/*.lo + -rm -f illume-home/*.$(OBJEXT) + -rm -f illume-home/*.lo + -rm -f illume-indicator/*.$(OBJEXT) + -rm -f illume-indicator/*.lo + -rm -f illume-kbd-toggle/*.$(OBJEXT) + -rm -f illume-kbd-toggle/*.lo + -rm -f illume-keyboard/*.$(OBJEXT) + -rm -f illume-keyboard/*.lo + -rm -f illume-mode-toggle/*.$(OBJEXT) + -rm -f illume-mode-toggle/*.lo + -rm -f illume-softkey/*.$(OBJEXT) + -rm -f illume-softkey/*.lo + -rm -f illume2/*.$(OBJEXT) + -rm -f illume2/*.lo + -rm -f illume2/policies/illume/*.$(OBJEXT) + -rm -f illume2/policies/illume/*.lo + -rm -f illume2/policies/tablet/*.$(OBJEXT) + -rm -f illume2/policies/tablet/*.lo + -rm -f mixer/*.$(OBJEXT) + -rm -f mixer/*.lo + -rm -f msgbus/*.$(OBJEXT) + -rm -f msgbus/*.lo + -rm -f notification/*.$(OBJEXT) + -rm -f notification/*.lo + -rm -f pager/*.$(OBJEXT) + -rm -f pager/*.lo + -rm -f physics/*.$(OBJEXT) + -rm -f physics/*.lo + -rm -f quickaccess/*.$(OBJEXT) + -rm -f quickaccess/*.lo + -rm -f shot/*.$(OBJEXT) + -rm -f shot/*.lo + -rm -f start/*.$(OBJEXT) + -rm -f start/*.lo + -rm -f syscon/*.$(OBJEXT) + -rm -f syscon/*.lo + -rm -f systray/*.$(OBJEXT) + -rm -f systray/*.lo + -rm -f tasks/*.$(OBJEXT) + -rm -f tasks/*.lo + -rm -f temperature/*.$(OBJEXT) + -rm -f temperature/*.lo + -rm -f tiling/*.$(OBJEXT) + -rm -f tiling/*.lo + -rm -f winlist/*.$(OBJEXT) + -rm -f winlist/*.lo + -rm -f wizard/*.$(OBJEXT) + -rm -f wizard/*.lo + -rm -f xkbswitch/*.$(OBJEXT) + -rm -f xkbswitch/*.lo distclean-compile: -rm -f *.tab.c @@ -8120,22 +8062,25 @@ uninstall-xkbswitchDATA: dir='$(DESTDIR)$(xkbswitchdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -8150,57 +8095,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -8216,12 +8116,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -8233,15 +8128,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -8250,6 +8141,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -8737,11 +8643,11 @@ uninstall-am: uninstall-accessDATA uninstall-accesspkgLTLIBRARIES \ uninstall-wizard_desktopDATA uninstall-wizardpkgLTLIBRARIES \ uninstall-xkbswitchDATA uninstall-xkbswitchpkgLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-accesspkgLTLIBRARIES \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-accesspkgLTLIBRARIES \ clean-backlightpkgLTLIBRARIES clean-batgetPROGRAMS \ clean-batterypkgLTLIBRARIES clean-clockpkgLTLIBRARIES \ clean-comppkgLTLIBRARIES clean-conf_applicationspkgLTLIBRARIES \ @@ -8784,11 +8690,11 @@ uninstall-am: uninstall-accessDATA uninstall-accesspkgLTLIBRARIES \ clean-taskspkgLTLIBRARIES clean-temperaturepkgLTLIBRARIES \ clean-tempgetPROGRAMS clean-tilingpkgLTLIBRARIES \ clean-winlistpkgLTLIBRARIES clean-wizardpkgLTLIBRARIES \ - clean-xkbswitchpkgLTLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-accessDATA install-accesspkgLTLIBRARIES \ - install-am install-backlightDATA \ + clean-xkbswitchpkgLTLIBRARIES cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-accessDATA \ + install-accesspkgLTLIBRARIES install-am install-backlightDATA \ install-backlightpkgLTLIBRARIES install-batgetPROGRAMS \ install-batteryDATA install-batterypkgLTLIBRARIES \ install-clockDATA install-clockpkgLTLIBRARIES install-compDATA \ @@ -8868,7 +8774,7 @@ uninstall-am: uninstall-accessDATA uninstall-accesspkgLTLIBRARIES \ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall \ + pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-accessDATA uninstall-accesspkgLTLIBRARIES \ uninstall-am uninstall-backlightDATA \ uninstall-backlightpkgLTLIBRARIES uninstall-batgetPROGRAMS \ diff --git a/src/modules/access/module.desktop.in b/src/modules/access/module.desktop.in index 75e43a082e..23fa5b26ce 100644 --- a/src/modules/access/module.desktop.in +++ b/src/modules/access/module.desktop.in @@ -1,18 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Access +Name[Name]=Access +Name[ab]= Name[ca]=Accessibilitat +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Atingo Name[es]=Accesibilidad +Name[fr]=Accès Name[gl]=Accesibilidade +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Acessibilidade Name[ru]=Доступность -Icon=preferences-desktop-accessibility -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Accessibility module designed to improve ease of use for the vision impaired and the blind. Comment[ca]=Mòdul d'accessibilitat dissenyat per a facilitar l'ús a persones amb discapacitat visual. +Comment[eo]=Modulo por alirebleco elpensita por plifaciligi uzadon de vido ĉe misvidantoj kaj blinduloj. Comment[es]=Módulo de accesibilidad diseñado para facilitar el uso a ciegos y discapacitados visuales. Comment[fr]=Module d'accessibilité permettant d'améliorer l'expérience utilisateur des déficients visuels. Comment[gl]=Módulo de accesibilidade programado para facilitar o uso a cegos e discapacitados visuais. Comment[it]=Modulo per l'accessibilità, progettato per facilitare l'uso agli ipovedenti e ai ciechi. Comment[pt]=Módulo de acessibilidade para ajudar os deficientes visuais Comment[ru]=Модуль разработанный для упрощения работы за компьютером людей со слабым зрением. +Icon=preferences-desktop-accessibility +X-Enlightenment-ModuleType=utils diff --git a/src/modules/backlight/module.desktop b/src/modules/backlight/module.desktop index 60e89e7c14..9d06a79abb 100644 --- a/src/modules/backlight/module.desktop +++ b/src/modules/backlight/module.desktop @@ -1,19 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Backlight +Name[Name]=Backlight +Name[ab]= Name[ca]=Il·luminació +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Fona lumo Name[es]=Iluminación Name[fr]=Rétroéclairage Name[gl]=Iluminación +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Iluminação Name[ru]=Подсветка -Icon=e-module-backlight -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Backlight control slider gadget Comment[ca]=Cursor per a controlar la retroil·luminació. +Comment[eo]=Akcesorajo de kontrolo-ŝovilo de fona lumo Comment[es]=Deslizador para controlar la iluminación. Comment[fr]=Slider de contrôle du rétroéclairage. Comment[gl]=Cursor para controlar a iluminación. Comment[it]=Fornisce un cursore per il controllo della retroilluminazione. Comment[pt]=Um cursor para controlar a iluminação do monitor Comment[ru]=Слайдер для управления подсветкой +Icon=e-module-backlight +X-Enlightenment-ModuleType=utils diff --git a/src/modules/backlight/module.desktop.in b/src/modules/backlight/module.desktop.in index 60e89e7c14..9d06a79abb 100644 --- a/src/modules/backlight/module.desktop.in +++ b/src/modules/backlight/module.desktop.in @@ -1,19 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Backlight +Name[Name]=Backlight +Name[ab]= Name[ca]=Il·luminació +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Fona lumo Name[es]=Iluminación Name[fr]=Rétroéclairage Name[gl]=Iluminación +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Iluminação Name[ru]=Подсветка -Icon=e-module-backlight -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Backlight control slider gadget Comment[ca]=Cursor per a controlar la retroil·luminació. +Comment[eo]=Akcesorajo de kontrolo-ŝovilo de fona lumo Comment[es]=Deslizador para controlar la iluminación. Comment[fr]=Slider de contrôle du rétroéclairage. Comment[gl]=Cursor para controlar a iluminación. Comment[it]=Fornisce un cursore per il controllo della retroilluminazione. Comment[pt]=Um cursor para controlar a iluminação do monitor Comment[ru]=Слайдер для управления подсветкой +Icon=e-module-backlight +X-Enlightenment-ModuleType=utils diff --git a/src/modules/battery/module.desktop b/src/modules/battery/module.desktop index 9014ccf5ce..b01baefec1 100644 --- a/src/modules/battery/module.desktop +++ b/src/modules/battery/module.desktop @@ -1,24 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Battery +Name[Name]=Battery +Name[ab]= Name[ca]=Bateria Name[cs]=Baterie Name[de]=Batterie Name[el]=Μπαταρία -Name[eo]=Baterío +Name[eo]=Baterio Name[es]=Batería Name[fr]=Batterie Name[gl]=Batería Name[hu]=Akkumulátor Name[it]= Name[ja]= +Name[ko]= Name[pt]=Bateria Name[pt_BR]= Name[ru]=Батарея +Name[sr]= Name[tr]=Pil Name[zh_CN]= Name[zh_TW]= -Icon=e-module-battery Comment=A gadget to visualize your battery status. Comment[ca]=Un mòdul que mostra l'estat de la bateria. Comment[cs]=Gadget pro zobrazení stavu vaší baterie v notebooku. @@ -37,4 +41,5 @@ Comment[ru]=Гаджет для отображения статуса батар Comment[tr]=Pil durumunu görselleştiren araç. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-battery X-Enlightenment-ModuleType=system diff --git a/src/modules/battery/module.desktop.in b/src/modules/battery/module.desktop.in index 9014ccf5ce..b01baefec1 100644 --- a/src/modules/battery/module.desktop.in +++ b/src/modules/battery/module.desktop.in @@ -1,24 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Battery +Name[Name]=Battery +Name[ab]= Name[ca]=Bateria Name[cs]=Baterie Name[de]=Batterie Name[el]=Μπαταρία -Name[eo]=Baterío +Name[eo]=Baterio Name[es]=Batería Name[fr]=Batterie Name[gl]=Batería Name[hu]=Akkumulátor Name[it]= Name[ja]= +Name[ko]= Name[pt]=Bateria Name[pt_BR]= Name[ru]=Батарея +Name[sr]= Name[tr]=Pil Name[zh_CN]= Name[zh_TW]= -Icon=e-module-battery Comment=A gadget to visualize your battery status. Comment[ca]=Un mòdul que mostra l'estat de la bateria. Comment[cs]=Gadget pro zobrazení stavu vaší baterie v notebooku. @@ -37,4 +41,5 @@ Comment[ru]=Гаджет для отображения статуса батар Comment[tr]=Pil durumunu görselleştiren araç. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-battery X-Enlightenment-ModuleType=system diff --git a/src/modules/clock/module.desktop b/src/modules/clock/module.desktop index 8dae939699..e20f07dcd6 100644 --- a/src/modules/clock/module.desktop +++ b/src/modules/clock/module.desktop @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Clock +Name[Name]=Clock +Name[ab]= Name[ca]=Rellotge Name[cs]=Hodiny Name[de]=Uhr @@ -12,14 +15,14 @@ Name[gl]=Reloxo Name[hu]=Óra Name[it]= Name[ja]= +Name[ko]= Name[pt]=Relógio Name[pt_BR]= Name[ru]=Часы +Name[sr]= Name[tr]=Saat Name[zh_CN]= Name[zh_TW]= -Icon=e-module-clock -X-Enlightenment-ModuleType=utils Comment=Nice clock gadget to show current time. Comment[ca]=Un bonic rellotge per a mostrar l'hora actual. Comment[cs]=Gadget pro zobrazení aktuálního času. @@ -38,3 +41,5 @@ Comment[ru]=Гаджет для отображения текущего врем Comment[tr]=Şu anki saati gösteren şık bir alet. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-clock +X-Enlightenment-ModuleType=utils diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop.in index 8dae939699..e20f07dcd6 100644 --- a/src/modules/clock/module.desktop.in +++ b/src/modules/clock/module.desktop.in @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Clock +Name[Name]=Clock +Name[ab]= Name[ca]=Rellotge Name[cs]=Hodiny Name[de]=Uhr @@ -12,14 +15,14 @@ Name[gl]=Reloxo Name[hu]=Óra Name[it]= Name[ja]= +Name[ko]= Name[pt]=Relógio Name[pt_BR]= Name[ru]=Часы +Name[sr]= Name[tr]=Saat Name[zh_CN]= Name[zh_TW]= -Icon=e-module-clock -X-Enlightenment-ModuleType=utils Comment=Nice clock gadget to show current time. Comment[ca]=Un bonic rellotge per a mostrar l'hora actual. Comment[cs]=Gadget pro zobrazení aktuálního času. @@ -38,3 +41,5 @@ Comment[ru]=Гаджет для отображения текущего врем Comment[tr]=Şu anki saati gösteren şık bir alet. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-clock +X-Enlightenment-ModuleType=utils diff --git a/src/modules/comp/module.desktop b/src/modules/comp/module.desktop index 9fcf32fd3a..60d6f0bb1a 100644 --- a/src/modules/comp/module.desktop +++ b/src/modules/comp/module.desktop @@ -1,15 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Composite +Name[Name]=Composite +Name[ab]= Name[ca]=Composite +Name[cs]= +Name[de]=Composite-Grafik +Name[el]= Name[eo]=Kunmetado Name[es]=Composición +Name[fr]=Composite Name[gl]=Composición -Name[de]=Composite-Grafik +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Composição -Name[tr]=Birleşiklik Name[ru]=Композитный режим -Icon=e-module-comp +Name[sr]= +Name[tr]=Birleşiklik Comment=Enlightenment Composite Manager Comment[ca]=Administrador de Composite a l'Enlightenment. Comment[de]=Composite-Manager für Enlightenment @@ -21,4 +31,5 @@ Comment[it]=Composite manager per Enlightenment. Comment[pt]=Gestão de composição integrada Comment[ru]=Композитный менеджер для Enlightenment Comment[tr]=Enlightenment için birleşiklik yöneticisi +Icon=e-module-comp X-Enlightenment-ModuleType=look diff --git a/src/modules/comp/module.desktop.in b/src/modules/comp/module.desktop.in index 9fcf32fd3a..60d6f0bb1a 100644 --- a/src/modules/comp/module.desktop.in +++ b/src/modules/comp/module.desktop.in @@ -1,15 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Composite +Name[Name]=Composite +Name[ab]= Name[ca]=Composite +Name[cs]= +Name[de]=Composite-Grafik +Name[el]= Name[eo]=Kunmetado Name[es]=Composición +Name[fr]=Composite Name[gl]=Composición -Name[de]=Composite-Grafik +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Composição -Name[tr]=Birleşiklik Name[ru]=Композитный режим -Icon=e-module-comp +Name[sr]= +Name[tr]=Birleşiklik Comment=Enlightenment Composite Manager Comment[ca]=Administrador de Composite a l'Enlightenment. Comment[de]=Composite-Manager für Enlightenment @@ -21,4 +31,5 @@ Comment[it]=Composite manager per Enlightenment. Comment[pt]=Gestão de composição integrada Comment[ru]=Композитный менеджер для Enlightenment Comment[tr]=Enlightenment için birleşiklik yöneticisi +Icon=e-module-comp X-Enlightenment-ModuleType=look diff --git a/src/modules/conf/module.desktop b/src/modules/conf/module.desktop index 47243ded39..fc840b614d 100644 --- a/src/modules/conf/module.desktop +++ b/src/modules/conf/module.desktop @@ -1,24 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Settings Panel +Name[Name]=Settings Panel +Name[ab]= Name[ca]=Panell de control Name[cs]=Ovládací centrum Name[de]=Einstellungsleiste Name[el]=Πάνελ ρυθμίσεων -Name[eo]=Panelo de agordado +Name[eo]=Panelo de agordoj Name[es]=Panel de configuración Name[fr]=Panneau de contrôle Name[gl]=Panel de configuración Name[hu]=Enlightenment Vezérlőpult Name[it]=Pannello di configurazione Name[ja]= +Name[ko]= Name[pt]=Painel de definições Name[pt_BR]= Name[ru]=Панель настроек +Name[sr]= Name[tr]=Ayarlar Paneli Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf Comment=General Enlightenment configuration panel. Comment[ca]=Panell de configuració general de Enlightenment. Comment[cs]= @@ -37,4 +41,5 @@ Comment[ru]=Модуль панели настроек Enlightenment. Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf X-Enlightenment-ModuleType=core diff --git a/src/modules/conf/module.desktop.in b/src/modules/conf/module.desktop.in index 47243ded39..fc840b614d 100644 --- a/src/modules/conf/module.desktop.in +++ b/src/modules/conf/module.desktop.in @@ -1,24 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Settings Panel +Name[Name]=Settings Panel +Name[ab]= Name[ca]=Panell de control Name[cs]=Ovládací centrum Name[de]=Einstellungsleiste Name[el]=Πάνελ ρυθμίσεων -Name[eo]=Panelo de agordado +Name[eo]=Panelo de agordoj Name[es]=Panel de configuración Name[fr]=Panneau de contrôle Name[gl]=Panel de configuración Name[hu]=Enlightenment Vezérlőpult Name[it]=Pannello di configurazione Name[ja]= +Name[ko]= Name[pt]=Painel de definições Name[pt_BR]= Name[ru]=Панель настроек +Name[sr]= Name[tr]=Ayarlar Paneli Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf Comment=General Enlightenment configuration panel. Comment[ca]=Panell de configuració general de Enlightenment. Comment[cs]= @@ -37,4 +41,5 @@ Comment[ru]=Модуль панели настроек Enlightenment. Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf X-Enlightenment-ModuleType=core diff --git a/src/modules/conf_applications/module.desktop b/src/modules/conf_applications/module.desktop index 9993cb2cf6..4ef7d7a94b 100644 --- a/src/modules/conf_applications/module.desktop +++ b/src/modules/conf_applications/module.desktop @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Applications +Name[Name]=Applications +Name[ab]= Name[ca]=Aplicacions Name[cs]=Aplikace Name[de]= @@ -12,13 +15,14 @@ Name[gl]=Aplicativos Name[hu]=Alkalmazások Name[it]=Applicazioni Name[ja]= +Name[ko]= Name[pt]=Aplicações Name[pt_BR]= Name[ru]=Приложения +Name[sr]= Name[tr]=Uygulamalar Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_applications Comment=Allows configuration of Ibar, Restart, and Startup applications. Comment[ca]=Permet configurar les aplicacions per a iniciar i reiniciar tasques, així com la barra Ibar. Comment[cs]=Umožňuje nastavit iBar spouÅ¡těče, aplikace při restartu a aplikace při startu. @@ -37,4 +41,5 @@ Comment[ru]=Позволяет настройку приложений для Ib Comment[tr]=IBar, Açılış ve Yeniden Başlat uygulamalarının yapılandırılmasına izin verir. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_applications X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_applications/module.desktop.in b/src/modules/conf_applications/module.desktop.in index 9993cb2cf6..4ef7d7a94b 100644 --- a/src/modules/conf_applications/module.desktop.in +++ b/src/modules/conf_applications/module.desktop.in @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Applications +Name[Name]=Applications +Name[ab]= Name[ca]=Aplicacions Name[cs]=Aplikace Name[de]= @@ -12,13 +15,14 @@ Name[gl]=Aplicativos Name[hu]=Alkalmazások Name[it]=Applicazioni Name[ja]= +Name[ko]= Name[pt]=Aplicações Name[pt_BR]= Name[ru]=Приложения +Name[sr]= Name[tr]=Uygulamalar Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_applications Comment=Allows configuration of Ibar, Restart, and Startup applications. Comment[ca]=Permet configurar les aplicacions per a iniciar i reiniciar tasques, així com la barra Ibar. Comment[cs]=Umožňuje nastavit iBar spouÅ¡těče, aplikace při restartu a aplikace při startu. @@ -37,4 +41,5 @@ Comment[ru]=Позволяет настройку приложений для Ib Comment[tr]=IBar, Açılış ve Yeniden Başlat uygulamalarının yapılandırılmasına izin verir. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_applications X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_dialogs/module.desktop b/src/modules/conf_dialogs/module.desktop index 24bd1b033f..9dc94371d3 100644 --- a/src/modules/conf_dialogs/module.desktop +++ b/src/modules/conf_dialogs/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Dialogs +Name[Name]=Dialogs +Name[ab]= Name[ca]=Diàlegs Name[cs]=Dialogy Name[de]= +Name[el]= Name[eo]=Dialogoj Name[es]=Diálogos Name[fr]=Boîtes de dialogue @@ -11,13 +15,14 @@ Name[gl]=Diálogos Name[hu]=Párbeszédablakok Name[it]=Finestre di dialogo Name[ja]= +Name[ko]= Name[pt]=Diálogos Name[pt_BR]= Name[ru]=Диалоги +Name[sr]= Name[tr]=Diyaloglar Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_dialogs Comment=Configure default dialog properties. Comment[ca]=Configuració de les propietats predefinides dels diàlegs. Comment[cs]=Volby výchozích vlastností dialogů. @@ -35,4 +40,5 @@ Comment[ru]=Настройка стандартных параметров ди Comment[tr]=Öntanımlı pencere özelliklerini yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_dialogs X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in index 24bd1b033f..9dc94371d3 100644 --- a/src/modules/conf_dialogs/module.desktop.in +++ b/src/modules/conf_dialogs/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Dialogs +Name[Name]=Dialogs +Name[ab]= Name[ca]=Diàlegs Name[cs]=Dialogy Name[de]= +Name[el]= Name[eo]=Dialogoj Name[es]=Diálogos Name[fr]=Boîtes de dialogue @@ -11,13 +15,14 @@ Name[gl]=Diálogos Name[hu]=Párbeszédablakok Name[it]=Finestre di dialogo Name[ja]= +Name[ko]= Name[pt]=Diálogos Name[pt_BR]= Name[ru]=Диалоги +Name[sr]= Name[tr]=Diyaloglar Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_dialogs Comment=Configure default dialog properties. Comment[ca]=Configuració de les propietats predefinides dels diàlegs. Comment[cs]=Volby výchozích vlastností dialogů. @@ -35,4 +40,5 @@ Comment[ru]=Настройка стандартных параметров ди Comment[tr]=Öntanımlı pencere özelliklerini yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_dialogs X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_display/module.desktop b/src/modules/conf_display/module.desktop index 66efbefbad..ee4336ffff 100644 --- a/src/modules/conf_display/module.desktop +++ b/src/modules/conf_display/module.desktop @@ -1,28 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Screen +Name[Name]=Screen +Name[ab]= Name[ca]=Pantalla Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Ekrano Name[es]=Pantalla Name[fr]=Écran Name[gl]=Pantalla Name[hu]= Name[it]=Schermo Name[ja]= +Name[ko]= Name[pt]=Ecrã Name[pt_BR]= Name[ru]=Экран +Name[sr]= Name[tr]= Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-display Comment=Used to configure your screen. Comment[ca]=Configuració de la pantalla. Comment[cs]= Comment[de]= -Comment[eo]= +Comment[eo]=Agordi vian ekranon Comment[es]=Usado para configurar su pantalla. Comment[fr]=Paramétrage de l'écran. Comment[gl]=Usado para configurar a súa pantalla. @@ -35,4 +40,5 @@ Comment[ru]=Используется для настройки экрана. Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-display X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in index 66efbefbad..ee4336ffff 100644 --- a/src/modules/conf_display/module.desktop.in +++ b/src/modules/conf_display/module.desktop.in @@ -1,28 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Screen +Name[Name]=Screen +Name[ab]= Name[ca]=Pantalla Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Ekrano Name[es]=Pantalla Name[fr]=Écran Name[gl]=Pantalla Name[hu]= Name[it]=Schermo Name[ja]= +Name[ko]= Name[pt]=Ecrã Name[pt_BR]= Name[ru]=Экран +Name[sr]= Name[tr]= Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-display Comment=Used to configure your screen. Comment[ca]=Configuració de la pantalla. Comment[cs]= Comment[de]= -Comment[eo]= +Comment[eo]=Agordi vian ekranon Comment[es]=Usado para configurar su pantalla. Comment[fr]=Paramétrage de l'écran. Comment[gl]=Usado para configurar a súa pantalla. @@ -35,4 +40,5 @@ Comment[ru]=Используется для настройки экрана. Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-display X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_edgebindings/module.desktop b/src/modules/conf_edgebindings/module.desktop index ce556eed70..2031a4189d 100644 --- a/src/modules/conf_edgebindings/module.desktop +++ b/src/modules/conf_edgebindings/module.desktop @@ -1,17 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Edge Bindings +Name[Name]=Edge Bindings +Name[ab]= Name[ca]=Ús dels marges de pantalla Name[cs]=Zkratky okrajù -Name[eo]=Fulmklavoj de ekranrandoj +Name[de]= +Name[el]= +Name[eo]=Bindoj de Edje Name[es]=Asociaciones del margen de pantalla Name[fr]=Raccourcis des bords de l'écran Name[gl]=Asociacións dos marxes da pantalla +Name[hu]= Name[it]=Associazioni a bordi dello schermo e segnali +Name[ja]= +Name[ko]= Name[pt]=Associação das margens do ecrã Name[ru]=Привязки по краям +Name[sr]= Name[tr]=Kenar Bağlayıcıları -Icon=e-module-conf_edgebindings Comment=Configure your edge bindings here. Comment[ca]=Accions a realitzar quan el punter arriba als marges de la pantalla. Comment[cs]=Zde mùžete nastavit zkratky pro okraje a rohy obrazovky. @@ -23,4 +31,5 @@ Comment[it]=Configurate qui le azioni da eseguire quando il puntatore raggiunge< Comment[pt]=Configurar as associações aos limites do ecrã Comment[ru]=Здесь можно настроить привязки по краям экрана. Comment[tr]=Kenar bağlayıcılarınızı yapılandırın. +Icon=e-module-conf_edgebindings X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_edgebindings/module.desktop.in b/src/modules/conf_edgebindings/module.desktop.in index ce556eed70..2031a4189d 100644 --- a/src/modules/conf_edgebindings/module.desktop.in +++ b/src/modules/conf_edgebindings/module.desktop.in @@ -1,17 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Edge Bindings +Name[Name]=Edge Bindings +Name[ab]= Name[ca]=Ús dels marges de pantalla Name[cs]=Zkratky okrajù -Name[eo]=Fulmklavoj de ekranrandoj +Name[de]= +Name[el]= +Name[eo]=Bindoj de Edje Name[es]=Asociaciones del margen de pantalla Name[fr]=Raccourcis des bords de l'écran Name[gl]=Asociacións dos marxes da pantalla +Name[hu]= Name[it]=Associazioni a bordi dello schermo e segnali +Name[ja]= +Name[ko]= Name[pt]=Associação das margens do ecrã Name[ru]=Привязки по краям +Name[sr]= Name[tr]=Kenar Bağlayıcıları -Icon=e-module-conf_edgebindings Comment=Configure your edge bindings here. Comment[ca]=Accions a realitzar quan el punter arriba als marges de la pantalla. Comment[cs]=Zde mùžete nastavit zkratky pro okraje a rohy obrazovky. @@ -23,4 +31,5 @@ Comment[it]=Configurate qui le azioni da eseguire quando il puntatore raggiunge< Comment[pt]=Configurar as associações aos limites do ecrã Comment[ru]=Здесь можно настроить привязки по краям экрана. Comment[tr]=Kenar bağlayıcılarınızı yapılandırın. +Icon=e-module-conf_edgebindings X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_interaction/module.desktop b/src/modules/conf_interaction/module.desktop index 7ba3270d2c..ff42d8f7b2 100644 --- a/src/modules/conf_interaction/module.desktop +++ b/src/modules/conf_interaction/module.desktop @@ -1,28 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Interaction +Name[Name]=Interaction +Name[ab]= Name[ca]=Interacció Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Interago Name[es]=Interacción -Name[fr]= +Name[fr]=Interaction Name[gl]=Interacción Name[hu]= Name[it]=Interazione Name[ja]= +Name[ko]= Name[pt]=Interação Name[pt_BR]= Name[ru]=Взаимодействие +Name[sr]= Name[tr]= Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_interaction Comment=Configure Mouse and Touch input. Comment[ca]=Configura les entrades de ratolí i tàctil. Comment[cs]= Comment[de]= -Comment[eo]= +Comment[eo]=Agodi musan kaj tuŝeblan enigon. Comment[es]=Configure el ratón y la pantalla táctil. Comment[fr]=Configure l'interface tactile et la souris. Comment[gl]=Configure o rato e a pantalla táctil. @@ -35,4 +40,5 @@ Comment[ru]=Настройка мыши и сенсорного ввода. Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_interaction X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop.in index 7ba3270d2c..ff42d8f7b2 100644 --- a/src/modules/conf_interaction/module.desktop.in +++ b/src/modules/conf_interaction/module.desktop.in @@ -1,28 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Interaction +Name[Name]=Interaction +Name[ab]= Name[ca]=Interacció Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Interago Name[es]=Interacción -Name[fr]= +Name[fr]=Interaction Name[gl]=Interacción Name[hu]= Name[it]=Interazione Name[ja]= +Name[ko]= Name[pt]=Interação Name[pt_BR]= Name[ru]=Взаимодействие +Name[sr]= Name[tr]= Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_interaction Comment=Configure Mouse and Touch input. Comment[ca]=Configura les entrades de ratolí i tàctil. Comment[cs]= Comment[de]= -Comment[eo]= +Comment[eo]=Agodi musan kaj tuŝeblan enigon. Comment[es]=Configure el ratón y la pantalla táctil. Comment[fr]=Configure l'interface tactile et la souris. Comment[gl]=Configure o rato e a pantalla táctil. @@ -35,4 +40,5 @@ Comment[ru]=Настройка мыши и сенсорного ввода. Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_interaction X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_intl/module.desktop b/src/modules/conf_intl/module.desktop index 42e26b6424..82a43c4b65 100644 --- a/src/modules/conf_intl/module.desktop +++ b/src/modules/conf_intl/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Language +Name[Name]=Language +Name[ab]= Name[ca]=Idioma Name[cs]=Jazyk Name[de]= +Name[el]= Name[eo]=Lingvo Name[es]=Idioma Name[fr]=Langue @@ -11,13 +15,14 @@ Name[gl]=Idioma Name[hu]=Nyelv Name[it]=Lingua Name[ja]= +Name[ko]= Name[pt]=Idioma Name[pt_BR]= Name[ru]=Язык +Name[sr]=Језик Name[tr]=Dil Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-locale Comment=Used to select a default language. Comment[ca]=Permet seleccionar l'idioma predeterminat. Comment[cs]=Použit pro výběr výchozího jazyka. @@ -32,7 +37,9 @@ Comment[ja]= Comment[pt]=Permite-lhe escolher o idioma do sistema Comment[pt_BR]= Comment[ru]=Используется для выбора языка системы по умолчанию. +Comment[sr]=Користи се за избор подразумеваног језика. Comment[tr]=Öntanımlı dil seçmek için kullanılır. Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-locale X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in index 42e26b6424..82a43c4b65 100644 --- a/src/modules/conf_intl/module.desktop.in +++ b/src/modules/conf_intl/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Language +Name[Name]=Language +Name[ab]= Name[ca]=Idioma Name[cs]=Jazyk Name[de]= +Name[el]= Name[eo]=Lingvo Name[es]=Idioma Name[fr]=Langue @@ -11,13 +15,14 @@ Name[gl]=Idioma Name[hu]=Nyelv Name[it]=Lingua Name[ja]= +Name[ko]= Name[pt]=Idioma Name[pt_BR]= Name[ru]=Язык +Name[sr]=Језик Name[tr]=Dil Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-locale Comment=Used to select a default language. Comment[ca]=Permet seleccionar l'idioma predeterminat. Comment[cs]=Použit pro výběr výchozího jazyka. @@ -32,7 +37,9 @@ Comment[ja]= Comment[pt]=Permite-lhe escolher o idioma do sistema Comment[pt_BR]= Comment[ru]=Используется для выбора языка системы по умолчанию. +Comment[sr]=Користи се за избор подразумеваног језика. Comment[tr]=Öntanımlı dil seçmek için kullanılır. Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-locale X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_keybindings/module.desktop b/src/modules/conf_keybindings/module.desktop index 429bfe1d3c..2b5d7a8c97 100644 --- a/src/modules/conf_keybindings/module.desktop +++ b/src/modules/conf_keybindings/module.desktop @@ -1,28 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Input Control Settings +Name[Name]=Input Control Settings +Name[ab]= Name[ca]=Preferències dels dispositius d'entrada Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Agordoj de kontrolo de enigo Name[es]=Preferencias de los dispositivos de entrada Name[fr]=Raccourcis des entrées -Name[hu]= Name[gl]=Preferencias dos dispositivos de entrada +Name[hu]= Name[it]=Controllo dell'input Name[ja]= +Name[ko]= Name[pt]=Definições de inserção Name[pt_BR]= Name[ru]=Настройки управления вводом +Name[sr]= Name[tr]= Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-keyboard-shortcuts Comment=Key, Mouse and Button control settings Comment[ca]=Configuracions del teclat, ratolí i botons. Comment[cs]= Comment[de]= -Comment[eo]= +Comment[eo]=Agordoj de klavoj, musoj kaj butonoj Comment[es]=Configuraciones del ratón, teclado y botones. Comment[fr]=Paramètres de contrôle des touches, boutons et souris. Comment[hu]=Configuracións do rato, teclado e botóns. @@ -34,4 +39,5 @@ Comment[ru]=Настройки управления мышью, клавишам Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-keyboard-shortcuts X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in index 429bfe1d3c..2b5d7a8c97 100644 --- a/src/modules/conf_keybindings/module.desktop.in +++ b/src/modules/conf_keybindings/module.desktop.in @@ -1,28 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Input Control Settings +Name[Name]=Input Control Settings +Name[ab]= Name[ca]=Preferències dels dispositius d'entrada Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Agordoj de kontrolo de enigo Name[es]=Preferencias de los dispositivos de entrada Name[fr]=Raccourcis des entrées -Name[hu]= Name[gl]=Preferencias dos dispositivos de entrada +Name[hu]= Name[it]=Controllo dell'input Name[ja]= +Name[ko]= Name[pt]=Definições de inserção Name[pt_BR]= Name[ru]=Настройки управления вводом +Name[sr]= Name[tr]= Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-keyboard-shortcuts Comment=Key, Mouse and Button control settings Comment[ca]=Configuracions del teclat, ratolí i botons. Comment[cs]= Comment[de]= -Comment[eo]= +Comment[eo]=Agordoj de klavoj, musoj kaj butonoj Comment[es]=Configuraciones del ratón, teclado y botones. Comment[fr]=Paramètres de contrôle des touches, boutons et souris. Comment[hu]=Configuracións do rato, teclado e botóns. @@ -34,4 +39,5 @@ Comment[ru]=Настройки управления мышью, клавишам Comment[tr]= Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-keyboard-shortcuts X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_menus/module.desktop b/src/modules/conf_menus/module.desktop index 78bcc1c5a0..672e39a7d4 100644 --- a/src/modules/conf_menus/module.desktop +++ b/src/modules/conf_menus/module.desktop @@ -1,23 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Menu Settings +Name[Name]=Menu Settings +Name[ab]= Name[ca]=Preferències del menú Name[cs]=Volby menu Name[de]= -Name[eo]=Menuaj agordoj +Name[el]= +Name[eo]=Agordoj de menuo Name[es]=Opciones de menú Name[fr]=Paramétrage du menu Name[gl]=Preferencias do menú Name[hu]=Menü beállítások Name[it]=Impostazioni menù Name[ja]= +Name[ko]= Name[pt]=Definições do menu Name[pt_BR]= Name[ru]=Настройки меню +Name[sr]= Name[tr]=Menü Ayarları Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_menus Comment=Configures menu behavior. Comment[ca]=Configura el comportament del menú. Comment[cs]=Volby chování menu. @@ -35,4 +40,5 @@ Comment[ru]=Конфигурация настроек меню. Comment[tr]=Menü davranışını yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_menus X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in index 78bcc1c5a0..672e39a7d4 100644 --- a/src/modules/conf_menus/module.desktop.in +++ b/src/modules/conf_menus/module.desktop.in @@ -1,23 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Menu Settings +Name[Name]=Menu Settings +Name[ab]= Name[ca]=Preferències del menú Name[cs]=Volby menu Name[de]= -Name[eo]=Menuaj agordoj +Name[el]= +Name[eo]=Agordoj de menuo Name[es]=Opciones de menú Name[fr]=Paramétrage du menu Name[gl]=Preferencias do menú Name[hu]=Menü beállítások Name[it]=Impostazioni menù Name[ja]= +Name[ko]= Name[pt]=Definições do menu Name[pt_BR]= Name[ru]=Настройки меню +Name[sr]= Name[tr]=Menü Ayarları Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_menus Comment=Configures menu behavior. Comment[ca]=Configura el comportament del menú. Comment[cs]=Volby chování menu. @@ -35,4 +40,5 @@ Comment[ru]=Конфигурация настроек меню. Comment[tr]=Menü davranışını yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_menus X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_paths/module.desktop b/src/modules/conf_paths/module.desktop index 78b3382b65..e7ddb068cc 100644 --- a/src/modules/conf_paths/module.desktop +++ b/src/modules/conf_paths/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Search Directories +Name[Name]=Search Directories +Name[ab]= Name[ca]=Directoris de cerca Name[cs]=Adresáře k hledání Name[de]= +Name[el]= Name[eo]=Dosierujoj de serĉo Name[es]=Directorios de búsqueda Name[fr]=Recherche de dossiers @@ -11,13 +15,14 @@ Name[gl]=Directorios de búsqueda Name[hu]=Könyvtárak Name[it]=Percorsi di ricerca Name[ja]= +Name[ko]= Name[pt]=Diretórios de pesquisa Name[pt_BR]= Name[ru]=Каталоги поиска +Name[sr]= Name[tr]=Aranacak Dizinler Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_paths Comment=Specifies the Enlightenment search paths and default directories. Comment[ca]=Especifica les rutes de cerca de l'Enlightenment i els directoris predeterminats. Comment[cs]=Určuje výchozí složky Enlightenment a cesty k hledání témat aj. @@ -35,4 +40,5 @@ Comment[ru]=Позволяет указать стандартные катал Comment[tr]=Enlightenment aranacak yollar ve öntanımlı dizinleri belirtir. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_paths X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in index 78b3382b65..e7ddb068cc 100644 --- a/src/modules/conf_paths/module.desktop.in +++ b/src/modules/conf_paths/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Search Directories +Name[Name]=Search Directories +Name[ab]= Name[ca]=Directoris de cerca Name[cs]=Adresáře k hledání Name[de]= +Name[el]= Name[eo]=Dosierujoj de serĉo Name[es]=Directorios de búsqueda Name[fr]=Recherche de dossiers @@ -11,13 +15,14 @@ Name[gl]=Directorios de búsqueda Name[hu]=Könyvtárak Name[it]=Percorsi di ricerca Name[ja]= +Name[ko]= Name[pt]=Diretórios de pesquisa Name[pt_BR]= Name[ru]=Каталоги поиска +Name[sr]= Name[tr]=Aranacak Dizinler Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_paths Comment=Specifies the Enlightenment search paths and default directories. Comment[ca]=Especifica les rutes de cerca de l'Enlightenment i els directoris predeterminats. Comment[cs]=Určuje výchozí složky Enlightenment a cesty k hledání témat aj. @@ -35,4 +40,5 @@ Comment[ru]=Позволяет указать стандартные катал Comment[tr]=Enlightenment aranacak yollar ve öntanımlı dizinleri belirtir. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_paths X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_performance/module.desktop b/src/modules/conf_performance/module.desktop index 47bcb788a0..21c9e9e15c 100644 --- a/src/modules/conf_performance/module.desktop +++ b/src/modules/conf_performance/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Performance +Name[Name]=Performance +Name[ab]= Name[ca]=Rendiment Name[cs]=Výkon Name[de]= +Name[el]= Name[eo]=Rendimento Name[es]=Rendimiento Name[fr]=Performance @@ -11,13 +15,14 @@ Name[gl]=Rendemento Name[hu]=Teljesítmény Name[it]=Prestazioni Name[ja]= +Name[ko]= Name[pt]=Desempenho Name[pt_BR]= Name[ru]=Быстродействие +Name[sr]=Учинковитост Name[tr]=Performans Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_performance Comment=Used to configure certain performance related items as frame rates and cache settings. Comment[ca]=Per a configurar certes característiques de rendiment, com ara quadres per segon o paràmetres de memòria cau. Comment[cs]=Použit k nastavení framerate, cache aj. @@ -32,7 +37,9 @@ Comment[ja]= Comment[pt]=Permite-lhe configurar alguns itens relacionados com o desempenho do computador Comment[pt_BR]= Comment[ru]=Используется для конфигурации быстродействия, типа частоты кадров и настроек кэширования. +Comment[sr]=Користи се за подешавање одређених ставки везаних за брзину извршавања, учесталост освежавања приказа и поставке прихватне меморије. Comment[tr]=Kare oranı ve önbellek ayarları gibi performans ile ilgili öğeleri yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_performance X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in index 47bcb788a0..21c9e9e15c 100644 --- a/src/modules/conf_performance/module.desktop.in +++ b/src/modules/conf_performance/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Performance +Name[Name]=Performance +Name[ab]= Name[ca]=Rendiment Name[cs]=Výkon Name[de]= +Name[el]= Name[eo]=Rendimento Name[es]=Rendimiento Name[fr]=Performance @@ -11,13 +15,14 @@ Name[gl]=Rendemento Name[hu]=Teljesítmény Name[it]=Prestazioni Name[ja]= +Name[ko]= Name[pt]=Desempenho Name[pt_BR]= Name[ru]=Быстродействие +Name[sr]=Учинковитост Name[tr]=Performans Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_performance Comment=Used to configure certain performance related items as frame rates and cache settings. Comment[ca]=Per a configurar certes característiques de rendiment, com ara quadres per segon o paràmetres de memòria cau. Comment[cs]=Použit k nastavení framerate, cache aj. @@ -32,7 +37,9 @@ Comment[ja]= Comment[pt]=Permite-lhe configurar alguns itens relacionados com o desempenho do computador Comment[pt_BR]= Comment[ru]=Используется для конфигурации быстродействия, типа частоты кадров и настроек кэширования. +Comment[sr]=Користи се за подешавање одређених ставки везаних за брзину извршавања, учесталост освежавања приказа и поставке прихватне меморије. Comment[tr]=Kare oranı ve önbellek ayarları gibi performans ile ilgili öğeleri yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_performance X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_randr/e_int_config_randr.c b/src/modules/conf_randr/e_int_config_randr.c index f3ab656d4d..e93614eea0 100644 --- a/src/modules/conf_randr/e_int_config_randr.c +++ b/src/modules/conf_randr/e_int_config_randr.c @@ -2,11 +2,14 @@ #include "e_mod_main.h" #include "e_int_config_randr.h" #include "e_smart_randr.h" +#include "e_smart_monitor.h" /* local structures */ struct _E_Config_Dialog_Data { Evas_Object *o_randr; + + int restore, primary; }; /* local function prototypes */ @@ -14,6 +17,8 @@ static void *_create_data(E_Config_Dialog *cfd EINA_UNUSED); static void _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); +static int _basic_check(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); + static void _randr_cb_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED); /* public functions */ @@ -27,10 +32,6 @@ e_int_config_randr(E_Container *con, const char *params EINA_UNUSED) if (e_config_dialog_find("E", "screen/screen_setup")) return NULL; - /* check for valid XRandR protocol version */ - if (e_randr_screen_info.randr_version < ECORE_X_RANDR_1_2) - return NULL; - /* try to allocate dialog view */ if (!(v = E_NEW(E_Config_Dialog_View, 1))) return NULL; @@ -40,6 +41,7 @@ e_int_config_randr(E_Container *con, const char *params EINA_UNUSED) v->free_cfdata = _free_data; v->basic.create_widgets = _basic_create; v->basic.apply_cfdata = _basic_apply; + v->basic.check_changed = _basic_check; v->override_auto_apply = EINA_TRUE; /* create new dialog */ @@ -47,7 +49,6 @@ e_int_config_randr(E_Container *con, const char *params EINA_UNUSED) "E", "screen/screen_setup", "preferences-system-screen-resolution", 0, v, NULL); - e_dialog_resizable_set(cfd->dia, 1); return cfd; } @@ -62,6 +63,9 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED) if (!(cfdata = E_NEW(E_Config_Dialog_Data, 1))) return NULL; + cfdata->restore = e_randr_cfg->restore; + cfdata->primary = e_randr_cfg->primary; + return cfdata; } @@ -71,10 +75,6 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) /* if we have the randr smart widget, delete it */ if (cfdata->o_randr) { - /* delete the hook into randr widget changed signal */ - evas_object_smart_callback_del(cfdata->o_randr, "changed", - _randr_cb_changed); - /* delete the randr object */ evas_object_del(cfdata->o_randr); } @@ -87,7 +87,9 @@ static Evas_Object * _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o; - Evas_Coord cw = 0, ch = 0; + Evas_Object *ow; + Evas_Coord mw = 0, mh = 0, ch = 0, fh = 0; + Eina_List *l, *monitors = NULL; /* create the base list widget */ o = e_widget_list_add(evas, 0, 0); @@ -95,38 +97,56 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) /* try to create randr smart widget */ if ((cfdata->o_randr = e_smart_randr_add(evas))) { - Evas_Coord lw = 0, lh = 0; - - /* ask randr widget to compute best layout size based on the - * size of available crtcs */ - e_smart_randr_layout_size_get(cfdata->o_randr, &lw, &lh); - - /* calculate virtual size - * - * NB: Get which size is larger. This is done so that the - * virtual canvas size can be set such that monitors may be - * repositioned easily in a horizontal or vertical layout. - * Without using MAX (and just using current size) than a - * horizontal layout cannot be changed into a vertical layout */ - cw = MAX(lw, lh); - ch = MAX(lw, lh); + /* hook into randr widget changed callback */ + evas_object_smart_callback_add(cfdata->o_randr, "randr_changed", + _randr_cb_changed, cfd); - /* set the virtual size for the randr widget */ - e_smart_randr_current_size_set(cfdata->o_randr, cw, ch); + /* tell randr widget to calculate virtual size */ + e_smart_randr_virtual_size_calc(cfdata->o_randr); /* tell randr widget to create monitors */ e_smart_randr_monitors_create(cfdata->o_randr); - /* hook into randr widget changed signal */ - evas_object_smart_callback_add(cfdata->o_randr, "changed", - _randr_cb_changed, cfd); - - /* add randr widget to the base widget */ + /* append randr widget to list object */ e_widget_list_object_append(o, cfdata->o_randr, 1, 1, 0.5); + + /* ask randr widget to calculate min size */ + e_smart_randr_min_size_get(cfdata->o_randr, &mw, &mh); + } + + monitors = e_smart_randr_monitors_get(cfdata->o_randr); + if (eina_list_count(monitors) > 1) + { + E_Radio_Group *rg; + Evas_Object *mon, *of; + + of = e_widget_framelist_add(evas, _("Primary Output"), 0); + rg = e_widget_radio_group_new(&(cfdata->primary)); + EINA_LIST_FOREACH(monitors, l, mon) + { + int output; + const char *name; + + name = e_smart_monitor_name_get(mon); + output = (int)e_smart_monitor_output_get(mon); + + ow = e_widget_radio_add(evas, name, output, rg); + e_widget_framelist_object_append(of, ow); + } + + e_widget_list_object_append(o, of, 1, 0, 0.5); + e_widget_size_min_get(of, NULL, &fh); } - /* set a minimum size to 1/10th */ - e_widget_size_min_set(o, (cw / 10), (ch / 10)); + ow = e_widget_check_add(evas, _("Restore On Startup"), &(cfdata->restore)); + e_widget_list_object_append(o, ow, 1, 0, 0.5); + e_widget_size_min_get(ow, NULL, &ch); + + /* set min size of the list widget */ + e_widget_size_min_set(o, mw, mh + fh + ch); + + e_util_win_auto_resize_fill(cfd->dia->win); + e_win_centered_set(cfd->dia->win, 1); return o; } @@ -134,13 +154,30 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { - /* tell randr widget to apply changes */ + Eina_Bool change_primary = EINA_FALSE; + + change_primary = (e_randr_cfg->primary != cfdata->primary); + + e_randr_cfg->primary = cfdata->primary; + e_randr_cfg->restore = cfdata->restore; + e_randr_config_save(); + + if (change_primary) + ecore_x_randr_primary_output_set(ecore_x_window_root_first_get(), + (Ecore_X_Randr_Output)cfdata->primary); + e_smart_randr_changes_apply(cfdata->o_randr); - /* return success */ return 1; } +static int +_basic_check(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) +{ + return ((e_randr_cfg->restore != cfdata->restore) || + (e_randr_cfg->primary != cfdata->primary)); +} + static void _randr_cb_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) { @@ -149,9 +186,6 @@ _randr_cb_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) if (!(cfd = data)) return; - /* get randr widget changed state */ changed = e_smart_randr_changed_get(obj); - - /* update dialog with changed state */ e_config_dialog_changed_set(cfd, changed); } diff --git a/src/modules/conf_randr/e_mod_main.h b/src/modules/conf_randr/e_mod_main.h index 672edf6025..45c7afaa0c 100644 --- a/src/modules/conf_randr/e_mod_main.h +++ b/src/modules/conf_randr/e_mod_main.h @@ -1,16 +1,13 @@ #ifndef E_MOD_MAIN_H # define E_MOD_MAIN_H -# ifndef ECORE_X_RANDR_1_2 -# define ECORE_X_RANDR_1_2 ((1 << 16) | 2) -# endif - -# ifndef ECORE_X_RANDR_1_3 -# define ECORE_X_RANDR_1_3 ((1 << 16) | 3) -# endif +//# define LOGFNS 1 -# ifndef E_RANDR_12 -# define E_RANDR_12 (e_randr_screen_info.rrvd_info.randr_info_12) +# ifdef LOGFNS +# include <stdio.h> +# define LOGFN(fl, ln, fn) printf("-CONF-RANDR: %25s: %5i - %s\n", fl, ln, fn); +# else +# define LOGFN(fl, ln, fn) # endif EAPI extern E_Module_Api e_modapi; @@ -19,8 +16,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -extern const char *mod_dir; - /** * @addtogroup Optional_Conf * @{ diff --git a/src/modules/conf_randr/e_smart_monitor.c b/src/modules/conf_randr/e_smart_monitor.c index 5acd6e176d..e0373607fe 100644 --- a/src/modules/conf_randr/e_smart_monitor.c +++ b/src/modules/conf_randr/e_smart_monitor.c @@ -2,18 +2,30 @@ #include "e_mod_main.h" #include "e_smart_monitor.h" -#define RESIZE_FUZZ 60 +#define RESIZE_FUZZ 80 #define ROTATE_FUZZ 45 +//#define BG_DBG 1 + /* local structure */ typedef struct _E_Smart_Data E_Smart_Data; struct _E_Smart_Data { - /* reference to the actual canvas */ + /* canvas variable */ Evas *evas; - /* object geometry */ - Evas_Coord x, y, w, h; + /* geometry */ + int x, y, w, h; + + struct + { + Evas_Coord mode_width, mode_height; + } min, max; + +#ifdef BG_DBG + /* test object */ + Evas_Object *o_bg; +#endif /* base object */ Evas_Object *o_base; @@ -24,102 +36,107 @@ struct _E_Smart_Data /* stand object */ Evas_Object *o_stand; - /* thumbnail object */ + /* background thumbnail */ Evas_Object *o_thumb; /* refresh rate object */ Evas_Object *o_refresh; - /* the parent object if we are cloned */ - Evas_Object *parent; - - /* the 'mini' object to represent clone */ - Evas_Object *o_clone; - - /* list of mini's */ - Eina_List *clones; - - /* changed flag */ - Eina_Bool changed : 1; - - /* visible flag */ - Eina_Bool visible : 1; + struct + { + Ecore_X_Randr_Crtc id; + Evas_Coord x, y, w, h; + Ecore_X_Randr_Orientation orient; + Ecore_X_Randr_Mode mode; + double refresh_rate; + Eina_Bool enabled : 1; + } crtc; - /* enabled flag */ - Eina_Bool enabled : 1; + /* output config */ + Ecore_X_Randr_Output output; + Eina_Bool primary : 1; - /* moving flag */ - Eina_Bool moving : 1; + struct + { + /* reference to the grid we are packed into */ + Evas_Object *obj; - /* resizing flag */ - Eina_Bool resizing : 1; + Evas_Coord x, y, w, h; - /* rotating flag */ - Eina_Bool rotating : 1; + /* virtual size of the grid */ + Evas_Coord vw, vh; + } grid; - /* cloned flag */ - /* Eina_Bool cloned : 1; */ + /* container number */ + unsigned int con_num; - /* layout child geometry on start of move - * - * NB: We save this so that if we 'unclone' we can restore this position */ - Evas_Coord cx, cy, cw, ch; + /* zone number */ + unsigned int zone_num; - /* handler for bg updates */ + /* event handler for background image updates */ Ecore_Event_Handler *bg_update_hdl; - /* list of randr 'modes' */ + /* list of modes */ Eina_List *modes; - /* min & max resolutions */ + /* coordinates where the user clicked to start resizing */ + Evas_Coord rx, ry; + + /* coordinates where the user clicked to start moving */ + Evas_Coord mx, my; + struct { - int w, h; - } min, max; + /* current geometry */ + Evas_Coord x, y, w, h; - /* original and current values */ - struct - { - Evas_Coord x, y, w, h; /* NB: these are virtual coordinates */ - Ecore_X_Randr_Mode_Info *mode; - Ecore_X_Randr_Orientation orientation; - int refresh_rate; + /* current orientation */ + Ecore_X_Randr_Orientation orient; + + /* current mode */ + Ecore_X_Randr_Mode mode; + + /* current rotation */ int rotation; + + /* current refresh rate */ + int refresh_rate; + + /* current enabled */ Eina_Bool enabled : 1; - Eina_Bool cloned : 1; - } orig, current; + } current; - /* store where user clicked during resize */ struct { - Evas_Coord x, y; - } resize; + Evas_Coord x, y, w, h; + } prev; - /* reference to the Crtc Info */ - E_Randr_Crtc_Info *crtc; + /* visibility flag */ + Eina_Bool visible : 1; - /* reference to the RandR Output Info */ - E_Randr_Output_Info *output; + /* resizing flag */ + Eina_Bool resizing : 1; - /* reference to the Layout widget */ - struct - { - Evas_Object *obj; /* the actual layout widget */ - Evas_Coord x, y; /* the layout widget's position */ - Evas_Coord vw, vh; /* the layout widget's virtual size */ - } layout; + /* rotating flag */ + Eina_Bool rotating : 1; - /* reference to the Container */ - E_Container *con; + /* moving flag */ + Eina_Bool moving : 1; + + /* cloned flag */ + Eina_Bool cloned : 1; + + /* parent monitor we are cloned into */ + Evas_Object *parent; - /* reference to the Zone number */ - int zone_num; + /* mini representation when cloned */ + Evas_Object *o_clone; /* record what changed */ E_Smart_Monitor_Changes changes; }; -/* local function prototypes */ +/* smart function prototypes */ static void _e_smart_add(Evas_Object *obj); static void _e_smart_del(Evas_Object *obj); static void _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y); @@ -129,53 +146,61 @@ static void _e_smart_hide(Evas_Object *obj); static void _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip); static void _e_smart_clip_unset(Evas_Object *obj); -static void _e_smart_monitor_refresh_rates_fill(Evas_Object *obj); -static double _e_smart_monitor_refresh_rate_get(Ecore_X_Randr_Mode_Info *mode); +/* local function prototypes */ static void _e_smart_monitor_modes_fill(E_Smart_Data *sd); static int _e_smart_monitor_modes_sort(const void *data1, const void *data2); -static void _e_smart_monitor_background_set(E_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy); -static Eina_Bool _e_smart_monitor_background_update(void *data, int type, void *event); -static Ecore_X_Randr_Mode_Info *_e_smart_monitor_resolution_get(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h, Eina_Bool skip_rate_check); -static void _e_smart_monitor_resolution_set(E_Smart_Data *sd, Evas_Coord width, Evas_Coord height); +static void _e_smart_monitor_background_set(E_Smart_Data *sd, int dx, int dy); +static Eina_Bool _e_smart_monitor_background_update(void *data, int type EINA_UNUSED, void *event); static void _e_smart_monitor_position_set(E_Smart_Data *sd, Evas_Coord x, Evas_Coord y); -static int _e_smart_monitor_rotation_get(Ecore_X_Randr_Orientation orient); -static int _e_smart_monitor_rotation_amount_get(E_Smart_Data *sd, Evas_Event_Mouse_Move *ev); -static Ecore_X_Randr_Orientation _e_smart_monitor_orientation_get(int rotation); +static void _e_smart_monitor_resolution_set(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h); static void _e_smart_monitor_pointer_push(Evas_Object *obj, const char *ptr); static void _e_smart_monitor_pointer_pop(Evas_Object *obj, const char *ptr); -static void _e_smart_monitor_map_apply(Evas_Object *obj, int rotation); -static void _e_smart_monitor_map_remove(E_Smart_Data *sd, Ecore_X_Randr_Orientation orient); -static void _e_smart_monitor_move_event(E_Smart_Data *sd, Evas_Object *mon, void *event); -static void _e_smart_monitor_resize_event(E_Smart_Data *sd, Evas_Object *mon, void *event); -static void _e_smart_monitor_rotate_event(E_Smart_Data *sd, Evas_Object *mon EINA_UNUSED, void *event); +static inline void _e_smart_monitor_coord_virtual_to_canvas(E_Smart_Data *sd, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy); +static inline void _e_smart_monitor_coord_canvas_to_virtual(E_Smart_Data *sd, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy); +static Ecore_X_Randr_Mode_Info *_e_smart_monitor_mode_find(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h, Eina_Bool skip_refresh); +static inline double _e_smart_monitor_mode_refresh_rate_get(Ecore_X_Randr_Mode_Info *mode); +static void _e_smart_monitor_mode_refresh_rates_fill(Evas_Object *obj); + +static void _e_smart_monitor_thumb_cb_mouse_in(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED); +static void _e_smart_monitor_thumb_cb_mouse_out(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED); +static void _e_smart_monitor_thumb_cb_mouse_up(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event); +static void _e_smart_monitor_thumb_cb_mouse_down(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event); -/* local callback prototypes */ -static void _e_smart_monitor_cb_refresh_rate_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); static void _e_smart_monitor_frame_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event); static void _e_smart_monitor_frame_cb_resize_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); static void _e_smart_monitor_frame_cb_resize_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); -static void _e_smart_monitor_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); -static void _e_smart_monitor_frame_cb_resize_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); static void _e_smart_monitor_frame_cb_rotate_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); static void _e_smart_monitor_frame_cb_rotate_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); -static void _e_smart_monitor_frame_cb_rotate_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); -static void _e_smart_monitor_frame_cb_rotate_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); static void _e_smart_monitor_frame_cb_indicator_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); static void _e_smart_monitor_frame_cb_indicator_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _e_smart_monitor_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _e_smart_monitor_frame_cb_resize_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _e_smart_monitor_frame_cb_rotate_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); +static void _e_smart_monitor_frame_cb_rotate_stop(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); static void _e_smart_monitor_frame_cb_indicator_toggle(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED); -static void _e_smart_monitor_thumb_cb_mouse_in(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED); -static void _e_smart_monitor_thumb_cb_mouse_out(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED); -static void _e_smart_monitor_thumb_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event); -static void _e_smart_monitor_thumb_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event); +static void _e_smart_monitor_refresh_rate_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); + +static void _e_smart_monitor_resize_event(E_Smart_Data *sd, Evas_Object *mon, void *event); +static void _e_smart_monitor_rotate_event(E_Smart_Data *sd, Evas_Object *mon EINA_UNUSED, void *event); +static void _e_smart_monitor_move_event(E_Smart_Data *sd, Evas_Object *mon, void *event); + +static int _e_smart_monitor_rotation_amount_get(E_Smart_Data *sd, Evas_Event_Mouse_Move *ev); +static inline int _e_smart_monitor_rotation_get(Ecore_X_Randr_Orientation orient); +static inline Ecore_X_Randr_Orientation _e_smart_monitor_orientation_get(int rotation); + +static void _e_smart_monitor_frame_map_apply(Evas_Object *o_frame, int rotation); +static void _e_smart_monitor_thumb_map_apply(Evas_Object *o_thumb, int rotation); -static void _e_smart_monitor_layout_cb_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); +static Ecore_X_Randr_Crtc _e_smart_monitor_crtc_find(Ecore_X_Randr_Output output); /* external functions exposed by this widget */ Evas_Object * e_smart_monitor_add(Evas *evas) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); + static Evas_Smart *smart = NULL; static const Evas_Smart_Class sc = { @@ -196,381 +221,271 @@ e_smart_monitor_add(Evas *evas) } void -e_smart_monitor_output_set(Evas_Object *obj, E_Randr_Output_Info *output) +e_smart_monitor_crtc_set(Evas_Object *obj, Ecore_X_Randr_Crtc crtc, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch) { E_Smart_Data *sd; + Ecore_X_Randr_Orientation orients = ECORE_X_RANDR_ORIENTATION_ROT_0; + Ecore_X_Window root = 0; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* set this monitor's output reference */ - sd->output = output; -} + /* set the crtc config */ + sd->crtc.id = crtc; -E_Randr_Output_Info * -e_smart_monitor_output_get(Evas_Object *obj) -{ - E_Smart_Data *sd; + /* record the crtc geometry */ + sd->crtc.x = cx; + sd->crtc.y = cy; + sd->crtc.w = cw; + sd->crtc.h = ch; - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return NULL; + sd->current.x = cx; + sd->current.y = cy; + sd->current.w = cw; + sd->current.h = ch; - /* return the monitor's referenced output */ - return sd->output; -} + /* get the root window */ + root = ecore_x_window_root_first_get(); -void -e_smart_monitor_crtc_set(Evas_Object *obj, E_Randr_Crtc_Info *crtc) -{ - E_Smart_Data *sd; + Ecore_X_Randr_Crtc_Info *crtc_info; - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; + if ((crtc_info = ecore_x_randr_crtc_info_get(root, crtc))) + { + /* get current orientation */ + sd->crtc.orient = crtc_info->rotation; - /* set this monitor's crtc reference */ - sd->crtc = crtc; -} + /* get possible orientations for this crtc */ + orients = crtc_info->rotations; -void -e_smart_monitor_layout_set(Evas_Object *obj, Evas_Object *layout) -{ - E_Smart_Data *sd; + /* check if orientation is possible and disable if not */ + if (orients <= ECORE_X_RANDR_ORIENTATION_ROT_0) + edje_object_signal_emit(sd->o_frame, "e,state,rotate,disabled", "e"); - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; + /* get current mode */ + sd->crtc.mode = crtc_info->mode; + + /* free any memory allocated from ecore_x_randr */ + ecore_x_randr_crtc_info_free(crtc_info); + } + + /* check crtc current mode to determine if enabled */ + if (sd->crtc.mode != 0) + { + Ecore_X_Randr_Mode_Info *mode; + + /* try to get current refresh rate for this mode */ + if ((mode = ecore_x_randr_mode_info_get(root, sd->crtc.mode))) + { + /* record current refresh rate */ + sd->crtc.refresh_rate = + _e_smart_monitor_mode_refresh_rate_get(mode); + + /* free any memory allocated from ecore_x_randr */ + free(mode); + } + } + + /* default refresh rate to 60 if not set */ + if (!sd->crtc.refresh_rate) sd->crtc.refresh_rate = 60.0; - /* set this monitor's layout reference */ - sd->layout.obj = layout; + /* fill in current values */ + sd->current.mode = sd->crtc.mode; + sd->current.orient = sd->crtc.orient; - /* get out if this is not a valid layout */ - if (!layout) return; + sd->crtc.enabled = sd->current.enabled = + ((sd->crtc.mode != 0) ? EINA_TRUE : EINA_FALSE); + if (!sd->current.enabled) + edje_object_signal_emit(sd->o_frame, "e,state,disabled", "e"); - /* get the layout's virtual size */ - e_layout_virtual_size_get(layout, &sd->layout.vw, &sd->layout.vh); + /* get the degree of rotation */ + sd->current.rotation = _e_smart_monitor_rotation_get(sd->current.orient); - /* setup callback to be notified when this layout moves */ - evas_object_event_callback_add(layout, EVAS_CALLBACK_MOVE, - _e_smart_monitor_layout_cb_move, sd); + /* record starting refresh rate */ + sd->current.refresh_rate = (int)sd->crtc.refresh_rate; } -Evas_Object * -e_smart_monitor_layout_get(Evas_Object *obj) +Ecore_X_Randr_Crtc +e_smart_monitor_crtc_get(Evas_Object *obj) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return NULL; + if (!(sd = evas_object_smart_data_get(obj))) return 0; - /* return the monitor's referenced layout widget */ - return sd->layout.obj; + return sd->crtc.id; } void -e_smart_monitor_setup(Evas_Object *obj) +e_smart_monitor_output_set(Evas_Object *obj, Ecore_X_Randr_Output output) { - Evas_Coord mw = 0, mh = 0; - E_Zone *zone; - E_Desk *desk; E_Smart_Data *sd; + Ecore_X_Randr_Mode_Info *mode; + Ecore_X_Window root = 0; + Ecore_X_Randr_Output primary = 0; + char *name = NULL; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* fill the list of 'modes' for this monitor - * - * NB: This clears old modes and also sets the min & max resolutions */ - _e_smart_monitor_modes_fill(sd); - - /* default to disabled */ - sd->orig.enabled = EINA_FALSE; - - /* if we have a crtc, get the x/y location of it and current refresh rate - * - * NB: Used to determine the proper container */ - if (sd->crtc) - { - /* set original geometry */ - sd->orig.x = sd->crtc->geometry.x; - sd->orig.y = sd->crtc->geometry.y; - sd->orig.w = sd->crtc->geometry.w; - sd->orig.h = sd->crtc->geometry.h; - - /* if we do not have a current mode, then this monitor is - * considered disabled. conversly if we do have when then we are - * enabled */ - if (sd->crtc->current_mode) sd->orig.enabled = EINA_TRUE; - - /* pick the largest possible resolution for a disabled monitor */ - if (!sd->crtc->current_mode) - sd->crtc->current_mode = eina_list_last_data_get(sd->modes); - - /* set original mode */ - sd->orig.mode = sd->crtc->current_mode; - if ((sd->orig.w == 0) || (sd->orig.h == 0)) - { - sd->orig.w = sd->orig.mode->width; - sd->orig.h = sd->orig.mode->height; - } - - /* set original refresh rate */ - sd->orig.refresh_rate = - _e_smart_monitor_refresh_rate_get(sd->orig.mode); - - /* set the original orientation */ - sd->orig.orientation = sd->crtc->current_orientation; - } - - /* set the original rotation */ - sd->orig.rotation = _e_smart_monitor_rotation_get(sd->orig.orientation); - - /* get the current zone at this crtc coordinate */ - sd->con = e_container_current_get(e_manager_current_get()); - if (!(zone = e_container_zone_at_point_get(sd->con, sd->orig.x, sd->orig.y))) - zone = e_util_zone_current_get(e_manager_current_get()); - - /* set references to the container & zone number - * - * NB: Used later if background gets updated */ - sd->zone_num = zone->num; + /* set the output config */ + sd->output = output; - /* with the min & max resolutions, we can now set the thumbnail size. - * get largest resolution and convert to largest canvas size */ - if (sd->layout.obj) - e_layout_coord_virtual_to_canvas(sd->layout.obj, - sd->max.w, sd->max.h, &mw, &mh); + /* since we now have the output, let's be preemptive and fill in modes */ + _e_smart_monitor_modes_fill(sd); + if (!sd->modes) return; - /* set thumbnail size based on largest canvas size */ - mh = (mw * mh) / mw; - if (sd->o_thumb) e_livethumb_vsize_set(sd->o_thumb, mw, mh); + /* get the largest mode */ + mode = eina_list_last_data_get(sd->modes); + sd->max.mode_width = mode->width; + sd->max.mode_height = mode->height; - /* try to get the desktop at these coordinates. fallback to current */ - if (!(desk = e_desk_at_xy_get(zone, sd->orig.x, sd->orig.y))) - desk = e_desk_current_get(zone); + /* get the root window */ + root = ecore_x_window_root_first_get(); - /* set the background image */ - _e_smart_monitor_background_set(sd, desk->x, desk->y); + /* get the primary output */ + primary = ecore_x_randr_primary_output_get(root); - /* if we have an output, set the monitor name */ - if (sd->output) + /* get output name */ + if (!(name = ecore_x_randr_output_name_get(root, sd->output, NULL))) { - E_Randr_Monitor_Info *monitor = NULL; - const char *name = NULL; + unsigned char *edid = NULL; + unsigned long edid_length = 0; - name = sd->output->name; - if (!name) + /* get the edid for this output */ + if ((edid = + ecore_x_randr_output_edid_get(root, sd->output, &edid_length))) { - if ((monitor = sd->output->monitor)) - name = ecore_x_randr_edid_display_name_get(monitor->edid, - monitor->edid_length); - } + /* get output name */ + name = ecore_x_randr_edid_display_name_get(edid, edid_length); - edje_object_part_text_set(sd->o_frame, "e.text.name", name); + /* free any memory allocated from ecore_x_randr */ + free(edid); + } } - /* set the position text */ - _e_smart_monitor_position_set(sd, sd->orig.x, sd->orig.y); + /* set if it's primary */ + sd->primary = (output == primary); + if (sd->primary) + edje_object_signal_emit(sd->o_frame, "e,state,primary,on", "e"); + else + edje_object_signal_emit(sd->o_frame, "e,state,primary,off", "e"); - /* set the resolution text */ - _e_smart_monitor_resolution_set(sd, sd->orig.w, sd->orig.h); + /* set monitor name */ + edje_object_part_text_set(sd->o_frame, "e.text.name", name); - /* send enabled/disabled signals */ - if (sd->orig.enabled) - edje_object_signal_emit(sd->o_frame, "e,state,enabled", "e"); - else - edje_object_signal_emit(sd->o_frame, "e,state,disabled", "e"); + /* free any memory allocated from ecore_x_randr */ + free(name); - /* check if rotation is supported */ - if (sd->crtc) - { - /* if no rotation is supported, disable rotate in frame */ - if (sd->crtc->orientations <= ECORE_X_RANDR_ORIENTATION_ROT_0) - edje_object_signal_emit(sd->o_frame, "e,state,rotate_disabled", "e"); - } + /* get the smallest mode */ + mode = eina_list_nth(sd->modes, 0); + sd->min.mode_width = mode->width; + sd->min.mode_height = mode->height; - /* set the 'current' values to be equal to the original ones */ - sd->current.x = sd->orig.x; - sd->current.y = sd->orig.y; - sd->current.w = sd->orig.w; - sd->current.h = sd->orig.h; - sd->current.orientation = sd->orig.orientation; - sd->current.rotation = sd->orig.rotation; - sd->current.mode = sd->orig.mode; - sd->current.refresh_rate = sd->orig.refresh_rate; - sd->current.enabled = sd->orig.enabled; - - /* fill in list of refresh rates + /* fill in the refresh rate list * - * NB: This has to be done after the 'current' refresh rate is calculated - * above or else the radio widgets do not get properly selected */ - _e_smart_monitor_refresh_rates_fill(obj); + * NB: This needs to be done After crtc_set has been called */ + _e_smart_monitor_mode_refresh_rates_fill(obj); } -E_Smart_Monitor_Changes -e_smart_monitor_changes_get(Evas_Object *obj) +void +e_smart_monitor_grid_set(Evas_Object *obj, Evas_Object *grid, Evas_Coord gx, Evas_Coord gy, Evas_Coord gw, Evas_Coord gh) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) - return E_SMART_MONITOR_CHANGED_NONE; + if (!(sd = evas_object_smart_data_get(obj))) return; - /* return the changes for this monitor */ - return sd->changes; + sd->grid.obj = grid; + sd->grid.x = gx; + sd->grid.y = gy; + sd->grid.w = gw; + sd->grid.h = gh; + + /* set monitor position text */ + _e_smart_monitor_position_set(sd, sd->current.x, sd->current.y); + + evas_object_grid_pack(sd->grid.obj, obj, sd->current.x, + sd->current.y, sd->current.w, sd->current.h); } void -e_smart_monitor_changes_reset(Evas_Object *obj) +e_smart_monitor_grid_virtual_size_set(Evas_Object *obj, Evas_Coord vw, Evas_Coord vh) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* reset the changes variable */ - sd->changes = E_SMART_MONITOR_CHANGED_NONE; - - /* update the original values to match current state */ - sd->orig.x = sd->current.x; - sd->orig.y = sd->current.y; - sd->orig.w = sd->current.w; - sd->orig.h = sd->current.h; - sd->orig.mode = sd->current.mode; - sd->orig.orientation = sd->current.orientation; - sd->orig.refresh_rate = sd->current.refresh_rate; - sd->orig.rotation = sd->current.rotation; - sd->orig.enabled = sd->current.enabled; - sd->orig.cloned = sd->current.cloned; + sd->grid.vw = vw; + sd->grid.vh = vh; } void -e_smart_monitor_changes_apply(Evas_Object *obj) +e_smart_monitor_background_set(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy) { E_Smart_Data *sd; - Eina_Bool reset = EINA_FALSE; - Ecore_X_Window root; + E_Manager *man; + E_Container *con; + E_Zone *zone; + E_Desk *desk; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - root = sd->con->manager->root; - - if (sd->changes & E_SMART_MONITOR_CHANGED_ENABLED) - { - if (sd->current.enabled) - { - if (sd->crtc) - { - Ecore_X_Randr_Output *outputs; - Evas_Coord mx, my; - int noutputs = -1; - - mx = sd->current.x; - my = sd->current.y; - - noutputs = eina_list_count(sd->crtc->outputs); - if (noutputs < 1) - { - outputs = calloc(1, sizeof(Ecore_X_Randr_Output)); - outputs[0] = sd->output->xid; - noutputs = 1; - } - else - { - int i = 0; - - outputs = - calloc(noutputs, sizeof(Ecore_X_Randr_Output)); - for (i = 0; i < noutputs; i++) - { - E_Randr_Output_Info *ero; + /* get the current manager */ + man = e_manager_current_get(); - ero = eina_list_nth(sd->crtc->outputs, i); - outputs[i] = ero->xid; - } - } + /* get the current container */ + con = e_container_current_get(man); + sd->con_num = con->num; - ecore_x_randr_crtc_settings_set(root, sd->crtc->xid, - outputs, - noutputs, mx, my, - sd->current.mode->xid, - sd->current.orientation); - if (outputs) free(outputs); - } - } - else - ecore_x_randr_crtc_settings_set(root, sd->crtc->xid, - NULL, 0, 0, 0, 0, - ECORE_X_RANDR_ORIENTATION_ROT_0); + /* get the zone number */ + if (!(zone = e_container_zone_at_point_get(con, dx, dy))) + zone = e_util_zone_current_get(man); + sd->zone_num = zone->num; - reset = EINA_TRUE; - } + /* get the desk */ + if (!(desk = e_desk_at_xy_get(zone, sd->crtc.x, sd->crtc.y))) + desk = e_desk_current_get(zone); - if ((sd->changes & E_SMART_MONITOR_CHANGED_POSITION) || - (sd->changes & E_SMART_MONITOR_CHANGED_CLONED)) - { - Evas_Coord mx, my; - Evas_Coord cx, cy; - - mx = sd->current.x; - my = sd->current.y; - - if (sd->current.cloned) - { - E_Smart_Data *psd; - - /* grab the parent location and apply that to the clone */ - if ((psd = evas_object_smart_data_get(sd->parent))) - { - mx = psd->current.x; - my = psd->current.y; - } - } - - ecore_x_randr_crtc_pos_get(root, sd->crtc->xid, &cx, &cy); - if ((cx != mx) || (cy != my)) - { - ecore_x_randr_crtc_pos_set(root, sd->crtc->xid, mx, my); - reset = EINA_TRUE; - } - } + /* set the background image */ + _e_smart_monitor_background_set(sd, desk->x, desk->y); +} - if (sd->changes & E_SMART_MONITOR_CHANGED_ROTATION) - { - if (sd->crtc) - { - Ecore_X_Randr_Orientation orient; +void +e_smart_monitor_current_geometry_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) +{ + E_Smart_Data *sd; - orient = sd->current.orientation; - if (orient != sd->crtc->current_orientation) - { - ecore_x_randr_crtc_orientation_set(root, - sd->crtc->xid, orient); - reset = EINA_TRUE; - } - } - } + LOGFN(__FILE__, __LINE__, __FUNCTION__); - if ((sd->changes & E_SMART_MONITOR_CHANGED_REFRESH) || - (sd->changes & E_SMART_MONITOR_CHANGED_RESOLUTION)) - { - if (sd->crtc) - { - Ecore_X_Randr_Output *outputs = NULL; - int noutputs = -1; + /* try to get the objects smart data */ + if (!(sd = evas_object_smart_data_get(obj))) return; - if (sd->output) outputs = &sd->output->xid; + sd->current.x = x; + sd->current.y = y; + sd->current.w = w; + sd->current.h = h; - if ((sd->crtc) && (sd->crtc->outputs)) - noutputs = eina_list_count(sd->crtc->outputs); + /* set monitor position text */ + _e_smart_monitor_position_set(sd, x, y); - ecore_x_randr_crtc_mode_set(root, sd->crtc->xid, - outputs, noutputs, - sd->current.mode->xid); - reset = EINA_TRUE; - } - } + /* set monitor resolution text */ + _e_smart_monitor_resolution_set(sd, w, h); - if (reset) ecore_x_randr_screen_reset(root); + evas_object_grid_pack(sd->grid.obj, obj, x, y, w, h); } void @@ -578,6 +493,8 @@ e_smart_monitor_current_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; @@ -587,295 +504,486 @@ e_smart_monitor_current_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord if (h) *h = sd->current.h; } -Ecore_X_Randr_Orientation -e_smart_monitor_current_orientation_get(Evas_Object *obj) -{ - E_Smart_Data *sd; - - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) - return ECORE_X_RANDR_ORIENTATION_ROT_0; - - /* return the current orientation */ - return sd->current.orientation; -} - -Ecore_X_Randr_Mode_Info * -e_smart_monitor_current_mode_get(Evas_Object *obj) +void +e_smart_monitor_previous_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { E_Smart_Data *sd; - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) - return NULL; - - /* return the current mode */ - return sd->current.mode; -} - -Eina_Bool -e_smart_monitor_current_enabled_get(Evas_Object *obj) -{ - E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) - return EINA_FALSE; + if (!(sd = evas_object_smart_data_get(obj))) return; - /* return the current enabled mode */ - return sd->current.enabled; + if (x) *x = sd->prev.x; + if (y) *y = sd->prev.y; + if (w) *w = sd->prev.w; + if (h) *h = sd->prev.h; } void -e_smart_monitor_clone_add(Evas_Object *obj, Evas_Object *mon) +e_smart_monitor_clone_set(Evas_Object *obj, Evas_Object *parent) { - E_Smart_Data *osd, *msd; - Evas_Object *o; - Evas_Coord mw = 0, mh = 0; + E_Smart_Data *sd, *psd = NULL; - /* try to get the objects smart data */ - if (!(osd = evas_object_smart_data_get(obj))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ - if (!(msd = evas_object_smart_data_get(mon))) return; + if (!(sd = evas_object_smart_data_get(obj))) return; - /* set cloned flag */ - msd->current.cloned = EINA_TRUE; + /* try to get the objects smart data */ + if (parent) + if (!(psd = evas_object_smart_data_get(parent))) return; - /* set appropriate changes */ - if (msd->orig.cloned != msd->current.cloned) - msd->changes |= E_SMART_MONITOR_CHANGED_CLONED; - else - msd->changes &= ~(E_SMART_MONITOR_CHANGED_CLONED); + sd->cloned = ((parent != NULL) ? EINA_TRUE : EINA_FALSE); + sd->parent = parent; - /* set cloned parent */ - msd->parent = obj; + if (sd->cloned) + { + Evas_Coord fw = 0, fh = 0; + Evas_Object *box; - /* grab size of monitor's frame */ - evas_object_geometry_get(msd->o_frame, NULL, NULL, &mw, &mh); + evas_object_hide(obj); - /* hide this monitor */ - if (msd->visible) evas_object_hide(mon); + /* check if parent is larger */ + if ((psd->current.w > sd->current.w) || + (psd->current.h > sd->current.h)) + { + /* NB: X RandR does not allow clones of different size or mode. + * They both must match. Because of that, if the parent is + * larger, then we need to resize the parent down and set the mode */ + + /* set the parent mode to this mode */ + if ((psd->current.mode != sd->current.mode) || + (psd->current.refresh_rate != sd->current.refresh_rate) || + (psd->current.w != sd->current.w) || + (psd->current.h != sd->current.h)) + { + psd->current.w = sd->current.w; + psd->current.h = sd->current.h; + psd->current.refresh_rate = sd->current.refresh_rate; + psd->current.mode = sd->current.mode; + psd->changes |= E_SMART_MONITOR_CHANGED_MODE; + } - /* use 1/4 of the size - * - * FIXME: NB: This should be fixed to use the same aspect ratio as the - * swallowed monitor */ - mw *= 0.25; - mh *= 0.25; + if (psd->current.orient != sd->current.orient) + { + psd->current.orient = sd->current.orient; + psd->changes |= E_SMART_MONITOR_CHANGED_ORIENTATION; + } - /* create mini representation of this monitor */ - msd->o_clone = edje_object_add(osd->evas); - e_theme_edje_object_set(msd->o_clone, "base/theme/widgets", - "e/conf/randr/main/mini"); + _e_smart_monitor_resolution_set(psd, psd->current.w, psd->current.h); - evas_object_data_set(msd->o_clone, "smart_data", msd); + evas_object_grid_pack(psd->grid.obj, parent, + psd->current.x, psd->current.y, + psd->current.w, psd->current.h); + } + else if ((sd->current.w > psd->current.w) || + (sd->current.h > psd->current.h)) + { + if ((sd->current.mode != psd->current.mode) || + (sd->current.refresh_rate != psd->current.refresh_rate) || + (sd->current.w != psd->current.w) || + (sd->current.h != psd->current.h)) + { + sd->current.w = psd->current.w; + sd->current.h = psd->current.h; + sd->current.refresh_rate = psd->current.refresh_rate; + sd->current.mode = psd->current.mode; + sd->changes |= E_SMART_MONITOR_CHANGED_MODE; + } - edje_object_part_unswallow(msd->o_frame, msd->o_thumb); - evas_object_hide(msd->o_thumb); + if (sd->current.orient != psd->current.orient) + { + sd->current.orient = psd->current.orient; + sd->changes |= E_SMART_MONITOR_CHANGED_ORIENTATION; + } - /* swallow the background */ - edje_object_part_swallow(msd->o_clone, "e.swallow.preview", msd->o_thumb); - evas_object_show(msd->o_thumb); + _e_smart_monitor_resolution_set(sd, sd->current.w, sd->current.h); - if ((msd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_0) || - (msd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_180)) - { - /* set minimum size */ - evas_object_size_hint_min_set(msd->o_clone, mw, mh); - } - else - { - /* set minimum size */ - evas_object_size_hint_min_set(msd->o_clone, mh, mw); - } + evas_object_grid_pack(sd->grid.obj, obj, + sd->current.x, sd->current.y, + sd->current.w, sd->current.h); + } + else + { + /* sizes are equal */ + sd->current.mode = psd->current.mode; + sd->current.refresh_rate = psd->current.refresh_rate; + sd->current.orient = psd->current.orient; + sd->changes |= E_SMART_MONITOR_CHANGED_MODE; + } - /* resize the mini monitor */ - evas_object_resize(msd->o_clone, mw, mh); + _e_smart_monitor_coord_virtual_to_canvas(sd, sd->current.w, sd->current.h, &fw, &fh); + if (fw < 1) fw = (sd->current.w / 10); + if (fh < 1) fh = (sd->current.h / 10); - /* show the mini monitor */ - evas_object_show(msd->o_clone); + fw *= 0.25; + fh *= 0.25; + if (fw < 32) fw = 32; + if (fh < 25) fh = 25; - /* add to list of cloned minis */ - osd->clones = eina_list_append(osd->clones, msd->o_clone); + /* create clone on the parent's canvas */ + sd->o_clone = edje_object_add(psd->evas); + e_theme_edje_object_set(sd->o_clone, "base/theme/widgets", + "e/conf/randr/main/mini"); + evas_object_smart_member_add(sd->o_clone, obj); - /* add this clone to the monitor */ - edje_object_part_box_append(osd->o_frame, "e.box.clone", msd->o_clone); + /* remove the thumbnail from monitor frame */ + edje_object_part_unswallow(sd->o_frame, sd->o_thumb); - /* adjust clone box size */ - if ((o = (Evas_Object *) - edje_object_part_object_get(osd->o_frame, "e.box.clone"))) - { - evas_object_size_hint_min_get(o, &mw, &mh); - if (mw < 1) mw = 1; - if (mh < 1) mh = 1; - evas_object_resize(o, mw, mh); - } + /* put the thumbnail into the clone */ + edje_object_part_swallow(sd->o_clone, "e.swallow.preview", sd->o_thumb); - /* apply existing rotation to mini */ - _e_smart_monitor_map_apply(msd->o_clone, msd->current.rotation); + /* based on orientation, size the clone accordingly */ + if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) + { + evas_object_size_hint_min_set(sd->o_clone, fw, fh); + evas_object_resize(sd->o_clone, fw, fh); + } + else + { + evas_object_size_hint_min_set(sd->o_clone, fh, fw); + evas_object_resize(sd->o_clone, fh, fw); + } - /* send monitor changed signal */ - evas_object_smart_callback_call(mon, "monitor_changed", NULL); + evas_object_move(sd->o_clone, 0, 0); + evas_object_show(sd->o_clone); + + /* pack the clone into the parent box */ + edje_object_part_box_append(psd->o_frame, "e.box.clone", sd->o_clone); + + /* calculate min size for the box */ + box = (Evas_Object *)edje_object_part_object_get(psd->o_frame, "e.box.clone"); + evas_object_size_hint_min_get(box, &fw, &fh); + if (fw < 1) fw = 1; + if (fh < 1) fh = 1; + evas_object_resize(box, fw, fh); + + if ((psd->current.x != 0) || (psd->current.y != 0)) + { + psd->current.x = 0; + psd->current.y = 0; + + evas_object_grid_pack(psd->grid.obj, parent, + psd->current.x, psd->current.y, + psd->current.w, psd->current.h); + } + } + else + { + if (sd->o_clone) + { + evas_object_smart_member_del(sd->o_clone); + + edje_object_part_unswallow(sd->o_clone, sd->o_thumb); + edje_object_part_swallow(sd->o_frame, "e.swallow.preview", sd->o_thumb); + evas_object_del(sd->o_clone); + } + + sd->parent = NULL; + sd->o_clone = NULL; + + /* set monitor position text */ + _e_smart_monitor_resolution_set(sd, sd->current.w, sd->current.h); + + /* repack monitor into original position (before cloning) */ + evas_object_grid_pack(sd->grid.obj, obj, + sd->current.x, sd->current.y, + sd->current.w, sd->current.h); + + evas_object_show(obj); + } + + /* update changes */ + if ((sd->crtc.x != sd->current.x) || (sd->crtc.y != sd->current.y)) + sd->changes |= E_SMART_MONITOR_CHANGED_POSITION; + else + sd->changes &= ~(E_SMART_MONITOR_CHANGED_POSITION); + + if ((sd->crtc.mode != sd->current.mode)) + sd->changes |= E_SMART_MONITOR_CHANGED_MODE; + else + sd->changes &= ~(E_SMART_MONITOR_CHANGED_MODE); + + evas_object_smart_callback_call(obj, "monitor_changed", NULL); + + if (!psd) return; + + if ((psd->crtc.x != psd->current.x) || (psd->crtc.y != psd->current.y)) + psd->changes |= E_SMART_MONITOR_CHANGED_POSITION; + else + psd->changes &= ~(E_SMART_MONITOR_CHANGED_POSITION); + + if (psd->crtc.mode != sd->current.mode) + psd->changes |= E_SMART_MONITOR_CHANGED_MODE; + else + psd->changes &= ~(E_SMART_MONITOR_CHANGED_MODE); + + evas_object_smart_callback_call(parent, "monitor_changed", NULL); } -void -e_smart_monitor_clone_del(Evas_Object *obj, Evas_Object *mon) +Evas_Object * +e_smart_monitor_clone_parent_get(Evas_Object *obj) +{ + E_Smart_Data *sd; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* try to get the objects smart data */ + if (!(sd = evas_object_smart_data_get(obj))) return NULL; + + return sd->parent; +} + +E_Smart_Monitor_Changes +e_smart_monitor_changes_get(Evas_Object *obj) { - E_Smart_Data *osd, *msd; - Evas_Object *o; - Evas_Coord x = 0, y = 0, w = 0, h = 0; + E_Smart_Data *sd; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ - if (!(osd = evas_object_smart_data_get(obj))) return; + if (!(sd = evas_object_smart_data_get(obj))) + return E_SMART_MONITOR_CHANGED_NONE; + + return sd->changes; +} + +Eina_Bool +e_smart_monitor_changes_apply(Evas_Object *obj) +{ + E_Smart_Data *sd; + Ecore_X_Window root = 0; + Ecore_X_Randr_Output *outputs, primary = 0; + int noutputs = 0; + Ecore_X_Randr_Mode_Info *mode_info; + Ecore_X_Randr_Mode mode; + Evas_Coord cx, cy, cw, ch; + Ecore_X_Randr_Orientation orient; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ - if (!(msd = evas_object_smart_data_get(mon))) return; + if (!(sd = evas_object_smart_data_get(obj))) return EINA_FALSE; - /* remove this monitor from the clone box */ - edje_object_part_box_remove(osd->o_frame, "e.box.clone", msd->o_clone); + primary = (Ecore_X_Randr_Output)e_randr_cfg->primary; + sd->primary = (sd->output == primary); - edje_object_part_unswallow(msd->o_clone, msd->o_thumb); - evas_object_hide(msd->o_thumb); + if (sd->primary) + edje_object_signal_emit(sd->o_frame, "e,state,primary,on", "e"); + else + edje_object_signal_emit(sd->o_frame, "e,state,primary,off", "e"); - /* delete the mini */ - evas_object_del(msd->o_clone); + /* if we have no changes to apply, get out */ + if (sd->changes <= E_SMART_MONITOR_CHANGED_NONE) return EINA_FALSE; - /* swallow the background */ - evas_object_show(msd->o_thumb); - edje_object_part_swallow(msd->o_frame, "e.swallow.preview", msd->o_thumb); + /* grab the root window */ + root = ecore_x_window_root_first_get(); - /* adjust clone box size */ - if ((o = (Evas_Object *) - edje_object_part_object_get(osd->o_frame, "e.box.clone"))) + /* get the outputs for this crtc */ + outputs = ecore_x_randr_crtc_outputs_get(root, sd->crtc.id, &noutputs); + if (noutputs < 1) { - Evas_Coord mw = 0, mh = 0; + free(outputs); - evas_object_size_hint_min_get(o, &mw, &mh); - if (mw < 1) mw = 1; - if (mh < 1) mh = 1; - evas_object_resize(o, mw, mh); + if ((outputs = malloc(sizeof(Ecore_X_Randr_Output)))) + { + outputs[0] = sd->output; + noutputs = 1; + } } - /* show the monitor */ - evas_object_show(mon); - - /* set cloned flag */ - msd->current.cloned = EINA_FALSE; + /* if this monitor gets re-enabled, we need to set a mode */ + if ((sd->current.enabled) && (!sd->current.mode)) + { + Ecore_X_Randr_Mode_Info *info; - /* set appropriate changes */ - if (msd->orig.cloned != msd->current.cloned) - msd->changes |= E_SMART_MONITOR_CHANGED_CLONED; - else - msd->changes &= ~(E_SMART_MONITOR_CHANGED_CLONED); + info = _e_smart_monitor_mode_find(sd, sd->current.w, + sd->current.h, EINA_FALSE); + if (info) + sd->current.mode = info->xid; + } - x = msd->cx; - y = msd->cy; - w = msd->cw; - h = msd->ch; + /* if this monitor gets re-enabled, we need to assign a crtc */ + if ((sd->current.enabled) && (!sd->crtc.id)) + { + /* find a crtc */ + sd->crtc.id = _e_smart_monitor_crtc_find(sd->output); + } - /* safety check for valid values. - * - * NB: Needed in the case that we have no previous setup, we are in a clone - * situation (from X), and we were not manually moved */ - if ((msd->orig.cloned) || (msd->cw == 0) || (msd->ch == 0)) + /* record current values */ + mode = sd->current.mode; + if (!sd->current.enabled) { - e_layout_child_geometry_get(mon, &x, &y, &w, &h); - msd->current.x = x; - msd->current.y = y; + mode = 0; + noutputs = 0; + if (outputs) free(outputs); + outputs = NULL; } - /* set the resolution name */ - _e_smart_monitor_resolution_set(msd, w, h); + cx = sd->current.x; + cy = sd->current.y; + cw = sd->current.w; + ch = sd->current.h; + orient = sd->current.orient; + + /* if we are cloned, we need to use the parent values */ + if ((sd->cloned) && (sd->parent)) + { + E_Smart_Data *psd; - /* set parent object */ - msd->parent = NULL; + if ((psd = evas_object_smart_data_get(sd->parent))) + { + cx = psd->current.x; + cy = psd->current.y; + cw = psd->current.w; + ch = psd->current.h; + mode = psd->current.mode; + orient = psd->current.orient; + + ecore_x_randr_crtc_clone_set(root, psd->crtc.id, sd->crtc.id); + } + } + else + { + /* try to apply the settings */ + if (!ecore_x_randr_crtc_settings_set(root, sd->crtc.id, outputs, + noutputs, cx, cy, mode, orient)) + printf("FAILED TO APPLY MONITOR SETTINGS !!!\n"); + } - /* restore to starting size */ - e_layout_child_resize(mon, w, h); + /* free any allocated memory from ecore_x_randr */ + if (outputs) free(outputs); + outputs = NULL; + + /* update crtc values to match current values */ + sd->crtc.x = cx; + sd->crtc.y = cy; + sd->crtc.w = cw; + sd->crtc.h = ch; + sd->crtc.mode = mode; + sd->crtc.orient = orient; + sd->crtc.enabled = sd->current.enabled; + + if ((sd->crtc.mode) && + (mode_info = ecore_x_randr_mode_info_get(root, sd->crtc.mode))) + { + sd->crtc.refresh_rate = + _e_smart_monitor_mode_refresh_rate_get(mode_info); + ecore_x_randr_mode_info_free(mode_info); + } + else + sd->crtc.refresh_rate = 60.0; - /* restore to starting position */ - e_layout_child_move(mon, x, y); + /* reset changes */ + sd->changes = E_SMART_MONITOR_CHANGED_NONE; - /* send monitor changed signal */ - evas_object_smart_callback_call(mon, "monitor_changed", NULL); + return EINA_TRUE; } -void -e_smart_monitor_cloned_set(Evas_Object *obj, Eina_Bool cloned) +const char * +e_smart_monitor_name_get(Evas_Object *obj) { E_Smart_Data *sd; /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; + if (!(sd = evas_object_smart_data_get(obj))) return NULL; - /* set cloned flag */ - sd->orig.cloned = sd->current.cloned = cloned; + /* get output name */ + return edje_object_part_text_get(sd->o_frame, "e.text.name"); } -void -e_smart_monitor_drop_zone_set(Evas_Object *obj, Eina_Bool can_drop) +Ecore_X_Randr_Output +e_smart_monitor_output_get(Evas_Object *obj) { E_Smart_Data *sd; /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; - - /* if we can drop here, emit signal to turn on hilighting, else - * emit signal to turn it off */ - if (can_drop) - edje_object_signal_emit(sd->o_frame, "e,state,drop,on", "e"); - else - edje_object_signal_emit(sd->o_frame, "e,state,drop,off", "e"); + if (!(sd = evas_object_smart_data_get(obj))) return 0; + return sd->output; } void -e_smart_monitor_frame_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) +e_smart_monitor_indicator_available_set(Evas_Object *obj, Eina_Bool available) { E_Smart_Data *sd; - Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - - /* get the geometry of the frame */ - evas_object_geometry_get(sd->o_frame, &fx, &fy, &fw, &fh); - if (x) *x = fx; - if (y) *y = fy; - if (w) *w = fw; - if (h) *h = fh; + if (available) + edje_object_signal_emit(sd->o_frame, "e,state,indicator,enabled", "e"); + else + edje_object_signal_emit(sd->o_frame, "e,state,indicator,disabled", "e"); } -/* local functions */ +/* smart functions */ static void _e_smart_add(Evas_Object *obj) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to allocate the smart data structure */ if (!(sd = E_NEW(E_Smart_Data, 1))) return; /* grab the canvas */ sd->evas = evas_object_evas_get(obj); +#ifdef BG_DBG + /* create the bg test object */ + sd->o_bg = evas_object_rectangle_add(sd->evas); + evas_object_color_set(sd->o_bg, 255, 0, 0, 128); + evas_object_smart_member_add(sd->o_bg, obj); +#endif + /* create the base object */ sd->o_base = edje_object_add(sd->evas); e_theme_edje_object_set(sd->o_base, "base/theme/widgets", "e/conf/randr/main/monitor"); evas_object_smart_member_add(sd->o_base, obj); - /* create monitor 'frame' */ + /* create the frame object */ sd->o_frame = edje_object_add(sd->evas); e_theme_edje_object_set(sd->o_frame, "base/theme/widgets", "e/conf/randr/main/frame"); edje_object_part_swallow(sd->o_base, "e.swallow.frame", sd->o_frame); + /* add callbacks for frame events */ evas_object_event_callback_add(sd->o_frame, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_monitor_frame_cb_mouse_move, obj); - /* create the preview */ + edje_object_signal_callback_add(sd->o_frame, "e,action,resize,in", "e", + _e_smart_monitor_frame_cb_resize_in, NULL); + edje_object_signal_callback_add(sd->o_frame, "e,action,resize,out", "e", + _e_smart_monitor_frame_cb_resize_out, NULL); + edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,in", "e", + _e_smart_monitor_frame_cb_rotate_in, NULL); + edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,out", "e", + _e_smart_monitor_frame_cb_rotate_out, NULL); + edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,in", "e", + _e_smart_monitor_frame_cb_indicator_in, NULL); + edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,out", "e", + _e_smart_monitor_frame_cb_indicator_out, NULL); + + edje_object_signal_callback_add(sd->o_frame, "e,action,resize,start", "e", + _e_smart_monitor_frame_cb_resize_start, obj); + edje_object_signal_callback_add(sd->o_frame, "e,action,resize,stop", "e", + _e_smart_monitor_frame_cb_resize_stop, obj); + edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,start", "e", + _e_smart_monitor_frame_cb_rotate_start, obj); + edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,stop", "e", + _e_smart_monitor_frame_cb_rotate_stop, obj); + edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,toggle", "e", + _e_smart_monitor_frame_cb_indicator_toggle, + obj); + + /* create the background preview */ sd->o_thumb = e_livethumb_add(sd->evas); edje_object_part_swallow(sd->o_frame, "e.swallow.preview", sd->o_thumb); + + /* add callbacks for thumbnail events */ evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_IN, _e_smart_monitor_thumb_cb_mouse_in, NULL); evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_OUT, @@ -885,43 +993,13 @@ _e_smart_add(Evas_Object *obj) evas_object_event_callback_add(sd->o_thumb, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_monitor_thumb_cb_mouse_down, obj); - /* create monitor stand */ + /* create the stand */ sd->o_stand = edje_object_add(sd->evas); e_theme_edje_object_set(sd->o_stand, "base/theme/widgets", "e/conf/randr/main/stand"); edje_object_part_swallow(sd->o_base, "e.swallow.stand", sd->o_stand); - /* add callbacks for resize signals */ - edje_object_signal_callback_add(sd->o_frame, "e,action,resize,in", "e", - _e_smart_monitor_frame_cb_resize_in, NULL); - edje_object_signal_callback_add(sd->o_frame, "e,action,resize,out", "e", - _e_smart_monitor_frame_cb_resize_out, NULL); - edje_object_signal_callback_add(sd->o_frame, "e,action,resize,start", "e", - _e_smart_monitor_frame_cb_resize_start, obj); - edje_object_signal_callback_add(sd->o_frame, "e,action,resize,stop", "e", - _e_smart_monitor_frame_cb_resize_stop, obj); - - /* add callbacks for rotate signals */ - edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,in", "e", - _e_smart_monitor_frame_cb_rotate_in, NULL); - edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,out", "e", - _e_smart_monitor_frame_cb_rotate_out, NULL); - edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,start", "e", - _e_smart_monitor_frame_cb_rotate_start, obj); - edje_object_signal_callback_add(sd->o_frame, "e,action,rotate,stop", "e", - _e_smart_monitor_frame_cb_rotate_stop, obj); - - /* add callbacks for indicator signals */ - edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,in", "e", - _e_smart_monitor_frame_cb_indicator_in, sd); - edje_object_signal_callback_add(sd->o_frame, "e,action,indicator,out", "e", - _e_smart_monitor_frame_cb_indicator_out, sd); - edje_object_signal_callback_add(sd->o_frame, - "e,action,indicator,toggle", "e", - _e_smart_monitor_frame_cb_indicator_toggle, - obj); - - /* add handler for bg updates */ + /* setup event handler for bg image updates */ sd->bg_update_hdl = ecore_event_handler_add(E_EVENT_BG_UPDATE, _e_smart_monitor_background_update, sd); @@ -934,28 +1012,24 @@ static void _e_smart_del(Evas_Object *obj) { E_Smart_Data *sd; - Eina_List *l; - Evas_Object *mclone; + Ecore_X_Randr_Mode_Info *mode; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* delete any existing clones */ - EINA_LIST_FOREACH(sd->clones, l, mclone) - evas_object_del(mclone); - - /* delete the list of modes */ - if (sd->modes) eina_list_free(sd->modes); - /* delete the bg update handler */ - if (sd->bg_update_hdl) ecore_event_handler_del(sd->bg_update_hdl); + ecore_event_handler_del(sd->bg_update_hdl); - /* delete the stand object */ - if (sd->o_stand) evas_object_del(sd->o_stand); + /* delete the refresh rate object */ + if (sd->o_refresh) evas_object_del(sd->o_refresh); + + if (sd->o_clone) evas_object_del(sd->o_clone); - /* delete the preview */ - if (sd->o_thumb) + if (sd->o_thumb) { + /* delete the event callbacks */ evas_object_event_callback_del(sd->o_thumb, EVAS_CALLBACK_MOUSE_IN, _e_smart_monitor_thumb_cb_mouse_in); evas_object_event_callback_del(sd->o_thumb, EVAS_CALLBACK_MOUSE_OUT, @@ -964,52 +1038,60 @@ _e_smart_del(Evas_Object *obj) _e_smart_monitor_thumb_cb_mouse_up); evas_object_event_callback_del(sd->o_thumb, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_monitor_thumb_cb_mouse_down); + + /* delete the object */ evas_object_del(sd->o_thumb); } - /* delete the frame object */ - if (sd->o_frame) + /* delete the stand */ + if (sd->o_stand) evas_object_del(sd->o_stand); + + if (sd->o_frame) { - edje_object_signal_callback_del(sd->o_frame, - "e,action,resize,in", "e", + /* delete the event callbacks */ + evas_object_event_callback_del(sd->o_frame, EVAS_CALLBACK_MOUSE_MOVE, + _e_smart_monitor_frame_cb_mouse_move); + + edje_object_signal_callback_del(sd->o_frame, "e,action,resize,in", "e", _e_smart_monitor_frame_cb_resize_in); - edje_object_signal_callback_del(sd->o_frame, - "e,action,resize,out", "e", + edje_object_signal_callback_del(sd->o_frame, "e,action,resize,out", "e", _e_smart_monitor_frame_cb_resize_out); - edje_object_signal_callback_del(sd->o_frame, - "e,action,resize,start", "e", - _e_smart_monitor_frame_cb_resize_start); - edje_object_signal_callback_del(sd->o_frame, - "e,action,resize,stop", "e", - _e_smart_monitor_frame_cb_resize_stop); - edje_object_signal_callback_del(sd->o_frame, - "e,action,rotate,in", "e", + edje_object_signal_callback_del(sd->o_frame, "e,action,rotate,in", "e", _e_smart_monitor_frame_cb_rotate_in); - edje_object_signal_callback_del(sd->o_frame, - "e,action,rotate,out", "e", + edje_object_signal_callback_del(sd->o_frame, "e,action,rotate,out", "e", _e_smart_monitor_frame_cb_rotate_out); - edje_object_signal_callback_del(sd->o_frame, - "e,action,rotate,start", "e", - _e_smart_monitor_frame_cb_rotate_start); - edje_object_signal_callback_del(sd->o_frame, - "e,action,rotate,stop", "e", - _e_smart_monitor_frame_cb_rotate_stop); - edje_object_signal_callback_del(sd->o_frame, - "e,action,indicator,in", "e", + edje_object_signal_callback_del(sd->o_frame, "e,action,indicator,in", "e", _e_smart_monitor_frame_cb_indicator_in); - edje_object_signal_callback_del(sd->o_frame, - "e,action,indicator,out", "e", + edje_object_signal_callback_del(sd->o_frame, "e,action,indicator,out", "e", _e_smart_monitor_frame_cb_indicator_out); - edje_object_signal_callback_del(sd->o_frame, - "e,action,indicator,toggle", "e", + + edje_object_signal_callback_del(sd->o_frame, "e,action,resize,start", "e", + _e_smart_monitor_frame_cb_resize_start); + edje_object_signal_callback_del(sd->o_frame, "e,action,resize,stop", "e", + _e_smart_monitor_frame_cb_resize_stop); + edje_object_signal_callback_del(sd->o_frame, "e,action,rotate,start", "e", + _e_smart_monitor_frame_cb_rotate_start); + edje_object_signal_callback_del(sd->o_frame, "e,action,rotate,stop", "e", + _e_smart_monitor_frame_cb_rotate_stop); + edje_object_signal_callback_del(sd->o_frame, "e,action,indicator,toggle", "e", _e_smart_monitor_frame_cb_indicator_toggle); - evas_object_event_callback_del(sd->o_frame, EVAS_CALLBACK_MOUSE_MOVE, - _e_smart_monitor_frame_cb_mouse_move); + + /* delete the object */ evas_object_del(sd->o_frame); } + _e_smart_monitor_pointer_pop(obj, NULL); + /* delete the base object */ - if (sd->o_base) evas_object_del(sd->o_base); + evas_object_del(sd->o_base); + +#ifdef BG_DBG + evas_object_del(sd->o_bg); +#endif + + /* free the list of modes */ + EINA_LIST_FREE(sd->modes, mode) + if (mode) ecore_x_randr_mode_info_free(mode); /* try to free the allocated structure */ E_FREE(sd); @@ -1022,84 +1104,54 @@ static void _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { E_Smart_Data *sd; - Eina_List *l; - Evas_Object *mclone; - Evas_Coord fx = 0, fy = 0; - Evas_Coord cx = 0, cy = 0; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; + /* if there is no position change, then get out */ if ((sd->x == x) && (sd->y == y)) return; sd->x = x; sd->y = y; - /* move the base object */ - if (sd->o_base) evas_object_move(sd->o_base, x, y); - - /* if we are not visible, no need to update map */ - if (!sd->visible) return; - - /* grab geometry of the frame */ - evas_object_geometry_get(sd->o_frame, &fx, &fy, NULL, NULL); - - /* convert to virtual coordinates */ - e_layout_coord_canvas_to_virtual(sd->layout.obj, fx, fy, &cx, &cy); - - /* set monitor position text */ - _e_smart_monitor_position_set(sd, cx, cy); - - /* apply any existing rotation */ - _e_smart_monitor_map_apply(sd->o_frame, sd->current.rotation); - - /* loop the clones and update their rotation */ - EINA_LIST_FOREACH(sd->clones, l, mclone) - { - E_Smart_Data *msd; - - /* try to get the clones smart data */ - if (!(msd = evas_object_data_get(mclone, "smart_data"))) - continue; - - /* apply existing rotation to mini */ - _e_smart_monitor_map_apply(mclone, msd->current.rotation); - } + evas_object_move(sd->o_base, x, y); +#ifdef BG_DBG + evas_object_move(sd->o_bg, x, y); +#endif } static void _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { E_Smart_Data *sd; - Eina_List *l; - Evas_Object *mclone; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; + /* if there is no size change, then get out */ + if ((sd->w == w) && (sd->h == h)) return; + sd->w = w; sd->h = h; - /* resize the base object */ - if (sd->o_base) evas_object_resize(sd->o_base, w, h); - - /* if we are not visible, no need to update map */ - if (!sd->visible) return; - - /* apply any existing rotation */ - _e_smart_monitor_map_apply(sd->o_frame, sd->current.rotation); + evas_object_resize(sd->o_base, w, h); +#ifdef BG_DBG + evas_object_resize(sd->o_bg, w, h + 30); +#endif - /* loop the clones and update their rotation */ - EINA_LIST_FOREACH(sd->clones, l, mclone) + /* set livethumb thumbnail size */ + if ((!sd->resizing) && (!sd->rotating) && (!sd->moving)) { - E_Smart_Data *msd; - - /* try to get the clones smart data */ - if (!(msd = evas_object_data_get(mclone, "smart_data"))) - continue; + Evas_Coord mw = 0, mh = 0; - /* apply existing rotation to mini */ - _e_smart_monitor_map_apply(mclone, msd->current.rotation); + _e_smart_monitor_coord_virtual_to_canvas(sd, sd->max.mode_width, + sd->max.mode_height, + &mw, &mh); + e_livethumb_vsize_set(sd->o_thumb, mw, mh); } } @@ -1108,26 +1160,34 @@ _e_smart_show(Evas_Object *obj) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* if it is already visible, get out */ + /* if we are already visible, then nothing to do */ // if (sd->visible) return; - /* show the stand */ - if (sd->o_stand) evas_object_show(sd->o_stand); - - /* show the frame */ - if (sd->o_frame) evas_object_show(sd->o_frame); - - /* show the base object */ - if (sd->o_base) evas_object_show(sd->o_base); + if (!sd->cloned) + { + evas_object_show(sd->o_stand); + evas_object_show(sd->o_frame); + evas_object_show(sd->o_base); +#ifdef BG_DBG + evas_object_show(sd->o_bg); +#endif - /* set visibility flag */ - sd->visible = EINA_TRUE; + if (!sd->current.enabled) + edje_object_signal_emit(sd->o_frame, "e,state,disabled", "e"); - /* apply any existing rotation */ - _e_smart_monitor_map_apply(sd->o_frame, sd->current.rotation); + /* set visibility flag */ + sd->visible = EINA_TRUE; + } + else + { + if (sd->o_clone) evas_object_show(sd->o_clone); + sd->visible = EINA_FALSE; + } } static void @@ -1135,20 +1195,25 @@ _e_smart_hide(Evas_Object *obj) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* if it is not visible, we have nothing to do */ + /* if we are already hidden, then nothing to do */ // if (!sd->visible) return; - /* hide the stand */ - if (sd->o_stand) evas_object_hide(sd->o_stand); - - /* hide the frame */ - if (sd->o_frame) evas_object_hide(sd->o_frame); - - /* hide the base object */ - if (sd->o_base) evas_object_hide(sd->o_base); + if (sd->cloned) + { + evas_object_hide(sd->o_stand); + evas_object_hide(sd->o_frame); + evas_object_hide(sd->o_base); +#ifdef BG_DBG + evas_object_hide(sd->o_bg); +#endif + } + else if (sd->o_clone) + evas_object_hide(sd->o_clone); /* set visibility flag */ sd->visible = EINA_FALSE; @@ -1159,13 +1224,15 @@ _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* set the clip */ - if (sd->o_stand) evas_object_clip_set(sd->o_stand, clip); - if (sd->o_frame) evas_object_clip_set(sd->o_frame, clip); - if (sd->o_base) evas_object_clip_set(sd->o_base, clip); + evas_object_clip_set(sd->o_base, clip); +#ifdef BG_DBG + evas_object_clip_set(sd->o_bg, clip); +#endif } static void @@ -1173,137 +1240,64 @@ _e_smart_clip_unset(Evas_Object *obj) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* unset the clip */ - if (sd->o_stand) evas_object_clip_unset(sd->o_stand); - if (sd->o_frame) evas_object_clip_unset(sd->o_frame); - if (sd->o_base) evas_object_clip_unset(sd->o_base); + evas_object_clip_unset(sd->o_base); +#ifdef BG_DBG + evas_object_clip_unset(sd->o_bg); +#endif } +/* local functions */ static void -_e_smart_monitor_refresh_rates_fill(Evas_Object *obj) +_e_smart_monitor_modes_fill(E_Smart_Data *sd) { - E_Smart_Data *sd; - E_Radio_Group *rg = NULL; - Eina_List *m = NULL; - Ecore_X_Randr_Mode_Info *mode = NULL; - Evas_Coord mw = 0, mh = 0; + Ecore_X_Window root = 0; + Ecore_X_Randr_Mode *modes; + int num = 0, i = 0; - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - if (sd->o_refresh) - { - /* remove the old refresh list */ - edje_object_part_unswallow(sd->o_frame, sd->o_refresh); - evas_object_del(sd->o_refresh); - } + /* safety check */ + if (!sd) return; - /* create new refresh list widget */ - sd->o_refresh = e_widget_list_add(sd->evas, 0, 0); + /* try to get the root window */ + root = ecore_x_window_root_first_get(); - /* loop the modes and find the current one */ - EINA_LIST_FOREACH(sd->modes, m, mode) + /* try to get the modes for this output from ecore_x_randr */ + modes = ecore_x_randr_output_modes_get(root, sd->output, &num, NULL); + if (!modes) return; + + /* loop the returned modes */ + for (i = 0; i < num; i++) { - if (!sd->current.mode) continue; + Ecore_X_Randr_Mode_Info *mode; - /* compare mode names */ - if (!strcmp(mode->name, sd->current.mode->name)) - { - if ((mode->hTotal) && (mode->vTotal)) - { - Evas_Object *ow; - double rate = 0.0; - char buff[1024]; + /* try to get the mode info */ + if (!(mode = ecore_x_randr_mode_info_get(root, modes[i]))) + continue; - /* create radio group for rates */ - if (!rg) - rg = e_widget_radio_group_new(&sd->current.refresh_rate); + /* append the mode info to our list of modes */ + sd->modes = eina_list_append(sd->modes, mode); + } - /* calculate rate */ - rate = _e_smart_monitor_refresh_rate_get(mode); - snprintf(buff, sizeof(buff), "%.1fHz", rate); + /* free any memory allocated from ecore_x_randr */ + free(modes); - /* create the radio widget */ - ow = e_widget_radio_add(sd->evas, buff, (int)rate, rg); + /* sort the list of modes (smallest to largest) */ + if (sd->modes) + sd->modes = eina_list_sort(sd->modes, 0, _e_smart_monitor_modes_sort); +} - /* hook into changed signal */ - evas_object_smart_callback_add(ow, "changed", - _e_smart_monitor_cb_refresh_rate_changed, obj); +static int +_e_smart_monitor_modes_sort(const void *data1, const void *data2) +{ + const Ecore_X_Randr_Mode_Info *m1, *m2 = NULL; - /* add this radio to the list */ - e_widget_list_object_append(sd->o_refresh, ow, 1, 0, 0.5); - } - } - } - - /* calculate minimum size for refresh list and set it */ - e_widget_size_min_get(sd->o_refresh, &mw, &mh); - edje_extern_object_min_size_set(sd->o_refresh, mw, mh); - - /* swallow refresh list into frame and show it */ - edje_object_part_swallow(sd->o_frame, "e.swallow.refresh", sd->o_refresh); - evas_object_show(sd->o_refresh); -} - -static double -_e_smart_monitor_refresh_rate_get(Ecore_X_Randr_Mode_Info *mode) -{ - double rate = 0.0; - - if (!mode) return 0.0; - - /* calculate rate */ - if ((mode->hTotal) && (mode->vTotal)) - rate = ((float)mode->dotClock / - ((float)mode->hTotal * (float)mode->vTotal)); - - return rate; -} - -static void -_e_smart_monitor_modes_fill(E_Smart_Data *sd) -{ - /* clear out any old modes */ - if (sd->modes) eina_list_free(sd->modes); - - /* if we have an assigned monitor, copy the modes from that */ - if ((sd->output) && (sd->output->monitor)) - sd->modes = eina_list_clone(sd->output->monitor->modes); - else if (sd->crtc) - sd->modes = eina_list_clone(sd->crtc->outputs_common_modes); - - /* sort the mode list (smallest to largest) */ - if (sd->modes) - sd->modes = eina_list_sort(sd->modes, 0, _e_smart_monitor_modes_sort); - - /* try to determine the min & max resolutions */ - if (sd->modes) - { - Ecore_X_Randr_Mode_Info *mode = NULL; - - /* try to get smallest resolution */ - if ((mode = eina_list_nth(sd->modes, 0))) - { - sd->min.w = mode->width; - sd->min.h = mode->height; - } - - /* try to get largest resolution */ - if ((mode = eina_list_last_data_get(sd->modes))) - { - sd->max.w = mode->width; - sd->max.h = mode->height; - } - } -} - -static int -_e_smart_monitor_modes_sort(const void *data1, const void *data2) -{ - const Ecore_X_Randr_Mode_Info *m1, *m2 = NULL; +// LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!(m1 = data1)) return 1; if (!(m2 = data2)) return -1; @@ -1323,47 +1317,52 @@ _e_smart_monitor_modes_sort(const void *data1, const void *data2) } static void -_e_smart_monitor_background_set(E_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy) +_e_smart_monitor_background_set(E_Smart_Data *sd, int dx, int dy) { const char *bg = NULL; - if (!sd->o_thumb) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* check for valid smart data */ + if (!sd) return; - /* try to get the bg file for this desktop */ - if ((bg = e_bg_file_get(sd->con->num, sd->zone_num, dx, dy))) + /* try to get the background file for this desktop */ + if ((bg = e_bg_file_get(sd->con_num, sd->zone_num, dx, dy))) { Evas_Object *o; - /* try to get the livethumb, if not then create an object */ + /* try to get the livethumb object, create if needed */ if (!(o = e_livethumb_thumb_get(sd->o_thumb))) o = edje_object_add(e_livethumb_evas_get(sd->o_thumb)); /* tell the object to use this edje file & group */ edje_object_file_set(o, bg, "e/desktop/background"); - /* tell the thumbnail to use this object for preview */ + /* tell the livethumb to use this object */ e_livethumb_thumb_set(sd->o_thumb, o); } } static Eina_Bool -_e_smart_monitor_background_update(void *data, int type, void *event) +_e_smart_monitor_background_update(void *data, int type EINA_UNUSED, void *event) { E_Smart_Data *sd; E_Event_Bg_Update *ev; - if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* try to get the smart data */ if (!(sd = data)) return ECORE_CALLBACK_PASS_ON; ev = event; /* check this bg event happened on our container */ - if (((ev->container < 0) || (ev->container == (int)sd->con->num)) && - ((ev->zone < 0) || (ev->zone == sd->zone_num))) + if (((ev->container < 0) || (ev->container == (int)sd->con_num)) && + ((ev->zone < 0) || (ev->zone == (int)sd->zone_num))) { /* check this bg event happened on our desktop */ - if (((ev->desk_x < 0) || (ev->desk_x == sd->current.x)) && - ((ev->desk_y < 0) || (ev->desk_y == sd->current.y))) + if (((ev->desk_x < 0) || (ev->desk_x == sd->crtc.x)) && + ((ev->desk_y < 0) || (ev->desk_y == sd->crtc.y))) { /* set the livethumb preview to the background of this desktop */ _e_smart_monitor_background_set(sd, ev->desk_x, ev->desk_y); @@ -1374,68 +1373,84 @@ _e_smart_monitor_background_update(void *data, int type, void *event) } static void -_e_smart_monitor_resolution_set(E_Smart_Data *sd, Evas_Coord width, Evas_Coord height) +_e_smart_monitor_position_set(E_Smart_Data *sd, Evas_Coord x, Evas_Coord y) { char buff[1024]; - if (!sd) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + snprintf(buff, sizeof(buff), "%d + %d", x, y); + edje_object_part_text_set(sd->o_frame, "e.text.position", buff); +} + +static void +_e_smart_monitor_resolution_set(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h) +{ + char buff[1024]; - snprintf(buff, sizeof(buff), "%d x %d", width, height); + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* set the frame's resolution text */ + snprintf(buff, sizeof(buff), "%d x %d", w, h); edje_object_part_text_set(sd->o_frame, "e.text.resolution", buff); } static void -_e_smart_monitor_position_set(E_Smart_Data *sd, Evas_Coord x, Evas_Coord y) +_e_smart_monitor_pointer_push(Evas_Object *obj, const char *ptr) { - char buff[1024]; + Evas_Object *ow; + E_Win *win; - if (!sd) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - snprintf(buff, sizeof(buff), "%d + %d", x, y); + /* try to find the E_Win for this object */ + if (!(ow = evas_object_name_find(evas_object_evas_get(obj), "E_Win"))) + return; + if (!(win = evas_object_data_get(ow, "E_Win"))) return; - /* set the frame's resolution text */ - edje_object_part_text_set(sd->o_frame, "e.text.position", buff); + /* tell E to set the pointer type */ + e_pointer_type_push(win->pointer, obj, ptr); } -static Ecore_X_Randr_Mode_Info * -_e_smart_monitor_resolution_get(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h, Eina_Bool skip_rate_check) +static void +_e_smart_monitor_pointer_pop(Evas_Object *obj, const char *ptr) { - Ecore_X_Randr_Mode_Info *mode = NULL; - Eina_List *l; + Evas_Object *ow; + E_Win *win; - if (!sd) return NULL; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* find the closest resolution to this size */ - if (!skip_rate_check) - { - EINA_LIST_REVERSE_FOREACH(sd->modes, l, mode) - { - if ((((int)mode->width - RESIZE_FUZZ) <= w) || - (((int)mode->width + RESIZE_FUZZ) <= w)) - { - if ((((int)mode->height - RESIZE_FUZZ) <= h) || - (((int)mode->height + RESIZE_FUZZ) <= h)) - { - if ((mode->hTotal) && (mode->vTotal)) - { - double rate = 0.0; + /* try to find the E_Win for this object */ + if (!(ow = evas_object_name_find(evas_object_evas_get(obj), "E_Win"))) + return; + if (!(win = evas_object_data_get(ow, "E_Win"))) return; - /* get the refresh rate for this mode */ - rate = _e_smart_monitor_refresh_rate_get(mode); + /* tell E to unset the pointer type */ + e_pointer_type_pop(win->pointer, obj, ptr); +} - /* compare this mode rate to current rate */ - if (((int)rate == sd->current.refresh_rate)) - return mode; - } - } - } - } - } +static inline void +_e_smart_monitor_coord_virtual_to_canvas(E_Smart_Data *sd, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy) +{ + if (cx) *cx = sd->grid.x + (vx * ((double)sd->grid.w / sd->grid.vw)); + if (cy) *cy = sd->grid.y + (vy * ((double)sd->grid.h / sd->grid.vh)); +} + +static inline void +_e_smart_monitor_coord_canvas_to_virtual(E_Smart_Data *sd, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy) +{ + if ((sd->grid.w) && (vx)) + *vx = ((cx - sd->grid.x) * sd->grid.vw) / sd->grid.w; + if ((sd->grid.h) && (vy)) + *vy = ((cy - sd->grid.y) * sd->grid.vh) / sd->grid.h; +} + +static Ecore_X_Randr_Mode_Info * +_e_smart_monitor_mode_find(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h, Eina_Bool skip_refresh) +{ + Ecore_X_Randr_Mode_Info *mode = NULL; + Eina_List *l = NULL; - /* if we got here, then we found no mode which matches the current - * refresh rate and size. Search again, ignoring refresh rate */ + /* loop the modes */ EINA_LIST_REVERSE_FOREACH(sd->modes, l, mode) { if ((((int)mode->width - RESIZE_FUZZ) <= w) || @@ -1443,533 +1458,348 @@ _e_smart_monitor_resolution_get(E_Smart_Data *sd, Evas_Coord w, Evas_Coord h, Ei { if ((((int)mode->height - RESIZE_FUZZ) <= h) || (((int)mode->height + RESIZE_FUZZ) <= h)) - return mode; + { + if (!skip_refresh) + { + double rate = 0.0; + + /* get the refresh rate for this mode */ + rate = _e_smart_monitor_mode_refresh_rate_get(mode); + + /* compare mode rate to "current" rate */ + if ((int)rate == sd->current.refresh_rate) + return mode; + } + else + return mode; + } } } return NULL; } -static int -_e_smart_monitor_rotation_get(Ecore_X_Randr_Orientation orient) +static inline double +_e_smart_monitor_mode_refresh_rate_get(Ecore_X_Randr_Mode_Info *mode) { - /* return numerical rotation degree based on orientation */ - switch (orient) + double rate = 0.0; + + if (mode) { - case ECORE_X_RANDR_ORIENTATION_ROT_90: - return 90; - case ECORE_X_RANDR_ORIENTATION_ROT_180: - return 180; - case ECORE_X_RANDR_ORIENTATION_ROT_270: - return 270; - case ECORE_X_RANDR_ORIENTATION_ROT_0: - default: - return 0; + if ((mode->hTotal) && (mode->vTotal)) + rate = ((float)mode->dotClock / + ((float)mode->hTotal * (float)mode->vTotal)); } + + return rate; } -static int -_e_smart_monitor_rotation_amount_get(E_Smart_Data *sd, Evas_Event_Mouse_Move *ev) +static void +_e_smart_monitor_mode_refresh_rates_fill(Evas_Object *obj) { - Evas_Coord cx = 0, cy = 0; - Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; - double a = 0.0, b = 0.0, c = 0.0, r = 0.0; - double ax = 0.0, ay = 0.0, bx = 0.0, by = 0.0; - double dotprod = 0.0; + E_Smart_Data *sd; + Ecore_X_Window root = 0; + Eina_List *m = NULL; + Ecore_X_Randr_Mode_Info *cmode = NULL, *mode = NULL; + E_Radio_Group *rg = NULL; + Evas_Coord mw = 0, mh = 0; - /* return a single rotation amount based on - * mouse movement in both directions */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* if there was no movement, return 0 - * - * NB: This smells quite odd to me. How can we get a mouse_move event - * (and end up in here) when the coordinates say otherwise ?? - * Must be a synthetic event and we are not interested in those */ - if ((ev->cur.canvas.x == ev->prev.canvas.x) && - (ev->cur.canvas.y == ev->prev.canvas.y)) - return 0; + /* try to get the objects smart data */ + if (!(sd = evas_object_smart_data_get(obj))) return; - /* get the geometry of the frame */ - evas_object_geometry_get(sd->o_frame, &fx, &fy, &fw, &fh); + /* try to get the root window */ + root = ecore_x_window_root_first_get(); - /* if the mouse is moved outside the frame then get out - * - * NB: This could be coded into one giant OR statement, but I am feeling - * lazy today ;) */ - /* if ((ev->cur.canvas.x > (sd->x + sd->w))) return 0; */ - /* else if ((ev->cur.canvas.x < sd->x)) return 0; */ - /* if ((ev->cur.canvas.y > (sd->y + sd->h))) return 0; */ - /* else if ((ev->cur.canvas.y < sd->y)) return 0; */ - if ((ev->cur.canvas.x > (fx + fw))) return 0; - else if ((ev->cur.canvas.x < fx)) return 0; - if ((ev->cur.canvas.y > (fy + fh))) return 0; - else if ((ev->cur.canvas.y < fy)) return 0; + /* try to get current mode info */ + if (!(cmode = ecore_x_randr_mode_info_get(root, sd->current.mode))) + return; - /* get center point - * - * NB: This COULD be used to provide a greater amount of rotation - * depending on distance of movement from center */ - /* cx = (sd->x + (sd->w / 2)); */ - /* cy = (sd->y + (sd->h / 2)); */ - cx = (fx + (fw / 2)); - cy = (fy + (fh / 2)); + /* remove the old refresh rate list */ + if (sd->o_refresh) + { + edje_object_part_unswallow(sd->o_frame, sd->o_refresh); + evas_object_del(sd->o_refresh); + } - /* ax = ((sd->x + sd->w) - cx); */ - /* ay = (sd->y - cy); */ - ax = ((fx + fw) - cx); - ay = (fy - cy); + /* create new refresh rate list */ + sd->o_refresh = e_widget_list_add(sd->evas, 0, 0); - bx = (ev->cur.canvas.x - cx); - by = (ev->cur.canvas.y - cy); + /* loop the modes and find the current one */ + EINA_LIST_FOREACH(sd->modes, m, mode) + { + /* compare mode names */ + if (!strcmp(cmode->name, mode->name)) + { + Evas_Object *ow; + double rate = 0.0; + char buff[1024]; - /* calculate degrees of rotation - * - * NB: A HUGE Thank You to Daniel for the help here !! */ - a = sqrt((ax * ax) + (ay * ay)); - b = sqrt((bx * bx) + (by * by)); - if ((a < 1) || (b < 1)) return 0; + /* create new radio group if needed */ + if (!rg) rg = e_widget_radio_group_new(&sd->current.refresh_rate); - /* c = sqrt((ev->cur.canvas.x - (sd->x + sd->w)) * */ - /* (ev->cur.canvas.x - (sd->x + sd->w)) + */ - /* (ev->cur.canvas.y - sd->y) * */ - /* (ev->cur.canvas.y - sd->y)); */ - c = sqrt((ev->cur.canvas.x - (fx + fw)) * - (ev->cur.canvas.x - (fx + fw)) + - (ev->cur.canvas.y - fy) * - (ev->cur.canvas.y - fy)); + /* get the refresh rate for this mode */ + rate = _e_smart_monitor_mode_refresh_rate_get(mode); + snprintf(buff, sizeof(buff), "%.1fHz", rate); - r = acos(((a * a) + (b * b) - (c * c)) / (2 * (a * b))); - r = r * 180 / M_PI; + /* create radio widget */ + ow = e_widget_radio_add(sd->evas, buff, (int)rate, rg); - dotprod = ((ay * bx) + (-ax * by)); - if (dotprod > 0) r = 360 - r; + /* hook changed signal */ + evas_object_smart_callback_add(ow, "changed", + _e_smart_monitor_refresh_rate_cb_changed, obj); - return r; -} + /* add this radio to the list */ + e_widget_list_object_append(sd->o_refresh, ow, 1, 0, 0.5); + } + } -static Ecore_X_Randr_Orientation -_e_smart_monitor_orientation_get(int rotation) -{ - rotation %= 360; + /* free any memory allocated from ecore_x_randr */ + if (cmode) ecore_x_randr_mode_info_free(cmode); - /* find the closest orientation based on rotation within fuziness */ - if (((rotation - ROTATE_FUZZ) <= 0) || - ((rotation + ROTATE_FUZZ) <= 0)) - return ECORE_X_RANDR_ORIENTATION_ROT_0; - else if (((rotation - ROTATE_FUZZ) <= 90) || - ((rotation + ROTATE_FUZZ) <= 90)) - return ECORE_X_RANDR_ORIENTATION_ROT_90; - else if (((rotation - ROTATE_FUZZ) <= 180) || - ((rotation + ROTATE_FUZZ) <=180)) - return ECORE_X_RANDR_ORIENTATION_ROT_180; - else if (((rotation - ROTATE_FUZZ) <= 270) || - ((rotation + ROTATE_FUZZ) <= 270)) - return ECORE_X_RANDR_ORIENTATION_ROT_270; - else if (((rotation - ROTATE_FUZZ) < 360) || - ((rotation + ROTATE_FUZZ) < 360)) - return ECORE_X_RANDR_ORIENTATION_ROT_0; + /* calculate min size for refresh list and set */ + e_widget_size_min_get(sd->o_refresh, &mw, &mh); + edje_extern_object_min_size_set(sd->o_refresh, mw, mh); - /* return a default */ - return ECORE_X_RANDR_ORIENTATION_ROT_0; + /* swallow refresh list */ + edje_object_part_swallow(sd->o_frame, "e.swallow.refresh", sd->o_refresh); + evas_object_show(sd->o_refresh); } static void -_e_smart_monitor_pointer_push(Evas_Object *obj, const char *ptr) +_e_smart_monitor_thumb_cb_mouse_in(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { - Evas_Object *ow; - E_Win *win; - - /* try to find the E_Win for this object */ - if (!(ow = evas_object_name_find(evas_object_evas_get(obj), "E_Win"))) - return; - if (!(win = evas_object_data_get(ow, "E_Win"))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* tell E to set the pointer type */ - e_pointer_type_push(win->pointer, obj, ptr); + /* set the mouse pointer to indicate we can be clicked */ + _e_smart_monitor_pointer_push(obj, "hand"); } static void -_e_smart_monitor_pointer_pop(Evas_Object *obj, const char *ptr) +_e_smart_monitor_thumb_cb_mouse_out(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) { - Evas_Object *ow; - E_Win *win; - - /* try to find the E_Win for this object */ - if (!(ow = evas_object_name_find(evas_object_evas_get(obj), "E_Win"))) - return; - if (!(win = evas_object_data_get(ow, "E_Win"))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* tell E to reset the pointer */ - e_pointer_type_pop(win->pointer, obj, ptr); + /* set the mouse pointer back to default */ + _e_smart_monitor_pointer_pop(obj, "hand"); } static void -_e_smart_monitor_map_apply(Evas_Object *obj, int rotation) +_e_smart_monitor_thumb_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event) { - Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; - static Evas_Map *map = NULL; + Evas_Event_Mouse_Up *ev; + Evas_Object *mon, *below; + E_Smart_Data *sd; - /* get the geometry of the frame */ - evas_object_geometry_get(obj, &fx, &fy, &fw, &fh); + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + ev = event; + if (ev->button != 1) return; - /* create a new evas map */ - if (!map) map = evas_map_new(4); + /* try to get the monitor object */ + if (!(mon = data)) return; - /* set map properties */ - evas_map_smooth_set(map, EINA_TRUE); - evas_map_alpha_set(map, EINA_TRUE); - evas_map_util_points_populate_from_object_full(map, obj, rotation); + /* try to get the monitor smart data */ + if (!(sd = evas_object_smart_data_get(mon))) return; - /* apply current rotation */ - evas_map_util_rotate(map, rotation, (fx + (fw / 2)), (fy + (fh / 2))); + if (sd->cloned) + { + /* reset moving flag */ + sd->moving = EINA_FALSE; - /* tell object to use this map */ - evas_object_map_set(obj, map); - evas_object_map_enable_set(obj, EINA_TRUE); -} + /* unclone this monitor */ + e_smart_monitor_clone_set(mon, NULL); -static void -_e_smart_monitor_map_remove(E_Smart_Data *sd, Ecore_X_Randr_Orientation orient) -{ - const Evas_Map *map = NULL; - Evas_Coord fx = 0, fy = 0; - Evas_Coord fw = 0, fh = 0; + return; + } - /* get the current map */ - if (!(map = evas_object_map_get(sd->o_frame))) return; + /* if we are not moving, then there is nothing to do in this routine */ + if (!sd->moving) return; - /* grab the frame geometry after everything is done */ - evas_object_geometry_get(sd->o_frame, NULL, NULL, &fw, &fh); + /* reset moving flag */ + sd->moving = EINA_FALSE; - if (orient == ECORE_X_RANDR_ORIENTATION_ROT_0) - { - /* only need the point 0 coords */ - evas_map_point_coord_get(map, 0, &fx, &fy, NULL); - } - else if (orient == ECORE_X_RANDR_ORIENTATION_ROT_180) + /* reset mouse pointer */ + _e_smart_monitor_pointer_pop(obj, "move"); + + if ((sd->current.x == sd->prev.x) && + (sd->current.y == sd->prev.y)) + return; + + /* any objects below this monitor ? */ + if ((below = evas_object_below_get(mon))) { - /* only need the point 2 coords */ - evas_map_point_coord_get(map, 2, &fx, &fy, NULL); - } - else if (orient == ECORE_X_RANDR_ORIENTATION_ROT_90) - { - /* only need the point 3 coords */ - evas_map_point_coord_get(map, 3, &fx, &fy, NULL); - } - else if (orient == ECORE_X_RANDR_ORIENTATION_ROT_270) - { - /* only need the point 1 coords */ - evas_map_point_coord_get(map, 1, &fx, &fy, NULL); - } - - /* disable the map so that the background and text get "unrotated" - * - * NB: This has the effect of resetting the frame geometry to the point - * where it was Before rotation started, thus why we need the - * move & resize below */ - evas_object_map_set(sd->o_frame, NULL); - evas_object_map_enable_set(sd->o_frame, EINA_FALSE); + const char *type; - /* move and resize the frame to the geometry of the frame - * - * NB: This is done to reflect the current orientation */ - evas_object_move(sd->o_frame, fx, fy); - - if ((orient == ECORE_X_RANDR_ORIENTATION_ROT_90) || - (orient == ECORE_X_RANDR_ORIENTATION_ROT_270)) - { - if ((sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_90) || - (sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_270)) - { - evas_object_resize(sd->o_frame, fh, fw); - } - } - else if ((orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || - (orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) - { - if ((sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_0) || - (sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_180)) + /* compare object type and make sure it's a monitor */ + if (!(type = evas_object_type_get(below))) return; + if (!strcmp(type, "smart_monitor")) { - evas_object_resize(sd->o_frame, fh, fw); - } - } -} - -static void -_e_smart_monitor_move_event(E_Smart_Data *sd, Evas_Object *mon, void *event) -{ - Evas_Event_Mouse_Move *ev; - Evas_Coord dx = 0, dy = 0; - Evas_Coord nx = 0, ny = 0; - Evas_Coord mx = 0, my = 0; - Evas_Coord mw = 0, mh = 0; - - /* check for valid smart data */ - if (!sd) return; - - /* if this monitor is cloned into another one, then do not process - * any mouse move events */ - if (sd->current.cloned) return; - - ev = event; + E_Smart_Data *osd; + Evas_Coord fx, fy, fw, fh; - /* calculate the difference in mouse movement */ - dx = (ev->cur.output.x - ev->prev.output.x); - dy = (ev->cur.output.y - ev->prev.output.y); - - /* get monitors current geometry */ - e_layout_child_geometry_get(mon, &mx, &my, &mw, &mh); - - /* convert these coords to virtual space */ - e_layout_coord_canvas_to_virtual(sd->layout.obj, (sd->layout.x + dx), - (sd->layout.y + dy), &nx, &ny); + /* try to get the monitor smart data */ + if (!(osd = evas_object_smart_data_get(below))) return; + if (!osd->visible) return; - /* factor monitor position into mouse movement */ - nx += mx; - ny += my; + /* grab geometry of this frame */ + evas_object_geometry_get(osd->o_frame, &fx, &fy, &fw, &fh); - if ((sd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_0) || - (sd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_180)) - { - /* constrain to the layout bounds */ - if (nx < 0) nx = 0; - if (ny < 0) ny = 0; + /* determine if monitor is being dragged over another one */ + if (E_INSIDE(sd->x, sd->y, fx, fy, (fw / 2), (fh / 2))) + { + e_smart_monitor_clone_set(mon, below); + edje_object_signal_emit(osd->o_frame, "e,state,drop,off", "e"); + evas_object_smart_callback_call(mon, "monitor_moved", NULL); + return; + } + else if (E_INSIDE((sd->x + sd->w), sd->y, + (fx + (fw / 2)), fy, fw, (fh / 2))) + { + e_smart_monitor_clone_set(mon, below); + edje_object_signal_emit(osd->o_frame, "e,state,drop,off", "e"); + evas_object_smart_callback_call(mon, "monitor_moved", NULL); + return; + } + } } - else if ((sd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_90) || - (sd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_270)) - { - int sx = 0, sy = 0; - - sx = -(((mh - mw) / 2) + sd->layout.x); - sy = -(((mw - mh) / 2) - sd->layout.y); - /* constrain to the layout bounds */ - if (nx < sx) nx = sx; - if (ny < sy) ny = sy; - } + /* take current object position, translate to virtual */ + _e_smart_monitor_coord_canvas_to_virtual(sd, sd->x, sd->y, + &sd->current.x, &sd->current.y); - if (nx < sd->layout.x) nx = sd->layout.x; - if (ny < sd->layout.y) ny = sd->layout.y; + /* repack into the grid with updated position */ + evas_object_grid_pack(sd->grid.obj, mon, sd->current.x, sd->current.y, + sd->current.w, sd->current.h); - /* constrain to the layout bounds */ - if ((nx + mw) > sd->layout.vw) - nx = (sd->layout.vw - mw); - if ((ny + mh) > sd->layout.vh) - ny = (sd->layout.vh - mh); + /* set monitor position text */ + _e_smart_monitor_position_set(sd, sd->current.x, sd->current.y); - if ((nx != mx) || (ny != my)) - { - /* actually move the monitor */ - e_layout_child_move(mon, nx, ny); + /* update changes */ + if ((sd->crtc.x != sd->current.x) || (sd->crtc.y != sd->current.y)) + sd->changes |= E_SMART_MONITOR_CHANGED_POSITION; + else + sd->changes &= ~(E_SMART_MONITOR_CHANGED_POSITION); - /* send monitor moving signal */ - evas_object_smart_callback_call(mon, "monitor_moving", NULL); - } + evas_object_smart_callback_call(mon, "monitor_moved", NULL); } static void -_e_smart_monitor_resize_event(E_Smart_Data *sd, Evas_Object *mon, void *event) +_e_smart_monitor_thumb_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event) { - Evas_Event_Mouse_Move *ev; - Evas_Coord dx = 0, dy = 0; - Evas_Coord mw = 0, mh = 0; - Evas_Coord nw = 0, nh = 0; - Ecore_X_Randr_Mode_Info *mode = NULL; - - /* check for valid smart data */ - if (!sd) return; + Evas_Event_Mouse_Down *ev; + Evas_Object *mon; + E_Smart_Data *sd; - /* if this monitor is cloned into another one, then do not process - * any mouse move events */ - if (sd->current.cloned) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); ev = event; + if (ev->button != 1) return; - /* factor in drag resistance to movement and if we have not moved the - * mouse enough, then get out */ - dx = (sd->resize.x - ev->cur.canvas.x); - dy = (sd->resize.y - ev->cur.canvas.y); - if (((dx * dx) + (dy * dy)) < - (e_config->drag_resist * e_config->drag_resist)) - return; - - /* calculate resize difference based on mouse movement */ - dx = (ev->cur.canvas.x - ev->prev.canvas.x); - dy = (ev->cur.canvas.y - ev->prev.canvas.y); - - if ((dx == 0) && (dy == 0)) return; - - /* TODO: FIXME: Handle case where monitor is rotated */ - - /* convert monitor size to canvas coords */ - e_layout_coord_virtual_to_canvas(sd->layout.obj, - sd->current.w, sd->current.h, &mw, &mh); - - /* factor in the resize difference and convert to virtual coords */ - e_layout_coord_canvas_to_virtual(sd->layout.obj, - (mw + dx), (mh + dy), &nw, &nh); - - if (nw < sd->min.w) nw = sd->min.w; - if (nw > sd->max.w) nw = sd->max.w; - if (nh < sd->min.h) nh = sd->min.h; - if (nh > sd->max.h) nh = sd->max.h; - - /* check if size already matches, if so we have nothing to do */ - if ((nw == (int)sd->current.mode->width) && - (nh == (int)sd->current.mode->height)) - return; - - /* TODO: Make both types of resizing here (freeform and snap) a - * checkbox option on the dialog maybe ?? */ - -// ************************* BEGIN FREEFORM RESIZING ************************ -#if 0 - /* actually resize the monitor (freeform) */ - e_layout_child_resize(mon, nw, nh); -#endif -// ************************* END FREEFORM RESIZING ************************** + /* try to get the monitor object */ + if (!(mon = data)) return; - /* reset current size to match */ - sd->current.w = nw; - sd->current.h = nh; + /* try to get the monitor smart data */ + if (!(sd = evas_object_smart_data_get(mon))) return; -// ************************* BEGIN SNAP RESIZING ************************ + /* set mouse pointer */ + _e_smart_monitor_pointer_push(obj, "move"); - /* find the next nearest resolution to this new size */ - if ((mode = _e_smart_monitor_resolution_get(sd, nw, nh, EINA_FALSE))) - { - /* reset current mode to match */ - sd->current.mode = mode; + /* set moving flag */ + sd->moving = EINA_TRUE; - /* actually resize the monitor (snap) */ - e_layout_child_resize(mon, mode->width, mode->height); + /* record the clicked position */ + sd->mx = ev->canvas.x; + sd->my = ev->canvas.y; - /* set the resolution text */ - _e_smart_monitor_resolution_set(sd, mode->width, mode->height); - } + /* record current size of monitor */ + evas_object_grid_pack_get(sd->grid.obj, mon, + &sd->prev.x, &sd->prev.y, + &sd->prev.w, &sd->prev.h); -// ************************* END SNAP RESIZING ************************** + /* raise the monitor */ + evas_object_raise(mon); } static void -_e_smart_monitor_rotate_event(E_Smart_Data *sd, Evas_Object *mon EINA_UNUSED, void *event) +_e_smart_monitor_frame_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) { - Evas_Event_Mouse_Move *ev; - int rotation = 0; - - /* check for valid smart data */ - if (!sd) return; - - /* if this monitor is cloned into another one, then do not process - * any mouse move events */ - if (sd->current.cloned) return; - - ev = event; - - /* get amount of rotation from the mouse event */ - rotation = _e_smart_monitor_rotation_amount_get(sd, ev); - - /* if we have no rotation to map, get out */ - if (rotation == 0) return; - - /* factor in any existing rotation */ - rotation += sd->current.rotation; - rotation %= 360; + Evas_Object *mon; + E_Smart_Data *sd; - /* update rotation value */ - sd->current.rotation = rotation; +// LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* apply existing rotation */ - _e_smart_monitor_map_apply(sd->o_frame, sd->current.rotation); + /* try to get the monitor object */ + if (!(mon = data)) return; - /* NB: The 'snapping' of this rotation (in relation to other monitors) - * occurs in the randr widget so we will just - * raise a signal here to tell it that we rotated */ + /* try to get the monitor smart data */ + if (!(sd = evas_object_smart_data_get(mon))) return; - /* NB: For now, don't send this signal here. We will send it when the - * user is finished rotating */ + /* if the monitor is disabled, get out */ + /* if (!sd->current.enabled) return; */ - /* send monitor rotated signal */ - /* evas_object_smart_callback_call(mon, "monitor_rotated", NULL); */ + /* call appropriate function based on current action */ + if (sd->resizing) + _e_smart_monitor_resize_event(sd, mon, event); + else if (sd->rotating) + _e_smart_monitor_rotate_event(sd, mon, event); + else if (sd->moving) + _e_smart_monitor_move_event(sd, mon, event); } -/* local callbacks */ static void -_e_smart_monitor_cb_refresh_rate_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) +_e_smart_monitor_frame_cb_resize_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - Evas_Object *mon; - E_Smart_Data *sd; - Ecore_X_Randr_Mode_Info *mode = NULL; - Eina_List *l = NULL; - - if (!(mon = data)) return; - - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(mon))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* loop the modes and find the current one */ - EINA_LIST_FOREACH(sd->modes, l, mode) - { - /* compare mode names */ - if (!strcmp(mode->name, sd->current.mode->name)) - { - int rate = 0; - - /* get the refresh rate for this mode */ - rate = (int)_e_smart_monitor_refresh_rate_get(mode); + /* set the mouse pointer to indicate we can be resized */ + _e_smart_monitor_pointer_push(obj, "resize_br"); +} - /* compare to the currently requested refresh rate */ - if (rate == sd->current.refresh_rate) - { - /* set new mode */ - sd->current.mode = mode; +static void +_e_smart_monitor_frame_cb_resize_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) +{ + LOGFN(__FILE__, __LINE__, __FUNCTION__); - break; - } - } - } + /* set the mouse pointer back to default */ + _e_smart_monitor_pointer_pop(obj, "resize_br"); +} - /* update changes */ - if (sd->orig.refresh_rate != sd->current.refresh_rate) - sd->changes |= E_SMART_MONITOR_CHANGED_REFRESH; - else - sd->changes &= ~(E_SMART_MONITOR_CHANGED_REFRESH); +static void +_e_smart_monitor_frame_cb_rotate_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) +{ + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* send monitor changed signal */ - evas_object_smart_callback_call(mon, "monitor_changed", NULL); + /* set the mouse pointer to indicate we can be rotated */ + _e_smart_monitor_pointer_push(obj, "rotate"); } static void -_e_smart_monitor_frame_cb_mouse_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event) +_e_smart_monitor_frame_cb_rotate_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - Evas_Object *mon; - E_Smart_Data *sd; - - /* try to get the objects smart data */ - if (!(mon = data)) return; - if (!(sd = evas_object_smart_data_get(mon))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* call appropriate functions based on current action */ - if (sd->moving) - _e_smart_monitor_move_event(sd, mon, event); - else if (sd->resizing) - _e_smart_monitor_resize_event(sd, mon, event); - else if (sd->rotating) - _e_smart_monitor_rotate_event(sd, mon, event); + /* set the mouse pointer back to default */ + _e_smart_monitor_pointer_pop(obj, "rotate"); } static void -_e_smart_monitor_frame_cb_resize_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) +_e_smart_monitor_frame_cb_indicator_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - /* try to set the pointer to indicate we can be resized */ - _e_smart_monitor_pointer_push(obj, "resize_br"); + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* set the mouse pointer to indicate we can be toggled */ + _e_smart_monitor_pointer_push(obj, "plus"); } static void -_e_smart_monitor_frame_cb_resize_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) +_e_smart_monitor_frame_cb_indicator_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { - /* try to reset the pointer back to default */ - _e_smart_monitor_pointer_pop(obj, "resize_br"); + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* set the mouse pointer back to default */ + _e_smart_monitor_pointer_pop(obj, "plus"); } static void @@ -1978,22 +1808,32 @@ _e_smart_monitor_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED, Evas_Object *mon; E_Smart_Data *sd; - /* try to get the objects smart data */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* try to get the monitor object */ if (!(mon = data)) return; + + /* try to get the monitor smart data */ if (!(sd = evas_object_smart_data_get(mon))) return; - /* record mouse position for drag resistance */ - evas_pointer_canvas_xy_get(sd->evas, &sd->resize.x, &sd->resize.y); + /* record current position of mouse */ + evas_pointer_canvas_xy_get(sd->evas, &sd->rx, &sd->ry); - /* get monitor geometry */ - e_layout_child_geometry_get(mon, NULL, NULL, - &sd->current.w, &sd->current.h); + /* record current size of monitor */ + evas_object_grid_pack_get(sd->grid.obj, mon, + &sd->current.x, &sd->current.y, + &sd->current.w, &sd->current.h); - /* raise this monitor */ - e_layout_child_raise(mon); + sd->prev.x = sd->current.x; + sd->prev.y = sd->current.y; + sd->prev.w = sd->current.w; + sd->prev.h = sd->current.h; /* set resizing flag */ sd->resizing = EINA_TRUE; + + /* raise the monitor */ + evas_object_raise(mon); } static void @@ -2002,63 +1842,59 @@ _e_smart_monitor_frame_cb_resize_stop(void *data, Evas_Object *obj EINA_UNUSED, Evas_Object *mon; E_Smart_Data *sd; - /* try to get the objects smart data */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* try to get the monitor object */ if (!(mon = data)) return; + + /* try to get the monitor smart data */ if (!(sd = evas_object_smart_data_get(mon))) return; + /* record current size of monitor */ + evas_object_grid_pack_get(sd->grid.obj, mon, NULL, NULL, + &sd->current.w, &sd->current.h); + /* set resizing flag */ sd->resizing = EINA_FALSE; - /* update the changes flag */ - if (sd->orig.mode) - { - if (sd->orig.mode->xid != sd->current.mode->xid) - sd->changes |= E_SMART_MONITOR_CHANGED_RESOLUTION; - else - sd->changes &= ~(E_SMART_MONITOR_CHANGED_RESOLUTION); - } + /* update changes */ + if ((sd->crtc.mode != sd->current.mode)) + sd->changes |= E_SMART_MONITOR_CHANGED_MODE; else - sd->changes |= E_SMART_MONITOR_CHANGED_RESOLUTION; - - /* NB: The 'snapping' of this resize (in relation to other monitors) - * occurs in the randr widget so we will just - * raise a signal here to tell it that we resized */ + sd->changes &= ~(E_SMART_MONITOR_CHANGED_MODE); - /* send monitor resized signal */ evas_object_smart_callback_call(mon, "monitor_resized", NULL); } -static void -_e_smart_monitor_frame_cb_rotate_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) -{ - /* try to set the pointer to indicate rotation */ - _e_smart_monitor_pointer_push(obj, "rotate"); -} - -static void -_e_smart_monitor_frame_cb_rotate_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) -{ - /* try to set the pointer to indicate rotation */ - _e_smart_monitor_pointer_pop(obj, "rotate"); -} - static void _e_smart_monitor_frame_cb_rotate_start(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { Evas_Object *mon; E_Smart_Data *sd; - /* try to get the objects smart data */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* try to get the monitor object */ if (!(mon = data)) return; + + /* try to get the monitor smart data */ if (!(sd = evas_object_smart_data_get(mon))) return; - /* raise this monitor */ - e_layout_child_raise(mon); + /* reset the degree of rotation */ + sd->current.rotation = 0; - /* set rotating flag */ - sd->rotating = EINA_TRUE; + /* record current size of monitor */ + evas_object_grid_pack_get(sd->grid.obj, mon, + &sd->current.x, &sd->current.y, + &sd->current.w, &sd->current.h); + + sd->prev.x = sd->current.x; + sd->prev.y = sd->current.y; + sd->prev.w = sd->current.w; + sd->prev.h = sd->current.h; - sd->orig.rotation = _e_smart_monitor_rotation_get(sd->current.orientation); + /* set resizing flag */ + sd->rotating = EINA_TRUE; } static void @@ -2066,30 +1902,21 @@ _e_smart_monitor_frame_cb_rotate_stop(void *data, Evas_Object *obj EINA_UNUSED, { Evas_Object *mon; E_Smart_Data *sd; - Ecore_X_Randr_Orientation orient; - Evas_Coord nx = 0, ny = 0; - Evas_Coord nw = 0, nh = 0; - int rot = 0; + int rotation = 0, rot = 0; + Ecore_X_Randr_Orientation orient = 0; + Evas_Coord nx = 0, ny = 0, nw = 0, nh = 0; - /* try to get the objects smart data */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* try to get the monitor object */ if (!(mon = data)) return; + + /* try to get the monitor smart data */ if (!(sd = evas_object_smart_data_get(mon))) return; /* set rotating flag */ sd->rotating = EINA_FALSE; - sd->current.rotation += sd->orig.rotation; - - /* get the orientation that this monitor would be in */ - orient = _e_smart_monitor_orientation_get(sd->current.rotation); - - /* if the orientation matches, then no changes have occured and we can - * get out of here */ - if (sd->current.orientation == orient) return; - - /* grab the current geometry */ - e_layout_child_geometry_get(mon, &nx, &ny, &nw, &nh); - /* get the degrees of rotation based on this orient * * NB: I know this seems redundant but it is needed however. The @@ -2100,98 +1927,100 @@ _e_smart_monitor_frame_cb_rotate_stop(void *data, Evas_Object *obj EINA_UNUSED, * EX: User manually rotates to 80 degrees. We take that 80 and * factor in some fuziness to get 90 degrees. We need to take that 90 * and return an 'orientation' */ - rot = _e_smart_monitor_rotation_get(orient); - if (rot != sd->current.rotation) - { - /* update rotation value */ - sd->current.rotation = rot; - } + rotation = _e_smart_monitor_rotation_get(sd->current.orient); - /* snap the monitor to this rotation */ + /* get current orientation based on rotation */ + orient = _e_smart_monitor_orientation_get(sd->current.rotation + rotation); - /* check orientation */ - if ((orient == ECORE_X_RANDR_ORIENTATION_ROT_90) || - (orient == ECORE_X_RANDR_ORIENTATION_ROT_270)) - { - if ((sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_90) || - (sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_270)) - { - int sx = 0, sy = 0; + rot = _e_smart_monitor_rotation_get(orient); - /* resize monitor object based on rotation */ - e_layout_child_resize(mon, nh, nw); + /* if we just flipped axis, we can remove map and get out */ + if (((sd->current.rotation + rotation) % 180) == 0) + { + /* remove the map from the frame so that controls revert to normal */ + evas_object_map_set(sd->o_frame, NULL); + evas_object_map_enable_set(sd->o_frame, EINA_FALSE); - /* set the resolution text */ - _e_smart_monitor_resolution_set(sd, sd->current.mode->height, - sd->current.mode->width); + /* apply rotation map */ + _e_smart_monitor_thumb_map_apply(sd->o_thumb, rot); - /* grab the current geometry */ - /* e_layout_child_geometry_get(mon, &nx, &ny, &nw, &nh); */ + /* update the orientation */ + sd->current.orient = orient; - /* sx = ((nh - nw) / 2); */ - /* sy = ((nw - nh) / 2); */ + goto ret; + } - sx = ((nw - nh) / 2); - sy = ((nh - nw) / 2); + /* remove the map */ + evas_object_map_set(sd->o_frame, NULL); + evas_object_map_enable_set(sd->o_frame, EINA_FALSE); - /* e_layout_child_geometry_get(mon, &nx, &ny, NULL, NULL); */ - nx -= (sx + sd->layout.x); - ny -= (sy - sd->layout.y); + nx = sd->current.x; + ny = sd->current.y; - /* NB: Hmmm, should this also raise a moved signal ?? */ - e_layout_child_move(mon, nx, ny); + /* calculate new size based on orientation */ + if ((orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || + (orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) + { + if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) + { + nw = sd->current.w; + nh = sd->current.h; + } + else if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_90) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_270)) + { + nw = sd->current.h; + nh = sd->current.w; } } - else if ((orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || - (orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) + else if ((orient == ECORE_X_RANDR_ORIENTATION_ROT_90) || + (orient == ECORE_X_RANDR_ORIENTATION_ROT_270)) { - if ((sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_0) || - (sd->current.orientation != ECORE_X_RANDR_ORIENTATION_ROT_180)) + if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_90) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_270)) { - /* resize monitor object based on rotation */ - e_layout_child_resize(mon, nh, nw); - - /* set the resolution text */ - _e_smart_monitor_resolution_set(sd, sd->current.mode->width, - sd->current.mode->height); - - /* NB: Hmmm, should this also raise a moved signal ?? */ - e_layout_child_move(mon, sd->current.x, sd->current.y); + nw = sd->current.w; + nh = sd->current.h; + } + else if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) + { + nw = sd->current.h; + nh = sd->current.w; } } - /* update the changes flag */ - if (sd->orig.orientation != orient) - sd->changes |= E_SMART_MONITOR_CHANGED_ROTATION; - else - sd->changes &= ~(E_SMART_MONITOR_CHANGED_ROTATION); + /* make sure new size and position are within the grid */ + if ((nx + nw) > sd->grid.vw) nx = (sd->grid.vw - nw); + if ((ny + nh) > sd->grid.vh) ny = (sd->grid.vh - nh); - /* NB: The 'snapping' of this rotation occurs in the randr widget - * so we will just raise a signal here to tell it that we rotated */ + /* repack monitor into grid at new location & size */ + evas_object_grid_pack(sd->grid.obj, mon, nx, ny, nw, nh); - /* send monitor rotated signal */ - evas_object_smart_callback_call(mon, "monitor_rotated", NULL); + /* update resolution text */ + _e_smart_monitor_resolution_set(sd, nw, nh); - /* remove the currently applied map so that the background and - * text get reset to a "normal" orientation */ - _e_smart_monitor_map_remove(sd, orient); + /* apply rotation map */ + _e_smart_monitor_thumb_map_apply(sd->o_thumb, rot); /* update current orientation */ - sd->current.orientation = orient; -} + sd->current.orient = orient; -static void -_e_smart_monitor_frame_cb_indicator_in(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) -{ - /* try to set the pointer to indicate we can be clicked */ - _e_smart_monitor_pointer_push(obj, "plus"); -} + /* update geometry */ + sd->current.x = nx; + sd->current.y = ny; + sd->current.w = nw; + sd->current.h = nh; -static void -_e_smart_monitor_frame_cb_indicator_out(void *data EINA_UNUSED, Evas_Object *obj, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) -{ - /* try to reset the pointer back to default */ - _e_smart_monitor_pointer_pop(obj, "plus"); +ret: + /* update changes */ + if ((sd->crtc.orient != sd->current.orient)) + sd->changes |= E_SMART_MONITOR_CHANGED_ORIENTATION; + else + sd->changes &= ~(E_SMART_MONITOR_CHANGED_ORIENTATION); + + evas_object_smart_callback_call(mon, "monitor_resized", NULL); } static void @@ -2200,168 +2029,496 @@ _e_smart_monitor_frame_cb_indicator_toggle(void *data, Evas_Object *obj EINA_UNU Evas_Object *mon; E_Smart_Data *sd; - /* try to get the objects smart data */ + LOGFN(__FILE__, __LINE__, __FUNCTION__); + if (!(mon = data)) return; + + /* try to get the monitor smart data */ if (!(sd = evas_object_smart_data_get(mon))) return; + /* check current enabled value */ if (sd->current.enabled) { - /* if we Were enabled, switch to disabled and tell the edj object */ + /* toggle value */ sd->current.enabled = EINA_FALSE; + + /* tell frame edje object it is now disabled */ edje_object_signal_emit(sd->o_frame, "e,state,disabled", "e"); } else { - /* if we Were disabled, switch to enabled and tell the edj object */ + /* toggle value */ sd->current.enabled = EINA_TRUE; + + /* tell frame edje object it is now disabled */ edje_object_signal_emit(sd->o_frame, "e,state,enabled", "e"); } - /* update the changes flag */ - if (sd->orig.enabled != sd->current.enabled) + /* update changes */ + if ((sd->crtc.enabled != sd->current.enabled)) sd->changes |= E_SMART_MONITOR_CHANGED_ENABLED; else sd->changes &= ~(E_SMART_MONITOR_CHANGED_ENABLED); - /* NB: The 'enabling' of this monitor occurs in the randr widget - * so we will just raise a signal here to tell it that we toggled */ - - /* send monitor changed signal */ evas_object_smart_callback_call(mon, "monitor_changed", NULL); } static void -_e_smart_monitor_thumb_cb_mouse_in(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) +_e_smart_monitor_refresh_rate_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { - /* try to set the pointer to indicate we can be clicked */ - _e_smart_monitor_pointer_push(obj, "hand"); -} + Evas_Object *mon; + E_Smart_Data *sd; + Ecore_X_Window root = 0; + Eina_List *m = NULL; + Ecore_X_Randr_Mode_Info *cmode = NULL, *mode = NULL; -static void -_e_smart_monitor_thumb_cb_mouse_out(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) -{ - /* try to reset the pointer back to default */ - _e_smart_monitor_pointer_pop(obj, "hand"); + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + if (!(mon = data)) return; + + /* try to get the monitor smart data */ + if (!(sd = evas_object_smart_data_get(mon))) return; + + /* try to get the root window */ + root = ecore_x_window_root_first_get(); + + /* try to get current mode info */ + if (!(cmode = ecore_x_randr_mode_info_get(root, sd->current.mode))) + return; + + /* loop the modes and find the current one */ + EINA_LIST_FOREACH(sd->modes, m, mode) + { + /* compare mode names */ + if (!strcmp(cmode->name, mode->name)) + { + int rate = 0; + + /* get the refresh rate for this mode */ + rate = (int)_e_smart_monitor_mode_refresh_rate_get(mode); + + /* compare refresh rates */ + if (rate == sd->current.refresh_rate) + { + /* set new mode */ + sd->current.mode = mode->xid; + break; + } + } + } + + /* free any memory allocated from ecore_x_randr */ + if (cmode) ecore_x_randr_mode_info_free(cmode); + + /* update changes */ + if ((sd->crtc.mode != sd->current.mode)) + sd->changes |= E_SMART_MONITOR_CHANGED_MODE; + else + sd->changes &= ~(E_SMART_MONITOR_CHANGED_MODE); + + evas_object_smart_callback_call(mon, "monitor_changed", NULL); } static void -_e_smart_monitor_thumb_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event) +_e_smart_monitor_resize_event(E_Smart_Data *sd, Evas_Object *mon, void *event) { - Evas_Event_Mouse_Down *ev; + Evas_Event_Mouse_Move *ev; + Evas_Coord dx = 0, dy = 0; + Evas_Coord cw = 0, ch = 0; + Evas_Coord nw = 0, nh = 0; + Ecore_X_Randr_Mode_Info *mode = NULL; + +// LOGFN(__FILE__, __LINE__, __FUNCTION__); ev = event; - if (ev->button == 1) + + /* check for valid mouse movement + * + * NB: This smells quite odd to me. How can we get a mouse_move event + * (and end up in here) when the coordinates say otherwise ?? + * Must be a synthetic event and we are not interested in those */ + if ((ev->cur.canvas.x == ev->prev.canvas.x) && + (ev->cur.canvas.y == ev->prev.canvas.y)) + return; + + /* calculate difference in mouse movement */ + dx = (sd->rx - ev->cur.canvas.x); + dy = (sd->ry - ev->cur.canvas.y); + + /* factor in drag resistance to measure movement */ + if (((dx * dx) + (dy * dy)) < + (e_config->drag_resist * e_config->drag_resist)) + return; + + dx = (ev->cur.canvas.x - ev->prev.canvas.x); + dy = (ev->cur.canvas.y - ev->prev.canvas.y); + + /* convert monitor size to canvas size */ + _e_smart_monitor_coord_virtual_to_canvas(sd, sd->current.w, sd->current.h, + &cw, &ch); + + /* factor in resize difference and convert to virtual */ + _e_smart_monitor_coord_canvas_to_virtual(sd, (cw + dx), (ch + dy), + &nw, &nh); + + /* update current size values */ + sd->current.w = nw; + sd->current.h = nh; + + /* based on orientation, try to find a valid mode */ + if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_0) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_180)) + mode = _e_smart_monitor_mode_find(sd, sd->current.w, + sd->current.h, EINA_TRUE); + else + mode = _e_smart_monitor_mode_find(sd, sd->current.h, + sd->current.w, EINA_TRUE); + + if (mode) { - Evas_Object *mon; - E_Smart_Data *sd; + Evas_Coord mw = 0, mh = 0; - /* try to get the objects smart data */ - if (!(mon = data)) return; - if (!(sd = evas_object_smart_data_get(mon))) return; + mw = mode->width; + mh = mode->height; - /* if this event is not on a cloned monitor */ - if (!sd->current.cloned) + /* if we are rotated, we need to swap sizes */ + if ((sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_90) || + (sd->current.orient == ECORE_X_RANDR_ORIENTATION_ROT_270)) { - /* try to set the mouse pointer to indicate moving */ - _e_smart_monitor_pointer_push(obj, "move"); + mw = mode->height; + mh = mode->width; + } - /* get the current geometry of this monitor and record it */ - e_layout_child_geometry_get(mon, &sd->cx, &sd->cy, - &sd->cw, &sd->ch); + /* update current mode */ + sd->current.mode = mode->xid; - /* set moving flag */ - sd->moving = EINA_TRUE; + /* update refresh rate */ + sd->current.refresh_rate = + (int)_e_smart_monitor_mode_refresh_rate_get(mode); - /* raise this monitor */ - e_layout_child_raise(mon); - } + /* if ((sd->current.x + mw) > sd->grid.vw) */ + /* sd->current.x = (sd->grid.vw - mw); */ + + /* if ((sd->current.h + mh) > sd->grid.vh) */ + /* sd->current.y = (sd->grid.vh - mh); */ + + /* update monitor size in the grid */ + evas_object_grid_pack(sd->grid.obj, mon, + sd->current.x, sd->current.y, mw, mh); + + /* update resolution text */ + _e_smart_monitor_resolution_set(sd, mw, mh); } } static void -_e_smart_monitor_thumb_cb_mouse_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event) +_e_smart_monitor_rotate_event(E_Smart_Data *sd, Evas_Object *mon EINA_UNUSED, void *event) { - Evas_Event_Mouse_Up *ev; + Evas_Event_Mouse_Move *ev; + int rotation = 0; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); ev = event; - if (ev->button == 1) - { - Evas_Object *mon; - E_Smart_Data *sd; - /* try to get the objects smart data */ - if (!(mon = data)) return; - if (!(sd = evas_object_smart_data_get(mon))) return; + /* get the amount of rotation from the mouse event */ + rotation = _e_smart_monitor_rotation_amount_get(sd, ev); - /* check if this is a cloned monitor */ - if (sd->current.cloned) - { - /* un-clone this monitor */ - e_smart_monitor_clone_del(sd->parent, mon); + /* if we have no rotation to map, get out */ + if (rotation == 0) return; - /* done here. exit the function */ - return; - } + /* factor in any existing rotation */ + rotation %= 360; - /* try to set the mouse pointer to indicate moving is done */ - _e_smart_monitor_pointer_pop(obj, "move"); + /* update current rotation value */ + sd->current.rotation = rotation; - /* set moving state */ - sd->moving = EINA_FALSE; + /* apply rotation map */ + _e_smart_monitor_frame_map_apply(sd->o_frame, sd->current.rotation); +} - if ((sd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_0) || - (sd->current.orientation == ECORE_X_RANDR_ORIENTATION_ROT_180)) - { - Evas_Coord nx = 0, ny = 0; +static void +_e_smart_monitor_move_event(E_Smart_Data *sd, Evas_Object *mon, void *event) +{ + Evas_Event_Mouse_Move *ev; + Evas_Coord dx = 0, dy = 0; + Evas_Coord nx = 0, ny = 0; + Evas_Coord px = 0, py = 0; + Evas_Object *obj; - /* get current geometry */ - e_layout_child_geometry_get(mon, &nx, &ny, NULL, NULL); + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* check if geometry has actually been changed */ - if ((sd->current.x != nx) || (sd->current.y != ny)) - { - /* update current geometry */ - sd->current.x = nx; - sd->current.y = ny; - } + ev = event; + + /* skip synthetic events */ + if ((ev->cur.output.x == ev->prev.output.x) && + (ev->cur.output.y == ev->prev.output.y)) + return; + + /* calculate difference in movement */ + dx = (ev->cur.output.x - ev->prev.output.x); + dy = (ev->cur.output.y - ev->prev.output.y); + + nx = (sd->x + dx); + ny = (sd->y + dy); + + /* make sure movement is restricted to be within the grid */ + if ((nx < sd->grid.x) || (ny < sd->grid.y)) return; + if (((nx + sd->w) > (sd->grid.x + sd->grid.w)) || + ((ny + sd->h) > (sd->grid.y + sd->grid.h))) + return; + + /* move the monitor */ + evas_object_move(mon, nx, ny); + + /* take current object position, translate to virtual */ + _e_smart_monitor_coord_canvas_to_virtual(sd, nx, ny, &px, &py); + + sd->current.x = px; + sd->current.y = py; + + /* set monitor position text */ + _e_smart_monitor_position_set(sd, px, py); + + /* any objects below this monitor ? */ + if ((obj = evas_object_below_get(mon))) + { + const char *type; + + /* compare object type and make sure it's a monitor */ + if (!(type = evas_object_type_get(obj))) return; + if (!strcmp(type, "smart_monitor")) + { + E_Smart_Data *osd; + Evas_Coord fx, fy, fw, fh; + + /* try to get the monitor smart data */ + if (!(osd = evas_object_smart_data_get(obj))) return; + if (!osd->visible) return; + + /* grab geometry of this frame */ + evas_object_geometry_get(osd->o_frame, &fx, &fy, &fw, &fh); + + /* determine if monitor is being dragged over another one */ + if (E_INSIDE(nx, ny, fx, fy, (fw / 2), (fh / 2))) + edje_object_signal_emit(osd->o_frame, "e,state,drop,on", "e"); + else if (E_INSIDE((nx + sd->w), ny, + (fx + (fw / 2)), fy, fw, (fh / 2))) + edje_object_signal_emit(osd->o_frame, "e,state,drop,on", "e"); + else + edje_object_signal_emit(osd->o_frame, "e,state,drop,off", "e"); } + } +} - /* update the changes flag */ - if ((sd->orig.x != sd->current.x) || (sd->orig.y != sd->current.y)) - sd->changes |= E_SMART_MONITOR_CHANGED_POSITION; - else - sd->changes &= ~(E_SMART_MONITOR_CHANGED_POSITION); +static int +_e_smart_monitor_rotation_amount_get(E_Smart_Data *sd, Evas_Event_Mouse_Move *ev) +{ + Evas_Coord cx = 0, cy = 0; + Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; + double a = 0.0, b = 0.0, c = 0.0, r = 0.0; + double ax = 0.0, ay = 0.0, bx = 0.0, by = 0.0; + double dotprod = 0.0; + double mx = 0.0, my = 0.0; + + /* return a single rotation amount based on + * mouse movement in both directions */ + + /* if there was no movement, return 0 + * + * NB: This smells quite odd to me. How can we get a mouse_move event + * (and end up in here) when the coordinates say otherwise ?? + * Must be a synthetic event and we are not interested in those */ + if ((ev->cur.output.x == ev->prev.output.x) && + (ev->cur.output.y == ev->prev.output.y)) + return 0; + + /* get the geometry of the frame */ + evas_object_geometry_get(sd->o_frame, &fx, &fy, &fw, &fh); + + /* get center point + * + * NB: This COULD be used to provide a greater amount of rotation + * depending on distance of movement from center */ + cx = (fx + (fw / 2)); + cy = (fy + (fh / 2)); + + mx = ev->cur.output.x; + my = ev->cur.output.y; + + ax = ((fx + fw) - cx); + ay = (fy - cy); + + bx = (mx - cx); + by = (my - cy); + + /* calculate degrees of rotation + * + * NB: A HUGE Thank You to Daniel for the help here !! */ + a = sqrt((ax * ax) + (ay * ay)); + b = sqrt((bx * bx) + (by * by)); + + c = sqrt((mx - (fx + fw)) * + (mx - (fx + fw)) + + (my - fy) * + (my - fy)); + + r = acos(((a * a) + (b * b) - (c * c)) / (2 * (a * b))); + r = r * 180 / M_PI; + + dotprod = ((ay * bx) + (-ax * by)); + if (dotprod > 0) r = 360 - r; + + return r; +} + +static inline int +_e_smart_monitor_rotation_get(Ecore_X_Randr_Orientation orient) +{ + /* return numerical rotation degree based on orientation */ + switch (orient) + { + case ECORE_X_RANDR_ORIENTATION_ROT_90: + return 90; + case ECORE_X_RANDR_ORIENTATION_ROT_180: + return 180; + case ECORE_X_RANDR_ORIENTATION_ROT_270: + return 270; + case ECORE_X_RANDR_ORIENTATION_ROT_0: + default: + return 0; + } +} + +static inline Ecore_X_Randr_Orientation +_e_smart_monitor_orientation_get(int rotation) +{ + rotation %= 360; + + /* find the closest orientation based on rotation within fuziness */ + if (((rotation - ROTATE_FUZZ) <= 0) || + ((rotation + ROTATE_FUZZ) <= 0)) + return ECORE_X_RANDR_ORIENTATION_ROT_0; + else if (((rotation - ROTATE_FUZZ) <= 90) || + ((rotation + ROTATE_FUZZ) <= 90)) + return ECORE_X_RANDR_ORIENTATION_ROT_90; + else if (((rotation - ROTATE_FUZZ) <= 180) || + ((rotation + ROTATE_FUZZ) <=180)) + return ECORE_X_RANDR_ORIENTATION_ROT_180; + else if (((rotation - ROTATE_FUZZ) <= 270) || + ((rotation + ROTATE_FUZZ) <= 270)) + return ECORE_X_RANDR_ORIENTATION_ROT_270; + else if (((rotation - ROTATE_FUZZ) < 360) || + ((rotation + ROTATE_FUZZ) < 360)) + return ECORE_X_RANDR_ORIENTATION_ROT_0; + + /* return a default */ + return ECORE_X_RANDR_ORIENTATION_ROT_0; +} - /* NB: The 'snapping' of this movement occurs in the randr widget - * so we will just raise a signal here to tell it that we moved */ +static void +_e_smart_monitor_frame_map_apply(Evas_Object *o_frame, int rotation) +{ + Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; + static Evas_Map *map = NULL; - /* send monitor moved signal */ - evas_object_smart_callback_call(mon, "monitor_moved", NULL); + /* create a new map if needed */ + if (!map) + { + map = evas_map_new(4); + evas_map_smooth_set(map, EINA_TRUE); + evas_map_alpha_set(map, EINA_TRUE); } + + /* get the frame geometry */ + evas_object_geometry_get(o_frame, &fx, &fy, &fw, &fh); + + /* setup map */ + evas_map_util_points_populate_from_geometry(map, fx, fy, fw, fh, rotation); + + /* apply current rotation */ + evas_map_util_rotate(map, rotation, (fx + (fw / 2)), (fy + (fh / 2))); + + /* tell the frame to use this map */ + evas_object_map_set(o_frame, map); + evas_object_map_enable_set(o_frame, EINA_TRUE); } static void -_e_smart_monitor_layout_cb_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) +_e_smart_monitor_thumb_map_apply(Evas_Object *o_thumb, int rotation) { - E_Smart_Data *sd; - Evas_Coord fx = 0, fy = 0, cx = 0, cy = 0; + Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; + static Evas_Map *map = NULL; - if (!(sd = data)) return; + /* create a new map if needed */ + if (!map) + { + map = evas_map_new(4); + evas_map_smooth_set(map, EINA_TRUE); + evas_map_alpha_set(map, EINA_TRUE); + } - /* get the layout's geometry and store it in our smart data structure */ - evas_object_geometry_get(sd->layout.obj, - &sd->layout.x, &sd->layout.y, NULL, NULL); + /* get the frame geometry */ + evas_object_geometry_get(o_thumb, &fx, &fy, &fw, &fh); - /* NB: This whole block below is needed because the layout may move - * AFTER the monitors have been placed, thus providing invalid - * monitor position text */ + /* setup map */ + evas_map_util_points_populate_from_geometry(map, fx, fy, fw, fh, rotation); + + /* apply current rotation */ + evas_map_util_rotate(map, rotation, (fx + (fw / 2)), (fy + (fh / 2))); - /* grab geometry of the frame */ - evas_object_geometry_get(sd->o_frame, &fx, &fy, NULL, NULL); + /* tell the frame to use this map */ + evas_object_map_set(o_thumb, map); + evas_object_map_enable_set(o_thumb, EINA_TRUE); +} - /* convert to virtual coordinates */ - e_layout_coord_canvas_to_virtual(sd->layout.obj, fx, fy, &cx, &cy); +static Ecore_X_Randr_Crtc +_e_smart_monitor_crtc_find(Ecore_X_Randr_Output output) +{ + Ecore_X_Randr_Crtc ret = 0; + Ecore_X_Window root = 0; + Ecore_X_Randr_Crtc *crtcs; + int ncrtcs = 0; - /* set monitor position text */ - _e_smart_monitor_position_set(sd, cx, cy); + /* get root window */ + root = ecore_x_window_root_first_get(); + + /* get possible crtcs for this output */ + if ((crtcs = ecore_x_randr_output_possible_crtcs_get(root, output, &ncrtcs))) + { + Ecore_X_Randr_Output *outputs; + int i = 0, noutputs = 0; + + for (i = 0; i < ncrtcs; i++) + { + int j = 0; + + /* get any outputs on this crtc */ + if (!(outputs = + ecore_x_randr_crtc_outputs_get(root, crtcs[i], &noutputs))) + ret = crtcs[i]; + else if (noutputs == 0) + ret = crtcs[i]; + else + { + /* loop the outputs */ + for (j = 0; j < noutputs; j++) + { + /* check if it is this output */ + if (outputs[j] == output) + { + ret = crtcs[i]; + break; + } + } + } + + free(outputs); + if (ret) break; + } + + free(crtcs); + } + + return ret; } diff --git a/src/modules/conf_randr/e_smart_monitor.h b/src/modules/conf_randr/e_smart_monitor.h index 24f622e422..7ed09a4a52 100644 --- a/src/modules/conf_randr/e_smart_monitor.h +++ b/src/modules/conf_randr/e_smart_monitor.h @@ -7,37 +7,30 @@ typedef enum _E_Smart_Monitor_Changes E_Smart_Monitor_Changes; enum _E_Smart_Monitor_Changes { E_SMART_MONITOR_CHANGED_NONE = 0, - E_SMART_MONITOR_CHANGED_CRTC = (1 << 0), - E_SMART_MONITOR_CHANGED_MODE = (1 << 1), - E_SMART_MONITOR_CHANGED_POSITION = (1 << 2), - E_SMART_MONITOR_CHANGED_ROTATION = (1 << 3), - E_SMART_MONITOR_CHANGED_REFRESH = (1 << 4), - E_SMART_MONITOR_CHANGED_RESOLUTION = (1 << 5), - E_SMART_MONITOR_CHANGED_ENABLED = (1 << 6), - E_SMART_MONITOR_CHANGED_CLONED = (1 << 7), + E_SMART_MONITOR_CHANGED_MODE = (1 << 0), + E_SMART_MONITOR_CHANGED_POSITION = (1 << 1), + E_SMART_MONITOR_CHANGED_ORIENTATION = (1 << 2), + E_SMART_MONITOR_CHANGED_ENABLED = (1 << 3), + E_SMART_MONITOR_CHANGED_PRIMARY = (1 << 4) }; Evas_Object *e_smart_monitor_add(Evas *evas); -void e_smart_monitor_output_set(Evas_Object *obj, E_Randr_Output_Info *output); -E_Randr_Output_Info *e_smart_monitor_output_get(Evas_Object *obj); -void e_smart_monitor_crtc_set(Evas_Object *obj, E_Randr_Crtc_Info *crtc); -void e_smart_monitor_layout_set(Evas_Object *obj, Evas_Object *layout); -Evas_Object *e_smart_monitor_layout_get(Evas_Object *obj); -void e_smart_monitor_setup(Evas_Object *obj); -E_Smart_Monitor_Changes e_smart_monitor_changes_get(Evas_Object *obj); -void e_smart_monitor_changes_reset(Evas_Object *obj); -void e_smart_monitor_changes_apply(Evas_Object *obj); - +void e_smart_monitor_crtc_set(Evas_Object *obj, Ecore_X_Randr_Crtc crtc, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch); +Ecore_X_Randr_Crtc e_smart_monitor_crtc_get(Evas_Object *obj); +void e_smart_monitor_output_set(Evas_Object *obj, Ecore_X_Randr_Output output); +void e_smart_monitor_grid_set(Evas_Object *obj, Evas_Object *grid, Evas_Coord gx, Evas_Coord gy, Evas_Coord gw, Evas_Coord gh); +void e_smart_monitor_grid_virtual_size_set(Evas_Object *obj, Evas_Coord vw, Evas_Coord vh); +void e_smart_monitor_background_set(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy); +void e_smart_monitor_current_geometry_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); void e_smart_monitor_current_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); -Ecore_X_Randr_Orientation e_smart_monitor_current_orientation_get(Evas_Object *mon); -Ecore_X_Randr_Mode_Info *e_smart_monitor_current_mode_get(Evas_Object *obj); -Eina_Bool e_smart_monitor_current_enabled_get(Evas_Object *obj); - -void e_smart_monitor_clone_add(Evas_Object *obj, Evas_Object *mon); -void e_smart_monitor_clone_del(Evas_Object *obj, Evas_Object *mon); -void e_smart_monitor_cloned_set(Evas_Object *obj, Eina_Bool cloned); -void e_smart_monitor_drop_zone_set(Evas_Object *obj, Eina_Bool can_drop); -void e_smart_monitor_frame_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); +void e_smart_monitor_previous_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); +void e_smart_monitor_clone_set(Evas_Object *obj, Evas_Object *parent); +Evas_Object *e_smart_monitor_clone_parent_get(Evas_Object *obj); +E_Smart_Monitor_Changes e_smart_monitor_changes_get(Evas_Object *obj); +Eina_Bool e_smart_monitor_changes_apply(Evas_Object *obj); +const char *e_smart_monitor_name_get(Evas_Object *obj); +Ecore_X_Randr_Output e_smart_monitor_output_get(Evas_Object *obj); +void e_smart_monitor_indicator_available_set(Evas_Object *obj, Eina_Bool available); # endif #endif diff --git a/src/modules/conf_randr/e_smart_randr.c b/src/modules/conf_randr/e_smart_randr.c index 235bca5a2a..91423afbff 100644 --- a/src/modules/conf_randr/e_smart_randr.c +++ b/src/modules/conf_randr/e_smart_randr.c @@ -3,24 +3,33 @@ #include "e_smart_randr.h" #include "e_smart_monitor.h" +#define SNAP_FUZZ 100 + +/* + * TODO: + * + * Add Poller for Output Change events to listen for hotplug (4 seconds) + * + */ + /* local structures */ typedef struct _E_Smart_Data E_Smart_Data; struct _E_Smart_Data { - /* scroll object */ - Evas_Object *o_scroll; + /* base object */ + Evas_Object *o_base; - /* layout object */ - Evas_Object *o_layout; + /* grid object */ + Evas_Object *o_grid; - /* list of monitor objects */ - Eina_List *monitors; - - /* changed flag */ - Eina_Bool changed : 1; + /* virtual size */ + Evas_Coord vw, vh; /* visible flag */ Eina_Bool visible : 1; + + /* list of monitors */ + Eina_List *monitors; }; /* local function prototypes */ @@ -32,25 +41,28 @@ static void _e_smart_show(Evas_Object *obj); static void _e_smart_hide(Evas_Object *obj); static void _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip); static void _e_smart_clip_unset(Evas_Object *obj); -static void _e_smart_randr_changed_set(Evas_Object *obj); -static int _e_smart_randr_modes_sort(const void *data1, const void *data2); - -static Evas_Object *_e_smart_randr_monitor_find(E_Smart_Data *sd, Ecore_X_Randr_Crtc xid); -static void _e_smart_randr_monitor_adjacent_move(E_Smart_Data *sd, Evas_Object *obj, Evas_Object *skip); +static void _e_smart_randr_grid_cb_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); +static void _e_smart_randr_grid_cb_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); -/* local callbacks prototypes for monitors */ -static void _e_smart_randr_monitor_cb_moving(void *data, Evas_Object *obj, void *event EINA_UNUSED); -static void _e_smart_randr_monitor_cb_moved(void *data, Evas_Object *obj, void *event EINA_UNUSED); -static void _e_smart_randr_monitor_cb_resized(void *data, Evas_Object *obj, void *event EINA_UNUSED); -static void _e_smart_randr_monitor_cb_rotated(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); -static void _e_smart_randr_monitor_cb_deleted(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED); +static Evas_Object *_e_smart_randr_monitor_crtc_find(E_Smart_Data *sd, Ecore_X_Randr_Crtc crtc); static void _e_smart_randr_monitor_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); +static void _e_smart_randr_monitor_cb_moved(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED); +static void _e_smart_randr_monitor_cb_resized(void *data, Evas_Object *obj, void *event EINA_UNUSED); + +static void _e_smart_randr_monitor_position_update(E_Smart_Data *sd, Evas_Object *obj, Evas_Object *skip); +static void _e_smart_randr_monitor_position_normalize(E_Smart_Data *sd); + +static void _e_smart_randr_monitor_preferred_mode_size_get(Ecore_X_Randr_Output output, Evas_Coord *mw, Evas_Coord *mh); +static Evas_Object *_e_smart_randr_clone_find(Ecore_X_Window root, Ecore_X_Randr_Output output, Ecore_X_Randr_Crtc crtc, Evas_Coord cx, Evas_Coord cy, E_Smart_Data *sd); +static Ecore_X_Randr_Crtc _e_smart_randr_crtc_find(Ecore_X_Randr_Output output); /* external functions exposed by this widget */ Evas_Object * e_smart_randr_add(Evas *evas) { + LOGFN(__FILE__, __LINE__, __FUNCTION__); + static Evas_Smart *smart = NULL; static const Evas_Smart_Class sc = { @@ -71,439 +83,304 @@ e_smart_randr_add(Evas *evas) } void -e_smart_randr_layout_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) +e_smart_randr_virtual_size_calc(Evas_Object *obj) { E_Smart_Data *sd; - Eina_List *l; - E_Randr_Crtc_Info *crtc; - Evas_Coord mw = 0, mh = 0; + Ecore_X_Window root = 0; + Ecore_X_Randr_Output *routputs; + Evas_Coord vw = 0, vh = 0; + int noutputs = 0; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* NB: The old code here used to get the modes from the e_randr_cfg. + * I changed it to get directly from Xrandr because of attempts to + * run this in Xephyr. Getting the information from e_randr_cfg was not + * practical in those cases */ /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* loop the crtcs, checking for valid output */ - EINA_LIST_FOREACH(E_RANDR_12->crtcs, l, crtc) - { - E_Randr_Output_Info *output; - Eina_List *outputs = NULL, *ll; + /* grab the root window */ + root = ecore_x_window_root_first_get(); - EINA_LIST_FOREACH(crtc->outputs, ll, output) - outputs = eina_list_append(outputs, output); + /* get list of outputs */ + if ((routputs = ecore_x_randr_outputs_get(root, &noutputs))) + { + int j = 0; + intptr_t *o; + Eina_List *outputs = NULL; - /* if this crtc is disabled, then no output will be assigned to it. - * - * We need to check the possible outputs and assign one */ - if (!crtc->current_mode) + for (j = 0; j < noutputs; j++) { - EINA_LIST_FOREACH(crtc->possible_outputs, ll, output) - { - if (!(eina_list_data_find(outputs, output) == output)) - { - if (!output->crtc) output->crtc = crtc; - if (output->crtc != crtc) continue; - outputs = eina_list_append(outputs, output); - } - } + Ecore_X_Randr_Connection_Status status = + ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN; + + status = + ecore_x_randr_output_connection_status_get(root, routputs[j]); + if (status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) continue; + + outputs = + eina_list_append(outputs, (intptr_t *)(long)routputs[j]); } - /* loop the outputs on this crtc */ - EINA_LIST_FOREACH(outputs, ll, output) + /* loop the outputs and get the largest mode */ + EINA_LIST_FREE(outputs, o) { - Eina_List *modes = NULL; - Ecore_X_Randr_Mode_Info *mode = NULL; + Ecore_X_Randr_Output output; + Ecore_X_Randr_Mode *modes; + Evas_Coord mw = 0, mh = 0; + int nmode = 0; - /* check for valid monitor */ - if (output->monitor) - { - /* try to get the list of modes */ - if (!(modes = eina_list_clone(output->monitor->modes))) - continue; + output = (int)(long)o; - /* sort the list of modes */ - modes = eina_list_sort(modes, 0, _e_smart_randr_modes_sort); + /* try to get the list of modes for this output */ + modes = + ecore_x_randr_output_modes_get(root, output, + &nmode, NULL); + if (!modes) continue; - /* get last mode */ - if ((mode = eina_list_last_data_get(modes))) - { - /* grab max mode size and add to return value */ - mw += mode->width; - mh += mode->height; - } - } - } - } + /* get the size of the largest mode */ + ecore_x_randr_mode_size_get(root, modes[0], &mw, &mh); - if (w) *w = mw; - if (h) *h = mh; -} + vw += MAX(mw, mh); + vh += MAX(mw, mh); -void -e_smart_randr_current_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) -{ - E_Smart_Data *sd; + /* free any allocated memory from ecore_x_randr */ + free(modes); + } - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; + free(routputs); + } - /* set the virtual size of the layout */ - e_layout_virtual_size_set(sd->o_layout, w, h); + if ((vw == 0) && (vh == 0)) + { + /* by default, set virtual size to the current screen size */ + ecore_x_randr_screen_current_size_get(root, &vw, &vh, NULL, NULL); + } - /* resize the layout widget - * - * NB: This is using an arbitrary scale of 1/10th the screen size */ - evas_object_resize(sd->o_layout, (w / 10), (h / 10)); + sd->vw = vw; + sd->vh = vh; + + /* set the grid size */ + evas_object_grid_size_set(sd->o_grid, vw, vh); } void e_smart_randr_monitors_create(Evas_Object *obj) { E_Smart_Data *sd; - Eina_List *l, *ll, *deferred = NULL; - E_Randr_Crtc_Info *crtc; - E_Randr_Output_Info *output; Evas *evas; + Ecore_X_Window root = 0; + Evas_Coord gx = 0, gy = 0, gw = 0, gh = 0; + Ecore_X_Randr_Output *outputs; + Evas_Object *mon; + Eina_List *l = NULL; + int noutputs = 0, count = 0; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); + + /* NB: The old code here used to get the outputs from the e_randr_cfg. + * I changed it to get directly from Xrandr because of attempts to + * run this in Xephyr. Getting the information from e_randr_cfg was not + * practical in those cases */ /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* get the canvas of the layout widget */ - evas = evas_object_evas_get(sd->o_layout); + /* grab the canvas of the grid object */ + evas = evas_object_evas_get(sd->o_grid); - /* loop the crtcs, checking for valid output */ - EINA_LIST_FOREACH(E_RANDR_12->crtcs, l, crtc) - { - Eina_List *outputs = NULL; + /* get the geometry of the grid */ + evas_object_geometry_get(sd->o_grid, &gx, &gy, &gw, &gh); - /* printf("Checking Crtc: %d\n", crtc->xid); */ - /* printf("\tGeom: %d %d %d %d\n", crtc->geometry.x, */ - /* crtc->geometry.y, crtc->geometry.w, crtc->geometry.h); */ + /* grab the root window */ + root = ecore_x_window_root_first_get(); - EINA_LIST_FOREACH(crtc->outputs, ll, output) - outputs = eina_list_append(outputs, output); + /* get a list of outputs from X */ + if ((outputs = ecore_x_randr_outputs_get(root, &noutputs))) + { + int i = 0; + Evas_Coord nx = 0; + Eina_List *connected = NULL; - /* if this crtc is disabled, then no output will be assigned to it. - * - * We need to check the possible outputs and assign one */ - if (!crtc->current_mode) + /* loop these outputs */ + for (i = 0; i < noutputs; i++) { - /* loop the possible outputs */ - EINA_LIST_FOREACH(crtc->possible_outputs, ll, output) - { - if (!(eina_list_data_find(outputs, output) == output)) - { - E_Randr_Crtc_Info *pcrtc = NULL; + Ecore_X_Randr_Crtc crtc = 0; + Evas_Coord mw = 0, mh = 0, crtcx = 0, crtcy = 0; + Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0; + Ecore_X_Randr_Connection_Status status = + ECORE_X_RANDR_CONNECTION_STATUS_UNKNOWN; + Ecore_X_Randr_Mode mode = 0; - if (!(pcrtc = - eina_list_last_data_get(output->possible_crtcs))) - continue; + /* ask X if this output is connected */ + status = + ecore_x_randr_output_connection_status_get(root, outputs[i]); - if (!output->crtc) output->crtc = pcrtc; - if ((output->crtc) && - (output->crtc != pcrtc)) continue; - outputs = eina_list_append(outputs, output); - } - } - } + /* if it's not connected, skip it */ + if (status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) + continue; - /* loop the outputs on this crtc */ - EINA_LIST_FOREACH(outputs, ll, output) - { - /* printf("\tChecking Output: %d %s\n", output->xid, output->name); */ - /* printf("\tOutput Policy: %d\n", output->policy); */ - /* printf("\tOutput Status: %d\n", output->connection_status); */ + connected = + eina_list_append(connected, (intptr_t *)(long)outputs[i]); + + /* for each output, try to create a monitor */ + if (!(mon = e_smart_monitor_add(evas))) + continue; + + /* hook into monitor changed callback */ + evas_object_smart_callback_add(mon, "monitor_changed", + _e_smart_randr_monitor_cb_changed, obj); + evas_object_smart_callback_add(mon, "monitor_moved", + _e_smart_randr_monitor_cb_moved, obj); + evas_object_smart_callback_add(mon, "monitor_resized", + _e_smart_randr_monitor_cb_resized, obj); + + /* add this monitor to our list */ + sd->monitors = eina_list_append(sd->monitors, mon); + + /* tell monitor what the grid's virtual size is */ + e_smart_monitor_grid_virtual_size_set(mon, sd->vw, sd->vh); + + /* tell monitor what the grid is and it's geometry */ + e_smart_monitor_grid_set(mon, sd->o_grid, gx, gy, gw, gh); - /* if (output->wired_clones) */ - /* printf("\tHAS WIRED CLONES !!\n"); */ + /* try to get the crtc of this output. If it does not have one + * we will try to find a usable one */ + if (!(crtc = ecore_x_randr_output_crtc_get(root, outputs[i]))) + crtc = _e_smart_randr_crtc_find(outputs[i]); - if (output->connection_status == - ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) + /* get the geometry for this crtc */ + ecore_x_randr_crtc_geometry_get(root, crtc, + &cx, &cy, &cw, &ch); + + e_smart_monitor_crtc_set(mon, crtc, cx, cy, cw, ch); + + mode = ecore_x_randr_crtc_mode_get(root, crtc); + + /* if this crtc has no mode, or it's size is 0, + * then it's disabled */ + if ((!mode) || ((cw == 0) && (ch == 0))) { - Evas_Object *mon = NULL, *pmon = NULL; - E_Randr_Crtc_Info *pcrtc = NULL; - - /* if we do not have a saved config yet, and the - * policy of this output is 'none' then this could be a - * first run situation. Because ecore_x_randr does not - * tell us proper output policies - * (as in ECORE_X_RANDR_OUTPUT_POLICY_CLONE) due to - * X not setting them, we need to determine manually - * if we are in a cloned situation here, and what output - * we are cloned to */ - if ((!e_config->randr_serialized_setup) && - ((output->policy == ECORE_X_RANDR_OUTPUT_POLICY_CLONE) || - (output->policy == ECORE_X_RANDR_OUTPUT_POLICY_NONE))) + /* get the size of the preferred mode for this output */ + _e_smart_randr_monitor_preferred_mode_size_get(outputs[i], + &mw, &mh); + if ((mw == 0) && (mh == 0)) + ecore_x_randr_crtc_size_get(root, crtc, &mw, &mh); + + /* safety */ + if ((mw == 0) && (mh == 0)) { - /* if we have a previous crtc, check if that is the - * one we are cloned to */ - if ((pcrtc = eina_list_data_get(eina_list_prev(l)))) - { - /* we have a previous crtc. compare geometry */ - if ((crtc->geometry.x == pcrtc->geometry.x) && - (crtc->geometry.y == pcrtc->geometry.y)) - { - pmon = - _e_smart_randr_monitor_find(sd, pcrtc->xid); - } - } + mw = 640; + mh = 480; } - /* else if we have an existing configuration and this - * output is set to cloned, then see if we can create the - * cloned representation */ - else if ((e_config->randr_serialized_setup) && - ((output->policy == ECORE_X_RANDR_OUTPUT_POLICY_CLONE) || - (output->policy == ECORE_X_RANDR_OUTPUT_POLICY_NONE))) - { - /* if we have a previous crtc, check if that is the - * one we are cloned to */ - if ((pcrtc = eina_list_data_get(eina_list_prev(l)))) - { - /* we have a previous crtc. compare geometry */ - if ((crtc->geometry.x == pcrtc->geometry.x) && - (crtc->geometry.y == pcrtc->geometry.y)) - { - pmon = - _e_smart_randr_monitor_find(sd, pcrtc->xid); - } - } - else - { - /* we have no previous monitor to clone this to yet - * add it to the deferred list and we will check it - * after everything has been setup */ - deferred = eina_list_append(deferred, output); - continue; - } - } - - if ((mon = e_smart_monitor_add(evas))) - { - Evas_Coord cx = 0, cy = 0; - Evas_Coord cw = 0, ch = 0; - /* add this monitor to the layout */ - e_smart_randr_monitor_add(obj, mon); + /* tell monitor what it's current position is + * NB: This also packs into the grid */ + e_smart_monitor_current_geometry_set(mon, nx, 0, mw, mh); - /* tell the monitor which layout it references */ - e_smart_monitor_layout_set(mon, sd->o_layout); + /* tell monitor to set the background preview */ + e_smart_monitor_background_set(mon, nx, 0); - /* tell the monitor which output it references */ - e_smart_monitor_output_set(mon, output); + crtcx = nx; + crtcy = 0; + nx += mw; + } + else + { + /* tell monitor what it's current position is + * NB: This also packs into the grid */ + e_smart_monitor_current_geometry_set(mon, cx, cy, + cw, ch); - /* tell the monitor which crtc it references */ - e_smart_monitor_crtc_set(mon, crtc); + /* tell monitor to set the background preview */ + e_smart_monitor_background_set(mon, cx, cy); - /* with the layout and output assigned, we can - * tell the monitor to setup - * - * NB: This means filling resolutions, getting - * refresh rates, displaying monitor name, etc... - * all the graphical stuff */ - e_smart_monitor_setup(mon); + crtcx = cx; + crtcy = cy; + nx += cw; + } - cx = crtc->geometry.x; - cy = crtc->geometry.y; - cw = crtc->geometry.w; - ch = crtc->geometry.h; + /* tell monitor what output it uses */ + e_smart_monitor_output_set(mon, outputs[i]); - if ((cw == 0) || (ch == 0)) - e_smart_monitor_current_geometry_get(mon, NULL, NULL, - &cw, &ch); + if (eina_list_count(connected) > 0) + { + intptr_t *o; + Evas_Object *pmon; - if (pmon) - { - /* set geometry so that when we "unclone" this - * one, it will unclone to the right */ - if (pcrtc) cx += pcrtc->geometry.w; - } + EINA_LIST_FOREACH(connected, l, o) + { + Ecore_X_Randr_Output out; - /* resize this monitor to it's current size */ - e_layout_child_resize(mon, cw, ch); + out = (int)(long)o; + if (out == outputs[i]) continue; - /* move this monitor to it's current location */ - e_layout_child_move(mon, cx, cy); + pmon = + _e_smart_randr_clone_find(root, out, crtc, + crtcx, crtcy, sd); - /* if we are cloned, then tell randr */ if (pmon) { - e_smart_monitor_cloned_set(mon, EINA_TRUE); - e_smart_monitor_clone_add(pmon, mon); + e_smart_monitor_clone_set(mon, pmon); + break; } } } } - } - /* all main monitors should be setup now */ + free(outputs); + } - /* loop any outputs we have deferred */ - EINA_LIST_FOREACH(deferred, l, output) + /* check if we have only one monitor. If so, we will disable the + * indicator toggle so dumb people cannot turn off their only monitor */ + count = eina_list_count(sd->monitors); + EINA_LIST_FOREACH(sd->monitors, l, mon) { - Evas_Object *mon = NULL, *pmon = NULL; - - if (!output->crtc) continue; - - /* find a crtc that matches the geometry of this output's crtc */ - EINA_LIST_FOREACH(E_RANDR_12->crtcs, ll, crtc) - { - if (crtc->xid == output->crtc->xid) continue; - - if ((crtc->geometry.x == output->crtc->geometry.x) && - (crtc->geometry.y == output->crtc->geometry.y)) - { - if ((pmon = _e_smart_randr_monitor_find(sd, crtc->xid))) - break; - } - } - - if ((mon = e_smart_monitor_add(evas))) - { - Evas_Coord cx = 0, cy = 0; - Evas_Coord cw = 0, ch = 0; - - /* add this monitor to the layout */ - e_smart_randr_monitor_add(obj, mon); - - /* tell the monitor which layout it references */ - e_smart_monitor_layout_set(mon, sd->o_layout); - - /* tell the monitor which output it references */ - e_smart_monitor_output_set(mon, output); - - /* tell the monitor which crtc it references */ - e_smart_monitor_crtc_set(mon, output->crtc); - - /* with the layout and output assigned, we can - * tell the monitor to setup - * - * NB: This means filling resolutions, getting - * refresh rates, displaying monitor name, etc... - * all the graphical stuff */ - e_smart_monitor_setup(mon); - - cx = output->crtc->geometry.x; - cy = output->crtc->geometry.y; - cw = output->crtc->geometry.w; - ch = output->crtc->geometry.h; - - if ((cw == 0) || (ch == 0)) - e_smart_monitor_current_geometry_get(mon, NULL, NULL, - &cw, &ch); - - /* set geometry so that when we "unclone" this - * one, it will unclone to the right */ - if (pmon) - { - E_Randr_Output_Info *poutput; - - /* get the output from this previous monitor */ - if ((poutput = e_smart_monitor_output_get(pmon))) - cx += poutput->crtc->geometry.w; - } - - /* resize this monitor to it's current size */ - e_layout_child_resize(mon, cw, ch); - - /* move this monitor to it's current location */ - e_layout_child_move(mon, cx, cy); - - /* if we are cloned, then tell randr */ - if (pmon) - { - e_smart_monitor_cloned_set(mon, EINA_TRUE); - e_smart_monitor_clone_add(pmon, mon); - } - } + if (count > 1) + e_smart_monitor_indicator_available_set(mon, EINA_TRUE); + else + e_smart_monitor_indicator_available_set(mon, EINA_FALSE); } } void -e_smart_randr_monitor_add(Evas_Object *obj, Evas_Object *mon) -{ - E_Smart_Data *sd; - - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; - - /* add evas callbacks for monitor resize, rotate */ - evas_object_smart_callback_add(mon, "monitor_moving", - _e_smart_randr_monitor_cb_moving, obj); - evas_object_smart_callback_add(mon, "monitor_moved", - _e_smart_randr_monitor_cb_moved, obj); - evas_object_smart_callback_add(mon, "monitor_resized", - _e_smart_randr_monitor_cb_resized, obj); - evas_object_smart_callback_add(mon, "monitor_rotated", - _e_smart_randr_monitor_cb_rotated, obj); - evas_object_smart_callback_add(mon, "monitor_changed", - _e_smart_randr_monitor_cb_changed, obj); - - /* add listener for monitor delete event */ - evas_object_event_callback_add(mon, EVAS_CALLBACK_DEL, - _e_smart_randr_monitor_cb_deleted, NULL); - - /* add monitor to layout */ - e_layout_pack(sd->o_layout, mon); - - /* add this monitor to our list */ - sd->monitors = eina_list_append(sd->monitors, mon); - - /* show the monitor - * - * NB: Needed. Do Not Remove */ - evas_object_show(mon); -} - -void -e_smart_randr_monitor_del(Evas_Object *obj, Evas_Object *mon) +e_smart_randr_min_size_get(Evas_Object *obj, Evas_Coord *mw, Evas_Coord *mh) { E_Smart_Data *sd; /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* delete evas callbacks for monitor resize, rotate */ - evas_object_smart_callback_del(mon, "monitor_moving", - _e_smart_randr_monitor_cb_moving); - evas_object_smart_callback_del(mon, "monitor_moved", - _e_smart_randr_monitor_cb_moved); - evas_object_smart_callback_del(mon, "monitor_resized", - _e_smart_randr_monitor_cb_resized); - evas_object_smart_callback_del(mon, "monitor_rotated", - _e_smart_randr_monitor_cb_rotated); - evas_object_smart_callback_del(mon, "monitor_changed", - _e_smart_randr_monitor_cb_changed); - - /* delete listener for monitor delete event */ - evas_object_event_callback_del(mon, EVAS_CALLBACK_DEL, - _e_smart_randr_monitor_cb_deleted); - - /* remove monitor from layout */ - e_layout_unpack(mon); - - /* add this monitor to our list */ - sd->monitors = eina_list_remove(sd->monitors, mon); -} - -Eina_List * -e_smart_randr_monitors_get(Evas_Object *obj) -{ - E_Smart_Data *sd; - - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return NULL; - - /* return the list of monitors */ - return sd->monitors; + if (mw) *mw = (sd->vw / 10); + if (mh) *mh = (sd->vh / 10); } Eina_Bool e_smart_randr_changed_get(Evas_Object *obj) { E_Smart_Data *sd; + Eina_Bool changed = EINA_FALSE; + Eina_List *l = NULL; + Evas_Object *mon; /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return EINA_FALSE; - return sd->changed; + EINA_LIST_FOREACH(sd->monitors, l, mon) + { + E_Smart_Monitor_Changes changes = E_SMART_MONITOR_CHANGED_NONE; + + changes = e_smart_monitor_changes_get(mon); + if (changes > E_SMART_MONITOR_CHANGED_NONE) + { + changed = EINA_TRUE; + break; + } + } + + return changed; } void @@ -511,28 +388,29 @@ e_smart_randr_changes_apply(Evas_Object *obj) { E_Smart_Data *sd; Eina_List *l = NULL; - Evas_Object *mon = NULL; + Evas_Object *mon; + Eina_Bool need_reset = EINA_FALSE; /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* loop the list of monitors */ + /* tell each monitor to apply it's changes */ EINA_LIST_FOREACH(sd->monitors, l, mon) - { - /* tell the monitor to apply these changes */ - e_smart_monitor_changes_apply(mon); - - /* tell monitor to reset changes - * - * NB: This updates the monitor's "original" values with those - * that are "current" */ - e_smart_monitor_changes_reset(mon); - } + if (e_smart_monitor_changes_apply(mon)) + need_reset = EINA_TRUE; - /* FIXME: This should maybe go into a "restore on login" option ?? */ + if (need_reset) + ecore_x_randr_screen_reset(ecore_x_window_root_first_get()); +} + +Eina_List * +e_smart_randr_monitors_get(Evas_Object *obj) +{ + E_Smart_Data *sd; - /* tell randr to save this config */ - e_randr_store_configuration(E_RANDR_CONFIGURATION_STORE_ALL); + /* try to get the objects smart data */ + if (!(sd = evas_object_smart_data_get(obj))) return NULL; + return sd->monitors; } /* local functions */ @@ -542,21 +420,30 @@ _e_smart_add(Evas_Object *obj) E_Smart_Data *sd; Evas *evas; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to allocate the smart data structure */ if (!(sd = E_NEW(E_Smart_Data, 1))) return; /* grab the canvas */ evas = evas_object_evas_get(obj); - /* create the layout */ - sd->o_layout = e_layout_add(evas); + sd->o_base = edje_object_add(evas); + e_theme_edje_object_set(sd->o_base, "base/theme/widgets", + "e/conf/randr/main"); + evas_object_smart_member_add(sd->o_base, obj); + + /* create the virtual grid */ + sd->o_grid = evas_object_grid_add(evas); + edje_object_part_swallow(sd->o_base, "e.swallow.content", sd->o_grid); - /* create the scroll */ - sd->o_scroll = e_scrollframe_add(evas); - e_scrollframe_child_set(sd->o_scroll, sd->o_layout); - evas_object_smart_member_add(sd->o_scroll, obj); + /* setup grid move callback */ + evas_object_event_callback_add(sd->o_grid, EVAS_CALLBACK_MOVE, + _e_smart_randr_grid_cb_move, sd); + evas_object_event_callback_add(sd->o_grid, EVAS_CALLBACK_RESIZE, + _e_smart_randr_grid_cb_resize, sd); - /* set the objects smart data */ + /* set the object's smart data */ evas_object_smart_data_set(obj, sd); } @@ -566,18 +453,34 @@ _e_smart_del(Evas_Object *obj) E_Smart_Data *sd; Evas_Object *mon; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* delete the monitors */ + /* free the monitors */ EINA_LIST_FREE(sd->monitors, mon) - evas_object_del(mon); + { + evas_object_smart_callback_del(mon, "monitor_changed", + _e_smart_randr_monitor_cb_changed); + evas_object_smart_callback_del(mon, "monitor_moved", + _e_smart_randr_monitor_cb_moved); + evas_object_smart_callback_del(mon, "monitor_resized", + _e_smart_randr_monitor_cb_resized); + evas_object_del(mon); + } - /* delete the layout object */ - if (sd->o_layout) evas_object_del(sd->o_layout); + /* remove grid move callback */ + evas_object_event_callback_del(sd->o_grid, EVAS_CALLBACK_MOVE, + _e_smart_randr_grid_cb_move); + evas_object_event_callback_del(sd->o_grid, EVAS_CALLBACK_RESIZE, + _e_smart_randr_grid_cb_resize); - /* delete the scrollframe object */ - if (sd->o_scroll) evas_object_del(sd->o_scroll); + /* delete the grid object */ + evas_object_del(sd->o_grid); + + /* delete the base object */ + evas_object_del(sd->o_base); /* try to free the allocated structure */ E_FREE(sd); @@ -591,11 +494,13 @@ _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* move the scroll */ - if (sd->o_scroll) evas_object_move(sd->o_scroll, x, y); + /* move the base object */ + evas_object_move(sd->o_base, x, y); } static void @@ -603,17 +508,23 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { E_Smart_Data *sd; + LOGFN(__FILE__, __LINE__, __FUNCTION__); + /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; - /* resize the scroll */ - if (sd->o_scroll) evas_object_resize(sd->o_scroll, w, h); + /* resize the base object */ + evas_object_resize(sd->o_base, w, h); } static void _e_smart_show(Evas_Object *obj) { E_Smart_Data *sd; + Eina_List *l = NULL; + Evas_Object *mon; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; @@ -621,8 +532,12 @@ _e_smart_show(Evas_Object *obj) /* if it is already visible, get out */ if (sd->visible) return; - /* show the grid */ - if (sd->o_scroll) evas_object_show(sd->o_scroll); + /* show the base object */ + evas_object_show(sd->o_base); + + /* show any monitors */ + EINA_LIST_FOREACH(sd->monitors, l, mon) + evas_object_show(mon); /* set visibility flag */ sd->visible = EINA_TRUE; @@ -632,6 +547,10 @@ static void _e_smart_hide(Evas_Object *obj) { E_Smart_Data *sd; + Eina_List *l = NULL; + Evas_Object *mon; + + LOGFN(__FILE__, __LINE__, __FUNCTION__); /* try to get the objects smart data */ if (!(sd = evas_object_smart_data_get(obj))) return; @@ -639,8 +558,12 @@ _e_smart_hide(Evas_Object *obj) /* if it is not visible, we have nothing to do */ if (!sd->visible) return; - /* hide the grid */ - if (sd->o_scroll) evas_object_hide(sd->o_scroll); + /* hide any monitors */ + EINA_LIST_FOREACH(sd->monitors, l, mon) + evas_object_hide(mon); + + /* hide the base object */ + evas_object_hide(sd->o_base); /* set visibility flag */ sd->visible = EINA_FALSE; @@ -655,7 +578,7 @@ _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip) if (!(sd = evas_object_smart_data_get(obj))) return; /* set the clip */ - if (sd->o_scroll) evas_object_clip_set(sd->o_scroll, clip); + evas_object_clip_set(sd->o_base, clip); } static void @@ -667,340 +590,360 @@ _e_smart_clip_unset(Evas_Object *obj) if (!(sd = evas_object_smart_data_get(obj))) return; /* unset the clip */ - if (sd->o_scroll) evas_object_clip_unset(sd->o_scroll); + evas_object_clip_unset(sd->o_base); } static void -_e_smart_randr_changed_set(Evas_Object *obj) +_e_smart_randr_grid_cb_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { E_Smart_Data *sd; - Evas_Object *mon = NULL; + Evas_Coord gx = 0, gy = 0, gw = 0, gh = 0; Eina_List *l = NULL; + Evas_Object *mon; - /* try to get the objects smart data */ - if (!(sd = evas_object_smart_data_get(obj))) return; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* default changed flag */ - sd->changed = EINA_FALSE; + /* try to get the smart data */ + if (!(sd = data)) return; - /* loop list of monitors */ - EINA_LIST_FOREACH(sd->monitors, l, mon) - { - E_Smart_Monitor_Changes changes = E_SMART_MONITOR_CHANGED_NONE; + /* get the grid geometry */ + evas_object_geometry_get(sd->o_grid, &gx, &gy, &gw, &gh); - /* determine if this monitor changed */ - changes = e_smart_monitor_changes_get(mon); - if (changes > E_SMART_MONITOR_CHANGED_NONE) - { - sd->changed = EINA_TRUE; - break; - } - } - - /* send changed signal to main dialog */ - evas_object_smart_callback_call(obj, "changed", NULL); + /* loop the monitors and update grid geometry */ + EINA_LIST_FOREACH(sd->monitors, l, mon) + e_smart_monitor_grid_set(mon, sd->o_grid, gx, gy, gw, gh); } -static int -_e_smart_randr_modes_sort(const void *data1, const void *data2) +static void +_e_smart_randr_grid_cb_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { - const Ecore_X_Randr_Mode_Info *m1, *m2 = NULL; + E_Smart_Data *sd; + Evas_Coord gx = 0, gy = 0, gw = 0, gh = 0; + Eina_List *l = NULL; + Evas_Object *mon; - if (!(m1 = data1)) return 1; - if (!(m2 = data2)) return -1; + LOGFN(__FILE__, __LINE__, __FUNCTION__); - /* second one compares to previous to determine position */ - if (m2->width < m1->width) return 1; - if (m2->width > m1->width) return -1; + /* try to get the smart data */ + if (!(sd = data)) return; - /* width are same, compare heights */ - if ((m2->width == m1->width)) - { - if (m2->height < m1->height) return 1; - if (m2->height > m1->height) return -1; - } + /* get the grid geometry */ + evas_object_geometry_get(sd->o_grid, &gx, &gy, &gw, &gh); - return 1; + /* loop the monitors and update grid geometry */ + EINA_LIST_FOREACH(sd->monitors, l, mon) + e_smart_monitor_grid_set(mon, sd->o_grid, gx, gy, gw, gh); } static Evas_Object * -_e_smart_randr_monitor_find(E_Smart_Data *sd, Ecore_X_Randr_Crtc xid) +_e_smart_randr_monitor_crtc_find(E_Smart_Data *sd, Ecore_X_Randr_Crtc crtc) { - Eina_List *l; + Eina_List *l = NULL; Evas_Object *mon; - /* loop the monitor list */ + if ((!sd) || (!crtc)) return NULL; + EINA_LIST_FOREACH(sd->monitors, l, mon) { - E_Randr_Output_Info *output; + Ecore_X_Randr_Crtc mcrtc; - /* try to grab this monitors output */ - if ((output = e_smart_monitor_output_get(mon))) - { - /* compare the output's crtc id to the one passed in */ - if ((output->crtc) && (output->crtc->xid == xid)) - return mon; - } + if ((mcrtc = e_smart_monitor_crtc_get(mon))) + if ((mcrtc == crtc)) return mon; } return NULL; } static void -_e_smart_randr_monitor_adjacent_move(E_Smart_Data *sd, Evas_Object *obj, Evas_Object *skip) +_e_smart_randr_monitor_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { - Eina_List *l = NULL; - Evas_Object *mon; - Eina_Rectangle o; + Evas_Object *randr; - /* get the current geometry of the monitor we were passed in */ - e_smart_monitor_current_geometry_get(obj, &o.x, &o.y, NULL, NULL); - e_layout_child_geometry_get(obj, NULL, NULL, &o.w, &o.h); + if (!(randr = data)) return; - /* loop the list of monitors */ - EINA_LIST_FOREACH(sd->monitors, l, mon) - { - Eina_Rectangle m; + /* tell main dialog that something changed and to enable apply button */ + evas_object_smart_callback_call(randr, "randr_changed", NULL); +} - /* if this monitor is the one we want to skip, than skip it */ - if (((skip) && (mon == skip)) || (mon == obj)) - continue; +static void +_e_smart_randr_monitor_cb_moved(void *data, Evas_Object *obj, void *event EINA_UNUSED) +{ + E_Smart_Data *sd; + Evas_Object *randr; - /* get the current geometry of this monitor */ - e_smart_monitor_current_geometry_get(mon, &m.x, &m.y, NULL, NULL); - e_layout_child_geometry_get(mon, NULL, NULL, &m.w, &m.h); + if (!(randr = data)) return; - /* check if this monitor is adjacent to the original one, - * if it is, then we need to move it */ - if ((m.x == o.x) || (m.y == o.y)) - { - if ((m.x == o.x)) - { - if ((m.y >= o.y)) - { - /* vertical positioning */ - e_layout_child_move(mon, m.x, (o.y + o.h)); - } - } - else if ((m.y == o.y)) - { - if ((m.x >= o.x)) - { - /* horizontal positioning */ - e_layout_child_move(mon, (o.x + o.w), m.y); - } - } - } - } -} + /* try to get the objects smart data */ + if (!(sd = evas_object_smart_data_get(randr))) return; -/* local callbacks for monitors */ + /* normalize output positions so that upper left corner of all + * outputs is at 0,0 */ + _e_smart_randr_monitor_position_normalize(sd); + + /* move any monitors which are adjacent to this one to their new + * positions due to the resize, specifying this resized monitor as + * the one to skip */ + _e_smart_randr_monitor_position_update(sd, obj, obj); + + /* tell main dialog that something changed and to enable apply button */ + evas_object_smart_callback_call(randr, "randr_changed", NULL); +} -/* callback received from a monitor object to let us know that it is moving, - * and we now have to check for a drop zone */ static void -_e_smart_randr_monitor_cb_moving(void *data, Evas_Object *obj, void *event EINA_UNUSED) +_e_smart_randr_monitor_cb_resized(void *data, Evas_Object *obj, void *event EINA_UNUSED) { - Evas_Object *o_randr = NULL; E_Smart_Data *sd; + Evas_Object *randr; + + if (!(randr = data)) return; + + /* try to get the objects smart data */ + if (!(sd = evas_object_smart_data_get(randr))) return; + + /* move any monitors which are adjacent to this one to their new + * positions due to the resize, specifying this resized monitor as + * the one to skip */ + _e_smart_randr_monitor_position_update(sd, obj, obj); + + /* tell main dialog that something changed and to enable apply button */ + evas_object_smart_callback_call(randr, "randr_changed", NULL); +} + +static void +_e_smart_randr_monitor_position_update(E_Smart_Data *sd, Evas_Object *obj, Evas_Object *skip) +{ Eina_List *l = NULL; Evas_Object *mon; - Evas_Coord ox = 0, oy = 0; - - /* data is the randr object */ - if (!(o_randr = data)) return; + Eina_Rectangle o, op; - /* try to get the RandR objects smart data */ - if (!(sd = evas_object_smart_data_get(o_randr))) return; + /* get the current geometry of the monitor we were passed in */ + e_smart_monitor_current_geometry_get(obj, &o.x, &o.y, &o.w, &o.h); - /* get the current frame geometry of the monitor we were passed in */ - e_smart_monitor_frame_geometry_get(obj, &ox, &oy, NULL, NULL); + e_smart_monitor_previous_geometry_get(obj, &op.x, &op.y, &op.w, &op.h); /* loop the list of monitors */ EINA_LIST_FOREACH(sd->monitors, l, mon) { - Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; + Eina_Rectangle m; /* if this monitor is the one we want to skip, than skip it */ - if (mon == obj) continue; + if (((skip) && (mon == skip)) || (mon == obj)) + continue; + + /* get the current geometry of this monitor */ + e_smart_monitor_current_geometry_get(mon, &m.x, &m.y, &m.w, &m.h); - /* get the geometry of the monitor frame */ - e_smart_monitor_frame_geometry_get(mon, &fx, &fy, &fw, &fh); + /* check if this monitor is adjacent to the original one, + * if it is, then we need to move it */ - /* check if the moved monitor is inside an existing one */ - if (E_INSIDE(ox, oy, fx, fy, fw, fh)) + /* check for any monitors that are on this X axis + * (within a certain threshold of distance) */ + if ((m.x >= (op.x + (op.w / 3))) && + (((m.x <= ((op.x + op.w) + SNAP_FUZZ)) || + (m.x <= ((op.x + op.w) - SNAP_FUZZ))))) { - /* turn on the drop zone so tell user they can drop here */ - e_smart_monitor_drop_zone_set(mon, EINA_TRUE); - break; + /* don't move the monitor IF this movement would place it + * outside the virual grid */ + if (((o.x + o.w) + m.w) <= sd->vw) + e_smart_monitor_current_geometry_set(mon, (o.x + o.w), + m.y, m.w, m.h); } - else + else if ((m.y >= (op.y + (op.h / 3))) && + (((m.y <= ((op.y + op.h) + SNAP_FUZZ)) || + (m.y <= ((op.y + op.h) - SNAP_FUZZ))))) + { + /* don't move the monitor IF this movement would place it + * outside the virual grid */ + if (((o.y + o.h) + m.h) <= sd->vh) + e_smart_monitor_current_geometry_set(mon, m.x, (o.y + o.h), + m.w, m.h); + } + + /* handle move case for obj */ + else if ((o.x >= (m.x + (m.w / 3))) && + (((o.x <= ((m.x + m.w) + SNAP_FUZZ)) || + (o.x <= ((m.x + m.w) - SNAP_FUZZ))))) { - /* moving monitor is outside the drop zone of this monitor. - * turn off drop zone hilighting */ - e_smart_monitor_drop_zone_set(mon, EINA_FALSE); + /* don't move the monitor IF this movement would place it + * outside the virual grid */ + if (((m.x + m.w) + o.w) <= sd->vw) + e_smart_monitor_current_geometry_set(obj, (m.x + m.w), + o.y, o.w, o.h); } + else if ((o.y >= (m.y + (m.h / 3))) && + (((o.y <= ((m.y + op.h) + SNAP_FUZZ)) || + (o.y <= ((m.y + op.h) - SNAP_FUZZ))))) + { + /* don't move the monitor IF this movement would place it + * outside the virual grid */ + if (((m.y + m.h) + o.h) <= sd->vh) + e_smart_monitor_current_geometry_set(obj, o.x, (m.y + m.h), + o.w, o.h); + } + } } -/* callback received from a monitor object to let us know that it was moved, - * and we now have to adjust the position of any adjacent monitors */ static void -_e_smart_randr_monitor_cb_moved(void *data, Evas_Object *obj, void *event EINA_UNUSED) +_e_smart_randr_monitor_position_normalize(E_Smart_Data *sd) { - Evas_Object *o_randr = NULL; - E_Smart_Data *sd; - Eina_List *l = NULL; Evas_Object *mon; - Evas_Coord ox = 0, oy = 0; - - /* data is the randr object */ - if (!(o_randr = data)) return; - - /* try to get the RandR objects smart data */ - if (!(sd = evas_object_smart_data_get(o_randr))) return; + Eina_List *l = NULL; + Evas_Coord minx = 0, miny = 0; - /* get the current frame geometry of the monitor we were passed in */ - e_smart_monitor_frame_geometry_get(obj, &ox, &oy, NULL, NULL); + minx = 32768; + miny = 32768; - /* loop the list of monitors */ EINA_LIST_FOREACH(sd->monitors, l, mon) { - Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; - - /* if this monitor is the one we want to skip, than skip it */ - if (mon == obj) continue; + Evas_Coord mx = 0, my = 0; - /* get the geometry of the monitor frame */ - e_smart_monitor_frame_geometry_get(mon, &fx, &fy, &fw, &fh); + /* get the geometry for this monitor */ + e_smart_monitor_current_geometry_get(mon, &mx, &my, NULL, NULL); + if (mx < minx) minx = mx; + if (my < miny) miny = my; + } - /* check if the moved monitor is inside an existing one */ - if (E_INSIDE(ox, oy, fx, fy, fw, fh)) + if ((minx) || (miny)) + { + EINA_LIST_FOREACH(sd->monitors, l, mon) { - /* clone this monitor into the obj monitor */ - e_smart_monitor_clone_add(mon, obj); + Evas_Coord mx = 0, my = 0, mw = 0, mh = 0; - /* emit signal to turn off drop zone hilight */ - e_smart_monitor_drop_zone_set(mon, EINA_FALSE); + /* get the geometry for this monitor */ + e_smart_monitor_current_geometry_get(mon, &mx, &my, &mw, &mh); - break; + mx -= minx; + my -= miny; + + /* move monitor to new position */ + e_smart_monitor_current_geometry_set(mon, mx, my, mw, mh); } } - - /* tell randr widget about changes */ - _e_smart_randr_changed_set(o_randr); } -/* callback received from a monitor object to let us know that it was resized, - * and we now have to adjust the position of any adjacent monitors */ static void -_e_smart_randr_monitor_cb_resized(void *data, Evas_Object *obj, void *event EINA_UNUSED) +_e_smart_randr_monitor_preferred_mode_size_get(Ecore_X_Randr_Output output, Evas_Coord *mw, Evas_Coord *mh) { - Evas_Object *o_randr = NULL; - E_Smart_Data *sd; - Eina_List *l = NULL; - Evas_Object *mon; - - /* data is the randr object */ - if (!(o_randr = data)) return; - - /* try to get the RandR objects smart data */ - if (!(sd = evas_object_smart_data_get(o_randr))) return; + Ecore_X_Window root = 0; + Ecore_X_Randr_Mode *modes; + int n = 0, p = 0; - /* freeze the layout widget from redrawing while we shuffle things around */ - e_layout_freeze(sd->o_layout); + if (mw) *mw = 0; + if (mh) *mh = 0; - /* move any monitors which are adjacent to this one to their new - * positions because of the resize, specifying the resized monitor - * as the one to skip */ - _e_smart_randr_monitor_adjacent_move(sd, obj, obj); + if (!output) return; - /* move any Other monitors to their new positions */ - EINA_LIST_FOREACH(sd->monitors, l, mon) - { - /* skip the current monitor */ - if (mon == obj) continue; + root = ecore_x_window_root_first_get(); - /* move any monitors which are adjacent to this one to their new - * positions because of the resize, specifying the resized monitor - * as the one to skip */ - _e_smart_randr_monitor_adjacent_move(sd, mon, obj); - } + if (!(modes = ecore_x_randr_output_modes_get(root, output, &n, &p))) + return; - /* thaw the layout widget, allowing redraws again */ - e_layout_thaw(sd->o_layout); + if ((n > 0) && (p > 0)) + ecore_x_randr_mode_size_get(root, modes[p - 1], mw, mh); + else if (n > 0) + ecore_x_randr_mode_size_get(root, modes[0], mw, mh); - /* tell randr widget about changes */ - _e_smart_randr_changed_set(o_randr); + free(modes); } -/* callback received from a monitor object to let us know that it was rotated, - * and we now have to adjust the position of any adjacent monitors */ -static void -_e_smart_randr_monitor_cb_rotated(void *data, Evas_Object *obj, void *event EINA_UNUSED) +static Evas_Object * +_e_smart_randr_clone_find(Ecore_X_Window root, Ecore_X_Randr_Output output, Ecore_X_Randr_Crtc crtc, Evas_Coord cx, Evas_Coord cy, E_Smart_Data *sd) { - Evas_Object *o_randr = NULL; - E_Smart_Data *sd; - Eina_List *l = NULL; - Evas_Object *mon; + Evas_Object *mon = NULL; + Ecore_X_Randr_Crtc pcrtc = 0; + Evas_Coord px = 0, py = 0; - /* data is the randr object */ - if (!(o_randr = data)) return; + /* get the crtc of the previous output */ + pcrtc = ecore_x_randr_output_crtc_get(root, output); + if (!pcrtc) return NULL; - /* try to get the RandR objects smart data */ - if (!(sd = evas_object_smart_data_get(o_randr))) return; + /* get this crtcs geom */ + ecore_x_randr_crtc_geometry_get(root, pcrtc, + &px, &py, NULL, NULL); - /* freeze the layout widget from redrawing while we shuffle things around */ - e_layout_freeze(sd->o_layout); + if ((px == cx) && (py == cy)) + { + Ecore_X_Randr_Orientation orient = + ECORE_X_RANDR_ORIENTATION_ROT_0; + Ecore_X_Randr_Orientation porient = + ECORE_X_RANDR_ORIENTATION_ROT_0; - /* move any monitors which are adjacent to this one to their new - * positions because of the resize, specifying the resized monitor - * as the one to skip */ - _e_smart_randr_monitor_adjacent_move(sd, obj, obj); + porient = + ecore_x_randr_crtc_orientation_get(root, pcrtc); - /* move any Other monitors to their new positions */ - EINA_LIST_FOREACH(sd->monitors, l, mon) - { - /* skip the current monitor */ - if (mon == obj) continue; + orient = + ecore_x_randr_crtc_orientation_get(root, crtc); - /* move any monitors which are adjacent to this one to their new - * positions because of the resize, specifying the resized monitor - * as the one to skip */ - _e_smart_randr_monitor_adjacent_move(sd, mon, obj); - } + if (porient == orient) + { + Ecore_X_Randr_Mode mode = 0, pmode = 0; + Evas_Coord pw = 0, ph = 0; + Evas_Coord w = 0, h = 0; - /* thaw the layout widget, allowing redraws again */ - e_layout_thaw(sd->o_layout); + pmode = + ecore_x_randr_crtc_mode_get(root, pcrtc); + ecore_x_randr_mode_size_get(root, pmode, &pw, &ph); - /* tell randr widget about changes */ - _e_smart_randr_changed_set(o_randr); -} + mode = + ecore_x_randr_crtc_mode_get(root, crtc); + ecore_x_randr_mode_size_get(root, mode, &w, &h); -static void -_e_smart_randr_monitor_cb_deleted(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED) -{ - /* delete the smart callbacks we were listening on */ - evas_object_smart_callback_del(obj, "monitor_moving", - _e_smart_randr_monitor_cb_moving); - evas_object_smart_callback_del(obj, "monitor_moved", - _e_smart_randr_monitor_cb_moved); - evas_object_smart_callback_del(obj, "monitor_resized", - _e_smart_randr_monitor_cb_resized); - evas_object_smart_callback_del(obj, "monitor_rotated", - _e_smart_randr_monitor_cb_rotated); - evas_object_smart_callback_del(obj, "monitor_changed", - _e_smart_randr_monitor_cb_changed); + if ((pmode == mode) || ((pw == w) && (ph == h))) + mon = _e_smart_randr_monitor_crtc_find(sd, pcrtc); + } + } + + return mon; } -static void -_e_smart_randr_monitor_cb_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) +static Ecore_X_Randr_Crtc +_e_smart_randr_crtc_find(Ecore_X_Randr_Output output) { - Evas_Object *o_randr = NULL; + Ecore_X_Randr_Crtc ret = 0; + Ecore_X_Window root = 0; + Ecore_X_Randr_Crtc *crtcs; + int ncrtcs = 0; - /* data is the randr object */ - if (!(o_randr = data)) return; + /* get root window */ + root = ecore_x_window_root_first_get(); + + /* get possible crtcs for this output */ + if ((crtcs = ecore_x_randr_output_possible_crtcs_get(root, output, &ncrtcs))) + { + Ecore_X_Randr_Output *outputs; + int i = 0, noutputs = 0; + + for (i = 0; i < ncrtcs; i++) + { + int j = 0; + + /* get any outputs on this crtc */ + if (!(outputs = + ecore_x_randr_crtc_outputs_get(root, crtcs[i], &noutputs))) + ret = crtcs[i]; + else if (noutputs == 0) + ret = crtcs[i]; + else + { + /* loop the outputs */ + for (j = 0; j < noutputs; j++) + { + /* check if it is this output */ + if (outputs[j] == output) + { + ret = crtcs[i]; + break; + } + } + } + + free(outputs); + if (ret) break; + } + + free(crtcs); + } - /* tell randr widget about changes */ - _e_smart_randr_changed_set(o_randr); + return ret; } diff --git a/src/modules/conf_randr/e_smart_randr.h b/src/modules/conf_randr/e_smart_randr.h index 735e25f5c2..37cd7d9a6e 100644 --- a/src/modules/conf_randr/e_smart_randr.h +++ b/src/modules/conf_randr/e_smart_randr.h @@ -4,14 +4,12 @@ # define E_SMART_RANDR_H Evas_Object *e_smart_randr_add(Evas *evas); -void e_smart_randr_layout_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -void e_smart_randr_current_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); +void e_smart_randr_virtual_size_calc(Evas_Object *obj); void e_smart_randr_monitors_create(Evas_Object *obj); -void e_smart_randr_monitor_add(Evas_Object *obj, Evas_Object *mon); -void e_smart_randr_monitor_del(Evas_Object *obj, Evas_Object *mon); -Eina_List *e_smart_randr_monitors_get(Evas_Object *obj); +void e_smart_randr_min_size_get(Evas_Object *obj, Evas_Coord *mw, Evas_Coord *mh); Eina_Bool e_smart_randr_changed_get(Evas_Object *obj); void e_smart_randr_changes_apply(Evas_Object *obj); +Eina_List *e_smart_randr_monitors_get(Evas_Object *obj); # endif #endif diff --git a/src/modules/conf_randr/module.desktop b/src/modules/conf_randr/module.desktop index c794cae911..4a7a5f8eaf 100644 --- a/src/modules/conf_randr/module.desktop +++ b/src/modules/conf_randr/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Settings - Screen Setup +Name[Name]=Settings - Screen Setup +Name[ab]= Name[ca]=Resolució de pantalla Name[cs]=Nastavení - rozlišení obrazovky Name[de]=Konfiguration - Bildschirm +Name[el]= Name[eo]=Agordo - Ekrandistingivo Name[es]=Configuración - Resolución de pantalla Name[fr]=Affichage @@ -11,13 +15,14 @@ Name[gl]=Configuración da pantalla Name[hu]=Beállítások - Képernyő felbontása Name[it]=Monitor Name[ja]= +Name[ko]= Name[pt]=Configuração de ecrã Name[pt_BR]= Name[ru]=Настройка экрана +Name[sr]= Name[tr]=Ayarlar - Ekran Çözünürlüğü Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_randr Comment=Used to configure your screen's resolution. Comment[ca]=Per a configurar la resolució del monitor. Comment[cs]=Použit k nastavení rozlišení obrazovky. @@ -35,4 +40,5 @@ Comment[ru]=Используется для настройки разрешен Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_randr X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_randr/module.desktop.in b/src/modules/conf_randr/module.desktop.in index c794cae911..4a7a5f8eaf 100644 --- a/src/modules/conf_randr/module.desktop.in +++ b/src/modules/conf_randr/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Settings - Screen Setup +Name[Name]=Settings - Screen Setup +Name[ab]= Name[ca]=Resolució de pantalla Name[cs]=Nastavení - rozlišení obrazovky Name[de]=Konfiguration - Bildschirm +Name[el]= Name[eo]=Agordo - Ekrandistingivo Name[es]=Configuración - Resolución de pantalla Name[fr]=Affichage @@ -11,13 +15,14 @@ Name[gl]=Configuración da pantalla Name[hu]=Beállítások - Képernyő felbontása Name[it]=Monitor Name[ja]= +Name[ko]= Name[pt]=Configuração de ecrã Name[pt_BR]= Name[ru]=Настройка экрана +Name[sr]= Name[tr]=Ayarlar - Ekran Çözünürlüğü Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_randr Comment=Used to configure your screen's resolution. Comment[ca]=Per a configurar la resolució del monitor. Comment[cs]=Použit k nastavení rozlišení obrazovky. @@ -35,4 +40,5 @@ Comment[ru]=Используется для настройки разрешен Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_randr X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_shelves/module.desktop b/src/modules/conf_shelves/module.desktop index 40f7a7a355..60c93dcb98 100644 --- a/src/modules/conf_shelves/module.desktop +++ b/src/modules/conf_shelves/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Shelves +Name[Name]=Shelves +Name[ab]= Name[ca]=Panells Name[cs]=Panely Name[de]= +Name[el]= Name[eo]=Bretoj Name[es]=Contenedores Name[fr]=Racks @@ -11,13 +15,14 @@ Name[gl]=Paneis Name[hu]=Polcok Name[it]=Mensole Name[ja]= +Name[ko]= Name[pt]=Painéis Name[pt_BR]= Name[ru]=Полки +Name[sr]= Name[tr]=Raflar Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_shelves Comment=Shelf configuration dialog. Comment[ca]=Interfície de configuració dels panells. Comment[cs]=Dialog nastavení panelů. @@ -35,4 +40,5 @@ Comment[ru]=Диалог конфигурации полки. Comment[tr]=Raf yapılandırma diyaloğu. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_shelves X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in index 40f7a7a355..60c93dcb98 100644 --- a/src/modules/conf_shelves/module.desktop.in +++ b/src/modules/conf_shelves/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Shelves +Name[Name]=Shelves +Name[ab]= Name[ca]=Panells Name[cs]=Panely Name[de]= +Name[el]= Name[eo]=Bretoj Name[es]=Contenedores Name[fr]=Racks @@ -11,13 +15,14 @@ Name[gl]=Paneis Name[hu]=Polcok Name[it]=Mensole Name[ja]= +Name[ko]= Name[pt]=Painéis Name[pt_BR]= Name[ru]=Полки +Name[sr]= Name[tr]=Raflar Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_shelves Comment=Shelf configuration dialog. Comment[ca]=Interfície de configuració dels panells. Comment[cs]=Dialog nastavení panelů. @@ -35,4 +40,5 @@ Comment[ru]=Диалог конфигурации полки. Comment[tr]=Raf yapılandırma diyaloğu. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_shelves X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_theme/module.desktop b/src/modules/conf_theme/module.desktop index 8ed7b033c7..2ed0d14f2b 100644 --- a/src/modules/conf_theme/module.desktop +++ b/src/modules/conf_theme/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Theme +Name[Name]=Theme +Name[ab]= Name[ca]=Tema Name[cs]=Téma Name[de]= +Name[el]= Name[eo]=Etoso Name[es]=Tema Name[fr]=Thème @@ -11,13 +15,14 @@ Name[gl]=Tema Name[hu]=Téma Name[it]=Temi Name[ja]= +Name[ko]= Name[pt]=Tema Name[pt_BR]= Name[ru]=Тема +Name[sr]= Name[tr]=Tema Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-theme Comment=Used to configure your theme preferences. Comment[ca]=Permet configurar les preferències del tema. Comment[cs]=Použit k nastavení vašeho tématu. @@ -35,4 +40,5 @@ Comment[ru]=Используется для настройки темы. Comment[tr]=Tema seçimlerinizi yapılandırmakta kullanılır. Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-theme X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in index 8ed7b033c7..2ed0d14f2b 100644 --- a/src/modules/conf_theme/module.desktop.in +++ b/src/modules/conf_theme/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Theme +Name[Name]=Theme +Name[ab]= Name[ca]=Tema Name[cs]=Téma Name[de]= +Name[el]= Name[eo]=Etoso Name[es]=Tema Name[fr]=Thème @@ -11,13 +15,14 @@ Name[gl]=Tema Name[hu]=Téma Name[it]=Temi Name[ja]= +Name[ko]= Name[pt]=Tema Name[pt_BR]= Name[ru]=Тема +Name[sr]= Name[tr]=Tema Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-theme Comment=Used to configure your theme preferences. Comment[ca]=Permet configurar les preferències del tema. Comment[cs]=Použit k nastavení vašeho tématu. @@ -35,4 +40,5 @@ Comment[ru]=Используется для настройки темы. Comment[tr]=Tema seçimlerinizi yapılandırmakta kullanılır. Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-theme X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_wallpaper2/module.desktop.in b/src/modules/conf_wallpaper2/module.desktop.in index d90ef9864b..efb8cad62d 100644 --- a/src/modules/conf_wallpaper2/module.desktop.in +++ b/src/modules/conf_wallpaper2/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Wallpaper 2 +Name[Name]=Wallpaper 2 +Name[ab]= Name[ca]=Fons d'escriptori Name[cs]=Pozadí plochy Name[de]= +Name[el]= Name[eo]=Tapeto Name[es]=Fondo de pantalla Name[fr]=Fond d'écran 2 @@ -11,13 +15,14 @@ Name[gl]=Fondo de escritorio 2 Name[hu]=Háttérkép Name[it]=Sfondo 2 Name[ja]= +Name[ko]= Name[pt]=Papel de parede 2 Name[pt_BR]= Name[ru]=Обои 2 +Name[sr]= Name[tr]=Duvarkağıdı 2 Name[zh_CN]= Name[zh_TW]= -Icon=preferences-desktop-wallpaper Comment=Used to pick a wallpaper. Comment[ca]=Permet seleccionar el fons d'escriptori. Comment[cs]=Použit k volbě pozadí. @@ -35,4 +40,5 @@ Comment[ru]=Используется для выбора обоев. Comment[tr]=Duvarkağıdı seçiminde kullanılır. Comment[zh_CN]= Comment[zh_TW]= +Icon=preferences-desktop-wallpaper X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_window_manipulation/module.desktop b/src/modules/conf_window_manipulation/module.desktop index 07fd3ecdcf..cfce86629e 100644 --- a/src/modules/conf_window_manipulation/module.desktop +++ b/src/modules/conf_window_manipulation/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Window Manipulation +Name[Name]=Window Manipulation +Name[ab]= Name[ca]=Manipulació de finestres Name[cs]=Manipulace s okny Name[de]= +Name[el]= Name[eo]=Manipulado de fenestroj Name[es]=Manipulación de ventanas Name[fr]=Manipulation des fenêtres @@ -11,13 +15,14 @@ Name[gl]=Manipulación de xanelas Name[hu]=Ablak műveletek Name[it]=Manipolazione finestre Name[ja]= +Name[ko]= Name[pt]=Manipulação de janelas Name[pt_BR]= Name[ru]=Манипуляции с окном +Name[sr]= Name[tr]=Pencere Manipülasyonu Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_winmanip Comment=Configures window raise, resistance, and maximize policies. Comment[ca]=Configura les regles per a la pujada, la resistència i la maximització de les finestres. Comment[cs]=Nasavení odolnosti okna, maximalizace aj. @@ -35,4 +40,5 @@ Comment[ru]=Позволяет настроить политику подъем Comment[tr]=Pencere yükseltmesi, direnci ve ekranı kaplama kurallarını yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_winmanip X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in index 07fd3ecdcf..cfce86629e 100644 --- a/src/modules/conf_window_manipulation/module.desktop.in +++ b/src/modules/conf_window_manipulation/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Window Manipulation +Name[Name]=Window Manipulation +Name[ab]= Name[ca]=Manipulació de finestres Name[cs]=Manipulace s okny Name[de]= +Name[el]= Name[eo]=Manipulado de fenestroj Name[es]=Manipulación de ventanas Name[fr]=Manipulation des fenêtres @@ -11,13 +15,14 @@ Name[gl]=Manipulación de xanelas Name[hu]=Ablak műveletek Name[it]=Manipolazione finestre Name[ja]= +Name[ko]= Name[pt]=Manipulação de janelas Name[pt_BR]= Name[ru]=Манипуляции с окном +Name[sr]= Name[tr]=Pencere Manipülasyonu Name[zh_CN]= Name[zh_TW]= -Icon=e-module-conf_winmanip Comment=Configures window raise, resistance, and maximize policies. Comment[ca]=Configura les regles per a la pujada, la resistència i la maximització de les finestres. Comment[cs]=Nasavení odolnosti okna, maximalizace aj. @@ -35,4 +40,5 @@ Comment[ru]=Позволяет настроить политику подъем Comment[tr]=Pencere yükseltmesi, direnci ve ekranı kaplama kurallarını yapılandırır. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-conf_winmanip X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_window_remembers/module.desktop b/src/modules/conf_window_remembers/module.desktop index 2c43df5d32..d18f4c88a1 100644 --- a/src/modules/conf_window_remembers/module.desktop +++ b/src/modules/conf_window_remembers/module.desktop @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Window Remembers +Name[Name]=Window Remembers +Name[ab]= Name[ca]=Memòria de les finestres Name[cs]=Paměť -Name[eo]=Fesnestraj memoroj +Name[de]= +Name[el]= +Name[eo]=Fenestraj memoroj Name[es]=Recordatorio de ventanas Name[fr]=Mémorisations des fenêtres Name[gl]=Recordatorio de xanelas Name[hu]=Ablak emlékek Name[it]=Ricordi finestre +Name[ja]= +Name[ko]= Name[pt]=Memorização de janelas Name[ru]=Запоминание окон +Name[sr]=Памћење прозора Name[tr]=Pencere Hatırlamaları -Icon=e-module-conf_window_remembers Comment=Delete existing window remembers. Comment[ca]=Elimina l'opció de recordar de les finestres. Comment[cs]=K vymazání existujících zapamatovaných vlastností oken. @@ -24,5 +31,7 @@ Comment[hu]=Meglévő ablak emlékek törlése. Comment[it]=Rimuove le impostazioni da ricordare delle finestre. Comment[pt]=Apagar memorização das janelas Comment[ru]=Удаление запомненных настроек окон. +Comment[sr]=Брише сачуване упамћене прозоре Comment[tr]=Mevcut pencere hatırlamalarını sil. +Icon=e-module-conf_window_remembers X-Enlightenment-ModuleType=settings diff --git a/src/modules/conf_window_remembers/module.desktop.in b/src/modules/conf_window_remembers/module.desktop.in index 2c43df5d32..d18f4c88a1 100644 --- a/src/modules/conf_window_remembers/module.desktop.in +++ b/src/modules/conf_window_remembers/module.desktop.in @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Window Remembers +Name[Name]=Window Remembers +Name[ab]= Name[ca]=Memòria de les finestres Name[cs]=Paměť -Name[eo]=Fesnestraj memoroj +Name[de]= +Name[el]= +Name[eo]=Fenestraj memoroj Name[es]=Recordatorio de ventanas Name[fr]=Mémorisations des fenêtres Name[gl]=Recordatorio de xanelas Name[hu]=Ablak emlékek Name[it]=Ricordi finestre +Name[ja]= +Name[ko]= Name[pt]=Memorização de janelas Name[ru]=Запоминание окон +Name[sr]=Памћење прозора Name[tr]=Pencere Hatırlamaları -Icon=e-module-conf_window_remembers Comment=Delete existing window remembers. Comment[ca]=Elimina l'opció de recordar de les finestres. Comment[cs]=K vymazání existujících zapamatovaných vlastností oken. @@ -24,5 +31,7 @@ Comment[hu]=Meglévő ablak emlékek törlése. Comment[it]=Rimuove le impostazioni da ricordare delle finestre. Comment[pt]=Apagar memorização das janelas Comment[ru]=Удаление запомненных настроек окон. +Comment[sr]=Брише сачуване упамћене прозоре Comment[tr]=Mevcut pencere hatırlamalarını sil. +Icon=e-module-conf_window_remembers X-Enlightenment-ModuleType=settings diff --git a/src/modules/connman/module.desktop b/src/modules/connman/module.desktop index 8531e2bf7c..4084dbe126 100644 --- a/src/modules/connman/module.desktop +++ b/src/modules/connman/module.desktop @@ -1,25 +1,31 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Connection Manager +Name[Name]=Connection Manager +Name[ab]= Name[ca]=Gestor de connexions Name[cs]=Správce připojení Name[de]=Verbindungsmanager +Name[el]= Name[eo]=Administrilo de konektoj Name[es]=Administrador de conexiones Name[fr]=Gestionnaire de connexion Name[gl]=Xestor de conexións Name[hu]=Hálózati kapcsolatok Name[it]=Gestore connessioni +Name[ja]= +Name[ko]= Name[pt]=Gestor de ligações Name[ru]=Менеджер подключений +Name[sr]= Name[tr]=Bağlantı Yöneticisi -Icon=e-module-connman Comment=Control Wifi and wired networks as a user. Comment[ca]=Gestió de xarxes cablejades i sense fils com a usuari. Comment[cs]=Nastavení wifi a drátových sítí jako uživatel. Comment[de]=Drahtlose und kabelgebundene Nezwerke als Nutzer verwalten Comment[eo]=Por kontroli sendratajn kaj dratajn retojn kiel uzanto. -Comment[es]=Controle las redes inalámbricas o cableadas como usuario. +Comment[es]=Controle las redes inalámbricas o cableadas como usuario. Comment[fr]=Permet de contrôler les réseaux Wifi et câblés en tant qu'utilisateur. Comment[gl]=Controle as redes sen fíos ou cableadas como usuario. Comment[hu]=Wifi és vezetékes hálózatok kezelését teszi lehetővé. @@ -27,4 +33,5 @@ Comment[it]=Controlla le reti wireless e cablate come utente. Comment[pt]=Permite-lhe controlar as redes com e sem fios Comment[ru]=Управление проводной и wifi сетями на пользовательском уровне. Comment[tr]=Kablolu ve kablosuz ağ bağlantısını ayarlar. +Icon=e-module-connman X-Enlightenment-ModuleType=system diff --git a/src/modules/connman/module.desktop.in b/src/modules/connman/module.desktop.in index 8531e2bf7c..4084dbe126 100644 --- a/src/modules/connman/module.desktop.in +++ b/src/modules/connman/module.desktop.in @@ -1,25 +1,31 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Connection Manager +Name[Name]=Connection Manager +Name[ab]= Name[ca]=Gestor de connexions Name[cs]=Správce připojení Name[de]=Verbindungsmanager +Name[el]= Name[eo]=Administrilo de konektoj Name[es]=Administrador de conexiones Name[fr]=Gestionnaire de connexion Name[gl]=Xestor de conexións Name[hu]=Hálózati kapcsolatok Name[it]=Gestore connessioni +Name[ja]= +Name[ko]= Name[pt]=Gestor de ligações Name[ru]=Менеджер подключений +Name[sr]= Name[tr]=Bağlantı Yöneticisi -Icon=e-module-connman Comment=Control Wifi and wired networks as a user. Comment[ca]=Gestió de xarxes cablejades i sense fils com a usuari. Comment[cs]=Nastavení wifi a drátových sítí jako uživatel. Comment[de]=Drahtlose und kabelgebundene Nezwerke als Nutzer verwalten Comment[eo]=Por kontroli sendratajn kaj dratajn retojn kiel uzanto. -Comment[es]=Controle las redes inalámbricas o cableadas como usuario. +Comment[es]=Controle las redes inalámbricas o cableadas como usuario. Comment[fr]=Permet de contrôler les réseaux Wifi et câblés en tant qu'utilisateur. Comment[gl]=Controle as redes sen fíos ou cableadas como usuario. Comment[hu]=Wifi és vezetékes hálózatok kezelését teszi lehetővé. @@ -27,4 +33,5 @@ Comment[it]=Controlla le reti wireless e cablate come utente. Comment[pt]=Permite-lhe controlar as redes com e sem fios Comment[ru]=Управление проводной и wifi сетями на пользовательском уровне. Comment[tr]=Kablolu ve kablosuz ağ bağlantısını ayarlar. +Icon=e-module-connman X-Enlightenment-ModuleType=system diff --git a/src/modules/cpufreq/module.desktop b/src/modules/cpufreq/module.desktop index 765f13061c..e2e7225ed6 100644 --- a/src/modules/cpufreq/module.desktop +++ b/src/modules/cpufreq/module.desktop @@ -1,15 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Cpufreq +Name[Name]=Cpufreq +Name[ab]= Name[ca]=Freqüència de la CPU Name[cs]=Frekvence procesoru +Name[de]= +Name[el]= Name[eo]=Ĉeforgana ofteco +Name[es]= Name[fr]=FréqCPU +Name[gl]= Name[hu]=Processzor frekvencia +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Frequência do cpu Name[ru]=Частота процессора +Name[sr]= Name[tr]=İşlemci ölçekleme -Icon=e-module-cpufreq Comment=Gadget to monitor and change the CPU frequency. Comment[ca]=Mòdul per a monitoritzar i canviar la freqüència de la CPU. Comment[cs]=Gadget pro monitorování a změnu frekvence CPU. @@ -27,4 +37,5 @@ Comment[ru]=Гаджет для отображения и смены часто Comment[tr]=İşlemci frekansını değiştiren ve izleyen bir araç. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-cpufreq X-Enlightenment-ModuleType=system diff --git a/src/modules/cpufreq/module.desktop.in b/src/modules/cpufreq/module.desktop.in index 765f13061c..e2e7225ed6 100644 --- a/src/modules/cpufreq/module.desktop.in +++ b/src/modules/cpufreq/module.desktop.in @@ -1,15 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Cpufreq +Name[Name]=Cpufreq +Name[ab]= Name[ca]=Freqüència de la CPU Name[cs]=Frekvence procesoru +Name[de]= +Name[el]= Name[eo]=Ĉeforgana ofteco +Name[es]= Name[fr]=FréqCPU +Name[gl]= Name[hu]=Processzor frekvencia +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Frequência do cpu Name[ru]=Частота процессора +Name[sr]= Name[tr]=İşlemci ölçekleme -Icon=e-module-cpufreq Comment=Gadget to monitor and change the CPU frequency. Comment[ca]=Mòdul per a monitoritzar i canviar la freqüència de la CPU. Comment[cs]=Gadget pro monitorování a změnu frekvence CPU. @@ -27,4 +37,5 @@ Comment[ru]=Гаджет для отображения и смены часто Comment[tr]=İşlemci frekansını değiştiren ve izleyen bir araç. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-cpufreq X-Enlightenment-ModuleType=system diff --git a/src/modules/dropshadow/module.desktop b/src/modules/dropshadow/module.desktop index c60a2cfa42..e368f51d54 100644 --- a/src/modules/dropshadow/module.desktop +++ b/src/modules/dropshadow/module.desktop @@ -1,16 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Dropshadow +Name[Name]=Dropshadow +Name[ab]= Name[ca]=Ombres Name[cs]=Stín okna +Name[de]= +Name[el]= Name[eo]=Ĵetita ombro +Name[es]= Name[fr]=Ombre portée Name[gl]=Sombra Name[hu]=Árnyékvető +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Sombra Name[ru]=Отброс тени +Name[sr]= Name[tr]=Pencere gölgesi -Icon=e-module-dropshadow Comment=Module to add a dropshadow to windows. Comment[ca]=Mòdul per a afegir ombres a les finestres. Comment[cs]=Modul k přidání stínu oknům. @@ -28,4 +37,5 @@ Comment[ru]=Модуль включает отброс теней окнами. Comment[tr]=Pencerelere gölge ekleyen modül. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-dropshadow X-Enlightenment-ModuleType=look diff --git a/src/modules/dropshadow/module.desktop.in b/src/modules/dropshadow/module.desktop.in index c60a2cfa42..e368f51d54 100644 --- a/src/modules/dropshadow/module.desktop.in +++ b/src/modules/dropshadow/module.desktop.in @@ -1,16 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Dropshadow +Name[Name]=Dropshadow +Name[ab]= Name[ca]=Ombres Name[cs]=Stín okna +Name[de]= +Name[el]= Name[eo]=Ĵetita ombro +Name[es]= Name[fr]=Ombre portée Name[gl]=Sombra Name[hu]=Árnyékvető +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Sombra Name[ru]=Отброс тени +Name[sr]= Name[tr]=Pencere gölgesi -Icon=e-module-dropshadow Comment=Module to add a dropshadow to windows. Comment[ca]=Mòdul per a afegir ombres a les finestres. Comment[cs]=Modul k přidání stínu oknům. @@ -28,4 +37,5 @@ Comment[ru]=Модуль включает отброс теней окнами. Comment[tr]=Pencerelere gölge ekleyen modül. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-dropshadow X-Enlightenment-ModuleType=look diff --git a/src/modules/everything/module.desktop b/src/modules/everything/module.desktop index 6fea6fa351..09316a7f89 100644 --- a/src/modules/everything/module.desktop +++ b/src/modules/everything/module.desktop @@ -1,27 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Everything (Starter) +Name[Name]=Everything (Starter) +Name[ab]= Name[ca]=Everything (Llançador) Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Ĉio (lanĉilo) Name[es]=Everything (Lanzador) Name[fr]=Omni Name[gl]=Everything (Iniciador) Name[hu]= Name[it]=Everything Name[ja]= +Name[ko]= Name[pt]=Everything (Lançador) Name[pt_BR]= Name[ru]=Всё (Стартер) +Name[sr]= Name[tr]=Everything (Başlatıcı) Name[zh_CN]= Name[zh_TW]= -Icon=e-module-everything Comment=The run command module provides an application launcher dialog. Comment[ca]=El mòdul d'executar comandes ofereix un diàleg per a llançar aplicacions. Comment[cs]=Poskytuje dialog pro spuštění aplikací. -Comment[de]= +Comment[de]=Der Ausführen-Befehl stellt einen Anwendungsstarter zur Verfügung. +Comment[el]=Το άρθρωμα της εκτέλεση εντολής παρέχει ένα παράθυρο διαλόγου εκτέλεσης εφαρμογής. Comment[eo]=La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj. Comment[es]=El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones. Comment[fr]=Lanceur d'applications et explorateur de fichiers à vocation universelle. @@ -35,4 +41,5 @@ Comment[ru]=Модуль выполнения команд предоставл Comment[tr]=Komut çalıştırma modülü uygulamaları başlatmak için diyalog sunar. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-everything X-Enlightenment-ModuleType=launcher diff --git a/src/modules/everything/module.desktop.in b/src/modules/everything/module.desktop.in index 6fea6fa351..09316a7f89 100644 --- a/src/modules/everything/module.desktop.in +++ b/src/modules/everything/module.desktop.in @@ -1,27 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Everything (Starter) +Name[Name]=Everything (Starter) +Name[ab]= Name[ca]=Everything (Llançador) Name[cs]= Name[de]= -Name[eo]= +Name[el]= +Name[eo]=Ĉio (lanĉilo) Name[es]=Everything (Lanzador) Name[fr]=Omni Name[gl]=Everything (Iniciador) Name[hu]= Name[it]=Everything Name[ja]= +Name[ko]= Name[pt]=Everything (Lançador) Name[pt_BR]= Name[ru]=Всё (Стартер) +Name[sr]= Name[tr]=Everything (Başlatıcı) Name[zh_CN]= Name[zh_TW]= -Icon=e-module-everything Comment=The run command module provides an application launcher dialog. Comment[ca]=El mòdul d'executar comandes ofereix un diàleg per a llançar aplicacions. Comment[cs]=Poskytuje dialog pro spuštění aplikací. -Comment[de]= +Comment[de]=Der Ausführen-Befehl stellt einen Anwendungsstarter zur Verfügung. +Comment[el]=Το άρθρωμα της εκτέλεση εντολής παρέχει ένα παράθυρο διαλόγου εκτέλεσης εφαρμογής. Comment[eo]=La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj. Comment[es]=El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones. Comment[fr]=Lanceur d'applications et explorateur de fichiers à vocation universelle. @@ -35,4 +41,5 @@ Comment[ru]=Модуль выполнения команд предоставл Comment[tr]=Komut çalıştırma modülü uygulamaları başlatmak için diyalog sunar. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-everything X-Enlightenment-ModuleType=launcher diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c index 2b7a8a0151..f343686535 100644 --- a/src/modules/fileman/e_mod_menu.c +++ b/src/modules/fileman/e_mod_menu.c @@ -205,7 +205,7 @@ _e_mod_menu_populate_item(void *data, Eio_File *handler __UNUSED__, const Eina_F { e_util_menu_item_theme_icon_set(mi, "folder"); eina_stringshare_ref(dev); - e_object_data_set(E_OBJECT(mi), eina_stringshare_printf("%s/%s", path ?: "/", info->path + info->name_start)); + e_object_data_set(E_OBJECT(mi), eina_stringshare_printf("%s/%s", path ?: "", info->path + info->name_start)); } e_menu_item_submenu_pre_callback_set(mi, _e_mod_menu_populate, dev); //fprintf(stderr, "PATH SET: %s\n", e_object_data_get(E_OBJECT(mi))); diff --git a/src/modules/fileman/module.desktop b/src/modules/fileman/module.desktop index e34f861e6c..60cc55c15a 100644 --- a/src/modules/fileman/module.desktop +++ b/src/modules/fileman/module.desktop @@ -1,23 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=EFM (Starter) +Name[Name]=EFM (Starter) +Name[ab]= Name[ca]=EFM (Llançador) Name[cs]= Name[de]=EFM (Starter) -Name[eo]= +Name[el]= +Name[eo]=Enlightenment dosieradministrilo (lanĉilo) Name[es]=EFM (Lanzador) Name[fr]=File manager Name[gl]=EFM (Iniciador) Name[hu]= Name[it]=EFM Name[ja]= +Name[ko]= Name[pt]=Gestor de ficheiros EFM Name[pt_BR]= Name[ru]=EFM (Стартер) +Name[sr]=УДП (покретач) Name[tr]=EFM (Başlatıcı) Name[zh_CN]= Name[zh_TW]= -Icon=e-module-fileman Comment=Enlightenment's integrated file manager. Comment[ca]=Administrador de fitxers integrat a l'Enlightenment. Comment[cs]=Integrovaný správce souborů v Enlightenment. @@ -32,7 +37,9 @@ Comment[ja]= Comment[pt]=O gestor de ficheiros do Enlightenment. Comment[pt_BR]= Comment[ru]=Встроенный в Enlightenment файловый менеджер. +Comment[sr]=Уграђени управник датотека Просвећења. Comment[tr]=Enlightenment'nin dahili pencere yöneticisi. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-fileman X-Enlightenment-ModuleType=files diff --git a/src/modules/fileman/module.desktop.in b/src/modules/fileman/module.desktop.in index e34f861e6c..60cc55c15a 100644 --- a/src/modules/fileman/module.desktop.in +++ b/src/modules/fileman/module.desktop.in @@ -1,23 +1,28 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=EFM (Starter) +Name[Name]=EFM (Starter) +Name[ab]= Name[ca]=EFM (Llançador) Name[cs]= Name[de]=EFM (Starter) -Name[eo]= +Name[el]= +Name[eo]=Enlightenment dosieradministrilo (lanĉilo) Name[es]=EFM (Lanzador) Name[fr]=File manager Name[gl]=EFM (Iniciador) Name[hu]= Name[it]=EFM Name[ja]= +Name[ko]= Name[pt]=Gestor de ficheiros EFM Name[pt_BR]= Name[ru]=EFM (Стартер) +Name[sr]=УДП (покретач) Name[tr]=EFM (Başlatıcı) Name[zh_CN]= Name[zh_TW]= -Icon=e-module-fileman Comment=Enlightenment's integrated file manager. Comment[ca]=Administrador de fitxers integrat a l'Enlightenment. Comment[cs]=Integrovaný správce souborů v Enlightenment. @@ -32,7 +37,9 @@ Comment[ja]= Comment[pt]=O gestor de ficheiros do Enlightenment. Comment[pt_BR]= Comment[ru]=Встроенный в Enlightenment файловый менеджер. +Comment[sr]=Уграђени управник датотека Просвећења. Comment[tr]=Enlightenment'nin dahili pencere yöneticisi. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-fileman X-Enlightenment-ModuleType=files diff --git a/src/modules/fileman_opinfo/module.desktop b/src/modules/fileman_opinfo/module.desktop index ab5e599258..bb42c7b4d1 100644 --- a/src/modules/fileman_opinfo/module.desktop +++ b/src/modules/fileman_opinfo/module.desktop @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=EFM Operation Info +Name[Name]=EFM Operation Info +Name[ab]= Name[ca]=Informació de les operacions de l'EFM Name[cs]=EFM Informace o operaci Name[de]=EFM-Operationsinfo -Name[eo]=Aktualaj operacioj en EFM +Name[el]= +Name[eo]=Informo de operacioj en EDA Name[es]=Información de las operaciones de EFM Name[fr]=Informations EFM Name[gl]=Información das operacións de EFM +Name[hu]= Name[it]=Informazioni operazioni EFM +Name[ja]= +Name[ko]= Name[pt]=Informação das operações do EFM Name[ru]=Информация о работе EFM +Name[sr]= Name[tr]=EFM İşlem Bilgisi -Icon=e-module-fileman_opinfo Comment=Can be placed on the desktop or in a shelf. Comment[ca]=Es pot col·locar a l'escriptori o en un panell. Comment[cs]=Může být na ploše nebo v panelu. @@ -25,4 +32,5 @@ Comment[it]=Può essere messo sul desktop o su una mensola. Comment[pt]=Pode ser colocado na área de trabalho ou no painel Comment[ru]=Можно разместить на столе или в полке. Comment[tr]=Masaüstüne ya da rafa yerleşebilir. +Icon=e-module-fileman_opinfo X-Enlightenment-ModuleType=files diff --git a/src/modules/fileman_opinfo/module.desktop.in b/src/modules/fileman_opinfo/module.desktop.in index ab5e599258..bb42c7b4d1 100644 --- a/src/modules/fileman_opinfo/module.desktop.in +++ b/src/modules/fileman_opinfo/module.desktop.in @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=EFM Operation Info +Name[Name]=EFM Operation Info +Name[ab]= Name[ca]=Informació de les operacions de l'EFM Name[cs]=EFM Informace o operaci Name[de]=EFM-Operationsinfo -Name[eo]=Aktualaj operacioj en EFM +Name[el]= +Name[eo]=Informo de operacioj en EDA Name[es]=Información de las operaciones de EFM Name[fr]=Informations EFM Name[gl]=Información das operacións de EFM +Name[hu]= Name[it]=Informazioni operazioni EFM +Name[ja]= +Name[ko]= Name[pt]=Informação das operações do EFM Name[ru]=Информация о работе EFM +Name[sr]= Name[tr]=EFM İşlem Bilgisi -Icon=e-module-fileman_opinfo Comment=Can be placed on the desktop or in a shelf. Comment[ca]=Es pot col·locar a l'escriptori o en un panell. Comment[cs]=Může být na ploše nebo v panelu. @@ -25,4 +32,5 @@ Comment[it]=Può essere messo sul desktop o su una mensola. Comment[pt]=Pode ser colocado na área de trabalho ou no painel Comment[ru]=Можно разместить на столе или в полке. Comment[tr]=Masaüstüne ya da rafa yerleşebilir. +Icon=e-module-fileman_opinfo X-Enlightenment-ModuleType=files diff --git a/src/modules/gadman/module.desktop b/src/modules/gadman/module.desktop index 05acaf8a13..b732d148f2 100644 --- a/src/modules/gadman/module.desktop +++ b/src/modules/gadman/module.desktop @@ -1,21 +1,30 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Gadgets +Name[Name]=Gadgets +Name[ab]= Name[ca]=Ginys Name[cs]=Gadgety Name[de]=Helferlein +Name[el]= Name[eo]=Akcesoraĵoj +Name[es]= +Name[fr]=Gadgets +Name[gl]= Name[hu]=Bigyók az asztalon Name[it]=Gestore gadget +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Гаджеты +Name[sr]= Name[tr]=Araçlar -Icon=e-module-gadman -X-Enlightenment-ModuleType=core Comment=Module to manage gadgets on the desktop. Comment[ca]=Mòdul per a administrar els ginys de l'escriptori. Comment[cs]=Modul pro správu gadgetů na ploše. Comment[de]=Verwaltet die Helferlein auf dem Desktop. -Comment[eo]= +Comment[eo]=Modulo por administri akcesoraĵojn en la labortablo. Comment[es]=Módulo para administrar los gadgets en el escritorio. Comment[fr]=Module de gestion des gadgets sur le bureau. Comment[gl]=Módulo para xestionar os gadgets no escritorio. @@ -24,3 +33,5 @@ Comment[it]=Modulo per la gestione dei gadget sul desktop. Comment[pt]=Módulo para fazer a gestão dos "gadgets" Comment[ru]=Модуль для управления гаджетами на рабочем столе. Comment[tr]=Masaüstündeki araçları yöneten modül. +Icon=e-module-gadman +X-Enlightenment-ModuleType=core diff --git a/src/modules/gadman/module.desktop.in b/src/modules/gadman/module.desktop.in index 05acaf8a13..b732d148f2 100644 --- a/src/modules/gadman/module.desktop.in +++ b/src/modules/gadman/module.desktop.in @@ -1,21 +1,30 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Gadgets +Name[Name]=Gadgets +Name[ab]= Name[ca]=Ginys Name[cs]=Gadgety Name[de]=Helferlein +Name[el]= Name[eo]=Akcesoraĵoj +Name[es]= +Name[fr]=Gadgets +Name[gl]= Name[hu]=Bigyók az asztalon Name[it]=Gestore gadget +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Гаджеты +Name[sr]= Name[tr]=Araçlar -Icon=e-module-gadman -X-Enlightenment-ModuleType=core Comment=Module to manage gadgets on the desktop. Comment[ca]=Mòdul per a administrar els ginys de l'escriptori. Comment[cs]=Modul pro správu gadgetů na ploše. Comment[de]=Verwaltet die Helferlein auf dem Desktop. -Comment[eo]= +Comment[eo]=Modulo por administri akcesoraĵojn en la labortablo. Comment[es]=Módulo para administrar los gadgets en el escritorio. Comment[fr]=Module de gestion des gadgets sur le bureau. Comment[gl]=Módulo para xestionar os gadgets no escritorio. @@ -24,3 +33,5 @@ Comment[it]=Modulo per la gestione dei gadget sul desktop. Comment[pt]=Módulo para fazer a gestão dos "gadgets" Comment[ru]=Модуль для управления гаджетами на рабочем столе. Comment[tr]=Masaüstündeki araçları yöneten modül. +Icon=e-module-gadman +X-Enlightenment-ModuleType=core diff --git a/src/modules/ibar/module.desktop b/src/modules/ibar/module.desktop index df9ab0c37c..b824b4cc88 100644 --- a/src/modules/ibar/module.desktop +++ b/src/modules/ibar/module.desktop @@ -1,13 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=IBar +Name[Name]=IBar +Name[ab]= Name[ca]=IBar Name[cs]=Lišta spouštěčů Name[de]=IBar +Name[el]= Name[eo]=Breto IBar +Name[es]= +Name[fr]=IBar +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=IBar -Icon=e-module-ibar -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Iconic application launcher. Comment[ca]=Barra d'icones per a executar aplicacions. Comment[cs]=Lišta se spouštěči. @@ -25,3 +37,5 @@ Comment[ru]=Меню запуска приложений, отображение Comment[tr]=Uygulama başlatıcı. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-ibar +X-Enlightenment-ModuleType=utils diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop.in index df9ab0c37c..b824b4cc88 100644 --- a/src/modules/ibar/module.desktop.in +++ b/src/modules/ibar/module.desktop.in @@ -1,13 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=IBar +Name[Name]=IBar +Name[ab]= Name[ca]=IBar Name[cs]=Lišta spouštěčů Name[de]=IBar +Name[el]= Name[eo]=Breto IBar +Name[es]= +Name[fr]=IBar +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=IBar -Icon=e-module-ibar -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Iconic application launcher. Comment[ca]=Barra d'icones per a executar aplicacions. Comment[cs]=Lišta se spouštěči. @@ -25,3 +37,5 @@ Comment[ru]=Меню запуска приложений, отображение Comment[tr]=Uygulama başlatıcı. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-ibar +X-Enlightenment-ModuleType=utils diff --git a/src/modules/ibox/module.desktop b/src/modules/ibox/module.desktop index 418cf42469..d092bb5f56 100644 --- a/src/modules/ibox/module.desktop +++ b/src/modules/ibox/module.desktop @@ -1,12 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=IBox +Name[Name]=IBox +Name[ab]= Name[ca]=IBox +Name[cs]= Name[de]=IBox +Name[el]= Name[eo]=Breto IBox +Name[es]= +Name[fr]=IBox +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=IBox -Icon=e-module-ibox -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=A home for your iconified applications. Comment[ca]=Un contenidor per a les aplicacions minimitzades. Comment[cs]=Zde se zobrazují všechny minimalizované aplikace. @@ -24,3 +37,5 @@ Comment[ru]=Место для отображения иконок свёрнут Comment[tr]=Simge durumundaki uygulamalarınızın yuvası. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-ibox +X-Enlightenment-ModuleType=utils diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop.in index 418cf42469..d092bb5f56 100644 --- a/src/modules/ibox/module.desktop.in +++ b/src/modules/ibox/module.desktop.in @@ -1,12 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=IBox +Name[Name]=IBox +Name[ab]= Name[ca]=IBox +Name[cs]= Name[de]=IBox +Name[el]= Name[eo]=Breto IBox +Name[es]= +Name[fr]=IBox +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=IBox -Icon=e-module-ibox -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=A home for your iconified applications. Comment[ca]=Un contenidor per a les aplicacions minimitzades. Comment[cs]=Zde se zobrazují všechny minimalizované aplikace. @@ -24,3 +37,5 @@ Comment[ru]=Место для отображения иконок свёрнут Comment[tr]=Simge durumundaki uygulamalarınızın yuvası. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-ibox +X-Enlightenment-ModuleType=utils diff --git a/src/modules/illume-bluetooth/module.desktop b/src/modules/illume-bluetooth/module.desktop index 2e8e687d4c..ad5c0752de 100644 --- a/src/modules/illume-bluetooth/module.desktop +++ b/src/modules/illume-bluetooth/module.desktop @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Bluetooth -Icon=e-module-illume-bluetooth -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Bluetooth +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Bludento Illume +Name[es]= +Name[fr]=Bluetooth Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-bluetooth +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-bluetooth/module.desktop.in b/src/modules/illume-bluetooth/module.desktop.in index 2e8e687d4c..ad5c0752de 100644 --- a/src/modules/illume-bluetooth/module.desktop.in +++ b/src/modules/illume-bluetooth/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Bluetooth -Icon=e-module-illume-bluetooth -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Bluetooth +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Bludento Illume +Name[es]= +Name[fr]=Bluetooth Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-bluetooth +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-home-toggle/module.desktop b/src/modules/illume-home-toggle/module.desktop index 5d257d1315..21f3da411c 100644 --- a/src/modules/illume-home-toggle/module.desktop +++ b/src/modules/illume-home-toggle/module.desktop @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Home-Toggle -Icon=e-module-illume-home-toggle -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Home-Toggle +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Baskulilo de hejmo Illume +Name[es]= +Name[fr]= +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-home-toggle +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-home-toggle/module.desktop.in b/src/modules/illume-home-toggle/module.desktop.in index 5d257d1315..21f3da411c 100644 --- a/src/modules/illume-home-toggle/module.desktop.in +++ b/src/modules/illume-home-toggle/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Home-Toggle -Icon=e-module-illume-home-toggle -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Home-Toggle +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Baskulilo de hejmo Illume +Name[es]= +Name[fr]= +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-home-toggle +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-home/module.desktop b/src/modules/illume-home/module.desktop index 6bb27d27bb..77aa89324a 100644 --- a/src/modules/illume-home/module.desktop +++ b/src/modules/illume-home/module.desktop @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Home -Icon=e-module-illume-home -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Home +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Illume-Hejmo +Name[es]= +Name[fr]=Accueil Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]=Домаћа додирна +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-home +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-home/module.desktop.in b/src/modules/illume-home/module.desktop.in index 6bb27d27bb..77aa89324a 100644 --- a/src/modules/illume-home/module.desktop.in +++ b/src/modules/illume-home/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Home -Icon=e-module-illume-home -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Home +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Illume-Hejmo +Name[es]= +Name[fr]=Accueil Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]=Домаћа додирна +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-home +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-indicator/module.desktop.in b/src/modules/illume-indicator/module.desktop.in index 43e58f3ba2..1b250f8221 100644 --- a/src/modules/illume-indicator/module.desktop.in +++ b/src/modules/illume-indicator/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Indicator -Icon=e-module-illume-indicator -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Indicator +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Illume-Indikilo +Name[es]= +Name[fr]=Indicateur Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-indicator +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-kbd-toggle/module.desktop b/src/modules/illume-kbd-toggle/module.desktop index b359fdcc85..e75cc90344 100644 --- a/src/modules/illume-kbd-toggle/module.desktop +++ b/src/modules/illume-kbd-toggle/module.desktop @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Keyboard-Toggle -Icon=e-module-illume-kbd-toggle -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Keyboard-Toggle +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Baskulo de klavaro Illume +Name[es]= +Name[fr]=Bascule clavier Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-kbd-toggle +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-kbd-toggle/module.desktop.in b/src/modules/illume-kbd-toggle/module.desktop.in index b359fdcc85..e75cc90344 100644 --- a/src/modules/illume-kbd-toggle/module.desktop.in +++ b/src/modules/illume-kbd-toggle/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Keyboard-Toggle -Icon=e-module-illume-kbd-toggle -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Keyboard-Toggle +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Baskulo de klavaro Illume +Name[es]= +Name[fr]=Bascule clavier Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-kbd-toggle +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-keyboard/module.desktop.in b/src/modules/illume-keyboard/module.desktop.in index f9ce697686..77d78cc1d3 100644 --- a/src/modules/illume-keyboard/module.desktop.in +++ b/src/modules/illume-keyboard/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Keyboard -Icon=e-module-illume-keyboard -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Keyboard +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Illume-Klavaro +Name[es]= +Name[fr]=Clavier Illume +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-keyboard +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-mode-toggle/module.desktop b/src/modules/illume-mode-toggle/module.desktop index 1a2224198c..97a23c661b 100644 --- a/src/modules/illume-mode-toggle/module.desktop +++ b/src/modules/illume-mode-toggle/module.desktop @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Mode-Toggle -Icon=e-module-illume-mode-toggle -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Mode-Toggle +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Baskulilo de reĝimo Illume +Name[es]= +Name[fr]= +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-mode-toggle +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-mode-toggle/module.desktop.in b/src/modules/illume-mode-toggle/module.desktop.in index 1a2224198c..97a23c661b 100644 --- a/src/modules/illume-mode-toggle/module.desktop.in +++ b/src/modules/illume-mode-toggle/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Mode-Toggle -Icon=e-module-illume-mode-toggle -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Mode-Toggle +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Baskulilo de reĝimo Illume +Name[es]= +Name[fr]= +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-mode-toggle +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume-softkey/module.desktop.in b/src/modules/illume-softkey/module.desktop.in index dd92124ac2..34aa9b6b58 100644 --- a/src/modules/illume-softkey/module.desktop.in +++ b/src/modules/illume-softkey/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume-Softkey -Icon=e-module-illume-softkey -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume-Softkey +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]= +Name[es]= +Name[fr]= +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume-softkey +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/illume2/module.desktop.in b/src/modules/illume2/module.desktop.in index 1694a7929c..85aff630cb 100644 --- a/src/modules/illume2/module.desktop.in +++ b/src/modules/illume2/module.desktop.in @@ -1,8 +1,27 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Illume2 -Icon=e-module-illume2 -X-Enlightenment-ModuleType=mobile +Name[Name]=Illume2 +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]= +Name[es]= +Name[fr]= +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= Comment= Comment[fr]= Comment[it]= +Icon=e-module-illume2 +X-Enlightenment-ModuleType=mobile diff --git a/src/modules/mixer/module.desktop b/src/modules/mixer/module.desktop index 33189231d1..a39d72005a 100644 --- a/src/modules/mixer/module.desktop +++ b/src/modules/mixer/module.desktop @@ -1,17 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Mixer +Name[Name]=Mixer +Name[ab]= Name[ca]=Gestor del so Name[cs]=Ovládání hlasitosti Name[de]=Mixer +Name[el]= Name[eo]=Sonmiksilo Name[es]=Mezclador Name[fr]=Mélangeur Name[gl]=Xestor de son +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Gestor de som Name[ru]=Микшер +Name[sr]= Name[tr]=Karıştırıcı -Icon=preferences-desktop-mixer Comment=A module to provide a mixer for changing volume. Comment[ca]=Mòdul que proporciona un controlador del volum del so. Comment[cs]=Modul pro ovládání hlasitosti. @@ -24,4 +32,5 @@ Comment[it]=Un modulo che fornisce un mixer per regolare il volume. Comment[pt]=Um módulo que disponibiliza um controlo para alterar o volume Comment[ru]=Модуль для управления уровнями громкости. Comment[tr]=Sesi ayarlarmak için kullanılan karıştırıcı modülü. +Icon=preferences-desktop-mixer X-Enlightenment-ModuleType=system diff --git a/src/modules/mixer/module.desktop.in b/src/modules/mixer/module.desktop.in index 33189231d1..a39d72005a 100644 --- a/src/modules/mixer/module.desktop.in +++ b/src/modules/mixer/module.desktop.in @@ -1,17 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Mixer +Name[Name]=Mixer +Name[ab]= Name[ca]=Gestor del so Name[cs]=Ovládání hlasitosti Name[de]=Mixer +Name[el]= Name[eo]=Sonmiksilo Name[es]=Mezclador Name[fr]=Mélangeur Name[gl]=Xestor de son +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Gestor de som Name[ru]=Микшер +Name[sr]= Name[tr]=Karıştırıcı -Icon=preferences-desktop-mixer Comment=A module to provide a mixer for changing volume. Comment[ca]=Mòdul que proporciona un controlador del volum del so. Comment[cs]=Modul pro ovládání hlasitosti. @@ -24,4 +32,5 @@ Comment[it]=Un modulo che fornisce un mixer per regolare il volume. Comment[pt]=Um módulo que disponibiliza um controlo para alterar o volume Comment[ru]=Модуль для управления уровнями громкости. Comment[tr]=Sesi ayarlarmak için kullanılan karıştırıcı modülü. +Icon=preferences-desktop-mixer X-Enlightenment-ModuleType=system diff --git a/src/modules/msgbus/module.desktop b/src/modules/msgbus/module.desktop index c9510a02aa..c0c196dfca 100644 --- a/src/modules/msgbus/module.desktop +++ b/src/modules/msgbus/module.desktop @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=DBus Extension +Name[Name]=DBus Extension +Name[ab]= Name[ca]=Extensió DBus Name[cs]=DBus rozšíření Name[de]=Erweiterung für D-Bus +Name[el]= Name[eo]=DBus kromaĵo Name[es]=Extensión DBus Name[fr]=Extension DBus @@ -11,9 +15,11 @@ Name[gl]=Extensión DBus Name[hu]=DBus kiterjesztés Name[it]=Estensione DBus Name[ja]= +Name[ko]= Name[pt]=Extensão DBus Name[pt_BR]= Name[ru]=Расширение DBus +Name[sr]= Name[tr]=DBus Uzantısı Name[zh_CN]= Name[zh_TW]= diff --git a/src/modules/msgbus/module.desktop.in b/src/modules/msgbus/module.desktop.in index c9510a02aa..c0c196dfca 100644 --- a/src/modules/msgbus/module.desktop.in +++ b/src/modules/msgbus/module.desktop.in @@ -1,9 +1,13 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=DBus Extension +Name[Name]=DBus Extension +Name[ab]= Name[ca]=Extensió DBus Name[cs]=DBus rozšíření Name[de]=Erweiterung für D-Bus +Name[el]= Name[eo]=DBus kromaĵo Name[es]=Extensión DBus Name[fr]=Extension DBus @@ -11,9 +15,11 @@ Name[gl]=Extensión DBus Name[hu]=DBus kiterjesztés Name[it]=Estensione DBus Name[ja]= +Name[ko]= Name[pt]=Extensão DBus Name[pt_BR]= Name[ru]=Расширение DBus +Name[sr]= Name[tr]=DBus Uzantısı Name[zh_CN]= Name[zh_TW]= diff --git a/src/modules/notification/module.desktop b/src/modules/notification/module.desktop index f18e87265e..cfae040bdb 100644 --- a/src/modules/notification/module.desktop +++ b/src/modules/notification/module.desktop @@ -1,17 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Notification +Name[Name]=Notification +Name[ab]= Name[ca]=Notificació Name[cs]=Notifikace Name[de]=Benachrichtigungen Name[el]=Ειδοποίηση Name[eo]=Sciigo Name[es]=Notificación +Name[fr]=Notification Name[gl]=Notificación Name[hu]=Értesítések +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Notificação Name[ru]=Уведомления -Icon=e-module-notification +Name[sr]= +Name[tr]= Comment=notification-daemon alternative.<br>Popup if an event occur. Comment[ca]=Una alternativa a notification-daemon.<br>Mostrarà una finestra emergent si passa alguna cosa. Comment[cs]=Alternativa k notification-daemon.<br>Zobrazí bublinu při události. @@ -25,4 +33,5 @@ Comment[hu]=notification-daemon alternatíva.<br>Egy esemény megtörténtét je Comment[it]=Alternativa a notification-daemon.<br>Mostra un popup al verificarsi di un evento. Comment[pt]=Uma alternativa ao notification-daemon.<br>Mostra alertas sobre eventos. Comment[ru]=Замена notification-daemon.<br>Показывает окно сообщения если происходит событие. +Icon=e-module-notification X-Enlightenment-ModuleType=core diff --git a/src/modules/notification/module.desktop.in b/src/modules/notification/module.desktop.in index f18e87265e..cfae040bdb 100644 --- a/src/modules/notification/module.desktop.in +++ b/src/modules/notification/module.desktop.in @@ -1,17 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Notification +Name[Name]=Notification +Name[ab]= Name[ca]=Notificació Name[cs]=Notifikace Name[de]=Benachrichtigungen Name[el]=Ειδοποίηση Name[eo]=Sciigo Name[es]=Notificación +Name[fr]=Notification Name[gl]=Notificación Name[hu]=Értesítések +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Notificação Name[ru]=Уведомления -Icon=e-module-notification +Name[sr]= +Name[tr]= Comment=notification-daemon alternative.<br>Popup if an event occur. Comment[ca]=Una alternativa a notification-daemon.<br>Mostrarà una finestra emergent si passa alguna cosa. Comment[cs]=Alternativa k notification-daemon.<br>Zobrazí bublinu při události. @@ -25,4 +33,5 @@ Comment[hu]=notification-daemon alternatíva.<br>Egy esemény megtörténtét je Comment[it]=Alternativa a notification-daemon.<br>Mostra un popup al verificarsi di un evento. Comment[pt]=Uma alternativa ao notification-daemon.<br>Mostra alertas sobre eventos. Comment[ru]=Замена notification-daemon.<br>Показывает окно сообщения если происходит событие. +Icon=e-module-notification X-Enlightenment-ModuleType=core diff --git a/src/modules/pager/module.desktop b/src/modules/pager/module.desktop index c01aada53b..126a091a7c 100644 --- a/src/modules/pager/module.desktop +++ b/src/modules/pager/module.desktop @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Pager +Name[Name]=Pager +Name[ab]= Name[ca]=Paginador Name[cs]=Přepínač ploch Name[de]=Pager -Name[eo]=Tabulpaĝilo +Name[el]= +Name[eo]=Paĝilo Name[es]=Paginador +Name[fr]=Miniature des bureaux Name[gl]=Paxinador Name[hu]=Lapozó +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Paginador Name[ru]=Пейджер +Name[sr]= Name[tr]=Sayfalayıcı -Icon=e-module-pager -X-Enlightenment-ModuleType=utils Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain. Comment[ca]=Permet visualitzar els escriptoris virtuals i les finestres que contenen. Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují. @@ -30,3 +37,5 @@ Comment[ru]=Гаджет для отображения виртуальных с Comment[tr]=Sanal masaüstlerini ve içerisindeki pencereleri görselleştirmenizi sağlayan araç. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-pager +X-Enlightenment-ModuleType=utils diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop.in index c01aada53b..126a091a7c 100644 --- a/src/modules/pager/module.desktop.in +++ b/src/modules/pager/module.desktop.in @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Pager +Name[Name]=Pager +Name[ab]= Name[ca]=Paginador Name[cs]=Přepínač ploch Name[de]=Pager -Name[eo]=Tabulpaĝilo +Name[el]= +Name[eo]=Paĝilo Name[es]=Paginador +Name[fr]=Miniature des bureaux Name[gl]=Paxinador Name[hu]=Lapozó +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Paginador Name[ru]=Пейджер +Name[sr]= Name[tr]=Sayfalayıcı -Icon=e-module-pager -X-Enlightenment-ModuleType=utils Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain. Comment[ca]=Permet visualitzar els escriptoris virtuals i les finestres que contenen. Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují. @@ -30,3 +37,5 @@ Comment[ru]=Гаджет для отображения виртуальных с Comment[tr]=Sanal masaüstlerini ve içerisindeki pencereleri görselleştirmenizi sağlayan araç. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-pager +X-Enlightenment-ModuleType=utils diff --git a/src/modules/physics/module.desktop.in b/src/modules/physics/module.desktop.in index b49a3e2440..a384eef61c 100644 --- a/src/modules/physics/module.desktop.in +++ b/src/modules/physics/module.desktop.in @@ -1,16 +1,32 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Physics +Name[Name]=Physics +Name[ab]= Name[ca]=Física +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Fiziko Name[es]=Física +Name[fr]=Physiques Name[gl]=Física +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Física Name[ru]=Физика -Icon=e-module-physics +Name[sr]= +Name[tr]= Comment=Enlightenment Physics Professor Comment[ca]=El professor de física de l'Enlightenment +Comment[eo]=Profesoro de Enlightenment pri fiziko Comment[es]=El profesor de física de Enlightenment +Comment[fr]=Professeur de physique pour Enlightenment Comment[gl]=O profesor de física de Enlightenment Comment[it]=Il professore di fisica di Enlightenment Comment[pt]=Professor de física do Enlightenment +Icon=e-module-physics X-Enlightenment-ModuleType=look diff --git a/src/modules/quickaccess/module.desktop b/src/modules/quickaccess/module.desktop index 53f3d266b9..a301a9cd96 100644 --- a/src/modules/quickaccess/module.desktop +++ b/src/modules/quickaccess/module.desktop @@ -1,17 +1,32 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Quickaccess +Name[Name]=Quickaccess +Name[ab]= Name[ca]=Accés ràpid +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Rapida atingo Name[es]=Acceso rápido +Name[fr]=Accès rapide Name[gl]=Acceso rápido +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Acesso rápido Name[ru]=Быстрый доступ -Icon=e-module-quickaccess +Name[sr]= +Name[tr]= Comment=Enlightenment Quickaccess Launcher Comment[ca]=Llançador de l'accés ràpid de l'Enlightenment +Comment[eo]=Rapidatinga lanĉilo de Enlightenment Comment[es]=Lanzador del acceso rápido de Enlightenment Comment[gl]=Iniciador do acceso rápido de Enlightenment Comment[it]=Lanciatore ad accesso rapido di Enlightenment Comment[pt]=Acesso rápido do Enlightenment Comment[ru]=Модуль быстрого запуска для Enlightenment +Icon=e-module-quickaccess X-Enlightenment-ModuleType=launcher diff --git a/src/modules/quickaccess/module.desktop.in b/src/modules/quickaccess/module.desktop.in index 53f3d266b9..a301a9cd96 100644 --- a/src/modules/quickaccess/module.desktop.in +++ b/src/modules/quickaccess/module.desktop.in @@ -1,17 +1,32 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Quickaccess +Name[Name]=Quickaccess +Name[ab]= Name[ca]=Accés ràpid +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Rapida atingo Name[es]=Acceso rápido +Name[fr]=Accès rapide Name[gl]=Acceso rápido +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Acesso rápido Name[ru]=Быстрый доступ -Icon=e-module-quickaccess +Name[sr]= +Name[tr]= Comment=Enlightenment Quickaccess Launcher Comment[ca]=Llançador de l'accés ràpid de l'Enlightenment +Comment[eo]=Rapidatinga lanĉilo de Enlightenment Comment[es]=Lanzador del acceso rápido de Enlightenment Comment[gl]=Iniciador do acceso rápido de Enlightenment Comment[it]=Lanciatore ad accesso rapido di Enlightenment Comment[pt]=Acesso rápido do Enlightenment Comment[ru]=Модуль быстрого запуска для Enlightenment +Icon=e-module-quickaccess X-Enlightenment-ModuleType=launcher diff --git a/src/modules/shot/module.desktop b/src/modules/shot/module.desktop index c153e74233..603c9e5c5f 100644 --- a/src/modules/shot/module.desktop +++ b/src/modules/shot/module.desktop @@ -1,14 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Shot +Name[Name]=Shot +Name[ab]= Name[ca]=Captura de pantalla +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Ekrankopio +Name[es]= Name[fr]=Capture d'écran +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= Name[ko]=스크린샷 Name[pt]=Capturas de ecrã Name[ru]=Снимок экрана -Icon=e-module-shot -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Simple screenshot+save/upload module Comment[ca]=Mòdul per a desar o compartir captures de pantalla. Comment[eo]=Simpla modulo por registri kaj kunhavigi ekrankopiojn. @@ -19,3 +30,5 @@ Comment[it]=Semplice modulo per il salvataggio e l'upload di istantanee del desk Comment[ko]=간단한 스크린샷 저장/공유 모듈 Comment[pt]=Módulo para capturar, gravar e enviar capturas de ecrã Comment[ru]=Модуль для сохранения/загрузки снимков экрана. +Icon=e-module-shot +X-Enlightenment-ModuleType=utils diff --git a/src/modules/shot/module.desktop.in b/src/modules/shot/module.desktop.in index c153e74233..603c9e5c5f 100644 --- a/src/modules/shot/module.desktop.in +++ b/src/modules/shot/module.desktop.in @@ -1,14 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Shot +Name[Name]=Shot +Name[ab]= Name[ca]=Captura de pantalla +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Ekrankopio +Name[es]= Name[fr]=Capture d'écran +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= Name[ko]=스크린샷 Name[pt]=Capturas de ecrã Name[ru]=Снимок экрана -Icon=e-module-shot -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Simple screenshot+save/upload module Comment[ca]=Mòdul per a desar o compartir captures de pantalla. Comment[eo]=Simpla modulo por registri kaj kunhavigi ekrankopiojn. @@ -19,3 +30,5 @@ Comment[it]=Semplice modulo per il salvataggio e l'upload di istantanee del desk Comment[ko]=간단한 스크린샷 저장/공유 모듈 Comment[pt]=Módulo para capturar, gravar e enviar capturas de ecrã Comment[ru]=Модуль для сохранения/загрузки снимков экрана. +Icon=e-module-shot +X-Enlightenment-ModuleType=utils diff --git a/src/modules/start/module.desktop b/src/modules/start/module.desktop index 14f50ba8f1..84de4b34f9 100644 --- a/src/modules/start/module.desktop +++ b/src/modules/start/module.desktop @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Start +Name[Name]=Start +Name[ab]= Name[ca]=Inici Name[cs]=Start menu Name[de]=Startmenü @@ -10,11 +13,13 @@ Name[es]=Inicio Name[fr]=Démarrer Name[gl]=Inicio Name[hu]=Start menü +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Iniciar Name[ru]=Меню запуска +Name[sr]= Name[tr]=Başlat -Icon=e-module-start -X-Enlightenment-ModuleType=utils Comment=Enlightenment's "Start" button equivalent. Comment[ca]=L'equivalent al botó "Inici" a l'Enlightenment. Comment[cs]=Enlightenment Start menu. @@ -33,3 +38,5 @@ Comment[ru]=Эквивалент кнопки "Пуск" для Enlightenment. Comment[tr]=Enlightenment'nin "Başlat" düğmesi eşdeğeri. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-start +X-Enlightenment-ModuleType=utils diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop.in index 14f50ba8f1..84de4b34f9 100644 --- a/src/modules/start/module.desktop.in +++ b/src/modules/start/module.desktop.in @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Start +Name[Name]=Start +Name[ab]= Name[ca]=Inici Name[cs]=Start menu Name[de]=Startmenü @@ -10,11 +13,13 @@ Name[es]=Inicio Name[fr]=Démarrer Name[gl]=Inicio Name[hu]=Start menü +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Iniciar Name[ru]=Меню запуска +Name[sr]= Name[tr]=Başlat -Icon=e-module-start -X-Enlightenment-ModuleType=utils Comment=Enlightenment's "Start" button equivalent. Comment[ca]=L'equivalent al botó "Inici" a l'Enlightenment. Comment[cs]=Enlightenment Start menu. @@ -33,3 +38,5 @@ Comment[ru]=Эквивалент кнопки "Пуск" для Enlightenment. Comment[tr]=Enlightenment'nin "Başlat" düğmesi eşdeğeri. Comment[zh_CN]= Comment[zh_TW]= +Icon=e-module-start +X-Enlightenment-ModuleType=utils diff --git a/src/modules/syscon/module.desktop b/src/modules/syscon/module.desktop index 2dd9f99c23..7e7b58708b 100644 --- a/src/modules/syscon/module.desktop +++ b/src/modules/syscon/module.desktop @@ -1,19 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=System Controls +Name[Name]=System Controls +Name[ab]= Name[ca]=Controls del sistema Name[cs]=Ovládací prvky Name[de]=Abmeldedialog +Name[el]= Name[eo]=Kontroloj de sistemo Name[es]=Controles del sistema Name[fr]=Contrôles du système Name[gl]=Controis do sistema Name[hu]=Rendszer felügyelő Name[it]=Controlli di sistema +Name[ja]= +Name[ko]= Name[pt]=Controlos do sistema Name[ru]=Управление системой +Name[sr]= Name[tr]=Sistem Kontrolleri -Icon=e-module-syscon Comment=This module provides a unified popup<br>dialog for all the system actions<br>in Enlightenment. Comment[ca]=Aquest mòdul proporciona una finestra emergent<br>unificada per a totes les accions del<br>sistema en l'Enlightenment. Comment[cs]=Poskytuje dialog pro všechny<br>systémové akce v Enlightenmentu. @@ -27,4 +33,5 @@ Comment[it]=Questo modulo fornisce una finestra di dialogo popup<br>unificata pe Comment[pt]=Disponibiliza o acesso ao sistema de ações do Enlightenment Comment[ru]=Этот модуль обеспечивает единое<br>диалоговое окно для всех системных действий<br>в Enlightenment. Comment[tr]=Tüm sistem eylemleri için özelleştirilmiş<br>açılır pencere diyaloğu sunan Enlightenment modülü. +Icon=e-module-syscon X-Enlightenment-ModuleType=core diff --git a/src/modules/syscon/module.desktop.in b/src/modules/syscon/module.desktop.in index 2dd9f99c23..7e7b58708b 100644 --- a/src/modules/syscon/module.desktop.in +++ b/src/modules/syscon/module.desktop.in @@ -1,19 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=System Controls +Name[Name]=System Controls +Name[ab]= Name[ca]=Controls del sistema Name[cs]=Ovládací prvky Name[de]=Abmeldedialog +Name[el]= Name[eo]=Kontroloj de sistemo Name[es]=Controles del sistema Name[fr]=Contrôles du système Name[gl]=Controis do sistema Name[hu]=Rendszer felügyelő Name[it]=Controlli di sistema +Name[ja]= +Name[ko]= Name[pt]=Controlos do sistema Name[ru]=Управление системой +Name[sr]= Name[tr]=Sistem Kontrolleri -Icon=e-module-syscon Comment=This module provides a unified popup<br>dialog for all the system actions<br>in Enlightenment. Comment[ca]=Aquest mòdul proporciona una finestra emergent<br>unificada per a totes les accions del<br>sistema en l'Enlightenment. Comment[cs]=Poskytuje dialog pro všechny<br>systémové akce v Enlightenmentu. @@ -27,4 +33,5 @@ Comment[it]=Questo modulo fornisce una finestra di dialogo popup<br>unificata pe Comment[pt]=Disponibiliza o acesso ao sistema de ações do Enlightenment Comment[ru]=Этот модуль обеспечивает единое<br>диалоговое окно для всех системных действий<br>в Enlightenment. Comment[tr]=Tüm sistem eylemleri için özelleştirilmiş<br>açılır pencere diyaloğu sunan Enlightenment modülü. +Icon=e-module-syscon X-Enlightenment-ModuleType=core diff --git a/src/modules/systray/module.desktop b/src/modules/systray/module.desktop index c6db1b4555..c771a133f0 100644 --- a/src/modules/systray/module.desktop +++ b/src/modules/systray/module.desktop @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Systray +Name[Name]=Systray +Name[ab]= Name[ca]=Àrea de notificacions Name[cs]=Upozorňovací oblast Name[de]=Systemleiste Name[el]=Ενδείξεις συστήματος -Name[eo]=Taskopleto +Name[eo]=Sistempleto Name[es]=Bandeja del sistema Name[fr]=Zone de notification Name[gl]=Bandexa do sistema +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Área de notificação Name[ru]=Системный лоток +Name[sr]= Name[tr]=Sistem Çekmecesi -Icon=e-module-systray Comment=system tray that hold applications icons like Skype, Pidgin, Kopete and others. Comment[ca]=Zona que conté les icones d'aplicacions com Skype, Pidgin, Kopete i altres. Comment[cs]=spravuje aplikace jako Skype, Pidgin, Kopete a jiné. @@ -26,4 +33,5 @@ Comment[it]=Un'area che contiene le icone di notifica di applicazioni come Skype Comment[pt]=Área de notificação que exibe os ícones de diversas aplicações Comment[ru]=Системный лоток содержащий значки приложений типа Skype, Pidgin, Kopete и других. Comment[tr]=Skype, Pidgin, Kopete ve diğerleri gibi uygulamaların simgelerini barındıran sistem çekmecesi. +Icon=e-module-systray X-Enlightenment-ModuleType=utils diff --git a/src/modules/systray/module.desktop.in b/src/modules/systray/module.desktop.in index c6db1b4555..c771a133f0 100644 --- a/src/modules/systray/module.desktop.in +++ b/src/modules/systray/module.desktop.in @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Systray +Name[Name]=Systray +Name[ab]= Name[ca]=Àrea de notificacions Name[cs]=Upozorňovací oblast Name[de]=Systemleiste Name[el]=Ενδείξεις συστήματος -Name[eo]=Taskopleto +Name[eo]=Sistempleto Name[es]=Bandeja del sistema Name[fr]=Zone de notification Name[gl]=Bandexa do sistema +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Área de notificação Name[ru]=Системный лоток +Name[sr]= Name[tr]=Sistem Çekmecesi -Icon=e-module-systray Comment=system tray that hold applications icons like Skype, Pidgin, Kopete and others. Comment[ca]=Zona que conté les icones d'aplicacions com Skype, Pidgin, Kopete i altres. Comment[cs]=spravuje aplikace jako Skype, Pidgin, Kopete a jiné. @@ -26,4 +33,5 @@ Comment[it]=Un'area che contiene le icone di notifica di applicazioni come Skype Comment[pt]=Área de notificação que exibe os ícones de diversas aplicações Comment[ru]=Системный лоток содержащий значки приложений типа Skype, Pidgin, Kopete и других. Comment[tr]=Skype, Pidgin, Kopete ve diğerleri gibi uygulamaların simgelerini barındıran sistem çekmecesi. +Icon=e-module-systray X-Enlightenment-ModuleType=utils diff --git a/src/modules/tasks/module.desktop b/src/modules/tasks/module.desktop index 7cc1877cab..c70cb739cd 100644 --- a/src/modules/tasks/module.desktop +++ b/src/modules/tasks/module.desktop @@ -1,15 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Tasks +Name[Name]=Tasks +Name[ab]= Name[ca]=Tasques +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Taskoj Name[es]=Tareas Name[fr]=Tâches Name[gl]=Tarefas +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Tarefas Name[ru]=Задачи -Icon=e-module-tasks -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Gadget to allow you to switch tasks Comment[ca]=Mòdul que permet el canvi entre tasques. Comment[eo]=Akcesoraĵo kiu permesas baskuli taskojn @@ -19,3 +29,5 @@ Comment[gl]=Módulo que lle permite o troco de tarefas. Comment[it]=Gadget che permette di commutare tra i task. Comment[pt]=Módulo que lhe permite trocar entre tarefas Comment[ru]=Гаджет для переключения задач +Icon=e-module-tasks +X-Enlightenment-ModuleType=utils diff --git a/src/modules/tasks/module.desktop.in b/src/modules/tasks/module.desktop.in index 7cc1877cab..c70cb739cd 100644 --- a/src/modules/tasks/module.desktop.in +++ b/src/modules/tasks/module.desktop.in @@ -1,15 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Tasks +Name[Name]=Tasks +Name[ab]= Name[ca]=Tasques +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Taskoj Name[es]=Tareas Name[fr]=Tâches Name[gl]=Tarefas +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Tarefas Name[ru]=Задачи -Icon=e-module-tasks -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Gadget to allow you to switch tasks Comment[ca]=Mòdul que permet el canvi entre tasques. Comment[eo]=Akcesoraĵo kiu permesas baskuli taskojn @@ -19,3 +29,5 @@ Comment[gl]=Módulo que lle permite o troco de tarefas. Comment[it]=Gadget che permette di commutare tra i task. Comment[pt]=Módulo que lhe permite trocar entre tarefas Comment[ru]=Гаджет для переключения задач +Icon=e-module-tasks +X-Enlightenment-ModuleType=utils diff --git a/src/modules/temperature/module.desktop b/src/modules/temperature/module.desktop index fafd2c1282..d8ed65b8cb 100644 --- a/src/modules/temperature/module.desktop +++ b/src/modules/temperature/module.desktop @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Temperature +Name[Name]=Temperature +Name[ab]= Name[ca]=Temperatura Name[cs]=Teplota Name[de]=Temperatur +Name[el]= Name[eo]=Temperaturo Name[es]=Temperatura Name[fr]=Température Name[gl]=Temperatura Name[hu]=Hőmérséklet +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Temperatura Name[ru]=Температура +Name[sr]=Топлота Name[tr]=Sıcaklık -Icon=e-module-temperature Comment=Temperature monitor. Comment[ca]=Monitor de la temperatura. Comment[cs]=Měřič teploty. @@ -25,5 +32,7 @@ Comment[hu]=Egy hőmérséklet monitorozó modul. Comment[it]=Monitor per le temperature. Comment[pt]=Monitorizador de temperatura Comment[ru]=Измеряет и показывает температуру системы. +Comment[sr]=Прати топлотне вредности. Comment[tr]=Sıcaklık izleyici. +Icon=e-module-temperature X-Enlightenment-ModuleType=system diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop.in index fafd2c1282..d8ed65b8cb 100644 --- a/src/modules/temperature/module.desktop.in +++ b/src/modules/temperature/module.desktop.in @@ -1,18 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Temperature +Name[Name]=Temperature +Name[ab]= Name[ca]=Temperatura Name[cs]=Teplota Name[de]=Temperatur +Name[el]= Name[eo]=Temperaturo Name[es]=Temperatura Name[fr]=Température Name[gl]=Temperatura Name[hu]=Hőmérséklet +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Temperatura Name[ru]=Температура +Name[sr]=Топлота Name[tr]=Sıcaklık -Icon=e-module-temperature Comment=Temperature monitor. Comment[ca]=Monitor de la temperatura. Comment[cs]=Měřič teploty. @@ -25,5 +32,7 @@ Comment[hu]=Egy hőmérséklet monitorozó modul. Comment[it]=Monitor per le temperature. Comment[pt]=Monitorizador de temperatura Comment[ru]=Измеряет и показывает температуру системы. +Comment[sr]=Прати топлотне вредности. Comment[tr]=Sıcaklık izleyici. +Icon=e-module-temperature X-Enlightenment-ModuleType=system diff --git a/src/modules/tiling/module.desktop b/src/modules/tiling/module.desktop index 913f97b1c2..dba086d7c8 100644 --- a/src/modules/tiling/module.desktop +++ b/src/modules/tiling/module.desktop @@ -1,18 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Tiling +Name[Name]=Tiling +Name[ab]= Name[ca]=Mosaic +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Kaheligado Name[es]=Mosaico Name[fr]=Pavage Name[gl]=Mosaico +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Мозаичный режим -Icon=e-module-tiling +Name[sr]= +Name[tr]= Comment=Positions/resizes your windows tilingly. Comment[ca]=Posiciona/redimensiona les finestres en mosaics. +Comment[eo]=Poziciigi kaj regrandigi viajn fenestrojn kaheligante. Comment[es]=Posicione/redimensione sus ventanas en mosaicos. Comment[fr]=Place/Redimensionne les fenêtres sans les superposer. Comment[gl]=Posicione/redimensione as súas xanelas en mosaicos. Comment[it]=Posiziona/ridimensiona le finestre disponendole in griglia. Comment[pt]=Posiciona/ajusta as janelas em mosaicos Comment[ru]=Мозаичный режим расположения окон +Icon=e-module-tiling X-Enlightenment-ModuleType=core diff --git a/src/modules/tiling/module.desktop.in b/src/modules/tiling/module.desktop.in index 913f97b1c2..dba086d7c8 100644 --- a/src/modules/tiling/module.desktop.in +++ b/src/modules/tiling/module.desktop.in @@ -1,18 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Tiling +Name[Name]=Tiling +Name[ab]= Name[ca]=Mosaic +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Kaheligado Name[es]=Mosaico Name[fr]=Pavage Name[gl]=Mosaico +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Мозаичный режим -Icon=e-module-tiling +Name[sr]= +Name[tr]= Comment=Positions/resizes your windows tilingly. Comment[ca]=Posiciona/redimensiona les finestres en mosaics. +Comment[eo]=Poziciigi kaj regrandigi viajn fenestrojn kaheligante. Comment[es]=Posicione/redimensione sus ventanas en mosaicos. Comment[fr]=Place/Redimensionne les fenêtres sans les superposer. Comment[gl]=Posicione/redimensione as súas xanelas en mosaicos. Comment[it]=Posiziona/ridimensiona le finestre disponendole in griglia. Comment[pt]=Posiciona/ajusta as janelas em mosaicos Comment[ru]=Мозаичный режим расположения окон +Icon=e-module-tiling X-Enlightenment-ModuleType=core diff --git a/src/modules/winlist/module.desktop b/src/modules/winlist/module.desktop index 894f4e876a..3f1c71033b 100644 --- a/src/modules/winlist/module.desktop +++ b/src/modules/winlist/module.desktop @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Window Switcher +Name[Name]=Window Switcher +Name[ab]= Name[ca]=Alternador de finestres Name[cs]=Přepínač oken Name[de]=Fensterwechsel-Liste @@ -11,10 +14,12 @@ Name[fr]=Liste de commutation Name[gl]=Alternador de xanelas Name[hu]=Ablak lista/váltó Name[it]=Commutatore finestre +Name[ja]= +Name[ko]= Name[pt]=Alternador de janelas Name[ru]=Список переключения окон +Name[sr]=Измењивач прозора Name[tr]=Pencere Değiştirici Listesi -Icon=e-module-winlist Comment=A module to show the list of client applications presently running. Comment[ca]=Un mòdul que mostra la llista d'aplicacions que s'estan executant. Comment[cs]=Modul pro zobrazení seznamu běžících aplikací. @@ -28,5 +33,7 @@ Comment[hu]=A modul megmutatja az éppen futó alkalmazások ablakainak listáj Comment[it]=Un modulo che mostra un elenco delle applicazioni in esecuzione. Comment[pt]=Módulo que exibe a lista de aplicações abertas Comment[ru]=Модуль для показа списка запущенных приложений (список клиентов). +Comment[sr]=Једница која показује списак тренутно покренутих клијентских програма. Comment[tr]=Mevcut çalışan istemci uygulamaların listesini gösteren modül. +Icon=e-module-winlist X-Enlightenment-ModuleType=core diff --git a/src/modules/winlist/module.desktop.in b/src/modules/winlist/module.desktop.in index 894f4e876a..3f1c71033b 100644 --- a/src/modules/winlist/module.desktop.in +++ b/src/modules/winlist/module.desktop.in @@ -1,6 +1,9 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Window Switcher +Name[Name]=Window Switcher +Name[ab]= Name[ca]=Alternador de finestres Name[cs]=Přepínač oken Name[de]=Fensterwechsel-Liste @@ -11,10 +14,12 @@ Name[fr]=Liste de commutation Name[gl]=Alternador de xanelas Name[hu]=Ablak lista/váltó Name[it]=Commutatore finestre +Name[ja]= +Name[ko]= Name[pt]=Alternador de janelas Name[ru]=Список переключения окон +Name[sr]=Измењивач прозора Name[tr]=Pencere Değiştirici Listesi -Icon=e-module-winlist Comment=A module to show the list of client applications presently running. Comment[ca]=Un mòdul que mostra la llista d'aplicacions que s'estan executant. Comment[cs]=Modul pro zobrazení seznamu běžících aplikací. @@ -28,5 +33,7 @@ Comment[hu]=A modul megmutatja az éppen futó alkalmazások ablakainak listáj Comment[it]=Un modulo che mostra un elenco delle applicazioni in esecuzione. Comment[pt]=Módulo que exibe a lista de aplicações abertas Comment[ru]=Модуль для показа списка запущенных приложений (список клиентов). +Comment[sr]=Једница која показује списак тренутно покренутих клијентских програма. Comment[tr]=Mevcut çalışan istemci uygulamaların listesini gösteren modül. +Icon=e-module-winlist X-Enlightenment-ModuleType=core diff --git a/src/modules/wizard/data/desktop/home.desktop b/src/modules/wizard/data/desktop/home.desktop index 1eab30db1b..a2424f853b 100644 --- a/src/modules/wizard/data/desktop/home.desktop +++ b/src/modules/wizard/data/desktop/home.desktop @@ -1,20 +1,34 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Home +Name[Name]=Home +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Hejmo Name[es]=Carpeta personal +Name[fr]=Accueil Name[gl]=Cartafol persoal +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Pasta pessoal Name[ru]=Домашний каталог +Name[sr]= +Name[tr]= Comment=The Directory containing all your personal files Comment[eo]=La dosierujo enhavante viajn proprajn dosieroj Comment[es]=El directorio que contiene todos sus archivos personales Comment[fr]=Le dossier contenant vos fichiers personnels Comment[gl]=O directorio que contén tódolos seus ficheiros persoais Comment[it]=La directory contenente i vostri file personali -Comment[pt]=O diretório dos ficheiros do utilizador +Comment[pt]=O diretório com os ficheiros do utilizador Comment[ru]=Каталог содержащий ваши личные файлы -Type=Link -X-Enlightenment-Type=Mount -URL=file:$HOME Icon=user-home NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:$HOME +X-Enlightenment-Type=Mount diff --git a/src/modules/wizard/data/desktop/root.desktop b/src/modules/wizard/data/desktop/root.desktop index e9726590c1..fe7ef40d4c 100644 --- a/src/modules/wizard/data/desktop/root.desktop +++ b/src/modules/wizard/data/desktop/root.desktop @@ -1,17 +1,34 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Root +Name[Name]=Root +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Radiko +Name[es]= +Name[fr]=Dossier racine +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= Name[ru]=Корневой каталог +Name[sr]= +Name[tr]= Comment=The Root Filesystem base Comment[eo]=La radika dosiersistemo Comment[es]=El sistema de archivos root Comment[fr]=Le système de fichiers à la base Comment[gl]=O sistema de ficheiros root Comment[it]=Il filesystem principale -Comment[pt]=Sistema de ficheiros root +Comment[pt]=O sistema de ficheiros root Comment[ru]=Корень файловой системы -Type=Link -X-Enlightenment-Type=Mount -URL=file:/ Icon=computer NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:/ +X-Enlightenment-Type=Mount diff --git a/src/modules/wizard/data/desktop/tmp.desktop b/src/modules/wizard/data/desktop/tmp.desktop index 766dcd3cfa..bc02a76040 100644 --- a/src/modules/wizard/data/desktop/tmp.desktop +++ b/src/modules/wizard/data/desktop/tmp.desktop @@ -1,8 +1,25 @@ [Desktop Entry] +Encoding=UTF-8 +Type=Link Name=Temp +Name[Name]=Temp +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= Name[eo]=Dumtempaj +Name[es]= +Name[fr]=Temporaires +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Temporários Name[ru]=Временный каталог +Name[sr]= +Name[tr]= Comment=Temporary files Comment[eo]=Dumtempaj dosieroj Comment[es]=Archivos temporales @@ -11,8 +28,7 @@ Comment[gl]=Ficheiros temporais Comment[it]=File temporanei Comment[pt]=Ficheiros temporários Comment[ru]=Временные файлы -Type=Link -X-Enlightenment-Type=Mount -URL=file:/tmp Icon=user-temp NotShowIn=GNOME;KDE;LXDE;ROX;XFCE; +URL=file:/tmp +X-Enlightenment-Type=Mount diff --git a/src/modules/wizard/data/extra_desktops/mplayer.desktop b/src/modules/wizard/data/extra_desktops/mplayer.desktop index 6c28157e94..767b5525ca 100644 --- a/src/modules/wizard/data/extra_desktops/mplayer.desktop +++ b/src/modules/wizard/data/extra_desktops/mplayer.desktop @@ -1,21 +1,42 @@ [Desktop Entry] +Encoding=UTF-8 Type=Application Name=MPlayer +Name[Name]=MPlayer +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=MPlayer +Name[es]= +Name[fr]=MPlayer +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= GenericName=Movie Player GenericName[eo]=Ludilo de videoj GenericName[es]=Reproductor de vídeo +GenericName[fr]=Lecteur de films GenericName[gl]=Reprodutor de vídeo GenericName[pt]=Reprodutor multimédia GenericName[ru]=Видеоплеер Comment=Watch movies and videos Comment[eo]=Por spekti filmojn kaj videojn Comment[es]=Para ver películas y vídeos +Comment[fr]=Regarder des films et vidéos Comment[gl]=Para ver películas e vídeos Comment[it]=Per guardare filmati e video Comment[pt]=Ver filmes e ouvir músicas Comment[ru]=Просмотр фильмов и видео -Exec=mplayer %U Icon=video_player -StartupWMClass=MPlayer -Categories=AudioVideo;Player; +Exec=mplayer %U MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd; +Categories=AudioVideo;Player; +StartupWMClass=MPlayer diff --git a/src/modules/wizard/data/extra_desktops/xterm.desktop b/src/modules/wizard/data/extra_desktops/xterm.desktop index f29ccd1c08..59ab88cd2c 100644 --- a/src/modules/wizard/data/extra_desktops/xterm.desktop +++ b/src/modules/wizard/data/extra_desktops/xterm.desktop @@ -1,17 +1,38 @@ [Desktop Entry] +Encoding=UTF-8 Type=Application Name=XTerm +Name[Name]=XTerm +Name[ab]= +Name[ca]= +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=XTerm +Name[es]= +Name[fr]=XTerm +Name[gl]= +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= +Name[pt]= +Name[ru]= +Name[sr]= +Name[tr]= GenericName=Terminal GenericName[eo]=Terminalo +GenericName[fr]=Console GenericName[ru]=Терминал Comment=Run commands in a shell Comment[eo]=Lanĉi komandojn en ĉelo Comment[es]=Ejecute comandos en una consola +Comment[fr]=Lancer des commandes dans le shell Comment[gl]=Execute comandos nunha consola Comment[it]=Esegue comandi in una shell Comment[pt]=Execução de comandos na consola Comment[ru]=Запуск команд в командной оболочке -Exec=xterm Icon=xterm -StartupWMClass=XTerm +Exec=xterm Categories=Utility;TerminalEmulator;System; +StartupWMClass=XTerm diff --git a/src/modules/xkbswitch/module.desktop b/src/modules/xkbswitch/module.desktop index e4557375f6..219ae29b79 100644 --- a/src/modules/xkbswitch/module.desktop +++ b/src/modules/xkbswitch/module.desktop @@ -1,19 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Keyboard +Name[Name]=Keyboard +Name[ab]= Name[ca]=Teclat +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Klavaro Name[es]=Teclado Name[fr]=Clavier Name[gl]=Teclado +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Teclado Name[ru]=Клавиатура -Icon=preferences-desktop-keyboard -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Keyboard layout configuration and switcher Comment[ca]=Configuració i commutació de les disposicions del teclat. +Comment[eo]=Agordo de klavara arango kaj interŝanĝilo Comment[es]=Configuración y conmutador de las disposiciones del teclado. Comment[fr]=Pour configurer et basculer l'agencement du clavier. Comment[gl]=Configuración e alteración das disposicións do teclado. Comment[it]=Per configurare e commutare il layout di tastiera. Comment[pt]=Configuração e alteração dos esquemas de teclado Comment[ru]=Настройка и переключение раскладки клавиатуры +Icon=preferences-desktop-keyboard +X-Enlightenment-ModuleType=utils diff --git a/src/modules/xkbswitch/module.desktop.in b/src/modules/xkbswitch/module.desktop.in index e4557375f6..219ae29b79 100644 --- a/src/modules/xkbswitch/module.desktop.in +++ b/src/modules/xkbswitch/module.desktop.in @@ -1,19 +1,33 @@ [Desktop Entry] +Encoding=UTF-8 Type=Link Name=Keyboard +Name[Name]=Keyboard +Name[ab]= Name[ca]=Teclat +Name[cs]= +Name[de]= +Name[el]= +Name[eo]=Klavaro Name[es]=Teclado Name[fr]=Clavier Name[gl]=Teclado +Name[hu]= +Name[it]= +Name[ja]= +Name[ko]= Name[pt]=Teclado Name[ru]=Клавиатура -Icon=preferences-desktop-keyboard -X-Enlightenment-ModuleType=utils +Name[sr]= +Name[tr]= Comment=Keyboard layout configuration and switcher Comment[ca]=Configuració i commutació de les disposicions del teclat. +Comment[eo]=Agordo de klavara arango kaj interŝanĝilo Comment[es]=Configuración y conmutador de las disposiciones del teclado. Comment[fr]=Pour configurer et basculer l'agencement du clavier. Comment[gl]=Configuración e alteración das disposicións do teclado. Comment[it]=Per configurare e commutare il layout di tastiera. Comment[pt]=Configuração e alteração dos esquemas de teclado Comment[ru]=Настройка и переключение раскладки клавиатуры +Icon=preferences-desktop-keyboard +X-Enlightenment-ModuleType=utils