update translations

22 files changed, 1261 insertions, 977 deletions

diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index fcad8dd51..7c6d3c3b6 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.mo
+++ b/locale/ca_CA/LC_MESSAGES/messages.mo
diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 4a38eeacf..5fb3141c0 100644
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <[email protected]>\n"
 "Language-Team: Català <[email protected]>\n"
@@ -185,182 +185,182 @@ msgstr ""
 "Ha fallat la sortida de prova de SQL, reviseu la base configuració de la "
 "bases de dades i de PHP"
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No s'ha pogut validar la sessió (IP incorrecta)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "El nom d'usuari o la contrasenya és incorrecte"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Tots els canals"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Sense categoria"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Articles marcats"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Articles publicats"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Articles nous"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Tots els articles"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Articles mémorisés"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Canals generats"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Selecciona:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Tot"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Per llegir"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Inverteix"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Cap"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Accions..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Commuta la selecció"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Marcats"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Publicats"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Selecció:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Marca'l com a llegit"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "Vés enrere"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "Per defecte"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Assigna-l'hi l'etiqueta:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Clica-hi per a reduir la categoria"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "No hi ha canals per a mostrar."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Etiqueta"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "àudio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Edita les etiquetes d'aquest article"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Obre els enllaços de l'article en una nova finestra"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Publica l'article amb una nota"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Canal"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "tipus desconegut"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Adjunció:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Adjuncions:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -369,11 +369,11 @@ msgstr "Adjuncions:"
 msgid "Close this window"
 msgstr "Tanca la finestra"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "No s'ha trobat el canal."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -382,31 +382,31 @@ msgstr ""
 "seleccioneu reviseu que coincideixi la sintaxi o que la configuració local "
 "sigui correcta."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "Marca'l com a llegit"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Clica-hi per a veure el cos de l'article"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "commuta els no llegits"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "No es poden mostrar els articles no llegits perquè no n'hi ha."
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "No hi ha cap article actualitzat."
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "No hi ha articles marcats per mostrar."
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -414,23 +414,23 @@ msgstr ""
 "No s'han trobat articles per a mostrar. Podeu assignar articles a etiquetes "
 "manualment (mireu el menú Accions) o utilitzeu un filtre."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "No s'han trobat articles per a mostrar."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Crea una etiqueta"
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "Elimina"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "sense etiqueta"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "edita la nota"
 
@@ -788,26 +788,26 @@ msgstr "Creeu un compte nou"
 msgid "Limit bandwidth usage"
 msgstr "Limita l'ús de l'ample de banda."
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "Eina OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "S'està important OPML (s'està utilitzant l'extensió DOMXML)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr ""
 "S'està important el fitxer OPML (s'està utilitzant l'extensió DOMDocument)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "No s'ha trobat l'extensió DOMXML. Fa falta per a versions de PHP inferiors a "
 "la 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Torna a les preferències"
 
@@ -1138,26 +1138,31 @@ msgstr "Ajuda"
 msgid "Help topic not found."
 msgstr "No s'ha trobat el tema a l'ajuda."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "S'està afegint la categoria <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "Ja s'ha importat"
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "D'acord!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Error mentre s'analitza el document."
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Error: si us plau carregueu el fitxer OPML."
 
@@ -1616,19 +1621,48 @@ msgstr "No s'ha trobat cap canal."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importeu"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Exporta en format OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
+"subscriure qualsevol que en conegui l'adreça URL."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "afficher les étiquettes"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Integració al Firefox"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1636,11 +1670,11 @@ msgstr ""
 "Podeu utilitzar Tiny Tiny RSS  com a lector de canals amb el Firefox fent "
 "clic en el següent enllaç."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Feu clic aquí per a desar aquesta pàgina web com un canal."
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1648,26 +1682,12 @@ msgstr ""
 "Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
 "subscriure qualsevol que en conegui l'adreça URL."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "afficher les étiquettes"
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Els articles publicats s'exporten en un canal RSS públic al qual s'hi pot "
-"subscriure qualsevol que en conegui l'adreça URL."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Articles marcats"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "No s'ha trobat cap canal."
 
@@ -2372,8 +2392,10 @@ msgid "No labels are selected."
 msgstr "No heu seleccionat cap etiqueta."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Esteu segur que voleu suprimir els usuaris seleccionats?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2611,6 +2633,9 @@ msgstr "Esteu segur que voleu marcar  %d article(s) com a llegit(s) ?"
 msgid "Please enter a note for this article:"
 msgstr "Si us plau, escriviu una nota per aquest article:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Esteu segur que voleu suprimir els usuaris seleccionats?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "S'està afegint el canal..."
 
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index a05f20283..b4efe3c2c 100644
--- a/locale/de_DE/LC_MESSAGES/messages.mo
+++ b/locale/de_DE/LC_MESSAGES/messages.mo
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 2d9b21c00..c29058d1a 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kevin Kraft <[email protected]>\n"
 "Language-Team: Deutsch <de.org>\n"
@@ -189,183 +189,183 @@ msgstr ""
 "SQL Escaping Test fehlgeschlagen, überprüfen Sie Ihre Datenbank und PHP "
 "Konfiguration"
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Session konnte nicht validiert werden (falsche IP)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "falscher Benutzername oder Passwort"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Unsortiert"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Sonderfeeds"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Label"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Bewertete Artikel"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Veröffentlichte Artikel"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Neue Artikel"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Alle Artikel"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Bewertete Artikel"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Erzeugter Feed"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Auswahl:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Invertieren"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Keine"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Aktionen..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Auswahl umschalten:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Bewertet"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Auswahl:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr "Archiv"
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "Zurück gehen"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Label zuweisen:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Kategorie auf-/zuklappen"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Keine Feeds zum Anzeigen."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Tags für diesen Artikel bearbeiten"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Artikelzusammenfassung in neuem Fenster anzeigen"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "Artikel veröffentlichen"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr "Original von:"
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "unbekannter Typ"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Anhang:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Anhänge:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -374,11 +374,11 @@ msgstr "Anhänge:"
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -386,33 +386,33 @@ msgstr ""
 "Konnte Feed nicht anzeigen (Abfrage fehlgeschlagen). Bitte prüfen Sie die "
 "Label Übereinstimmungs Syntax oder die Spracheinstellungen."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 #, fuzzy
 msgid "mark as read"
 msgstr "Als gelesen markieren"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Klicken um den Artikel aufzuklappen"
 
