diff --git a/l10n/cs_CZ/koreader.po b/l10n/cs_CZ/koreader.po
index ac7c12925..a01c12a92 100644
--- a/l10n/cs_CZ/koreader.po
+++ b/l10n/cs_CZ/koreader.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-03 16:27+0000\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
 "Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/koreader/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr "10 stupňu"
 msgid "5 deg"
 msgstr "5 stupňu"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Automaticky"
@@ -45,27 +49,27 @@ msgstr "Automaticky"
 msgid "Auto Straighten"
 msgstr "Automatické vyrovnání"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Automatické rozpoznání Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Automatické rozpoznání Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Automatické rozpoznání Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Automatické rozpoznání Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Automatické rozpoznání Kindle PaperWhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Automatické rozpoznání Kindle Touch"
 
@@ -113,10 +117,18 @@ msgstr "Zmenšit mezery mezi slovy na"
 msgid "Defect Size"
 msgstr "Změnit velikost"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Nabídka dokument"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Vložený styl"
@@ -149,6 +161,10 @@ msgstr "Gama"
 msgid "Help"
 msgstr "Nápověda"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Hlavní nabídka"
@@ -193,11 +209,15 @@ msgstr "Poslední dokumenty"
 msgid "Line Spacing"
 msgstr "Řádkování"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Engine pro tento soubor nenalezen"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Nepodporovaný typ zařízení!"
 
@@ -267,6 +287,10 @@ msgstr "Nastavit velikost písma na"
 msgid "Set render style"
 msgstr "Nastavit způsob vykreslování"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Zobrazit hlavní nabídku"
@@ -283,7 +307,7 @@ msgstr "Obsah"
 msgid "Table of contents"
 msgstr "Obsah"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Tlačítko"
 
@@ -363,7 +387,8 @@ msgstr "vyčistit všechny externí styly"
 msgid "close config menu"
 msgstr "zavřít konfigurační nabídku"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "zavřít dialog"
 
@@ -459,7 +484,7 @@ msgstr "jít na předešlou stranu nabídky"
 msgid "high"
 msgstr "vysoký"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr ""
 
diff --git a/l10n/de/koreader.po b/l10n/de/koreader.po
index 4f6dece17..af34c0fd1 100644
--- a/l10n/de/koreader.po
+++ b/l10n/de/koreader.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-03 19:16+0000\n"
-"Last-Translator: Yim4\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
+"Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/koreader/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,6 +38,10 @@ msgstr "10°"
 msgid "5 deg"
 msgstr "5°"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Auto"
@@ -46,27 +50,27 @@ msgstr "Auto"
 msgid "Auto Straighten"
 msgstr "Auto-Begradigen"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Automatisch erkannter Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Automatisch erkannter Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Automatisch erkannter Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Automatisch erkannter Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Automatisch erkannter Kindle PaperWhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Automatisch erkannter Kindle Touch"
 
@@ -114,10 +118,18 @@ msgstr "Zeilenabstand verringern auf"
 msgid "Defect Size"
 msgstr "Stoerflecken-Groeße"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Dokument-Menue"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Eingebetteter Stil"
@@ -150,6 +162,10 @@ msgstr "Gamma"
 msgid "Help"
 msgstr "Hilfe"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Start-Menue"
@@ -194,11 +210,15 @@ msgstr "Zuletzt betrachtete Dokumente"
 msgid "Line Spacing"
 msgstr "Zeilenabstand"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Kein Lese-Modul fuer diese Datei"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Nicht unterstuetztes Geraete-Modell!"
 
@@ -268,6 +288,10 @@ msgstr "Schriftgroeße setzen auf"
 msgid "Set render style"
 msgstr "Darstellungs-Stil setzen"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Zeige das Start-Menue"
@@ -284,7 +308,7 @@ msgstr "Inhaltsverzeichnis"
 msgid "Table of contents"
 msgstr "Inhaltsverzeichnis"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Button antippen"
 
@@ -364,7 +388,8 @@ msgstr "Externe Stile bereinigen"
 msgid "close config menu"
 msgstr "Konfigurationsmenue schließen"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "Dialog schließen"
 
@@ -460,7 +485,7 @@ msgstr "Zur vorangegangenen Seite des Menues springen"
 msgid "high"
 msgstr "hoch"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr "Text markieren"
 
