po: drop translations

Makefile.am

@@ -1,12 +1,12 @@
 NULL =
 
-SUBDIRS = build clutter tests po
+SUBDIRS = build clutter tests
 
 if BUILD_EXAMPLES
 SUBDIRS += examples
 endif
 
-DIST_SUBDIRS = clutter tests examples po build
+DIST_SUBDIRS = clutter tests examples build
 
 # XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
 # that jhbuild sets while still retaining build/autotools as the authoritative

build/autotools/Makefile.am

@@ -2,9 +2,7 @@ NULL =
 
 EXTRA_DIST = \
 	introspection.m4	\
-	gtk-doc.m4		\
 	as-compiler-flag.m4	\
-	as-linguas.m4		\
 	glibtests.m4		\
 	glib-tap.mk		\
 	tap-driver.sh		\

build/autotools/as-linguas.m4

@@ -1,24 +0,0 @@
-# Set ALL_ALL_LINGUAS based on the .po files present. Optional argument is the
-# name of the po directory. $podir/LINGUAS.ignore can be used to ignore a
-# subset of the po files.
-
-AC_DEFUN([AS_ALL_LINGUAS],
-[
- AC_MSG_CHECKING([for linguas])
- podir="m4_default([$1],[$srcdir/po])"
- linguas=`cd $podir && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
- if test -f "$podir/LINGUAS.ignore"; then
-   ALL_LINGUAS="";
-   ignore_linguas=`sed -n -e 's/^\s\+\|\s\+$//g' -e '/^#/b' -e '/\S/!b' \
-                       -e 's/\s\+/\n/g' -e p "$podir/LINGUAS.ignore"`;
-   for lang in $linguas; do
-     if ! echo "$ignore_linguas" | grep -q "^${lang}$"; then
-       ALL_LINGUAS="$ALL_LINGUAS $lang";
-     fi;
-   done;
- else
-   ALL_LINGUAS="$linguas";
- fi;
- AC_SUBST([ALL_LINGUAS])
- AC_MSG_RESULT($ALL_LINGUAS)
-])

clutter/clutter-main.c

@@ -52,8 +52,6 @@
 #endif
 
 #include <stdlib.h>
-#include <glib/gi18n-lib.h>
-#include <locale.h>
 
 #include "clutter-actor-private.h"
 #include "clutter-backend-private.h"
@@ -1444,10 +1442,6 @@ pre_parse_hook (GOptionContext  *context,
   if (clutter_is_initialized)
     return TRUE;
 
-  if (setlocale (LC_ALL, "") == NULL)
-    g_warning ("Locale not supported by C library.\n"
-               "Using the fallback 'C' locale.");
-
   clutter_context = _clutter_context_get_default ();
 
   backend = clutter_context->backend;
@@ -1602,7 +1596,6 @@ clutter_get_option_group (void)
 
   g_option_group_set_parse_hooks (group, pre_parse_hook, post_parse_hook);
   g_option_group_add_entries (group, clutter_args);
-  g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
 
   /* add backend-specific options */
   _clutter_backend_add_options (context->backend, group);
@@ -2572,9 +2565,6 @@ clutter_base_init (void)
     {
       initialised = TRUE;
 
-      bindtextdomain (GETTEXT_PACKAGE, CLUTTER_LOCALEDIR);
-      bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
 #if !GLIB_CHECK_VERSION (2, 35, 1)
       /* initialise GLib type system */
       g_type_init ();

clutter/clutter-private.h

@@ -26,10 +26,9 @@
 #ifndef __CLUTTER_PRIVATE_H__
 #define __CLUTTER_PRIVATE_H__
 
+#include <string.h>
 #include <glib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include <cogl-pango/cogl-pango.h>
 
 #include "clutter-backend.h"
@@ -80,12 +79,10 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 /* automagic interning of a static string */
 #define I_(str)  (g_intern_static_string ((str)))
 
-/* mark all properties under the "Property" context */
+/* keep this for source compatibility with clutter */
-#ifdef ENABLE_NLS
-#define P_(String) (_clutter_gettext ((String)))
-#else
 #define P_(String) (String)
-#endif
+#define N_(String) (String)
+#define _(String) (String)
 
 /* This is a replacement for the nearbyint function which always rounds to the
  * nearest integer. nearbyint is apparently a C99 function so it might not
@@ -201,8 +198,6 @@ ClutterActor *          _clutter_context_peek_shader_stack              (void);
 gboolean                _clutter_context_get_motion_events_enabled      (void);
 gboolean                _clutter_context_get_show_fps                   (void);
 
-const gchar *_clutter_gettext (const gchar *str);
-
 gboolean      _clutter_feature_init (GError **error);
 
 /* Diagnostic mode */

clutter/clutter-util.c

@@ -36,8 +36,6 @@
 
 #include <math.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "clutter-debug.h"
 #include "clutter-main.h"
 #include "clutter-interval.h"
@@ -66,20 +64,6 @@ clutter_util_next_p2 (gint a)
   return rval;
 }
 
-/*< private >
- * _clutter_gettext:
- * @str: a string to localize
- *
- * Retrieves the localized version of @str, using the Clutter domain
- *
- * Return value: the translated string
- */
-const gchar *
-_clutter_gettext (const gchar *str)
-{
-  return g_dgettext (GETTEXT_PACKAGE, str);
-}
-
 /* Help macros to scale from OpenGL <-1,1> coordinates system to
  * window coordinates ranging [0,window-size]
  */

clutter/deprecated/clutter-shader.c

@@ -55,7 +55,6 @@
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
 #include <glib.h>
-#include <glib/gi18n-lib.h>
 
 /* This file depends on the cogl 1.x api which isn't exposed when
  * COGL_ENABLE_EXPERIMENTAL_2_0_API is defined...

clutter/x11/clutter-backend-x11.c

@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#include <glib/gi18n-lib.h>
-
 #include <string.h>
 
 #include <unistd.h>

configure.ac

@@ -736,20 +736,6 @@ dnl === GObject-Introspection check ===========================================
 
 GOBJECT_INTROSPECTION_CHECK([gi_req_version])
 
-dnl === I18N ==================================================================
-
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE="clutter-1.0"
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],
-                   ["$GETTEXT_PACKAGE"],
-                   [The prefix for our gettext translation domains.])
-AS_ALL_LINGUAS
-
-dnl = Build optionals =========================================================
-
 dnl === Conformance test suite ================================================
 
 GLIB_TESTS
@@ -782,8 +768,6 @@ AC_CONFIG_FILES([
 	tests/performance/Makefile
 
         examples/Makefile
-
-	po/Makefile.in
 ])
 
 AC_OUTPUT

po/Makevars

@@ -1,41 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = clutter-1.0
-
-# 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_ --keyword=P_ --keyword=C_
-
-# 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 = Intel Corporation
-
-# 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 = http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
-
-# 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 =

po/POTFILES.in

@@ -1,80 +0,0 @@
-# keep sorted alphabetically!
-clutter/clutter-actor.c
-clutter/clutter-actor-meta.c
-clutter/clutter-align-constraint.c
-clutter/clutter-backend.c
-clutter/clutter-bind-constraint.c
-clutter/clutter-binding-pool.c
-clutter/clutter-bin-layout.c
-clutter/clutter-box-layout.c
-clutter/clutter-brightness-contrast-effect.c
-clutter/clutter-canvas.c
-clutter/clutter-child-meta.c
-clutter/clutter-click-action.c
-clutter/clutter-clone.c
-clutter/clutter-color.c
-clutter/clutter-colorize-effect.c
-clutter/clutter-container.c
-clutter/clutter-content.c
-clutter/clutter-deform-effect.c
-clutter/clutter-desaturate-effect.c
-clutter/clutter-device-manager.c
-clutter/clutter-drag-action.c
-clutter/clutter-drop-action.c
-clutter/clutter-event.c
-clutter/clutter-flow-layout.c
-clutter/clutter-gesture-action.c
-clutter/clutter-grid-layout.c
-clutter/clutter-image.c
-clutter/clutter-input-device.c
-clutter/clutter-interval.c
-clutter/clutter-layout-manager.c
-clutter/clutter-layout-meta.c
-clutter/clutter-main.c
-clutter/clutter-paint-node.c
-clutter/clutter-pan-action.c
-clutter/clutter-path-constraint.c
-clutter/clutter-property-transition.c
-clutter/clutter-rotate-action.c
-clutter/clutter-script.c
-clutter/clutter-scroll-actor.c
-clutter/clutter-settings.c
-clutter/clutter-shader-effect.c
-clutter/clutter-shader-types.c
-clutter/clutter-snap-constraint.c
-clutter/clutter-stage.c
-clutter/clutter-stage-window.c
-clutter/clutter-swipe-action.c
-clutter/clutter-tap-action.c
-clutter/clutter-text-buffer.c
-clutter/clutter-text.c
-clutter/clutter-timeline.c
-clutter/clutter-transition.c
-clutter/clutter-units.c
-clutter/clutter-zoom-action.c
-clutter/deprecated/clutter-alpha.c
-clutter/deprecated/clutter-animation.c
-clutter/deprecated/clutter-animator.c
-clutter/deprecated/clutter-behaviour.c
-clutter/deprecated/clutter-behaviour-depth.c
-clutter/deprecated/clutter-behaviour-ellipse.c
-clutter/deprecated/clutter-behaviour-opacity.c
-clutter/deprecated/clutter-behaviour-path.c
-clutter/deprecated/clutter-behaviour-rotate.c
-clutter/deprecated/clutter-behaviour-scale.c
-clutter/deprecated/clutter-box.c
-clutter/deprecated/clutter-cairo-texture.c
-clutter/deprecated/clutter-fixed.c
-clutter/deprecated/clutter-fixed.h
-clutter/deprecated/clutter-media.c
-clutter/deprecated/clutter-rectangle.c
-clutter/deprecated/clutter-shader.c
-clutter/deprecated/clutter-state.c
-clutter/deprecated/clutter-table-layout.c
-clutter/deprecated/clutter-texture.c
-clutter/evdev/clutter-input-device-evdev.c
-clutter/gdk/clutter-backend-gdk.c
-clutter/wayland/clutter-wayland-surface.c
-clutter/x11/clutter-backend-x11.c
-clutter/x11/clutter-keymap-x11.c
-clutter/x11/clutter-x11-texture-pixmap.c