From 60ffebd0483ae915b4bfd2ef0675295125488746 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Mon, 7 Aug 2006 20:08:32 +0000
Subject: Merged from gnome-2-14.

2006-07-24  Christian Persch  <chpe@cvs.gnome.org>

	* Makefile.am:
	* sv/sv.po:

	Merged from gnome-2-14.
---
 help/ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'help/ChangeLog')

diff --git a/help/ChangeLog b/help/ChangeLog
index b53d92793..4a93c1c5f 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-24  Christian Persch  <chpe@cvs.gnome.org>
+
+	* Makefile.am:
+	* sv/sv.po:
+
+	Merged from gnome-2-14.
+
 2006-07-27  Francisco Javier F. Serrador  <serrador@openshine.com>
 
 	* es/figures/ephy-addressbar-smartbookmark-screenshot.png: Updated image.
@@ -31,6 +38,12 @@
 
 	Documentation update from Victor Osadci.
 
+2006-05-03  Takeshi AIHANA <takeshi.aihana@gmail.com>
+
+	* help/ja/ja.po:
+	  Set translator-credit in Japanese translation.
+	  Fixes bug #339527.
+
 2006-03-17  Maxim Dziumanenko <mvd@mylinux.ua>
 
 	* uk/uk.po: Updated Ukrainian Ukrainian translation.
-- 
cgit v1.2.3