Some patches to fix translations related issues +
some terminology unification:
* Use "directory" term everywhere, don't use "folder".
* Remove stray semicolon from a control label in mpdule gadget.
* Fix handling plural forms in EFM.
* Gettextize MPDule and prepare it for translation.
-- Igor
>From 23ffa1d49ac5abbd31657282f156e5aac0998a6a Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 28 Oct 2012 17:55:43 +0400
Subject: [PATCH 5/6] Get rid of "folder" term, use "directory" everywhere.
---
src/bin/e_fm_cmdline.c | 4 ++--
src/bin/e_open.c | 2 +-
src/modules/everything/evry_plug_files.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c
index 68f36bd..941f14a 100644
--- a/src/bin/e_fm_cmdline.c
+++ b/src/bin/e_fm_cmdline.c
@@ -107,11 +107,11 @@ fm_open(const char *path)
static const Ecore_Getopt options = {
"enlightenment_filemanager",
- "%prog [options] [file-or-folder1] ... [file-or-folderN]",
+ "%prog [options] [file-or-directory1] ... [file-or-directoryN]",
PACKAGE_VERSION,
"(C) 2012 Gustavo Sverzut Barbieri and others",
"BSD 2-Clause",
- "Opens the Enlightenment File Manager at a given folders.",
+ "Opens the Enlightenment File Manager at a given directories.",
EINA_FALSE,
{
ECORE_GETOPT_VERSION('V', "version"),
diff --git a/src/bin/e_open.c b/src/bin/e_open.c
index 0d34452..b160bb7 100644
--- a/src/bin/e_open.c
+++ b/src/bin/e_open.c
@@ -430,7 +430,7 @@ static const char *type_choices[] = {
static const Ecore_Getopt options = {
"enlightenment_open",
- "%prog [options] <file-or-folder-or-url>",
+ "%prog [options] <file-or-directory-or-url>",
PACKAGE_VERSION,
"(C) 2012 Gustavo Sverzut Barbieri and others",
"BSD 2-Clause",
diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c
index d6bd716..f6ea47d 100644
--- a/src/modules/everything/evry_plug_files.c
+++ b/src/modules/everything/evry_plug_files.c
@@ -1327,7 +1327,7 @@ _plugins_init(const Evry_API *api)
_file_trash_action, NULL, 1);
EVRY_ITEM_DATA_INT_SET(act, ACT_TRASH);
- ACTION_NEW("Open Folder (EFM)", 0, "folder-open",
+ ACTION_NEW("Open Directory (EFM)", 0, "folder-open",
_open_folder_action, _open_folder_check, 1);
act->remember_context = EINA_TRUE;
--
1.7.12.1
From 961a702481ce05f9dd00bece4c963c458ff50eb7 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 28 Oct 2012 17:56:45 +0400
Subject: [PATCH 2/8] Get rid of "folder" term, use "directory" everywhere.
---
engage/src/ng_launcher.c | 2 +-
everything-places/module.desktop.in | 2 +-
photo/src/photo_picture_local.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/engage/src/ng_launcher.c b/engage/src/ng_launcher.c
index 7e81dd6..ca82d59 100644
--- a/engage/src/ng_launcher.c
+++ b/engage/src/ng_launcher.c
@@ -272,7 +272,7 @@ _cb_drop_end(void *data, const char *type, void *event_info)
if (app->icon) free(app->icon);
app->icon = strdup("folder");
if (app->comment)free(app->comment);
- app->comment = strdup(D_("Open folder with EFM"));
+ app->comment = strdup(D_("Open directory with EFM"));
if (app->exec) free(app->exec);
snprintf(buf, PATH_MAX, "enlightenment_remote -efm-open-dir %s", file);
app->exec = strdup(buf);
diff --git a/everything-places/module.desktop.in b/everything-places/module.desktop.in
index 85150ca..5c06a78 100644
--- a/everything-places/module.desktop.in
+++ b/everything-places/module.desktop.in
@@ -6,7 +6,7 @@ Name[fr]=Omni - Raccourcis
Name[it]=Everything - Risorse
Name[pt]=Everything - Locais
Icon=e-module
-Comment=Access folder bookmarks and mount drives
+Comment=Access directory bookmarks and mount drives
Comment[ru]=ÐоÑÑÑп к закладкам диÑекÑоÑий и монÑиÑование диÑков.
Comment[fr]=Accès aux signets des dossiers et aux volumes montés.
Comment[it]=Accede ai segnalibro delle cartelle e monta le unità .
diff --git a/photo/src/photo_picture_local.c b/photo/src/photo_picture_local.c
index f1acc84..c52a998 100644
--- a/photo/src/photo_picture_local.c
+++ b/photo/src/photo_picture_local.c
@@ -251,7 +251,7 @@ Picture_Local_Dir *photo_picture_local_dir_new(char *path, int recursive, int re
char buf[4096];
snprintf(buf, sizeof(buf),
D_("<hilight>Directory %s doesnt exists.</hilight><br><br>"
- "You can change the picture's folders in main configuration panel<br>"
+ "You can change the picture's directories in main configuration panel<br>"
"They can be jpeg or png<br><br>"
"After import, if you can remove these files and the pictures still can<br>"
"be viewed, but you wont be able to set them as wallpaper anymore<br><br>"),
--
1.7.12.1
>From 18796727bbb19d4d099ac33341e66f18489d6706 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 28 Oct 2012 20:53:26 +0400
Subject: [PATCH 7/8] mpdule: gettextize.
---
mpdule/Makefile.am | 7 +++++++
mpdule/autogen.sh | 2 +-
mpdule/configure.ac | 32 ++++++++++++++++++++++++++++----
mpdule/po/Makevars | 41 +++++++++++++++++++++++++++++++++++++++++
mpdule/po/POTFILES.in | 3 +++
5 files changed, 80 insertions(+), 5 deletions(-)
create mode 100644 mpdule/po/LINGUAS
create mode 100644 mpdule/po/Makevars
create mode 100644 mpdule/po/POTFILES.in
diff --git a/mpdule/Makefile.am b/mpdule/Makefile.am
index 9b0dd3f..27914b1 100644
--- a/mpdule/Makefile.am
+++ b/mpdule/Makefile.am
@@ -1,9 +1,16 @@
+ACLOCAL_AMFLAGS = -I m4
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs
SUBDIRS = src
+if HAVE_PO
+
+SUBDIRS += po
+
+endif
+
EDJE_FLAGS = -v \
-id $(top_srcdir)/images
diff --git a/mpdule/autogen.sh b/mpdule/autogen.sh
index 2003c6e..458ca60 100755
--- a/mpdule/autogen.sh
+++ b/mpdule/autogen.sh
@@ -5,7 +5,7 @@ rm -f aclocal.m4 ltmain.sh
touch README
-#echo "Running autopoint..." ; autopoint -f || :
+echo "Running autopoint..." ; autopoint -f || :
echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1
diff --git a/mpdule/configure.ac b/mpdule/configure.ac
index 363abcb..2bc2af5 100644
--- a/mpdule/configure.ac
+++ b/mpdule/configure.ac
@@ -20,11 +20,18 @@ define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
-ALL_LINGUAS=""
-AC_SUBST(ALL_LINGUAS)
+m4_ifdef([AM_GNU_GETTEXT_VERSION], [
+AM_GNU_GETTEXT_VERSION([0.18.1])
+])
-#AM_GNU_GETTEXT([external])
-#AM_GNU_GETTEXT_VERSION(0.14)
+m4_ifdef([AM_GNU_GETTEXT], [
+AM_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+AM_CONDITIONAL([HAVE_PO], [true])
+],[
+AM_CONDITIONAL([HAVE_PO], [false])
+])
+AC_SUBST(LTLIBINTL)
PKG_CHECK_MODULES(E, [enlightenment])
release=$(pkg-config --variable=release enlightenment)
@@ -66,5 +73,22 @@ Makefile
src/Makefile
e_modules-mpdule.spec
module.desktop
+$po_makefile_in
],[
])
+
+
+# report
+txt_strip() {
+ echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g'
+}
+
+echo
+cat << SUMMARY_EOF
+Summary:
+ * project.........: $PACKAGE $VERSION
+ * prefix..........: $(txt_strip $prefix)
+ * CFLAGS..........: $(txt_strip $CFLAGS)
+ * LDFLAGS.........: $(txt_strip $LDFLAGS)
+SUMMARY_EOF
+echo
diff --git a/mpdule/po/LINGUAS b/mpdule/po/LINGUAS
new file mode 100644
index 0000000..e69de29
diff --git a/mpdule/po/Makevars b/mpdule/po/Makevars
new file mode 100644
index 0000000..9275c25
--- /dev/null
+++ b/mpdule/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=N_ --keyword=D_ --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/mpdule/po/POTFILES.in b/mpdule/po/POTFILES.in
new file mode 100644
index 0000000..57c81e0
--- /dev/null
+++ b/mpdule/po/POTFILES.in
@@ -0,0 +1,3 @@
+# List of source files which contain translatable strings.
+src/e_mod_config.c
+src/e_mod_main.c
--
1.7.12.1
>From 0d50d17eaa452f17351f71a56eaa059f1eb4aa18 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 28 Oct 2012 20:30:22 +0400
Subject: [PATCH 5/8] mpdule: Remove stray semicolon from a control label
---
mpdule/src/e_mod_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mpdule/src/e_mod_config.c b/mpdule/src/e_mod_config.c
index abe35ab..d002cbd 100644
--- a/mpdule/src/e_mod_config.c
+++ b/mpdule/src/e_mod_config.c
@@ -106,7 +106,7 @@ _basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
e_widget_frametable_object_append (of, port_entry, 0, 5, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append (o, of, 1, 1, 0.5);
- ob = e_widget_check_add(evas, D_("Show Popup:"), &(cfdata->show_popup));
+ ob = e_widget_check_add(evas, D_("Show Popup"), &(cfdata->show_popup));
e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 0, 1, 0);
return o;
--
1.7.12.1
>From e9212ac4e7cdfdb04d86939ee66f5a622474db81 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 28 Oct 2012 16:44:16 +0400
Subject: [PATCH 3/6] Properly use gettext for handling plural forms.
There are languages with two plural forms, so handle them properly.
---
src/bin/e_utils.c | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 4399990..825662f 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -905,50 +905,32 @@ e_util_file_time_get(time_t ftime)
else if (diff >= 31526000)
{
test = diff / 31526000;
- if (test == 1)
- snprintf(buf, sizeof(buf), _("Last year"));
- else
- snprintf(buf, sizeof(buf), _("%li Years ago"), test);
+ snprintf(buf, sizeof(buf), P_("Last year", "%li Years ago", test), test);
}
else if (diff >= 2592000)
{
test = diff / 2592000;
- if (test == 1)
- snprintf(buf, sizeof(buf), _("Last month"));
- else
- snprintf(buf, sizeof(buf), _("%li Months ago"), test);
+ snprintf(buf, sizeof(buf), P_("Last month", "%li Months ago", test), test);
}
else if (diff >= 604800)
{
test = diff / 604800;
- if (test == 1)
- snprintf(buf, sizeof(buf), _("Last week"));
- else
- snprintf(buf, sizeof(buf), _("%li Weeks ago"), test);
+ snprintf(buf, sizeof(buf), P_("Last week", "%li Weeks ago", test), test);
}
else if (diff >= 86400)
{
test = diff / 86400;
- if (test == 1)
- snprintf(buf, sizeof(buf), _("Yesterday"));
- else
- snprintf(buf, sizeof(buf), _("%li Days ago"), test);
+ snprintf(buf, sizeof(buf), P_("Yesterday", "%li Days ago", test), test);
}
else if (diff >= 3600)
{
test = diff / 3600;
- if (test == 1)
- snprintf(buf, sizeof(buf), _("An hour ago"));
- else
- snprintf(buf, sizeof(buf), _("%li Hours ago"), test);
+ snprintf(buf, sizeof(buf), P_("An hour ago", "%li Hours ago", test), test);
}
else if (diff > 60)
{
test = diff / 60;
- if (test == 1)
- snprintf(buf, sizeof(buf), _("A minute ago"));
- else
- snprintf(buf, sizeof(buf), _("%li Minutes ago"), test);
+ snprintf(buf, sizeof(buf), P_("A minute ago", "%li Minutes ago", test), test);
}
}
--
1.7.12.1
From e69673f2ce249db2e29bcfcde2617f197db21f03 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-m...@date.by>
Date: Sun, 28 Oct 2012 17:04:41 +0400
Subject: [PATCH 4/6] Stop scaring people with bold font, that EFM is under
construction.
I use it quite a lot and it works fine.
---
src/modules/fileman/module.desktop.in | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/modules/fileman/module.desktop.in b/src/modules/fileman/module.desktop.in
index 9221e2a..86c9143 100644
--- a/src/modules/fileman/module.desktop.in
+++ b/src/modules/fileman/module.desktop.in
@@ -16,19 +16,19 @@ Name[tr]=EFM (BaÅlatıcı)
Name[zh_CN]=
Name[zh_TW]=
Icon=e-module-fileman
-Comment=Enlightenment's integrated file manager.<br><hilight>Under Construction!</hilight>
-Comment[ru]=ÐÑÑÑоеннÑй в Enlightenment ÑайловÑй менеджеÑ.<br><hilight>Ð Ð ÐÐÐ ÐÐÐТÐÐ!</hilight>
-Comment[cs]=Integrovaný správce souborů v Enlightenment.<br><hilight>Ve vývoji!</hilight>
-Comment[de]=Der eingebaute Dateimanager von Enlightenment.<br><hilight>In Entwicklung!</hilight>
-Comment[eo]=Integrita dosieradministrilo de Enlightenment.<br><hilight>Äiam en disvolviÄo</hilight>
-Comment[es]=El administrador de archivos integrado a Enlightenment.<br><hilight>¡TodavÃa en construcción!</hilight>
-Comment[fr]=Gestionnaire de fichiers intégré.<br><hilight>En construction !</hilight>
-Comment[hu]=Az Enlightenment beépÃtett fájlkezelõje.<br><hilight>Fejlesztés alatt!</hilight>
-Comment[it]=Questo è il file manager integrato in Enlightenment.<br><hilight>In costruzione!</hilight>
+Comment=Enlightenment's integrated file manager.
+Comment[ru]=ÐÑÑÑоеннÑй в Enlightenment ÑайловÑй менеджеÑ.
+Comment[cs]=Integrovaný správce souborů v Enlightenment.
+Comment[de]=Der eingebaute Dateimanager von Enlightenment.
+Comment[eo]=Integrita dosieradministrilo de Enlightenment.
+Comment[es]=El administrador de archivos integrado a Enlightenment.
+Comment[fr]=Gestionnaire de fichiers intégré.
+Comment[hu]=Az Enlightenment beépÃtett fájlkezelõje.
+Comment[it]=Questo è il file manager integrato in Enlightenment.
Comment[ja]=
-Comment[pt]=O gestor de ficheiros do Enlightenment.<br><br><hilight>Em desenvolvimento!</hilight>
+Comment[pt]=O gestor de ficheiros do Enlightenment.
Comment[pt_BR]=
-Comment[tr]=Enlightenment'nin dahili pencere yöneticisi.<br><hilight>Yapım AÅamasında!</hilight>
+Comment[tr]=Enlightenment'nin dahili pencere yöneticisi.
Comment[zh_CN]=
Comment[zh_TW]=
X-Enlightenment-ModuleType=files
--
1.7.12.1
------------------------------------------------------------------------------
The Windows 8 Center - In partnership with Sourceforge
Your idea - your app - 30 days.
Get started!
http://windows8center.sourceforge.net/
what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
