Merge remote-tracking branch 'remotes/origin/upstream'

32 files changed, 604 insertions, 83 deletions

diff --git a/.gitignore b/.gitignore
index b11e722..119db4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ autom4te.cache/
 /config.log
 /config.status
 /config.sub
+/config.rpath
 /configure
 /depcomp
 doc/Doxyfile
@@ -45,6 +46,109 @@ src/tests/efreet_cache_test
 src/tests/efreet_icon_cache_dump
 src/tests/efreet_spec_test
 src/tests/efreet_test
+/m4/codeset.m4
+/m4/gettext.m4
+/m4/glibc21.m4
+/m4/iconv.m4
+/m4/intdiv0.m4
+/m4/intmax.m4
+/m4/inttypes-pri.m4
+/m4/inttypes.m4
+/m4/inttypes_h.m4
+/m4/isc-posix.m4
+/m4/lcmessage.m4
+/m4/lib-ld.m4
+/m4/lib-link.m4/m4/codeset.m4
+/m4/gettext.m4
+/m4/glibc21.m4
+/m4/iconv.m4
+/m4/intdiv0.m4
+/m4/intmax.m4
+/m4/inttypes-pri.m4
+/m4/inttypes.m4
+/m4/inttypes_h.m4
+/m4/isc-posix.m4
+/m4/lcmessage.m4
+/m4/lib-ld.m4
+/m4/lib-link.m4
+/m4/lib-prefix.m4
+/m4/libtool.m4
+/m4/longdouble.m4
+/m4/longlong.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/m4/nls.m4
+/m4/po.m4
+/m4/printf-posix.m4
+/m4/progtest.m4
+/m4/signed.m4
+/m4/size_max.m4
+/m4/stdint_h.m4
+/m4/uintmax_t.m4
+/m4/ulonglong.m4
+/m4/wchar_t.m4
+/m4/wint_t.m4
+/m4/xsize.m4
+/m4/glibc2.m4
+/m4/lib-prefix.m4
+/m4/libtool.m4
+/m4/longdouble.m4
+/m4/longlong.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/m4/nls.m4
+/m4/po.m4
+/m4/printf-posix.m4
+/m4/progtest.m4
+/m4/signed.m4
+/m4/size_max.m4
+/m4/stdint_h.m4
+/m4/uintmax_t.m4
+/m4/ulonglong.m4
+/m4/wchar_t.m4
+/m4/wint_t.m4
+/m4/xsize.m4
+/m4/glibc2.m4
+/m4/intl.m4
+/m4/intldir.m4
+/m4/intlmacosx.m4
+/m4/lock.m4
+/m4/visibility.m4/m4/intl.m4
+/m4/intldir.m4
+/m4/intlmacosx.m4
+/m4/lock.m4
+/m4/visibility.m4
+/po/Makefile.in.in
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/boldquot.sed
+/po/ecore.pot
+/po/en@boldquot.header
+/po/en@quot.header
+/po/insert-header.sin
+/po/quot.sed
+/po/remove-potcdate.sed
+/po/remove-potcdate.sin
+/po/stamp-po
+/po/Makefile.in.in
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/boldquot.sed
+/po/ecore.pot
+/po/en@boldquot.header
+/po/en@quot.header
+/po/insert-header.sin
+/po/quot.sed
+/po/remove-potcdate.sed
+/po/remove-potcdate.sin
+/po/*.gmo
+/po/stamp-po
 /stamp-h1
 debian/*.debhelper.log
 debian/*.substvars
diff --git a/ChangeLog b/ChangeLog
index 08e577c..213d4a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,6 +124,6 @@
 
         * Support XDG_DESKTOP_DIR
 
-2012-06-14  Mike Blumenkrantz
+2012-06-25  Sebastian Dransfeld
 
-        * Added efreet_dirs_reset() to delete cached env variable information
+        * Added efreet_lang_reset() to reset language dependent variables and caches
diff --git a/Makefile.am b/Makefile.am
index 5e4fbf9..a159015 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ aclocal.m4 \
 config.guess \
 config.h.in \
 config.h.in~ \
+config.rpath \
 config.sub \
 configure \
 depcomp \
@@ -21,7 +22,56 @@ m4/libtool.m4 \
 m4/lt~obsolete.m4 \
 m4/ltoptions.m4 \
 m4/ltsugar.m4 \
-m4/ltversion.m4
+m4/ltversion.m4 \
+m4/codeset.m4 \
+m4/gettext.m4* \
+m4/glibc2*.m4 \
+m4/iconv.m4 \
+m4/intdiv0.m4 \
+m4/intldir.m4 \
+m4/intl.m4 \
+m4/intlmacosx.m4 \
+m4/intmax.m4* \
+m4/inttypes_h.m4 \
+m4/inttypes.m4 \
+m4/inttypes-pri.m4 \
+m4/isc-posix.m4 \
+m4/lcmessage.m4 \
+m4/lib-ld.m4* \
+m4/lib-link.m4 \
+m4/lib-prefix.m4* \
+m4/lock.m4 \
+m4/longdouble.m4* \
+m4/longlong.m4* \
+m4/nls.m4 \
+m4/po.m4* \
+m4/printf-posix.m4* \
+m4/progtest.m4 \
+m4/signed.m4 \
+m4/size_max.m4* \
+m4/stdint_h.m4 \
+m4/uintmax_t.m4 \
+m4/ulonglong.m4* \
+m4/visibility.m4 \
+m4/wchar_t.m4 \
+m4/wint_t.m4* \
+m4/xsize.m4*
+
+if HAVE_PO
+SUBDIRS += po
+
+MAINTAINERCLEANFILES += \
+			po/boldquot.sed \
+			po/en@boldquot.header \
+			po/en@quot.header \
+			po/insert-header.sin \
+			po/Makefile.in.in* \
+			po/Makevars.template \
+			po/quot.sed \
+			po/remove-potcdate.sin \
+			po/Rules-quot*
+
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
@@ -62,23 +112,21 @@ endif
 
 if EFL_ENABLE_COVERAGE
 lcov-reset:
-	@rm -rf coverage
-	@find . -name "*.gcda" -exec rm {} \;
-	@lcov --directory . --zerocounters
+	@rm -rf $(top_builddir)/coverage
+	@find $(top_builddir) -name "*.gcda" -delete
+	@lcov --zerocounters --directory $(top_builddir)
 
 lcov-report:
-	@mkdir coverage
-	@lcov --compat-libtool --directory $(top_srcdir)/src --capture --output-file coverage/coverage.info
-	@lcov -l coverage/coverage.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > coverage/remove
-	@lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
-	@rm coverage/remove
-	@mv coverage/coverage.cleaned.info coverage/coverage.info
-	@genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
+	@mkdir $(top_builddir)/coverage
+	lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
+	lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
+	genhtml -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned.info
+	@echo "Coverage Report at $(top_builddir)/coverage/html"
 
 coverage:
-	@make lcov-reset
-	@make check
-	@make lcov-report
+	@$(MAKE) lcov-reset
+	@$(MAKE) check
+	@$(MAKE) lcov-report
 else
 lcov-reset:
 	@echo "reconfigure with --enable-coverage"
diff --git a/NEWS b/NEWS
index aae3349..0c97e4e 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Improvements:
 Additions:
 
     * Support XDG_DESKTOP_DIR
-    * efreet_dirs_reset() for refreshing env vars after locale switches
+    * efreet_lang_reset() for refreshing language variables and caches after locale switches
 
 Efreet 1.2.0
 
diff --git a/autogen.sh b/autogen.sh
index 00116ea..2a59cac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,9 +3,9 @@
 rm -rf autom4te.cache
 rm -f aclocal.m4 ltmain.sh
 
-touch README
 touch ABOUT-NLS
 
+echo "Running autopoint..." ; autopoint -f || :
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
diff --git a/configure.ac b/configure.ac
index 5361064..a400a04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,23 @@ AC_SUBST(release_info)
 VMAJ=v_maj
 AC_SUBST(VMAJ)
 
+AM_GNU_GETTEXT_VERSION(0.17)
+
+m4_ifdef([AM_GNU_GETTEXT], [
+AM_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+have_po="yes"
+],[
+have_po="no"
+])
+AC_SUBST(LTLIBINTL)
+
+if test "x${POSUB}" = "x" ; then
+   have_po="no"
+fi
+
+AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
+
 ### Needed information
 
 AC_CANONICAL_BUILD
@@ -231,6 +248,7 @@ src/tests/Makefile
 src/tests/data/Makefile
 src/tests/data/sub/Makefile
 src/tests/compare/Makefile
+$po_makefile_in
 ])
 
 
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..6e30c56
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,12 @@
+cs
+de
+el
+es
+fr
+it
+ja
+ko
+nl
+pt
+ru
+sl
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..22837ab
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Enlightenment development team
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = enlightenment-devel@lists.sourceforge.net
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..68cb9d8
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1 @@
+src/lib/efreet_base.c
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..f191784
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,20 @@
+# Czech translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Plocha"
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..3df97f5
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,20 @@
+# German translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Arbeitsfläche"
diff --git a/po/efreet.pot b/po/efreet.pot
new file mode 100644
index 0000000..093ea02
--- /dev/null
+++ b/po/efreet.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Enlightenment development team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: efreet 1.2.99.72784\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr ""
diff --git a/po/el.po b/po/el.po
new file mode 100644
index 0000000..585321c
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,20 @@
+# Greek translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Επιφάνεια εργασίας"
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..85ccdc7
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,20 @@
+# Spanish translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Escritorio"
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..203b1e4
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,20 @@
+# French translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Bureau"
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..7f36e1e
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,20 @@
+# Italian translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Scrivania"
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..2ac4cf2
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,20 @@
+# Japanese translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/デスクトップ"
diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..077bca7
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,20 @@
+# Korean translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/바탕화면"
diff --git a/po/nl.po b/po/nl.po
new file mode 100644
index 0000000..17961b3
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,20 @@
+# Dutch translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Bureaublad"
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 0000000..c1f6899
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,20 @@
+# Portuguese translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Área de Trabalho"
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..1c0742e
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,20 @@
+# Russian translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Рабочий стол"
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 0000000..6571dab
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,20 @@
+# Slovenian translation for Efreet.
+# Copyright (C) 2012 Enlightenment development team
+# This file is put in the public domain.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Efreet\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-25 17:14+0900\n"
+"PO-Revision-Date: 2012-06-24 17:10+0900\n"
+"Last-Translator: Jerome Pinot <ngc891@gmail.com>\n"
+"Language-Team: Enlightenment Team\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/lib/efreet_base.c:122
+msgid "/Desktop"
+msgstr "/Namizje"
diff --git a/src/bin/efreet_desktop_cache_create.c b/src/bin/efreet_desktop_cache_create.c
index 16a6322..21f2922 100644
--- a/src/bin/efreet_desktop_cache_create.c
+++ b/src/bin/efreet_desktop_cache_create.c
@@ -23,8 +23,9 @@ static Eet_File *util_ef = NULL;
 
 static Eina_Hash *desktops = NULL;
 
-static Eina_Hash *file_ids = NULL;
-static Eina_Hash *paths = NULL;
+static Eina_Hash         *file_ids = NULL;
+static Efreet_Cache_Hash *old_file_ids = NULL;
+static Eina_Hash         *paths = NULL;
 
 static Eina_Hash *mime_types = NULL;
 static Eina_Hash *categories = NULL;
@@ -69,6 +70,11 @@ cache_add(const char *path, const char *file_id, int priority __UNUSED__, int *c
         else      INF("  NO UNCACHED");
     }
     if (!desk) return 1;
+    if (file_id && old_file_ids && !eina_hash_find(old_file_ids->hash, file_id))
+    {
+        *changed = 1;
+        INF("  NOT IN UTILS");
+    }
     if (!eina_hash_find(paths, desk->orig_path))
     {
         if (!eet_data_write(ef, edd, desk->orig_path, desk, 0))
@@ -281,6 +287,13 @@ main(int argc, char **argv)
         eet_close(ef);
     }
 
+    ef = eet_open(efreet_desktop_util_cache_file(), EET_FILE_MODE_READ);
+    if (ef)
+    {
+        old_file_ids = eet_data_read(ef, efreet_hash_string_edd(), "file_id");
+        eet_close(ef);
+    }
+
     /* create cache */
     snprintf(file, sizeof(file), "%s.XXXXXX", efreet_desktop_cache_file());
     tmpfd = mkstemp(file);
