[Pkg-mozext-commits] [personasplus] 19/42: Update locales and release Personas Plus 1.7.

Wed Feb 3 16:15:40 UTC 2016

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository personasplus.

commit abede2439b04abc210469afd985d6f3b992c2104
Author: Kris Maglione <maglione.k at gmail.com>
Date:   Thu Apr 4 11:31:17 2013 -0700

    Update locales and release Personas Plus 1.7.
---
 extension/chrome.manifest                          |  28 +++---
 extension/install.rdf                              |   4 +-
 extension/locale/bg-BG/personas.properties         |  60 ++----------
 extension/locale/cs-CZ/personas.properties         |  60 ++----------
 extension/locale/{da-DK => da}/personas.dtd        |   0
 extension/locale/{da-DK => da}/personas.properties |  58 ++----------
 extension/locale/{da-DK => da}/preferences.dtd     |   2 +-
 extension/locale/de-DE/preferences.dtd             |   8 --
 extension/locale/{de-DE => de}/personas.dtd        |  16 ++--
 extension/locale/{de-DE => de}/personas.properties |  74 ++++-----------
 extension/locale/de/preferences.dtd                |   8 ++
 extension/locale/{el-GR => el}/personas.dtd        |   0
 extension/locale/{el-GR => el}/personas.properties |  58 ++----------
 extension/locale/{el-GR => el}/preferences.dtd     |   0
 extension/locale/es-AR/personas.dtd                |  10 +-
 extension/locale/es-AR/personas.properties         |  76 ++++-----------
 extension/locale/es-AR/preferences.dtd             |   2 +-
 extension/locale/es-CL/personas.properties         |  60 ++----------
 extension/locale/es-ES/personas.properties         |  60 ++----------
 extension/locale/es-MX/personas.dtd                |  20 ++++
 .../locale/{fr-FR => es-MX}/personas.properties    |  90 +++++-------------
 extension/locale/{es-AR => es-MX}/preferences.dtd  |   6 +-
 extension/locale/{eu-ES => eu}/personas.dtd        |   0
 extension/locale/{eu-ES => eu}/personas.properties |  58 ++----------
 extension/locale/{eu-ES => eu}/preferences.dtd     |   0
 extension/locale/{fi-FI => fi}/personas.dtd        |   0
 extension/locale/{fi-FI => fi}/personas.properties |  58 ++----------
 extension/locale/{fi-FI => fi}/preferences.dtd     |   0
 extension/locale/{fr-FR => fr}/personas.dtd        |   6 +-
 extension/locale/{fr-FR => fr}/personas.properties |  64 +++----------
 extension/locale/{fr-FR => fr}/preferences.dtd     |   8 +-
 extension/locale/fy-NL/personas.properties         |  60 ++----------
 extension/locale/ga-IE/personas.dtd                |  20 ++++
 .../locale/{fr-FR => ga-IE}/personas.properties    |  90 +++++-------------
 extension/locale/ga-IE/preferences.dtd             |   8 ++
 extension/locale/gl-ES/personas.properties         |  60 ++----------
 extension/locale/he-IL/personas.properties         |  60 ++----------
 extension/locale/hu-HU/personas.properties         |  60 ++----------
 extension/locale/it-IT/personas.dtd                |  20 ----
 extension/locale/it-IT/personas.properties         | 102 ---------------------
 extension/locale/it-IT/preferences.dtd             |   8 --
 extension/locale/it/personas.properties            |  60 ++----------
 extension/locale/ja-JP-mac/personas.properties     |  60 ++----------
 extension/locale/ja/personas.properties            |  60 ++----------
 extension/locale/ko-KR/personas.dtd                |   2 +-
 extension/locale/ko-KR/personas.properties         |  60 ++----------
 extension/locale/lt-LT/personas.dtd                |  20 ++++
 .../locale/{fr-FR => lt-LT}/personas.properties    |  84 +++++------------
 extension/locale/lt-LT/preferences.dtd             |   8 ++
 extension/locale/mk-MK/personas.properties         |  60 ++----------
 extension/locale/nl-NL/preferences.dtd             |   8 --
 extension/locale/{nl-NL => nl}/personas.dtd        |  12 +--
 extension/locale/{fr-FR => nl}/personas.properties |  90 +++++-------------
 extension/locale/nl/preferences.dtd                |   8 ++
 extension/locale/pl-PL/personas.properties         |  62 ++-----------
 extension/locale/pl/personas.dtd                   |  20 ++++
 extension/locale/{pl-PL => pl}/personas.properties |  60 ++----------
 extension/locale/pl/preferences.dtd                |   8 ++
 extension/locale/pt-BR/personas.properties         |  62 ++-----------
 extension/locale/ro-RO/preferences.dtd             |   8 --
 extension/locale/{ro-RO => ro}/personas.dtd        |  16 ++--
 extension/locale/{ro-RO => ro}/personas.properties |  66 +++----------
 extension/locale/ro/preferences.dtd                |   8 ++
 extension/locale/ru-RU/personas.properties         |  60 ++----------
 extension/locale/si-LK/personas.dtd                |  20 ++++
 .../locale/{nl-NL => si-LK}/personas.properties    | 100 ++++++--------------
 extension/locale/si-LK/preferences.dtd             |   8 ++
 extension/locale/sk-SK/personas.properties         |  60 ++----------
 extension/locale/{sr-RS => sr}/personas.dtd        |  20 ++--
 extension/locale/{sr-RS => sr}/personas.properties |  96 ++++++-------------
 extension/locale/{sr-RS => sr}/preferences.dtd     |   4 +-
 extension/locale/sv-SE/personas.properties         |  60 ++----------
 extension/locale/{tr-TR => tr}/personas.dtd        |   0
 extension/locale/{tr-TR => tr}/personas.properties |  58 ++----------
 extension/locale/{tr-TR => tr}/preferences.dtd     |   0
 extension/locale/uk-UA/personas.properties         |  60 ++----------
 extension/locale/{vi-VN => vi}/personas.dtd        |   0
 extension/locale/{vi-VN => vi}/personas.properties |  48 +---------
 extension/locale/{vi-VN => vi}/preferences.dtd     |   0
 extension/locale/zh-CN/personas.properties         |  60 ++----------
 extension/locale/zh-TW/personas.properties         |  60 ++----------
 81 files changed, 674 insertions(+), 2264 deletions(-)

diff --git a/extension/chrome.manifest b/extension/chrome.manifest
index 2b48542..d3b3c7b 100644
--- a/extension/chrome.manifest
+++ b/extension/chrome.manifest
@@ -57,36 +57,40 @@ style chrome://global/content/customizeToolbar.xul  chrome://personas/content/pe
 #
 locale   personas   bg-BG       locale/bg-BG/
 locale   personas   cs-CZ       locale/cs-CZ/
-locale   personas   da-DK       locale/da-DK/
-locale   personas   de-DE       locale/de-DE/
-locale   personas   el-GR       locale/el-GR/
+locale   personas   da          locale/da/
+locale   personas   de          locale/de/
+locale   personas   el          locale/el/
 locale   personas   en-US       locale/en-US/
 locale   personas   es-AR       locale/es-AR/
 locale   personas   es-CL       locale/es-CL/
 locale   personas   es-ES       locale/es-ES/
-locale   personas   eu-ES       locale/eu-ES/
-locale   personas   fi-FI       locale/fi-FI/
-locale   personas   fr-FR       locale/fr-FR/
+locale   personas   es-MX       locale/es-MX/
+locale   personas   eu          locale/eu/
+locale   personas   fi          locale/fi/
+locale   personas   fr          locale/fr/
 locale   personas   fy-NL       locale/fy-NL/
+locale   personas   ga-IE       locale/ga-IE/
 locale   personas   gl-ES       locale/gl-ES/
 locale   personas   he-IL       locale/he-IL/
 locale   personas   hu-HU       locale/hu-HU/
 locale   personas   it          locale/it/
-locale   personas   it-IT       locale/it-IT/
 locale   personas   ja          locale/ja/
 locale   personas   ja-JP-mac   locale/ja-JP-mac/
 locale   personas   ko-KR       locale/ko-KR/
+locale   personas   lt-LT       locale/lt-LT/
 locale   personas   mk-MK       locale/mk-MK/
-locale   personas   nl-NL       locale/nl-NL/
+locale   personas   nl          locale/nl/
+locale   personas   pl          locale/pl/
 locale   personas   pl-PL       locale/pl-PL/
 locale   personas   pt-BR       locale/pt-BR/
-locale   personas   ro-RO       locale/ro-RO/
+locale   personas   ro          locale/ro/
 locale   personas   ru-RU       locale/ru-RU/
+locale   personas   si-LK       locale/si-LK/
 locale   personas   sk-SK       locale/sk-SK/
-locale   personas   sr-RS       locale/sr-RS/
+locale   personas   sr          locale/sr/
 locale   personas   sv-SE       locale/sv-SE/
-locale   personas   tr-TR       locale/tr-TR/
+locale   personas   tr          locale/tr/
 locale   personas   uk-UA       locale/uk-UA/
-locale   personas   vi-VN       locale/vi-VN/
+locale   personas   vi          locale/vi/
 locale   personas   zh-CN       locale/zh-CN/
 locale   personas   zh-TW       locale/zh-TW/
diff --git a/extension/install.rdf b/extension/install.rdf
index 7900eb7..6d77356 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -5,7 +5,7 @@
 
     <em:id>personas at christopher.beard</em:id>
     <em:name>Personas Plus</em:name>
-    <em:version>1.7-pre</em:version>
+    <em:version>1.7</em:version>
     <em:description>Your Firefox, your style. Easy-to-change themes.</em:description>
 
     <em:creator>Chris Beard</em:creator>
@@ -66,7 +66,7 @@
     <em:targetApplication> <!-- Thunderbird -->
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>3.3</em:minVersion>
+        <em:minVersion>3.3a1</em:minVersion>
         <em:maxVersion>19.*</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/extension/locale/bg-BG/personas.properties b/extension/locale/bg-BG/personas.properties
index 698b7ed..31aa3d6 100644
--- a/extension/locale/bg-BG/personas.properties
+++ b/extension/locale/bg-BG/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Относно
-popular=Най-популярни
-new=Нови
+featured= Featured
 recent=Скоро избирани
-categories=По категории
 favorites=Любими
 favoritesSignIn=Влезте, за да достъпите вашите любими
 viewDetail=Преглед детайли
 favoritesGoTo=Към моите любими
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Стандартна
 unnamedPersona=Безименна персона
 customPersona=Лична персона
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Още от %S
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S още от %2$S
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Вие избрахте персоната "%1$S" от %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Отмяна
 notification.revertButton.accesskey=О
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=Текущата тема е несъвместима с Персони. Рестартирайте, за да приложите.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Рестартиране на Firefox
 notification.restartButton.accesskey=Р
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Случаен избор от %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Случаен избор от %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Данни за персоните не са достъпни. Проверете своята Интернет свързаност и рестартирайте %S или опитайте отново след малко.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Избор на файл
diff --git a/extension/locale/cs-CZ/personas.properties b/extension/locale/cs-CZ/personas.properties
index 04a0624..f74971a 100644
--- a/extension/locale/cs-CZ/personas.properties
+++ b/extension/locale/cs-CZ/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=O doplňku
-popular=Nejpopulárnější
-new=Novinky
+featured= Featured
 recent=Posledně použité
-categories=Podle kategorie
 favorites=Oblíbené
 favoritesSignIn=Pro práci s oblíbenými položkami se musíte přihlásit
 viewDetail=Zobrazit podrobnosti
 favoritesGoTo=Přejít do oblíbených...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Výchozí
 unnamedPersona=Bezejmenné
 customPersona=Vlastní
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=Více od %S...
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=Další %1$S z kat. %2$S...
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=Zvolili jste "%1$S", autor: %2$S.
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=Zrušit
 notification.revertButton.accesskey=Z
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Náhodně vybráno: %2$S z %1$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Náhodný výběr od %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Stále nedostupné. Překontrolujte si své síťové připojení a restartujte %S, nebo zkuste za pár minut znovu.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Vyberte soubor
diff --git a/extension/locale/da-DK/personas.dtd b/extension/locale/da/personas.dtd
similarity index 100%
rename from extension/locale/da-DK/personas.dtd
rename to extension/locale/da/personas.dtd
diff --git a/extension/locale/da-DK/personas.properties b/extension/locale/da/personas.properties
similarity index 95%
rename from extension/locale/da-DK/personas.properties
rename to extension/locale/da/personas.properties
index 351317b..4003d31 100644
--- a/extension/locale/da-DK/personas.properties
+++ b/extension/locale/da/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Om…
-popular=Mest populære
-new=Nye
+featured=Anbefalede
 recent=Mine senest valgte
-categories=Alle
 favorites=Mine favoritter
 favoritesSignIn=Log ind for at få adgang til dine favoritter
 viewDetail=Vis detaljer…
 favoritesGoTo=Gå til mine favoritter…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Standard
 unnamedPersona=Unavngivet Persona
 customPersona=Tilpas Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Flere fra %S…
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=Yderligere %1$S fra %2$S…
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Du valgte persona "%1$S" af %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Fortryd
 notification.revertButton.accesskey=o
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=Det pågældende tema er inkompatibelt med Personas. Genstart for at anvende.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Genstart Firefox
 notification.restartButton.accesskey=G
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Tilfældigt valg fra %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Tilfældigt valg fra %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas data er endnu ikke tilgængelige. Tjek din netværksforbindelse og genstart %S eller prøv igen om et par minutter.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Vælg en fil
diff --git a/extension/locale/da-DK/preferences.dtd b/extension/locale/da/preferences.dtd
similarity index 84%
rename from extension/locale/da-DK/preferences.dtd
rename to extension/locale/da/preferences.dtd
index 9fd276a..b7d6197 100644
--- a/extension/locale/da-DK/preferences.dtd
+++ b/extension/locale/da/preferences.dtd
@@ -5,4 +5,4 @@
 <!ENTITY useTextColor.label "Brug tekstfarve">
 <!ENTITY useAccentColor.label "Brug accentfarve">
 <!ENTITY advancedSettings.label "Avanceret">