-#: functions.php:5598
+#: functions.php:5595
 #, fuzzy
 msgid "toggle unread"
 msgstr "Umschalten ungelesen"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "Keine ungelesenen Artikel zum Anzeigen gefunden."
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "Keine aktualisierten Artikel zum Anzeigen gefunden."
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "Keine bewerteten Artikel zum Anzeigen gefunden."
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -420,23 +420,23 @@ msgstr ""
 "Keine Artikel zum Anzeigen gefunden. Sie können Artikel zu Labeln manuell "
 "hinzufügen (siehe obiges Aktionsmenü) oder einen Filter benutzen."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "Keine Artikel zum Anzeigen gefunden."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Label erstellen..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(entfernen)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "Keine Tags"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "Notiz bearbeiten"
 
@@ -786,25 +786,25 @@ msgstr "Neues Konto erstellen"
 msgid "Limit bandwidth usage"
 msgstr "Bandbreitennutzung begrenzen"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "OPML Werkzeug"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Importiere OPML (verwende DOMXML Erweiterung)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importiere OPML (verwende DOMDocument Erweiterung)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "DOMXML Erweiterung wurde nicht gefunden. Sie wird benötigt für PHP vor "
 "Version 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Zu den Einstellungen zurückkehren"
 
@@ -1133,26 +1133,31 @@ msgstr "Hilfe"
 msgid "Help topic not found."
 msgstr "Hilfe Thema nicht gefunden."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Füge Kategorie <b>%s</b> hinzu."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "Bereits importiert."
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Fehler beim analysieren des Dokuments."
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Fehler: bitte eine OPML Datei hochladen."
 
@@ -1612,19 +1617,47 @@ msgstr "Keine übereinstimmenden Filter gefunden."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importieren"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "OPML exportieren"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
+"können von jedem abonniert werden, der die nachstehende URL kennt."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+msgid "Display URL"
+msgstr "Zeige URL an"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Firefox Integration"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1632,11 +1665,11 @@ msgstr ""
 "Tiny Tiny RSS kann durch den nachstehenden Link als Feedreader für Firefox "
 "verwendet werden."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Diese Website als Feedreader registrieren."
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1644,25 +1677,12 @@ msgstr ""
 "Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
 "können von jedem abonniert werden, der die nachstehende URL kennt."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-msgid "Display URL"
-msgstr "Zeige URL an"
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Veröffentlichte Artikel werden als öffentlicher RSS-Feed exportiert und "
-"können von jedem abonniert werden, der die nachstehende URL kennt."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Bewertete Artikel"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "Keine Feeds gefunden."
 
@@ -2377,8 +2397,13 @@ msgid "No labels are selected."
 msgstr "Keine Label ausgewählt."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Ausgewählte Benutzer entfernen?"
+#, fuzzy
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"ausgewählte Profile löschen? Das Aktive und das Standardprofil werden nicht "
+"gelöscht"
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2604,6 +2629,9 @@ msgstr "%d Artikel als gelesen markieren?"
 msgid "Please enter a note for this article:"
 msgstr "Tags für diesen Artikel bearbeiten"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Ausgewählte Benutzer entfernen?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "Füge Feed hinzu..."
 
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 5b069b9dc..a31491b75 100644
--- a/locale/es_ES/LC_MESSAGES/messages.mo
+++ b/locale/es_ES/LC_MESSAGES/messages.mo
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 1b9274612..0161fdfc0 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-11-10 00:12+0100\n"
 "Last-Translator: Manuel Gualda Caballero <[email protected]>\n"
 "Language-Team: Español <[email protected]>\n"
@@ -182,182 +182,182 @@ msgstr ""
 "La prueba de escape SQL ha fallado. Por favor, revise la configuración de su "
 "base de datos y PHP."
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "No se pudo validar la sesión (IP incorrecta)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Todas las fuentes"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Sin clasificar"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Favoritos"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Publicados"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Recientes"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Todos"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Fuente generada"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Seleccione:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "No"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Sin leer"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Invertir"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Ninguno"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Acciones..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Cambiar la selección:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Selección:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Marcar como leído"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "Volver atrás"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "Por defecto"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Asignar etiqueta:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Plegar la categoría"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "No hay fuentes que mostrar."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Editar las etiquetas de este artículo"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Mostrar el sumario del artículo en una nueva pestaña o ventana"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Publicar el artículo con una nota"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Fuente"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "tipo desconocido"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Adjunto:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Adjuntos:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -366,11 +366,11 @@ msgstr "Adjuntos:"
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Fuente no encontrada."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -378,31 +378,31 @@ msgstr ""
 "No se puede mostrar la fuente (consulta fallida). Por favor, compruebe la "
 "sintaxis de la coincidencia de etiqueta o la configuración local."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "marcar como leído"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Desplegar el artículo"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "cambiar a sin leer"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "No se han encontrado artículos sin leer."
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "No se han encontrado artículos actualizados."
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "No se han encontrado artículos favoritos."
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -411,23 +411,23 @@ msgstr ""
 "artículos a las etiquetas manualmente (ver el menú Acciones -arriba-) o usar "
 "un filtro."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "No se han encontrado artículos que desplegar."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Crear etiqueta..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(eliminar)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "sin etiquetas"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "editar nota"
 