diff --git a/l10n/fr/koreader.po b/l10n/fr/koreader.po
index c9d4a06bb..5cfa1e591 100644
--- a/l10n/fr/koreader.po
+++ b/l10n/fr/koreader.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-05 11:12+0000\n"
-"Last-Translator: heliox <heliox17@hotmail.com>\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
+"Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/koreader/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,6 +40,10 @@ msgstr "10 degrés"
 msgid "5 deg"
 msgstr "5 degrés"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Automatique"
@@ -48,27 +52,27 @@ msgstr "Automatique"
 msgid "Auto Straighten"
 msgstr "Redressement automatique"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Kindle 2 auto-détecté"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Kindle 3 auto-détecté"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Kindle 4 auto-détecté"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Kindle DXG auto-détecté "
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Kindle PaperWhite auto-détecté"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Kindle Touch auto-détecté"
 
@@ -116,10 +120,18 @@ msgstr "Réduire l'interligne à"
 msgid "Defect Size"
 msgstr "Taille du défaut"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Menu des documents"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Style intégré"
@@ -152,6 +164,10 @@ msgstr "Gamma"
 msgid "Help"
 msgstr "Aide"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Menu d'accueil"
@@ -196,11 +212,15 @@ msgstr "Derniers documents"
 msgid "Line Spacing"
 msgstr "Interligne"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Pas de moteur de lecture pour ce fichier"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr " Appareil non pris en charge"
 
@@ -270,6 +290,10 @@ msgstr "Définir la taille de police à"
 msgid "Set render style"
 msgstr "Définir le style de rendu"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Montrer le Menu d'accueil"
@@ -286,7 +310,7 @@ msgstr "Sommaire"
 msgid "Table of contents"
 msgstr "Sommaire"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Bouton d'activation"
 
@@ -366,7 +390,8 @@ msgstr "enlever tous les styles externes"
 msgid "close config menu"
 msgstr "fermer le menu de configuration"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "fermer le dialogue"
 
@@ -462,7 +487,7 @@ msgstr "aller à la page précédente du menu"
 msgid "high"
 msgstr "haut"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr "surligner le texte"
 
diff --git a/l10n/it_IT/koreader.po b/l10n/it_IT/koreader.po
index fc20bd9fe..36a90f030 100644
--- a/l10n/it_IT/koreader.po
+++ b/l10n/it_IT/koreader.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-03 16:27+0000\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
 "Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/koreader/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -38,6 +38,10 @@ msgstr "10°"
 msgid "5 deg"
 msgstr "5°"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Automatico"
@@ -46,27 +50,27 @@ msgstr "Automatico"
 msgid "Auto Straighten"
 msgstr "Auto raddrizzamento"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Auto-rilevamento Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Auto-rilevamento Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Auto-rilevamento Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Auto-rilevamento Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Auto-rilevamento Kindle PaperWhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Auto-rilevamento Kindle Touch"
 
@@ -114,10 +118,18 @@ msgstr "Diminuisci interlinea a"
 msgid "Defect Size"
 msgstr "Difetti di scansione"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Menu documento"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Stile incorporato"
@@ -150,6 +162,10 @@ msgstr "Gamma"
 msgid "Help"
 msgstr "Aiuto"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Menu principale"
@@ -194,11 +210,15 @@ msgstr "Documenti recenti"
 msgid "Line Spacing"
 msgstr "Interlinea"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Nessun motore di lettura per questo file"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Modello non supportato!"
 
@@ -268,6 +288,10 @@ msgstr "Cambia dimensione carattere"
 msgid "Set render style"
 msgstr "cambia modalità di rendering"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Mostra menu principale"
@@ -284,7 +308,7 @@ msgstr "Sommario"
 msgid "Table of contents"
 msgstr "Sommario"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Premi a fondo"
 
@@ -364,7 +388,8 @@ msgstr "cancella tutti gli stili esterni"
 msgid "close config menu"
 msgstr "chiudi menu configura"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "Chiudi"
 
@@ -460,7 +485,7 @@ msgstr "Vai alla pagina precedente del menu"
 msgid "high"
 msgstr "alto"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr ""
 