-<!ENTITY showCustomMenu.label "Vis tilpasset Persona i menu">
+<!ENTITY showCustomMenu.label "Aktiver Tilpas Persona">
diff --git a/extension/locale/de-DE/preferences.dtd b/extension/locale/de-DE/preferences.dtd
deleted file mode 100644
index c05ca7c..0000000
--- a/extension/locale/de-DE/preferences.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY preferences.title "Personas Einstellungen">
-<!ENTITY generalSettings.label "Allgemein">
-<!ENTITY previewEnabled.label "Vorschau anzeigen, wenn im Menü ausgewählt">
-<!ENTITY displaySettings.label "Anzeige">
-<!ENTITY useTextColor.label "Textfarbe benutzen">
-<!ENTITY useAccentColor.label "Akzentfarbe benutzen">
-<!ENTITY advancedSettings.label "Erweiterte Einstellungen">
-<!ENTITY showCustomMenu.label "Zeige angepasstes Persona im Menü">
diff --git a/extension/locale/de-DE/personas.dtd b/extension/locale/de/personas.dtd
similarity index 55%
rename from extension/locale/de-DE/personas.dtd
rename to extension/locale/de/personas.dtd
index ccdc8c0..f13ecbb 100644
--- a/extension/locale/de-DE/personas.dtd
+++ b/extension/locale/de/personas.dtd
@@ -1,20 +1,20 @@
 <!ENTITY personas_app_title "Personas">
 <!ENTITY useDefaultPersona.label "Standard">
 <!ENTITY preferences.label "Einstellungen...">
-<!ENTITY viewDirectory.label "Personas im Internet...">
-<!ENTITY customPersona.label "Persona anpassen">
+<!ENTITY viewDirectory.label "Personas-Galerie aufrufen...">
+<!ENTITY customPersona.label "Benutzerdefiniertes Persona">
 <!ENTITY customName.label "Name:">
-<!ENTITY header.label "Header:">
-<!ENTITY selectBackground.label "Durchsuche...">
-<!ENTITY footer.label "Footer:">
+<!ENTITY header.label "Kopfleiste:">
+<!ENTITY selectBackground.label "Durchsuchen...">
+<!ENTITY footer.label "Fußleiste:">
 <!ENTITY textColorPicker.label "Textfarbe:">
 <!ENTITY accentColorPicker.label "Akzentfarbe:">
-<!ENTITY useDefaultColor.label "Standardfarbe verwenden">
+<!ENTITY useDefaultColor.label "Standard wiederherstellen">
 <!ENTITY okButton.label "OK">
 <!ENTITY contextHomePage.label "Internetseite">
 <!ENTITY contextPreferences.label "Einstellungen">
 <!ENTITY contextEdit.label "Bearbeiten">
 <!ENTITY contextApply.label "Anwenden">
-<!ENTITY usePersona.label "Use Persona">
+<!ENTITY usePersona.label "Persona verwenden">
 <!ENTITY usePersona.accesskey "P">
-<!ENTITY usePersona.tooltip "Use this Persona">
+<!ENTITY usePersona.tooltip "Dieses Persona verwenden">
diff --git a/extension/locale/de-DE/personas.properties b/extension/locale/de/personas.properties
similarity index 72%
rename from extension/locale/de-DE/personas.properties
rename to extension/locale/de/personas.properties
index 640929e..fca7fc3 100644
--- a/extension/locale/de-DE/personas.properties
+++ b/extension/locale/de/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Über...
-popular=Am beliebtesten
-new=Neu
+featured= Featured
 recent=Kürzlich ausgewählt
-categories=Nach Kategorie
 favorites=Meine Favoriten
 favoritesSignIn=Melden Sie sich an, um auf Ihre Favoriten zuzugreifen
-viewDetail=Zeige Details...
-favoritesGoTo=Gehe zu meinen Favouriten...
+viewDetail=Details ansehen...
+favoritesGoTo=Meinen Favoriten aufrufen...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Standard
 unnamedPersona=Unbenanntes Persona
 customPersona=Persona anpassen
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Mehr von %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
 viewMore=%1$S mehr von %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Sie markierten das Persona %1$S von %2$S.
+notification.personaWasSelected=Sie haben das Persona %1$S von %2$S ausgewählt.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
 notification.revertButton.label=Rückgängig
 notification.revertButton.accesskey=R
+# The text of the notification shown when the browser needs to be restarted in
+# order to apply a persona.
+notification.restartToApply=Das aktuelle Theme ist nicht kompatibel mit Personas. Neustarten zum Anwenden.
+# Strings used for the Restart button in the notification shown when the browser
+# needs to be restarted in order to apply a persona. The brand name "Firefox"
+# can be used safely because this notification is shown only in Firefox [3.6, 4.0[
+notification.restartButton.label=Firefox neu starten.
+notification.restartButton.accesskey=F
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+randomPersona=Zufällige Auswahl aus %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
+useRandomPersona=Zufällige Auswahl aus %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-randomPersona=Zufällige Auswahl aus %1$S > %2$S
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
-useRandomPersona=Zufällige Auswahl aus %S
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Die Daten für Personas sind noch nicht verfügbar. Bitte überprüfen Sie ihre Netzwerkverbindung und starten Sie %S neu oder versuchen Sie es in ein paar Minuten nochmal.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Wählen Sie eine Datei aus...
diff --git a/extension/locale/de/preferences.dtd b/extension/locale/de/preferences.dtd
new file mode 100644
index 0000000..58b0f58
--- /dev/null
+++ b/extension/locale/de/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "Personas-Einstellungen">
+<!ENTITY generalSettings.label "Allgemein">
+<!ENTITY previewEnabled.label "Vorschau anzeigen, wenn im Menü ausgewählt">
+<!ENTITY displaySettings.label "Ansicht">
+<!ENTITY useTextColor.label "Textfarbe verwenden">
+<!ENTITY useAccentColor.label "Akzentfarbe verwenden">
+<!ENTITY advancedSettings.label "Erweiterte Einstellungen">
+<!ENTITY showCustomMenu.label "Benutzerdefiniertes Persona im Menü anzeigen">
diff --git a/extension/locale/el-GR/personas.dtd b/extension/locale/el/personas.dtd
similarity index 100%
rename from extension/locale/el-GR/personas.dtd
rename to extension/locale/el/personas.dtd
diff --git a/extension/locale/el-GR/personas.properties b/extension/locale/el/personas.properties
similarity index 94%
rename from extension/locale/el-GR/personas.properties
rename to extension/locale/el/personas.properties
index ff5d2c3..088c344 100644
--- a/extension/locale/el-GR/personas.properties
+++ b/extension/locale/el/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Περί...
-popular=Πιο δημοφιλή
-new=Νέα και προβεβλημένα
+featured=Προβεβλημένα
 recent=Επιλεγμένα πρόσφατα
-categories=Όλα
 favorites=Αγαπημένα
 favoritesSignIn=Συνδεθείτε για να έχετε πρόσβαση στα αγαπημένα σας
 viewDetail=Εμφάνιση λεπτομερειών...
 favoritesGoTo=Μετάβαση στα αγαπημένα μου...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Αρχικό
 unnamedPersona=Persona χωρίς όνομα
 customPersona=Προσαρμοσμένο Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Περισσότερα από %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S περισσότερα από %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Επιλέξατε το persona «%1$S» από %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Αναίρεση
 notification.revertButton.accesskey=ρ
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=Το τρέχων θέμα δεν είναι συμβατό με τα Personas. Κάντε επανεκκίνηση για την εφαρμογή του.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Επανεκκίνηση του Firefox
 notification.restartButton.accesskey=π
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Τυχαία επιλογή κατηγορίας: %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Τυχαία επιλογή κατηγορίας: %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Τα δεδομένα του Persona δεν είναι διαθέσιμα ακόμη. Παρακαλούμε ελέγξτε τη σύνδεση σας στο δίκτυο και επανεκκινήστε τον %S ή προσπαθήστε ξανά σε μερικά λεπτά.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Επιλογή αρχείου
diff --git a/extension/locale/el-GR/preferences.dtd b/extension/locale/el/preferences.dtd
similarity index 100%
rename from extension/locale/el-GR/preferences.dtd
rename to extension/locale/el/preferences.dtd
diff --git a/extension/locale/es-AR/personas.dtd b/extension/locale/es-AR/personas.dtd
index a94de78..a80c122 100644
--- a/extension/locale/es-AR/personas.dtd
+++ b/extension/locale/es-AR/personas.dtd
@@ -1,11 +1,11 @@
 <!ENTITY personas_app_title "Personas">
-<!ENTITY useDefaultPersona.label "Predeterminado">
+<!ENTITY useDefaultPersona.label "Predeterminada">
 <!ENTITY preferences.label "Preferencias">
 <!ENTITY viewDirectory.label "Ver galería">
-<!ENTITY customPersona.label "Mi Persona">
+<!ENTITY customPersona.label "Mi persona">
 <!ENTITY customName.label "Nombre:">
 <!ENTITY header.label "Imagen superior:">
-<!ENTITY selectBackground.label "Navegar...">
+<!ENTITY selectBackground.label "Navegar…">
 <!ENTITY footer.label "Imagen inferior:">
 <!ENTITY textColorPicker.label "Color de texto:">
 <!ENTITY accentColorPicker.label "Color remarcado:">
@@ -15,6 +15,6 @@
 <!ENTITY contextPreferences.label "Configuración">
 <!ENTITY contextEdit.label "Editar">
 <!ENTITY contextApply.label "Aplicar">
-<!ENTITY usePersona.label "Usar Persona">
+<!ENTITY usePersona.label "Usar persona">
 <!ENTITY usePersona.accesskey "P">
-<!ENTITY usePersona.tooltip "Usar esta Persona">
+<!ENTITY usePersona.tooltip "Usar esta persona">
diff --git a/extension/locale/es-AR/personas.properties b/extension/locale/es-AR/personas.properties
index 4c9a2d2..e404f3c 100644
--- a/extension/locale/es-AR/personas.properties
+++ b/extension/locale/es-AR/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=Acerca de...
-popular=Los más populares
-new=Nuevos y destacados
+About=Acerca de…
+featured=Destacadas
 recent=Mi selección reciente
-categories=Todos
-favorites=Mis favoritos
-favoritesSignIn=Ingresá para acceder a tus favoritos
-viewDetail=Ver detalles...
-favoritesGoTo=Ir a mis favoritos...
+favorites=Mis favoritas
+favoritesSignIn=Ingresá para acceder a tus favoritas
+viewDetail=Ver detalles…
+favoritesGoTo=Ir a mis favoritas…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Predeterminado
+Default=Predeterminada
 unnamedPersona=Persona sin nombre
-customPersona=Mi Persona
+customPersona=Mi persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=Más de %S...
+viewDesigner=Más de %S…
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
+viewMore=%1$S más en %2$S…
 #  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S más en %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Seleccionaste la persona "%1$S", por %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Deshacer
 notification.revertButton.accesskey=D
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=El tema actual es incompatible con Personas. Reiniciá para aplicar los cambios.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Reiniciar Mozilla Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Selección aleatoria de %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Selección aleatoria de %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
+dataUnavailable=Los datos de Personas no están disponible aún. Por favor, revisá tu conexión de red y reiniciá %S, o intentá de nuevo en unos instantes.
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Los datos de Personas no está disponible aún. Por favor, revisá tu conexión de red y reiniciá %S, o intentá de nuevo en unos instantes.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Seleccioná un archivo
diff --git a/extension/locale/es-AR/preferences.dtd b/extension/locale/es-AR/preferences.dtd
index 11da8af..3434f79 100644
--- a/extension/locale/es-AR/preferences.dtd
+++ b/extension/locale/es-AR/preferences.dtd
@@ -5,4 +5,4 @@
 <!ENTITY useTextColor.label "Usar color de texto">
 <!ENTITY useAccentColor.label "Usar color remarcado">
 <!ENTITY advancedSettings.label "Avanzado">
-<!ENTITY showCustomMenu.label "Mostrar Mi Persona en el menú">
+<!ENTITY showCustomMenu.label "Mostrar "Mi persona" en el menú">
diff --git a/extension/locale/es-CL/personas.properties b/extension/locale/es-CL/personas.properties
index 0147453..1506b2e 100644
--- a/extension/locale/es-CL/personas.properties
+++ b/extension/locale/es-CL/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Acerca de...
-popular=Más popular
-new=Nuevo
+featured= Featured
 recent=Recientemente seleccionado
-categories=Por categoría
 favorites=Favoritos
 favoritesSignIn=Inicie sesión para acceder a sus favoritos
 viewDetail=Ver detalles...
 favoritesGoTo=Ir a Favoritos...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Por defecto
 unnamedPersona=Persona sin nombre
 customPersona=Persona personalizado
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=Más de %S
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=%1$S más de %2$S...
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=Tú seleccionaste la persona "%1$S" por %2$S.
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=Deshacer
 notification.revertButton.accesskey=D
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.restartToApply=El tema actual no es compatible con Personas. Reinicia para aplicar.
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Reiniciar Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Selección al azar desde %1$S a %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Selección al azar desde %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Dato de Personas no está disponible aún. Por favor revise su conexión y reinicie %S, o intente de nuevo en unos minutos más.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Seleccione un archivo
diff --git a/extension/locale/es-ES/personas.properties b/extension/locale/es-ES/personas.properties
index c2a26c4..a04e9c7 100644
--- a/extension/locale/es-ES/personas.properties
+++ b/extension/locale/es-ES/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Acerca de...
-popular=Más Popular
-new=Nuevo & Mostrados
+featured=Destacados
 recent=Seleccionados recientemente