@@ -790,25 +790,25 @@ msgstr "Crear una nueva cuenta"
 msgid "Limit bandwidth usage"
 msgstr "Limitar el uso de ancho de banda"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "Utilidad OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Importando OPML (usando la extensión DOMXML)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importando OPML (usando la extensión DOMDocument)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "No se ha encontrado la extensión DOMXML, la cual es necesaria para las "
 "versiones de PHP inferiores a la 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Volver a las preferencias"
 
@@ -1141,26 +1141,31 @@ msgstr "Ayuda"
 msgid "Help topic not found."
 msgstr "Tema de ayuda no encontrado."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Añadiendo categoría <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "Ya importado."
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "¡TODO CORRECTO!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Error mientras se analizaba el documento."
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Error: por favor, suba un fichero OPML."
 
@@ -1619,19 +1624,48 @@ msgstr "No se han encontrado fuentes coincidentes."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Los artículos publicados son exportados como una fuente RSS pública a la "
+"cual podrá suscribirse cualquiera que conozca la URL especificada a "
+"continuación."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+msgid "Display URL"
+msgstr ""
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Integración con Firefox"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1639,11 +1673,11 @@ msgstr ""
 "Este sitio Tiny tiny RSS puede ser usado como un lector de fuentes de "
 "Firefox si pulsa en el enlace de abajo."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Pulse aquí para registrar este sitio como un lector de fuentes."
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1652,26 +1686,12 @@ msgstr ""
 "cual podrá suscribirse cualquiera que conozca la URL especificada a "
 "continuación."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-msgid "Display URL"
-msgstr ""
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Los artículos publicados son exportados como una fuente RSS pública a la "
-"cual podrá suscribirse cualquiera que conozca la URL especificada a "
-"continuación."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "No se han encontrado fuentes."
 
@@ -2384,8 +2404,10 @@ msgid "No labels are selected."
 msgstr "No se han seleccionado etiquetas."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "¿Eliminar los usuarios seleccionados?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2611,6 +2633,9 @@ msgstr "¿Marcar %d artículo(s) como leído(s)?"
 msgid "Please enter a note for this article:"
 msgstr "Por favor, introduzca una nota para este artículo:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "¿Eliminar los usuarios seleccionados?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "Añadiendo fuente..."
 
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index a372afc86..76da20858 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 16e52aecd..d31503633 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Ploc <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -189,178 +189,178 @@ msgstr ""
 "Le test d'échappement sql a échoué, vérifier votre base de donnée et votre "
 "configuration de php."
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Echec de la validation de la session (adresse ip incorrecte)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "Login ou mot de passe incorrect"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Etiquettes"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: functions.php:3105
+#: functions.php:3102
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Sélectionner :"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Tout"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Non lus"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Inverse"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Aucun"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Actions..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Sélection :"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Remarquables"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Publiés"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Sélection :"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr "Archives"
 
-#: functions.php:4247
+#: functions.php:4244
 msgid "Move back"
 msgstr "Revenir"
 
-#: functions.php:4248
+#: functions.php:4245
 msgid "Delete"
 msgstr "Effacer"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Assigner l'étiquette :"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Cliquer pour contracter la catégorie"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Editer les tags pour cet article"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Afficher le résumé des articles dans une nouvelle fenêtre"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Publier l'article avec une note"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Fichier attaché :"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Fichiers attachés :"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -369,11 +369,11 @@ msgstr "Fichiers attachés :"
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -381,31 +381,31 @@ msgstr ""
 "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier "
 "la syntaxe de l'étiquette de correspondance ou la configuration locale."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "marquer comme lu"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Cliquer pour développer l'article"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "marquer comme non-lu"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "Aucun article non-lu à afficher"
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "Aucun article mise à jour à afficher"
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "Aucun article remarquable à afficher"
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -414,23 +414,23 @@ msgstr ""
 "articles manuellement (voir les actions du menu ci-dessus) ou utiliser un "
 "filtre."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "Aucun article à afficher"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Créer une étiquette..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(supprimer)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "aucun tag"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "éditer la note"
 
@@ -786,26 +786,26 @@ msgstr "Créer un nouveau compte"
 msgid "Limit bandwidth usage"
 msgstr "Limiter l'usage de la bande passante"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "Outil OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Importation OPML (utilisant l'extension DOMXML)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importation OPML (utilisation l'extension DOMDocument)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "Extension DOMXML non trouvée. Cette extension est requise pour les versions "
 "de php inférieures à 5.Extension DOMXML non trouvée. Elle est nécessaire "
 "pour les versions de PHP antérieures à la 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Revenir à la configuration"
 
@@ -1134,24 +1134,29 @@ msgstr "Aide"
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "<li>Ajout de la catégorie <b>%s</b>.</li>"
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 msgid "is already imported."
 msgstr "est déjà importé"
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 msgid "OK"
 msgstr "OK"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
 
@@ -1590,19 +1595,46 @@ msgstr "Aucun flux correspondant trouvé."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Votre OPML peut être publiée publiquement et toute personne qui connaît "
+"l'adresse indiquée ci-dessous peut s'y abonner."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+msgid "Display URL"
+msgstr "URL affichée"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Intégration à Firefox"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1610,11 +1642,11 @@ msgstr ""
 "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox "
 "en cliquant sur le lien ci-dessous."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1622,24 +1654,12 @@ msgstr ""
 "Les articles publiés sont exportés comme un flux RSS public et toute "
 "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-msgid "Display URL"
