Olivier Goffart 9573c5e64d Merge remote-tracking branch '2.2' into master ... For the reanslation. Now transifex should be updated to update master. This should normally be the last merge from 2.2 Conflicts: mirall.desktop.in translations/client_sl.ts translations/client_th.ts		2016-11-04 16:51:58 +01:00
..
.tx	Adding new resource for the desktop.ini file	2016-04-22 10:58:57 +02:00
client_ca.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_cs.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_de.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_el.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_en.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_es.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_es_AR.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_et.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_eu.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_fa.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_fi.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_fr.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_gl.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_hu.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_it.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_ja.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_nb_NO.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_nl.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_pl.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_pt.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_pt_BR.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_ru.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_sk.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_sl.ts	Merge remote-tracking branch '2.2' into master	2016-11-04 16:51:58 +01:00
client_sr.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_sv.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_th.ts	Merge remote-tracking branch '2.2' into master	2016-11-04 16:51:58 +01:00
client_tr.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_TW.ts	s/mirall/client in transifex & translations	2015-02-06 15:16:55 +01:00
client_uk.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_zh_CN.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00
client_zh_TW.ts	[tx-robot] updated from transifex	2016-11-04 16:41:40 +01:00