-categories=Todo
 favorites=Mis Favoritos
 favoritesSignIn=Iniciar sesión para acceder a tus favoritos
 viewDetail=Ver detalles...
 favoritesGoTo=Ir a mis favoritos...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Predeterminado
 unnamedPersona=Persona Sin Nombre
 customPersona=Persona personalizada
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Más sobre %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S más en %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Has seleccionado a la persona "%1$S" de %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Deshacer
 notification.revertButton.accesskey=D
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=El tema actual es incompatible con Personas. Reinicie la aplicación.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Reiniciar Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Selección aleatoria de %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Selección aleatoria de %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Aún no están disponibles los datos de Personas. Por favor compruebe su conexión a la red y reinicie %S, o pruebe de nuevo en unos minutos.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Seleccionar un archivo
diff --git a/extension/locale/es-MX/personas.dtd b/extension/locale/es-MX/personas.dtd
new file mode 100644
index 0000000..9f034eb
--- /dev/null
+++ b/extension/locale/es-MX/personas.dtd
@@ -0,0 +1,20 @@
+<!ENTITY personas_app_title "Personas">
+<!ENTITY useDefaultPersona.label "Predeterminado">
+<!ENTITY preferences.label "Preferencias">
+<!ENTITY viewDirectory.label "Ver Galería">
+<!ENTITY customPersona.label "Persona Personalizado">
+<!ENTITY customName.label "Nombre:">
+<!ENTITY header.label "Encabezado:">
+<!ENTITY selectBackground.label "Explorar…">
+<!ENTITY footer.label "Pie:">
+<!ENTITY textColorPicker.label "Color de Texto:">
+<!ENTITY accentColorPicker.label "Color de Acento:">
+<!ENTITY useDefaultColor.label "Usar Predeterminado">
+<!ENTITY okButton.label "OK">
+<!ENTITY contextHomePage.label "Página de Inicio">
+<!ENTITY contextPreferences.label "Configuraciones">
+<!ENTITY contextEdit.label "Editar">
+<!ENTITY contextApply.label "Aplicar">
+<!ENTITY usePersona.label "Usar Persona">
+<!ENTITY usePersona.accesskey "P">
+<!ENTITY usePersona.tooltip "Usar esta Persona">
diff --git a/extension/locale/fr-FR/personas.properties b/extension/locale/es-MX/personas.properties
similarity index 63%
copy from extension/locale/fr-FR/personas.properties
copy to extension/locale/es-MX/personas.properties
index e23c04b..2c1235a 100644
--- a/extension/locale/fr-FR/personas.properties
+++ b/extension/locale/es-MX/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=À propos…
-popular=Les plus populaires
-new=Nouveaux
-recent=Choisis récemment
-categories=Par catégorie
-favorites=Favoris
-favoritesSignIn=Vous abonner pour accéder à vos favoris
-viewDetail=Détails…
-favoritesGoTo=Accéder à mes favoris…
+About=Acerca de ...
+featured=Destacado
+recent=Mi selección reciente
+favorites=Mis Favoritos
+favoritesSignIn=Inicia sesión para acceder a tus favoritos
+viewDetail=Ver detalles...
+favoritesGoTo=Ir a mis favoritos
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Par défaut
-unnamedPersona=Persona sans nom
-customPersona=Persona personnalisé
+Default=Predeterminado
+unnamedPersona=Persona sin título
+customPersona=Persona personalizado
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=D'autres de %S…
+viewDesigner=Más de $@...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S d'autres de %2$S…
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore=%1$S más en %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Vous avez choisi le persona « %1$S » de %2$S
+notification.personaWasSelected=Seleccionaste el persona "%1$S" creado por %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
-notification.revertButton.label=Annuler
-notification.revertButton.accesskey=u
+notification.revertButton.label=Deshacer
+notification.revertButton.accesskey=D
 # The text of the notification shown when the browser needs to be restarted in
-
 # order to apply a persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+notification.restartToApply=El tema actual es incompatible con Personas. Reinicie para aplicar.
 # Strings used for the Restart button in the notification shown when the browser
-
 # needs to be restarted in order to apply a persona. The brand name "Firefox"
-
 # can be used safely because this notification is shown only in Firefox [3.6, 4.0[
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+notification.restartButton.label=Reiniciar Firefox
+notification.restartButton.accesskey=R
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-randomPersona=Choix aléatoire de %1$S > %2$S
+randomPersona=Selección al azar de %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-useRandomPersona=Choix aléatoire à partir de %S
+useRandomPersona=Selección al azar de %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Les données Persona ne sont pas encore disponibles. Veuillez vérifier votre connexion Internet et redémarrer %S ou essayer à nouveau dans quelques minutes.
+dataUnavailable=Datos aún no disponibles de Personas. Por favor verifica tu conexión de red y reinicia %S, o vuelve a intentarlo en unos cuantos minutos.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Choix d'un fichier
+backgroundPickerDialogTitle=Selecciona un archivo
diff --git a/extension/locale/es-AR/preferences.dtd b/extension/locale/es-MX/preferences.dtd
similarity index 61%
copy from extension/locale/es-AR/preferences.dtd
copy to extension/locale/es-MX/preferences.dtd
index 11da8af..a9cd6d2 100644
--- a/extension/locale/es-AR/preferences.dtd
+++ b/extension/locale/es-MX/preferences.dtd
@@ -1,8 +1,8 @@
 <!ENTITY preferences.title "Preferencias de Personas">
 <!ENTITY generalSettings.label "General">
 <!ENTITY previewEnabled.label "Mostrar previsualización cuando seleccione desde el menú">
-<!ENTITY displaySettings.label "Mostrar">
+<!ENTITY displaySettings.label "Presentación">
 <!ENTITY useTextColor.label "Usar color de texto">
-<!ENTITY useAccentColor.label "Usar color remarcado">
+<!ENTITY useAccentColor.label "Usar color de acento">
 <!ENTITY advancedSettings.label "Avanzado">
-<!ENTITY showCustomMenu.label "Mostrar Mi Persona en el menú">
+<!ENTITY showCustomMenu.label "Motrar Persona personalizado en el menú">
diff --git a/extension/locale/eu-ES/personas.dtd b/extension/locale/eu/personas.dtd
similarity index 100%
rename from extension/locale/eu-ES/personas.dtd
rename to extension/locale/eu/personas.dtd
diff --git a/extension/locale/eu-ES/personas.properties b/extension/locale/eu/personas.properties
similarity index 95%
rename from extension/locale/eu-ES/personas.properties
rename to extension/locale/eu/personas.properties
index 1cd3789..6899bc2 100644
--- a/extension/locale/eu-ES/personas.properties
+++ b/extension/locale/eu/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Honi buruz…
-popular=Ezagunenak
-new=Berria
+featured= Featured
 recent=Azkenez hautatuak
-categories=Kategoriaz
 favorites=Gogokoenak
 favoritesSignIn=Saioa hasi zure gogokoenak atzitzeko
 viewDetail=Ikusi xehtasunak...
 favoritesGoTo=Joan nire gogokoetara...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Lehenetsia
 unnamedPersona=Izengabeko Persona
 customPersona=Pertsonalizatutako Persona
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=Geihago %S-tik...
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=%1$S gehiago %2$S-tik...
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=%2$S-ren  "%1$S" persona hautatu duzu.
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=Desegin
 notification.revertButton.accesskey=D
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Ausazko hautapen eremua: %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=%S-ko ausazko hautapena
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas datuak ez daude eskuragarri oraindik. Mesedez egiaztatu zure sare eta %S berrabiarazi, edo saiatu minutu batzuetan.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Hautatu fitxategi bat
diff --git a/extension/locale/eu-ES/preferences.dtd b/extension/locale/eu/preferences.dtd
similarity index 100%
rename from extension/locale/eu-ES/preferences.dtd
rename to extension/locale/eu/preferences.dtd
diff --git a/extension/locale/fi-FI/personas.dtd b/extension/locale/fi/personas.dtd
similarity index 100%
rename from extension/locale/fi-FI/personas.dtd
rename to extension/locale/fi/personas.dtd
diff --git a/extension/locale/fi-FI/personas.properties b/extension/locale/fi/personas.properties
similarity index 95%
rename from extension/locale/fi-FI/personas.properties
rename to extension/locale/fi/personas.properties
index ab7627f..102d4df 100644
--- a/extension/locale/fi-FI/personas.properties
+++ b/extension/locale/fi/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Tietoja...
-popular=Suosituimmat
-new=Uudet & suositellut
+featured= Featured
 recent=Viimeksi valitut
-categories=Kaikki
 favorites=Suosikit
 favoritesSignIn=Kirjaudu sisään nähdäksesi suosikkisi
 viewDetail=Katso lisätietoja...
 favoritesGoTo=Siirry suosikkeihin...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Oletus
 unnamedPersona=Nimetön Persona
 customPersona=Mukautettu Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Lisää suunnittelijalta %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S lisää kohteesta %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Valitsit personan "%1$S" suunnittelijalta %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Kumoa
 notification.revertButton.accesskey=m
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=Nykyinen teema ei ole yhteensopiva Personasin kanssa. Käynnistä uudelleen ottaaksesi sen käyttön.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Käynnistä Firefox uudelleen
 notification.restartButton.accesskey=F
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Satunnainen valinta kohteesta %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Satunnainen valinta kohteesta %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas-data ei ole vielä saatavilla. Tarkista verkkoyhteytesi ja käynnistä %S uudelleen, tai yritä uudelleen muutaman minuutin päästä.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Valitse tiedosto
diff --git a/extension/locale/fi-FI/preferences.dtd b/extension/locale/fi/preferences.dtd
similarity index 100%
rename from extension/locale/fi-FI/preferences.dtd
rename to extension/locale/fi/preferences.dtd
diff --git a/extension/locale/fr-FR/personas.dtd b/extension/locale/fr/personas.dtd
similarity index 85%
rename from extension/locale/fr-FR/personas.dtd
rename to extension/locale/fr/personas.dtd
index 5e80396..207dfce 100644
--- a/extension/locale/fr-FR/personas.dtd
+++ b/extension/locale/fr/personas.dtd
@@ -15,6 +15,6 @@
 <!ENTITY contextPreferences.label "Paramètres">
 <!ENTITY contextEdit.label "Éditer">
 <!ENTITY contextApply.label "Appliquer">
-<!ENTITY usePersona.label "Use Persona">
-<!ENTITY usePersona.accesskey "P">
-<!ENTITY usePersona.tooltip "Use this Persona">
+<!ENTITY usePersona.label "Porter le Persona">
+<!ENTITY usePersona.accesskey "p">
+<!ENTITY usePersona.tooltip "Utiliser ce Persona">
diff --git a/extension/locale/fr-FR/personas.properties b/extension/locale/fr/personas.properties
similarity index 79%
copy from extension/locale/fr-FR/personas.properties
copy to extension/locale/fr/personas.properties
index e23c04b..11b2ebf 100644
--- a/extension/locale/fr-FR/personas.properties
+++ b/extension/locale/fr/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=À propos…
-popular=Les plus populaires
-new=Nouveaux
+featured=Fonction
 recent=Choisis récemment
-categories=Par catégorie
 favorites=Favoris
-favoritesSignIn=Vous abonner pour accéder à vos favoris
+favoritesSignIn=Identifiez-vous pour accéder à vos favoris
 viewDetail=Détails…
 favoritesGoTo=Accéder à mes favoris…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Par défaut
 unnamedPersona=Persona sans nom
 customPersona=Persona personnalisé
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=D'autres de %S…
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S d'autres de %2$S…
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore=D'autres dans %1$S…
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Vous avez choisi le persona « %1$S » de %2$S
+notification.personaWasSelected=Vous avez choisi le Persona « %1$S » de %2$S
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
 notification.revertButton.label=Annuler
 notification.revertButton.accesskey=u
 # The text of the notification shown when the browser needs to be restarted in
-
 # order to apply a persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+notification.restartToApply=Le thème actuel est incompatible avec ce Persona. Veuillez redémarrer pour l'appliquer.
 # Strings used for the Restart button in the notification shown when the browser
-
 # needs to be restarted in order to apply a persona. The brand name "Firefox"
-
 # can be used safely because this notification is shown only in Firefox [3.6, 4.0[
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+notification.restartButton.label=Redémarrer Firefox
+notification.restartButton.accesskey=r
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-randomPersona=Choix aléatoire de %1$S > %2$S
+randomPersona=Choix aléatoire dans %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-useRandomPersona=Choix aléatoire à partir de %S
+useRandomPersona=Choix aléatoire dans %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Les données Persona ne sont pas encore disponibles. Veuillez vérifier votre connexion Internet et redémarrer %S ou essayer à nouveau dans quelques minutes.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Choix d'un fichier
diff --git a/extension/locale/fr-FR/preferences.dtd b/extension/locale/fr/preferences.dtd
similarity index 52%
rename from extension/locale/fr-FR/preferences.dtd
rename to extension/locale/fr/preferences.dtd
index 98369cb..7735925 100644
--- a/extension/locale/fr-FR/preferences.dtd
+++ b/extension/locale/fr/preferences.dtd
@@ -1,8 +1,8 @@
-<!ENTITY preferences.title "Préférences Persona">
-<!ENTITY generalSettings.label "Générales">
-<!ENTITY previewEnabled.label "Afficher l'aperçu lors de la sélection via le menu">
+<!ENTITY preferences.title "Préférences de Persona">
+<!ENTITY generalSettings.label "Général">
+<!ENTITY previewEnabled.label "Afficher l'aperçu lors de la sélection via le menu">
 <!ENTITY displaySettings.label "Affichage">
 <!ENTITY useTextColor.label "Utiliser la couleur de texte">
 <!ENTITY useAccentColor.label "Utiliser la couleur de mise en relief">
-<!ENTITY advancedSettings.label "Avancées">
+<!ENTITY advancedSettings.label "Avancé">
 <!ENTITY showCustomMenu.label "Afficher les Personas personnalisés dans le menu">
diff --git a/extension/locale/fy-NL/personas.properties b/extension/locale/fy-NL/personas.properties
index ffcb25c..4971206 100644
--- a/extension/locale/fy-NL/personas.properties
+++ b/extension/locale/fy-NL/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Oer...
-popular=Meast populêr
-new=Nij
+featured= Featured
 recent=Resint selektearre
