Index: mythplugins/mythbrowser/i18n/translate.pro
===================================================================
--- mythplugins/mythbrowser/i18n/translate.pro	(revision 21427)
+++ mythplugins/mythbrowser/i18n/translate.pro	(working copy)
@@ -1,6 +1,8 @@
 SOURCES += ../mythbrowser/webpage.cpp
 SOURCES += ../mythbrowser/mythbrowser.cpp
-SOURCES += ../mythbookmarkmanager/bookmarkmanager.cpp
+SOURCES += ../mythbrowser/bookmarkmanager.cpp
+SOURCES += ../mythbrowser/bookmarkeditor.cpp
+SOURCES += ./themestrings.h
 
 TRANSLATIONS  = mythbrowser_de.ts mythbrowser_sl.ts mythbrowser_fr.ts
 TRANSLATIONS += mythbrowser_sv.ts mythbrowser_nl.ts mythbrowser_nb.ts
Index: mythplugins/mythbrowser/i18n/mythbrowser_sv.ts
===================================================================
--- mythplugins/mythbrowser/i18n/mythbrowser_sv.ts	(revision 21427)
+++ mythplugins/mythbrowser/i18n/mythbrowser_sv.ts	(working copy)
@@ -1,346 +1,224 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1">
+<!DOCTYPE TS>
+<TS version="2.0" language="sv_SE">
 <context>
+    <name>BookmarkEditor</name>
+    <message>
+        <source>Edit Bookmark Details</source>
+        <translation>Redigera bokmärkesinformation</translation>
+    </message>
+    <message>
+        <source>Enter Bookmark Details</source>
+        <translation>Ange bokmärkesinformation</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Sök...</translation>
+    </message>
+    <message>
+        <source>Select a category</source>
+        <translation>Välj en kategori</translation>
+    </message>
+</context>
+<context>
     <name>BookmarkManager</name>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="163"/>
         <source>No bookmarks defined.
 
 Use the &apos;Add Bookmark&apos; menu option to add new bookmarks</source>
         <translation>Inga bokmärken definierade.
 
-Använd &apos;Lägg till bokmärke&apos; meny val för att lägga till nya bokmärken</translation>
+Använd menyalternativet &apos;Lägg till bokmärke&apos; för att lägga till nya bokmärken</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="277"/>
         <source>Actions</source>
-        <translation>Åtgärd</translation>
+        <translation>Åtgärder</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="292"/>
         <source>Add Bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="296"/>
         <source>Edit Bookmark</source>
         <translation>Redigera bokmärke</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="297"/>
         <source>Delete Bookmark</source>
-        <translation>Radera bokmärke</translation>
+        <translation>Ta bort bokmärke</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="298"/>
-        <source>Show bookmark</source>
+        <source>Show Bookmark</source>
         <translation>Visa bokmärke</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="303"/>
         <source>Delete Marked</source>
-        <translation>Radera markerade</translation>
+        <translation>Ta bort markerade</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="309"/>
         <source>Show Marked</source>
         <translation>Visa markerade</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="311"/>
         <source>Clear Marked</source>
         <translation>Rensa markerade</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="314"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="472"/>
         <source>Are you sure you want to delete the selected bookmark</source>
-        <translation>Säker på att du vill radera valt bokmärke</translation>
+        <translation>Är du säker på att du vill ta bort det valda bokmärket</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="516"/>
         <source>Are you sure you want to delete the marked bookmarks</source>
-        <translation>Säker på att du vill radera markerade bokmärken</translation>
+        <translation>Är du säker på att du vill ta bort de markerade bokmärkena</translation>
     </message>
 </context>
 <context>
