GNOME.org
 

[gtranslator] Release 2.91.6

commit 0a926177c882d556c949172bcec5410be8e4d221
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Dec 29 23:07:38 2012 +0100

    Release 2.91.6

 .gitignore                             |   99 --------------------------------
 NEWS                                   |   24 ++++++++
 configure.ac                           |    2 +-
 git.mk                                 |   76 ++++++++++++++++--------
 plugins/alternate-language/Makefile.am |    1 -
 plugins/codeview/gtr-viewer.c          |    2 +-
 src/gtr-actions-edit.c                 |    1 +
 src/gtr-actions-search.c               |    1 +
 src/gtr-settings.c                     |    1 +
 src/gtr-tab.c                          |    1 +
 src/gtr-window.c                       |    1 +
 11 files changed, 81 insertions(+), 128 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4139132..c0ea9d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,27 @@
+NEWS from gtranslator 2.91.6 (2012-12-29):
+- Misc bugfixes.
+
+Translations:
+- be (Yuri Matsuk)
+- ca (SÃlvia Miranda)
+- da (Joe Hansen)
+- de (Christian Kirbach)
+- de (Mario BlÃttermann)
+- el (Ioannis Zampoukas)
+- es (Daniel Mustieles)
+- et (Mattias PÃldaru)
+- he (Yaron Shahrabani)
+- hu (Gabor Kelemen)
+- id (Andika Triwidada)
+- ja (Jiro Matsuzawa)
+- ko (Seong-ho Cho)
+- nn (Ãsmund SkjÃveland)
+- pl (Piotr DrÄg)
+- ru (Yuri Myasoedov)
+- sk (Ondrej MosnÃÄek)
+- th (Akom Chotiphantawanon)
+- tr (Muhammet Kara)
+
 NEWS from gtranslator 2.91.5 (2012-06-07):
 - Add/update X-Generator header in PO file (Daniel Mustieles)
 - Misc bugfixes
diff --git a/configure.ac b/configure.ac
index a612c48..c1ba5b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl -------------------------------------------------------------------
 dnl (C) 2000-2004 Fatih Demir <kabalak kabalak net>
 dnl -------------------------------------------------------------------
 AC_PREREQ(2.64)
