[Monodevelop-patches-list] r1340 - in trunk/MonoDevelop: . build/AddIns libmonodevelop po src/Main/Base src/Main/Base/Gui/Dialogs src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions src/Main/Base/Services
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Apr 2 04:37:27 EST 2004
Author: tberman
Date: 2004-04-02 04:37:27 -0500 (Fri, 02 Apr 2004)
New Revision: 1340
Added:
trunk/MonoDevelop/build/AddIns/ChangeLog
trunk/MonoDevelop/libmonodevelop/
trunk/MonoDevelop/libmonodevelop/ChangeLog
trunk/MonoDevelop/libmonodevelop/Makefile.am
trunk/MonoDevelop/libmonodevelop/gettext-utils.c
trunk/MonoDevelop/libmonodevelop/gettext-utils.h
trunk/MonoDevelop/po/
trunk/MonoDevelop/po/ChangeLog
trunk/MonoDevelop/po/Makefile.in.in
trunk/MonoDevelop/po/POTFILES.in
trunk/MonoDevelop/po/POTFILES.skip
trunk/MonoDevelop/po/en_CA.po
trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
Modified:
trunk/MonoDevelop/
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/Makefile.am
trunk/MonoDevelop/autogen.sh
trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
trunk/MonoDevelop/configure.in
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
trunk/MonoDevelop/src/Main/Base/Makefile.am
Log:
committing the beginning of gettextification of MD.
this is going to take at least a week to get working properly (fully translateable)
if anything breaks
let me know
also, you have to make install to see new and updated translations (i think)
Property changes on: trunk/MonoDevelop
___________________________________________________________________
Name: svn:ignore
- depcomp
install-sh
aclocal.m4
missing
autom4te.cache
libtool
config.status
mkinstalldirs
Makefile
COPYING
INSTALL
ltmain.sh
config.sub
config.guess
monodevelop
config.log
Makefile.in
configure
monodevelop*.tar.gz
monodevelop*.spec
*.diff
FixmeTodo.list
+ depcomp
install-sh
aclocal.m4
missing
autom4te.cache
libtool
config.status
mkinstalldirs
Makefile
COPYING
INSTALL
ltmain.sh
config.sub
config.guess
monodevelop
config.log
Makefile.in
configure
monodevelop*.tar.gz
monodevelop*.spec
*.diff
FixmeTodo.list
intltool-*
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/ChangeLog 2004-04-02 09:37:27 UTC (rev 1340)
@@ -1,3 +1,10 @@
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * configure.in: added po/Makefile.in.in, and other gettext related
+ stuff. added libmonodevelop/Makefile
+ * Makefile.am: added po and libmonodevelop to subdirs
+ * autogen.sh: added intltoolize to autogen.sh
+
2004-03-31 Todd Berman <tberman at sevenl.net>
* configure.in: bumping to 0.3
Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/Makefile.am 2004-04-02 09:37:27 UTC (rev 1340)
@@ -1,6 +1,6 @@
# leave gdldock first
# (mkdir ../../build/bin/ hack)
-SUBDIRS = gdldock src build data
+SUBDIRS = gdldock libmonodevelop src build data po
bin_SCRIPTS = monodevelop
Modified: trunk/MonoDevelop/autogen.sh
===================================================================
--- trunk/MonoDevelop/autogen.sh 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/autogen.sh 2004-04-02 09:37:27 UTC (rev 1340)
@@ -36,7 +36,13 @@
NO_AUTOMAKE=yes
}
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`intltoolize' installed to compile MonoDevelop."
+ DIE=1
+}
+
# if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
echo
@@ -90,6 +96,11 @@
echo "Running automake --gnu $am_opt ..."
automake --add-missing --gnu $am_opt ||
{ echo "**Error**: automake failed."; exit 1; }
+
+echo "Running intltoolize ..."
+intltoolize --force ||
+ { echo "**Error**: intltoolize failed."; exit 1; }
+
echo "Running autoconf ..."
WANT_AUTOCONF="2.5" autoconf || { echo "**Error**: autoconf failed."; exit 1; }
Added: trunk/MonoDevelop/build/AddIns/ChangeLog
===================================================================
--- trunk/MonoDevelop/build/AddIns/ChangeLog 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/build/AddIns/ChangeLog 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,3 @@
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * SharpDevelopCore.addin: adding GettextCatalog as a service.
Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin 2004-04-02 09:37:27 UTC (rev 1340)
@@ -30,6 +30,8 @@
</Extension>
<Extension path = "/Workspace/Services">
+ <Class id = "GettextCatalog"
+ class = "MonoDevelop.Services.GettextCatalog"/>
<Class id = "MonodocService"
class = "MonoDevelop.Services.MonodocService"/>
<Class id = "ProjectService"
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/configure.in 2004-04-02 09:37:27 UTC (rev 1340)
@@ -5,6 +5,7 @@
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
+AC_PROG_INTLTOOL
AC_PATH_PROG(MONO, mono)
AC_PATH_PROG(MCS, mcs)
@@ -111,12 +112,20 @@
AM_CONDITIONAL(ENABLE_DEBUGGER, test "x$enable_debugger" = "xyes")
AM_CONDITIONAL(ENABLE_XDGMIME, test "x$enable_xdgmime" = "xyes")
+dnl Intl
+ALL_LINGUAS="en_CA"
+GETTEXT_PACKAGE=monodevelop
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+AM_GLIB_GNU_GETTEXT
+
AC_OUTPUT([
Makefile
gdldock/Makefile
gdldock/gdl/Makefile
gdldock/sources/Makefile
gdldock/sources/gdl/Makefile
+libmonodevelop/Makefile
src/Makefile
src/AddIns/Makefile
src/AddIns/BackendBindings/Makefile
@@ -173,6 +182,7 @@
src/Libraries/MonoDevelop.Gui.Utils/AssemblyInfo.cs
src/Libraries/MonoDevelop.Core/AssemblyInfo.cs
monodevelop
+po/Makefile.in
])
echo "---"
Property changes on: trunk/MonoDevelop/libmonodevelop
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile
.deps
.libs
Added: trunk/MonoDevelop/libmonodevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/libmonodevelop/ChangeLog 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/ChangeLog 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,4 @@
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * *: Creation of libmonodevelop.so. Right now it is used to bind to
+ gettext. Copied from muine.
Added: trunk/MonoDevelop/libmonodevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/libmonodevelop/Makefile.am 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/Makefile.am 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,13 @@
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+
+monodeveloplibdir = $(prefix)/lib/monodevelop/bin
+monodeveloplib_LTLIBRARIES = libmonodevelop.la
+
+libmonodevelop_la_SOURCES = \
+ gettext-utils.c \
+ gettext-utils.h
+
+all-local:
+ $(LIBTOOL) --mode=install $(INSTALL) libmonodevelop.la `pwd`/$(top_builddir)/build/bin
Added: trunk/MonoDevelop/libmonodevelop/gettext-utils.c
===================================================================
--- trunk/MonoDevelop/libmonodevelop/gettext-utils.c 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/gettext-utils.c 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2004 Jorn Baayen <jorn at nl.linux.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <libintl.h>
+
+#include "gettext-utils.h"
+
+void
+intl_init (const char *package)
+{
+#ifdef ENABLE_NLS
+ bindtextdomain (package, GNOMELOCALEDIR);
+ bind_textdomain_codeset (package, "UTF-8");
+ textdomain (package);
+#endif
+}
+
+const char *
+intl_get_string (const char *string)
+{
+#ifdef ENABLE_NLS
+ return gettext (string);
+#else
+ return string;
+#endif
+}
+
+const char *
+intl_get_plural_string (const char *singular,
+ const char *plural,
+ long n)
+{
+#ifdef ENABLE_NLS
+ return ngettext (singular, plural, n);
+#else
+ if (n == 1)
+ return singular;
+ else
+ return plural;
+#endif
+}
Added: trunk/MonoDevelop/libmonodevelop/gettext-utils.h
===================================================================
--- trunk/MonoDevelop/libmonodevelop/gettext-utils.h 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/libmonodevelop/gettext-utils.h 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2004 Jorn Baayen <jorn at nl.linux.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+void intl_init (const char *package);
+
+const char *intl_get_string (const char *string);
+const char *intl_get_plural_string (const char *singular,
+ const char *plural,
+ long n);
Property changes on: trunk/MonoDevelop/po
___________________________________________________________________
Name: svn:ignore
+ *.gmo
monodevelop.pot
POTFILES
Added: trunk/MonoDevelop/po/ChangeLog
===================================================================
--- trunk/MonoDevelop/po/ChangeLog 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/ChangeLog 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,3 @@
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * *: Initial creation of po/ and adding en_CA.po
Added: trunk/MonoDevelop/po/Makefile.in.in
===================================================================
--- trunk/MonoDevelop/po/Makefile.in.in 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/Makefile.in.in 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,254 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+#
+# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob at ximian.com> to install
+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+ at SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = ..
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+libdir = @libdir@
+localedir = $(libdir)/locale
+gnulocaledir = $(datadir)/locale
+gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+subdir = po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+
+CC = @CC@
+GENCAT = @GENCAT@
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+
+INCLUDES = -I.. -I$(top_srcdir)/intl
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+SOURCES =
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
+$(POFILES) $(GMOFILES) $(SOURCES)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+INSTOBJEXT = @INSTOBJEXT@
+
+.SUFFIXES:
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+
+.c.o:
+ $(COMPILE) $<
+
+.po.pox:
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox
+
+.po.mo:
+ $(MSGFMT) -o $@ $<
+
+.po.gmo:
+ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+ && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+ sed -f ../intl/po2msg.sed < $< > $*.msg \
+ && rm -f $@ && $(GENCAT) $@ $*.msg
+
+
+all: all- at USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+ $(GENPOT)
+
+install: install-exec install-data
+install-exec:
+install-data: install-data- at USE_NLS@
+install-data-no: all
+install-data-yes: all
+ if test -r "$(MKINSTALLDIRS)"; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ fi
+ @catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ case "$$cat" in \
+ *.gmo) destdir=$(gnulocaledir);; \
+ *) destdir=$(localedir);; \
+ esac; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+ if test -r "$(MKINSTALLDIRS)"; then \
+ $(MKINSTALLDIRS) $$dir; \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+ fi; \
+ if test -r $$cat; then \
+ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ else \
+ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ echo "installing $(srcdir)/$$cat as" \
+ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ fi; \
+ if test -r $$cat.m; then \
+ $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ else \
+ if test -r $(srcdir)/$$cat.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$cat.m \
+ $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+ echo "installing $(srcdir)/$$cat as" \
+ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ else \
+ true; \
+ fi; \
+ fi; \
+ done
+ if test "$(PACKAGE)" = "glib"; then \
+ if test -r "$(MKINSTALLDIRS)"; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+ else \
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+ fi; \
+ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+ else \
+ : ; \
+ fi
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+ catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
+ done
+ if test "$(PACKAGE)" = "glib"; then \
+ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+ fi
+
+check: all
+
+dvi info tags TAGS ID:
+
+mostlyclean:
+ rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
+ rm -fr *.o
+ rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+ rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+
+maintainer-clean: distclean
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+ rm -f $(GMOFILES)
+
+distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: update-po $(DISTFILES)
+ dists="$(DISTFILES)"; \
+ for file in $$dists; do \
+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+ || cp -p $(srcdir)/$$file $(distdir); \
+ done
+
+update-po: Makefile
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ tmpdir=`pwd`; \
+ cd $(srcdir); \
+ catalogs='$(CATALOGS)'; \
+ for cat in $$catalogs; do \
+ cat=`basename $$cat`; \
+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ echo "$$lang:"; \
+ if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -o $$tmpdir/$$lang.new.po $$lang; then \
+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ exit 1; \
+ fi; \
+ fi; \
+ else \
+ echo "msgmerge for $$cat failed!"; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi; \
+ done
+
+# POTFILES is created from POTFILES.in by stripping comments, empty lines
+# and Intltool tags (enclosed in square brackets), and appending a full
+# relative path to them
+POTFILES: POTFILES.in
+ ( if test 'x$(srcdir)' != 'x.'; then \
+ posrcprefix='$(top_srcdir)/'; \
+ else \
+ posrcprefix="../"; \
+ fi; \
+ rm -f $@-t $@ \
+ && (sed -e '/^#/d' \
+ -e "s/^\[.*\] +//" \
+ -e '/^[ ]*$$/d' \
+ -e "s at .*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+ | sed -e '$$s/\\$$//') > $@-t \
+ && chmod a-w $@-t \
+ && mv $@-t $@ )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+ cd .. \
+ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+ $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/MonoDevelop/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/po/POTFILES.in 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/POTFILES.in 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,3 @@
+[encoding: UTF-8]
+data/resources/glade/Base.glade
+src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
Added: trunk/MonoDevelop/po/POTFILES.skip
===================================================================
Added: trunk/MonoDevelop/po/en_CA.po
===================================================================
--- trunk/MonoDevelop/po/en_CA.po 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/po/en_CA.po 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,365 @@
+# MonoDevelop en_CA translation
+# Copyright (C) 2004 Todd Berman
+# This file is distributed under the same license as the PACKAGE package.
+# Todd Berman <tberman at sevenl.net>, 2004.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: MonoDevelop 0.3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-02 04:24-0500\n"
+"PO-Revision-Date: 2004-04-02 03:31-0500\n"
+"Last-Translator: Todd Berman <tberman at sevenl.net>\n"
+"Language-Team: Todd Berman <tberman at sevenl.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/resources/glade/Base.glade.h:1
+msgid " "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:2
+msgid " "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:3
+msgid " > "
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:4
+msgid "*"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:5
+msgid "..."
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:6
+msgid "<b>Code generation options</b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:7
+msgid "<b>Comment generation options</b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:8
+msgid "<b>Include</b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:9
+msgid "<b>Load</b>-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:10
+msgid "<b>Location</b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:11
+msgid "<b>On Project Load- </b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:12
+msgid "<b>Project Information-</b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:13
+msgid "<b>Save</b>-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:14
+msgid "<b>Template</b>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:15
+msgid "<span weight=\"bold\" size=\"x-large\">Title</span>"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:16
+msgid "Action-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:17
+msgid "Allways create backup copy-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:18
+msgid "Automaticly _include found files-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:19
+msgid "Browse"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:20
+msgid "Build and run options"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:21
+msgid "BuildPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:22
+msgid "Cat_egories:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:23
+msgid "CombineStartupPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:24
+msgid "Compilation _target"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:25
+msgid "CompileFileOptionsPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:26
+msgid "Create seperate c_ombine subdirectory"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:27
+msgid "Creates a new C# Project"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:28
+msgid "Default _combine location-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:29
+msgid "DeployFileOptionsPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:30
+msgid "Did you know that you can design lots of cool things with glade?"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:31
+msgid "Did you know?"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:32
+msgid "Enable _viewstate-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:33
+msgid "ExternalToolPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:34
+msgid "GNU GENERAL PUBLIC LICENSE"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:35
+msgid "GeneralProjectOptionsPanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:36
+msgid "Generate _additional comments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:37
+msgid "Generate _documentation comments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:38
+msgid "Include Found Files"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:39
+msgid "Layout name:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:40
+msgid "Line Terminator Style-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:41
+msgid "Load user-specific settings with the document-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:42
+msgid "LoadSavePanel"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:43
+msgid "Macintosh-"
+msgstr "Mac, eh?"
+
+#: data/resources/glade/Base.glade.h:44
+msgid "New Combine"
+msgstr "New Combine, eh?"
+
+#: data/resources/glade/Base.glade.h:45
+msgid "New layout"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:46
+msgid "Project _Subdirectory:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:47
+msgid "Project will be saved in: /dev/null"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:48
+msgid "Search for new _files on load-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:49
+msgid "Show Extensions in project scout"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:50
+msgid "Show _output pad when build starts-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:51
+msgid "Show _task list pad if build finished with errors-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:52
+msgid "Show hidden files and directories"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:53
+msgid "Tip of the day"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:54
+msgid "Unix-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:55
+msgid "Use _Output Window"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:56
+msgid "Windows-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:57
+msgid "With _scriptfile"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:58
+msgid "_Arguments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:59
+msgid "_Command"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:60
+msgid "_Deploy target:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:61
+msgid "_Description-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:62
+msgid "_Don't save changes to open documents -"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:63
+msgid "_Else on same line as closing bracket"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:64
+msgid "_Include files in compile run-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:65
+msgid "_Insert blank lines between members"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:66
+msgid "_Load previous combine on startup-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:67
+msgid "_Location:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:68
+msgid "_Multiple Startup Project-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:69
+msgid "_Name-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:70
+msgid "_Name:"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:71
+msgid "_Next Tip"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:72
+msgid "_Project Files"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:73
+msgid "_Prompt for Arguments"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:74
+msgid "_Prompt to save changes to open documents-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:75
+msgid "_Save Changes to open documents-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:76
+msgid "_Show at startup"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:77
+msgid "_Single Startup Project-"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:78
+msgid "_Start code block on the same line"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:79
+msgid "_Title"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:80
+msgid "_Use full type names"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:81
+msgid "_Working Dir."
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:82
+msgid "button1"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:83
+msgid "button3"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:84
+msgid "dialog1"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:85
+msgid "radiobutton1"
+msgstr ""
+
+#: data/resources/glade/Base.glade.h:86
+msgid "radiobutton2"
+msgstr ""
+
+#: src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs:129
+msgid "About MonoDevelop"
+msgstr "Aboot MonoDevelop"
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-04-02 09:37:27 UTC (rev 1340)
@@ -1,3 +1,12 @@
+2004-04-02 Todd Berman <tberman at sevenl.net>
+
+ * Makefile.am: Added GettextCatalog.cs
+ * Services/GettextCatalog.cs: imported from muine, modified a bit.
+ * Gui/Dialogs/CommonAboutDialog.cs: added gettext translatable title
+ to test .cs translations.
+ * Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs: modified to
+ test .glade translations
+
2004-04-01 John Luke <jluke at cfl.rr.com>
* Internal/ExternalTool/ExternalTool.cs:
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-04-02 09:37:27 UTC (rev 1340)
@@ -10,6 +10,7 @@
using MonoDevelop.Gui;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Services;
+using MonoDevelop.Services;
//using MonoDevelop.Gui.HtmlControl;
using Gdk;
@@ -118,13 +119,14 @@
ScrollBox aboutPictureScrollBox;
static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+ static GettextCatalog gettext = (GettextCatalog)ServiceManager.Services.GetService (typeof (GettextCatalog));
static CommonAboutDialog ()
{
type = RegisterGType (typeof (CommonAboutDialog));
}
- public CommonAboutDialog() : base ("About MonoDevelop", (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
+ public CommonAboutDialog() : base (gettext.GetString ("About MonoDevelop"), (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
{
ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
aboutPictureScrollBox = new ScrollBox ();
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs 2004-04-02 09:37:27 UTC (rev 1340)
@@ -94,8 +94,8 @@
"${res:Dialog.Options.IDEOptions.LoadSaveOptions.LineTerminatorStyleGroupBox}");
windowsRadioButton.Label = StringParserService.Parse(
"${res:Dialog.Options.IDEOptions.LoadSaveOptions.WindowsRadioButton}");
- macintoshRadioButton.Label = StringParserService.Parse(
- "${res:Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton}");
+ //macintoshRadioButton.Label = StringParserService.Parse(
+ // "${res:Dialog.Options.IDEOptions.LoadSaveOptions.MacintoshRadioButton}");
unixRadioButton.Label = StringParserService.Parse(
"${res:Dialog.Options.IDEOptions.LoadSaveOptions.UnixRadioButton}");
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-04-02 09:37:27 UTC (rev 1340)
@@ -215,6 +215,7 @@
./Services/Toolbar/ToolbarService.cs \
./Services/MonodocService.cs \
./Services/IDebuggerService.cs \
+./Services/GettextCatalog.cs \
./Internal/Undo/IUndoableOperation.cs \
./Internal/Undo/UndoStack.cs \
./Internal/Undo/UndoQueue.cs \
Added: trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs 2004-04-02 00:55:12 UTC (rev 1339)
+++ trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs 2004-04-02 09:37:27 UTC (rev 1340)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2004 Jorn Baayen <jorn at nl.linux.org>
+ *
+ * Modified by Todd Berman <tberman at sevenl.net> to fit with MonoDevelop.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * !!! Note that this class has to have the same API as the one
+ * from GNU.Gettext.dll, because otherwise the strings won't
+ * be picked up by update-po.
+ */
+
+using System.Runtime.InteropServices;
+
+using MonoDevelop.Core.Services;
+using MonoDevelop.Core.AddIns;
+
+namespace MonoDevelop.Services
+{
+
+ public class GettextCatalog : AbstractService
+ {
+
+ public GettextCatalog () : this ("monodevelop")
+ {
+ }
+
+ [DllImport ("libmonodevelop")]
+ private static extern void intl_init (string package);
+
+ public GettextCatalog (string package)
+ {
+ intl_init (package);
+ }
+
+ [DllImport ("libmonodevelop")]
+ private static extern string intl_get_string (string str);
+
+ public string GetString (string str)
+ {
+ return intl_get_string (str);
+ }
+
+ [DllImport ("libmonodevelop")]
+ private static extern string intl_get_plural_string (string singular,
+ string plural,
+ int n);
+
+ public string GetPluralString (string singular,
+ string plural,
+ int n)
+ {
+ return intl_get_plural_string (singular, plural, n);
+ }
+ }
+}
More information about the Monodevelop-patches-list
mailing list