aboutsummaryrefslogtreecommitdiffstats
path: root/po/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'po/ChangeLog')
-rw-r--r--po/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 34b915b6f6..bcc5b24f33 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-16 Manoj Kumar Giri <mgiri@redhat.com>
+
+ * or.po: Updated Oriya Translation.
+
+<<<<<<< .mine
+2009-03-16 Manoj Kumar Giri <mgiri@redhat.com>
+
+ * or.po: Updated Oriya Translation.
+
+=======
2009-03-16 Dwayne Bailey <dwayne@translate.org.za>
* af.po: Fix msgfmt errors
@@ -8,6 +18,7 @@
Fixes bug #575466.
* LINGUAS: Added af.
+>>>>>>> .r37444
2009-03-15 Daniel Nylander <po@danielnylander.se>
* sv.po: Updated Swedish translation.