From 950f8cab6568f15106b1e44ae7a3af68f2670c71 Mon Sep 17 00:00:00 2001
From: Åsmund Skjæveland <aasmunds@fys.uio.no>
Date: Mon, 30 Aug 2004 14:06:24 +0000
Subject: Updated Norwegian Nynorsk translation: Merged translations from
 gnome-2-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2004-08-30  Åsmund Skjæveland <aasmunds@fys.uio.no>

	* nn.po: Updated Norwegian Nynorsk translation:
       	         Merged translations from gnome-2-8 branch.

svn path=/trunk/; revision=27084
---
 po/ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'po/ChangeLog')

diff --git a/po/ChangeLog b/po/ChangeLog
index 7db37f7632..60dc5f22d1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-30  Åsmund Skjæveland <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation: 
+       	         Merged translations from gnome-2-8 branch.
+
 2004-08-28  Ales Nyakhaychyk  <nab@mail.by>
 	
 	* be.po: Updated Belarusian translation.
@@ -121,7 +126,6 @@
 
 	* nb.po: Add this.
 
->>>>>>> 1.1655
 2004-08-18  Åsmund Skjæveland <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
-- 
cgit