• Cyril Brulebois's avatar
    Merge branch 'stable' into devel · 3fc21b5c
    Cyril Brulebois authored
    Conflicts:
    	po/ar.po
    	po/az.po
    	po/bg.po
    	po/cs.po
    	po/cy.po
    	po/da.po
    	po/en_GB.po
    	po/es.po
    	po/es_AR.po
    	po/fa.po
    	po/fi.po
    	po/fr_CA.po
    	po/ga.po
    	po/hr_HR.po
    	po/hu.po
    	po/id.po
    	po/is.po
    	po/ja.po
    	po/km.po
    	po/ko.po
    	po/lv.po
    	po/nb.po
    	po/nl.po
    	po/nn.po
    	po/pl.po
    	po/pt.po
    	po/ro.po
    	po/ru.po
    	po/sk.po
    	po/sk_SK.po
    	po/sl_SI.po
    	po/sq.po
    	po/sr.po
    	po/sv.po
    	po/tr.po
    	po/uk.po
    	po/vi.po
    	po/zh_HK.po
    	po/zh_TW.po
    
    Conflicts fixed by taking updated translations from the stable branch,
    since the conflicts seemed to be about fuzzy strings mainly; stable had
    newer strings, and devel hadn't.
    3fc21b5c
Name
Last commit
Last update
..
POTFILES.in Loading commit data...
POTFILES.skip Loading commit data...
ar.po Loading commit data...
az.po Loading commit data...
bg.po Loading commit data...
bn.po Loading commit data...
bn_BD.po Loading commit data...
ca.po Loading commit data...
cs.po Loading commit data...
cy.po Loading commit data...
da.po Loading commit data...
de.po Loading commit data...
el.po Loading commit data...
en_GB.po Loading commit data...
es.po Loading commit data...
es_AR.po Loading commit data...
fa.po Loading commit data...
fi.po Loading commit data...
fr.po Loading commit data...
fr_CA.po Loading commit data...
ga.po Loading commit data...
he.po Loading commit data...
hr_HR.po Loading commit data...
hu.po Loading commit data...
id.po Loading commit data...
is.po Loading commit data...
it.po Loading commit data...
ja.po Loading commit data...
ka.po Loading commit data...
km.po Loading commit data...
ko.po Loading commit data...
lv.po Loading commit data...
nb.po Loading commit data...
nl.po Loading commit data...
nn.po Loading commit data...
pl.po Loading commit data...
pt.po Loading commit data...
pt_BR.po Loading commit data...
ro.po Loading commit data...
ru.po Loading commit data...
sk.po Loading commit data...
sk_SK.po Loading commit data...
sl_SI.po Loading commit data...
sq.po Loading commit data...
sr.po Loading commit data...
sv.po Loading commit data...
tails.pot Loading commit data...
tr.po Loading commit data...
uk.po Loading commit data...
vi.po Loading commit data...
zh.po Loading commit data...
zh_CN.po Loading commit data...
zh_HK.po Loading commit data...
zh_TW.po Loading commit data...