diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index d12a25f..41d42a0 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -3,6 +3,11 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://mailhops/skin/pb-styles.css" type="text/css"?>
 
+<!DOCTYPE window [
+<!ENTITY % MailHopsDTD SYSTEM "chrome://mailhops/locale/prefs.dtd">
+%MailHopsDTD;
+]>
+
 <dialog id="mailHopsPreferences"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	buttons="accept,cancel"
@@ -17,11 +22,11 @@
 
 	<tabbox id="mhTabs" selectedIndex="0">
 	  <tabs>
-			<tab label="Member"/>
-			<tab label="Filters"/>
-			<tab label="Defaults"/>
-	    <tab label="Display"/>
-	    <tab label="API &amp; Hosting"/>
+			<tab label="&mailhops_tab_member_label;"/>
+			<tab label="&mailhops_tab_filters_label;"/>
+			<tab label="&mailhops_tab_defaults_label;"/>
+	    <tab label="&mailhops_tab_display_label;"/>
+	    <tab label="&mailhops_tab_api_label;"/>
 	  </tabs>
 	  <tabpanels>
 			<tabpanel>
diff --git a/chrome/locale/de/prefs.dtd b/chrome/locale/de/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/de/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/de/strings.properties b/chrome/locale/de/strings.properties
deleted file mode 100644
index cac8221..0000000
--- a/chrome/locale/de/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHops Strecke
-mailhops_header_auth_label=MailHops/Auth
-mailhops_header_meta_label=MailHops Meta
-mailhops_route_nav_map_label=Karte
-mailhops_route_nav_details_label=Einzelheiten
-mailhops_route_nav_refresh_label=erfrischen
-mailhops_route_nav_options_label=Vorlieben
-mailhops_unsubscribe=Abbestellen
-mailhops_hops=Hopfen
diff --git a/chrome/locale/en/prefs.dtd b/chrome/locale/en/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/en/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/en/strings.properties b/chrome/locale/en/strings.properties
deleted file mode 100644
index 9ad41b7..0000000
--- a/chrome/locale/en/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHops Route
-mailhops_header_auth_label=MailHops/Auth
-mailhops_header_meta_label=MailHops Meta
-mailhops_route_nav_map_label=Map
-mailhops_route_nav_details_label=Details
-mailhops_route_nav_refresh_label=Refresh
-mailhops_route_nav_options_label=Preferences
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/chrome/locale/es/prefs.dtd b/chrome/locale/es/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/es/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/es/strings.properties b/chrome/locale/es/strings.properties
deleted file mode 100644
index 1a77e64..0000000
--- a/chrome/locale/es/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHops Ruta
-mailhops_header_auth_label=MailHops Mailer/Aut
-mailhops_header_meta_label=MailHops Meta
-mailhops_route_nav_map_label=mapa
-mailhops_route_nav_details_label=detalles
-mailhops_route_nav_refresh_label=refrescar
-mailhops_route_nav_options_label=Preferencias
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/chrome/locale/fr/prefs.dtd b/chrome/locale/fr/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/fr/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/fr/strings.properties b/chrome/locale/fr/strings.properties
deleted file mode 100644
index 1d79a36..0000000
--- a/chrome/locale/fr/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=Trajet
-mailhops_header_auth_label=Authentification
-mailhops_header_meta_label=Autres données
-mailhops_route_nav_map_label=Afficher la Carte
-mailhops_route_nav_details_label=Détails
-mailhops_route_nav_refresh_label=Rafraîchir
-mailhops_route_nav_options_label=Préférences
-mailhops_unsubscribe=Se désabonner
-mailhops_hops=Trajet
diff --git a/chrome/locale/ja/prefs.dtd b/chrome/locale/ja/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/ja/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/ja/strings.properties b/chrome/locale/ja/strings.properties
deleted file mode 100644
index d5f6462..0000000
--- a/chrome/locale/ja/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHopsルート
-mailhops_header_auth_label=MailHopsメーラー/認証
-mailhops_header_meta_label=MailHopsメタ
-mailhops_route_nav_map_label=マップ
-mailhops_route_nav_details_label=細部
-mailhops_route_nav_refresh_label=リフレッシュ
-mailhops_route_nav_options_label=設定
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/chrome/locale/pl/prefs.dtd b/chrome/locale/pl/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/pl/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/pl/strings.properties b/chrome/locale/pl/strings.properties
deleted file mode 100644
index e016b41..0000000
--- a/chrome/locale/pl/strings.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-mailhops_header_route_label=Trasa
-mailhops_header_auth_label=Mailer/Auth
-mailhops_header_lists_label=Listy
-mailhops_header_meta_label=Meta
-mailhops_route_nav_map_label=mapa
-mailhops_route_nav_details_label=szczegóły
-mailhops_route_nav_refresh_label=odśwież
-mailhops_route_nav_options_label=opcje
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/chrome/locale/pt-BR/prefs.dtd b/chrome/locale/pt-BR/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/pt-BR/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/pt-BR/strings.properties b/chrome/locale/pt-BR/strings.properties
deleted file mode 100644
index c7c02c5..0000000
--- a/chrome/locale/pt-BR/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHops Route
-mailhops_header_auth_label=MailHops Mailer/Auth
-mailhops_header_meta_label=MailHops Meta
-mailhops_route_nav_map_label=mapa
-mailhops_route_nav_details_label=detalhes
-mailhops_route_nav_refresh_label=refrescar
-mailhops_route_nav_options_label=Preferências
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/chrome/locale/ru/prefs.dtd b/chrome/locale/ru/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/ru/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/ru/strings.properties b/chrome/locale/ru/strings.properties
deleted file mode 100644
index fc8114d..0000000
--- a/chrome/locale/ru/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHops маршрута
-mailhops_header_auth_label=MailHops Мейлер / Авт
-mailhops_header_meta_label=MailHops Мета
-mailhops_route_nav_map_label=карта
-mailhops_route_nav_details_label=подробности
-mailhops_route_nav_refresh_label=обновление
-mailhops_route_nav_options_label=предпочтения
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/chrome/locale/zh-CN/prefs.dtd b/chrome/locale/zh-CN/prefs.dtd
new file mode 100644
index 0000000..090df4f
--- /dev/null
+++ b/chrome/locale/zh-CN/prefs.dtd
@@ -0,0 +1,5 @@
+<!ENTITY mailhops_tab_member_label           "Member">
+<!ENTITY mailhops_tab_filters_label           "Filters">
+<!ENTITY mailhops_tab_defaults_label           "Defaults">
+<!ENTITY mailhops_tab_display_label           "Display">
+<!ENTITY mailhops_tab_api_label           "API &amp; Hosting">
diff --git a/chrome/locale/zh-CN/strings.properties b/chrome/locale/zh-CN/strings.properties
deleted file mode 100644
index 1d848ff..0000000
--- a/chrome/locale/zh-CN/strings.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-mailhops_header_route_label=MailHops路线
-mailhops_header_auth_label=MailHops梅勒/验证
-mailhops_header_meta_label=MailHops元
-mailhops_route_nav_map_label=地圖
-mailhops_route_nav_details_label=詳細信息
-mailhops_route_nav_refresh_label=刷新
-mailhops_route_nav_options_label=优先
-mailhops_unsubscribe=Unsubscribe
-mailhops_hops=Hops
diff --git a/install.rdf b/install.rdf
index 185ef42..6cb4af1 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:type>2</em:type>
 		<em:id>thunderbird@mailhops.com</em:id>
