diff --git a/phpgwapi/setup/egw_ar.lang b/phpgwapi/lang/egw_ar.lang
similarity index 100%
rename from phpgwapi/setup/egw_ar.lang
rename to phpgwapi/lang/egw_ar.lang
diff --git a/phpgwapi/setup/egw_bg.lang b/phpgwapi/lang/egw_bg.lang
similarity index 100%
rename from phpgwapi/setup/egw_bg.lang
rename to phpgwapi/lang/egw_bg.lang
diff --git a/phpgwapi/setup/egw_ca.lang b/phpgwapi/lang/egw_ca.lang
similarity index 100%
rename from phpgwapi/setup/egw_ca.lang
rename to phpgwapi/lang/egw_ca.lang
diff --git a/phpgwapi/setup/egw_cs.lang b/phpgwapi/lang/egw_cs.lang
similarity index 100%
rename from phpgwapi/setup/egw_cs.lang
rename to phpgwapi/lang/egw_cs.lang
diff --git a/phpgwapi/setup/egw_da.lang b/phpgwapi/lang/egw_da.lang
similarity index 100%
rename from phpgwapi/setup/egw_da.lang
rename to phpgwapi/lang/egw_da.lang
diff --git a/phpgwapi/setup/egw_de.lang b/phpgwapi/lang/egw_de.lang
similarity index 100%
rename from phpgwapi/setup/egw_de.lang
rename to phpgwapi/lang/egw_de.lang
diff --git a/phpgwapi/setup/egw_el.lang b/phpgwapi/lang/egw_el.lang
similarity index 100%
rename from phpgwapi/setup/egw_el.lang
rename to phpgwapi/lang/egw_el.lang
diff --git a/phpgwapi/setup/egw_en.lang b/phpgwapi/lang/egw_en.lang
similarity index 100%
rename from phpgwapi/setup/egw_en.lang
rename to phpgwapi/lang/egw_en.lang
diff --git a/phpgwapi/setup/egw_es-es.lang b/phpgwapi/lang/egw_es-es.lang
similarity index 100%
rename from phpgwapi/setup/egw_es-es.lang
rename to phpgwapi/lang/egw_es-es.lang
diff --git a/phpgwapi/setup/egw_et.lang b/phpgwapi/lang/egw_et.lang
similarity index 100%
rename from phpgwapi/setup/egw_et.lang
rename to phpgwapi/lang/egw_et.lang
diff --git a/phpgwapi/setup/egw_eu.lang b/phpgwapi/lang/egw_eu.lang
similarity index 100%
rename from phpgwapi/setup/egw_eu.lang
rename to phpgwapi/lang/egw_eu.lang
diff --git a/phpgwapi/setup/egw_fa.lang b/phpgwapi/lang/egw_fa.lang
similarity index 100%
rename from phpgwapi/setup/egw_fa.lang
rename to phpgwapi/lang/egw_fa.lang
diff --git a/phpgwapi/setup/egw_fi.lang b/phpgwapi/lang/egw_fi.lang
similarity index 100%
rename from phpgwapi/setup/egw_fi.lang
rename to phpgwapi/lang/egw_fi.lang
diff --git a/phpgwapi/setup/egw_fr.lang b/phpgwapi/lang/egw_fr.lang
similarity index 100%
rename from phpgwapi/setup/egw_fr.lang
rename to phpgwapi/lang/egw_fr.lang
diff --git a/phpgwapi/setup/egw_he.lang b/phpgwapi/lang/egw_he.lang
similarity index 100%
rename from phpgwapi/setup/egw_he.lang
rename to phpgwapi/lang/egw_he.lang
diff --git a/phpgwapi/setup/egw_hi.lang b/phpgwapi/lang/egw_hi.lang
similarity index 100%
rename from phpgwapi/setup/egw_hi.lang
rename to phpgwapi/lang/egw_hi.lang
diff --git a/phpgwapi/setup/egw_hr.lang b/phpgwapi/lang/egw_hr.lang
similarity index 100%
rename from phpgwapi/setup/egw_hr.lang
rename to phpgwapi/lang/egw_hr.lang
diff --git a/phpgwapi/setup/egw_hu.lang b/phpgwapi/lang/egw_hu.lang
similarity index 100%
rename from phpgwapi/setup/egw_hu.lang
rename to phpgwapi/lang/egw_hu.lang
diff --git a/phpgwapi/setup/egw_it.lang b/phpgwapi/lang/egw_it.lang
similarity index 100%
rename from phpgwapi/setup/egw_it.lang
rename to phpgwapi/lang/egw_it.lang
diff --git a/phpgwapi/setup/egw_iw.lang b/phpgwapi/lang/egw_iw.lang
old mode 100755
new mode 100644
similarity index 100%
rename from phpgwapi/setup/egw_iw.lang
rename to phpgwapi/lang/egw_iw.lang
diff --git a/phpgwapi/setup/egw_ja.lang b/phpgwapi/lang/egw_ja.lang
similarity index 100%
rename from phpgwapi/setup/egw_ja.lang
rename to phpgwapi/lang/egw_ja.lang
diff --git a/phpgwapi/setup/egw_ko.lang b/phpgwapi/lang/egw_ko.lang
similarity index 100%
rename from phpgwapi/setup/egw_ko.lang
rename to phpgwapi/lang/egw_ko.lang
diff --git a/phpgwapi/setup/egw_lt.lang b/phpgwapi/lang/egw_lt.lang
similarity index 100%
rename from phpgwapi/setup/egw_lt.lang
rename to phpgwapi/lang/egw_lt.lang
diff --git a/phpgwapi/setup/egw_lv.lang b/phpgwapi/lang/egw_lv.lang
similarity index 100%
rename from phpgwapi/setup/egw_lv.lang
rename to phpgwapi/lang/egw_lv.lang
diff --git a/phpgwapi/setup/egw_nl.lang b/phpgwapi/lang/egw_nl.lang
similarity index 100%
rename from phpgwapi/setup/egw_nl.lang
rename to phpgwapi/lang/egw_nl.lang
diff --git a/phpgwapi/setup/egw_no.lang b/phpgwapi/lang/egw_no.lang
similarity index 100%
rename from phpgwapi/setup/egw_no.lang
rename to phpgwapi/lang/egw_no.lang
diff --git a/phpgwapi/setup/egw_pl.lang b/phpgwapi/lang/egw_pl.lang
old mode 100755
new mode 100644
similarity index 100%
rename from phpgwapi/setup/egw_pl.lang
rename to phpgwapi/lang/egw_pl.lang
diff --git a/phpgwapi/setup/egw_pt-br.lang b/phpgwapi/lang/egw_pt-br.lang
old mode 100755
new mode 100644
similarity index 100%
rename from phpgwapi/setup/egw_pt-br.lang
rename to phpgwapi/lang/egw_pt-br.lang
diff --git a/phpgwapi/setup/egw_pt.lang b/phpgwapi/lang/egw_pt.lang
similarity index 100%
rename from phpgwapi/setup/egw_pt.lang
rename to phpgwapi/lang/egw_pt.lang
diff --git a/phpgwapi/setup/egw_ro.lang b/phpgwapi/lang/egw_ro.lang
similarity index 100%
rename from phpgwapi/setup/egw_ro.lang
rename to phpgwapi/lang/egw_ro.lang
diff --git a/phpgwapi/setup/egw_ru.lang b/phpgwapi/lang/egw_ru.lang
similarity index 100%
rename from phpgwapi/setup/egw_ru.lang
rename to phpgwapi/lang/egw_ru.lang
diff --git a/phpgwapi/setup/egw_rw.lang b/phpgwapi/lang/egw_rw.lang
similarity index 100%
rename from phpgwapi/setup/egw_rw.lang
rename to phpgwapi/lang/egw_rw.lang
diff --git a/phpgwapi/setup/egw_sk.lang b/phpgwapi/lang/egw_sk.lang
similarity index 100%
rename from phpgwapi/setup/egw_sk.lang
rename to phpgwapi/lang/egw_sk.lang
diff --git a/phpgwapi/setup/egw_sl.lang b/phpgwapi/lang/egw_sl.lang
similarity index 100%
rename from phpgwapi/setup/egw_sl.lang
rename to phpgwapi/lang/egw_sl.lang
diff --git a/phpgwapi/setup/egw_sv.lang b/phpgwapi/lang/egw_sv.lang
similarity index 100%
rename from phpgwapi/setup/egw_sv.lang
rename to phpgwapi/lang/egw_sv.lang
diff --git a/phpgwapi/setup/egw_th.lang b/phpgwapi/lang/egw_th.lang
similarity index 100%
rename from phpgwapi/setup/egw_th.lang
rename to phpgwapi/lang/egw_th.lang
diff --git a/phpgwapi/setup/egw_tr.lang b/phpgwapi/lang/egw_tr.lang
similarity index 100%
rename from phpgwapi/setup/egw_tr.lang
rename to phpgwapi/lang/egw_tr.lang
diff --git a/phpgwapi/setup/egw_uk.lang b/phpgwapi/lang/egw_uk.lang
similarity index 100%
rename from phpgwapi/setup/egw_uk.lang
rename to phpgwapi/lang/egw_uk.lang
diff --git a/phpgwapi/setup/egw_vi.lang b/phpgwapi/lang/egw_vi.lang
similarity index 100%
rename from phpgwapi/setup/egw_vi.lang
rename to phpgwapi/lang/egw_vi.lang
diff --git a/phpgwapi/setup/egw_zh-tw.lang b/phpgwapi/lang/egw_zh-tw.lang
similarity index 100%
rename from phpgwapi/setup/egw_zh-tw.lang
rename to phpgwapi/lang/egw_zh-tw.lang
diff --git a/phpgwapi/setup/egw_zh.lang b/phpgwapi/lang/egw_zh.lang
similarity index 100%
rename from phpgwapi/setup/egw_zh.lang
rename to phpgwapi/lang/egw_zh.lang
diff --git a/phpgwapi/setup/phpgw_rw.lang b/phpgwapi/setup/phpgw_rw.lang
deleted file mode 100644
index 0b875257e4..0000000000
--- a/phpgwapi/setup/phpgw_rw.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-no	admin	rw	Oya
-yes	admin	rw	Yego