-categories=Per kategory
 favorites=Favoriten
 favoritesSignIn=Loch yn om jo favoriten te besjen
 viewDetail=Toan details...
 favoritesGoTo=Gean nei myn favoriten...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Standert
 unnamedPersona=Net beneamde Persona
 customPersona=Oanpaste Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Mear fan %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S Mear fan %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Jo hawwe de persona "%1$S" fan %2$S selektearre.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Ungedien meitsje
 notification.revertButton.accesskey=U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Samar in seleksje út %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Samar in seleksje út %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas gegevens is noch net beskikber. Kontrolearje asjobleaft jo netwurkferbining en start %S op 'e nij, of besykje it opnij oer in pear minuten.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Selektearje in bestân
diff --git a/extension/locale/ga-IE/personas.dtd b/extension/locale/ga-IE/personas.dtd
new file mode 100644
index 0000000..15b9a92
--- /dev/null
+++ b/extension/locale/ga-IE/personas.dtd
@@ -0,0 +1,20 @@
+<!ENTITY personas_app_title "Pearsantachtaí">
+<!ENTITY useDefaultPersona.label "Réamhshocrú">
+<!ENTITY preferences.label "Sainroghanna">
+<!ENTITY viewDirectory.label "Féach ar an nGailearaí">
+<!ENTITY customPersona.label "Pearsantacht Shaincheaptha">
+<!ENTITY customName.label "Ainm:">
+<!ENTITY header.label "Ceanntásc:">
+<!ENTITY selectBackground.label "Brabhsáil...">
+<!ENTITY footer.label "Buntásc:">
+<!ENTITY textColorPicker.label "Dath an Téacs:">
+<!ENTITY accentColorPicker.label "Dath an Aibhsithe:">
+<!ENTITY useDefaultColor.label "Úsáid Réamhshocrú">
+<!ENTITY okButton.label "OK">
+<!ENTITY contextHomePage.label "Leathanach Baile">
+<!ENTITY contextPreferences.label "Socruithe">
+<!ENTITY contextEdit.label "Eagar">
+<!ENTITY contextApply.label "Cuir i bhFeidhm">
+<!ENTITY usePersona.label "Úsáid Pearsantacht">
+<!ENTITY usePersona.accesskey "P">
+<!ENTITY usePersona.tooltip "Úsáid an Phearsantacht seo">
diff --git a/extension/locale/fr-FR/personas.properties b/extension/locale/ga-IE/personas.properties
similarity index 63%
copy from extension/locale/fr-FR/personas.properties
copy to extension/locale/ga-IE/personas.properties
index e23c04b..2197ab1 100644
--- a/extension/locale/fr-FR/personas.properties
+++ b/extension/locale/ga-IE/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=À propos…
-popular=Les plus populaires
-new=Nouveaux
-recent=Choisis récemment
-categories=Par catégorie
-favorites=Favoris
-favoritesSignIn=Vous abonner pour accéder à vos favoris
-viewDetail=Détails…
-favoritesGoTo=Accéder à mes favoris…
+About=Maidir Leis...
+featured= Featured
+recent=Roghnaithe agam le déanaí
+favorites=Ceanáin
+favoritesSignIn=Logáil Isteach chun do chuid Ceanán a fheiceáil
+viewDetail=Féach ar na mionsonraí...
+favoritesGoTo=Féach ar mo chuid Ceanán...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Par défaut
-unnamedPersona=Persona sans nom
-customPersona=Persona personnalisé
+Default=Réamhshocrú
+unnamedPersona=Pearsantacht Gan Ainm
+customPersona=Pearsantacht Shaincheaptha
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=D'autres de %S…
+viewDesigner=Tuilleadh ó %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S d'autres de %2$S…
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore=%1$S Pearsantacht eile ó %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Vous avez choisi le persona « %1$S » de %2$S
+notification.personaWasSelected=Roghnaigh tú pearsantacht "%1$S" le %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
-notification.revertButton.label=Annuler
-notification.revertButton.accesskey=u
+notification.revertButton.label=Cealaigh
+notification.revertButton.accesskey=C
 # The text of the notification shown when the browser needs to be restarted in
-
 # order to apply a persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+notification.restartToApply=Níl an téama seo comhoiriúnach do Phearsantachtaí.  Atosaigh chun é a chur i bhfeidhm.
 # Strings used for the Restart button in the notification shown when the browser
-
 # needs to be restarted in order to apply a persona. The brand name "Firefox"
-
 # can be used safely because this notification is shown only in Firefox [3.6, 4.0[
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+notification.restartButton.label=Atosaigh Firefox
+notification.restartButton.accesskey=A
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-randomPersona=Choix aléatoire de %1$S > %2$S
+randomPersona=Roghnúchán Randamach ó %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-useRandomPersona=Choix aléatoire à partir de %S
+useRandomPersona=Roghnúchán Randamach ó %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Les données Persona ne sont pas encore disponibles. Veuillez vérifier votre connexion Internet et redémarrer %S ou essayer à nouveau dans quelques minutes.
+dataUnavailable=Níl na sonraí seo ar fáil fós. Deimhnigh do cheangal leis an líonra agus atosaigh %S, nó bain triail eile as i gceann cúpla nóiméad.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Choix d'un fichier
+backgroundPickerDialogTitle=Roghnaigh Comhad
diff --git a/extension/locale/ga-IE/preferences.dtd b/extension/locale/ga-IE/preferences.dtd
new file mode 100644
index 0000000..40683e7
--- /dev/null
+++ b/extension/locale/ga-IE/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "Sainroghanna Pearsantachtaí">
+<!ENTITY generalSettings.label "Ginearálta">
+<!ENTITY previewEnabled.label "Taispeáin réamhamharc le linn roghnú ó roghchlár">
+<!ENTITY displaySettings.label "Taispeáint">
+<!ENTITY useTextColor.label "Úsáid dath téacs">
+<!ENTITY useAccentColor.label "Úsáid dath aibhsithe">
+<!ENTITY advancedSettings.label "Casta">
+<!ENTITY showCustomMenu.label "Taispeáin Pearsantacht Shaincheaptha sa roghchlár">
diff --git a/extension/locale/gl-ES/personas.properties b/extension/locale/gl-ES/personas.properties
index dbe5ae6..5a6ce52 100644
--- a/extension/locale/gl-ES/personas.properties
+++ b/extension/locale/gl-ES/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Acerca de
-popular=Os máis populares
-new=Novo
+featured=Destacado
 recent=Seleccionados recentemente
-categories=Todos
 favorites=Favoritos
 favoritesSignIn=Acceda aos seus favoritos
 viewDetail=Ver detalles...
 favoritesGoTo=Ir aos favoritos...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Predeterminado
 unnamedPersona=Persona sen nome
 customPersona=Personalizar o Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Máis desde %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S máis desde %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Vostede seleccionou o persona "%1$S" deseñado por %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Desfacer
 notification.revertButton.accesskey=U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=O tema actual é incompatible con Personas. Reiniciar para aplicar.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Reiniciar o Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Selección ao chou en  %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Selección ao chou desde %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Os datos de Personas non están aínda dispoñibles. Por favor comprobe a súa conexión de rede e reinicie o %S ou ténteo de novo nuns minutos.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Seleccione un ficheiro
diff --git a/extension/locale/he-IL/personas.properties b/extension/locale/he-IL/personas.properties
index e5b76c4..1f36636 100644
--- a/extension/locale/he-IL/personas.properties
+++ b/extension/locale/he-IL/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=אודות...
-popular=הכי פופולרי
-new=חדש ומאופיין
+featured=נבחרים
 recent=נבחר לאחרונה
-categories=הכל
 favorites=המועדפים שלי
 favoritesSignIn=התחברות כדי לגשת אל המועדפים שלך
 viewDetail=הצגת הפרטים...
 favoritesGoTo=לך אל המועדפים שלי...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=ברירת מחדל
 unnamedPersona=Persona ללא שם
 customPersona=Persona מותאם אישית
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=עוד מ%S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S  נוספים מ%2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=הפרסונה (persona) שנבחרה היא %1$S מאת %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=ביטול הפעולה האחרונה
 notification.revertButton.accesskey=ט
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=ערכת הנושא הנוכחית אינה תואמת עם Personas. יש לאתחל כדי להחיל.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=אתחול פיירפוקס
 notification.restartButton.accesskey=א
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=בחירה אקראית מ%1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=בחירה אקראית מ%S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=מידע Personas איננו זמין עדיין. יש לבדוק את חיבור הרשת ולאתחל את %S, או לנסות בשנית בעוד מספר דקות.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=בחירת קובץ
diff --git a/extension/locale/hu-HU/personas.properties b/extension/locale/hu-HU/personas.properties
index c3ead07..6c1be67 100644
--- a/extension/locale/hu-HU/personas.properties
+++ b/extension/locale/hu-HU/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Névjegy...
-popular=Legnépszerűbb
-new=Új
+featured=Kiemelt
 recent=Legutóbb kiválasztott
-categories=Kategória szerint
 favorites=Kedvencek
 favoritesSignIn=A Kedvencek eléréséhez be kell jelentkezni
 viewDetail=Részletek...
 favoritesGoTo=Kedvencek...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Alapértelmezett
 unnamedPersona=Névtelen Persona
 customPersona=Egyéni Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=%S további alkotásai...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S további alkotás a(z) %2$S kategóriában...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Kiválasztott persona: "%1$S" készítette: %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Visszavonás
 notification.revertButton.accesskey=V
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=A jelenlegi téma nem kompatibilis a Personas-szal. Megjelenéséhez indítsa újra a böngészőt.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Firefox újraindítása
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Véletlenszerű kiválasztás: %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Véletlenszerű kiválasztás innen: %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=A Personas adatai most nem elérhetők. Ellenőrizze a hálózati kapcsolatot és indítsa újra a %Sot, vagy próbálja meg pár perc múlva.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Fájl kiválasztása
diff --git a/extension/locale/it-IT/personas.dtd b/extension/locale/it-IT/personas.dtd
deleted file mode 100644
index 189faa4..0000000
--- a/extension/locale/it-IT/personas.dtd
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY personas_app_title "Personas">
-<!ENTITY useDefaultPersona.label "Predefinito">
-<!ENTITY preferences.label "Opzioni...">
-<!ENTITY viewDirectory.label "Visualizza galleria...">
-<!ENTITY customPersona.label "Personalizzazioni">
-<!ENTITY customName.label "Nome:">
-<!ENTITY header.label "Intestazione:">
-<!ENTITY selectBackground.label "Sfoglia...">
-<!ENTITY footer.label "Piè di pagina:">
-<!ENTITY textColorPicker.label "Colore del testo:">
-<!ENTITY accentColorPicker.label "Colore evidenziatore:">
-<!ENTITY useDefaultColor.label "Utilizza predefinito">
-<!ENTITY okButton.label "OK">
-<!ENTITY contextHomePage.label "Pagina iniziale">
-<!ENTITY contextPreferences.label "Impostazioni">
-<!ENTITY contextEdit.label "Modifica">
-<!ENTITY contextApply.label "Applica">
-<!ENTITY usePersona.label "Utilizza tema">
-<!ENTITY usePersona.accesskey "z">
-<!ENTITY usePersona.tooltip "Utilizza questo tema">
diff --git a/extension/locale/it-IT/personas.properties b/extension/locale/it-IT/personas.properties
deleted file mode 100644
index 450d11f..0000000
--- a/extension/locale/it-IT/personas.properties
+++ /dev/null
@@ -1,102 +0,0 @@
-# Labels that identify the current persona when the current persona is either
-
-About=Informazioni su...
-popular=I più popolari
-new=Nuovi
-recent=Selezionati recentemente
-categories=Per categoria
-favorites=Preferiti
-favoritesSignIn=Accedi per visualizzare i tuoi Preferiti
-viewDetail=Visualizza dettagli...
-favoritesGoTo=Visualizza i miei Preferiti
-# the default persona, a persona that doesn't have a name, or a custom persona
-
-# that doesn't have a name.
-
-# LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-Default=Predefinito
-unnamedPersona=Senza nome
-customPersona=Personalizzazioni
-# randomly-selected persona.
-
-#   %1$S = the category to which the persona belongs
-
-#   %2$S = the name of the persona
-
-viewDesigner=Visualizza altri temi di %S...
-# f.e. "Random Selection from Scenery > Yosemite"
-
-# LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
-#   %S = the category from which to pick random personas
-
-viewMore=Visualizza i restanti %1$S temi della categoria %2$S...
-# f.e. "Random Selection from Scenery"
-
-# The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
-notification.personaWasSelected=Hai selezionato il tema di Personas "%1$S" di %2$S.
-# translated it in this one, we'll leave it here for now.
-
-# is selected for the first time.
-
-notification.revertButton.label=Annulla
-notification.revertButton.accesskey=u
-# LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
-notification.restartToApply=Il tema in uso non è compatibile con Personas. Riavvia per rendere effettive le modifiche.
-#   %1$S = the category to which the persona belongs
-
-#   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
-notification.restartButton.label=Riavvia Firefox
-notification.restartButton.accesskey=r
-# LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
-#   %S = the category from which to pick random personas
-
-# f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-randomPersona=Selezione casuale da %1$S a %2$S
-# when a user hovers over a Personas menu that we can't yet generate because
-
-# we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
-useRandomPersona=Selezione casuale da %S
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=I dati di Personas non sono ancora disponibili. Controllare la propria connessione a Internet e riavviare %S oppure ritentare tra qualche minuto.
-# The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Seleziona un file
diff --git a/extension/locale/it-IT/preferences.dtd b/extension/locale/it-IT/preferences.dtd
deleted file mode 100644
index 5b540a6..0000000
--- a/extension/locale/it-IT/preferences.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY preferences.title "Opzioni di Personas">
-<!ENTITY generalSettings.label "Generale">
-<!ENTITY previewEnabled.label "Visualizza anteprima durante la selezione da menu">
-<!ENTITY displaySettings.label "Visualizza">
-<!ENTITY useTextColor.label "Utilizza testo colorato">
-<!ENTITY useAccentColor.label "Utilizza evidenziatore">
-<!ENTITY advancedSettings.label "Avanzate">
-<!ENTITY showCustomMenu.label "Visualizza la voce 'Personalizzazioni' nel menu">
diff --git a/extension/locale/it/personas.properties b/extension/locale/it/personas.properties
index 450d11f..7069fe3 100644
--- a/extension/locale/it/personas.properties
+++ b/extension/locale/it/personas.properties
@@ -1,102 +1,60 @@
 # Labels that identify the current persona when the current persona is either