diff --git a/l10n/pl/koreader.po b/l10n/pl/koreader.po
index d069da2fb..9822e1aee 100644
--- a/l10n/pl/koreader.po
+++ b/l10n/pl/koreader.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-06 08:32+0000\n"
-"Last-Translator: danan_72 <piotr.martyni@gmail.com>\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
+"Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/koreader/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,6 +39,10 @@ msgstr "10 stopni"
 msgid "5 deg"
 msgstr "5 stopni"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Automatycznie"
@@ -47,27 +51,27 @@ msgstr "Automatycznie"
 msgid "Auto Straighten"
 msgstr "Automatyczne wyrównanie"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Automatycznie wykryty Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Automatycznie wykryty Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Automatycznie wykryty Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Automatycznie wykryty Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Automatycznie wykryty Kindle PaperWhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Automatycznie wykryty Kindle Touch"
 
@@ -115,10 +119,18 @@ msgstr "Zmniejsz odstęp między liniami do "
 msgid "Defect Size"
 msgstr "Rozmiar defektu"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Menu dokumentu"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Wbudowany styl"
@@ -151,6 +163,10 @@ msgstr "Gamma"
 msgid "Help"
 msgstr "Pomoc"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Menu główne"
@@ -195,11 +211,15 @@ msgstr "Ostatnie dokumenty"
 msgid "Line Spacing"
 msgstr "Odstępy między liniami"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Brak obsługi dla tego pliku"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Nieobsługiwany model urządzenia!"
 
@@ -269,6 +289,10 @@ msgstr "Ustaw rozmiar czcionki na "
 msgid "Set render style"
 msgstr "Ustaw tryb renderowania"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Pokaż menu główne"
@@ -285,7 +309,7 @@ msgstr "Spis treści"
 msgid "Table of contents"
 msgstr "Spis treści"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Przycisk"
 
@@ -365,7 +389,8 @@ msgstr "wyczyść wszystkie zewnętrzne style"
 msgid "close config menu"
 msgstr "wybierz menu konfiguracji"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "zamknij dialog"
 
@@ -461,7 +486,7 @@ msgstr "idź do poprzedniej strony menu"
 msgid "high"
 msgstr "wysoki"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr "podkreśl tekst"
 
diff --git a/l10n/pt_BR/koreader.po b/l10n/pt_BR/koreader.po
index 2acc188ca..182727400 100644
--- a/l10n/pt_BR/koreader.po
+++ b/l10n/pt_BR/koreader.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-27 17:08+0000\n"
-"Last-Translator: Antoine Kamel <antoine12@gmail.com>\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
+"Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/koreader/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,6 +38,10 @@ msgstr "10º"
 msgid "5 deg"
 msgstr "5º"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Automático"
@@ -46,27 +50,27 @@ msgstr "Automático"
 msgid "Auto Straighten"
 msgstr "Autoalinhar"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Autodetectado Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Autodetectado Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Autodetectado Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Autodetectado Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Autodetectado Kindle Paperwhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Autodetectado Kindle Touch"
 
@@ -114,10 +118,18 @@ msgstr "Diminuir entrelinhas para"
 msgid "Defect Size"
 msgstr "Tamanho do defeito"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Menu do documento"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Estilo embutido"
@@ -150,6 +162,10 @@ msgstr "Gamute"
 msgid "Help"
 msgstr "Ajuda"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Menu Principal"
@@ -194,11 +210,15 @@ msgstr "Documentos recentes"
 msgid "Line Spacing"
 msgstr "Entrelinhas"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Não há suporte para esse arquivo"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Modelo de aparelho não suportado!"
 
@@ -268,6 +288,10 @@ msgstr "Mudar tamanho de fonte para"
 msgid "Set render style"
 msgstr "Escolher estilo de exibição"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Exibir Menu Principal"
@@ -284,7 +308,7 @@ msgstr "Sumário"
 msgid "Table of contents"
 msgstr "Sumário"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Tocar no Botão"
 
@@ -364,7 +388,8 @@ msgstr "limpar todos os estilos externos"
 msgid "close config menu"
 msgstr "fechar menu de configuração"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "fechar diálogo"
 
@@ -460,7 +485,7 @@ msgstr "ir para página anterior do menu"
 msgid "high"
 msgstr "alto"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr "Destacar texto"
 