-msgstr "URL affichée"
-
-#: modules/pref-feeds.php:1507
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Votre OPML peut être publiée publiquement et toute personne qui connaît "
-"l'adresse indiquée ci-dessous peut s'y abonner."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articles archivés"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
@@ -2344,8 +2364,13 @@ msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Supprimer les utilisateurs sélectionnés ?"
+#, fuzzy
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"Supprimer les profiles sélectionnés ? Le profile par défaut et le profile "
+"actifne seront pas supprimés."
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2568,3 +2593,6 @@ msgstr "Marquer %d article(s) comme lu(s) ?"
 #: viewfeed.js:2255
 msgid "Please enter a note for this article:"
 msgstr "Veuillez saisir une note pour cet article :"
+
+#~ msgid "Remove selected users?"
+#~ msgstr "Supprimer les utilisateurs sélectionnés ?"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index c6bdf1a01..dad567196 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.mo
+++ b/locale/hu_HU/LC_MESSAGES/messages.mo
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 874803401..4ec79f433 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
@@ -180,182 +180,182 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "Hibás felhasználói név vagy jelszó"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Összes hírcsatorna"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Kategorizálatlan"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Kiemelt"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Címkék"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Csillagos hírek"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Publikált hírek"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Friss hírek"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Az összes hír"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Tárolt hírek"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Generált hírcsatorna"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Kiválaszt:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Mind"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Fordított"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Kijelölés törlése"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Műveletek"
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Kiválasztott legyen:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Csillagos"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Publikált"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Kiválasztott hírcsatornák:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Olvasottá tesz"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "Vissza"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "Alapértelmezett"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Besorolás címke alá:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Kattintson ide a kategória összecsukásához"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Nincs megjelenítendő hírcsatorna."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Címkék"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr "-"
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Címkék hozzáadása a hírhez"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Hírösszefoglaló megjelenítése új ablakban."
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Hír publikálása megjegyzéssel"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Hírcsatorna"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "ismeretlen hírcsatornatípus"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Csatolmány:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Csatolmányok:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -364,41 +364,41 @@ msgstr "Csatolmányok:"
 msgid "Close this window"
 msgstr "Ablak bezárása"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Hírcsatorna nem található"
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "olvasottként jelöl"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Hír kinyitása"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "olvasatlanná tesz"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "Nincs megjeleníthető olvasatlan hír."
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "Nincs megjeleníthető friss hír."
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "Nincs megjeleníthető csillagos hír."
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -407,23 +407,23 @@ msgstr ""
 "Címkék alá híreket besorolhat manuálisan (lásd a fenti Műveletek menüt) vagy "
 "a besoroláshoz használhat Szűrőket."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "Nincs megjeleníthető hír."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Új címke létrehozása..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(eltávolít)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "nincs címke"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "jegyzet szerkesztése"
 
@@ -774,25 +774,25 @@ msgstr "Új felhasználói fiók létrehozása"
 msgid "Limit bandwidth usage"
 msgstr "Sávszélesség-használat korlátozása"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "OMPL-segédprogram"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "OPML importálása (DOMXML kiterjesztés használatával)"
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "OPML importálása (DOMDocument kiterjesztés használatával)"
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "Az ötösnél alacsonyabb verziószámű PHP-hez szükséges DOMXMLkiterjesztés nem "
 "található."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Vissza a beállításokhoz"
 
@@ -1120,26 +1120,31 @@ msgstr "Segítség"
 msgid "Help topic not found."
 msgstr "Súgótéma nem tlálható."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Kategória hozzáadása <b>%s</b>...<br>"
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "Már importálva."
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Hiba történt a dokuementum feldoglozása közben"
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Hiba: kérem töltse fel az OPML fájlt!"
 
@@ -1598,19 +1603,47 @@ msgstr "Nem található a feltételeknek megfelelő szűrő."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importálás"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Exportálás OPML-be"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
+"bárki feliratkozhat, aki tudja a lenti címet."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+msgid "Display URL"
+msgstr ""
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Firefox-integráció"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1618,11 +1651,11 @@ msgstr ""
 "Ez a Tiny Tiny RSS oldal beállítható a Firefox böngésző alapértelmezett "
 "hírcsatorna-olvasójaként. Ehhez kattintson az alábbi linkre!"
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Kattintson ide az oldal hírcsatorna-olvasóként való beállításához!"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1630,25 +1663,12 @@ msgstr ""
 "A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
 "bárki feliratkozhat, aki tudja a lenti címet."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-msgid "Display URL"
-msgstr ""
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"A program a publikált hírekből egy publikus RSS hírcsatornát készít, amelyre "
-"bárki feliratkozhat, aki tudja a lenti címet."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Csillagos hírek"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "Nem található hírcsatorna."
 
@@ -2349,8 +2369,10 @@ msgid "No labels are selected."
 msgstr "Nincs kiválasztott címke."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Eltávolítja a kiválasztott felhasználókat?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2577,6 +2599,9 @@ msgstr "Olvasottá teszi a következő hír(eke)t: %d?"
 msgid "Please enter a note for this article:"
 msgstr "Megyjegyzés csatolása ehhez a hírhez:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Eltávolítja a kiválasztott felhasználókat?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "Hírcsatorna hozzáadása..."
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 91da68e7f..f754ab00e 100644
--- a/locale/it_IT/LC_MESSAGES/messages.mo
+++ b/locale/it_IT/LC_MESSAGES/messages.mo
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index f6cc0a82f..3600a047e 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2010-04-19 16:36+0200\n"
 "Last-Translator: Andrea Zagli <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -182,178 +182,178 @@ msgstr ""
 "Test di sanitizzazione dell&apos;SQL fallito; controllare il database e la "
 "configurazione del PHP"
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "La validazione della sessione è fallita (IP non corretto)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "Nome utente o password sbagliati"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Tutti i notiziari"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Speciale"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Etichette"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Articoli con stella"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Articoli pubblicati"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Articoli nuovi"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
-#: functions.php:3105
+#: functions.php:3102
 msgid "Archived articles"
 msgstr "Articoli archiviati"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Notiziario generato"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Seleziona:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Tutti"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Non letti"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Inverti"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Nessuno"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Azioni..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Inverti selezione:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Con stella"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Pubblicati"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Selezione:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Segna come letto"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr "Archivio"
 
