diff options
Diffstat (limited to 'po/ChangeLog')
| -rw-r--r-- | po/ChangeLog | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index fe3f6aa629..721636a83f 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -99,12 +99,10 @@ * 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 @@ -115,7 +113,6 @@ Fixes bug #575466. * LINGUAS: Added af. ->>>>>>> .r37444 2009-03-15 Daniel Nylander <po@danielnylander.se> * sv.po: Updated Swedish translation. @@ -696,11 +693,7 @@ * 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 @@ -748,11 +741,7 @@ 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> @@ -805,27 +794,12 @@ * 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> @@ -835,7 +809,6 @@ 2008-09-21 Rajesh Ranjan <rajeshkajha@yahoo.com> * hi.po: Updated Hindi Translation. ->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:po/ChangeLog 2008-09-21 Gabor Kelemen <kelemeng@gnome.hu> @@ -896,30 +869,18 @@ 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. @@ -933,11 +894,7 @@ 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> |