-
 About=Informazioni su...
-popular=I più popolari
-new=Nuovi
+featured=Consigliati
 recent=Selezionati recentemente
-categories=Per categoria
 favorites=Preferiti
 favoritesSignIn=Accedi per visualizzare i tuoi Preferiti
 viewDetail=Visualizza dettagli...
 favoritesGoTo=Visualizza i miei Preferiti
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 Default=Predefinito
 unnamedPersona=Senza nome
 customPersona=Personalizzazioni
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 viewDesigner=Visualizza altri temi di %S...
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
-#   %S = the category from which to pick random personas
-
 viewMore=Visualizza i restanti %1$S temi della categoria %2$S...
+#   %S = the category from which to pick random personas
 # f.e. "Random Selection from Scenery"
-
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
 notification.personaWasSelected=Hai selezionato il tema di Personas "%1$S" di %2$S.
+# be in an editor-specific properties file, but since translators have already
 # translated it in this one, we'll leave it here for now.
-
-# is selected for the first time.
-
 notification.revertButton.label=Annulla
 notification.revertButton.accesskey=u
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=Il tema in uso non è compatibile con Personas. Riavvia per rendere effettive le modifiche.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Riavvia Firefox
 notification.restartButton.accesskey=r
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Selezione casuale da %1$S a %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Selezione casuale da %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=I dati di Personas non sono ancora disponibili. Controllare la propria connessione a Internet e riavviare %S oppure ritentare tra qualche minuto.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Seleziona un file
diff --git a/extension/locale/ja-JP-mac/personas.properties b/extension/locale/ja-JP-mac/personas.properties
index 2cb5d8c..5118c3b 100644
--- a/extension/locale/ja-JP-mac/personas.properties
+++ b/extension/locale/ja-JP-mac/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Personas について...
-popular=人気
-new=新着と特集
+featured=注目
 recent=最近の選択
-categories=すべて
 favorites=お気に入り
 favoritesSignIn=サインインしてお気に入りにアクセス
 viewDetail=詳細を表示...
 favoritesGoTo=お気に入りを開く...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=デフォルト
 unnamedPersona=名称未設定のペルソナ
 customPersona=カスタムペルソナ
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=%S による他のペルソナ...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%2$S から %1$S のペルソナ...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=%2$S によるペルソナ「%1$S」を選択しました。
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=取り消す
 notification.revertButton.accesskey=U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=現在のテーマは Personas と互換性がありません。再起動後に適用されます。
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Firefox を再起動
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=%1$S から無作為に選択された %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=%S から無作為に選択
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=ペルソナデータがまだ利用できません。ネットワーク接続を確認して %S を再起動するか、また後ほどお試しください。
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=ファイル選択
diff --git a/extension/locale/ja/personas.properties b/extension/locale/ja/personas.properties
index 2c29d5e..04a7edb 100644
--- a/extension/locale/ja/personas.properties
+++ b/extension/locale/ja/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Personas について
-popular=人気
-new=新着と特集
+featured= Featured
 recent=最近の選択
-categories=すべて
 favorites=お気に入り
 favoritesSignIn=サインインしてお気に入りにアクセス
 viewDetail=詳細を表示...
 favoritesGoTo=お気に入りに行く...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=既定
 unnamedPersona=名無しのペルソナ
 customPersona=カスタムペルソナ
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=%S によるほかのペルソナ...
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=%2$S から%1$Sのペルソナ...
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.personaWasSelected=%2$S によるペルソナ「%1$S」を選択しました。
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 notification.revertButton.label=元に戻す
 notification.revertButton.accesskey=U
+# translated it in this one, we'll leave it here for now.
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=%1$S から無作為に選択された %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=%S から無作為に選択
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=ペルソナデータがまだ利用できません。ネットワーク接続を確認して %S を再起動するか、また後ほどお試しください。
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=ファイルを選択
diff --git a/extension/locale/ko-KR/personas.dtd b/extension/locale/ko-KR/personas.dtd
index c3ed881..e7f6b0d 100644
--- a/extension/locale/ko-KR/personas.dtd
+++ b/extension/locale/ko-KR/personas.dtd
@@ -1,7 +1,7 @@
 <!ENTITY personas_app_title "Personas">
 <!ENTITY useDefaultPersona.label "기본">
 <!ENTITY preferences.label "환경설정...">
-<!ENTITY viewDirectory.label "사전 보기...">
+<!ENTITY viewDirectory.label "목록 보기…">
 <!ENTITY customPersona.label "사용자 Persona">
 <!ENTITY customName.label "이름:">
 <!ENTITY header.label "머리글:">
diff --git a/extension/locale/ko-KR/personas.properties b/extension/locale/ko-KR/personas.properties
index 529d531..21fb7f3 100644
--- a/extension/locale/ko-KR/personas.properties
+++ b/extension/locale/ko-KR/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=정보...
-popular=인기도
-new=신상
+featured=인기
 recent=최근 선택
-categories=분류
 favorites=선호하는 스킨
 favoritesSignIn=당신이 선호하는 스킨 접속을 위해 로그인
 viewDetail=상세 보기
 favoritesGoTo=나의 즐겨찾기로 가기...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=기본값
 unnamedPersona=이름없는 Persona
 customPersona=사용자지정 Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=%S의 다른 스킨 보기
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%2$S의 %1$S개 스킨이 더 있음
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=%2$S의 "%1$S" Persona를 선택하셨습니다.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=되돌리기
 notification.revertButton.accesskey=U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=현재 테마는 Personas와 호환되지 않습니다. 적용하려면 재시작하세요.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Firefox 재시작
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=%1$S > %2$S 에서 무작위 선택
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=%S 에서 무작위 선택
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas 데이터를 아직 이용할 수 없습니다. 네트워크 접속을 확인후 %S를 재시작하거나, 잠시 후에 다시 시도해 주세요.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=파일 선택
diff --git a/extension/locale/lt-LT/personas.dtd b/extension/locale/lt-LT/personas.dtd
new file mode 100644
index 0000000..405c1c0
--- /dev/null
+++ b/extension/locale/lt-LT/personas.dtd
@@ -0,0 +1,20 @@
+<!ENTITY personas_app_title "Kaukės">
+<!ENTITY useDefaultPersona.label "Įprastasis">
+<!ENTITY preferences.label "Nuostatymai">
+<!ENTITY viewDirectory.label "Žiurėti galeriją">
+<!ENTITY customPersona.label "Kita kaukė">
+<!ENTITY customName.label "Pavadinimas:">
+<!ENTITY header.label "Antraštė:">
+<!ENTITY selectBackground.label "Naršyti:">
+<!ENTITY footer.label "Apačia:">
+<!ENTITY textColorPicker.label "TEksto spalva:">
+<!ENTITY accentColorPicker.label "Kirčio spalva:">
+<!ENTITY useDefaultColor.label "Naudoti įprastą">
+<!ENTITY okButton.label "OK">
+<!ENTITY contextHomePage.label "Namų puslapis">
+<!ENTITY contextPreferences.label "Nustatymai">
+<!ENTITY contextEdit.label "Redaguoti">
+<!ENTITY contextApply.label "Taikyti">
+<!ENTITY usePersona.label "Use Persona">
+<!ENTITY usePersona.accesskey "P">
+<!ENTITY usePersona.tooltip "Use this Persona">
diff --git a/extension/locale/fr-FR/personas.properties b/extension/locale/lt-LT/personas.properties
similarity index 68%
copy from extension/locale/fr-FR/personas.properties
copy to extension/locale/lt-LT/personas.properties
index e23c04b..0b8ffda 100644
--- a/extension/locale/fr-FR/personas.properties
+++ b/extension/locale/lt-LT/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=À propos…
-popular=Les plus populaires
-new=Nouveaux
-recent=Choisis récemment
-categories=Par catégorie
-favorites=Favoris
-favoritesSignIn=Vous abonner pour accéder à vos favoris
-viewDetail=Détails…
-favoritesGoTo=Accéder à mes favoris…
+About=Apie...
+featured= Featured
+recent=Neseniai naudotos
+favorites=Mėgstamiausios
+favoritesSignIn=Prisijungti, mėgstamiausių pasiekimui
+viewDetail=Išsamiau...
+favoritesGoTo=Eiti į mėgstamiausius...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Par défaut
-unnamedPersona=Persona sans nom
-customPersona=Persona personnalisé
+Default=Įprastasis
+unnamedPersona=Bevardė kaukė
+customPersona=Kaukė pagal užsakymą
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=D'autres de %S…
+viewDesigner=Daugiau iš $S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S d'autres de %2$S…
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore=%1$S iš %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Vous avez choisi le persona « %1$S » de %2$S
+notification.personaWasSelected=Jūs pasirinkote "%1$S". Autorius: %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
-notification.revertButton.label=Annuler
-notification.revertButton.accesskey=u
+notification.revertButton.label=Atšaukti
+notification.revertButton.accesskey=U
 # The text of the notification shown when the browser needs to be restarted in
-
 # order to apply a persona.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 # Strings used for the Restart button in the notification shown when the browser
-
 # needs to be restarted in order to apply a persona. The brand name "Firefox"
-
 # can be used safely because this notification is shown only in Firefox [3.6, 4.0[
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-randomPersona=Choix aléatoire de %1$S > %2$S
+randomPersona=Atsitiktine tvarka %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-useRandomPersona=Choix aléatoire à partir de %S
+useRandomPersona=Atsitiktine tvarka %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Les données Persona ne sont pas encore disponibles. Veuillez vérifier votre connexion Internet et redémarrer %S ou essayer à nouveau dans quelques minutes.
+dataUnavailable=Kaukės duomenys nepasiekiami. Prašome patikrinti savo interneto ryšį ir pakartoti %S, arba pabandyti vėliau.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Choix d'un fichier
+backgroundPickerDialogTitle=Pasirinkti failą
diff --git a/extension/locale/lt-LT/preferences.dtd b/extension/locale/lt-LT/preferences.dtd
new file mode 100644
index 0000000..0f0917e
--- /dev/null
+++ b/extension/locale/lt-LT/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "Kaukių nustatymai">
+<!ENTITY generalSettings.label "Bendrai">
+<!ENTITY previewEnabled.label "Rodyti peržiūrą, kai pasirenkate iš meniu">
+<!ENTITY displaySettings.label "Rodyti">
+<!ENTITY useTextColor.label "Naudoti teksto spalvą">
+<!ENTITY useAccentColor.label "Naudoti skirtuko spalvą">
+<!ENTITY advancedSettings.label "Sudėtingiau">
+<!ENTITY showCustomMenu.label "Rodyti kauke pagal užsakyma meniu">
diff --git a/extension/locale/mk-MK/personas.properties b/extension/locale/mk-MK/personas.properties
index ea9b224..417b41f 100644
--- a/extension/locale/mk-MK/personas.properties
+++ b/extension/locale/mk-MK/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=За...
-popular=Нај популарни
-new=Нови и интересни
+featured= Featured
 recent=Мои скоро одбрани
-categories=Сите категории
 favorites=Мои омилени
 favoritesSignIn=Највете се за да пристапите до Вашите омилени
 viewDetail=Деталји...
 favoritesGoTo=Отвори ги моите омилени
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Основна
 unnamedPersona=Персона без име
 customPersona=Своја персона
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=Повеќе од %S...
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=%1$S Повеќе од %2$S...
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=Ја одбравте персоната "%1$S" од %2$S.
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=Врати
 notification.revertButton.accesskey=В
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Случаен избор од %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Случаен избор од %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas податоците не се достапни моментално. Проверрте ја вашата мрежна конекција и рестартијате го %S, или обидете се повторно за неколку минути.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Одберете датотека
diff --git a/extension/locale/nl-NL/preferences.dtd b/extension/locale/nl-NL/preferences.dtd
deleted file mode 100644
index 4bce81f..0000000
--- a/extension/locale/nl-NL/preferences.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY preferences.title "Personas voorkeuren">
-<!ENTITY generalSettings.label "Algemeen">
-<!ENTITY previewEnabled.label "Voorbeeld weergeven bij selecteren uit het menu">
-<!ENTITY displaySettings.label "Weergeven">
-<!ENTITY useTextColor.label "Tekstkleur gebruiken">
-<!ENTITY useAccentColor.label "Accentkleur gebruiken">
-<!ENTITY advancedSettings.label "Geavanceerd">
-<!ENTITY showCustomMenu.label "Aangepaste Persona in menu weergeven">
diff --git a/extension/locale/nl-NL/personas.dtd b/extension/locale/nl/personas.dtd
similarity index 67%
rename from extension/locale/nl-NL/personas.dtd
rename to extension/locale/nl/personas.dtd
index b1dadb5..f41b537 100644
--- a/extension/locale/nl-NL/personas.dtd
+++ b/extension/locale/nl/personas.dtd
@@ -1,8 +1,8 @@
 <!ENTITY personas_app_title "Personas">
 <!ENTITY useDefaultPersona.label "Standaard">
-<!ENTITY preferences.label "Voorkeuren…">
-<!ENTITY viewDirectory.label "Map tonen…">
-<!ENTITY customPersona.label "Eigen Persona">
+<!ENTITY preferences.label "Voorkeuren">
+<!ENTITY viewDirectory.label "Galerij bekijken">
+<!ENTITY customPersona.label "Eigen persona">
 <!ENTITY customName.label "Naam:">
 <!ENTITY header.label "Koptekst:">
 <!ENTITY selectBackground.label "Bladeren…">
@@ -11,10 +11,10 @@
 <!ENTITY accentColorPicker.label "Accentkleur:">
 <!ENTITY useDefaultColor.label "Standaard gebruiken">
 <!ENTITY okButton.label "OK">
-<!ENTITY contextHomePage.label "sTARTPAGINA">
+<!ENTITY contextHomePage.label "Startpagina">
 <!ENTITY contextPreferences.label "Instellingen">
 <!ENTITY contextEdit.label "Bewerken">
 <!ENTITY contextApply.label "Toepassen">