@@ -367,10 +380,7 @@ main(int argc, char **argv)
     }
 
     if (user_dirs)
-    {
-        IF_FREE(user_dirs->array);
-        free(user_dirs);
-    }
+        efreet_cache_array_string_free(user_dirs);
 
     /* store user dirs */
     if (store_dirs)
@@ -428,6 +438,12 @@ main(int argc, char **argv)
     eina_hash_free(comment);
     eina_hash_free(exec);
 
+    if (old_file_ids)
+    {
+        eina_hash_free(old_file_ids->hash);
+        free(old_file_ids);
+    }
+
     eina_hash_free(file_ids);
     eina_hash_free(paths);
 
@@ -501,6 +517,11 @@ error:
     IF_FREE(dir);
 edd_error:
     if (user_dirs) efreet_cache_array_string_free(user_dirs);
+    if (old_file_ids)
+    {
+        eina_hash_free(old_file_ids->hash);
+        free(old_file_ids);
+    }
     efreet_shutdown();
 efreet_error:
     ecore_shutdown();
diff --git a/src/lib/Efreet.h b/src/lib/Efreet.h
index bf5fa11..6d3f96d 100644
--- a/src/lib/Efreet.h
+++ b/src/lib/Efreet.h
@@ -80,19 +80,26 @@ extern "C" {
 #include "efreet_uri.h"
 
 /**
- * @return Returns > 0 if the initialization was successful, 0 otherwise
+ * @return Value > @c 0 if the initialization was successful, @c 0 otherwise.
  * @brief Initializes the Efreet system
  */
 EAPI int efreet_init(void);
 
 /**
- * @return Returns the number of times the init function as been called
- * minus the corresponding init call.
+ * @return The number of times the init function has been called minus the
+ * corresponding init call.
  * @brief Shuts down Efreet if a balanced number of init/shutdown calls have
  * been made
  */
 EAPI int efreet_shutdown(void);
 
+/**
+ * @brief Resets language dependent variables and resets language dependent
+ * caches This must be called whenever the locale is changed.
+ * @since 1.3
+ */
+EAPI void efreet_lang_reset(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/lib/Efreet_Mime.h b/src/lib/Efreet_Mime.h
index 254c3e5..d6873fc 100644
--- a/src/lib/Efreet_Mime.h
+++ b/src/lib/Efreet_Mime.h
@@ -44,49 +44,49 @@ extern "C" {
 
 
 /**
- * @return Returns 1 on success or 0 on failure
+ * @return @c 1 on success or @c 0 on failure.
  * @brief Initializes the efreet mime settings
  */
 EAPI int         efreet_mime_init(void);
 
 /**
- * @return Returns no value
+ * @return No value.
  * @brief Cleans up the efreet mime settings system
  */
 EAPI int         efreet_mime_shutdown(void);
 
 /**
  * @param file The file to find the mime type
- * @return Returns mime type as a string
- * @brief Retreive the mime type of a file
+ * @return Mime type as a string.
+ * @brief Retrieve the mime type of a file
  */
 EAPI const char *efreet_mime_type_get(const char *file);
 
 /**
  * @param file The file to check the mime type
- * @return Returns mime type as a string
- * @brief Retreive the mime type of a file using magic
+ * @return Mime type as a string.
+ * @brief Retrieve the mime type of a file using magic
  */
 EAPI const char *efreet_mime_magic_type_get(const char *file);
 
 /**
  * @param file The file to check the mime type
- * @return Returns mime type as a string
- * @brief Retreive the mime type of a file using globs
+ * @return Mime type as a string.
+ * @brief Retrieve the mime type of a file using globs
  */
 EAPI const char *efreet_mime_globs_type_get(const char *file);
 
 /**
  * @param file The file to check the mime type
- * @return Returns mime type as a string
- * @brief Retreive the special mime type of a file
+ * @return Mime type as a string.
+ * @brief Retrieve the special mime type of a file
  */
 EAPI const char *efreet_mime_special_type_get(const char *file);
 
 /**
  * @param file The file to check the mime type
- * @return Returns mime type as a string
- * @brief Retreive the fallback mime type of a file
+ * @return Mime type as a string.
+ * @brief Retrieve the fallback mime type of a file.
  */
 EAPI const char *efreet_mime_fallback_type_get(const char *file);
 
@@ -95,8 +95,8 @@ EAPI const char *efreet_mime_fallback_type_get(const char *file);
  * @param mime The name of the mime type
  * @param theme The name of the theme to search icons in
  * @param size The wanted size of the icon
- * @return Returns mime type icon path as a string
- * @brief Retreive the mime type icon for a file
+ * @return Mime type icon path as a string.
+ * @brief Retrieve the mime type icon for a file.
  */
 EAPI const char *efreet_mime_type_icon_get(const char *mime, const char *theme,
                                            unsigned int size);
diff --git a/src/lib/Efreet_Trash.h b/src/lib/Efreet_Trash.h
index d6ff401..3f86aa2 100644
--- a/src/lib/Efreet_Trash.h
+++ b/src/lib/Efreet_Trash.h
@@ -41,52 +41,52 @@ extern "C" {
  */
 
 /**
- * @return Returns 1 on success or 0 on failure
+ * @return @c 1 on success or @c 0 on failure.
  * @brief Initializes the efreet trash system
  */
 EAPI int         efreet_trash_init(void);
 
 /**
- * @return Returns no value
+ * @return No value.
  * @brief Cleans up the efreet trash system
  */
 EAPI int         efreet_trash_shutdown(void);
 
 /**
- * @return Returns the XDG Trash local directory or NULL on errors
- * return value must be freed with eina_stringshare_del.
+ * @return The XDG Trash local directory or @c NULL on errors.
+ * Return value must be freed with eina_stringshare_del.
  * @brief Retrieves the XDG Trash local directory
  */
 EAPI const char *efreet_trash_dir_get(const char *for_file);
 
 /**
  * @param uri The local uri to move in the trash
- * @param force_delete If you set this to 1 than files on different filesystems
+ * @param force_delete If you set this to @c 1 than files on different filesystems
  * will be deleted permanently
- * @return Return 1 on success, 0 on failure or -1 in case the uri is not on the
- * same filesystem and force_delete is not set.
+ * @return @c 1 on success, @c 0 on failure or @c -1 in case the uri is not on
+ * the same filesystem and force_delete is not set.
  * @brief This function try to move the given uri to the trash. Files on 
  * different filesystem can't be moved to trash. If force_delete
- * is 0 than non-local files will be ignored and -1 is returned, if you set
- * force_delete to 1 non-local files will be deleted without asking.
+ * is @c 0 than non-local files will be ignored and @c -1 is returned, if you set
+ * force_delete to @c 1 non-local files will be deleted without asking.
  */
 EAPI int         efreet_trash_delete_uri(Efreet_Uri *uri, int force_delete);
 
 /**
- * @return Return a list of strings with filename (remember to free the list
- * when you don't need anymore)
+ * @return A list of strings with filename (remember to free the list
+ * when you don't need anymore).
  * @brief List all the files and directory currently inside the trash.
  */
 EAPI Eina_List  *efreet_trash_ls(void);
 
 /**
- * @return Return 1 if the trash is empty or 0 if some file are in.
+ * @return @c 1 if the trash is empty or @c 0 if some file are in.
  * @brief Check if the trash is currently empty
  */
 EAPI int         efreet_trash_is_empty(void);
 
 /**
- * @return Return 1 on success or 0 on failure
+ * @return @c 1 on success or @c 0 on failure.
  * @brief Delete all the files inside the trash.
  */
 EAPI int         efreet_trash_empty_trash(void);
diff --git a/src/lib/efreet.c b/src/lib/efreet.c
index 7d2f363..7f6792d 100644
--- a/src/lib/efreet.c
+++ b/src/lib/efreet.c
@@ -166,7 +166,19 @@ efreet_shutdown(void)
     return _efreet_init_count;
 }
 
-/**
+EAPI void
+efreet_lang_reset(void)
+{
+    IF_RELEASE(efreet_lang);
+    IF_RELEASE(efreet_lang_country);
+    IF_RELEASE(efreet_lang_modifier);
+    efreet_parsed_locale = 0;  /* reset this in case they init efreet again */
+
+    efreet_dirs_reset();
+    efreet_cache_desktop_update();
+}
+
+ /**
  * @internal
  * @return Returns the current users language setting or NULL if none set
  * @brief Retrieves the current language setting
@@ -220,13 +232,13 @@ efreet_parse_locale(void)
 {
     efreet_parsed_locale = 1;
 
-    if (efreet_parse_locale_setting("LC_ALL"))
+    if (efreet_parse_locale_setting("LANG"))
         return;
 
-    if (efreet_parse_locale_setting("LC_MESSAGES"))
+    if (efreet_parse_locale_setting("LC_ALL"))
         return;
 
-    efreet_parse_locale_setting("LANG");
+    efreet_parse_locale_setting("LC_MESSAGES");
 }
 
 /**
diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index 89b6ade..01a8e57 100644
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -53,7 +53,7 @@ static Eina_List  *efreet_dirs_get(const char *key,
 
 /**
  * @internal
- * @return Returns 1 on success or 0 on failure
+ * @return Returns @c 1 on success or @c 0 on failure
  * @brief Initializes the efreet base settings
  */
 int
@@ -119,7 +119,7 @@ EAPI const char *
 efreet_desktop_dir_get(void)
 {
     if (xdg_desktop_dir) return xdg_desktop_dir;
-    xdg_desktop_dir = efreet_dir_get("XDG_DESKTOP_DIR", "/Desktop");
+    xdg_desktop_dir = efreet_dir_get("XDG_DESKTOP_DIR", _("/Desktop"));
     return xdg_desktop_dir;
 }
 
@@ -187,28 +187,18 @@ efreet_hostname_get(void)
     return hostname;
 }
 
-EAPI void
+void
 efreet_dirs_reset(void)
 {
-   const char *s;
-   eina_stringshare_replace(&hostname, NULL);
-   eina_stringshare_replace(&xdg_desktop_dir, NULL);
-   eina_stringshare_replace(&xdg_cache_home, NULL);
-   eina_stringshare_replace(&xdg_config_home, NULL);
-   eina_stringshare_replace(&xdg_data_home, NULL);
-   eina_stringshare_replace(&efreet_home_dir, NULL);
-   EINA_LIST_FREE(xdg_data_dirs, s)
-     eina_stringshare_del(s);
-   EINA_LIST_FREE(xdg_config_dirs, s)
-     eina_stringshare_del(s);
+    eina_stringshare_replace(&xdg_desktop_dir, NULL);
 }
 
 /**
  * @internal
- * @param key The environemnt key to lookup
+ * @param key The environment key to lookup
  * @param fallback The fallback value to use
  * @return Returns the directory related to the given key or the fallback
- * @brief This trys to determine the correct directory name given the
+ * @brief This tries to determine the correct directory name given the
  * environment key @a key and fallbacks @a fallback.
  */
 static const char *
diff --git a/src/lib/efreet_base.h b/src/lib/efreet_base.h
index 429ba28..0eb3d52 100644
--- a/src/lib/efreet_base.h
+++ b/src/lib/efreet_base.h
@@ -66,13 +66,6 @@ EAPI const char *efreet_cache_home_get(void);
 EAPI const char *efreet_hostname_get(void);
 
 /**
- * @brief Resets all the stored env variables. This must be called whenever the
- * locale is changed.
- * @since 1.3
- */
-EAPI void efreet_dirs_reset(void);
-
-/**
  * Efreet_Event_Cache_Update
  */
 typedef struct _Efreet_Event_Cache_Update Efreet_Event_Cache_Update;
diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index d455a8e..9293f94 100644
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -810,7 +810,9 @@ efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini)
     const char *not_show_in = NULL, *only_show_in = NULL;
 
     val = efreet_ini_localestring_get(ini, "Name");