-#: functions.php:4247
+#: functions.php:4244
 msgid "Move back"
 msgstr "Sposta indietro"
 
-#: functions.php:4248
+#: functions.php:4245
 msgid "Delete"
 msgstr "Elimina"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Assegna etichetta:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Fare clic per contrarre la categoria"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Nessun notiziario da visualizzare."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Etichette"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Mostra il sommario dell&apos;articolo in una nuova finestra"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Pubblica articolo con una nota"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "tipo sconosciuto"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Allegato:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Allegati:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -362,11 +362,11 @@ msgstr "Allegati:"
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -374,31 +374,31 @@ msgstr ""
 "Impossibile visualizzare il notiziario (interrogazione fallita). Controllare "
 "che l&apos;etichetta corrisponda alla sintassi o la configurazione locale."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "segna come letto"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Fare clic per espandere l&apos;articolo"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "inverti non letti"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "Nessun articolo non letto trovato da visualizzare."
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "Nessun articolo non aggiornato trovato da visualizzare."
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "Nessun articolo con stella trovato da visualizzare."
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -407,23 +407,23 @@ msgstr ""
 "gli articoli alle etichette (vedere il menù «Azioni» sopra) o utilizzare un "
 "filtro."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Crea etichetta..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(rimuovi)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "modifica note"
 
@@ -781,25 +781,25 @@ msgstr "Crea un nuovo utente"
 msgid "Limit bandwidth usage"
 msgstr "Limitare l&apos;uso della banda"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "Utilità OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Importazione OPML (utilizzando l&apos;estensione DOMXML)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importazione OPML (utilizzando l&apos;estensione DOMDocument)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "L&apos;estensione DOMXML non è stata trovata. È richiesta per versioni di "
 "PHP inferiori alla 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Ritorna alle preferenze"
 
@@ -1127,24 +1127,29 @@ msgstr "Aiuto"
 msgid "Help topic not found."
 msgstr "Argomento dell&apos;aiuto non trovato."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "<li>Aggiunta della categoria <b>%s</b>.</li>"
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 msgid "is already imported."
 msgstr "già importato."
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 msgid "OK"
 msgstr "OK"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Errore durante l&apos;analisi del documento."
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Errore: caricare il file OPML."
 
@@ -1584,19 +1589,48 @@ msgstr "Nessun articolo trovato che corrisponde."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importa"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Esporta OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Gli articoli pubblicati vengono esportati come un notiziario pubblico e "
+"possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
+"sotto."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+msgid "Display URL"
+msgstr "Visualizza URL"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Integrazione con Firefox"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1604,11 +1638,11 @@ msgstr ""
 "Questo sito di Tiny Tiny RSS può essere utilizzato come lettore di notiziari "
 "di Firefox facendo clic sul collegamento qui sotto."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Fare clic qui per registrare questo sito come lettore di notiziari."
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1617,26 +1651,12 @@ msgstr ""
 "possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
 "sotto."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-msgid "Display URL"
-msgstr "Visualizza URL"
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Gli articoli pubblicati vengono esportati come un notiziario pubblico e "
-"possono essere sottoscritti da chiunque conosca l&apos;URL specificato qui "
-"sotto."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, php-format
 msgid "%d archived articles"
 msgstr "%d articoli archiviati"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "Nessun notiziario trovato."
 
@@ -2342,8 +2362,13 @@ msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Rimuovere gli utenti selezionati?"
+#, fuzzy
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
+"Rimuovere i profili selezionati? Il profilo attivo e quello predefinito non "
+"saranno rimossi."
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2565,6 +2590,9 @@ msgstr "Segnare %d articolo/i come letto/i?"
 msgid "Please enter a note for this article:"
 msgstr "Inserire una nota per questo articolo:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Rimuovere gli utenti selezionati?"
+
 #~ msgid "MySQL Charset Updater"
 #~ msgstr "Aggiornatore del set di caratteri di MySQL"
 
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 22c877348..a9882e91d 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.mo
+++ b/locale/ja_JP/LC_MESSAGES/messages.mo
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index a4b7a28eb..6ce7cf2a2 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -184,182 +184,182 @@ msgstr ""
 "SQL のエスケープ処理のテストに失敗しました。データベースの設定と PHP の設定を"
 "確認してください。"
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "セッションの検査に失敗しました (IP が正しくない)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "ユーザー名かパスワードが正しくありません"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "カテゴリー割り当てなし"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "特別"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "ラベル"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "お気に入りの記事"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "公開済みの記事"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "新しい記事"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "すべての記事"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "未読記事"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "生成したフィード"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "選択:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "すべて"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "未読"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "反転"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "なし"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "操作..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "選択の切り替え:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "お気に入り"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "公開済み"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "選択:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "既読にする"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "戻る"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "標準"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "ラベルの割り当て:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "閉じたカテゴリーのクリック"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "表示するフィードがありません。"
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "タグ"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "この記事のタグを編集する"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "記事の要約を新しいウィンドウで表示する"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "ノートと記事を公開する"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "フィード"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "未知の種類"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "添付:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "添付:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -368,11 +368,11 @@ msgstr "添付:"
 msgid "Close this window"
 msgstr "このウィンドウを閉じる"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -380,31 +380,31 @@ msgstr ""
 "フィードを表示できません (問い合わせの失敗)。ラベル一致の文法かローカルの設定"
 "を確認してください。"
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "既読にする"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "開いた記事のクリック"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "未読/既読を切り替える"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "表示する未読記事が見つかりませんでした。"
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "表示する更新された記事が見つかりませんでした。"
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "表示するお気に入りの記事が見つかりませんでした。"
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -412,23 +412,23 @@ msgstr ""
 "表示する記事が見つかりません。手動でラベルに記事を割り当てるか(上の操作メ"
 "ニューを参照します)、フィルターを使うことができます。"
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "表示する記事が見つかりません。"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "ラベルを作成する..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(削除)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "タグがありません"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "ノートの編集"
 
