GNOME.org
 

[gtk-vnc/i18n: 1/3] Initial setup for i18n

commit e0edecde7d079f6747f94cdf143cf3b85e51fa01
Author: Jonh Wendell <jwendell gnome org>
Date:   Tue Aug 11 13:37:16 2009 -0300

    Initial setup for i18n

 .gitignore               |   60 ---------------
 Makefile.am              |   46 ++++++++++-
 configure.ac             |   16 ++++-
 examples/Makefile.am     |    2 +
 git.mk                   |  182 ++++++++++++++++++++++++++++++++++++++++++++++
 gnulib/lib/Makefile.am   |    2 +
 gnulib/tests/Makefile.am |    2 +
 plugin/Makefile.am       |    2 +
 po/LINGUAS               |    2 +
 po/POTFILES.in           |    1 +
 po/pt_BR.po              |   25 ++++++
 src/Makefile.am          |    1 +
 src/vncdisplay.c         |    3 +-
 13 files changed, 277 insertions(+), 67 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7c6f58c..5c01329 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,47 @@
-
 SUBDIRS = gnulib/lib src examples plugin gnulib/tests
-
 ACLOCAL_AMFLAGS = -I gnulib/m4
 
-
-
 pkgconfig_DATA = @PACKAGE -1 0 pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = $(PACKAGE)-1.0.pc.in $(PACKAGE).spec.in $(PACKAGE).spec mingw32-$(PACKAGE).spec.in
+EXTRA_DIST =				\
+	$(PACKAGE)-1.0.pc.in		\
+	$(PACKAGE).spec.in		\
+	$(PACKAGE).spec			\
+	mingw32-$(PACKAGE).spec.in	\
+	intltool-extract.in		\
+	intltool-merge.in		\
+	intltool-update.in
+
+DISTCLEANFILES =			\
+	intltool-extract		\
+	intltool-merge			\
+	intltool-update
+
+MAINTAINERCLEANFILES = 		\
+	INSTALL			\
+	compile			\
+	aclocal.m4		\
+	config.guess		\
+	config.hin		\
+	config.sub		\
+	depcomp			\
+	gtk-doc.make		\
+	install-sh		\
+	ltmain.sh		\
+	missing			\
+	mkinstalldirs		\
+	omf.make		\
+	py-compile		\
+	xmldocs.make		\
+	gnulib/m4/gnome-doc-utils.m4	\
+	gnulib/m4/gtk-doc.m4		\
+	gnulib/m4/intltool.m4		\
+	gnulib/m4/libtool.m4		\
+	gnulib/m4/ltoptions.m4		\
+	gnulib/m4/ltsugar.m4		\
+	gnulib/m4/ltversion.m4		\
+	gnulib/m4/lt~obsolete.m4	\
+	`find "$(srcdir)" -type f -name Makefile.in -print`
+
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 5d440d6..276b728 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,20 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([gtk-vnc], [0.3.9], [anthony codemonkey ws])
 AC_CONFIG_SRCDIR([src/gvnc.c])
 
+#*******************************************************************************
+# Internationalization
+#*******************************************************************************
+GETTEXT_PACKAGE=gtk-vnc
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+
+IT_PROG_INTLTOOL([0.35.0])
+AM_GLIB_GNU_GETTEXT
+
+#*******************************************************************************
+# Check required libraries
+#*******************************************************************************
+
 GTK_REQUIRED=2.10.0
 AC_SUBST(GTK_REQUIRED)
 GNUTLS_REQUIRED=1.4.0
@@ -17,7 +31,6 @@ NSPR_REQUIRED=4.0.0
 FIREFOX_PLUGIN_REQUIRED=2.0.0
 MOZILLA_PLUGIN_REQUIRED=1.8
 
-
 AC_CONFIG_HEADERS([config.h:config.hin])
 
 AC_CANONICAL_TARGET
