diff --git a/admin/win/nsi/l10n/.tx/config b/admin/win/nsi/l10n/.tx/config
index 7b135d430..8c3c1f4b0 100644
--- a/admin/win/nsi/l10n/.tx/config
+++ b/admin/win/nsi/l10n/.tx/config
@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
-[owncloud.mirall-wininstaller]
+[owncloud.client-nsis]
host = https://www.transifex.com
source_file = pofiles/messages.pot
source_lang = en
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index b4d49b476..0f88e09d2 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -519,7 +519,7 @@ void Application::setupTranslations()
lang.replace(QLatin1Char('-'), QLatin1Char('_')); // work around QTBUG-25973
lang = substLang(lang);
const QString trPath = applicationTrPath();
- const QString trFile = QLatin1String("mirall_") + lang;
+ const QString trFile = QLatin1String("client_") + lang;
if (translator->load(trFile, trPath) ||
lang.startsWith(QLatin1String("en"))) {
// Permissive approach: Qt and keychain translations
diff --git a/translations/.tx/config b/translations/.tx/config
index 00f1c5e21..59b888e65 100644
--- a/translations/.tx/config
+++ b/translations/.tx/config
@@ -1,46 +1,46 @@
[main]
host = https://www.transifex.com
-[owncloud.mirall]
+[owncloud.client]
host = https://www.transifex.com
-source_file = mirall_en.ts
+source_file = client_en.ts
source_lang = en
# simple one-to-one language mappings
-trans.ca = mirall_ca.ts
-trans.el = mirall_el.ts
-trans.es = mirall_es.ts
-trans.es_AR = mirall_es_AR.ts
-trans.eu = mirall_eu.ts
-trans.fa = mirall_fa.ts
-trans.fr = mirall_fr.ts
-trans.gl = mirall_gl.ts
-trans.it = mirall_it.ts
-trans.nl = mirall_nl.ts
-trans.pl = mirall_pl.ts
-trans.pt_BR = mirall_pt_BR.ts
-trans.ru = mirall_ru.ts
-trans.sl = mirall_sl.ts
-trans.sv = mirall_sv.ts
-trans.tr = mirall_tr.ts
-trans.uk = mirall_uk.ts
-trans.zh_TW = mirall_zh_TW.ts
-trans.zh_CN = mirall_zh_CN.ts
+trans.ca = client_ca.ts
+trans.el = client_el.ts
+trans.es = client_es.ts
+trans.es_AR = client_es_AR.ts
+trans.eu = client_eu.ts
+trans.fa = client_fa.ts
+trans.fr = client_fr.ts
+trans.gl = client_gl.ts
+trans.it = client_it.ts
+trans.nl = client_nl.ts
+trans.pl = client_pl.ts
+trans.pt_BR = client_pt_BR.ts
+trans.ru = client_ru.ts
+trans.sl = client_sl.ts
+trans.sv = client_sv.ts
+trans.tr = client_tr.ts
+trans.uk = client_uk.ts
+trans.zh_TW = client_zh_TW.ts
+trans.zh_CN = client_zh_CN.ts
# special handling below
# de_DE holds the formal translation which we want as default
-trans.de_DE = mirall_de.ts
+trans.de_DE = client_de.ts
# choose one of the given translations on transifex as default
-trans.pt_PT = mirall_pt.ts
+trans.pt_PT = client_pt.ts
# choose a special language as more generic default
-trans.cs_CZ = mirall_cs.ts
-trans.et_EE = mirall_et.ts
-trans.fi_FI = mirall_fi.ts
-trans.ja_JP = mirall_ja.ts
-trans.hu_HU = mirall_hu.ts
-trans.sk_SK = mirall_sk.ts
-trans.th_TH = mirall_th.ts
+trans.cs_CZ = client_cs.ts
+trans.et_EE = client_et.ts
+trans.fi_FI = client_fi.ts
+trans.ja_JP = client_ja.ts
+trans.hu_HU = client_hu.ts
+trans.sk_SK = client_sk.ts
+trans.th_TH = client_th.ts
diff --git a/translations/mirall_TW.ts b/translations/client_TW.ts
similarity index 100%
rename from translations/mirall_TW.ts
rename to translations/client_TW.ts
diff --git a/translations/mirall_ca.ts b/translations/client_ca.ts
similarity index 100%
rename from translations/mirall_ca.ts
rename to translations/client_ca.ts
diff --git a/translations/mirall_cs.ts b/translations/client_cs.ts
similarity index 100%
rename from translations/mirall_cs.ts
rename to translations/client_cs.ts
diff --git a/translations/mirall_de.ts b/translations/client_de.ts
similarity index 100%
rename from translations/mirall_de.ts
rename to translations/client_de.ts
diff --git a/translations/mirall_el.ts b/translations/client_el.ts
similarity index 100%
rename from translations/mirall_el.ts
rename to translations/client_el.ts
diff --git a/translations/mirall_en.ts b/translations/client_en.ts
similarity index 100%
rename from translations/mirall_en.ts
rename to translations/client_en.ts
diff --git a/translations/mirall_es.ts b/translations/client_es.ts
similarity index 100%
rename from translations/mirall_es.ts
rename to translations/client_es.ts
diff --git a/translations/mirall_es_AR.ts b/translations/client_es_AR.ts
similarity index 99%
rename from translations/mirall_es_AR.ts
rename to translations/client_es_AR.ts
index 990671947..2853e5406 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -441,7 +441,7 @@ Total time left %5
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?
Esta sincronización borraría todos los archivos en el directorio local de sincronización '%1'.
-Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o a que todos los archivos fueron borrados manualmente.
+Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o a que todos los archivos fueron borrados manualmente.
¿Estás seguro de que querés realizar esta operación?
diff --git a/translations/mirall_et.ts b/translations/client_et.ts
similarity index 100%
rename from translations/mirall_et.ts
rename to translations/client_et.ts
diff --git a/translations/mirall_eu.ts b/translations/client_eu.ts
similarity index 100%
rename from translations/mirall_eu.ts
rename to translations/client_eu.ts
diff --git a/translations/mirall_fa.ts b/translations/client_fa.ts
similarity index 100%
rename from translations/mirall_fa.ts
rename to translations/client_fa.ts
diff --git a/translations/mirall_fi.ts b/translations/client_fi.ts
similarity index 100%
rename from translations/mirall_fi.ts
rename to translations/client_fi.ts
diff --git a/translations/mirall_fr.ts b/translations/client_fr.ts
similarity index 99%
rename from translations/mirall_fr.ts
rename to translations/client_fr.ts
index 91b2349ad..9311fcde1 100644
--- a/translations/mirall_fr.ts
+++ b/translations/client_fr.ts
@@ -1041,7 +1041,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
- Une nouvelle mise à jour est sur le point d'être installée. L'assistant
+ Une nouvelle mise à jour est sur le point d'être installée. L'assistant
peut demander des privilèges additionnels durant le processus.
diff --git a/translations/mirall_gl.ts b/translations/client_gl.ts
similarity index 100%
rename from translations/mirall_gl.ts
rename to translations/client_gl.ts
diff --git a/translations/mirall_hu.ts b/translations/client_hu.ts
similarity index 100%
rename from translations/mirall_hu.ts
rename to translations/client_hu.ts
diff --git a/translations/mirall_it.ts b/translations/client_it.ts
similarity index 100%
rename from translations/mirall_it.ts
rename to translations/client_it.ts
diff --git a/translations/mirall_ja.ts b/translations/client_ja.ts
similarity index 100%
rename from translations/mirall_ja.ts
rename to translations/client_ja.ts
diff --git a/translations/mirall_nl.ts b/translations/client_nl.ts
similarity index 100%
rename from translations/mirall_nl.ts
rename to translations/client_nl.ts
diff --git a/translations/mirall_pl.ts b/translations/client_pl.ts
similarity index 99%
rename from translations/mirall_pl.ts
rename to translations/client_pl.ts
index 7088b0f8f..dfff8eb18 100644
--- a/translations/mirall_pl.ts
+++ b/translations/client_pl.ts
@@ -1041,7 +1041,7 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
- Nowa aktualizacja ma zostać zainstalowana. Instalator może
+ Nowa aktualizacja ma zostać zainstalowana. Instalator może
poprosić o dodatkowe uprawnienia podczas tego procesu.
diff --git a/translations/mirall_pt.ts b/translations/client_pt.ts
similarity index 99%
rename from translations/mirall_pt.ts
rename to translations/client_pt.ts
index 551d1d143..b9afb6bd4 100644
--- a/translations/mirall_pt.ts
+++ b/translations/client_pt.ts
@@ -786,7 +786,7 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
- Os ficheiros ou diretórios que correspondam a uma regra não serão sincronizados.
+ Os ficheiros ou diretórios que correspondam a uma regra não serão sincronizados.
Itens verificados também serão removidos se evitarem que um diretório seja removido. Isto é útil para os metadados.
diff --git a/translations/mirall_pt_BR.ts b/translations/client_pt_BR.ts
similarity index 100%
rename from translations/mirall_pt_BR.ts
rename to translations/client_pt_BR.ts
diff --git a/translations/mirall_ru.ts b/translations/client_ru.ts
similarity index 99%
rename from translations/mirall_ru.ts
rename to translations/client_ru.ts
index ccd0ef38d..93219a8b9 100644
--- a/translations/mirall_ru.ts
+++ b/translations/client_ru.ts
@@ -1041,7 +1041,7 @@ Checked items will also be deleted if they prevent a directory from being remove
- Новое обновление в процессе установки. Установщик может запросить
+ Новое обновление в процессе установки. Установщик может запросить
дополнительные права во время обновления.
diff --git a/translations/mirall_sk.ts b/translations/client_sk.ts
similarity index 100%
rename from translations/mirall_sk.ts
rename to translations/client_sk.ts
diff --git a/translations/mirall_sl.ts b/translations/client_sl.ts
similarity index 100%
rename from translations/mirall_sl.ts
rename to translations/client_sl.ts
diff --git a/translations/mirall_sv.ts b/translations/client_sv.ts
similarity index 100%
rename from translations/mirall_sv.ts
rename to translations/client_sv.ts
diff --git a/translations/mirall_th.ts b/translations/client_th.ts
similarity index 100%
rename from translations/mirall_th.ts
rename to translations/client_th.ts
diff --git a/translations/mirall_tr.ts b/translations/client_tr.ts
similarity index 99%
rename from translations/mirall_tr.ts
rename to translations/client_tr.ts
index 7dae1575b..e439a62c9 100644
--- a/translations/mirall_tr.ts
+++ b/translations/client_tr.ts
@@ -1041,7 +1041,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
- Yeni bir güncelleme kurulmak üzere. Güncelleyici
+ Yeni bir güncelleme kurulmak üzere. Güncelleyici
bu süreç sırasında ek yetki talebinde bulunabilir.
diff --git a/translations/mirall_uk.ts b/translations/client_uk.ts
similarity index 100%
rename from translations/mirall_uk.ts
rename to translations/client_uk.ts
diff --git a/translations/mirall_zh_CN.ts b/translations/client_zh_CN.ts
similarity index 100%
rename from translations/mirall_zh_CN.ts
rename to translations/client_zh_CN.ts
diff --git a/translations/mirall_zh_TW.ts b/translations/client_zh_TW.ts
similarity index 100%
rename from translations/mirall_zh_TW.ts
rename to translations/client_zh_TW.ts