@@ -754,24 +754,24 @@ msgstr "新規アカウントの作成"
 msgid "Limit bandwidth usage"
 msgstr "帯域の制限を使う"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "OPML ユーティリティ"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "OPML のインポート中 (DOMXML 機能拡張を用いて)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "OPML のインポート中 (DOMDocument 機能拡張を用いて)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "DOMXML 機能拡張が見つかりません。PHP バージョン 5 未満はそれを要求します。"
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "設定に戻る"
 
@@ -1096,26 +1096,31 @@ msgstr "ヘルプ"
 msgid "Help topic not found."
 msgstr "ヘルプのトピックが見つかりません。"
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "カテゴリー <b>%s</b> の追加中です。"
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "既にインポート済みです。"
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "ドキュメントの解析中のエラーです。"
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "エラー: OPML ファイルをアップロードしてください。"
 
@@ -1564,19 +1569,45 @@ msgstr "一致するフィルターが見つかりません。"
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "インポート"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "OPML エクスポート"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "タグの表示"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Firefox 統合"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1584,33 +1615,22 @@ msgstr ""
 "下のリンクをクリックすることで、Firefox のフィードリーダーとしてこの Tiny "
 "Tiny RSS のサイトを使うことができます。"
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "クリックするとフィードリーダーとしてこのサイトを登録します。"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "タグの表示"
-
-#: modules/pref-feeds.php:1507
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "お気に入りの記事"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "フィードがありません。"
 
@@ -2306,8 +2326,10 @@ msgid "No labels are selected."
 msgstr "選択されたラベルはありません。"
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "選択されたユーザーを削除しますか?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2531,6 +2553,9 @@ msgstr "%d 件のマークした記事を既読として設定しますか?"
 msgid "Please enter a note for this article:"
 msgstr "このアーティクルのノートを入力してください:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "選択されたユーザーを削除しますか?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "フィードを追加しています..."
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index 596ff2e9c..2d991a2c9 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.mo
+++ b/locale/nb_NO/LC_MESSAGES/messages.mo
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index dbd322d2a..2a01fc0df 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -183,182 +183,182 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 "SQL escaping testen feilen, sjekk database og PHP konfigurasjonene dine."
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Sesjonen kunne ikke valideres (feil IP)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "Feil brukernavn og/eller passord"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Alle Nyhetsstrømmer"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Ukategorisert"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Snarveier"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Merkelapper"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Favorittartikler"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Publiserte artikler"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Ferske artikler"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Alle artikler"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Lagrede artikler"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Generert nyhetsstrøm"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Velg:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Alle"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Ulest"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Motsatt"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Ingen"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Handlinger..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Marker utvalg:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Favoritter"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Publisert"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Utvalg:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Marker som lest"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "Gå tilbake"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "Standard"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Tildel stikkord:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Velg for å slå sammen kategorien"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Ingen nyhetstrømmer å vise"
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Stikkord"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "Lyd/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr "-"
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Rediger stikkordene for denne artikkelen"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Åpne artikkelsammendraget i nytt nettleservindu"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Publiser artikelen med notat"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Nyhetsstrøm"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "Ukjent type"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Vedlegg:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Vedlegg:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -367,11 +367,11 @@ msgstr "Vedlegg:"
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Nyhetsstrømmen ble ikke funnet"
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -379,31 +379,31 @@ msgstr ""
 "Kunne ikke vise nyhetsstrøm (spørring feilet). Vennligst sjekk "
 "merkelappsyntaksen eller lokal konfigurasjon."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "marker som lest"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Trykk for å utvide artikkel"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "sett som ulest"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "Ingen uleste artikler funnet som kunne vises"
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "Ingen oppdaterte artikler funnet som kunne vises"
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "Ingen markerte artikler som kan vises"
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -411,23 +411,23 @@ msgstr ""
 "Ingen artikler ble funnet. Du kan gi artikler merkelapper manuelt (se aksjon-"
 "menyen ovenfor) eller bruke et filter."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "Ingen artikler funnet som kan vises"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Lag merkelapp..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(fjern)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "Ingen stikkord"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "Rediger notat"
 
@@ -781,24 +781,24 @@ msgstr "Lag ny konto"
 msgid "Limit bandwidth usage"
 msgstr "Begrens båndbreddebruken"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "OPML-verktøy"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Importerer OPML (bruker DOMXML-utvidelsen)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importerer OPML (bruker DOMDocument-utvidelsen)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "DOMXML-utvidelsen ble ikke funnet. Den er påkrevet for PHPversjoner under 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Returner til innstillinger"
 
@@ -1128,26 +1128,31 @@ msgstr "Hjelp"
 msgid "Help topic not found."
 msgstr "Hjelp-emne kunne ikke bli funnet"
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Legger til kategori <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "Allerede importert."
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Feil under behandling av dokumentet"
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Feil: Kan ikke laste opp OPMLfil"
 