diff --git a/l10n/ru/koreader.po b/l10n/ru/koreader.po
index 1e608b212..a51285548 100644
--- a/l10n/ru/koreader.po
+++ b/l10n/ru/koreader.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-03 16:27+0000\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
 "Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/koreader/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -37,6 +37,10 @@ msgstr "10 градусов"
 msgid "5 deg"
 msgstr "5 градусов"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Авто"
@@ -45,27 +49,27 @@ msgstr "Авто"
 msgid "Auto Straighten"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Авто-определение Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Авто-определение Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Авто-определение Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Авто-определение Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Авто-определение Kindle PaperWhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Авто-определение Kindle Touch"
 
@@ -113,10 +117,18 @@ msgstr "Уменьшить межстрочное расстояние до"
 msgid "Defect Size"
 msgstr "Defect Size"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Меню документа"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Встроенные стили"
@@ -149,6 +161,10 @@ msgstr "Гамма"
 msgid "Help"
 msgstr "Помощь"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Меню"
@@ -193,11 +209,15 @@ msgstr "Последние документы"
 msgid "Line Spacing"
 msgstr "Строковое расстояние"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Нет движка ридера для этого файла"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Модель устройства не поддерживается!"
 
@@ -267,6 +287,10 @@ msgstr "Установить размер шрифта"
 msgid "Set render style"
 msgstr "Установить стиль отрисовки"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Показать Меню"
@@ -283,7 +307,7 @@ msgstr "Оглавление"
 msgid "Table of contents"
 msgstr "Оглавление"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Нажать Кнопку"
 
@@ -363,7 +387,8 @@ msgstr "очистить все внешние стили"
 msgid "close config menu"
 msgstr "закрыть меню конфигов"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "закрыть диалог"
 
@@ -459,7 +484,7 @@ msgstr "перейти к предыдущей странице меню"
 msgid "high"
 msgstr "выше"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr ""
 
diff --git a/l10n/sv/koreader.po b/l10n/sv/koreader.po
index 5aa640532..23ee9212d 100644
--- a/l10n/sv/koreader.po
+++ b/l10n/sv/koreader.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-21 06:11+0000\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
 "Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/koreader/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "5 deg"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr ""
@@ -44,27 +48,27 @@ msgstr ""
 msgid "Auto Straighten"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr ""
 
@@ -112,10 +116,18 @@ msgstr ""
 msgid "Defect Size"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr ""
@@ -148,6 +160,10 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr ""
@@ -192,11 +208,15 @@ msgstr ""
 msgid "Line Spacing"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr ""
 
@@ -266,6 +286,10 @@ msgstr ""
 msgid "Set render style"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr ""
@@ -282,7 +306,7 @@ msgstr ""
 msgid "Table of contents"
 msgstr ""
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr ""
 
@@ -362,7 +386,8 @@ msgstr ""
 msgid "close config menu"
 msgstr ""
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr ""
 
@@ -458,7 +483,7 @@ msgstr ""
 msgid "high"
 msgstr ""
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr ""
 
diff --git a/l10n/templates/koreader.pot b/l10n/templates/koreader.pot
index 71fdb3109..0fa8c8ec0 100644
--- a/l10n/templates/koreader.pot
+++ b/l10n/templates/koreader.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-06 06:39+0000\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,11 @@ msgid ""
 "5 deg"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid ""
+"Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid ""
 "Auto"
@@ -47,32 +52,32 @@ msgid ""
 "Auto Straighten"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid ""
 "Auto-detected Kindle 2"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid ""
 "Auto-detected Kindle 3"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid ""
 "Auto-detected Kindle 4"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid ""
 "Auto-detected Kindle DXG"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid ""
 "Auto-detected Kindle PaperWhite"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid ""
 "Auto-detected Kindle Touch"
 msgstr ""
@@ -132,11 +137,21 @@ msgid ""
 "Defect Size"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid ""
+"Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid ""
 "Document menu"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid ""
+"Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid ""
 "Embedded style"
@@ -177,6 +192,11 @@ msgid ""
 "Help"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid ""
+"Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid ""
 "Home menu"
@@ -232,12 +252,17 @@ msgid ""
 "Line Spacing"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid ""
+"More"
+msgstr ""
+
 #: reader.lua:127
 msgid ""
 "No reader engine for this file"
 msgstr ""
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid ""
 "Not supported device model!"
 msgstr ""
@@ -247,7 +272,7 @@ msgid ""
 "OK"
 msgstr ""
 