-    <name>Bookmarks</name>
-    <message>
-        <location filename="" line="0"/>
-        <source>MythBrowser: Select group or single site to view</source>
-        <translation type="obsolete">MythBrowser: Välj grupp eller enstaka sida att se</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarksConfig</name>
-    <message>
-        <location filename="" line="0"/>
-        <source>MythBrowser Bookmarks Settings</source>
-        <translation type="obsolete">MythBrowser bokmärkesinställningar</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Press the &apos;New Bookmark&apos; button to add a new site/group.
-Pressing SPACE/Enter on a selected entry removes it from the listview.</source>
-        <translation type="obsolete">Tryck på knappen &apos;Nytt bokmärke&apos; för att lägga till en ny sida/grupp.
-Ett tryck på Mellanslag/Enter på en markerad post tar bort den från listvisaren.</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Zoom [%]:</source>
-        <translation type="obsolete">Zoom [%]:</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Browser:</source>
-        <translation type="obsolete">Webbläsare:</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Hide Scrollbars</source>
-        <translation type="obsolete">Dölj rullningslister</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Scroll Page</source>
-        <translation type="obsolete">Rulla sida</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Scroll Speed:</source>
-        <translation type="obsolete">Rullningshastighet:</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>&amp;New Bookmark</source>
-        <translation type="obsolete">&amp;Nytt bokmärke</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Add a new Website</source>
-        <translation type="obsolete">Lägg till en ny webbsida</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>&amp;Finish</source>
-        <translation type="obsolete">&amp;Avsluta</translation>
-    </message>
-</context>
-<context>
     <name>BrowserConfig</name>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="45"/>
         <source>MythBrowser Settings</source>
-        <translation>MythWebbläsaren inställningar</translation>
+        <translation>Inställning av Mythbrowser</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="66"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="67"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="119"/>
-        <source>This is the command that will be used to show the web browser. The default is to use MythBrowser.</source>
-        <translation>Dethär är kommandot som används för att visa webbläsaren. Som förinställt används MythWebbläsaren.</translation>
+        <source>This is the command that will be used to show the web browser. Use &apos;Internal&apos; to use the built in web browser&apos;. %ZOOM% and %URL% will be replaced with the zoom level and URL list.</source>
+        <translation>Detta är kommandot som kommer att användas för att visa webbläsaren. Använd &apos;Internal&apos; för att använda den inbyggda webbläsaren. %ZOOM% och %URL% ersätts av zoomnivån och webbadresslistan.</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="123"/>
-        <source>This is the default text size that will be used. Valid values are from 0.3 to 5.0 with 1.0 being normal size less than 1 is smaller and greater than 1 is larger than normal size.</source>
-        <translation>Dethär är förinställda textstorlek som används. Giltiga värden är från 0.3 till 5.0 med 1.0 som normal storlek mindre än 1 är mindre och högre än 1 är större än normal storlek.</translation>
+        <source>This is the default text size that will be used. Valid values for the Internal browser are from 0.3 to 5.0 with 1.0 being normal size less than 1 is smaller and greater than 1 is larger than normal size.</source>
+        <translation>Detta är den förvalda textstorleken som kommer att användas. Giltiga värden för den interna webbläsaren är från 0,3 till 5,0, där 1,0 är normal storlek. Mindre än 1 är mindre, och större än 1 är större än normal storlek.</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="125"/>
         <source>Exit without saving settings</source>
-        <translation>Avslut utan att spara inställningar</translation>
+        <translation>Avsluta utan att spara inställningarna</translation>
     </message>
     <message>
-        <location filename="../mythbookmarkmanager/bookmarkmanager.cpp" line="127"/>
         <source>Save settings and Exit</source>
-        <translation>Spara inställningar och avslut</translation>
+        <translation>Spara inställningar och avsluta</translation>
     </message>
 </context>
 <context>
     <name>MythBrowser</name>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="376"/>
         <source>Enter URL</source>
-        <translation>Skriv in adress</translation>
+        <translation>Skriv in webbadress</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="260"/>
         <source>Loading...</source>
         <translation>Laddar...</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="363"/>
         <source>Actions</source>
-        <translation>Åtgärd</translation>
+        <translation>Åtgärder</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="379"/>
         <source>Back</source>
         <translation>Bakåt</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="382"/>
         <source>Forward</source>
         <translation>Framåt</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="384"/>
         <source>Zoom In</source>
         <translation>Zooma in</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="385"/>
         <source>Zoom Out</source>
         <translation>Zooma ut</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="386"/>
         <source>New Tab</source>
-        <translation>Ny tab</translation>
+        <translation>Ny flik</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="389"/>
         <source>Delete Tab</source>
-        <translation>Radera tab</translation>
+        <translation>Ta bort flik</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="394"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="391"/>
-        <source>Edit Bookmarks</source>
-        <translation>Redigera bokmärken</translation>
-    </message>
-    <message>
-        <location filename="../mythbrowser/mythbrowser.cpp" line="392"/>
         <source>Add Bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
 </context>
 <context>
-    <name>PopupBox</name>
+    <name>ThemeUI</name>
     <message>
