aboutsummaryrefslogtreecommitdiffstats
path: root/po/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'po/ChangeLog')
-rw-r--r--po/ChangeLog6
1 files changed, 5 insertions, 1 deletions
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.