@@ -292,6 +305,7 @@ AC_CONFIG_FILES(
   src/Makefile
   examples/Makefile
   plugin/Makefile
+  po/Makefile.in
   gtk-vnc-1.0.pc
   gtk-vnc.spec
   mingw32-gtk-vnc.spec
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5a55057..9943a6d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -12,3 +12,5 @@ gvncviewer_CFLAGS = @GTK_CFLAGS@ @WARNING_CFLAGS@ \
 		    @VIEW_CFLAGS@ -I$(top_srcdir)/src/
 
 EXTRA_DIST = gvncviewer.py
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..01bf288
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,182 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk".  This modifies all Makefile.am files in
+# your project to include git.mk.
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
+# not tarballs.  It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, intltool.
+#
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+		if grep 'include .*/git.mk' $$x >/dev/null; then \
+			echo $$x already includes git.mk; \
+		else \
+			failed=; \
+			echo "Updating $$x"; \
+			{ cat $$x; \
+			  echo ''; \
+			  echo '-include $$(top_srcdir)/git.mk'; \
+			} > $$x.tmp || failed=1; \
+			if test x$$failed = x; then \
+				mv $$x.tmp $$x || failed=1; \
+			fi; \
+			if test x$$failed = x; then : else \
+				echo Failed updating $$x; >&2 \
+				any_failed=1; \
+			fi; \
+	fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	@echo Generating $@; \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for x in \
+				$(_DOC_C_DOCS) \
+				$(_DOC_LC_DOCS) \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_POFILES) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				intltool-extract.in \
+				intltool-merge.in \
+				intltool-update.in \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/configure; then \
+			for x in \
+				autom4te.cache \
+				configure \
+				config.h \
+				stamp-h1 \
+				libtool \
+				config.lt \
+			; do echo /$$x; done; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) \
+			$(EXTRA_PROGRAMS) \
+			$(LTLIBRARIES) \
+			so_locations \
+			.libs _libs \
+			$(MOSTLYCLEANFILES) \
+			"*.$(OBJEXT)" \
+			"*.lo" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+		; do echo /$$x; done; \
+	} | \
+	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LANG=C sort | uniq > $  tmp && \
+	mv $  tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+	fi;
+gitignore-recurse:
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \
+	done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index 6df8dfa..b32ddcd 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -603,3 +603,5 @@ mostlyclean-local: mostlyclean-generic
 	  fi; \
 	done; \
 	:
+
+-include $(top_srcdir)/git.mk
diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am
index a20bf6c..b47dd66 100644
--- a/gnulib/tests/Makefile.am
+++ b/gnulib/tests/Makefile.am
@@ -207,3 +207,5 @@ mostlyclean-local: mostlyclean-generic
 	  fi; \
 	done; \
 	:
+
+-include $(top_srcdir)/git.mk
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 83242b6..2fa8777 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -28,3 +28,5 @@ EXTRA_DIST = README
 CLEANFILES = gtk-vnc-plugin.so
 
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..d193efc
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
+# please keep this list sorted alphabetically
+pt_BR
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..f2e11b8
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1 @@
+src/vncdisplay.c
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 0000000..8e789ae
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-11 12:01-0300\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/vncdisplay.c:2244
+msgid "GTK-VNC Options:"
+msgstr ""
+
+#: ../src/vncdisplay.c:2244
+msgid "Show GTK-VNC Options"
+msgstr ""
diff --git a/src/Makefile.am b/src/Makefile.am
index fcd7c8e..3359405 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,3 +75,4 @@ else
 EXTRA_DIST += vnc.override vncmodule.c
 endif
 
+-include $(top_srcdir)/git.mk
diff --git a/src/vncdisplay.c b/src/vncdisplay.c
index e587dfb..ce54d38 100644
--- a/src/vncdisplay.c
+++ b/src/vncdisplay.c
@@ -29,6 +29,7 @@
 #include "x_keymap.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
@@ -2240,7 +2241,7 @@ vnc_display_get_option_group (void)
 {
 	GOptionGroup *group;
 
-	group = g_option_group_new ("gtk-vnc", "GTK-VNC Options", "Show GTK-VNC Options", NULL, NULL);
+	group = g_option_group_new ("gtk-vnc", N_("GTK-VNC Options:"), N_("Show GTK-VNC Options"), NULL, NULL);
 
 	g_option_group_add_entries (group, gtk_vnc_args);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]