diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 2ba8b8ab4..7c16c22e0 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -224,21 +224,9 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 		// Browser
 		Zotero.browser = "g";
 		
-		// Locale
-		var uaPrefs = Services.prefs.getBranch("general.useragent.");
-		try {
-			this.locale = uaPrefs.getComplexValue("locale", Components.interfaces.nsIPrefLocalizedString);
-		} catch (e) {}
-		
-		if(this.locale) {
-			this.locale = this.locale.toString();
-		} else {
-			this.locale = uaPrefs.getCharPref("locale");
-		}
-		
-		if (this.locale.length == 2) {
-			this.locale = this.locale + '-' + this.locale.toUpperCase();
-		}
+		// Get resolved locale
+		this.locale = Services.strings.createBundle("chrome://zotero/locale/mozilla/intl.properties")
+			.GetStringFromName("general.useragent.locale");
 		
 		_localizedStringBundle = Services.strings.createBundle("chrome://zotero/locale/zotero.properties");
 		// Fix logged error in PluralForm.jsm when numForms() is called before get(), as it is in
diff --git a/chrome/locale/af-ZA/zotero/mozilla/intl.properties b/chrome/locale/af-ZA/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..1966121af
--- /dev/null
+++ b/chrome/locale/af-ZA/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=af-ZA
diff --git a/chrome/locale/ar/zotero/mozilla/intl.properties b/chrome/locale/ar/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..d41b5792e
--- /dev/null
+++ b/chrome/locale/ar/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=ar
diff --git a/chrome/locale/bg-BG/zotero/mozilla/intl.properties b/chrome/locale/bg-BG/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..a4a12ddca
--- /dev/null
+++ b/chrome/locale/bg-BG/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=bg-BG
diff --git a/chrome/locale/ca-AD/zotero/mozilla/intl.properties b/chrome/locale/ca-AD/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..2b948bc56
--- /dev/null
+++ b/chrome/locale/ca-AD/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=ca-AD
diff --git a/chrome/locale/cs-CZ/zotero/mozilla/intl.properties b/chrome/locale/cs-CZ/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..2fdb89594
--- /dev/null
+++ b/chrome/locale/cs-CZ/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=cs-CZ
diff --git a/chrome/locale/da-DK/zotero/mozilla/intl.properties b/chrome/locale/da-DK/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..db378db88
--- /dev/null
+++ b/chrome/locale/da-DK/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=da-DK
diff --git a/chrome/locale/de/zotero/mozilla/intl.properties b/chrome/locale/de/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..b4a6e5c10
--- /dev/null
+++ b/chrome/locale/de/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=de
diff --git a/chrome/locale/el-GR/zotero/mozilla/intl.properties b/chrome/locale/el-GR/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..c7aa7332a
--- /dev/null
+++ b/chrome/locale/el-GR/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=el-GR
diff --git a/chrome/locale/en-US/zotero/mozilla/intl.properties b/chrome/locale/en-US/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..8a2461fa9
--- /dev/null
+++ b/chrome/locale/en-US/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=en-US
diff --git a/chrome/locale/es-ES/zotero/mozilla/intl.properties b/chrome/locale/es-ES/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..86f524422
--- /dev/null
+++ b/chrome/locale/es-ES/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=es-ES
diff --git a/chrome/locale/et-EE/zotero/mozilla/intl.properties b/chrome/locale/et-EE/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..12647ff3d
--- /dev/null
+++ b/chrome/locale/et-EE/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=et-EE
diff --git a/chrome/locale/eu-ES/zotero/mozilla/intl.properties b/chrome/locale/eu-ES/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..f60f82dda
--- /dev/null
+++ b/chrome/locale/eu-ES/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=eu-ES
diff --git a/chrome/locale/fa/zotero/mozilla/intl.properties b/chrome/locale/fa/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..3a6fb610b
--- /dev/null
+++ b/chrome/locale/fa/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=fa
diff --git a/chrome/locale/fi-FI/zotero/mozilla/intl.properties b/chrome/locale/fi-FI/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..ae72ffdc5
--- /dev/null
+++ b/chrome/locale/fi-FI/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=fi-FI
diff --git a/chrome/locale/fr-FR/zotero/mozilla/intl.properties b/chrome/locale/fr-FR/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..94a37a4c8
--- /dev/null
+++ b/chrome/locale/fr-FR/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=fr-FR
diff --git a/chrome/locale/gl-ES/zotero/mozilla/intl.properties b/chrome/locale/gl-ES/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..f129787ad
--- /dev/null
+++ b/chrome/locale/gl-ES/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=gl-ES
diff --git a/chrome/locale/he-IL/zotero/mozilla/intl.properties b/chrome/locale/he-IL/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..d76ef1d84
--- /dev/null
+++ b/chrome/locale/he-IL/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=he-IL
diff --git a/chrome/locale/hr-HR/zotero/mozilla/intl.properties b/chrome/locale/hr-HR/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..bcb693d63
--- /dev/null
+++ b/chrome/locale/hr-HR/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=hr-HR
diff --git a/chrome/locale/hu-HU/zotero/mozilla/intl.properties b/chrome/locale/hu-HU/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..0bd7249c9
--- /dev/null
+++ b/chrome/locale/hu-HU/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=hu-HU
diff --git a/chrome/locale/id-ID/zotero/mozilla/intl.properties b/chrome/locale/id-ID/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..5a67e7155
--- /dev/null
+++ b/chrome/locale/id-ID/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=id-ID
diff --git a/chrome/locale/is-IS/zotero/mozilla/intl.properties b/chrome/locale/is-IS/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..28a5d93a4
--- /dev/null
+++ b/chrome/locale/is-IS/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=is-IS
diff --git a/chrome/locale/it-IT/zotero/mozilla/intl.properties b/chrome/locale/it-IT/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..7be31b2b2
--- /dev/null
+++ b/chrome/locale/it-IT/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=it-IT
diff --git a/chrome/locale/ja-JP/zotero/mozilla/intl.properties b/chrome/locale/ja-JP/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..641b5291d
--- /dev/null
+++ b/chrome/locale/ja-JP/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=ja-JP
diff --git a/chrome/locale/km/zotero/mozilla/intl.properties b/chrome/locale/km/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..a74dbce9d
--- /dev/null
+++ b/chrome/locale/km/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=km
diff --git a/chrome/locale/ko-KR/zotero/mozilla/intl.properties b/chrome/locale/ko-KR/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..73ac368b0
--- /dev/null
+++ b/chrome/locale/ko-KR/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=ko-KR
diff --git a/chrome/locale/lt-LT/zotero/mozilla/intl.properties b/chrome/locale/lt-LT/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..550c13b2b
--- /dev/null
+++ b/chrome/locale/lt-LT/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=lt-LT
diff --git a/chrome/locale/mn-MN/zotero/mozilla/intl.properties b/chrome/locale/mn-MN/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..3818922cd
--- /dev/null
+++ b/chrome/locale/mn-MN/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=mn-MN
diff --git a/chrome/locale/nb-NO/zotero/mozilla/intl.properties b/chrome/locale/nb-NO/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..e02a90d7e
--- /dev/null
+++ b/chrome/locale/nb-NO/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=nb-NO
diff --git a/chrome/locale/nl-NL/zotero/mozilla/intl.properties b/chrome/locale/nl-NL/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..21a4f2c38
--- /dev/null
+++ b/chrome/locale/nl-NL/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=nl-NL
diff --git a/chrome/locale/nn-NO/zotero/mozilla/intl.properties b/chrome/locale/nn-NO/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..3d32a5d91
--- /dev/null
+++ b/chrome/locale/nn-NO/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=nn-NO
diff --git a/chrome/locale/pl-PL/zotero/mozilla/intl.properties b/chrome/locale/pl-PL/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..ad527ebd8
--- /dev/null
+++ b/chrome/locale/pl-PL/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=pl-PL
diff --git a/chrome/locale/pt-BR/zotero/mozilla/intl.properties b/chrome/locale/pt-BR/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..4a9d34967
--- /dev/null
+++ b/chrome/locale/pt-BR/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=pt-BR
diff --git a/chrome/locale/pt-PT/zotero/mozilla/intl.properties b/chrome/locale/pt-PT/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..fb754e65c
--- /dev/null
+++ b/chrome/locale/pt-PT/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=pt-PT
diff --git a/chrome/locale/ro-RO/zotero/mozilla/intl.properties b/chrome/locale/ro-RO/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..f6f95698e
--- /dev/null
+++ b/chrome/locale/ro-RO/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=ro-RO
diff --git a/chrome/locale/ru-RU/zotero/mozilla/intl.properties b/chrome/locale/ru-RU/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..8bba23547
--- /dev/null
+++ b/chrome/locale/ru-RU/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=ru-RU
diff --git a/chrome/locale/sk-SK/zotero/mozilla/intl.properties b/chrome/locale/sk-SK/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..4b3a46cd2
--- /dev/null
+++ b/chrome/locale/sk-SK/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=sk-SK
diff --git a/chrome/locale/sl-SI/zotero/mozilla/intl.properties b/chrome/locale/sl-SI/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..21d24fd0b
--- /dev/null
+++ b/chrome/locale/sl-SI/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=sl-SI
diff --git a/chrome/locale/sr-RS/zotero/mozilla/intl.properties b/chrome/locale/sr-RS/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..872f9d77b
--- /dev/null
+++ b/chrome/locale/sr-RS/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=sr-RS
diff --git a/chrome/locale/sv-SE/zotero/mozilla/intl.properties b/chrome/locale/sv-SE/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..fbc9d877d
--- /dev/null
+++ b/chrome/locale/sv-SE/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=sv-SE
diff --git a/chrome/locale/th-TH/zotero/mozilla/intl.properties b/chrome/locale/th-TH/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..489c5e009
--- /dev/null
+++ b/chrome/locale/th-TH/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=th-TH
diff --git a/chrome/locale/tr-TR/zotero/mozilla/intl.properties b/chrome/locale/tr-TR/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..8f901a19c
--- /dev/null
+++ b/chrome/locale/tr-TR/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=tr-TR
diff --git a/chrome/locale/uk-UA/zotero/mozilla/intl.properties b/chrome/locale/uk-UA/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..64452d359
--- /dev/null
+++ b/chrome/locale/uk-UA/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=uk-UA
diff --git a/chrome/locale/vi-VN/zotero/mozilla/intl.properties b/chrome/locale/vi-VN/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..82e8a0f4c
--- /dev/null
+++ b/chrome/locale/vi-VN/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=vi-VN
diff --git a/chrome/locale/zh-CN/zotero/mozilla/intl.properties b/chrome/locale/zh-CN/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..52f8d7c4f
--- /dev/null
+++ b/chrome/locale/zh-CN/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=zh-CN
diff --git a/chrome/locale/zh-TW/zotero/mozilla/intl.properties b/chrome/locale/zh-TW/zotero/mozilla/intl.properties
new file mode 100644
index 000000000..4e35cda69
--- /dev/null
+++ b/chrome/locale/zh-TW/zotero/mozilla/intl.properties
@@ -0,0 +1 @@
+general.useragent.locale=zh-TW