@@ -1606,19 +1611,48 @@ msgstr "Ingen filtre ble funnet."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importer"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Eksporter OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
+"kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "Vis stikkord"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Firefox integrering"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1626,11 +1660,11 @@ msgstr ""
 "Denne Tiny Tiny RSS siden kan bli brukt som nyhetsstrømsleser for Firefox "
 "ved å trykke på lenken nedenfor."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Trykk her for å registrere denne siden som nyhetsstrømsleser"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1638,26 +1672,12 @@ msgstr ""
 "Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
 "kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "Vis stikkord"
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Publiserte artikler kan bli eksportert som en offentlig RSS-nyhetskanal og "
-"kan bli abonnert på av alle som vet adressen som blir spesifisert nedenfor."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favorittartikler"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "Ingen nyhetsstrømmer ble funnet."
 
@@ -2369,8 +2389,10 @@ msgid "No labels are selected."
 msgstr "Ingen merkelapper er markert"
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Fjerne markerte brukere?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2592,6 +2614,9 @@ msgstr "Marker %d artikkel/artikler som leste?"
 msgid "Please enter a note for this article:"
 msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Fjerne markerte brukere?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "Legger til nyhetsstrøm..."
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 04237cf46..84d9313f6 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.mo
+++ b/locale/pt_BR/LC_MESSAGES/messages.mo
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 3942850a1..002cf6c82 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -176,187 +176,187 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Todos os feeds"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Não Categorizado"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Especial"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr ""
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr ""
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr ""
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr ""
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "Favoritos"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Favoritos"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Selecione:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Todos"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Não Lido"
 
-#: functions.php:4219
+#: functions.php:4216
 #, fuzzy
 msgid "Invert"
 msgstr "(Inverso)"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Nenhum"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Ações..."
 
-#: functions.php:4234
+#: functions.php:4231
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Favoritos"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Publicado"
 
-#: functions.php:4238
+#: functions.php:4235
 #, fuzzy
 msgid "Selection:"
 msgstr "Seleção"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "Padrão"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr ""
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Tags"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4806
+#: functions.php:4803
 #, fuzzy
 msgid " - "
 msgstr " - por "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr ""
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr ""
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 #, fuzzy
 msgid "unknown type"
 msgstr "Erro desconhecido"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -365,72 +365,72 @@ msgstr ""
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Feed não encontrado."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 #, fuzzy
 msgid "mark as read"
 msgstr "Marcar como lido"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 #, fuzzy
 msgid "Click to expand article"
 msgstr "Favoritos"
 
-#: functions.php:5598
+#: functions.php:5595
 #, fuzzy
 msgid "toggle unread"
 msgstr "Marcar como favorito"
 
-#: functions.php:5617
+#: functions.php:5614
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5620
+#: functions.php:5617
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5623
+#: functions.php:5620
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "Sem Feeds para exibir."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 #, fuzzy
 msgid "Create label..."
 msgstr "Criar um usuário"
 
-#: functions.php:6402
+#: functions.php:6399
 #, fuzzy
 msgid "(remove)"
 msgstr "Remover"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "sem tags"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr ""
 
@@ -755,25 +755,25 @@ msgstr ""
 msgid "Limit bandwidth usage"
 msgstr ""
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "Utilitário OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Importando OPML (usando a extensão DOMXML)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Importando OPML (usando a extensão DOMDocument)…"
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr ""
 "A extensão DOMXML não foi encontrada. Ela é exigida para versões do PHP "
 "menores que 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Retornar às preferências"
 
@@ -1111,25 +1111,30 @@ msgstr "Olá,"
 msgid "Help topic not found."
 msgstr "Tópico de ajuda não encontrado."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Adicionando a categoria <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 msgid "is already imported."
 msgstr ""
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr ""
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr ""
 
@@ -1585,50 +1590,65 @@ msgstr "Sem Feeds para exibir."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Importar"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Exportar OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+msgid "Display URL"
+msgstr ""
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr ""
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-msgid "Display URL"
-msgstr ""
-
-#: modules/pref-feeds.php:1507
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Favoritos"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 #, fuzzy
 msgid "No feeds found."
 msgstr "Sem Feeds para exibir."
@@ -2358,8 +2378,10 @@ msgid "No labels are selected."
 msgstr ""
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Remover os usuários selecionados?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2589,6 +2611,9 @@ msgstr ""
 msgid "Please enter a note for this article:"
 msgstr ""
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Remover os usuários selecionados?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "Adicionando o Feed..."
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index d578ad6db..ec3c45f62 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 64ce64e10..6921c9f42 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2009-05-29 14:38+0300\n"
 "Last-Translator: Max Kamashev <[email protected]>\n"
 "Language-Team: Русский <[email protected]>\n"
@@ -187,182 +187,182 @@ msgstr ""
 "неудавшийся тест экранирования SQL, проверьте вашу базу данных и "
 "конфигурацию PHP"
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr "Ошибка проверки сессии (некорректный IP)"
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr "Некорректное имя пользователя или пароль"
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "Нет категории"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "Метки"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "Отмеченные"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "Опубликованные"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 msgid "Fresh articles"
 msgstr "Свежие"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 msgid "All articles"
 msgstr "Все статьи"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "Сохранённые статьи"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "Генерировать канал"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "Выбрать:"
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "Все"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "Новые"
 
-#: functions.php:4219
+#: functions.php:4216
 msgid "Invert"
 msgstr "Инвертировать"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "Ничего"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "Действия..."
 
-#: functions.php:4234
+#: functions.php:4231
 msgid "Selection toggle:"
 msgstr "Переключить выбранное:"
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "Отмеченные"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "Опубликован"
 
-#: functions.php:4238
+#: functions.php:4235
 msgid "Selection:"
 msgstr "Выбрано:"
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "Как прочитанные"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 #, fuzzy
 msgid "Move back"
 msgstr "Идти назад"
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "По умолчанию"
 
-#: functions.php:4253
+#: functions.php:4250
 msgid "Assign label:"
 msgstr "Применить метку:"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr "Щёлкните, чтобы развернуть категорию"
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr "audio/mpeg"
 