-AC_INIT([gtranslator],[2.91.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtranslator],[gtranslator],[http://projects.gnome.org/gtranslator/])
+AC_INIT([gtranslator],[2.91.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtranslator],[gtranslator],[http://projects.gnome.org/gtranslator/])
 
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/git.mk b/git.mk
index abd6c0a..4da8fe2 100644
--- a/git.mk
+++ b/git.mk
@@ -1,18 +1,20 @@
 # git.mk
 #
 # Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011 Behdad Esfahbod
 # Written by Behdad Esfahbod
 #
 # Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
+# is 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.
+# The canonical source for this file is https://github.com/behdad/git.mk.
 #
 # 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.
+# your project to -include git.mk.  Remember to add that line to new
+# Makefile.am files you create in your project, or just rerun the
+# "make -f git.mk".
 #
 # This enables automatic .gitignore generation.  If you need to ignore
 # more files, add them to the GITIGNOREFILES variable in your Makefile.am.
@@ -22,7 +24,7 @@
 #
 # 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.
+# or maintainer-clean-local make targets.
 #
 # Note that for files like editor backup, etc, there are better places to
 # ignore them.  See "man gitignore".
@@ -30,18 +32,24 @@
 # 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.
+# the directories involved and I'll diagnose.
 #
 # For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# pango/Makefile.am.
+# Makefile.am.sample in the git.mk git repo.
 #
 # 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, mallard, intltool, gsettings.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
 #
+# This makefile provides the following targets:
+#
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
 #
 # KNOWN ISSUES:
 #
@@ -52,16 +60,13 @@
 #   And add those files to git.  See vte/gnome-pty-helper/git.mk for
 #   example.
 #
-# ChangeLog
-#
-# - 2010-12-06 Add support for Mallard docs
-# - 2010-12-06 Start this change log
 
 git-all: git-mk-install
 
 git-mk-install:
 	@echo Installing git makefile
-	@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+	@any_failed=; \
+		find "`test -z "$(top_srcdir)" && echo . || echo "$(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 \
@@ -98,19 +103,32 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 			; do echo /$$x; done; \
 		fi; \
 		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for lc in $(DOC_LINGUAS); do \
+				for x in \
+					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+					$(DOC_PAGES) \
+					$(DOC_INCLUDES) \
+				; do echo /$$lc/$$x; done; \
+			done; \
 			for x in \
-				$(_DOC_C_DOCS) \
-				$(_DOC_LC_DOCS) \
 				$(_DOC_OMF_ALL) \
 				$(_DOC_DSK_ALL) \
 				$(_DOC_HTML_ALL) \
 				$(_DOC_MOFILES) \
-				$(_DOC_POFILES) \
 				$(DOC_H_FILE) \
 				"*/.xml2po.mo" \
 				"*/*.omf.out" \
 			; do echo /$$x; done; \
 		fi; \
+		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+			for lc in $(HELP_LINGUAS); do \
+				for x in \
+					$(HELP_FILES) \
+					"$$lc.stamp" \
+					"$$lc.mo" \
+				; do echo /$$lc/$$x; done; \
+			done; \
+		fi; \
 		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
 			for x in \
 				$(gsettings_SCHEMAS:.xml=.valid) \
@@ -143,14 +161,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 				config.lt \
 			; do echo /$$x; done; \
 		fi; \
+		if test "x$(DEJATOOL)" = x; then :; else \
+			for x in \
+				$(DEJATOOL) \
+			; do echo /$$x.sum; echo /$$x.log; done; \
+			echo /site.exp; \
+		fi; \
 		for x in \
 			.gitignore \
 			$(GITIGNOREFILES) \
 			$(CLEANFILES) \
-			$(PROGRAMS) \
-			$(check_PROGRAMS) \
-			$(EXTRA_PROGRAMS) \
-			$(LTLIBRARIES) \
+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
 			so_locations \
 			.libs _libs \
 			$(MOSTLYCLEANFILES) \
@@ -180,18 +203,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 	mv $  tmp $@;
 
 all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
 gitignore-recurse-maybe:
-	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-	fi;
-gitignore-recurse:
 	@for subdir in $(DIST_SUBDIRS); do \
 	  case " $(SUBDIRS) " in \
 	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \
 	  esac; \
 	done
-gitignore: $(srcdir)/.gitignore gitignore-recurse
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	    test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \
+	done
 
 maintainer-clean: gitignore-clean
 gitignore-clean:
diff --git a/plugins/alternate-language/Makefile.am b/plugins/alternate-language/Makefile.am
index 4f97f38..15ef70d 100644
--- a/plugins/alternate-language/Makefile.am
+++ b/plugins/alternate-language/Makefile.am
@@ -4,7 +4,6 @@ plugindir = $(libdir)/gtranslator/plugins
 INCLUDES = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/src				\
-	-I$(top_srcdir)/src/dialogs			\
 	$(GTRANSLATOR_CFLAGS) 				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)				\
diff --git a/plugins/codeview/gtr-viewer.c b/plugins/codeview/gtr-viewer.c
index 1428d50..6566e6b 100644
--- a/plugins/codeview/gtr-viewer.c
+++ b/plugins/codeview/gtr-viewer.c
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <string.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksource.h>
 
 #define GTR_VIEWER_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ( \
 						 	(object),	\
diff --git a/src/gtr-actions-edit.c b/src/gtr-actions-edit.c
index bcc2303..8b62bbc 100644
--- a/src/gtr-actions-edit.c
+++ b/src/gtr-actions-edit.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksource.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/src/gtr-actions-search.c b/src/gtr-actions-search.c
index 9545636..8872726 100644
--- a/src/gtr-actions-search.c
+++ b/src/gtr-actions-search.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtksourceview/gtksource.h>
 
 #include "gtr-actions.h"
 #include "gtr-msg.h"
diff --git a/src/gtr-settings.c b/src/gtr-settings.c
index 9a7bf73..fb02764 100644
--- a/src/gtr-settings.c
+++ b/src/gtr-settings.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 #include <gdl/gdl.h>
+#include <gtksourceview/gtksource.h>
 
 #include "gtr-settings.h"
 #include "gtr-application.h"
diff --git a/src/gtr-tab.c b/src/gtr-tab.c
index 2ebf60b..538b27f 100644
--- a/src/gtr-tab.c
+++ b/src/gtr-tab.c
@@ -50,6 +50,7 @@
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksource.h>
 #include <libpeas/peas-extension-set.h>
 
 #ifdef G_OS_WIN32
diff --git a/src/gtr-window.c b/src/gtr-window.c
index f136346..b106bb8 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -50,6 +50,7 @@
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gtksourceview/gtksource.h>
 #include <libpeas/peas-extension-set.h>
 
 #define GTR_STOCK_FUZZY_NEXT "gtranslator-fuzzy-next"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]