-<!ENTITY usePersona.label "Use Persona">
+<!ENTITY usePersona.label "Persona gebruiken">
 <!ENTITY usePersona.accesskey "P">
-<!ENTITY usePersona.tooltip "Use this Persona">
+<!ENTITY usePersona.tooltip "Deze persona gebruiken">
diff --git a/extension/locale/fr-FR/personas.properties b/extension/locale/nl/personas.properties
similarity index 63%
rename from extension/locale/fr-FR/personas.properties
rename to extension/locale/nl/personas.properties
index e23c04b..a27bf19 100644
--- a/extension/locale/fr-FR/personas.properties
+++ b/extension/locale/nl/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=À propos…
-popular=Les plus populaires
-new=Nouveaux
-recent=Choisis récemment
-categories=Par catégorie
-favorites=Favoris
-favoritesSignIn=Vous abonner pour accéder à vos favoris
-viewDetail=Détails…
-favoritesGoTo=Accéder à mes favoris…
+About= Over…
+featured= Aanbevolen
+recent= Onlangs geselecteerd
+favorites= Mijn favorieten
+favoritesSignIn= Meld u aan om naar uw favorieten te gaan
+viewDetail= Details bekijken…
+favoritesGoTo= Naar mijn favorieten…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Par défaut
-unnamedPersona=Persona sans nom
-customPersona=Persona personnalisé
+Default= Standaard
+unnamedPersona= Niet-benoemde persona
+customPersona= Eigen persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=D'autres de %S…
+viewDesigner= Meer van %S…
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S d'autres de %2$S…
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore= Meer van %1$S…
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Vous avez choisi le persona « %1$S » de %2$S
+notification.personaWasSelected= U hebt de persona “%1$S” van %2$S geselecteerd.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
-notification.revertButton.label=Annuler
-notification.revertButton.accesskey=u
+notification.revertButton.label= Ongedaan maken
+notification.revertButton.accesskey= O
 # The text of the notification shown when the browser needs to be restarted in
-
 # order to apply a persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+notification.restartToApply= Het huidige thema is niet compatibel met Personas. Herstart om toe te passen.
 # Strings used for the Restart button in the notification shown when the browser
-
 # needs to be restarted in order to apply a persona. The brand name "Firefox"
-
 # can be used safely because this notification is shown only in Firefox [3.6, 4.0[
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+notification.restartButton.label= Firefox herstarten
+notification.restartButton.accesskey= h
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-randomPersona=Choix aléatoire de %1$S > %2$S
+randomPersona= Willekeurige selectie uit %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-useRandomPersona=Choix aléatoire à partir de %S
+useRandomPersona= Willekeurige selectie uit %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Les données Persona ne sont pas encore disponibles. Veuillez vérifier votre connexion Internet et redémarrer %S ou essayer à nouveau dans quelques minutes.
+dataUnavailable= Personas-gegevens zijn nog niet beschikbaar. Controleer uw netwerkverbinding en herstart %S, of probeer het over enkele minuten opnieuw.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Choix d'un fichier
+backgroundPickerDialogTitle= Selecteer een bestand
diff --git a/extension/locale/nl/preferences.dtd b/extension/locale/nl/preferences.dtd
new file mode 100644
index 0000000..f1f7d52
--- /dev/null
+++ b/extension/locale/nl/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "Personas-voorkeuren">
+<!ENTITY generalSettings.label "Algemeen">
+<!ENTITY previewEnabled.label "Voorbeeld tonen bij selecteren vanuit menu">
+<!ENTITY displaySettings.label "Weergave">
+<!ENTITY useTextColor.label "Tekstkleur gebruiken">
+<!ENTITY useAccentColor.label "Accentkleur gebruiken">
+<!ENTITY advancedSettings.label "Geavanceerd">
+<!ENTITY showCustomMenu.label "Eigen persona’s inschakelen">
diff --git a/extension/locale/pl-PL/personas.properties b/extension/locale/pl-PL/personas.properties
index 2181e7f..f3c6f93 100644
--- a/extension/locale/pl-PL/personas.properties
+++ b/extension/locale/pl-PL/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Minimotywy – informacje…
-popular=Najpopularniejsze
-new=Nowe i polecane
+featured=Polecane
 recent=Ostatnio używane
-categories=Wszystkie
 favorites=Ulubione
 favoritesSignIn=Zaloguj się, aby uzyskać dostęp do ulubionych motywów
 viewDetail=Wyświetl szczegóły…
 favoritesGoTo=Przejdź do ulubionych…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Domyślny minimotyw
 unnamedPersona=Motyw bez nazwy
 customPersona=Prywatny minimotyw
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=Więcej autorstwa %S…
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=Pozostałe %1$S z kategorii %2$S…
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=Wybrano minimotyw „%1$S” autorstwa %2$S.
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=Cofnij
 notification.revertButton.accesskey=C
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
+notification.restartToApply=The current theme is incompatible with Personas. Restart to apply.
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
+notification.restartButton.label=Restart Firefox
+notification.restartButton.accesskey=R
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 randomPersona=Losowy wybór z kategorii %1$S » %2$S
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Losowy wybór z kategorii %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Dane motywu są niedostępne. Sprawdź połączenie sieciowe i uruchom ponownie program %S lub spróbuj jeszcze raz za kilka minut.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Wybierz plik
diff --git a/extension/locale/pl/personas.dtd b/extension/locale/pl/personas.dtd
new file mode 100644
index 0000000..a519e9a
--- /dev/null
+++ b/extension/locale/pl/personas.dtd
@@ -0,0 +1,20 @@
+<!ENTITY personas_app_title "Minimotywy">
+<!ENTITY useDefaultPersona.label "Domyślny motyw">
+<!ENTITY preferences.label "Ustawienia…">
+<!ENTITY viewDirectory.label "Wyświetl galerię">
+<!ENTITY customPersona.label "Prywatny minimotyw">
+<!ENTITY customName.label "Nazwa:">
+<!ENTITY header.label "Nagłówek:">
+<!ENTITY selectBackground.label "Przeglądaj…">
+<!ENTITY footer.label "Stopka:">
+<!ENTITY textColorPicker.label "Kolor tekstu:">
+<!ENTITY accentColorPicker.label "Kolor akcentu:">
+<!ENTITY useDefaultColor.label "Domyślny">
+<!ENTITY okButton.label "OK">
+<!ENTITY contextHomePage.label "Strona domowa">
+<!ENTITY contextPreferences.label "Ustawienia">
+<!ENTITY contextEdit.label "Edytuj">
+<!ENTITY contextApply.label "Zastosuj">
+<!ENTITY usePersona.label "Użyj minimotywu">
+<!ENTITY usePersona.accesskey "m">
+<!ENTITY usePersona.tooltip "Użyj tego minimotywu">
diff --git a/extension/locale/pl-PL/personas.properties b/extension/locale/pl/personas.properties
similarity index 90%
copy from extension/locale/pl-PL/personas.properties
copy to extension/locale/pl/personas.properties
index 2181e7f..3e035bd 100644
--- a/extension/locale/pl-PL/personas.properties
+++ b/extension/locale/pl/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Minimotywy – informacje…
-popular=Najpopularniejsze
-new=Nowe i polecane
+featured=Polecane
 recent=Ostatnio używane
-categories=Wszystkie
 favorites=Ulubione
 favoritesSignIn=Zaloguj się, aby uzyskać dostęp do ulubionych motywów
 viewDetail=Wyświetl szczegóły…
 favoritesGoTo=Przejdź do ulubionych…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Domyślny minimotyw
 unnamedPersona=Motyw bez nazwy
 customPersona=Prywatny minimotyw
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=Więcej autorstwa %S…
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=Pozostałe %1$S z kategorii %2$S…
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=Wybrano minimotyw „%1$S” autorstwa %2$S.
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=Cofnij
 notification.revertButton.accesskey=C
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
+notification.restartToApply=Aktualny motyw nie jest kompatybilny z rozszerzeniem Personas. Aby zatwierdzić, uruchom ponownie.
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
+notification.restartButton.label=Uruchom ponownie przeglądarkę
+notification.restartButton.accesskey=U
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 randomPersona=Losowy wybór z kategorii %1$S » %2$S
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Losowy wybór z kategorii %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Dane motywu są niedostępne. Sprawdź połączenie sieciowe i uruchom ponownie program %S lub spróbuj jeszcze raz za kilka minut.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Wybierz plik
diff --git a/extension/locale/pl/preferences.dtd b/extension/locale/pl/preferences.dtd
new file mode 100644
index 0000000..60cafb8
--- /dev/null
+++ b/extension/locale/pl/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "Minimotywy – ustawienia">
+<!ENTITY generalSettings.label "Ogólne">
+<!ENTITY previewEnabled.label "Wyświetlaj podgląd po wskazaniu motywu">
+<!ENTITY displaySettings.label "Wyświetlanie">
+<!ENTITY useTextColor.label "Zezwalaj na zmianę koloru tekstu">
+<!ENTITY useAccentColor.label "Zezwalaj na zmianę koloru akcentu">
+<!ENTITY advancedSettings.label "Zaawansowane">
+<!ENTITY showCustomMenu.label "Wyświetlaj w menu element „Prywatny minimotyw”">
diff --git a/extension/locale/pt-BR/personas.properties b/extension/locale/pt-BR/personas.properties
index 6803a3e..b44dc30 100644
--- a/extension/locale/pt-BR/personas.properties
+++ b/extension/locale/pt-BR/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Sobre…
-popular=Mais populares
-new=Novas
+featured=Em destaque
 recent=Selecionadas recentemente
-categories=Por categoria
 favorites=Favoritos
 favoritesSignIn=Conecte-se para acessar seus favoritos
 viewDetail=Ver detalhes…
 favoritesGoTo=Ir para Favoritas…
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Padrão
 unnamedPersona=Persona sem nome
 customPersona=Persona personalizada
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Mais personas de %S…
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=Mais %1$S personas de %2$S…
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Você selecionou a persona "%1$S" de %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Desfazer
 notification.revertButton.accesskey=Z
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
+notification.restartToApply=The current theme is incompatible with Personas. Restart to apply.
 # randomly-selected persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
+notification.restartButton.label=Restart Firefox
+notification.restartButton.accesskey=R
 # f.e. "Random Selection from Scenery > Yosemite"
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Seleção aleatória de %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Seleção aleatória na categoria %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=As Personas ainda não estão disponíveis. Por favor, verifique sua conexão de rede e reinicie o %S, ou tente novamente após alguns minutos.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Selecionar arquivo
diff --git a/extension/locale/ro-RO/preferences.dtd b/extension/locale/ro-RO/preferences.dtd
deleted file mode 100644
index 22cf33a..0000000
--- a/extension/locale/ro-RO/preferences.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY preferences.title "Opţiuni">
-<!ENTITY generalSettings.label "General">
-<!ENTITY previewEnabled.label "Vizualizează tema la selectarea din meniu">
-<!ENTITY displaySettings.label "Afişare">
-<!ENTITY useTextColor.label "Foloseşte text colorat">
-<!ENTITY useAccentColor.label "Foloseşte evidenţiere colorată">
-<!ENTITY advancedSettings.label "Complex">
-<!ENTITY showCustomMenu.label "Afişează tema personalizată în meniu">
diff --git a/extension/locale/ro-RO/personas.dtd b/extension/locale/ro/personas.dtd
similarity index 56%
rename from extension/locale/ro-RO/personas.dtd
rename to extension/locale/ro/personas.dtd
index 9c7568b..39b1097 100644
--- a/extension/locale/ro-RO/personas.dtd
+++ b/extension/locale/ro/personas.dtd
@@ -1,20 +1,20 @@
 <!ENTITY personas_app_title "Personas">
 <!ENTITY useDefaultPersona.label "Predefinită">
-<!ENTITY preferences.label "Opţiuni">
+<!ENTITY preferences.label "Opțiuni">
 <!ENTITY viewDirectory.label "Vizualizează galeria">
 <!ENTITY customPersona.label "Personalizare temă">
 <!ENTITY customName.label "Denumire:">
 <!ENTITY header.label "Antet:">
-<!ENTITY selectBackground.label "Răsfoieşte...">
+<!ENTITY selectBackground.label "Răsfoiește...">
 <!ENTITY footer.label "Subsol:">
 <!ENTITY textColorPicker.label "Culoare text:">
-<!ENTITY accentColorPicker.label "Culoare evidenţiere:">
-<!ENTITY useDefaultColor.label "Iniţializează">
-<!ENTITY okButton.label "Ieşire">
-<!ENTITY contextHomePage.label "Pagină iniţială">
+<!ENTITY accentColorPicker.label "Culoare evidențiere:">
+<!ENTITY useDefaultColor.label "Inițializează">
+<!ENTITY okButton.label "Ieșire">
+<!ENTITY contextHomePage.label "Pagină inițială">
 <!ENTITY contextPreferences.label "Configurare">
 <!ENTITY contextEdit.label "Editează">
 <!ENTITY contextApply.label "Aplică">
-<!ENTITY usePersona.label "Foloseşte tema">
+<!ENTITY usePersona.label "Folosește tema">
 <!ENTITY usePersona.accesskey "F">
-<!ENTITY usePersona.tooltip "Foloseşte această temă">
+<!ENTITY usePersona.tooltip "Folosește această temă">
diff --git a/extension/locale/ro-RO/personas.properties b/extension/locale/ro/personas.properties
similarity index 85%
rename from extension/locale/ro-RO/personas.properties
rename to extension/locale/ro/personas.properties
index 25a34b0..04dc282 100644
--- a/extension/locale/ro-RO/personas.properties
+++ b/extension/locale/ro/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Despre...
-popular=Cele mai populare
-new=Noi şi recomandate
+featured=Recomandat
 recent=Recent selectate
-categories=Toate
 favorites=Favorite
 favoritesSignIn=Abonare pentru accesul la favorite...
 viewDetail=Vezi detalii...
