Moritz Bunkus bc795dee2e Merge branch 'mpls-append-instead-of-additional-parts' ... Conflicts: po/cs.po po/de.po po/es.po po/eu.po po/fr.po po/it.po po/ja.po po/lt.po po/nl.po po/pl.po po/pt.po po/ru.po po/tr.po po/uk.po po/zh_CN.po po/zh_TW.po		2014-01-01 18:11:25 +01:00
..
cs.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
de.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
es.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
eu.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
fr.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
it.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
ja.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
lt.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
nl.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
pl.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
pt.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
ru.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
tr.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
uk.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
zh_CN.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00
zh_TW.po	Merge branch 'mpls-append-instead-of-additional-parts'	2014-01-01 18:11:25 +01:00