diff options
Diffstat (limited to 'po')
-rw-r--r-- | po/ChangeLog | 44 | ||||
-rw-r--r-- | po/be.po | 28 | ||||
-rw-r--r--[-rwxr-xr-x] | po/mai.po | 0 |
3 files changed, 56 insertions, 16 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> @@ -3924,7 +3924,7 @@ msgstr "Запыт адраснай кнігі..." #, c-format msgid "There is one other contact." msgid_plural "There are %d other contacts." -msgstr[0] "Тут адзін іншы кантакт." +msgstr[0] "Тут %d адзін іншы кантакт." msgstr[1] "Тут %d іншыя кантакты." msgstr[2] "Тут %d іншых кантактаў." @@ -6448,7 +6448,7 @@ msgstr "Укладзенае паведамленьне - %s" #, c-format msgid "Attached message" msgid_plural "%d attached messages" -msgstr[0] "Укладзенае паведамленьне" +msgstr[0] "%d укладзенае паведамленьне" msgstr[1] "%d укладзеныя паведамленьні" msgstr[2] "%d укладзеных паведамленьняў" @@ -8084,7 +8084,7 @@ msgstr "Так. (Комплекснае паўтарэньне)" #, c-format msgid "Every day" msgid_plural "Every %d days" -msgstr[0] "Штодзень" +msgstr[0] "%d Штодзень" msgstr[1] "Кожныя %d дні" msgstr[2] "Кожныя %d дзён" @@ -8092,7 +8092,7 @@ msgstr[2] "Кожныя %d дзён" #, c-format msgid "Every week" msgid_plural "Every %d weeks" -msgstr[0] "Штотыдзень" +msgstr[0] "%d Штотыдзень" msgstr[1] "Кожныя %d тыдні" msgstr[2] "Кожныя %d тыдняў" @@ -8100,7 +8100,7 @@ msgstr[2] "Кожныя %d тыдняў" #, c-format msgid "Every week on " msgid_plural "Every %d weeks on " -msgstr[0] "Штотыдзень на " +msgstr[0] "%d Штотыдзень на " msgstr[1] "Кожныя %d тыдні на " msgstr[2] "Кожныя %d тыдняў на " @@ -8123,7 +8123,7 @@ msgstr "%s %s" #, c-format msgid "every month" msgid_plural "every %d months" -msgstr[0] "штомесяц" +msgstr[0] "%d штомесяц" msgstr[1] "кожныя %d месяцы" msgstr[2] "кожны %d месяцаў" @@ -8131,7 +8131,7 @@ msgstr[2] "кожны %d месяцаў" #, c-format msgid "Every year" msgid_plural "Every %d years" -msgstr[0] "Штогод" +msgstr[0] "%d Штогод" msgstr[1] "Кожныя %d гады" msgstr[2] "Кожныя %d год" @@ -11744,7 +11744,7 @@ msgstr "" #, c-format msgid "1 second ago" msgid_plural "%d seconds ago" -msgstr[0] "1 сэкунда таму" +msgstr[0] "%d сэкунда таму" msgstr[1] "%d сэкунды таму" msgstr[2] "%d сэкундаў таму" @@ -11760,7 +11760,7 @@ msgstr[2] "" #, c-format msgid "1 minute ago" msgid_plural "%d minutes ago" -msgstr[0] "1 хвіліна таму" +msgstr[0] "%d хвіліна таму" msgstr[1] "%d хвіліны таму" msgstr[2] "%d хвілінаў таму" @@ -11776,7 +11776,7 @@ msgstr[2] "Я зараз на працы" #, c-format msgid "1 hour ago" msgid_plural "%d hours ago" -msgstr[0] "1 гадзіна таму" +msgstr[0] "%d гадзіна таму" msgstr[1] "%d гадзіны таму" msgstr[2] "%d гадзінаў таму" @@ -11792,7 +11792,7 @@ msgstr[2] "" #, c-format msgid "1 day ago" msgid_plural "%d days ago" -msgstr[0] "1 дзень таму" +msgstr[0] "%d дзень таму" msgstr[1] "%d дені таму" msgstr[2] "%d дзень таму" @@ -11808,7 +11808,7 @@ msgstr[2] "Я зараз на працы" #, c-format msgid "1 week ago" msgid_plural "%d weeks ago" -msgstr[0] "1 тыдзень таму" +msgstr[0] "%d тыдзень таму" msgstr[1] "%d тыдні таму" msgstr[2] "%d тыдняў таму" @@ -11824,7 +11824,7 @@ msgstr[2] "" #, c-format msgid "1 month ago" msgid_plural "%d months ago" -msgstr[0] "1 месяц таму" +msgstr[0] "%d месяц таму" msgstr[1] "%d месяцы таму" msgstr[2] "%d месяцаў таму" @@ -11840,7 +11840,7 @@ msgstr[2] "Я зараз на працы" #, c-format msgid "1 year ago" msgid_plural "%d years ago" -msgstr[0] "1 год таму" +msgstr[0] "%d год таму" msgstr[1] "%d годы таму" msgstr[2] "%d гадоў таму" |