-favoritesGoTo=Afişează favoritele
+favoritesGoTo=Afișează favoritele
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Temă predefinită
 unnamedPersona=Temă nedenumită
 customPersona=Temă personalizată
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Mai multe de la %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=Încă %1$S de la %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
+notification.personaWasSelected=Ați selectat tema "%1$S" de la %2$S.
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Aţi selectat tema "%1$S" de la %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Anulează
 notification.revertButton.accesskey=u
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
+notification.restartToApply=Tema curentă este incompatibilă cu Personas. Reporniți navigatorul pentru folosirea ei.
 # randomly-selected persona.
-
-notification.restartToApply=Tema curentă este incompatibilă cu Personas. Reporniţi navigatorul pentru folosirea ei.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
-notification.restartButton.label=Reporneşte Firefox
+notification.restartButton.label=Repornește Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Seleactează aleator de la %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Seleactează aleator de la %1$S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
+dataUnavailable=Datele despre Personas nu sunt disponibile momentan. Verificați conexiunea la rețea și reporniți %S sau reîncercați peste câteva minute.
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Datele despre Personas nu sunt disponibile momentan. Verificaţi conexiunea la reţea şi reporniţi %S sau reîncercaţi peste câteva minute.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Selectare fişier
+backgroundPickerDialogTitle=Selectare fișier
diff --git a/extension/locale/ro/preferences.dtd b/extension/locale/ro/preferences.dtd
new file mode 100644
index 0000000..d3ac0ab
--- /dev/null
+++ b/extension/locale/ro/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "Opțiuni">
+<!ENTITY generalSettings.label "General">
+<!ENTITY previewEnabled.label "Vizualizează tema la selectarea din meniu">
+<!ENTITY displaySettings.label "Afișare">
+<!ENTITY useTextColor.label "Folosește text colorat">
+<!ENTITY useAccentColor.label "Folosește evidențiere colorată">
+<!ENTITY advancedSettings.label "Complex">
+<!ENTITY showCustomMenu.label "Afișează tema personalizată în meniu">
diff --git a/extension/locale/ru-RU/personas.properties b/extension/locale/ru-RU/personas.properties
index f715d12..2b3e7d6 100644
--- a/extension/locale/ru-RU/personas.properties
+++ b/extension/locale/ru-RU/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=О Personas...
-popular=Популярные
-new=Новые и рекомендуемые
+featured= Featured
 recent=Недавно выбранные
-categories=Все
 favorites=Избранное
 favoritesSignIn=Войдите для просмотра Избранного
 viewDetail=Данные...
 favoritesGoTo=Перейти к Избранному...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=По умолчанию
 unnamedPersona=Скин без имени
 customPersona=Скин пользователя
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Ещё темы от %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S Ещё темы от %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Выбран скин "%1$S" от %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Отменить
 notification.revertButton.accesskey=О
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Случайный выбор из %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Случайный выбор из %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Данные Personas не доступны. Проверьте подключение к Интернету и перезапустите %S или попробуйте снова через несколько минут.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Выберите файл
diff --git a/extension/locale/si-LK/personas.dtd b/extension/locale/si-LK/personas.dtd
new file mode 100644
index 0000000..168d181
--- /dev/null
+++ b/extension/locale/si-LK/personas.dtd
@@ -0,0 +1,20 @@
+<!ENTITY personas_app_title "පුද්ගල සැකසුම">
+<!ENTITY useDefaultPersona.label "සාමාන්‍ය">
+<!ENTITY preferences.label "අභිමත">
+<!ENTITY viewDirectory.label "ගැලරිය පෙන්වන්න">
+<!ENTITY customPersona.label "සකස් කරන්න ලද පුද්ගල සැකසුම">
+<!ENTITY customName.label "නම">
+<!ENTITY header.label "ශීර්ෂකය">
+<!ENTITY selectBackground.label "තෝරන්න..">
+<!ENTITY footer.label "පාද තලය">
+<!ENTITY textColorPicker.label "අකුරු වල වර්ණය">
+<!ENTITY accentColorPicker.label "ගැඹුරු වර්ණ">
+<!ENTITY useDefaultColor.label "සාමාන්‍ය පුද්ගල සැකසුම භාවිතා කරන්න">
+<!ENTITY okButton.label "හරි">
+<!ENTITY contextHomePage.label "මුල් පිටුව">
+<!ENTITY contextPreferences.label "සැකසුම්">
+<!ENTITY contextEdit.label "වෙනස් කරන්න">
+<!ENTITY contextApply.label "යොදන්න">
+<!ENTITY usePersona.label "Use Persona">
+<!ENTITY usePersona.accesskey "P">
+<!ENTITY usePersona.tooltip "Use this Persona">
diff --git a/extension/locale/nl-NL/personas.properties b/extension/locale/si-LK/personas.properties
similarity index 52%
rename from extension/locale/nl-NL/personas.properties
rename to extension/locale/si-LK/personas.properties
index d0d9e39..caee77b 100644
--- a/extension/locale/nl-NL/personas.properties
+++ b/extension/locale/si-LK/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=Over…
-popular=Populairst
-new=Nieuw & aanbevolen
-recent=Recent geselecteerd
-categories=Alles
-favorites=Mijn favorieten
-favoritesSignIn=Meld u aan om naar uw favorieten te gaan
-viewDetail=Details bekijken…
-favoritesGoTo=Ga naar mijn favorieten...
+About=මෙම ඇඩෝනය පිළිබඳව ...
+featured= Featured
+recent=මැතකදී තොරාගත්
+favorites=මම වඩාත් කැමති
+favoritesSignIn=ඔබ කැමති පුද්ගල සැකසුම තොරා ගැනීමට ඔබගේ ගිණුමට පිවිසෙන්න
+viewDetail=තොරතුරු පෙන්වන්න
+favoritesGoTo=මා කැමති පුද්ගල සැකසුම් පෙන්වන්න
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Standaard
-unnamedPersona=Niet benoemde Persona
-customPersona=Aangepaste Persona
+Default=සමාන්‍ය ආකාරය
+unnamedPersona=නම් නොකළ පුද්ගල සැකසුම
+customPersona=සකස් කරන්න ලද පුද්ගල සැකසුම
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=Meer van %S…
+viewDesigner=වැඩියෙන්... %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=Nog %1$S van %2$S…
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore=%1$S වැඩියෙන් %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=U selecteerde de persona "%1$S" van %2$S.
+notification.personaWasSelected=ඔබ තෝරන ලද පුද්ගල සැකසුම "%1$S" by %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
-notification.revertButton.label=Ongedaan maken
-notification.revertButton.accesskey=O
+notification.revertButton.label=නැවත පෙර සැකසුමට
+notification.revertButton.accesskey=U
+# The text of the notification shown when the browser needs to be restarted in
+# order to apply a persona.
+notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# Strings used for the Restart button in the notification shown when the browser
+# needs to be restarted in order to apply a persona. The brand name "Firefox"
+# can be used safely because this notification is shown only in Firefox [3.6, 4.0[
+notification.restartButton.label= Restart Firefox
+notification.restartButton.accesskey= R
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+randomPersona=අහඹු ලෙස තෝරාගත් %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
+useRandomPersona=අහඹු ලෙස තෝරාගත් %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-randomPersona=Willekeurige selectie uit %1$S > %2$S
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
-useRandomPersona=Willekeurige selectie uit %S
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Personagegevens zijn nog niet beschikbaar. Controleer a.u.b. uw netwerkverbinding en start %S opnieuw op, of probeer het over een paar minuten nog eens.
+dataUnavailable=පුද්ගල සැකසුම් දත්ත නොමැත. ඔබගේ ජාලය පරීක්ෂා කර හෝ මිනිත්තු කිහිපයකින් නැවත පරීක්ෂා කරන්න
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-backgroundPickerDialogTitle=Selecteer een bestand
+backgroundPickerDialogTitle=ගොනුවක් තෝරන්න
diff --git a/extension/locale/si-LK/preferences.dtd b/extension/locale/si-LK/preferences.dtd
new file mode 100644
index 0000000..dc41bd8
--- /dev/null
+++ b/extension/locale/si-LK/preferences.dtd
@@ -0,0 +1,8 @@
+<!ENTITY preferences.title "පුද්ගල සැකසුමේ අභිමත">
+<!ENTITY generalSettings.label "සාමාන්‍ය">
+<!ENTITY previewEnabled.label "මෙනු මගින් සැකසීමේදී  පූර්වදර්ශනයක් කරන්න">
+<!ENTITY displaySettings.label "සංදර්ශකය">
+<!ENTITY useTextColor.label "සරල වර්ණ භාවිතා කරන්න">
+<!ENTITY useAccentColor.label "ගැඹුරු වර්ණ භාවිතා කරන්න">
+<!ENTITY advancedSettings.label "දියුණු">
+<!ENTITY showCustomMenu.label "තමාගේම පුද්ගල සැකසුම් මෙනුවේ පෙන්වන්න">
diff --git a/extension/locale/sk-SK/personas.properties b/extension/locale/sk-SK/personas.properties
index 9d01073..c81fe2a 100644
--- a/extension/locale/sk-SK/personas.properties
+++ b/extension/locale/sk-SK/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=O rozšírení...
-popular=Najpopulárnejšie
-new=Nové a odporúčané
+featured= Featured
 recent=Najčastejšie vybrané
-categories=Všetky
 favorites=Moje obľúbené
 favoritesSignIn=Na zobrazenie obľúbených sa musíte prihlásiť
 viewDetail=Zobraziť podrobnosti...
 favoritesGoTo=Prejsť na Moje obľúbené...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Predvolená
 unnamedPersona=Téma bez názvu
 customPersona=Vlastná téma
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas 
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Viac od %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=Ďalších %1$S tém od %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # Strings used in the notification shown when a Persona is selected for the first time.
-
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
-#   %1$S = the category to which the persona belongs
-
 notification.personaWasSelected=Zvolili ste tému Persona "%1$S" id %2$S.
+#   %1$S = the category to which the persona belongs
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.revertButton.label=Vrátiť späť
 notification.revertButton.accesskey=V
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 randomPersona=Náhodne vybrať tému z %1$S > %2$S
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Náhodne vybrať tému z %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Údaje o témach Personas nie sú dostupné. Prosím, skontrolujte sieťové pripojenie a reštartujte %S alebo to skúste opäť neskôr.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Výber súboru
diff --git a/extension/locale/sr-RS/personas.dtd b/extension/locale/sr/personas.dtd
similarity index 52%
rename from extension/locale/sr-RS/personas.dtd
rename to extension/locale/sr/personas.dtd
index fb2bff9..a2d7d86 100644
--- a/extension/locale/sr-RS/personas.dtd
+++ b/extension/locale/sr/personas.dtd
@@ -1,20 +1,20 @@
-<!ENTITY personas_app_title "Personas">
+<!ENTITY personas_app_title "Одела">
 <!ENTITY useDefaultPersona.label "Подразумевана">
 <!ENTITY preferences.label "Подешавања...">
-<!ENTITY viewDirectory.label "Прикажи деректоријум...">
-<!ENTITY customPersona.label "Прилагођена персона">
-<!ENTITY customName.label "Име:">
+<!ENTITY viewDirectory.label "Прикажи галерију...">
+<!ENTITY customPersona.label "Прилагођено одело">
+<!ENTITY customName.label "Назив:">
 <!ENTITY header.label "Заглавље:">
-<!ENTITY selectBackground.label "Претражи...">
-<!ENTITY footer.label "Поглавље:">
+<!ENTITY selectBackground.label "Прегледај...">
+<!ENTITY footer.label "Заглавље:">
 <!ENTITY textColorPicker.label "Боја текста:">
 <!ENTITY accentColorPicker.label "Боја нагласка:">
 <!ENTITY useDefaultColor.label "Користи подразумевану">
 <!ENTITY okButton.label "У реду">
 <!ENTITY contextHomePage.label "Матична страна">
 <!ENTITY contextPreferences.label "Подешавања">
-<!ENTITY contextEdit.label "Измени">
+<!ENTITY contextEdit.label "Уреди">
 <!ENTITY contextApply.label "Примени">
-<!ENTITY usePersona.label "Use Persona">
-<!ENTITY usePersona.accesskey "P">
-<!ENTITY usePersona.tooltip "Use this Persona">
+<!ENTITY usePersona.label "Користи одело">
+<!ENTITY usePersona.accesskey "О">
+<!ENTITY usePersona.tooltip "Користи ово одело">
diff --git a/extension/locale/sr-RS/personas.properties b/extension/locale/sr/personas.properties
similarity index 56%
rename from extension/locale/sr-RS/personas.properties
rename to extension/locale/sr/personas.properties
index 58f4780..3057c1a 100644
--- a/extension/locale/sr-RS/personas.properties
+++ b/extension/locale/sr/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
-About=О...
-popular=Најпопуларније
-new=Нове
-recent=Недавно изабране
-categories=По категорији
-favorites=Омиљене
-favoritesSignIn=Пријавите се да бисте приступили вашим омиљенима
+About=О додатку...
+featured=Истакнута
+recent=Моја недавно изабрана
+favorites=Моја омиљена
+favoritesSignIn=Пријавите се да бисте приступили својим омиљеним оделима
 viewDetail=Прикажи детаље...
