aboutsummaryrefslogtreecommitdiffstats
path: root/po/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'po/ChangeLog')
-rw-r--r--po/ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 838b4606d6..904c3488e7 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-04 Terance Sola <terance@lyse.net>
+
+ * nb.po: Updated Norwegian Bokmål translation.
+ * no.po: Same.
+
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+s2005-07-15 Shreyas Srinivasan <sshreyas@novell.com>
+=======
+=======
2005-08-03 Adam Weinberger <adamw@gnome.org>
* POTFILES.in: Added missing files.
@@ -11,6 +21,7 @@
* sk.po: Updated Slovak translation.
+>>>>>>> 1.2102
2005-07-31 Ilkka Tuohela <hile@iki.fi>
* fi.po: Bulk updates to Finnish translation
@@ -246,6 +257,7 @@
* POTFILES.in : Added missing exchange files.
2005-07-15 Shreyas Srinivasan <sshreyas@novell.com>
+>>>>>>> 1.2099
*plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
: Add file for translation.