ttrss/locale
Andrew Dolgov 2bf5783f81 Merge branch 'master' of git://github.com/HeikoAdams/Tiny-Tiny-RSS into HeikoAdams-master
Conflicts:
	locale/de_DE/LC_MESSAGES/messages.mo
	locale/de_DE/LC_MESSAGES/messages.po
2013-04-02 16:55:13 +04:00
..
ca_CA/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
cs_CZ/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
de_DE/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
es_ES/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
fi_FI/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
fr_FR/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
hu_HU/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
it_IT/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
ja_JP/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
lv_LV/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
nb_NO/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
nl_NL/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
pl_PL/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
pt_BR/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
ru_RU/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
sv_SE/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00
zh_CN/LC_MESSAGES rebase translations 2013-04-02 16:46:23 +04:00