-#: frontend/ui/widget/touchmenu.lua:332
+#: frontend/ui/widget/touchmenu.lua:338
 msgid ""
 "Page "
 msgstr ""
@@ -325,6 +350,11 @@ msgid ""
 "Set render style"
 msgstr ""
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid ""
+"Share"
+msgstr ""
+
 #: reader.lua:18
 msgid ""
 "Show Home Menu"
@@ -345,7 +375,7 @@ msgid ""
 "Table of contents"
 msgstr ""
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid ""
 "Tap Button"
 msgstr ""
@@ -446,6 +476,7 @@ msgid ""
 "close config menu"
 msgstr ""
 
+#: frontend/ui/widget/buttontable.lua:18
 #: frontend/ui/widget/dict.lua:20
 #: frontend/ui/widget/infomessage.lua:18
 msgid ""
@@ -568,7 +599,7 @@ msgid ""
 "high"
 msgstr ""
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid ""
 "highlight text"
 msgstr ""
diff --git a/l10n/tr/koreader.po b/l10n/tr/koreader.po
index ff01a75df..66d2f7a77 100644
--- a/l10n/tr/koreader.po
+++ b/l10n/tr/koreader.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-03 16:42+0000\n"
-"Last-Translator: thomass <pblcaccess2me@gmail.com>\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
+"Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/koreader/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,6 +37,10 @@ msgstr "10 °"
 msgid "5 deg"
 msgstr "5 °"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "Oto"
@@ -45,27 +49,27 @@ msgstr "Oto"
 msgid "Auto Straighten"
 msgstr "Oto Doğrultma"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "Kindle 2 olarak belirlendi"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "Kindle 3 olarak belirlendi"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "Kindle 4 olarak belirlendi"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "Kindle DXG olarak belirlendi"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "Kindle PaperWhite olarak belirlendi"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "Kindle Touch olarak belirlendi"
 
@@ -113,10 +117,18 @@ msgstr "Satır boşluğunu şuna düşür:"
 msgid "Defect Size"
 msgstr "Bozukluk Büyüklüğü"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "Belge menüsü"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "Gömülü stil"
@@ -149,6 +161,10 @@ msgstr "Gama"
 msgid "Help"
 msgstr "Yardım"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "Ana menü"
@@ -193,11 +209,15 @@ msgstr "Son görüntülenen belgeler"
 msgid "Line Spacing"
 msgstr "Satır boşluğu"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "Bu dosya türü desteklenmiyor"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "Cihaz modeli desteklenmiyor!"
 
@@ -267,6 +287,10 @@ msgstr "Font boyutunu şuna ayarla:"
 msgid "Set render style"
 msgstr "İşleme Stilini Ayarla"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "Ana menüyü görüntüle"
@@ -283,7 +307,7 @@ msgstr "İçindekiler"
 msgid "Table of contents"
 msgstr "İçindekiler"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "Butona Tıklayın"
 
@@ -363,7 +387,8 @@ msgstr "Harici stilleri temizle"
 msgid "close config menu"
 msgstr "Ayar menüsünü kapat"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "Dialogu kapat"
 
@@ -459,7 +484,7 @@ msgstr "menünün önceki sayfasına git"
 msgid "high"
 msgstr "yüksek"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr "yazıyı vurgula"
 
diff --git a/l10n/zh_CN/koreader.po b/l10n/zh_CN/koreader.po
index 04be906d4..fdf6c389e 100644
--- a/l10n/zh_CN/koreader.po
+++ b/l10n/zh_CN/koreader.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KOReader\n"
 "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
-"POT-Creation-Date: 2013-05-03 16:27+0000\n"
-"PO-Revision-Date: 2013-05-03 16:27+0000\n"
+"POT-Creation-Date: 2013-06-16 04:18+0000\n"
+"PO-Revision-Date: 2013-06-16 04:19+0000\n"
 "Last-Translator: houqp <dave2008713@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/koreader/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -38,6 +38,10 @@ msgstr "10度"
 msgid "5 deg"
 msgstr "5度"
 
+#: frontend/ui/reader/readerhighlight.lua:186
+msgid "Add Note"
+msgstr ""
+
 #: frontend/ui/reader/readertypeset.lua:49
 msgid "Auto"
 msgstr "自动"
