Use dgettext() (aka _() ) rather than gettext().

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 121a062737621c5b0bf1ff3b479923616201dcd5..aaf9814bd4984914bc32d8b4723f90cebca05cae 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -1208,7 +1208,6 @@ VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
 #else
 #   define _(String) (String)
 #   define N_(String) (String)
-#   define gettext(String) (String)
 #endif
 
 /*****************************************************************************

diff --git a/src/config/file.c b/src/config/file.c
index 04f072b50a17e29c2fb827c2978baffc1d68cb0f..137e1251b0a7abb8ebdeebeddf80f9c4c2fd6bf4 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -353,7 +353,7 @@ config_Write (FILE *file, const char *type, const char *desc,
     if (desc == NULL)
         desc = "?";
 
-    if (fprintf (file, "# %s (%s)\n%s%s=", desc, gettext (type),
+    if (fprintf (file, "# %s (%s)\n%s%s=", desc, _(type),
                  comment ? "#" : "", name) < 0)
         return -1;
 

diff --git a/src/modules/entry.c b/src/modules/entry.c
index 7cb0ebf11626cce9a92350e2a39f315f34367833..6c6caa040cc89c91b583502084721f678201aaa1 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -200,8 +200,8 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
             const char *text = va_arg (ap, const char *);
             const char *longtext = va_arg (ap, const char *);
 
-            item->psz_text = text ? strdup (gettext (text)) : NULL;
-            item->psz_longtext = longtext ? strdup (gettext (text)) : NULL;
+            item->psz_text = text ? strdup ( _(text)) : NULL;
+            item->psz_longtext = longtext ? strdup ( _(text)) : NULL;
             ret = 0;
             break;
         }
@@ -352,7 +352,7 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
             if (text != NULL)
             {
                 for (size_t i = 0; i < len; i++)
-                    dtext[i] = text[i] ? strdup (gettext (text[i])) : NULL;
+                    dtext[i] = text[i] ? strdup ( _(text[i])) : NULL;
 
                 dtext[len] = NULL;
                 item->ppsz_list_text = dtext;
@@ -389,7 +389,7 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
             item->ppsz_action_text = tabtext;
 
             if (name)
-                tabtext[item->i_action] = strdup (gettext (name));
+                tabtext[item->i_action] = strdup ( _(name));
             else
                 tabtext[item->i_action] = NULL;
             tabtext[item->i_action + 1] = NULL;