-#: functions.php:4806
+#: functions.php:4803
 msgid " - "
 msgstr " - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr "Редактировать теги статьи"
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 msgid "Show article summary in new window"
 msgstr "Показать детали статьи в новом окне"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 msgid "Publish article with a note"
 msgstr "Опубликовать статью с заметкой"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Канал"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 msgid "unknown type"
 msgstr "Неизвестный тип"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr "Вложение:"
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr "Вложения:"
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -371,11 +371,11 @@ msgstr "Вложения:"
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -383,31 +383,31 @@ msgstr ""
 "Не могу показать канал (ошибка в запросе). Пожалуйста проверьте синтаксис "
 "или локальную конфигурацию."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 msgid "mark as read"
 msgstr "Отметить как прочитанные"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 msgid "Click to expand article"
 msgstr "Щёлкните чтобы развернуть статью"
 
-#: functions.php:5598
+#: functions.php:5595
 msgid "toggle unread"
 msgstr "переключить непрочитанные"
 
-#: functions.php:5617
+#: functions.php:5614
 msgid "No unread articles found to display."
 msgstr "Не найдено не прочитанных статей"
 
-#: functions.php:5620
+#: functions.php:5617
 msgid "No updated articles found to display."
 msgstr "Не найдено не прочитанных статей."
 
-#: functions.php:5623
+#: functions.php:5620
 msgid "No starred articles found to display."
 msgstr "Не найдено отмеченных статей"
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -415,23 +415,23 @@ msgstr ""
 "Нет статей для показа. Вы можете присвоить метку вручную (смотрите выше меню "
 "Действия) или используйте фильтр."
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 msgid "No articles found to display."
 msgstr "Статей не найдено."
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 msgid "Create label..."
 msgstr "Создать метку..."
 
-#: functions.php:6402
+#: functions.php:6399
 msgid "(remove)"
 msgstr "(удалить)"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr "править заметку"
 
@@ -780,23 +780,23 @@ msgstr "Создать новый аккаунт"
 msgid "Limit bandwidth usage"
 msgstr "Ограничить скорость передачи"
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "Утилита OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "Импортирую OPML (с помощью расширения DOMXML)..."
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "Импортирую OPML (с помощью расширения DOMDocument)..."
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr "Расширение DOMXML не найдено. Оно необходимо для версий PHP старее 5."
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "Вернуться к настройкам"
 
@@ -1125,26 +1125,31 @@ msgstr "Помощь"
 msgid "Help topic not found."
 msgstr "Раздел помощи не найден."
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "Добавляется категория <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "Уже импортирован."
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK!"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "Ошибка при разборе документа."
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "Ошибка: пожалуйста загрузите OPML файл."
 
@@ -1602,19 +1607,48 @@ msgstr "Не найдено совпадений с фильтром."
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "Импортировать"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "Экспортировать OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr ""
+"Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
+"быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "показать теги"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr "Интеграция в Firefox"
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
@@ -1622,11 +1656,11 @@ msgstr ""
 "Этот сайт с Tiny Tiny RSS можно использовать в Firefox как агрегатор RSS. "
 "Для этого щёлкните по ссылке ниже."
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr "Щёлкните здесь для регистрации сайта в роли RSS агрегатора"
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1634,26 +1668,12 @@ msgstr ""
 "Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
 "быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "показать теги"
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr ""
-"Опубликованные статьи экспортируется в качестве общего RSS канала и могут "
-"быть подписаны кем-либо ещё, кто знает URL, указанный ниже."
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "Отмеченные"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 msgid "No feeds found."
 msgstr "Каналы не найдены."
 
@@ -2362,8 +2382,10 @@ msgid "No labels are selected."
 msgstr "Нет выбранных меток."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "Удалить выбранных пользователей?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2586,6 +2608,9 @@ msgstr "Отметить %d статью(ей) как прочитанные?"
 msgid "Please enter a note for this article:"
 msgstr "Пожалуйста, укажите заметку для статьи:"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "Удалить выбранных пользователей?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "Канал добавляется..."
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index f8ad16455..ebeb4780d 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 80254d4d1..db22cd2a1 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -172,191 +172,191 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2986 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3094 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4219
+#: functions.php:4216
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "无"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4234
+#: functions.php:4231
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4238
+#: functions.php:4235
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4253
+#: functions.php:4250
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4806
+#: functions.php:4803
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "发布文章"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
@@ -365,72 +365,72 @@ msgstr ""
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:5101
+#: functions.php:5098
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5262 functions.php:5349
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5598
+#: functions.php:5595
 #, fuzzy
 msgid "toggle unread"
 msgstr "触发开关"
 
-#: functions.php:5617
+#: functions.php:5614
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5620
+#: functions.php:5617
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5623
+#: functions.php:5620
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5627
+#: functions.php:5624
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5626 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6402
+#: functions.php:6399
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 msgstr ""
 
@@ -764,23 +764,23 @@ msgstr ""
 msgid "Limit bandwidth usage"
 msgstr ""
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "通用OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "导入 OPML（需要DOMXML扩展）"
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "导入 OPML（需要DOMXMDocmentL扩展）"
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
@@ -1125,26 +1125,31 @@ msgstr "你好,"
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "添加分类 <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "已导入"
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK！"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "解析文档时发生错误。"
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传OPML文件。"
 
@@ -1617,53 +1622,68 @@ msgstr "未找到文章。"
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
+
+#: modules/pref-feeds.php:1489
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "显示标签"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1506
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "显示标签"
-
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
-msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
-
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -2412,8 +2432,10 @@ msgid "No labels are selected."
 msgstr "未选定标记."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "移除选定用户?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2657,6 +2679,9 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Please enter a note for this article:"
 msgstr "请输入标签主题"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "移除选定用户?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "添加feed中..."