diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-17 23:15:22 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-17 23:15:22 +0800 |
| commit | 50561b38dc05595c52a25529b1ff80ad876fabf6 (patch) | |
| tree | fad8b02cbe25b0969cccbdc02f128e78c0765f01 /po/ChangeLog | |
| parent | bf49384fd8b27c64ed52ac82d61dc19c94fc120a (diff) | |
| download | gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.gz gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.zst gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.zip | |
Fix merge conflicts in po/ChangeLog
svn path=/trunk/; revision=484
Diffstat (limited to 'po/ChangeLog')
| -rw-r--r-- | po/ChangeLog | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 783edb596..ffee504a3 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-12-17 Xavier Claessens <xclaesse@gmail.com> + + * pt_BR.po: Updated pt_BR translation (André Filipe de Assunção e Brito). + 2007-12-17 Luca Ferretti <elle.uca@libero.it> * it.po: Updated Italian translation by Milo Casagrande. @@ -37,8 +41,7 @@ 2007-11-26 Alexander Shopov <ash@contact.bg> - * bg.po: Updated Bulgarian translation by - Alexander Shopov <ash@contact.bg> + * bg.po: Updated Bulgarian translation 2007-11-23 Takeshi AIHANA <takeshi.aihana@gmail.com> |