diff --git a/changelog.txt b/changelog.txt
index 59016b7..1d12d3e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,7 @@ Version 1.1.1
 fixed error on authorizers (missing secret/key)
 added ability to "catchup" on missed scheduled backup
 updated google oauth and client versions
+merged in dropbox v2 code
 
 Version 1.1.0
 
diff --git a/resources/language/resource.language.af/strings.po b/resources/language/resource.language.af_za/strings.po
similarity index 100%
rename from resources/language/resource.language.af/strings.po
rename to resources/language/resource.language.af_za/strings.po
diff --git a/resources/language/resource.language.am/strings.po b/resources/language/resource.language.am_et/strings.po
similarity index 100%
rename from resources/language/resource.language.am/strings.po
rename to resources/language/resource.language.am_et/strings.po
diff --git a/resources/language/resource.language.ar/strings.po b/resources/language/resource.language.ar_sa/strings.po
similarity index 100%
rename from resources/language/resource.language.ar/strings.po
rename to resources/language/resource.language.ar_sa/strings.po
diff --git a/resources/language/resource.language.az/strings.po b/resources/language/resource.language.az_az/strings.po
similarity index 100%
rename from resources/language/resource.language.az/strings.po
rename to resources/language/resource.language.az_az/strings.po
diff --git a/resources/language/resource.language.be/strings.po b/resources/language/resource.language.be_by/strings.po
similarity index 100%
rename from resources/language/resource.language.be/strings.po
rename to resources/language/resource.language.be_by/strings.po
diff --git a/resources/language/resource.language.bg/strings.po b/resources/language/resource.language.bg_bg/strings.po
similarity index 100%
rename from resources/language/resource.language.bg/strings.po
rename to resources/language/resource.language.bg_bg/strings.po
diff --git a/resources/language/resource.language.bs/strings.po b/resources/language/resource.language.bs_ba/strings.po
similarity index 100%
rename from resources/language/resource.language.bs/strings.po
rename to resources/language/resource.language.bs_ba/strings.po
diff --git a/resources/language/resource.language.ca/strings.po b/resources/language/resource.language.ca_es/strings.po
similarity index 100%
rename from resources/language/resource.language.ca/strings.po
rename to resources/language/resource.language.ca_es/strings.po
diff --git a/resources/language/resource.language.cs/strings.po b/resources/language/resource.language.cs_cz/strings.po
similarity index 100%
rename from resources/language/resource.language.cs/strings.po
rename to resources/language/resource.language.cs_cz/strings.po
diff --git a/resources/language/resource.language.cy/strings.po b/resources/language/resource.language.cy_gb/strings.po
similarity index 100%
rename from resources/language/resource.language.cy/strings.po
rename to resources/language/resource.language.cy_gb/strings.po
diff --git a/resources/language/resource.language.da/strings.po b/resources/language/resource.language.da_dk/strings.po
similarity index 100%
rename from resources/language/resource.language.da/strings.po
rename to resources/language/resource.language.da_dk/strings.po
diff --git a/resources/language/resource.language.de/strings.po b/resources/language/resource.language.de_de/strings.po
similarity index 100%
rename from resources/language/resource.language.de/strings.po
rename to resources/language/resource.language.de_de/strings.po
diff --git a/resources/language/resource.language.el/strings.po b/resources/language/resource.language.el_gr/strings.po
similarity index 100%
rename from resources/language/resource.language.el/strings.po
rename to resources/language/resource.language.el_gr/strings.po
diff --git a/resources/language/resource.language.es/strings.po b/resources/language/resource.language.es_es/strings.po
similarity index 100%
rename from resources/language/resource.language.es/strings.po
rename to resources/language/resource.language.es_es/strings.po
diff --git a/resources/language/resource.language.et/strings.po b/resources/language/resource.language.et_ee/strings.po
similarity index 100%
rename from resources/language/resource.language.et/strings.po
rename to resources/language/resource.language.et_ee/strings.po
diff --git a/resources/language/resource.language.eu/strings.po b/resources/language/resource.language.eu_es/strings.po
similarity index 100%
rename from resources/language/resource.language.eu/strings.po
rename to resources/language/resource.language.eu_es/strings.po
diff --git a/resources/language/resource.language.fa/strings.po b/resources/language/resource.language.fa_af/strings.po
similarity index 100%
rename from resources/language/resource.language.fa/strings.po
rename to resources/language/resource.language.fa_af/strings.po
diff --git a/resources/language/resource.language.fi/strings.po b/resources/language/resource.language.fi_fi/strings.po
similarity index 100%
rename from resources/language/resource.language.fi/strings.po
rename to resources/language/resource.language.fi_fi/strings.po
diff --git a/resources/language/resource.language.fo/strings.po b/resources/language/resource.language.fo_fo/strings.po
similarity index 100%
rename from resources/language/resource.language.fo/strings.po
rename to resources/language/resource.language.fo_fo/strings.po
diff --git a/resources/language/resource.language.fr/strings.po b/resources/language/resource.language.fr_fr/strings.po
similarity index 100%
rename from resources/language/resource.language.fr/strings.po
rename to resources/language/resource.language.fr_fr/strings.po
diff --git a/resources/language/resource.language.gl/strings.po b/resources/language/resource.language.gl_es/strings.po
similarity index 100%
rename from resources/language/resource.language.gl/strings.po
rename to resources/language/resource.language.gl_es/strings.po
diff --git a/resources/language/resource.language.he/strings.po b/resources/language/resource.language.he_il/strings.po
similarity index 100%
rename from resources/language/resource.language.he/strings.po
rename to resources/language/resource.language.he_il/strings.po
diff --git a/resources/language/resource.language.hi/strings.po b/resources/language/resource.language.hi_in/strings.po
similarity index 100%
rename from resources/language/resource.language.hi/strings.po
rename to resources/language/resource.language.hi_in/strings.po
diff --git a/resources/language/resource.language.hr/strings.po b/resources/language/resource.language.hr_hr/strings.po
similarity index 100%
rename from resources/language/resource.language.hr/strings.po
rename to resources/language/resource.language.hr_hr/strings.po
diff --git a/resources/language/resource.language.hu/strings.po b/resources/language/resource.language.hu_hu/strings.po
similarity index 100%
rename from resources/language/resource.language.hu/strings.po
rename to resources/language/resource.language.hu_hu/strings.po
diff --git a/resources/language/resource.language.hy/strings.po b/resources/language/resource.language.hy_am/strings.po
similarity index 100%
rename from resources/language/resource.language.hy/strings.po
rename to resources/language/resource.language.hy_am/strings.po
diff --git a/resources/language/resource.language.id/strings.po b/resources/language/resource.language.id_id/strings.po
similarity index 100%
rename from resources/language/resource.language.id/strings.po
rename to resources/language/resource.language.id_id/strings.po
diff --git a/resources/language/resource.language.is/strings.po b/resources/language/resource.language.is_is/strings.po
similarity index 100%
rename from resources/language/resource.language.is/strings.po
rename to resources/language/resource.language.is_is/strings.po
diff --git a/resources/language/resource.language.it/strings.po b/resources/language/resource.language.it_it/strings.po
similarity index 100%
rename from resources/language/resource.language.it/strings.po
rename to resources/language/resource.language.it_it/strings.po
diff --git a/resources/language/resource.language.ja/strings.po b/resources/language/resource.language.ja_jp/strings.po
similarity index 100%
rename from resources/language/resource.language.ja/strings.po
rename to resources/language/resource.language.ja_jp/strings.po
diff --git a/resources/language/resource.language.ko/strings.po b/resources/language/resource.language.ko_kr/strings.po
similarity index 100%
rename from resources/language/resource.language.ko/strings.po
rename to resources/language/resource.language.ko_kr/strings.po
diff --git a/resources/language/resource.language.lt/strings.po b/resources/language/resource.language.lt_lt/strings.po
similarity index 100%
rename from resources/language/resource.language.lt/strings.po
rename to resources/language/resource.language.lt_lt/strings.po
diff --git a/resources/language/resource.language.lv/strings.po b/resources/language/resource.language.lv_lv/strings.po
similarity index 100%
rename from resources/language/resource.language.lv/strings.po
rename to resources/language/resource.language.lv_lv/strings.po
diff --git a/resources/language/resource.language.mk/strings.po b/resources/language/resource.language.mk_mk/strings.po
similarity index 100%
rename from resources/language/resource.language.mk/strings.po
rename to resources/language/resource.language.mk_mk/strings.po
diff --git a/resources/language/resource.language.ms/strings.po b/resources/language/resource.language.ms_my/strings.po
similarity index 100%
rename from resources/language/resource.language.ms/strings.po
rename to resources/language/resource.language.ms_my/strings.po
diff --git a/resources/language/resource.language.mt/strings.po b/resources/language/resource.language.mt_mt/strings.po
similarity index 100%
rename from resources/language/resource.language.mt/strings.po
rename to resources/language/resource.language.mt_mt/strings.po
diff --git a/resources/language/resource.language.my/strings.po b/resources/language/resource.language.my_mm/strings.po
similarity index 100%
rename from resources/language/resource.language.my/strings.po
rename to resources/language/resource.language.my_mm/strings.po
diff --git a/resources/language/resource.language.no/strings.po b/resources/language/resource.language.nb_no/strings.po
similarity index 100%
rename from resources/language/resource.language.no/strings.po
rename to resources/language/resource.language.nb_no/strings.po
diff --git a/resources/language/resource.language.nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
similarity index 100%
rename from resources/language/resource.language.nl/strings.po
rename to resources/language/resource.language.nl_nl/strings.po
diff --git a/resources/language/resource.language.pl/strings.po b/resources/language/resource.language.pl_pl/strings.po
similarity index 100%
rename from resources/language/resource.language.pl/strings.po
rename to resources/language/resource.language.pl_pl/strings.po
diff --git a/resources/language/resource.language.pt/strings.po b/resources/language/resource.language.pt_pt/strings.po
similarity index 100%
rename from resources/language/resource.language.pt/strings.po
rename to resources/language/resource.language.pt_pt/strings.po
diff --git a/resources/language/resource.language.ro/strings.po b/resources/language/resource.language.ro_ro/strings.po
similarity index 100%
rename from resources/language/resource.language.ro/strings.po
rename to resources/language/resource.language.ro_ro/strings.po
diff --git a/resources/language/resource.language.ru/strings.po b/resources/language/resource.language.ru_ru/strings.po
similarity index 100%
rename from resources/language/resource.language.ru/strings.po
rename to resources/language/resource.language.ru_ru/strings.po
diff --git a/resources/language/resource.language.sk/strings.po b/resources/language/resource.language.sk_sk/strings.po
similarity index 100%
rename from resources/language/resource.language.sk/strings.po
rename to resources/language/resource.language.sk_sk/strings.po
diff --git a/resources/language/resource.language.sl/strings.po b/resources/language/resource.language.sl_si/strings.po
similarity index 100%
rename from resources/language/resource.language.sl/strings.po
rename to resources/language/resource.language.sl_si/strings.po
diff --git a/resources/language/resource.language.sq/strings.po b/resources/language/resource.language.sq_al/strings.po
similarity index 100%
rename from resources/language/resource.language.sq/strings.po
rename to resources/language/resource.language.sq_al/strings.po
diff --git a/resources/language/resource.language.sr/strings.po b/resources/language/resource.language.sr_rs/strings.po
similarity index 100%
rename from resources/language/resource.language.sr/strings.po
rename to resources/language/resource.language.sr_rs/strings.po
diff --git a/resources/language/resource.language.sv/strings.po b/resources/language/resource.language.sv_se/strings.po
similarity index 100%
rename from resources/language/resource.language.sv/strings.po
rename to resources/language/resource.language.sv_se/strings.po
diff --git a/resources/language/resource.language.th/strings.po b/resources/language/resource.language.th_th/strings.po
similarity index 100%
rename from resources/language/resource.language.th/strings.po
rename to resources/language/resource.language.th_th/strings.po
diff --git a/resources/language/resource.language.tr/strings.po b/resources/language/resource.language.tr_tr/strings.po
similarity index 100%
rename from resources/language/resource.language.tr/strings.po
rename to resources/language/resource.language.tr_tr/strings.po
diff --git a/resources/language/resource.language.uk/strings.po b/resources/language/resource.language.uk_ua/strings.po
similarity index 100%
rename from resources/language/resource.language.uk/strings.po
rename to resources/language/resource.language.uk_ua/strings.po
diff --git a/resources/language/resource.language.uz/strings.po b/resources/language/resource.language.uz_uz/strings.po
similarity index 100%
rename from resources/language/resource.language.uz/strings.po
rename to resources/language/resource.language.uz_uz/strings.po
diff --git a/resources/language/resource.language.vi/strings.po b/resources/language/resource.language.vi_vn/strings.po
similarity index 100%
rename from resources/language/resource.language.vi/strings.po
rename to resources/language/resource.language.vi_vn/strings.po
diff --git a/resources/language/resource.language.zh/strings.po b/resources/language/resource.language.zh_cn/strings.po
similarity index 100%
rename from resources/language/resource.language.zh/strings.po
rename to resources/language/resource.language.zh_cn/strings.po