-        <location filename="" line="0"/>
-        <source>Add New Website</source>
-        <translation type="obsolete">Lägg till ny webbsida</translation>
+        <source>Bookmark Manager</source>
+        <translation>Bokmärkeshanterare</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Group:</source>
-        <translation type="obsolete">Grupp:</translation>
+        <source>Category</source>
+        <translation>Kategori</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Description:</source>
-        <translation type="obsolete">Beskrivning:</translation>
+        <source>[x]</source>
+        <translation>[x]</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>URL:</source>
-        <translation type="obsolete">URL:</translation>
+        <source>Name</source>
+        <translation>Namn</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>&amp;Ok</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <source>URL</source>
+        <translation>Adress</translation>
     </message>
-</context>
-<context>
-    <name>TabView</name>
     <message>
-        <location filename="" line="0"/>
-        <source>MythBrowser Menu</source>
-        <translation type="obsolete">MythBrowser-meny</translation>
+        <source>Category:</source>
+        <translation>Kategori:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Save Link in Bookmarks</source>
-        <translation type="obsolete">Spara länk i bokmärken</translation>
+        <source>Find...</source>
+        <translation>Sök...</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Enter URL</source>
-        <translation type="obsolete">Skriv in adress</translation>
+        <source>Name:</source>
+        <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>OK</source>
-        <translation type="obsolete">OK</translation>
+        <source>URL:</source>
+        <translation>Adress:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
         <source>Cancel</source>
-        <translation type="obsolete">Avbryt</translation>
+        <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Back</source>
-        <translation type="obsolete">Bakåt</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Next Tab</source>
-        <translation type="obsolete">Nästa flik</translation>
+        <source>Browser Command:</source>
+        <translation>Webbläsarkommando:</translation>
     </message>
     <message>
-        <location filename="" line="0"/>
-        <source>Prev Tab</source>
-        <translation type="obsolete">Föregående flik</translation>
+        <source>Text Size:</source>
+        <translation>Textstorlek:</translation>
     </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Remove Tab</source>
-        <translation type="obsolete">Ta bort flik</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Zoom Out</source>
-        <translation type="obsolete">Zooma ut</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Zoom In</source>
-        <translation type="obsolete">Zooma in</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Add New Bookmark</source>
-        <translation type="obsolete">Lägg till nytt bokmärke</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Group:</source>
-        <translation type="obsolete">Grupp:</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>Description:</source>
-        <translation type="obsolete">Beskrivning:</translation>
-    </message>
-    <message>
-        <location filename="" line="0"/>
-        <source>URL:</source>
-        <translation type="obsolete">URL:</translation>
-    </message>
 </context>
 <context>
     <name>WebPage</name>
     <message>
-        <location filename="../mythbrowser/webpage.cpp" line="129"/>
         <source>Loading...</source>
         <translation>Laddar...</translation>
     </message>
Index: mythplugins/mythbrowser/i18n/themestrings.h
===================================================================
--- mythplugins/mythbrowser/i18n/themestrings.h	(revision 0)
+++ mythplugins/mythbrowser/i18n/themestrings.h	(revision 0)
@@ -0,0 +1,32 @@
+void strings_null() {
+    ThemeUI::tr("Bookmark Manager");
+    ThemeUI::tr("Category");
+    ThemeUI::tr("[x]");
+    ThemeUI::tr("Name");
+    ThemeUI::tr("URL");
+    ThemeUI::tr("Category:");
+    ThemeUI::tr("Find...");
+    ThemeUI::tr("Name:");
+    ThemeUI::tr("URL:");
+    ThemeUI::tr("Cancel");
+    ThemeUI::tr("Ok");
+    ThemeUI::tr("Browser Command:");
+    ThemeUI::tr("Text Size:");
+    ThemeUI::tr("Cancel");
+    ThemeUI::tr("Ok");
+    ThemeUI::tr("Bookmark Manager");
+    ThemeUI::tr("Category");
+    ThemeUI::tr("[x]");
+    ThemeUI::tr("Name");
+    ThemeUI::tr("URL");
+    ThemeUI::tr("Category:");
+    ThemeUI::tr("Find...");
+    ThemeUI::tr("Name:");
+    ThemeUI::tr("URL:");
+    ThemeUI::tr("Cancel");
+    ThemeUI::tr("Ok");
+    ThemeUI::tr("Browser Command:");
+    ThemeUI::tr("Text Size:");
+    ThemeUI::tr("Cancel");
+    ThemeUI::tr("Ok");
+}