-		<em:version>3.0.1</em:version>
+		<em:version>3.0.2</em:version>
 
 		<em:name>MailHops</em:name>
 		<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>
@@ -60,7 +60,7 @@
 		  <Description>
 		    <em:locale>fr</em:locale>
 		    <em:name>MailHops</em:name>
-		    <em:description>MailHops vous permet de connaître la route empruntée par un mail avant qu'il ne parvienne dans votre messagerie. Grâce à MailHops vous pourrez : connaître le lieu d'émission du mail (pays, ville); visualiser le parcours du mail sur une carte (avec un grand choix de styles de carte); ou encore connaître des informations plus techniques (le user-agent et l'authentification utilisés par l'expéditeur) et d'autres informations plus amusantes comme la distance totale parcourue par le mail ou la météo actuelle sur le lieu d'émission. La version gratuite (sans clef API) permet d'obtenir ces informations et bien d'autres pour 100 messages par tranche de 24h.</em:description>		
+		    <em:description>MailHops vous permet de connaître la route empruntée par un mail avant qu'il ne parvienne dans votre messagerie. Grâce à MailHops vous pourrez : connaître le lieu d'émission du mail (pays, ville); visualiser le parcours du mail sur une carte (avec un grand choix de styles de carte); ou encore connaître des informations plus techniques (le user-agent et l'authentification utilisés par l'expéditeur) et d'autres informations plus amusantes comme la distance totale parcourue par le mail ou la météo actuelle sur le lieu d'émission. La version gratuite (sans clef API) permet d'obtenir ces informations et bien d'autres pour 100 messages par tranche de 24h.</em:description>
   </Description>
 		</em:localized>