@@ -46,27 +50,27 @@ msgstr "自动"
 msgid "Auto Straighten"
 msgstr "水平校正"
 
-#: frontend/ui/inputevent.lua:317
+#: frontend/ui/inputevent.lua:347
 msgid "Auto-detected Kindle 2"
 msgstr "自动检测为Kindle 2"
 
-#: frontend/ui/inputevent.lua:313
+#: frontend/ui/inputevent.lua:343
 msgid "Auto-detected Kindle 3"
 msgstr "自动检测为Kindle 3"
 
-#: frontend/ui/inputevent.lua:309
+#: frontend/ui/inputevent.lua:339
 msgid "Auto-detected Kindle 4"
 msgstr "自动检测为Kindle 4"
 
-#: frontend/ui/inputevent.lua:315
+#: frontend/ui/inputevent.lua:345
 msgid "Auto-detected Kindle DXG"
 msgstr "自动检测为Kindle DXG"
 
-#: frontend/ui/inputevent.lua:287
+#: frontend/ui/inputevent.lua:295
 msgid "Auto-detected Kindle PaperWhite"
 msgstr "自动检测为Kindle PaperWhite"
 
-#: frontend/ui/inputevent.lua:307
+#: frontend/ui/inputevent.lua:315
 msgid "Auto-detected Kindle Touch"
 msgstr "自动检测为Kindle Touch"
 
@@ -114,10 +118,18 @@ msgstr "行距减小为"
 msgid "Defect Size"
 msgstr "页面污点"
 
+#: frontend/ui/reader/readerhighlight.lua:97
+msgid "Delete"
+msgstr ""
+
 #: frontend/ui/reader/readermenu.lua:94
 msgid "Document menu"
 msgstr "文档菜单"
 
+#: frontend/ui/reader/readerhighlight.lua:101
+msgid "Edit"
+msgstr ""
+
 #: frontend/ui/data/strings.lua:22
 msgid "Embedded style"
 msgstr "内置CSS"
@@ -150,6 +162,10 @@ msgstr "灰度系数"
 msgid "Help"
 msgstr "帮助"
 
+#: frontend/ui/reader/readerhighlight.lua:182
+msgid "Highlight"
+msgstr ""
+
 #: reader.lua:106
 msgid "Home menu"
 msgstr "主目录"
@@ -194,11 +210,15 @@ msgstr "最后阅读文档"
 msgid "Line Spacing"
 msgstr "行间距"
 
+#: frontend/ui/reader/readerhighlight.lua:198
+msgid "More"
+msgstr ""
+
 #: reader.lua:127
 msgid "No reader engine for this file"
 msgstr "无渲染组件解析此文档"
 
-#: frontend/ui/inputevent.lua:319
+#: frontend/ui/inputevent.lua:349
 msgid "Not supported device model!"
 msgstr "无法支持此设备型号！"
 
@@ -268,6 +288,10 @@ msgstr "设置字体大小"
 msgid "Set render style"
 msgstr "设置渲染样式"
 
+#: frontend/ui/reader/readerhighlight.lua:193
+msgid "Share"
+msgstr ""
+
 #: reader.lua:18
 msgid "Show Home Menu"
 msgstr "显示主菜单"
@@ -284,7 +308,7 @@ msgstr "目录"
 msgid "Table of contents"
 msgstr "目录"
 
-#: frontend/ui/widget/button.lua:55
+#: frontend/ui/widget/button.lua:58
 msgid "Tap Button"
 msgstr "点击按钮"
 
@@ -364,7 +388,8 @@ msgstr "清除外置样式"
 msgid "close config menu"
 msgstr "关闭设置菜单"
 
-#: frontend/ui/widget/dict.lua:20 frontend/ui/widget/infomessage.lua:18
+#: frontend/ui/widget/buttontable.lua:18 frontend/ui/widget/dict.lua:20
+#: frontend/ui/widget/infomessage.lua:18
 msgid "close dialog"
 msgstr "关闭对话框"
 
@@ -460,7 +485,7 @@ msgstr "转到菜单上一页"
 msgid "high"
 msgstr "高"
 
-#: frontend/ui/reader/readerhighlight.lua:9
+#: frontend/ui/reader/readerhighlight.lua:10
 msgid "highlight text"
 msgstr ""