-favoritesGoTo=Иди до мојих фаворита...
+favoritesGoTo=Иди до мојих омиљених одела...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
-Default=Подразумевана
-unnamedPersona=Неименована персона
-customPersona=Прилагођена персона
+Default=Подразумевано
+unnamedPersona=Неименовано одело
+customPersona=Прилагођено одело
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
-viewDesigner=Још од %S...
+viewDesigner=Још одела аутора %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
-viewMore=%1$S још од %2$S...
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
+viewMore=Још %1$S аутора %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
-notification.personaWasSelected=Иѕабрали сте персону "%1$S" од %2$S.
+notification.personaWasSelected=Изабрали сте одело „%1$S” аутора %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
-notification.revertButton.label=Поништи
-notification.revertButton.accesskey=П
+notification.revertButton.label=Опозови
+notification.revertButton.accesskey=О
+# The text of the notification shown when the browser needs to be restarted in
+# order to apply a persona.
+notification.restartToApply=Тренутна тема није подударна са Оделима. Поново покрените да бисте је применили.
+# Strings used for the Restart button in the notification shown when the browser
+# needs to be restarted in order to apply a persona. The brand name "Firefox"
+# can be used safely because this notification is shown only in Firefox [3.6, 4.0[
+notification.restartButton.label=Поново покрени Фајерфокс
+notification.restartButton.accesskey=П
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
-notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
-notification.restartButton.label= Restart Firefox
-notification.restartButton.accesskey= R
+randomPersona=Насумично бирај из %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
+useRandomPersona=Насумично бирај из %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-randomPersona=Насумично бирај из %1$S > %2$S
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
-useRandomPersona=Насумично бирај из %S
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
-# be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-dataUnavailable=Personas подаци нису доступни. Молим вас проверите вашу везу и поново покрените %S, или покушајте поново после неколико минута.
+dataUnavailable=Подаци о оделима нису доступни. Проверите своју мрежну везу и поново покрените %S или покушајте поново после неколико минута.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Изабери датотеку
diff --git a/extension/locale/sr-RS/preferences.dtd b/extension/locale/sr/preferences.dtd
similarity index 70%
rename from extension/locale/sr-RS/preferences.dtd
rename to extension/locale/sr/preferences.dtd
index 882afbc..beafd71 100644
--- a/extension/locale/sr-RS/preferences.dtd
+++ b/extension/locale/sr/preferences.dtd
@@ -1,8 +1,8 @@
-<!ENTITY preferences.title "Personas подешавања">
+<!ENTITY preferences.title "Подешавања Одела">
 <!ENTITY generalSettings.label "Општа">
 <!ENTITY previewEnabled.label "Прикажи преглед приликом бирања из менија">
 <!ENTITY displaySettings.label "Приказ">
 <!ENTITY useTextColor.label "Користи боју текста">
 <!ENTITY useAccentColor.label "Користи боју нагласка">
 <!ENTITY advancedSettings.label "Напредно">
-<!ENTITY showCustomMenu.label "Прикажи Прилагођену персону у менију">
+<!ENTITY showCustomMenu.label "Прикажи „Прилагођено одело” у менију">
diff --git a/extension/locale/sv-SE/personas.properties b/extension/locale/sv-SE/personas.properties
index 6b42565..ed06d15 100644
--- a/extension/locale/sv-SE/personas.properties
+++ b/extension/locale/sv-SE/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Om...
-popular=Mest Populär
-new=Nya och Featured
+featured= Featured
 recent=Nyligen valda
-categories=Alla
 favorites=Favoriter
 favoritesSignIn=Logga in för att se dina favoriter
 viewDetail=Se Detaljer
 favoritesGoTo=Visa Mina Favoriter
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Standard
 unnamedPersona=Namnlös Persona
 customPersona=Anpassad Persona
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Mer från $S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=%1$S Mer från %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Du valde persona "%1$S" av %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=Ångra
 notification.revertButton.accesskey=U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=Det aktuella temat är oförenligt med Personas. Starta om för att tillämpa.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=Starta om Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=Slumpmässigt urval från %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=Slumpmässigt urval från %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas data är inte tillgänglig än. Kontrollera din nätverksanslutning och starta om %S, eller försök igen om några minuter.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Välj en fil
diff --git a/extension/locale/tr-TR/personas.dtd b/extension/locale/tr/personas.dtd
similarity index 100%
rename from extension/locale/tr-TR/personas.dtd
rename to extension/locale/tr/personas.dtd
diff --git a/extension/locale/tr-TR/personas.properties b/extension/locale/tr/personas.properties
similarity index 95%
rename from extension/locale/tr-TR/personas.properties
rename to extension/locale/tr/personas.properties
index 0844f93..a61c57a 100644
--- a/extension/locale/tr-TR/personas.properties
+++ b/extension/locale/tr/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Hakkında...
-popular=En Popüler
-new=Yeni
+featured= Featured
 recent=Son Seçilen
-categories=Kategoriye Göre
 favorites= Favorites
 favoritesSignIn= Sign In to Access Your Favorites
 viewDetail= View Details...
 favoritesGoTo= Go to My Favorites...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Varsayılan
 unnamedPersona=Adlandırılmamış Kişi
 customPersona=Varsayılan Kişi
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner= More from %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore= %1$S More from %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected= You selected the persona "%1$S" by %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label= Undo
 notification.revertButton.accesskey= U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=%1$S > %2$S arasında Rastgele Seçim
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=%S'dan itibaren rastgele seçim
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas verisi şu anda uygun değil. İnternet bağlantınızı kontrol edin ve %S'u yeniden başlatın, ya da birkaç dakika içinde yeniden deneyin.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Bir Belge Seçin
diff --git a/extension/locale/tr-TR/preferences.dtd b/extension/locale/tr/preferences.dtd
similarity index 100%
rename from extension/locale/tr-TR/preferences.dtd
rename to extension/locale/tr/preferences.dtd
diff --git a/extension/locale/uk-UA/personas.properties b/extension/locale/uk-UA/personas.properties
index 330e410..9615fb7 100644
--- a/extension/locale/uk-UA/personas.properties
+++ b/extension/locale/uk-UA/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About= Про Персони...
-popular= Найпопулярніші
-new= Нові та розрекламовіні
+featured= Featured
 recent= Нещодавно вибрані мною
-categories= Всі
 favorites= Мої улюблені
 favoritesSignIn= Увійти для доступу в свої улюблені
 viewDetail= Переглянути типові...
 favoritesGoTo= Перейти до моїх улюблених...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default= Типові
 unnamedPersona= Персони без імені
 customPersona= Налаштовані Персони
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner= Більше з %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore= %1$S Більше з %2$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected= Ви вибрали Персону "%1$S" від %2$S.
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label= Відмінити
 notification.revertButton.accesskey= U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona= Випадковий вибір з %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona= Випадковий вибір з %S
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable= Дані з Персони поки що недоступні. Будь-ласка перевірте своє мережеве підключення і перезапустіть %S, або спробуйте через декілька хвилин.
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle= Вибрати файл
diff --git a/extension/locale/vi-VN/personas.dtd b/extension/locale/vi/personas.dtd
similarity index 100%
rename from extension/locale/vi-VN/personas.dtd
rename to extension/locale/vi/personas.dtd
diff --git a/extension/locale/vi-VN/personas.properties b/extension/locale/vi/personas.properties
similarity index 91%
rename from extension/locale/vi-VN/personas.properties
rename to extension/locale/vi/personas.properties
index 2289bec..4fd61f3 100644
--- a/extension/locale/vi-VN/personas.properties
+++ b/extension/locale/vi/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=Giới thiệu…
-popular=Phổ biến Nhất
-new=Mới & Khuyên dùng
+featured= Featured
 recent=Được chọn Gần đây
-categories=Tất cả
 favorites=Ưa thích
 favoritesSignIn=Đăng nhập để Truy cập Giao diện Ưa thích của Bạn
 viewDetail=Xem chi tiết...
 favoritesGoTo=Vào Danh mục Ưa thích của Tôi...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=Mặc định
 unnamedPersona=Persona Không tên
 customPersona=Persona Tùy biến
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=Cái khác của %S...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
-# page on getpersonas.com for this specific category.
-
-#  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
+# page on addons.mozilla.org for this specific category.
+#  %1$S = the name of the category (e.g. Music)
 viewMore=%1$S cái khác trong %2$S...
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
 #  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=Bạn đã chọn persona "%1$S" của %2$S.
 # Strings used for the Undo button in the notification shown when a persona
-
 # is selected for the first time.
-
 notification.revertButton.label=Hoàn tác
 notification.revertButton.accesskey=H
 # The text of the notification shown when the browser needs to be restarted in
-
 # order to apply a persona.
-
 notification.restartToApply= The current theme is incompatible with Personas. Restart to apply.
 # Strings used for the Restart button in the notification shown when the browser
-
 # needs to be restarted in order to apply a persona. The brand name "Firefox"
-
 # can be used safely because this notification is shown only in Firefox [3.6, 4.0[
-
 notification.restartButton.label= Restart Firefox
 notification.restartButton.accesskey= R
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 randomPersona=Lựa chọn Ngẫu nhiên từ %1$S > %2$S
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 useRandomPersona=Lựa chọn Ngẫu nhiên từ %S
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Dữ liệu Personas không có. Vui lòng kiểm tra kết nối mạng và khởi động lại %S, hoặc đợi vài phút rồi thử lại.
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=Chọn một Tập tin
diff --git a/extension/locale/vi-VN/preferences.dtd b/extension/locale/vi/preferences.dtd
similarity index 100%
rename from extension/locale/vi-VN/preferences.dtd
rename to extension/locale/vi/preferences.dtd
diff --git a/extension/locale/zh-CN/personas.properties b/extension/locale/zh-CN/personas.properties
index 40825fe..eef5852 100644
--- a/extension/locale/zh-CN/personas.properties
+++ b/extension/locale/zh-CN/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=关于...
-popular=最流行的
-new=新增
+featured=精选
 recent=最近选择
-categories=按类别
 favorites=收藏
 favoritesSignIn=登录访问你的收藏
 viewDetail=查看详情...
 favoritesGoTo=转到我的收藏
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=默认
 unnamedPersona=未命名的风格
 customPersona=自定义风格
 # LOCALIZATION NOTE (viewDesigner): a label that indicates the name of the designer
-
 # of the current persona as part of a link to more personas
-
 #  $@ = the name of the designer of the current persona
-
 viewDesigner=来自 %S 的更多作品...
 # LOCALIZATION NOTE (viewMore): the label of a command that will load the gallery
-
 # page on getpersonas.com for this specific category.
-
 #  %1$S = number of additional personas in this category available on the site (e.g. 1,542)
-
-#  %2$2 = the name of the category (e.g. Music)
-
 viewMore=来自 %2$S 的更多 %1$S...
+#  %2$2 = the name of the category (e.g. Music)
 # LOCALIZATION NOTE (notification.personaWasSelected): the text
-
 # of the notification shown when a persona is selected for the first time.
-
 #  %1$S = the name of the persona (f.e. Groovy Blue)
-
-#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
-
 notification.personaWasSelected=你选择了 %2$S 制作的炫彩风格 “ %1$S ”。
+#  %2$2 = the name of the author of the persona (f.e. Lee.Tom)
 # Strings used for the Undo button in the notification shown when a persona
-
-# is selected for the first time.
-
 notification.revertButton.label=撤销
 notification.revertButton.accesskey=U
+# is selected for the first time.
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
-# randomly-selected persona.
-
 notification.restartToApply=当前主题与炫彩风格不兼容。重新启动才能生效。
+# randomly-selected persona.
 #   %1$S = the category to which the persona belongs
-
 #   %2$S = the name of the persona
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=重新启动 Firefox
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=从 %1$S > %2$S 随机选择
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=从 %S 随机选择
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=尚无可用的风格数据。请检查你的网络连接并重新启动 %S。或者几分钟后再试。
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=选择一个文件
diff --git a/extension/locale/zh-TW/personas.properties b/extension/locale/zh-TW/personas.properties
index ddfc652..1f7da4f 100644
--- a/extension/locale/zh-TW/personas.properties
+++ b/extension/locale/zh-TW/personas.properties
@@ -1,102 +1,60 @@
 # The labels of various items in the personas menu.
-
 About=關於...
-popular=最受歡迎
-new=最新
+featured= Featured
 recent=最近使用
-categories=分類
 favorites=我的最愛
 favoritesSignIn=登入我的最愛
 viewDetail=檢視細節...
 favoritesGoTo=到我的最愛...
 # Labels that identify the current persona when the current persona is either
-
 # the default persona, a persona that doesn't have a name, or a custom persona
-
 # that doesn't have a name.
-
 Default=預設值
 unnamedPersona=未命名的 Persona
 customPersona=自訂 Persona
 # LOCALIZATION NOTE (randomPersona): a label that identifies the current
-
 # randomly-selected persona.
-
 #   %1$S = the category to which the persona belongs
-
 viewDesigner=更多來自 "%S" 的作品...
 #   %2$S = the name of the persona
-
 # f.e. "Random Selection from Scenery > Yosemite"
-
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
-# a category from which to pick random personas.
-
 viewMore=還有 %1$S 項作品來自 "%2$S"...
+# a category from which to pick random personas.
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
 # LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
-# when a user hovers over a Personas menu that we can't yet generate because
-
 notification.personaWasSelected=您將套用由 "%2$S" 提供的Persona "%1$S" 。
+# when a user hovers over a Personas menu that we can't yet generate because
 # we don't yet have the data we need to generate the menu.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 notification.revertButton.label=取消
 notification.revertButton.accesskey=U
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
-# from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 notification.restartToApply=目前的主題不相容於 Personas。 重新啟動後套用。
+# from the custom persona editor (customPersonaEditor.xul).  It should probably
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-# f.e. "Random Selection from Scenery > Yosemite"
-
 notification.restartButton.label=重新啟動火狐
 notification.restartButton.accesskey=R
+# f.e. "Random Selection from Scenery > Yosemite"
 # LOCALIZATION NOTE (useRandomPersona): the label of a command that selects
-
 # a category from which to pick random personas.
-
 #   %S = the category from which to pick random personas
-
 # f.e. "Random Selection from Scenery"
-
-# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
-
 randomPersona=隨機選擇從 %1$S > %2$S
+# LOCALIZATION NOTE (dataUnavailable): the content of a tooltip that shows up
 # when a user hovers over a Personas menu that we can't yet generate because
-
 # we don't yet have the data we need to generate the menu.
-
 #   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
-# The title of the dialog for picking a header or footer background image
-
 useRandomPersona=隨機選擇從 "%S"
+# The title of the dialog for picking a header or footer background image
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
 # translated it in this one, we'll leave it here for now.
-
-#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
-
 dataUnavailable=Personas 資料無法取得。請檢查您的網路連線並重新啟動 %S，或是稍等幾分鐘後再試一次。
+#   %S = the "brand short name" of the application (f.e. Firefox, Thunderbird)
 # The title of the dialog for picking a header or footer background image
-
 # from the custom persona editor (customPersonaEditor.xul).  It should probably
-
 # be in an editor-specific properties file, but since translators have already
-
-# translated it in this one, we'll leave it here for now.
-
 backgroundPickerDialogTitle=選擇檔案

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/personasplus.git

