diff options
Diffstat (limited to 'po/ChangeLog')
| -rw-r--r-- | po/ChangeLog | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 288d6506bd..fe3f6aa629 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -413,9 +413,9 @@ * es.po: Updated Spanish translation. -2009-02-06 Clytie Siddall <clytie@riverland.net.au> +2009-02-06 Clytie Siddall <clytie@riverland.net.au> - * vi.po: Updated Vietnamese translation + * vi.po Updated Vietnamese translation 2009-02-05 Sweta Kothari <swkothar@redhat.com> @@ -696,7 +696,11 @@ * sk.po: Updated Slovak translation. +<<<<<<< HEAD:po/ChangeLog +2008-10-17 Jorge Gonzalez <jorgegonz@svn.gnome.org> +======= 2008-10-17 Jorge Gonzalez <jorgegonz@svn.gnome.org> +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog * es.po: Updated Spanish translation @@ -744,7 +748,11 @@ 2008-10-01 Robert-André Mauchin <zebob.m@pengzone.org> +<<<<<<< HEAD:po/ChangeLog + * fr.po: French translation update. Fixed #554548 +======= * fr.po: French translation update. Fixed #554548 +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog thanks to Hanka Zalska from Sun. 2008-10-01 Priit Laes <plaes at svn dot gnome dot org> @@ -797,12 +805,27 @@ * pl.po: Updated Polish translation +<<<<<<< HEAD:po/ChangeLog +2008-09-21 Djihed Afifi <djihed@gmail.com> +======= 2008-09-21 Djihed Afifi <djihed@gmail.com> +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog * ar.po: Updated Arabic Translation by OsamaKhalid. 2008-09-21 Rajesh Ranjan <rajeshkajha@yahoo.com> +<<<<<<< HEAD:po/ChangeLog + * hi.po: Updated Hindi Translation. + +2008-09-21 Rajesh Ranjan <rajeshkajha@yahoo.com> + + * hi.po: Updated Hindi Translation. + +2008-09-21 Rajesh Ranjan <rajeshkajha@yahoo.com> + + * hi.po: Updated Hindi Translation. +======= * hi.po: Updated Hindi Translation. 2008-09-21 Rajesh Ranjan <rajeshkajha@yahoo.com> @@ -812,6 +835,7 @@ 2008-09-21 Rajesh Ranjan <rajeshkajha@yahoo.com> * hi.po: Updated Hindi Translation. +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog 2008-09-21 Gabor Kelemen <kelemeng@gnome.hu> @@ -872,18 +896,30 @@ 2008-09-18 Shankar Prasad <svenkate@redhat.com> +<<<<<<< HEAD:po/ChangeLog + * kn.po: Updated Kannada translation +======= * kn.po: Updated Kannada translation +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog 2008-09-18 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> * zh_HK.po: Updated Traditional Chinese translation(Hong Kong). * zh_TW.po: Updated Traditional Chinese translation(Taiwan). +<<<<<<< HEAD:po/ChangeLog +2008-09-18 Djihed Afifi <djihed@gmail.com> + + * ar.po: Updated Arabic Translation by Usama Akkad. + +2008-09-17 Djihed Afifi <djihed@gmail.com> +======= 2008-09-18 Djihed Afifi <djihed@gmail.com> * ar.po: Updated Arabic Translation by Usama Akkad. 2008-09-17 Djihed Afifi <djihed@gmail.com> +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog * ar.po: Updated Arabic Translation by Usama Akkad. @@ -897,7 +933,11 @@ 2008-09-17 Shankar Prasad <svenkate@redhat.com> +<<<<<<< HEAD:po/ChangeLog + * kn.po: Updated Kannada translation +======= * kn.po: Updated Kannada translation +>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog 2008-09-16 Jorge Gonzalez <jorgegonz@svn.gnome.org> |