+#ifndef STRICT_SPEC
     if (!val) val = efreet_ini_localestring_get(ini, "_Name");
+#endif
     if (val) desktop->name = strdup(val);
     else
     {
@@ -822,7 +824,9 @@ efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini)
     if (val) desktop->generic_name = strdup(val);
 
     val = efreet_ini_localestring_get(ini, "Comment");
+#ifndef STRICT_SPEC
     if (!val) val = efreet_ini_localestring_get(ini, "_Comment");
+#endif
     if (val) desktop->comment = strdup(val);
 
     val = efreet_ini_localestring_get(ini, "Icon");
diff --git a/src/lib/efreet_private.h b/src/lib/efreet_private.h
index e8a835c..24f953d 100644
--- a/src/lib/efreet_private.h
+++ b/src/lib/efreet_private.h
@@ -1,6 +1,13 @@
 #ifndef EFREET_PRIVATE_H
 #define EFREET_PRIVATE_H
 
+#ifdef ENABLE_NLS
+# include <libintl.h>
+# define _(str) dgettext(PACKAGE, str)
+#else
+# define _(str) (str)
+#endif
+
 /**
  * @file efreet_private.h
  * @brief Contains methods and defines that are private to the Efreet
@@ -179,6 +186,7 @@ int efreet_util_init(void);
 int efreet_util_shutdown(void);
 
 const char *efreet_home_dir_get(void);
+void        efreet_dirs_reset(void);
 
 const char *efreet_lang_get(void);
 const char *efreet_lang_country_get(void);
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 29de633..13c1274 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -37,7 +37,7 @@ efreet_test_SOURCES += \
 ef_locale.c
 endif
 
-efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la @EINA_LIBS@
+efreet_spec_test_LDADD = $(top_builddir)/src/lib/libefreet.la @EFREET_LIBS@
 efreet_spec_test_SOURCES = \
 efreet_spec_test.c
 
@@ -54,7 +54,7 @@ efreet_suite.c \
 efreet_test_efreet.c \
 efreet_test_efreet_cache.c
 
-efreet_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libefreet.la
+efreet_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libefreet.la @EFREET_LIBS@
 
 endif