diff --git a/.hgtags b/.hgtags
index d3c9fda..97b57e6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -17,3 +17,4 @@ aca483636af460c93f9817e083e85d1976aa1b7d 0.3.1
 07e901e7e35334e3747358ac5ba829347696a5d6 0.5.0
 4525a844482c54b57cf394887541f6c483c429d7 0.6.0
 ef69515ccafa912360c35a23e303cb180d7e95b9 0.6.1
+605e2b671bf46530fed4a13b2c5924ef1266b132 0.6.2
diff --git a/CHANGELOG b/CHANGELOG
index b50cdbb..46597a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-0.6.2 - 201309XX
+0.6.2 - 20130913
   * Added server side rendering for devices like PRS-TX / Kindle / Cybook. Thanks to all the testers.
   * Added a configuration item to tweak how thumbnail are handled.
   * Fixed the click on cog on IOS. Thanks to sb domo.
@@ -6,7 +6,9 @@
   * Fixed a regression about custom favicon.ico. Thanks to Tyler.
   * Fixed another regression about COPS's version in the about box. Reported by Ian.
   * Upgraded Magnific Popup to v0.9.5.
-  * Add a style for iphone. Thanks to sb domo.  
+  * Added a style for IPhone. Thanks to sb domo.  
+  * Added Portuguese translation. Thanks to Pablo Aguiar.
+  * Fixed rendering on Internet Explorer < 9.0.
   
 0.6.1 - 20130730
   * Properly close the lightbox when clicking in a link. Reported by le_.
diff --git a/base.php b/base.php
index a02f817..b272df9 100644
--- a/base.php
+++ b/base.php
@@ -6,7 +6,7 @@
  * @author     S�bastien Lucas <sebastien@slucas.fr>
  */
 
-define ("VERSION", "0.6.2");
+define ("VERSION", "0.7.0beta");
 define ("DB", "db");
 date_default_timezone_set($config['default_timezone']);
  
@@ -167,6 +167,13 @@ function localize($phrase, $count=-1) {
         $lang_file_content = file_get_contents($lang_file);
         /* Load the language file as a JSON object and transform it into an associative array */
         $translations = json_decode($lang_file_content, true);
+        
+        /* Clean the array of all translations unfinished */
+        foreach ($translations as $key => $val) {
+            if (preg_match ("/^##TODO##/", $key)) {
+                unset ($translations [$key]);
+            }
+        }
         if ($lang_file_en)
         {
             $lang_file_content = file_get_contents($lang_file_en);
diff --git a/book.php b/book.php
index cc2c5b6..b06a567 100644
--- a/book.php
+++ b/book.php
@@ -462,11 +462,13 @@ class Book extends Base {
                           str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text", 
                           array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS)));
         array_push ($result, $entry);
-        $entry = new Entry (localize ("recent.title"), 
-                          self::ALL_RECENT_BOOKS_ID, 
-                          str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text", 
-                          array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)));
-        array_push ($result, $entry);
+        if ($config['cops_recentbooks_limit'] > 0) {
+            $entry = new Entry (localize ("recent.title"), 
+                              self::ALL_RECENT_BOOKS_ID, 
+                              str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text", 
+                              array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)));
+            array_push ($result, $entry);
+        }
         return $result;
     }
         
diff --git a/lang/Localization_ca.json b/lang/Localization_ca.json
index 9d99966..6171cc0 100644
--- a/lang/Localization_ca.json
+++ b/lang/Localization_ca.json
@@ -1,100 +1,244 @@
 {
-"boolean.yes":"si",
-"splitByLetter.letter":"{0} ({1})",
-"home.title":"Catàleg principal",
-"link.fullentry":"Entrada sencera",
-"title.nextpage":"propera pàg. ({0} de {1})",
-"title.lastpage":"pàg. següent (darrera)",
-"title.numberOfPages":"{0} ({1} pàgines)",
-"bookword.title":"Llibres",
-"bookword.none":"Cap llibre",
-"bookword.one":"1 llibre",
-"bookword.many":"{0} llibres",
-"authorword.title":"Autors",
+"##TODO##about.title":"About COPS",
+"allbooks.alphabetical.many":"{0} llibres ordenats alfabèticament",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Índex d'un sol llibre",
+"allbooks.title":"Tots els llibres",
+"authors.alphabetical.many":"{0} autors ordenats alfabèticament",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Índex s'un sol autor",
+"authors.title":"Autors",
+"authorword.many":"{0} autors",
 "authorword.none":"Cap autor",
 "authorword.one":"1 autor",
-"authorword.many":"{0} autors",
-"taglevelword.title":"Nivells d'etiquetes",
-"taglevelword.none":"Cap nivell d'etiquetes",
-"taglevelword.one":"1 nivell d'etiqueta",
-"taglevelword.many":"{0} nivells d'etiquetes",
-"seriesword.none":"Cap sèrie",
-"seriesword.one":"1 sèrie",
-"seriesword.many":"sèries",
-"tagword.title":"Etiquetes",
-"tagword.none":"Cap etiqueta",
-"tagword.one":"1 etiqueta",
-"tagword.many":"etiquetes",
-"content.tags":"Etiquetes:",
-"content.series.data":"Llibre {0} de la sèrie {1}",
-"content.publisher":"Editorial:",
-"content.publisher.data":"Publicat el {1} por {0}",
-"content.summary":"Sinopsi:",
-"bookentry.series":"Llibre {0} de la sèrie {1}",
 "bookentry.author":"{0} de {1}",
-"bookentry.tags":"{0} en {1}",
-"bookentry.ratings":"{0} puntuats {1}",
-"bookentry.goodreads":"El llibre a Goodreads",
-"bookentry.goodreads.review":"Comenta'l a Goodreads",
-"bookentry.goodreads.author":"{0} a Goodreads",
-"bookentry.wikipedia":"El llibre a la Wikipedia",
-"bookentry.wikipedia.author":"{0} a Wikipedia",
-"bookentry.librarything":"El llibre a LibraryThing",
-"bookentry.librarything.author":"{0} a LibraryThing",
-"bookentry.amazon":"El llibre a Amazon",
-"bookentry.amazon.author":"{0} a Amazon",
-"bookentry.isfdb.author":"{0} a ISFDB",
-"bookentry.download":"Descarrega el llibre com a {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Entrada sencera",
-"tags.title":"Etiquetes",
-"tags.categorized":"Llistat per categories de les {0} etiquetes",
-"tags.categorized.single":"Llistat per categories de la única etiqueta",
-"tags.alphabetical.many":"{0} etiquetes ordenades alfabèticament",
-"tags.alphabetical.one":"Llistat alfabètic de la única etiqueta",
-"splitByLetter.tag.other":"Altres etiquetes",
-"authors.series.title":"Sèries",
-"authors.title":"Autors",
-"authors.alphabetical.many":"{0} autors ordenats alfabèticament",
-"authors.alphabetical.one":"Índex s'un sol autor",
-"splitByLetter.author.other":"Altres autors",
-"series.title":"Sèries",
-"series.alphabetical.many":"{0} sèries ordenades alfabèticament",
-"series.alphabetical.one":"Índex alfabètic d'una sola sèrie",
-"splitByLetter.series.other":"Altres sèries",
-"recent.title":"Els més recents",
-"recent.list":"{0} darrers títols incorporats",
-"recent.list.single":"El llibre més recent",
-"rating.title":"Valoració",
-"rating.summary":"{0}, agrupats per valoració",
-"allbooks.title":"Tots els llibres",
-"allbooks.alphabetical.many":"{0} llibres ordenats alfabèticament",
-"allbooks.alphabetical.one":"Índex d'un sol llibre",
-"splitByLetter.book.other":"Altres llibres",
-"main.title":"Biblioteca generada per Calibre",
-"main.summary":"{0} ha catalogat {1}",
-"i18n.downloads":"Descàrregues, enllaços i altres catàlegs",
-"i18n.links":"Enllaços i altres catàlegs",
-"i18n.downloadfile":"Descarregar arxiu",
-"i18n.downloadsection":"Descàrregues, enllaços i més",
-"i18n.relatedsection":"Catàlegs relacionats",
-"i18n.linksection":"Enllaços externs",
-"i18n.backToMain":"Tornar a la pàgina d'inici del catàleg",
-"i18n.summarysection":"Resum",
-"i18n.dateGenerated":"Catàleg creat el {0}",
-"deeplevel.summary":"{0} per autors, etiquetes, etc.",
-"about.summary":"Notes d'ús",
-"usage.intro":"Les opcions provenen de l'arxiu de configuració present a: {0}",
+"bookword.many":"{0} llibres",
+"bookword.none":"Cap llibre",
+"bookword.one":"1 llibre",
+"bookword.title":"Llibres",
+"##TODO##content.series":"Series:",
+"content.series.data":"Llibre {0} de la sèrie {1}",
+"content.summary":"Sinopsi:",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"##TODO##home.alternate":"Home",
+"##TODO##i18n.coversection":"Cover",
 "language.title":"Idioma",
-"config.Language.description":"Aquesta opció canvia l'idioma del programa; fes servir un codi ISO estàndard, p.e: EN, FR, DE, ES...)",
-"config.Language.possible":"Valors posibles: {0}",
-"intro.goal":"Genear catàleg OPDS i HTML des de la biblioteca del Calibre",
-"intro.team.title":"L'equip de Calibre2Opds:",
-"intro.team.list1":"David Pierron - Programador principal",
-"intro.team.list2":"Dave Walker - gurú, opcions, gestió i tester extraordinari",
-"intro.team.list4":"Douglas Steele - programador",
-"intro.team.list5":"Jane Litte - beta tester i recolzament moral",
-"intro.thanks.1":"Gràcies especials a Kb Sriram, que no només ha programat Trook, un gestor de biblioteques OPDS excel·lent i compatible",
-"intro.thanks.2":"amb el Nook, sinó que, a més, ha estat tan amable de donar un Nook",
-"fin":"fi"
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"##TODO##paging.next.alternate":"Next",
+"##TODO##paging.previous.alternate":"Previous",
+"##TODO##permalink.alternate":"Permalink",
+"##TODO##pubdate.title":"Publication year",
+"recent.list":"{0} darrers títols incorporats",
+"recent.title":"Els més recents",
+"##TODO##search.alternate":"Search",
+"##TODO##search.result":"Search result for *{0}*",
+"##TODO##search.sortorder.asc":"Asc",
+"##TODO##search.sortorder.desc":"Desc",
+"series.alphabetical.many":"{0} sèries ordenades alfabèticament",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Índex alfabètic d'una sola sèrie",
+"series.title":"Sèries",
+"##TODO##sort.alternate":"Sort",
+"splitByLetter.book.other":"Altres llibres",
+"splitByLetter.letter":"{0} ({1})",
+"tags.alphabetical.many":"{0} etiquetes ordenades alfabèticament",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Llistat alfabètic de la única etiqueta",
+"tags.title":"Etiquetes",
+"tagword.title":"Etiquetes",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_de.json b/lang/Localization_de.json
index 2ecc1e4..e914fbf 100644
--- a/lang/Localization_de.json
+++ b/lang/Localization_de.json
@@ -1,123 +1,244 @@
 {
-"boolean.no":"nein",
-"boolean.yes":"ja",
-"splitByLetter.letter":"{0} unter {1}",
-"home.title":"Hauptkatalog",
-"link.fullentry":"Vollständiger Eintrag",
-"title.nextpage":"nächste Seite ({0} von {1})",
-"title.lastpage":"nächste Seite (letzte)",
-"title.numberOfPages":"{0} ({1} Seiten)",
-"bookword.title":"Bücher",
-"bookword.none":"Kein Buch",
-"bookword.one":"1 Buch",
-"bookword.many":"{0} Bücher",
-"authorword.title":"Autoren",
+"##TODO##about.title":"About COPS",
+"allbooks.alphabetical.many":"Alphabetischer Index der {0} Bücher",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Alphabetischer Index des einzigen Buchs",
+"allbooks.title":"Alle Bücher",
+"authors.alphabetical.many":"Alphabetischer Index der {0} Autoren",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Alphabetischer Index des Autors",
+"authors.title":"Autoren",
+"authorword.many":"{0} Autoren",
 "authorword.none":"Kein Autor",
 "authorword.one":"1 Autor",
-"authorword.many":"{0} Autoren",
-"taglevelword.title":"Schlagwortebenen",
-"taglevelword.none":"Keine Schlagwortebene",
-"taglevelword.one":"1 Schlagwortebene",
-"taglevelword.many":"{0} Schlagwortebenen",
-"seriesword.title":"Serien",
-"seriesword.none":"Keine Serie",
-"seriesword.one":"1 Serie",
-"seriesword.many":"{0} Serien",
-"tagword.title":"Schlagwörter",
-"tagword.none":"Kein Schlagwort",
-"tagword.one":"1 Schlagwort",
-"tagword.many":"{0} Schlagwörter",
-"content.tags":"Schlagwörter: ",
+"bookentry.author":"{0} von {1}",
+"bookword.many":"{0} Bücher",
+"bookword.none":"Kein Buch",
+"bookword.one":"1 Buch",
+"bookword.title":"Bücher",
 "content.series":"Serien: ",
 "content.series.data":"Buch {0} der {1} - Reihe",
-"content.publisher":"Verlag: ",
-"content.published":"Veröffentlicht:",
-"content.publisher.data":"Veröffentlicht {1} von {0}",
 "content.summary":"Inhalt: ",
-"bookentry.series":"Buch {0} der {1} - Reihe",
-"bookentry.author":"{0} von {1}",
-"bookentry.tags":"{0} unter {1}",
-"bookentry.ratings":"{0} bewertet mit {1}",
-"bookentry.goodreads":"Dieses Buch bei Goodreads",
-"bookentry.goodreads.review":"Rezensiere dieses Buch bei Goodreads",
-"bookentry.goodreads.author":"{0} bei Goodreads",
-"bookentry.wikipedia":"Dieses Buch bei Wikipedia",
-"bookentry.wikipedia.author":"{0} bei Wikipedia",
-"bookentry.librarything":"Dieses Buch bei LibraryThing",
-"bookentry.librarything.author":"{0} bei LibraryThing",
-"bookentry.amazon":"Dieses Buch bei Amazon",
-"bookentry.amazon.author":"{0} bei Amazon",
-"bookentry.isfdb.author":"{0} bei ISFDB",
-"bookentry.download":"Lade dieses eBook als {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Vollständiger Eintrag",
-"tags.title":"Schlagwörter",
-"tags.categorized":"Index der {0} Schlagwörter nach Kategorien",
-"tags.categorized.single":"Index des Schlagworts nach Kategorien",
-"tags.alphabetical.many":"Alphabetischer Index der {0} Schlagwörter",
-"tags.alphabetical.one":"Alphabetischer Index des Schlagworts",
-"splitByLetter.tag.other":"Andere Schlagwörter",
-"authors.series.title":"Serien: {0}",
-"authors.title":"Autoren",
-"authors.alphabetical.many":"Alphabetischer Index der {0} Autoren",
-"authors.alphabetical.one":"Alphabetischer Index des Autors",
-"splitByLetter.author.other":"Andere Autoren",
-"series.title":"Serien",
-"series.alphabetical.many":"Alphabetischer Index der {0} Serien",
-"series.alphabetical.one":"Alphabetischer Index der Serie",
-"splitByLetter.series.other":"Andere Serien",
-"recent.title":"Neuzugänge",
-"recent.list":"{0} neue Bücher",
-"recent.list.single":"Das neueste einzige Buch",
-"rating.title":"Bewertung",
-"rating.summary":"{0}, gruppiert nach Bewertung",
-"allbooks.title":"Alle Bücher",
-"allbooks.alphabetical.many":"Alphabetischer Index der {0} Bücher",
-"allbooks.alphabetical.one":"Alphabetischer Index des einzigen Buchs",
-"splitByLetter.book.other":"Andere Bücher",
-"main.title":"Calibre Bibliothek",
-"main.summary":"{0} hat {1} katalogisierte Bücher",
-"startup.newhome":"Standard-Konfigurationsverzeichnis wurde in {0} umgeleitet",
-"startup.redirectfound":".redirect-Datei in {0} gefunden",
-"startup.redirectreadfail":"… konnte .redirect-Datei nicht lesen",
-"startup.redirectnotfound":"… Verzeichnis {0} für Umleitung nicht gefunden",
-"startup.redirectabandoned":"… Umleitung nicht durchgeführt",
-"startup.redirecting":"Home-Verzeichnis in {0} umgeleitet",
-"startup.configusing":"Benutze Konfigurations-Verzeichnis {0}",
-"startup.folderuserhome":"Suche Konfigurations-Verzeichnis in Benutzer-Verzeichnis {0}",
-"startup.foldertilde":"Suche Konfigurations-Verzeichnis in ~ („Tilde-Verzeichnis“) {0}",
-"startup.folderjar":"Suche Konfigurations-Verzeichnis ab der .jar-Datei {0}",
-"startup.foldernotexist":"… angegebener Verzeichnis existiert nicht",
-"i18n.and":"und",
-"i18n.downloads":"Downloads, Links und andere Kataloge",
-"i18n.links":"Links und andere Kataloge",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"##TODO##home.alternate":"Home",
 "i18n.coversection":"Umschlag",
-"i18n.downloadfile":"Download Datei",
-"i18n.downloadsection":"Downloads",
-"i18n.relatedsection":"Verwandte Kataloge",
-"i18n.linksection":"Externe Links",
-"i18n.backToMain":"Zurück zur Hauptseite des Katalogs",
-"i18n.summarysection":"Zusammenfassung",
-"i18n.dateGenerated":"Katalog erstellt am {0}",
-"deeplevel.summary":"{0} aufgeschlüsselt nach Autoren, Schlagwörter, etc.",
-"about.summary":"Anmerkungen zur Verwendung von Calibre2Opds",
-"usage.intro":"Die Optionen werden der Konfigurationsdatei in {0} entnommen",
 "language.title":"Sprache",
-"config.Language.description":"Diese Einstellung ändert die verwendete Sprache des Programms; verwende den Standard ISO Sprachcode (z.B. EN, FR, DE …)",
-"config.Language.possible":"Mögliche Werte : {0}",
-"intro.goal":"Erstelle OPDS und HTML Kataloge der Calibre eBooks Datenbank",
-"intro.wiki.title":"Calibre2opds Projektseite:",
-"intro.wiki.url":"http://calibre2opds.com",
-"intro.team.title":"Das Calibre2Opds Team:",
-"intro.team.list1":"David Pierron - Hauptprogrammer",
-"intro.team.list2":"Dave Walker - Guru, Manager der Features und Tester der Extraklasse",
-"intro.team.list3":"Farid Soussi - CSS und HTML Guru",
-"intro.team.list4":"Douglas Steele - Programmierung",
-"intro.team.list5":"Jane Litte - Beta Tests und moralische Unterstützung",
-"intro.thanks.1":"Speziellen Dank an Kb Sriram, der nicht nur Trook, eine exzellente und OPDS kompatible ",
-"intro.thanks.2":"Bibliotheksverwaltung programmierte, sondern auch einen Nook spendete!",
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"##TODO##paging.next.alternate":"Next",
+"##TODO##paging.previous.alternate":"Previous",
+"##TODO##permalink.alternate":"Permalink",
+"##TODO##pubdate.title":"Publication year",
+"recent.list":"{0} neue Bücher",
+"recent.title":"Neuzugänge",
+"##TODO##search.alternate":"Search",
 "search.result":"Suchergebnis für",
 "search.sortorder.asc":"Auf",
 "search.sortorder.desc":"Ab",
-"fin":"fin"
+"series.alphabetical.many":"Alphabetischer Index der {0} Serien",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Alphabetischer Index der Serie",
+"series.title":"Serien",
+"##TODO##sort.alternate":"Sort",
+"splitByLetter.book.other":"Andere Bücher",
+"splitByLetter.letter":"{0} unter {1}",
+"tags.alphabetical.many":"Alphabetischer Index der {0} Schlagwörter",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Alphabetischer Index des Schlagworts",
+"tags.title":"Schlagwörter",
+"tagword.title":"Schlagwörter",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_en.json b/lang/Localization_en.json
index b4bab9d..6d1d7e8 100644
--- a/lang/Localization_en.json
+++ b/lang/Localization_en.json
@@ -1,65 +1,61 @@
 {
-"boolean.no":"no",
-"boolean.yes":"yes",
-"splitByLetter.letter":"{0} starting with {1}",
-"home.title":"Main catalog",
-"link.fullentry":"Full entry",
-"title.nextpage":"next page ({0} of {1})",
-"title.lastpage":"next page (last)",
-"title.numberOfPages":"{0} ({1} pages)",
-"pubdate.title":"Publication year",
-"bookword.title":"Books",
-"bookword.none":"No book",
-"bookword.one":"1 book",
-"bookword.many":"{0} books",
-"authorword.title":"Authors",
+"about.title":"About COPS",
+"allbooks.alphabetical.many":"Alphabetical index of the {0} books",
+"allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Alphabetical index of the single book",
+"allbooks.title":"All books",
+"authors.alphabetical.many":"Alphabetical index of the {0} authors",
+"authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Alphabetical index of the single author",
+"authors.title":"Authors",
+"authorword.many":"{0} authors",
 "authorword.none":"No author",
 "authorword.one":"1 author",
-"authorword.many":"{0} authors",
-"taglevelword.title":"Tag levels",
-"taglevelword.none":"No tag level",
-"taglevelword.one":"1 tag level",
-"taglevelword.many":"{0} tag levels",
-"seriesword.title":"Series",
-"seriesword.none":"No series",
-"seriesword.one":"1 series",
-"seriesword.many":"{0} series",
-"tagword.title":"Tags",
-"tagword.none":"No tag",
-"tagword.one":"1 tag",
-"tagword.many":"{0} tags",
-"content.tags":"Tags:",
+"bookentry.author":"{0} by {1}",
+"bookword.many":"{0} books",
+"bookword.none":"No book",
+"bookword.one":"1 book",
+"bookword.title":"Books",
 "content.series":"Series:",
 "content.series.data":"Book {0} in the {1} series",
-"content.publisher":"Publisher:",
-"content.published":"Published:",
-"content.added":"Added: ",
-"content.modified":"Modified:",
-"content.publisher.data":"Published {1} by {0}",
 "content.summary":"Summary",
-"bookentry.series":"Book {0} in the {1} series",
-"bookentry.author":"{0} by {1}",
-"bookentry.tags":"{0} in {1}",
-"bookentry.ratings":"{0} rated {1}",
-"bookentry.goodreads":"This book on Goodreads",
-"bookentry.goodreads.review":"Review this book on Goodreads",
-"bookentry.goodreads.author":"{0} on Goodreads",
-"bookentry.wikipedia":"This book on Wikipedia",
-"bookentry.wikipedia.author":"{0} on Wikipedia",
-"bookentry.librarything":"This book on LibraryThing",
-"bookentry.librarything.author":"{0} on LibraryThing",
-"bookentry.amazon":"This book on Amazon",
-"bookentry.amazon.author":"{0} on Amazon",
-"bookentry.isfdb.author":"{0} on ISFDB",
-"bookentry.download":"Download this ebook as {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Full entry",
-"languages.title":"Languages",
-"languages.categorized":"Categorized index of the {0} languages",
-"languages.categorized.single":"Categorized index of the single language",
+"customize.email":"Set your email (to allow book emailing)",
+"customize.fancybox":"Use a Lightbox",
+"customize.filter":"Enable tag filtering",
+"customize.paging":"Max number of books per page (-1 to disable)",
+"customize.style":"Theme",
+"customize.title":"Customize COPS UI",
+"home.alternate":"Home",
+"i18n.coversection":"Cover",
+"language.title":"Language",
 "languages.alphabetical.many":"Alphabetical index of the {0} languages",
-"languages.alphabetical.one":"Alphabetical index of the single language",
 "languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"languages.alphabetical.one":"Alphabetical index of the single language",
+"languages.title":"Languages",
+"mail.messagenotsent":"Message could not be sent.",
+"mail.messagesent":"Message has been sent",
+"paging.next.alternate":"Next",
+"paging.previous.alternate":"Previous",
+"permalink.alternate":"Permalink",
+"pubdate.title":"Publication year",
+"recent.list":"{0} most recent books",
+"recent.title":"Recent additions",
+"search.alternate":"Search",
+"search.result":"Search result for *{0}*",
+"search.sortorder.asc":"Asc",
+"search.sortorder.desc":"Desc",
+"series.alphabetical.many":"Alphabetical index of the {0} series",
+"series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Alphabetical index of the single series",
+"series.title":"Series",
+"sort.alternate":"Sort",
+"splitByLetter.book.other":"Other books",
+"splitByLetter.letter":"{0} starting with {1}",
+"tags.alphabetical.many":"Alphabetical index of the {0} tags",
+"tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Alphabetical index of the single tag",
+"tags.title":"Tags",
+"tagword.title":"Tags",
 "languages.abk":"Abkhaz",
 "languages.aaf":"Afar",
 "languages.afr":"Afrikaans",
@@ -244,93 +240,5 @@
 "languages.yor":"Yoruba",
 "languages.zha":"Zhuang",
 "languages.zul":"Zulu",
-"tags.title":"Tags",
-"tags.categorized":"Categorized index of the {0} tags",
-"tags.categorized.single":"Categorized index of the single tag",
-"tags.alphabetical.many":"Alphabetical index of the {0} tags",
-"tags.alphabetical.one":"Alphabetical index of the single tag",
-"tags.alphabetical.none":"Alphabetical index of absolutely no tag",
-"splitByLetter.tag.other":"Other tags",
-"authors.series.title":"Series: {0}",
-"authors.title":"Authors",
-"authors.alphabetical.many":"Alphabetical index of the {0} authors",
-"authors.alphabetical.one":"Alphabetical index of the single author",
-"authors.alphabetical.none":"Alphabetical index of absolutely no author",
-"splitByLetter.author.other":"Other authors",
-"series.title":"Series",
-"series.alphabetical.many":"Alphabetical index of the {0} series",
-"series.alphabetical.one":"Alphabetical index of the single series",
-"series.alphabetical.none":"Alphabetical index of absolutely no series",
-"splitByLetter.series.other":"Other series",
-"recent.title":"Recent additions",
-"recent.list":"{0} most recent books",
-"recent.list.single":"Most recent single book",
-"rating.title":"Rating",
-"rating.summary":"{0}, grouped by rating",
-"allbooks.title":"All books",
-"allbooks.alphabetical.many":"Alphabetical index of the {0} books",
-"allbooks.alphabetical.one":"Alphabetical index of the single book",
-"allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
-"splitByLetter.book.other":"Other books",
-"main.title":"Calibre library",
-"main.summary":"{0} has catalogued {1}",
-"startup.newhome":"Default configuration folder home redirected to {0}",
-"startup.redirectfound":".redirect file found in {0}",
-"startup.redirectreadfail":"... failure reading .redirect file",
-"startup.redirectnotfound":"... unable to find redirect folder {0}",
-"startup.redirectabandoned":"... so redirect abandoned",
-"startup.redirecting":"redirecting home folder to {0}",
-"startup.configusing":"Using configuration folder {0}",
-"startup.folderuserhome":"Try configuration folder in user home folder {0}",
-"startup.foldertilde":"Try configuration folder from tilde folder {0}",
-"startup.folderjar":"Try configuration folder from .jar location {0}",
-"startup.foldernotexist":"... but specified folder does not exist",
-"i18n.and":"and",
-"i18n.downloads":"Downloads, links and other catalogs",
-"i18n.links":"Links and other catalogs",
-"i18n.coversection":"Cover",
-"i18n.downloadfile":"Download file",
-"i18n.downloadsection":"Downloads",
-"i18n.relatedsection":"Related catalogs",
-"i18n.linksection":"External links",
-"i18n.backToMain":"Back to the main page of the catalog",
-"i18n.summarysection":"Description",
-"i18n.dateGenerated":"Catalog generated on {0}",
-"deeplevel.summary":"{0} broken up by authors, tags, etc. ",
-"about.title":"About COPS",
-"customize.title":"Customize COPS",
-"about.summary":"Notes on using Calibre2Opds",
-"usage.intro":"The options are taken from the configuration file located at {0}",
-"language.title":"Language",
-"config.Language.description":"This setting changes the language used by the program ; use the standard ISO language code (e.g. EN, FR, DE...)",
-"config.Language.possible":"Possible values : {0}",
-"intro.goal":"Generate OPDS and HTML catalogs from your Calibre ebooks database",
-"intro.wiki.title":"The project''s home : ",
-"intro.wiki.url":"http://calibre2opds.com",
-"intro.team.title":"The Calibre2Opds team :",
-"intro.team.list1":"David Pierron - main programmer",
-"intro.team.list2":"Dave Walker - guru, features manager and tester extraordinaire",
-"intro.team.list3":"Farid Soussi - css and html guru",
-"intro.team.list4":"Douglas Steele - programmer",
-"intro.team.list5":"Jane Litte - beta tester and moral support",
-"intro.thanks.1":"Special thanks to Kb Sriram, who not only programmed Trook, an excellent and OPDS compatible ",
-"intro.thanks.2":"library manager for the Nook, but also was kind enough to donate a Nook !",
-"search.result":"Search result for *{0}*",
-"search.sortorder.asc":"Asc",
-"search.sortorder.desc":"Desc",
-"permalink.alternate":"Permalink",
-"home.alternate":"Home",
-"search.alternate":"Search",
-"sort.alternate":"Sort",
-"paging.next.alternate":"Next",
-"paging.previous.alternate":"Previous",
-"customize.title":"Customize COPS UI",
-"customize.style":"Theme",
-"customize.fancybox":"Use a Lightbox",
-"customize.paging":"Max number of books per page (-1 to disable)",
-"customize.email":"Set your email (to allow book emailing)",
-"customize.filter":"Enable tag filtering",
-"mail.messagenotsent":"Message could not be sent.",
-"mail.messagesent":"Message has been sent",
-"fin":"fin"
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_es.json b/lang/Localization_es.json
index 83f3049..01b0d30 100644
--- a/lang/Localization_es.json
+++ b/lang/Localization_es.json
@@ -1,100 +1,244 @@
 {
-"boolean.yes":"si",
-"splitByLetter.letter":"{0} que empiezan por {1}",
-"home.title":"Catalogo principal",
-"link.fullentry":"Entrada completa",
-"title.nextpage":"next page ({0} de {1})",
-"title.lastpage":"pagina siguiente (ultima)",
-"title.numberOfPages":"{0} ({1} paginas)",
-"bookword.title":"Libros",
-"bookword.none":"Sin libros",
-"bookword.one":"1 libro",
-"bookword.many":"{0} libros",
-"authorword.title":"Autores",
+"##TODO##about.title":"About COPS",
+"allbooks.alphabetical.many":"Indice alfabético de {0} libros",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Indice de un solo ",
+"allbooks.title":"Todos los libros",
+"authors.alphabetical.many":"Indice alfabético de {0}",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Indice de un solo autor",
+"authors.title":"Autores",
+"authorword.many":"{0} autores",
 "authorword.none":"Sin autor",
 "authorword.one":"1 autor",
-"authorword.many":"{0} autores",
-"taglevelword.title":"Niveles de Etiquetas",
-"taglevelword.none":"Sin nivel de etiquetas",
-"taglevelword.one":"1 nivel de etiqueta",
-"taglevelword.many":"{0} niveles de etiquetas",
-"seriesword.none":"Sin series",
-"seriesword.one":"1 serie",
-"seriesword.many":"series",
-"tagword.title":"Etiquetas",
-"tagword.none":"Sin etiquetas",
-"tagword.one":"1 etiqueta",
-"tagword.many":"etiquetas",
-"content.tags":"Etiquetas:",
-"content.series.data":"Libro {0} en la {1} serie",
-"content.publisher":"Editorial:",
-"content.publisher.data":"Publicado {1} por {0}",
-"content.summary":"Sumario:",
-"bookentry.series":"Libro {0} en la {1} serie",
 "bookentry.author":"{0} de {1}",
-"bookentry.tags":"{0} en {1}",
-"bookentry.ratings":"{0} puntuados {1}",
-"bookentry.goodreads":"Este libro en Goodreads",
-"bookentry.goodreads.review":"Comenta este libro en Goodreads",
-"bookentry.goodreads.author":"{0} en Goodreads",
-"bookentry.wikipedia":"Este libro en Wikipedia",
-"bookentry.wikipedia.author":"{0} en Wikipedia",
-"bookentry.librarything":"Este libro en LibraryThing",
-"bookentry.librarything.author":"{0} en LibraryThing",
-"bookentry.amazon":"Este libro en Amazon",
-"bookentry.amazon.author":"{0} en Amazon",
-"bookentry.isfdb.author":"{0} en ISFDB",
-"bookentry.download":"Descargar este libro como {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Entrada completa",
-"tags.title":"etiquetas",
-"tags.categorized":"Listado por categorias de las {0} etiquetas",
-"tags.categorized.single":"Listado por categorias de la unica etiqueta",
-"tags.alphabetical.many":"Listado alfabético de las {0} etiquetas",
-"tags.alphabetical.one":"Listado Alfabético de la unica etiqueta",
-"splitByLetter.tag.other":"Otras etiquetas",
-"authors.series.title":"Series",
-"authors.title":"Autores",
-"authors.alphabetical.many":"Indice alfabético de {0}",
-"authors.alphabetical.one":"Indice de un solo autor",
-"splitByLetter.author.other":"Otros Autores",
-"series.title":"Series:",
-"series.alphabetical.many":"Indice alfabético de {0}",
-"series.alphabetical.one":"Indice de una sola serie",
-"splitByLetter.series.other":"Otras series",
-"recent.title":"Añadidos recientemente",
-"recent.list":"{0} libros más recientes",
-"recent.list.single":"El libro más reciente",
-"rating.title":"Valoración",
-"rating.summary":"{0}, agrupados por valoración",
-"allbooks.title":"Todos los libros",
-"allbooks.alphabetical.many":"Indice alfabético de {0} libros",
-"allbooks.alphabetical.one":"Indice de un solo ",
-"splitByLetter.book.other":"Otros libros",
-"main.title":"Biblioteca generada de calibre",
-"main.summary":"{0} ha catalogado {1}",
-"i18n.downloads":"Descargas, enlaces y otros catálogos",
-"i18n.links":"Enlaces y otros catálogos",
-"i18n.downloadfile":"Descargar fichero",
-"i18n.downloadsection":"Descargas, enlaces y otros",
-"i18n.relatedsection":"Catálogos relacionados",
-"i18n.linksection":"Enlaces externos",
-"i18n.backToMain":"Volver a la página de inicio del catálogo",
-"i18n.summarysection":"Resumen",
-"i18n.dateGenerated":"Catálogo creado el {0}",
-"deeplevel.summary":"{0} por autores, etiquetas, etc.",
-"about.summary":"Notas de Uso",
-"usage.intro":"Las opciones provienen del fichero de configuración presente en: {0}",
+"bookword.many":"{0} libros",
+"bookword.none":"Sin libros",
+"bookword.one":"1 libro",
+"bookword.title":"Libros",
+"##TODO##content.series":"Series:",
+"content.series.data":"Libro {0} en la {1} serie",
+"content.summary":"Sumario:",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"##TODO##home.alternate":"Home",
+"##TODO##i18n.coversection":"Cover",
 "language.title":"Idioma",
-"config.Language.description":"Esta opción cambia el idioma del programa; use un código ISO estándar  (ej: EN, FR, DE, ES...)",
-"config.Language.possible":"Valores posibles: {0}",
-"intro.goal":"Genear catálogos OPDS y HTML desde la biblioteca de calibre",
-"intro.team.title":"El equipo de Calibre2Opds:",
-"intro.team.list1":"David Pierron - Programador principal",
-"intro.team.list2":"Dave Walker - guru, opciones, gestión y tester extraordinaire",
-"intro.team.list4":"Douglas Steele - programador",
-"intro.team.list5":"Jane Litte - beta tester y apoyo moral",
-"intro.thanks.1":"Gracias especiales a Kb Sriram, que no solo ha programado Trook, un gestor de bibliotecas OPDS excelente y compatible",
-"intro.thanks.2":"con el Nook, sino que además ha sido tan amable de donar un Nook",
-"fin":"fin"
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"##TODO##paging.next.alternate":"Next",
+"##TODO##paging.previous.alternate":"Previous",
+"##TODO##permalink.alternate":"Permalink",
+"##TODO##pubdate.title":"Publication year",
+"recent.list":"{0} libros más recientes",
+"recent.title":"Añadidos recientemente",
+"##TODO##search.alternate":"Search",
+"##TODO##search.result":"Search result for *{0}*",
+"##TODO##search.sortorder.asc":"Asc",
+"##TODO##search.sortorder.desc":"Desc",
+"series.alphabetical.many":"Indice alfabético de {0}",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Indice de una sola serie",
+"series.title":"Series:",
+"##TODO##sort.alternate":"Sort",
+"splitByLetter.book.other":"Otros libros",
+"splitByLetter.letter":"{0} que empiezan por {1}",
+"tags.alphabetical.many":"Listado alfabético de las {0} etiquetas",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Listado Alfabético de la unica etiqueta",
+"tags.title":"etiquetas",
+"tagword.title":"Etiquetas",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_fr.json b/lang/Localization_fr.json
index 840e38d..b7337fa 100644
--- a/lang/Localization_fr.json
+++ b/lang/Localization_fr.json
@@ -1,131 +1,244 @@
 {
-"boolean.no":"non",
-"boolean.yes":"oui",
-"splitByLetter.letter":"{0} débutant par {1}",
-"home.title":"Catalogue principal",
-"link.fullentry":"Entrée complète",
-"title.nextpage":"page suivante ({0} sur {1})",
-"title.lastpage":"page suivante (dernière)",
-"title.numberOfPages":"{0} ({1} pages)",
-"pubdate.title":"Année de publication",
-"bookword.title":"Livres",
-"bookword.none":"Aucun livre",
-"bookword.one":"1 livre",
-"bookword.many":"{0} livres",
-"authorword.title":"Auteurs",
+"about.title":"A propos de COPS",
+"allbooks.alphabetical.many":"Index alphabétique des {0} livres",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Index alphabétique du seul livre",
+"allbooks.title":"Tous les livres",
+"authors.alphabetical.many":"Index alphabétique des {0} auteurs",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Index alphabétique du seul auteur",
+"authors.title":"Auteurs",
+"authorword.many":"{0} auteurs",
 "authorword.none":"Pas d'auteur",
 "authorword.one":"1 auteur",
-"authorword.many":"{0} auteurs",
-"taglevelword.title":"Niveaux",
-"taglevelword.none":"Pas de niveau",
-"taglevelword.one":"1 niveau",
-"taglevelword.many":"{0} niveaux",
-"seriesword.title":"Collections",
-"seriesword.none":"Pas de collection",
-"seriesword.one":"1 collection",
-"seriesword.many":"{0} collections",
-"tagword.title":"Étiquettes",
-"tagword.none":"Sans étiquette",
-"tagword.one":"1 étiquette",
-"tagword.many":"{0} étiquettes",
-"content.tags":"Étiquettes:",
+"bookentry.author":"{0} de {1}",
+"bookword.many":"{0} livres",
+"bookword.none":"Aucun livre",
+"bookword.one":"1 livre",
+"bookword.title":"Livres",
 "content.series":"Collection:",
 "content.series.data":"Livre {0} dans la collection {1}",
-"content.publisher":"Editeur:",
-"content.published":"Publié:",
-"content.publisher.data":"Publié {0} le {1}",
 "content.summary":"Résumé:",
-"bookentry.series":"Livre {0} dans la collection {1}",
-"bookentry.author":"{0} de {1}",
-"bookentry.tags":"{0} dans {1}",
-"bookentry.ratings":"{0} notés {1}",
-"bookentry.goodreads":"Ce livre sur Goodreads",
-"bookentry.goodreads.review":"Critique du livre sur Goodreads",
-"bookentry.goodreads.author":"{0} sur Goodreads",
-"bookentry.wikipedia":"Ce livre sur Wikipedia",
-"bookentry.wikipedia.author":"{0} sur Wikipedia",
-"bookentry.librarything":"Ce livre sur LibraryThing",
-"bookentry.librarything.author":"{0} sur LibraryThing",
-"bookentry.amazon":"Ce livre sur Amazon",
-"bookentry.amazon.author":"{0} sur Amazon",
-"bookentry.isfdb.author":"{0} sur ISFDB",
-"bookentry.download":"Télécharger ce livre au format {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Entrée complète",
-"languages.title":"Langues",
-"languages.alphabetical.many":"Index alphabétique des {0} langues",
-"languages.alphabetical.one":"Index alphabétique de la seule langue",
-"tags.title":"Étiquettes",
-"tags.categorized":"Index ordonné des {0} étiquettes",
-"tags.categorized.single":"Index ordonné de la seule étiquette disponible",
-"tags.alphabetical.many":"Index alphabétique des {0} étiquettes",
-"tags.alphabetical.one":"Index alphabétique de la seule étiquette",
-"splitByLetter.tag.other":"Autres étiquettes",
-"authors.series.title":"Collection: {0}",
-"authors.title":"Auteurs",
-"authors.alphabetical.many":"Index alphabétique des {0} auteurs",
-"authors.alphabetical.one":"Index alphabétique du seul auteur",
-"splitByLetter.author.other":"Autres auteurs",
-"series.title":"Collections",
-"series.alphabetical.many":"Index alphabétique de {0} collections",
-"series.alphabetical.one":"Index alphabétique de la seule collection",
-"splitByLetter.series.other":"Autres collections",
-"recent.title":"Ajouts récents",
-"recent.list":"{0} livres les plus récents",
-"recent.list.single":"Ajouté récemment",
-"rating.title":"Appréciations",
-"rating.summary":"{0}, par appréciation",
-"allbooks.title":"Tous les livres",
-"allbooks.alphabetical.many":"Index alphabétique des {0} livres",
-"allbooks.alphabetical.one":"Index alphabétique du seul livre",
-"splitByLetter.book.other":"Autres livres",
-"main.title":"Bibliothèque gérée par Calibre",
-"main.summary":"{0} a catalogué {1}",
-"i18n.downloads":"Téléchargements, liens et autres catalogues",
-"i18n.links":"Liens et autres catalogues",
+"customize.email":"Adresse email (pour l'envoi automatique de livres)",
+"customize.fancybox":"Utiliser une Lightbox",
+"customize.filter":"Filtrage via les étiquettes",
+"customize.paging":"Nombre de livres par page (-1 pour désactiver)",
+"customize.style":"Thème",
+"customize.title":"Paramétrage de COPS",
+"home.alternate":"Accueil",
 "i18n.coversection":"Couverture",
-"i18n.downloadfile":"Télécharger fichier",
-"i18n.downloadsection":"Téléchargements",
-"i18n.relatedsection":"Catalogues similaires",
-"i18n.linksection":"Liens externes",
-"i18n.backToMain":"Page principale du catalogue",
-"i18n.summarysection":"Résumé",
-"i18n.dateGenerated":"Catalogue généré le {0}",
-"deeplevel.summary":"{0} par auteur, étiquette, etc.",
-"about.title":"A propos de COPS",
-"about.summary":"Notes d'utilisation",
-"usage.intro":"Les options sont tirées du fichier de configuration qui se trouve ici : {0}",
 "language.title":"Langue",
-"config.Language.description":"Fixe la langue utilisée par le programme ; Code ISO Standard (ex: EN, FR, DE...)",
-"config.Language.possible":"Valeurs proposées : {0}",
-"intro.goal":"Génère des catalogues OPDS et HTML à partir de votre base de données de Calibre",
-"intro.wiki.title":"Le site du projet :",
-"intro.team.title":"L'équipe Calibre2Opds :",
-"intro.team.list1":"David Pierron - programmeur principal",
-"intro.team.list2":"Dave Walker - guru, responsable des fonctionnalités et testeur extraordinaire",
-"intro.team.list3":"Farid Soussi - guru HTML et CSS",
-"intro.team.list4":"Douglas Steele - programmeur",
-"intro.team.list5":"Jane Litte - beta testeuse et soutien moral",
-"intro.thanks.1":"Remerciements particuliers à Kb Sriram, qui est l'auteur de Trook, un excellent",
-"intro.thanks.2":"gestionnaire de bibliothèque pour Nook, et a m'a fait cadeau d'un Nook !",
+"languages.alphabetical.many":"Index alphabétique des {0} langues",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"languages.alphabetical.one":"Index alphabétique de la seule langue",
+"languages.title":"Langues",
+"mail.messagenotsent":"Le message n'a pas pu être envoyé.",
+"mail.messagesent":"Le message a été envoyé",
+"paging.next.alternate":"Suivant",
+"paging.previous.alternate":"Précédent",
+"permalink.alternate":"Permalien",
+"pubdate.title":"Année de publication",
+"recent.list":"{0} livres les plus récents",
+"recent.title":"Ajouts récents",
+"search.alternate":"Rechercher",
 "search.result":"Résultats pour *{0}*",
 "search.sortorder.asc":"Crois.",
 "search.sortorder.desc":"Décrois.",
-"permalink.alternate":"Permalien",
-"home.alternate":"Accueil",
-"search.alternate":"Rechercher",
+"series.alphabetical.many":"Index alphabétique de {0} collections",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Index alphabétique de la seule collection",
+"series.title":"Collections",
 "sort.alternate":"Trier",
-"paging.next.alternate":"Suivant",
-"paging.previous.alternate":"Précédent",
-"customize.title":"Paramétrage de COPS",
-"customize.style":"Thème",
-"customize.fancybox":"Utiliser une Lightbox",
-"customize.paging":"Nombre de livres par page (-1 pour désactiver)",
-"customize.email":"Adresse email (pour l'envoi automatique de livres)",
-"customize.filter":"Filtrage via les étiquettes",
+"splitByLetter.book.other":"Autres livres",
+"splitByLetter.letter":"{0} débutant par {1}",
+"tags.alphabetical.many":"Index alphabétique des {0} étiquettes",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Index alphabétique de la seule étiquette",
+"tags.title":"Étiquettes",
+"tagword.title":"Étiquettes",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
 "languages.eng":"Anglais",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
 "languages.fra":"Français",
-"mail.messagenotsent":"Le message n'a pas pu être envoyé.",
-"mail.messagesent":"Le message a été envoyé",
-"fin":"fin"
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_it.json b/lang/Localization_it.json
index ee5b369..07239f5 100644
--- a/lang/Localization_it.json
+++ b/lang/Localization_it.json
@@ -1,102 +1,244 @@
 {
-"boolean.yes":"sì",
-"splitByLetter.letter":"{0} che iniziano per {1}",
-"home.title":"Catalogo principale",
-"link.fullentry":"Scheda completa",
-"title.nextpage":"pagina seguente ({0} di {1})",
-"title.lastpage":"pagina seguente (ultima)",
-"title.numberOfPages":"{0} ({1} pagine)",
-"bookword.title":"Libri",
-"bookword.none":"Nessun libro",
-"bookword.one":"1 libro",
-"bookword.many":"{0} libri",
-"authorword.title":"Autori",
+"##TODO##about.title":"About COPS",
+"allbooks.alphabetical.many":"Indice alfabetico di {0} libri",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Indice alfabetico di un solo libro",
+"allbooks.title":"Tutti i libri",
+"authors.alphabetical.many":"Indice alfabetico di {0} autori",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Indice alfabetico di un solo autore",
+"authors.title":"Autori",
+"authorword.many":"{0} autori",
 "authorword.none":"Senza autore",
 "authorword.one":"1 autore",
-"authorword.many":"{0} autori",
-"taglevelword.title":"Livelli",
-"taglevelword.none":"Nessun livello",
-"taglevelword.one":"1 livello",
-"taglevelword.many":"{0} livelli",
-"seriesword.title":"Collane",
-"seriesword.none":"Nessuna collana",
-"seriesword.one":"1 collana",
-"seriesword.many":"{0} collane",
-"tagword.title":"Argomenti",
-"tagword.none":"Senza argomento",
-"tagword.one":"1 argomento",
-"tagword.many":"{0} argomenti",
-"content.tags":"Argomenti:",
+"bookentry.author":"{0} di {1}",
+"bookword.many":"{0} libri",
+"bookword.none":"Nessun libro",
+"bookword.one":"1 libro",
+"bookword.title":"Libri",
 "content.series":"Collana:",
 "content.series.data":"Libro {0} nella collana {1}",
-"content.publisher":"Editore:",
-"content.publisher.data":"Pubblicato {0} il {1}",
 "content.summary":"Riassunto:",
-"bookentry.series":"Libro {0} nella collana {1}",
-"bookentry.author":"{0} di {1}",
-"bookentry.ratings":"{0} annotati {1}",
-"bookentry.goodreads":"Questo libro su Goodreads",
-"bookentry.goodreads.review":"Commenta questo libro su Goodreads",
-"bookentry.goodreads.author":"{0} su Goodreads",
-"bookentry.wikipedia":"Questo libro su Wikipedia",
-"bookentry.wikipedia.author":"{0} su Wikipedia",
-"bookentry.librarything":"Questo libro su LibraryThing",
-"bookentry.librarything.author":"{0} su LibraryThing",
-"bookentry.amazon":"Questo libro su Amazon",
-"bookentry.amazon.author":"{0} su Amazon",
-"bookentry.isfdb.author":"{0} su ISFDB",
-"bookentry.download":"Scarica questo libro nel formato {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Scheda completa",
-"tags.title":"Argomenti",
-"tags.categorized":"Indice ordinato di {0} argomenti",
-"tags.categorized.single":"Indice ordinato del solo argomento disponibile",
-"tags.alphabetical.many":"Indice alfabetico di {0} argomenti",
-"tags.alphabetical.one":"Indice alfabetico del solo argomento",
-"splitByLetter.tag.other":"Altri argomenti",
-"authors.series.title":"Collane: {0}",
-"authors.title":"Autori",
-"authors.alphabetical.many":"Indice alfabetico di {0} autori",
-"authors.alphabetical.one":"Indice alfabetico di un solo autore",
-"splitByLetter.author.other":"Altri autori",
-"series.title":"Collane",
-"series.alphabetical.many":"Indice alfabetico di {0} collane",
-"series.alphabetical.one":"Indice alfabetico di una sola collana",
-"splitByLetter.series.other":"Altre collane",
-"recent.title":"Ultime aggiunte",
-"recent.list":" I {0} libri più recenti",
-"recent.list.single":"Il libro più recente",
-"rating.title":"Valutazioni",
-"rating.summary":"{0}, per valutazioni",
-"allbooks.title":"Tutti i libri",
-"allbooks.alphabetical.many":"Indice alfabetico di {0} libri",
-"allbooks.alphabetical.one":"Indice alfabetico di un solo libro",
-"splitByLetter.book.other":"Altri libri",
-"main.title":"Biblioteca generata da Calibre",
-"main.summary":"{0} ha catalogato {1}",
-"i18n.downloads":"Scarica, collegamenti e altri cataloghi",
-"i18n.links":"Collegamenti e altri cataloghi",
-"i18n.downloadfile":"Scarica il documento",
-"i18n.downloadsection":"Scaricati",
-"i18n.relatedsection":"Cataloghi simili",
-"i18n.linksection":"Collegamenti esterni",
-"i18n.backToMain":"Pagina principale del catalogo",
-"i18n.summarysection":"Riassunto",
-"i18n.dateGenerated":"Catalogo generato il {0}",
-"deeplevel.summary":"{0} par autore, etichetta, ecc.",
-"about.summary":"Note d'utilizzo",
-"usage.intro":"Le opzioni sono prese dal file di configuraziones che si trova qui: {0}",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"##TODO##home.alternate":"Home",
+"##TODO##i18n.coversection":"Cover",
 "language.title":"Lingua",
-"config.Language.description":"Scegli la lingua da utilizzare ; usa il codice ISO standard (es: EN, FR, DE...)",
-"config.Language.possible":"Valori proposti: {0}",
-"intro.goal":"Crea cataloghi OPDS e HTML a partire dalla tua banca dati di Calibre",
-"intro.wiki.title":"Il sito del progetto: ",
-"intro.team.title":"Il team Calibre2Opds:",
-"intro.team.list1":"David Pierron - programmatore principale",
-"intro.team.list2":"Dave Walker - guru, responsabile delle funzionalità e collaudatore straordinario",
-"intro.team.list4":"Douglas Steele - programmatore",
-"intro.team.list5":"Jane Litte - collaudatrice beta e sostegno morale",
-"intro.thanks.1":"Un ringraziamento particolare a Kb Sriram, autore di Trook, un eccellente ",
-"intro.thanks.2":"gestore di biblioteche per Nook, che mi ha regalato un Nook!",
-"fin":"fin"
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"##TODO##paging.next.alternate":"Next",
+"##TODO##paging.previous.alternate":"Previous",
+"##TODO##permalink.alternate":"Permalink",
+"##TODO##pubdate.title":"Publication year",
+"recent.list":" I {0} libri più recenti",
+"recent.title":"Ultime aggiunte",
+"##TODO##search.alternate":"Search",
+"##TODO##search.result":"Search result for *{0}*",
+"##TODO##search.sortorder.asc":"Asc",
+"##TODO##search.sortorder.desc":"Desc",
+"series.alphabetical.many":"Indice alfabetico di {0} collane",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Indice alfabetico di una sola collana",
+"series.title":"Collane",
+"##TODO##sort.alternate":"Sort",
+"splitByLetter.book.other":"Altri libri",
+"splitByLetter.letter":"{0} che iniziano per {1}",
+"tags.alphabetical.many":"Indice alfabetico di {0} argomenti",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Indice alfabetico del solo argomento",
+"tags.title":"Argomenti",
+"tagword.title":"Argomenti",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_nb.json b/lang/Localization_nb.json
index 6b0ce37..680a1b6 100644
--- a/lang/Localization_nb.json
+++ b/lang/Localization_nb.json
@@ -1,144 +1,244 @@
-{
-"boolean.no":"nei",
-"boolean.yes":"ja",
-"splitByLetter.letter":"{0} begynner med {1}",
-"home.title":"Hovedkatalog",
-"link.fullentry":"Full oppføring",
-"title.nextpage":"neste side ({0} av {1})",
-"title.lastpage":"neste side (siste)",
-"title.numberOfPages":"{0} ({1} sider)",
-"pubdate.title":"Publikasjonsår",
-"bookword.title":"Bøker",
-"bookword.none":"Ingen bøker",
-"bookword.one":"1 bok",
-"bookword.many":"{0} bøker",
-"authorword.title":"Forfattere",
-"authorword.none":"Ingen forfattere",
-"authorword.one":"1 forfatter",
-"authorword.many":"{0} forfattere",
-"taglevelword.title":"Stikkordnivåer",
-"taglevelword.none":"Ingen stikkordnivåer",
-"taglevelword.one":"1 stikkordnivå",
-"taglevelword.many":"{0} stikkordnivå",
-"seriesword.title":"Serier",
-"seriesword.none":"Ingen serier",
-"seriesword.one":"1 serie",
-"seriesword.many":"{0} serier",
-"tagword.title":"Stikkord",
-"tagword.none":"Ingen stikkord",
-"tagword.one":"1 stikkord",
-"tagword.many":"{0} stikkord",
-"content.tags":"Stikkord:",
-"content.series":"Serier:",
-"content.series.data":"Bok {0} i serien {1}",
-"content.publisher":"Utgiver:",
-"content.published":"Utgitt:",
-"content.added":"Lagt til: ",
-"content.modified":"Endret:",
-"content.publisher.data":"Utgitt {1} av {0}",
-"content.summary":"Sammendrag",
-"bookentry.series":"Bok {0} i serien {1}",
-"bookentry.author":"{0} av {1}",
-"bookentry.tags":"{0} i {1}",
-"bookentry.ratings":"{0} rated {1}",
-"bookentry.goodreads":"Denne boka på Goodreads",
-"bookentry.goodreads.review":"Anmeld denne boka på Goodreads",
-"bookentry.goodreads.author":"{0} på Goodreads",
-"bookentry.wikipedia":"Denne boka på Wikipedia",
-"bookentry.wikipedia.author":"{0} på Wikipedia",
-"bookentry.librarything":"Denne boka på LibraryThing",
-"bookentry.librarything.author":"{0} på LibraryThing",
-"bookentry.amazon":"Denne boka på Amazon",
-"bookentry.amazon.author":"{0} på Amazon",
-"bookentry.isfdb.author":"{0} på ISFDB",
-"bookentry.download":"Last ned denne eboka som {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Full oppføring",
-"languages.title":"Språk",
-"languages.categorized":"Kategorisert indeks for de {0} språkene",
-"languages.categorized.single":"Kategorisert indeks for ett enkelt språk",
-"languages.alphabetical.many":"Alfabetisk indek for de {0} språkene",
-"languages.alphabetical.one":"Alfabetisk indeks for ett enkelt språk",
-"languages.alphabetical.none":"Alfabetisk indeks for absolutt ingen språk",
-"languages.nob":"Norsk bokmål",
-"tags.title":"Stikkord",
-"tags.categorized":"Kategorisert indeks for {0} stikkord",
-"tags.categorized.single":"Kategorisert indeks for ett enkelt stikkord",
-"tags.alphabetical.many":"Alfabetisk indeks for {0} stikkord",
-"tags.alphabetical.one":"Alfabetisk indeks for ett enkelt stikkord",
-"tags.alphabetical.none":"Alfabetisk indeks for ingen stikkord",
-"splitByLetter.tag.other":"Andre stikkord",
-"authors.series.title":"Serier: {0}",
-"authors.title":"Forfattere",
-"authors.alphabetical.many":"Alfabetisk indeks for {0} forfattere",
-"authors.alphabetical.one":"Alfabetisk indeks for èn forfatter",
-"authors.alphabetical.none":"Alfabetisk indeks for ingen forfattere",
-"splitByLetter.author.other":"Andre forfattere",
-"series.title":"Serier",
-"series.alphabetical.many":"Alfabetisk indeks for {0} serier",
-"series.alphabetical.one":"Alfabetisk indeks for èn enkelt serie",
-"series.alphabetical.none":"Alfabetisk indeks for ingen serier",
-"splitByLetter.series.other":"Andre serier",
-"recent.title":"Nylig lagt til",
-"recent.list":"{0} nyeste bøker",
-"recent.list.single":"Nyeste enkeltbok",
-"rating.title":"Vurdering",
-"rating.summary":"{0}, gruppert etter vurdering",
-"allbooks.title":"Alle bøker",
-"allbooks.alphabetical.many":"Alfabetisk indeks for {0} bøker",
-"allbooks.alphabetical.one":"Alfabetisk indeks for èn enkelt bok",
-"allbooks.alphabetical.none":"Alfabetisk indeks for absolutt ingen bøker",
-"splitByLetter.book.other":"Andre bøker",
-"main.title":"Calibre-bibliotek",
-"main.summary":"{0} har katalogisert {1}",
-"startup.newhome":"Standard konfigurasjonsmappe omdirigert til {0}",
-"startup.redirectfound":".redirect fil finnet i {0}",
-"startup.redirectreadfail":"... feil ved innlesing av .redirect fil",
-"startup.redirectnotfound":"... kunne ikke finne omdirigeringsmappe {0}",
-"startup.redirectabandoned":"... så omdirigering er avbrutt",
-"startup.redirecting":"omdirigerer hjemmemappe til {0}",
-"startup.configusing":"Bruker konfigurasjonsmappe {0}",
-"startup.folderuserhome":"Prøv konfigurasjonsmappe i brukers hjemmemappe {0}",
-"startup.foldertilde":"Prøv konfigurasjonsmappe fra tilde-mappe {0}",
-"startup.folderjar":"Prøv konfigurasjonsmappe fra .jar plassering {0}",
-"startup.foldernotexist":"... men spesifisert mappe eksisterer ikke",
-"i18n.and":"og",
-"i18n.downloads":"Nedlastinger, lenker og andre kataloger",
-"i18n.links":"Lenker og andre kataloger",
-"i18n.coversection":"Omslag",
-"i18n.downloadfile":"Last ned fil",
-"i18n.downloadsection":"Nedlastinger",
-"i18n.relatedsection":"Relaterte kataloger",
-"i18n.linksection":"Eksterne lenker",
-"i18n.backToMain":"Tilbake til hovedside for katalogen",
-"i18n.summarysection":"Beskrivelse",
-"i18n.dateGenerated":"Katalog generert den {0}",
-"deeplevel.summary":"{0} brutt ned på forfattere, stikkord, osv. ",
-"about.title":"Om COPS",
-"about.summary":"Merknader om bruk av Calibre2Opds",
-"usage.intro":"Innstillinger er tatt fra konfigurasjonsfila som ligger i {0}",
-"language.title":"Språk",
-"config.Language.description":"Denne innstillingen endrer språket som benyttes av programmet; bruk standard ISO språkkoder (e.g. EN, FR, DE...)",
-"config.Language.possible":"Mulige verdier : {0}",
-"intro.goal":"Generer OPDS- og HTML-kataloger fra din Calibre ebokdatabase",
-"intro.wiki.title":"Prosjektets hjemmeside : ",
-"intro.wiki.url":"http://calibre2opds.com",
-"intro.team.title":"Calibre2Opds-teamet :",
-"intro.team.list1":"David Pierron - main programmer",
-"intro.team.list2":"Dave Walker - guru, features manager and tester extraordinaire",
-"intro.team.list3":"Farid Soussi - css and html guru",
-"intro.team.list4":"Douglas Steele - programmer",
-"intro.team.list5":"Jane Litte - beta tester and moral support",
-"intro.thanks.1":"Special thanks to Kb Sriram, who not only programmed Trook, an excellent and OPDS compatible ",
-"intro.thanks.2":"library manager for the Nook, but also was kind enough to donate a Nook !",
-"search.result":"Søkeresultat for *{0}*",
-"search.sortorder.asc":"Stigende",
-"search.sortorder.desc":"Synkende",
-"permalink.alternate":"Permalenke",
-"home.alternate":"Hjem",
-"search.alternate":"Søk",
-"sort.alternate":"Sorter",
-"paging.next.alternate":"Neste",
-"paging.previous.alternate":"Forrige",
-"fin":"fin"
-}
+{
+"about.title":"Om COPS",
+"allbooks.alphabetical.many":"Alfabetisk indeks for {0} bøker",
+"allbooks.alphabetical.none":"Alfabetisk indeks for absolutt ingen bøker",
+"allbooks.alphabetical.one":"Alfabetisk indeks for èn enkelt bok",
+"allbooks.title":"Alle bøker",
+"authors.alphabetical.many":"Alfabetisk indeks for {0} forfattere",
+"authors.alphabetical.none":"Alfabetisk indeks for ingen forfattere",
+"authors.alphabetical.one":"Alfabetisk indeks for èn forfatter",
+"authors.title":"Forfattere",
+"authorword.many":"{0} forfattere",
+"authorword.none":"Ingen forfattere",
+"authorword.one":"1 forfatter",
+"bookentry.author":"{0} av {1}",
+"bookword.many":"{0} bøker",
+"bookword.none":"Ingen bøker",
+"bookword.one":"1 bok",
+"bookword.title":"Bøker",
+"content.series":"Serier:",
+"content.series.data":"Bok {0} i serien {1}",
+"content.summary":"Sammendrag",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"home.alternate":"Hjem",
+"i18n.coversection":"Omslag",
+"language.title":"Språk",
+"languages.alphabetical.many":"Alfabetisk indek for de {0} språkene",
+"languages.alphabetical.none":"Alfabetisk indeks for absolutt ingen språk",
+"languages.alphabetical.one":"Alfabetisk indeks for ett enkelt språk",
+"languages.title":"Språk",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"paging.next.alternate":"Neste",
+"paging.previous.alternate":"Forrige",
+"permalink.alternate":"Permalenke",
+"pubdate.title":"Publikasjonsår",
+"recent.list":"{0} nyeste bøker",
+"recent.title":"Nylig lagt til",
+"search.alternate":"Søk",
+"search.result":"Søkeresultat for *{0}*",
+"search.sortorder.asc":"Stigende",
+"search.sortorder.desc":"Synkende",
+"series.alphabetical.many":"Alfabetisk indeks for {0} serier",
+"series.alphabetical.none":"Alfabetisk indeks for ingen serier",
+"series.alphabetical.one":"Alfabetisk indeks for èn enkelt serie",
+"series.title":"Serier",
+"sort.alternate":"Sorter",
+"splitByLetter.book.other":"Andre bøker",
+"splitByLetter.letter":"{0} begynner med {1}",
+"tags.alphabetical.many":"Alfabetisk indeks for {0} stikkord",
+"tags.alphabetical.none":"Alfabetisk indeks for ingen stikkord",
+"tags.alphabetical.one":"Alfabetisk indeks for ett enkelt stikkord",
+"tags.title":"Stikkord",
+"tagword.title":"Stikkord",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"languages.nob":"Norsk bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
+}
diff --git a/lang/Localization_nl.json b/lang/Localization_nl.json
index 6b9efae..679b48b 100644
--- a/lang/Localization_nl.json
+++ b/lang/Localization_nl.json
@@ -1,122 +1,244 @@
 {
-"boolean.no":"nee",
-"boolean.yes":"ja",
-"splitByLetter.letter":"{0} beginnend met {1}",
-"home.title":"Hoofd catalogus",
-"link.fullentry":"Volledige invoer",
-"title.nextpage":"Volgende pagina ({0} van {1})",
-"title.lastpage":"Volgende pagina (last)",
-"title.numberOfPages":"{0} ({1} paginas)",
-"bookword.title":"Boeken",
-"bookword.none":"Geen boek",
-"bookword.one":"1 boek",
-"bookword.many":"{0} boeken",
-"authorword.title":"Auteurs",
+"##TODO##about.title":"About COPS",
+"allbooks.alphabetical.many":"Alfabetische index van {0} boeken",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Alfabetische index van 1 boek",
+"allbooks.title":"Alle boeken",
+"authors.alphabetical.many":"Alfabetische index van {0} auteurs",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Alfabetische index van 1 auteur",
+"authors.title":"Auteurs",
+"authorword.many":"{0} auteurs",
 "authorword.none":"Geen auteur",
 "authorword.one":"1 auteur",
-"authorword.many":"{0} auteurs",
-"taglevelword.title":"Tag niveaus",
-"taglevelword.none":"Geen tag niveau",
-"taglevelword.one":"1 tag niveau",
-"taglevelword.many":"{0} tag niveaus",
-"seriesword.title":"Series",
-"seriesword.none":"Geen series",
-"seriesword.one":"1 serie",
-"seriesword.many":"{0} series",
-"tagword.title":"Tags",
-"tagword.none":"Geen tag",
-"tagword.one":"1 tag",
-"tagword.many":"{0} tags",
-"content.tags":"Tags:",
+"bookentry.author":"{0} door {1}",
+"bookword.many":"{0} boeken",
+"bookword.none":"Geen boek",
+"bookword.one":"1 boek",
+"bookword.title":"Boeken",
 "content.series":"Series:",
 "content.series.data":"Boek {0} in de {1} serie",
-"content.publisher":"Uitgever:",
-"content.published":"Uitgegeven:",
-"content.added":"Toegevoegd: ",
-"content.modified":"Gewijzigd:",
-"content.publisher.data":"Uitgegeven {1} door {0}",
 "content.summary":"Samenvatting",
-"bookentry.series":"Boek {0} in de {1} serie",
-"bookentry.author":"{0} door {1}",
-"bookentry.tags":"{0} in {1}",
-"bookentry.ratings":"{0} rated {1}",
-"bookentry.goodreads":"Dit boek op Goodreads",
-"bookentry.goodreads.review":"Review dit boek op Goodreads",
-"bookentry.goodreads.author":"{0} op Goodreads",
-"bookentry.wikipedia":"Dit boek op Wikipedia",
-"bookentry.wikipedia.author":"{0} op Wikipedia",
-"bookentry.librarything":"Dit boek op LibraryThing",
-"bookentry.librarything.author":"{0} op LibraryThing",
-"bookentry.amazon":"Dit boek op Amazon",
-"bookentry.amazon.author":"{0} op Amazon",
-"bookentry.isfdb.author":"{0} op ISFDB",
-"bookentry.download":"Download dit eboek als {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Volledige invoer",
-"tags.title":"Tags",
-"tags.categorized":"Gecategorizeerde index van {0} tags",
-"tags.categorized.single":"Gecategorizeerde index van 1 tag",
-"tags.alphabetical.many":"Alfabetische index van {0} tags",
-"tags.alphabetical.one":"Alfabetische index van 1 tag",
-"splitByLetter.tag.other":"Andere tags",
-"authors.series.title":"Series: {0}",
-"authors.title":"Auteurs",
-"authors.alphabetical.many":"Alfabetische index van {0} auteurs",
-"authors.alphabetical.one":"Alfabetische index van 1 auteur",
-"splitByLetter.author.other":"Andere auteurs",
-"series.title":"Series",
-"series.alphabetical.many":"Alfabetische index van {0} series",
-"series.alphabetical.one":"Alfabetische index van 1 serie",
-"splitByLetter.series.other":"Andere series",
-"recent.title":"Recent toegevoegd",
-"recent.list":"{0} meest recente boeken",
-"recent.list.single":"Meest recente boek",
-"rating.title":"Rating",
-"rating.summary":"{0}, gegroepeerd per rating",
-"allbooks.title":"Alle boeken",
-"allbooks.alphabetical.many":"Alfabetische index van {0} boeken",
-"allbooks.alphabetical.one":"Alfabetische index van 1 boek",
-"splitByLetter.book.other":"Andere boeken",
-"main.title":"Calibre bibliotheek",
-"main.summary":"{0} heeft gecatalogiseerd {1}",
-"startup.newhome":"Standaard configuratie folder home doorverwezen naar {0}",
-"startup.redirectfound":".redirect file gevonden in {0}",
-"startup.redirectreadfail":"... fout bij lezen .redirect file",
-"startup.redirectnotfound":"... niet in staat doorverwijs folder {0} te vinden",
-"startup.redirectabandoned":"... dus doorverwijzing niet uitgevoerd",
-"startup.redirecting":"home folder wordt doorverwezen naar {0}",
-"startup.configusing":"Gebruikt configuratie folder {0}",
-"startup.folderuserhome":"Probeer configuratie folder in user home folder {0}",
-"startup.foldertilde":"Probeer configuratie folder uit tilde folder {0}",
-"startup.folderjar":"Probeer configuratie folder uit .jar locatie {0}",
-"startup.foldernotexist":"... maar gespecificeerde folder bestaat niet",
-"i18n.and":"en",
-"i18n.downloads":"Downloads, links en andere catalogi",
-"i18n.links":"Links en andere catalogi",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"##TODO##home.alternate":"Home",
 "i18n.coversection":"Omslag",
-"i18n.downloadfile":"Download bestand",
-"i18n.downloadsection":"Downloads",
-"i18n.relatedsection":"Gerelateerde catalogi",
-"i18n.linksection":"Externe links",
-"i18n.backToMain":"Terug naar de hoofdpagina van de catalogus",
-"i18n.summarysection":"Omschrijving",
-"i18n.dateGenerated":"Catalogus gegenereerd op {0}",
-"deeplevel.summary":"{0} uitgesplitst naar auteurs, tags, etc. ",
-"about.summary":"Notities hoe Calibre2Opds te gebruiken",
-"usage.intro":"De opties worden uit het configuratie bestand {0} gebruikt",
 "language.title":"Taal",
-"config.Language.description":"Deze setting verandert de taal van het programma ; gebruik de standaard ISO taal code (e.g. EN, FR, DE...)",
-"config.Language.possible":"Mogelijke waardes : {0}",
-"intro.goal":"Genereer OPDS and HTML catalogi van je Calibre eboeken database",
-"intro.wiki.title":"The project''s home : ",
-"intro.wiki.url":"http://calibre2opds.com",
-"intro.team.title":"The Calibre2Opds team :",
-"intro.team.list1":"David Pierron - main programmer",
-"intro.team.list2":"Dave Walker - guru, features manager and tester extraordinaire",
-"intro.team.list3":"Farid Soussi - css and html guru",
-"intro.team.list4":"Douglas Steele - programmer",
-"intro.team.list5":"Jane Litte - beta tester and moral support",
-"intro.thanks.1":"Special thanks to Kb Sriram, who not only programmed Trook, an excellent and OPDS compatible ",
-"intro.thanks.2":"library manager for the Nook, but also was kind enough to donate a Nook !",
-"fin":"Einde"
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"##TODO##paging.next.alternate":"Next",
+"##TODO##paging.previous.alternate":"Previous",
+"##TODO##permalink.alternate":"Permalink",
+"##TODO##pubdate.title":"Publication year",
+"recent.list":"{0} meest recente boeken",
+"recent.title":"Recent toegevoegd",
+"##TODO##search.alternate":"Search",
+"##TODO##search.result":"Search result for *{0}*",
+"##TODO##search.sortorder.asc":"Asc",
+"##TODO##search.sortorder.desc":"Desc",
+"series.alphabetical.many":"Alfabetische index van {0} series",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Alfabetische index van 1 serie",
+"series.title":"Series",
+"##TODO##sort.alternate":"Sort",
+"splitByLetter.book.other":"Andere boeken",
+"splitByLetter.letter":"{0} beginnend met {1}",
+"tags.alphabetical.many":"Alfabetische index van {0} tags",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Alfabetische index van 1 tag",
+"tags.title":"Tags",
+"tagword.title":"Tags",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_pt.json b/lang/Localization_pt.json
index d311e08..5e81497 100644
--- a/lang/Localization_pt.json
+++ b/lang/Localization_pt.json
@@ -1,65 +1,61 @@
 {
-"boolean.no":"não",
-"boolean.yes":"sim",
-"splitByLetter.letter":"{0} começando com {1}",
-"home.title":"Catálogo principal",
-"link.fullentry":"Entrada completa",
-"title.nextpage":"próxima página ({0} de {1})",
-"title.lastpage":"próxima página (última)",
-"title.numberOfPages":"{0} ({1} páginas)",
-"pubdate.title":"Ano de publicação",
-"bookword.title":"Livros",
-"bookword.none":"Sem livros",
-"bookword.one":"1 livro",
-"bookword.many":"{0} livros",
-"authorword.title":"Autores",
+"about.title":"Sobre o COPS",
+"allbooks.alphabetical.many":"Índice alfabético dos {0} livros",
+"allbooks.alphabetical.none":"Índice alfabético de nenhum livro",
+"allbooks.alphabetical.one":"Índice alfabético de um livro",
+"allbooks.title":"Todos os livros",
+"authors.alphabetical.many":"Índice alfabético dos {0} autores",
+"authors.alphabetical.none":"Índice alfabético de nenhum autor",
+"authors.alphabetical.one":"Índice alfabético de um autor",
+"authors.title":"Autores",
+"authorword.many":"{0} autores",
 "authorword.none":"Sem autor",
 "authorword.one":"1 autor",
-"authorword.many":"{0} autores",
-"taglevelword.title":"Níveis de etiqueta",
-"taglevelword.none":"Sem nível de etiqueta",
-"taglevelword.one":"1 nível de etiqueta",
-"taglevelword.many":"{0} níveis de etiqueta",
-"seriesword.title":"Séries",
-"seriesword.none":"Sem séries",
-"seriesword.one":"1 série",
-"seriesword.many":"{0} séries",
-"tagword.title":"Etiquetas",
-"tagword.none":"Sem etiquetas",
-"tagword.one":"1 etiqueta",
-"tagword.many":"{0} etiquetas",
-"content.tags":"Etiquetas:",
+"bookentry.author":"{0} por {1}",
+"bookword.many":"{0} livros",
+"bookword.none":"Sem livros",
+"bookword.one":"1 livro",
+"bookword.title":"Livros",
 "content.series":"Séries:",
 "content.series.data":"Livro {0} da série {1}",
-"content.publisher":"Editora:",
-"content.published":"Publicado:",
-"content.added":"Adicionado: ",
-"content.modified":"Modificado:",
-"content.publisher.data":"Publicado em {1} por {0}",
 "content.summary":"Sumário",
-"bookentry.series":"Livro {0} da série {1}",
-"bookentry.author":"{0} por {1}",
-"bookentry.tags":"{0} em {1}",
-"bookentry.ratings":"{0} avaliado {1}",
-"bookentry.goodreads":"Este livro no Goodreads",
-"bookentry.goodreads.review":"Faça resenha deste livro no Goodreads",
-"bookentry.goodreads.author":"{0} no Goodreads",
-"bookentry.wikipedia":"Este livro na Wikipédia",
-"bookentry.wikipedia.author":"{0} na Wikipédia",
-"bookentry.librarything":"Este livro na LibraryThing",
-"bookentry.librarything.author":"{0} na LibraryThing",
-"bookentry.amazon":"Este livro na Amazon",
-"bookentry.amazon.author":"{0} na Amazon",
-"bookentry.isfdb.author":"{0} no ISFDB",
-"bookentry.download":"Baixar este livro como {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Entrada completa",
-"languages.title":"Idiomas",
-"languages.categorized":"Índice por categoria dos {0} idiomas",
-"languages.categorized.single":"Índice por categoria de um idioma",
+"customize.email":"Forneça seu email (para enviar o ebook)",
+"customize.fancybox":"Usar o Lightbox",
+"customize.filter":"Ativar filtro por etiqueta",
+"customize.paging":"Número máximo de livros por página (-1 para desabilitar)",
+"customize.style":"Tema",
+"customize.title":"Personalizar a interface do COPS",
+"home.alternate":"Principal",
+"i18n.coversection":"Capa",
+"language.title":"Idioma",
 "languages.alphabetical.many":"Índice alfabético dos {0} idiomas",
-"languages.alphabetical.one":"Índice alfabético de um idioma",
 "languages.alphabetical.none":"Índice alfabético de nenhum idioma",
+"languages.alphabetical.one":"Índice alfabético de um idioma",
+"languages.title":"Idiomas",
+"mail.messagenotsent":"A mensagem não pôde ser enviada.",
+"mail.messagesent":"A mensagem foi enviada",
+"paging.next.alternate":"Próximo",
+"paging.previous.alternate":"Anterior",
+"permalink.alternate":"Permalink",
+"pubdate.title":"Ano de publicação",
+"recent.list":"{0} livros mais recentes",
+"recent.title":"Adições recentes",
+"search.alternate":"Busca",
+"search.result":"Resultado da busca por *{0}*",
+"search.sortorder.asc":"Asc",
+"search.sortorder.desc":"Desc",
+"series.alphabetical.many":"Índice alfabético das {0} séries",
+"series.alphabetical.none":"Índice alfabético de nenhuma série",
+"series.alphabetical.one":"Índice alfabético de uma série",
+"series.title":"Séries",
+"sort.alternate":"Ordenar",
+"splitByLetter.book.other":"Outros livros",
+"splitByLetter.letter":"{0} começando com {1}",
+"##TODO##tags.alphabetical.many":"Alphabetical index of the {0} tags",
+"tags.alphabetical.none":"Índice alfabético de nenhuma etiqueta",
+"##TODO##tags.alphabetical.one":"Alphabetical index of the single tag",
+"tags.title":"Etiquetas",
+"tagword.title":"Etiquetas",
 "languages.abk":"Abcázia",
 "languages.aaf":"Afar",
 "languages.afr":"Sul Africano",
@@ -244,93 +240,5 @@
 "languages.yor":"Yoruba",
 "languages.zha":"Zhuang",
 "languages.zul":"Zulu",
-"tags.title":"Etiquetas",
-"tags.categorized":"Índice por categoria das {0} etiquetas",
-"tags.categorized.single":"Índice por categoria de uma etiqueta",
-"tags.alphabetical":"Índice alfabético das {0} etiquetas",
-"tags.alphabetical.single":"Índice alfabético de uma etiqueta",
-"tags.alphabetical.none":"Índice alfabético de nenhuma etiqueta",
-"splitByLetter.tag.other":"Outras etiquetas",
-"authors.series.title":"Série: {0}",
-"authors.title":"Autores",
-"authors.alphabetical.many":"Índice alfabético dos {0} autores",
-"authors.alphabetical.one":"Índice alfabético de um autor",
-"authors.alphabetical.none":"Índice alfabético de nenhum autor",
-"splitByLetter.author.other":"Outros autores",
-"series.title":"Séries",
-"series.alphabetical.many":"Índice alfabético das {0} séries",
-"series.alphabetical.one":"Índice alfabético de uma série",
-"series.alphabetical.none":"Índice alfabético de nenhuma série",
-"splitByLetter.series.other":"Outras séries",
-"recent.title":"Adições recentes",
-"recent.list":"{0} livros mais recentes",
-"recent.list.single":"Livro mais recente",
-"rating.title":"Avaliação",
-"rating.summary":"{0}, agrupados por avaliação",
-"allbooks.title":"Todos os livros",
-"allbooks.alphabetical.many":"Índice alfabético dos {0} livros",
-"allbooks.alphabetical.one":"Índice alfabético de um livro",
-"allbooks.alphabetical.none":"Índice alfabético de nenhum livro",
-"splitByLetter.book.other":"Outros livros",
-"main.title":"Biblioteca do Calibre",
-"main.summary":"{0} catalogou {1}",
-"startup.newhome":"Pasta principal da configuração padrão redirecionada para {0}",
-"startup.redirectfound":"Arquivo .redirect não encontrado em {0}",
-"startup.redirectreadfail":"... falha ao ler arquivo .redirect",
-"startup.redirectnotfound":"... incapaz de encontrar a pasta de redirecionamento {0}",
-"startup.redirectabandoned":"... portanto redirecionamento abandonado",
-"startup.redirecting":"redirecionando pasta principal para {0}",
-"startup.configusing":"Usando pasta de configuração {0}",
-"startup.folderuserhome":"Tentativa de configuração de pasta na pasta principal do usuário {0}",
-"startup.foldertilde":"Tentativa de configuração de pasta a partir da pasta til {0}",
-"startup.folderjar":"Tentativa de configuração de pasta a partir da localização do .jar {0}",
-"startup.foldernotexist":"... mas pasta especificada não existe",
-"i18n.and":"e",
-"i18n.downloads":"Downloads, links e outros catálogos",
-"i18n.links":"Links e outros catálogos",
-"i18n.coversection":"Capa",
-"i18n.downloadfile":"Baixar arquivo",
-"i18n.downloadsection":"Downloads",
-"i18n.relatedsection":"Catálogos relacionados",
-"i18n.linksection":"Links externos",
-"i18n.backToMain":"Voltar para a página principal do catálogo",
-"i18n.summarysection":"Descrição",
-"i18n.dateGenerated":"Catálogo gerado em {0}",
-"deeplevel.summary":"{0} partido por autores, etiquetas, etc. ",
-"about.title":"Sobre o COPS",
-"customize.title":"Personalizar o COPS",
-"about.summary":"Notas para usar o COPS",
-"usage.intro":"As opções são obtidas a partir do arquivo de configuração localizado em {0}",
-"language.title":"Idioma",
-"config.Language.description":"Esta configuração muda a linguagem usada pelo programa; use o código de linguagem padrão ISO (ex.: EN, FR, DE...)",
-"config.Language.possible":"Possíveis valores : {0}",
-"intro.goal":"Gerar catálogos OPDS e HTML a partir da sua base de dados de ebooks do Calibre",
-"intro.wiki.title":"Home do projeto : ",
-"intro.wiki.url":"http://calibre2opds.com",
-"intro.team.title":"Time do Calibre2Opds :",
-"intro.team.list1":"David Pierron - programador principal",
-"intro.team.list2":"Dave Walker - guru, gestor de funcionalidades e notável testador",
-"intro.team.list3":"Farid Soussi - guru de css e html",
-"intro.team.list4":"Douglas Steele - programador",
-"intro.team.list5":"Jane Litte - testador beta e suporte moral",
-"intro.thanks.1":"Agradecimentos especiais a Kb Sriram, que não somente programou Trook, um excelente gerenciador ",
-"intro.thanks.2":"de biblioteca compatível com OPDS para o Nook, mas também foi gentil o bastante ao doar um Nook!",
-"search.result":"Resultado da busca por *{0}*",
-"search.sortorder.asc":"Asc",
-"search.sortorder.desc":"Desc",
-"permalink.alternate":"Permalink",
-"home.alternate":"Principal",
-"search.alternate":"Busca",
-"sort.alternate":"Ordenar",
-"paging.next.alternate":"Próximo",
-"paging.previous.alternate":"Anterior",
-"customize.title":"Personalizar a interface do COPS",
-"customize.style":"Tema",
-"customize.fancybox":"Usar o Lightbox",
-"customize.paging":"Número máximo de livros por página (-1 para desabilitar)",
-"customize.email":"Forneça seu email (para enviar o ebook)",
-"customize.filter":"Ativar filtro por etiqueta",
-"mail.messagenotsent":"A mensagem não pôde ser enviada.",
-"mail.messagesent":"A mensagem foi enviada",
-"fin":"final"
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_ru.json b/lang/Localization_ru.json
index 5e43034..cfff000 100644
--- a/lang/Localization_ru.json
+++ b/lang/Localization_ru.json
@@ -1,103 +1,244 @@
 {
-"boolean.no":"нет",
-"boolean.yes":"да",
-"splitByLetter.letter":"{0} начать с {1}",
-"home.title":"Основной каталог",
-"link.fullentry":"Полный перечень",
-"title.nextpage":"следующая страница ({0} из {1})",
-"title.lastpage":"следующая страница (последняя)",
-"title.numberOfPages":"{0} ({1} страницы(а))",
-"bookword.title":"Книги",
-"bookword.none":"Нет книг",
-"bookword.one":"1 книга",
-"bookword.many":"{0} книг(и)",
-"authorword.title":"Авторы",
+"##TODO##about.title":"About COPS",
+"allbooks.alphabetical.many":"Алфавитный указатель всех {0} книг",
+"##TODO##allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Алфавитный указатель одной книги",
+"allbooks.title":"Все книги",
+"authors.alphabetical.many":"Алфавитный указатель для {0} авторов",
+"##TODO##authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Алфавитный указатель для одного автора",
+"authors.title":"Авторы",
+"authorword.many":"{0} авторов(а)",
 "authorword.none":"Нет авторов",
 "authorword.one":"1 автор",
-"authorword.many":"{0} авторов(а)",
-"taglevelword.title":"Уровни тэгов",
-"taglevelword.none":"Нет уровней тэгов",
-"taglevelword.one":"1 уровень тэгов",
-"taglevelword.many":"{0} уровней(я) тэгов",
-"seriesword.title":"Серии",
-"seriesword.none":"Нет серий",
-"seriesword.one":"1 серия",
-"seriesword.many":"{0} серий(и)",
-"tagword.title":"Тэги",
-"tagword.none":"Нет тэгов",
-"tagword.one":"1 тэг",
-"tagword.many":"{0} тэгов(а)",
-"content.tags":"Тэги:",
+"bookentry.author":"{0} из {1}",
+"bookword.many":"{0} книг(и)",
+"bookword.none":"Нет книг",
+"bookword.one":"1 книга",
+"bookword.title":"Книги",
 "content.series":"Серии:",
 "content.series.data":"Книга {0} в {1} серии",
-"content.publisher":"Издательство:",
-"content.publisher.data":"Опубликовано {1} издательством {0}",
 "content.summary":"Краткое содержание:",
-"bookentry.series":"Книга {0} в {1} серии",
-"bookentry.author":"{0} из {1}",
-"bookentry.tags":"{0} в {1}",
-"bookentry.ratings":"{0} оценено {1}",
-"bookentry.goodreads":"Эта книга на Goodreads",
-"bookentry.goodreads.review":"Обзор этой книги на Goodreads",
-"bookentry.goodreads.author":"{0} на Goodreads",
-"bookentry.wikipedia":"Эта книга на Wikipedia",
-"bookentry.wikipedia.author":"{0} на Wikipedia",
-"bookentry.librarything":"Эта книга на LibraryThing",
-"bookentry.librarything.author":"{0} на LibraryThing",
-"bookentry.amazon":"Эта книга на Amazon",
-"bookentry.amazon.author":"{0} на Amazon",
-"bookentry.isfdb.author":"{0} на ISFDB",
-"bookentry.download":"Скачать эту электронную книгу в формате {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"Полный перечень",
-"tags.title":"Тэги",
-"tags.categorized":"Категорированный указатель для {0} тэгов",
-"tags.categorized.single":"Категорированный указатель для одного тэга",
-"tags.alphabetical.many":"Алфавитный указатель для {0} тэгов",
-"tags.alphabetical.one":"Алфавитный указатель для одного тэга",
-"splitByLetter.tag.other":"Другие тэги",
-"authors.series.title":"Серии: {0}",
-"authors.title":"Авторы",
-"authors.alphabetical.many":"Алфавитный указатель для {0} авторов",
-"authors.alphabetical.one":"Алфавитный указатель для одного автора",
-"splitByLetter.author.other":"Другие авторы",
-"series.title":"Серии",
-"series.alphabetical.many":"Алфавитный указатель для {0} серий",
-"series.alphabetical.one":"Алфавитный указатель для одной серии",
-"splitByLetter.series.other":"Другие серии",
-"recent.title":"Недавние поступления",
-"recent.list":"{0} недавно поступивших(ие) книг(и)",
-"recent.list.single":"Недавно поступившая одна книга",
-"rating.title":"Рейтинг",
-"rating.summary":"{0}, сгруппировано по рейтингу",
-"allbooks.title":"Все книги",
-"allbooks.alphabetical.many":"Алфавитный указатель всех {0} книг",
-"allbooks.alphabetical.one":"Алфавитный указатель одной книги",
-"splitByLetter.book.other":"Другие книги",
-"main.title":"Библиотека Calibre",
-"main.summary":"{0} каталогизировано {1}",
-"i18n.downloads":"Файлы для скачивания, ссылки и другие каталоги",
-"i18n.links":"Ссылки и другие каталоги",
-"i18n.downloadfile":"Скачать файл",
-"i18n.downloadsection":"Файлы для скачивания",
-"i18n.relatedsection":"Связанные каталоги",
-"i18n.linksection":"Внешние ссылки",
-"i18n.backToMain":"Назад на заглавную страницу каталога",
-"i18n.summarysection":"Краткое содержание",
-"i18n.dateGenerated":"Каталог создан {0}",
-"deeplevel.summary":"{0} разбито по авторам, тэгам и т.д.",
-"about.summary":"Примечания по использованию Calibre2Opds",
-"usage.intro":"Эта опция взята из файла конфигурации, расположенного в {0}",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"##TODO##home.alternate":"Home",
+"##TODO##i18n.coversection":"Cover",
 "language.title":"Язык",
-"config.Language.description":"Эта опция устанавливает язык, используемый программой; используйте стандартный ISO код языка (например, EN, FR, DE...)",
-"config.Language.possible":"Возможные значения : {0}",
-"intro.goal":"Генерация OPDS и HTML каталогов вашей базы электронных книг Calibre",
-"intro.team.title":"Команда Calibre2Opds :",
-"intro.team.list1":"David Pierron - главный программист",
-"intro.team.list2":"Dave Walker - гуру, менеджер по фукциональности и исключительный тестер",
-"intro.team.list4":"Douglas Steele - программист",
-"intro.team.list5":"Jane Litte - бэта-тестер и моральная поддержка",
-"intro.thanks.1":"Особые благодарности Kb Sriram, который программировал Trook, отличный и OPDS-совместимый",
-"intro.thanks.2":"менеджер библиотеки Nook, для благодарности достаточно оказать спонсорскую помощь Nook !",
-"fin":"fin"
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"##TODO##paging.next.alternate":"Next",
+"##TODO##paging.previous.alternate":"Previous",
+"##TODO##permalink.alternate":"Permalink",
+"##TODO##pubdate.title":"Publication year",
+"recent.list":"{0} недавно поступивших(ие) книг(и)",
+"recent.title":"Недавние поступления",
+"##TODO##search.alternate":"Search",
+"##TODO##search.result":"Search result for *{0}*",
+"##TODO##search.sortorder.asc":"Asc",
+"##TODO##search.sortorder.desc":"Desc",
+"series.alphabetical.many":"Алфавитный указатель для {0} серий",
+"##TODO##series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Алфавитный указатель для одной серии",
+"series.title":"Серии",
+"##TODO##sort.alternate":"Sort",
+"splitByLetter.book.other":"Другие книги",
+"splitByLetter.letter":"{0} начать с {1}",
+"tags.alphabetical.many":"Алфавитный указатель для {0} тэгов",
+"##TODO##tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Алфавитный указатель для одного тэга",
+"tags.title":"Тэги",
+"tagword.title":"Тэги",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
 }
diff --git a/lang/Localization_zh.json b/lang/Localization_zh.json
index f40531d..de0a9c8 100644
--- a/lang/Localization_zh.json
+++ b/lang/Localization_zh.json
@@ -1,137 +1,244 @@
-{
-"boolean.no":"否",
-"boolean.yes":"是",
-"splitByLetter.letter":"{0} 以 {1} 开头",
-"home.title":"目录",
-"link.fullentry":"全部条目",
-"title.nextpage":"下一页 ({0} of {1})",
-"title.lastpage":"最后一页",
-"title.numberOfPages":"{0} (共 {1} 页)",
-"pubdate.title":"出版时间",
-"bookword.title":"书名",
-"bookword.none":"没有书籍",
-"bookword.one":"1 本书籍",
-"bookword.many":"{0} 本书籍",
-"authorword.title":"作者",
-"authorword.none":"未知",
-"authorword.one":"1 位作者",
-"authorword.many":"{0} 位作者",
-"taglevelword.title":"Tag levels",
-"taglevelword.none":"No tag level",
-"taglevelword.one":"1 tag level",
-"taglevelword.many":"{0} tag levels",
-"seriesword.title":"系列",
-"seriesword.none":"没有系列",
-"seriesword.one":"1 个系列",
-"seriesword.many":"{0} 系列",
-"tagword.title":"标签",
-"tagword.none":"没有标签",
-"tagword.one":"1 个标签",
-"tagword.many":"{0} 标签",
-"content.tags":"标签:",
-"content.series":"系列:",
-"content.series.data":"{0} 系列的第 {0} 本",
-"content.publisher":"出版社:",
-"content.published":"出版时间",
-"content.added":"添加了: ",
-"content.modified":"修改了:",
-"content.publisher.data":"由 {0} 出版于 {1}",
-"content.summary":"概要",
-"bookentry.series":"Book {0} in the {1} series",
-"bookentry.author":"{0} 由作者 {1}",
-"bookentry.tags":"{0} 在标签 {1}",
-"bookentry.ratings":"{0} 评分 {1}",
-"bookentry.goodreads":"Goodreads 上的这本书",
-"bookentry.goodreads.review":"在 Goodreads上评论这本书",
-"bookentry.goodreads.author":"{0} 在 Goodreads",
-"bookentry.wikipedia":"维基百科上的这本书",
-"bookentry.wikipedia.author":"{0} 在维基百科上",
-"bookentry.librarything":"LibraryThing 上的这本书",
-"bookentry.librarything.author":"{0} 在 LibraryThing",
-"bookentry.amazon":"Amazon上的这本书",
-"bookentry.amazon.author":"{0} 在 Amazon",
-"bookentry.isfdb.author":"{0} 在 ISFDB",
-"bookentry.download":"下载这本书 {0}",
-"bookentry.rated":"{0} {1}",
-"bookentry.fullentrylink":"全部条目",
-"tags.title":"标签",
-"tags.categorized":"Categorized index of the {0} tags",
-"tags.categorized.single":"Categorized index of the single tag",
-"tags.alphabetical.many":"{0} 个标签的字母索引",
-"tags.alphabetical.one":"Alphabetical index of the single tag",
-"tags.alphabetical.none":"Alphabetical index of absolutely no tag",
-"splitByLetter.tag.other":"其他标签",
-"authors.series.title":"系列: {0}",
-"authors.title":"作者",
-"authors.alphabetical.many":"{0} 位作者的字母索引",
-"authors.alphabetical.one":"Alphabetical index of the single author",
-"authors.alphabetical.none":"Alphabetical index of absolutely no author",
-"splitByLetter.author.other":"其他作者",
-"series.title":"系列",
-"series.alphabetical.many":"{0} 个系列的字母索引",
-"series.alphabetical.one":"Alphabetical index of the single series",
-"series.alphabetical.none":"Alphabetical index of absolutely no series",
-"splitByLetter.series.other":"其他系列",
-"recent.title":"最近添加",
-"recent.list":"{0} 本最近添加的书",
-"recent.list.single":"Most recent single book",
-"rating.title":"Rating",
-"rating.summary":"{0}, 根据评分分组",
-"allbooks.title":"所有书籍",
-"allbooks.alphabetical.many":"{0} 本书籍的字母索引",
-"allbooks.alphabetical.one":"Alphabetical index of the single book",
-"allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
-"splitByLetter.book.other":"其他书籍",
-"main.title":"Calibre 书架",
-"main.summary":"{0} has catalogued {1}",
-"startup.newhome":"Default configuration folder home redirected to {0}",
-"startup.redirectfound":".redirect file found in {0}",
-"startup.redirectreadfail":"... failure reading .redirect file",
-"startup.redirectnotfound":"... unable to find redirect folder {0}",
-"startup.redirectabandoned":"... so redirect abandoned",
-"startup.redirecting":"redirecting home folder to {0}",
-"startup.configusing":"Using configuration folder {0}",
-"startup.folderuserhome":"Try configuration folder in user home folder {0}",
-"startup.foldertilde":"Try configuration folder from tilde folder {0}",
-"startup.folderjar":"Try configuration folder from .jar location {0}",
-"startup.foldernotexist":"... but specified folder does not exist",
-"i18n.and":"和",
-"i18n.downloads":"下载,链接和其他目录 ",
-"i18n.links":"链接和其他目录",
-"i18n.coversection":"封面",
-"i18n.downloadfile":"下载文件",
-"i18n.downloadsection":"下载",
-"i18n.relatedsection":"相关目录",
-"i18n.linksection":"外部链接",
-"i18n.backToMain":"返回目录主页",
-"i18n.summarysection":"描述",
-"i18n.dateGenerated":"目录生成于 {0}",
-"deeplevel.summary":"{0} broken up by authors, tags, etc. ",
-"about.title":"关于COPS",
-"about.summary":"关于Calibre2Opds的说明",
-"usage.intro":"选项从此配置文件生成 {0}",
-"language.title":"语言",
-"config.Language.description":"此项设置将会改变程序使用的语言 ; 请使用ISO标准语言代码 (例如 EN, FR, DE...)",
-"config.Language.possible":"可能的选项 : {0}",
-"intro.goal":"从你的 Calibre 数据库生成 OPDS 和 HTML 目录",
-"intro.wiki.title":"项目主页 : ",
-"intro.wiki.url":"http://calibre2opds.com",
-"intro.team.title":"项目人员 :",
-"intro.team.list1":"David Pierron - main programmer",
-"intro.team.list2":"Dave Walker - guru, features manager and tester extraordinaire",
-"intro.team.list3":"Farid Soussi - css and html guru",
-"intro.team.list4":"Douglas Steele - programmer",
-"intro.team.list5":"Jane Litte - beta tester and moral support",
-"intro.thanks.1":"Special thanks to Kb Sriram, who not only programmed Trook, an excellent and OPDS compatible ",
-"intro.thanks.2":"library manager for the Nook, but also was kind enough to donate a Nook !",
-"search.result":"*{0}* 的搜索结果",
-"search.sortorder.asc":"升序",
-"search.sortorder.desc":"降序",
-"permalink.alternate":"永久链接",
-"home.alternate":"首页",
-"search.alternate":"搜索",
-"sort.alternate":"排序",
-"paging.next.alternate":"下一页",
-"paging.previous.alternate":"上一页",
-"fin":"fin"
-}
+{
+"about.title":"关于COPS",
+"allbooks.alphabetical.many":"{0} 本书籍的字母索引",
+"allbooks.alphabetical.none":"Alphabetical index of absolutely no book",
+"allbooks.alphabetical.one":"Alphabetical index of the single book",
+"allbooks.title":"所有书籍",
+"authors.alphabetical.many":"{0} 位作者的字母索引",
+"authors.alphabetical.none":"Alphabetical index of absolutely no author",
+"authors.alphabetical.one":"Alphabetical index of the single author",
+"authors.title":"作者",
+"authorword.many":"{0} 位作者",
+"authorword.none":"未知",
+"authorword.one":"1 位作者",
+"bookentry.author":"{0} 由作者 {1}",
+"bookword.many":"{0} 本书籍",
+"bookword.none":"没有书籍",
+"bookword.one":"1 本书籍",
+"bookword.title":"书名",
+"content.series":"系列:",
+"content.series.data":"{0} 系列的第 {0} 本",
+"content.summary":"概要",
+"##TODO##customize.email":"Set your email (to allow book emailing)",
+"##TODO##customize.fancybox":"Use a Lightbox",
+"##TODO##customize.filter":"Enable tag filtering",
+"##TODO##customize.paging":"Max number of books per page (-1 to disable)",
+"##TODO##customize.style":"Theme",
+"##TODO##customize.title":"Customize COPS UI",
+"home.alternate":"首页",
+"i18n.coversection":"封面",
+"language.title":"语言",
+"##TODO##languages.alphabetical.many":"Alphabetical index of the {0} languages",
+"##TODO##languages.alphabetical.none":"Alphabetical index of absolutely no language",
+"##TODO##languages.alphabetical.one":"Alphabetical index of the single language",
+"##TODO##languages.title":"Languages",
+"##TODO##mail.messagenotsent":"Message could not be sent.",
+"##TODO##mail.messagesent":"Message has been sent",
+"paging.next.alternate":"下一页",
+"paging.previous.alternate":"上一页",
+"permalink.alternate":"永久链接",
+"pubdate.title":"出版时间",
+"recent.list":"{0} 本最近添加的书",
+"recent.title":"最近添加",
+"search.alternate":"搜索",
+"search.result":"*{0}* 的搜索结果",
+"search.sortorder.asc":"升序",
+"search.sortorder.desc":"降序",
+"series.alphabetical.many":"{0} 个系列的字母索引",
+"series.alphabetical.none":"Alphabetical index of absolutely no series",
+"series.alphabetical.one":"Alphabetical index of the single series",
+"series.title":"系列",
+"sort.alternate":"排序",
+"splitByLetter.book.other":"其他书籍",
+"splitByLetter.letter":"{0} 以 {1} 开头",
+"tags.alphabetical.many":"{0} 个标签的字母索引",
+"tags.alphabetical.none":"Alphabetical index of absolutely no tag",
+"tags.alphabetical.one":"Alphabetical index of the single tag",
+"tags.title":"标签",
+"tagword.title":"标签",
+"##TODO##languages.abk":"Abkhaz",
+"##TODO##languages.aaf":"Afar",
+"##TODO##languages.afr":"Afrikaans",
+"##TODO##languages.aka":"Akan",
+"##TODO##languages.sqi":"Albanian",
+"##TODO##languages.amh":"Amharic",
+"##TODO##languages.ara":"Arabic",
+"##TODO##languages.arg":"Aragonese",
+"##TODO##languages.hye":"Armenian",
+"##TODO##languages.asm":"Assamese",
+"##TODO##languages.ava":"Avaric",
+"##TODO##languages.ave":"Avestan",
+"##TODO##languages.aym":"Aymara",
+"##TODO##languages.aze":"Azerbaijani",
+"##TODO##languages.bam":"Bambara",
+"##TODO##languages.bak":"Bashkir",
+"##TODO##languages.eus":"Basque",
+"##TODO##languages.bel":"Belarusian",
+"##TODO##languages.ben":"Bengali",
+"##TODO##languages.bih":"Bihari",
+"##TODO##languages.bis":"Bislama",
+"##TODO##languages.bos":"Bosnian",
+"##TODO##languages.bre":"Breton",
+"##TODO##languages.bul":"Bulgarian",
+"##TODO##languages.mya":"Burmese",
+"##TODO##languages.cat":"Catalan",
+"##TODO##languages.cha":"Chamorro",
+"##TODO##languages.che":"Chechen",
+"##TODO##languages.nya":"Chichewa",
+"##TODO##languages.zho":"Chinese",
+"##TODO##languages.chv":"Chuvash",
+"##TODO##languages.cor":"Cornish",
+"##TODO##languages.cos":"Corsican",
+"##TODO##languages.cre":"Cree",
+"##TODO##languages.hrv":"Croatian",
+"##TODO##languages.ces":"Czech",
+"##TODO##languages.dan":"Danish",
+"##TODO##languages.div":"Divehi",
+"##TODO##languages.nld":"Dutch",
+"##TODO##languages.dzo":"Dzongkha",
+"##TODO##languages.eng":"English",
+"##TODO##languages.epo":"Esperanto",
+"##TODO##languages.est":"Estonian",
+"##TODO##languages.ewe":"Ewe",
+"##TODO##languages.fao":"Faroese",
+"##TODO##languages.fij":"Fijian",
+"##TODO##languages.fin":"Finnish",
+"##TODO##languages.fra":"French",
+"##TODO##languages.ful":"Fula",
+"##TODO##languages.glg":"Galician",
+"##TODO##languages.kat":"Georgian",
+"##TODO##languages.deu":"German",
+"##TODO##languages.ell":"Greek",
+"##TODO##languages.grn":"Guaraní",
+"##TODO##languages.guj":"Gujarati",
+"##TODO##languages.hat":"Haitian",
+"##TODO##languages.hau":"Hausa",
+"##TODO##languages.hed":"Hebrew",
+"##TODO##languages.her":"Herero",
+"##TODO##languages.hin":"Hindi",
+"##TODO##languages.hmo":"Hiri Motu",
+"##TODO##languages.hun":"Hungarian",
+"##TODO##languages.ina":"Interlingua",
+"##TODO##languages.ind":"Indonesian",
+"##TODO##languages.ile":"Interlingue",
+"##TODO##languages.gle":"Irish",
+"##TODO##languages.ibo":"Igbo",
+"##TODO##languages.ipk":"Inupiaq",
+"##TODO##languages.ido":"Ido",
+"##TODO##languages.isl":"Icelandic",
+"##TODO##languages.ita":"Italian",
+"##TODO##languages.iku":"Inuktitut",
+"##TODO##languages.jpn":"Japanese",
+"##TODO##languages.jav":"Javanese",
+"##TODO##languages.kal":"Kalaallisut",
+"##TODO##languages.kan":"Kannada",
+"##TODO##languages.kau":"Kanuri",
+"##TODO##languages.kas":"Kashmiri",
+"##TODO##languages.kaz":"Kazakh",
+"##TODO##languages.khm":"Khmer",
+"##TODO##languages.kik":"Kikuyu",
+"##TODO##languages.kin":"Kinyarwanda",
+"##TODO##languages.kir":"Kyrgyz",
+"##TODO##languages.kom":"Komi",
+"##TODO##languages.kon":"Kongo",
+"##TODO##languages.kor":"Korean",
+"##TODO##languages.kur":"Kurdish",
+"##TODO##languages.kua":"Kwanyama",
+"##TODO##languages.lat":"Latin",
+"##TODO##languages.ltz":"Luxembourgish",
+"##TODO##languages.lug":"Ganda",
+"##TODO##languages.lim":"Limburgish",
+"##TODO##languages.lin":"Lingala",
+"##TODO##languages.lao":"Lao",
+"##TODO##languages.lit":"Lithuanian",
+"##TODO##languages.lub":"Luba-Katanga",
+"##TODO##languages.lav":"Latvian",
+"##TODO##languages.glv":"Manx",
+"##TODO##languages.mkd":"Macedonian",
+"##TODO##languages.mlg":"Malagasy",
+"##TODO##languages.msa":"Malay",
+"##TODO##languages.mal":"Malayalam",
+"##TODO##languages.mlt":"Maltese",
+"##TODO##languages.mri":"Māori",
+"##TODO##languages.mar":"Marathi",
+"##TODO##languages.mah":"Marshallese",
+"##TODO##languages.mon":"Mongolian",
+"##TODO##languages.nau":"Nauru",
+"##TODO##languages.nav":"Navajo",
+"##TODO##languages.nob":"Norwegian Bokmål",
+"##TODO##languages.nde":"North Ndebele",
+"##TODO##languages.nep":"Nepali",
+"##TODO##languages.ndo":"Ndonga",
+"##TODO##languages.nno":"Norwegian Nynorsk",
+"##TODO##languages.nor":"Norwegian",
+"##TODO##languages.iii":"Nuosu",
+"##TODO##languages.nbl":"South Ndebele",
+"##TODO##languages.oci":"Occitan",
+"##TODO##languages.oji":"Ojibwe",
+"##TODO##languages.chu":"Old Church Slavonic",
+"##TODO##languages.orm":"Oromo",
+"##TODO##languages.ori":"Oriya",
+"##TODO##languages.oss":"Ossetian",
+"##TODO##languages.pan":"Panjabi",
+"##TODO##languages.pli":"Pāli",
+"##TODO##languages.fas":"Persian",
+"##TODO##languages.pol":"Polish",
+"##TODO##languages.pus":"Pashto",
+"##TODO##languages.por":"Portuguese",
+"##TODO##languages.que":"Quechua",
+"##TODO##languages.roh":"Romansh",
+"##TODO##languages.run":"Kirundi",
+"##TODO##languages.ron":"Romanian",
+"##TODO##languages.rus":"Russian",
+"##TODO##languages.san":"Sanskrit",
+"##TODO##languages.srd":"Sardinian",
+"##TODO##languages.snd":"Sindhi",
+"##TODO##languages.sme":"Northern Sami",
+"##TODO##languages.smo":"Samoan",
+"##TODO##languages.sag":"Sango",
+"##TODO##languages.srp":"Serbian",
+"##TODO##languages.gla":"Scottish Gaelic",
+"##TODO##languages.sna":"Shona",
+"##TODO##languages.sin":"Sinhala",
+"##TODO##languages.slk":"Slovak",
+"##TODO##languages.slv":"Slovene",
+"##TODO##languages.som":"Somali",
+"##TODO##languages.sot":"Southern Sotho",
+"##TODO##languages.spa":"Spanish",
+"##TODO##languages.sun":"Sundanese",
+"##TODO##languages.swa":"Swahili",
+"##TODO##languages.ssw":"Swati",
+"##TODO##languages.swe":"Swedish",
+"##TODO##languages.tam":"Tamil",
+"##TODO##languages.tel":"Telugu",
+"##TODO##languages.tgk":"Tajik",
+"##TODO##languages.tha":"Thai",
+"##TODO##languages.tir":"Tigrinya",
+"##TODO##languages.bod":"Tibetan Standard",
+"##TODO##languages.tuk":"Turkmen",
+"##TODO##languages.tgl":"Tagalog",
+"##TODO##languages.tsn":"Tswana",
+"##TODO##languages.ton":"Tonga",
+"##TODO##languages.tur":"Turkish",
+"##TODO##languages.tso":"Tsonga",
+"##TODO##languages.tat":"Tatar",
+"##TODO##languages.twi":"Twi",
+"##TODO##languages.tah":"Tahitian",
+"##TODO##languages.uig":"Uighur",
+"##TODO##languages.ukr":"Ukrainian",
+"##TODO##languages.urd":"Urdu",
+"##TODO##languages.uzb":"Uzbek",
+"##TODO##languages.ven":"Venda",
+"##TODO##languages.vie":"Vietnamese",
+"##TODO##languages.vol":"Volapük",
+"##TODO##languages.win":"Walloon",
+"##TODO##languages.cym":"Welsh",
+"##TODO##languages.wol":"Wolof",
+"##TODO##languages.fry":"Western Frisian",
+"##TODO##languages.xho":"Xhosa",
+"##TODO##languages.yid":"Yiddish",
+"##TODO##languages.yor":"Yoruba",
+"##TODO##languages.zha":"Zhuang",
+"##TODO##languages.zul":"Zulu",
+"DO_NOT_TRANSLATE":"end"
+}
diff --git a/templates/default/header.html b/templates/default/header.html
index bcd45a0..f39fc45 100644
--- a/templates/default/header.html
+++ b/templates/default/header.html
@@ -22,7 +22,7 @@
                     {{? it.databaseId != ""}}
                         <input type="hidden" name="db" value="{{=it.databaseId}}" />
                     {{?}}
-                    <input type="search" name="query" />
+                    <input type="search" required="required" name="query" />
                 </div>
             </form>
         </div>
diff --git a/tools/updateLang.pl b/tools/updateLang.pl
index 66caca0..e8deddc 100644
--- a/tools/updateLang.pl
+++ b/tools/updateLang.pl
@@ -9,7 +9,7 @@
 
 use strict;
 
-my @strings = ();
+our @strings = ();
 my %values;
 my %allstrings;
 
@@ -43,38 +43,54 @@ closedir $dirhandle;
 
 # Load existing json files with strings and values
 
+handleLanguageFile ("Localization_en.json");
+
 opendir (my($dirhandle), "../lang") or die ("Directory not found\n");
 for (readdir ($dirhandle)) {
     next if (-d $_ ); # skip directories
     next if (/^[.]/); # skip dot-files
     next if not (/(.+)[.]json$/);
+    next if (/en\.json$/);
     
-    my $file = "../lang/" . $_;    
-    (my $lang = $_) =~ s/Localization_(\w\w)\.json/$1/;
-    debug ("language file: $_ / $lang \n");
+    handleLanguageFile ($_);
+}
+closedir $dirhandle;
+
+sub handleLanguageFile {
+    my ($file) = @_;
+    (my $lang = $file) =~ s/Localization_(\w\w)\.json/$1/;
+    my $file = "../lang/" . $file;    
+    
+    debug ("language file: $file / $lang \n");
     
     my $content = loadFile ($file);
     
     while ($content =~ /"(.*?)"\:"(.*?)",/igs) {
-        #push @strings, $1;
-        $values{$lang}{$1} = $2;
+        my $key = $1;
+        my $value = $2;
+        next if ($key =~ /^##TODO##/);
+        if ($lang eq "en" && $key =~ /^languages\.\w{3}$/) {
+            push (@strings, $key);
+        }
+        $values{$lang}{$key} = $value;
         #debug (" * $1 \n");
     }
     
-    open OUTPUT, ">$file.new";
+    open OUTPUT, ">$file";
     
     print OUTPUT "{\n";
     foreach my $name (@strings) {
-        print OUTPUT "\"$name\":\"$values{$lang}{$name}\",\n";
+        if (not exists ($values{$lang}{$name})) {
+            print OUTPUT "\"##TODO##$name\":\"$values{en}{$name}\",\n";
+        } else {
+            print OUTPUT "\"$name\":\"$values{$lang}{$name}\",\n";
+        }
     }
-    print OUTPUT "\"end\":\"end\"\n";
+    print OUTPUT "\"DO_NOT_TRANSLATE\":\"end\"\n";
     print OUTPUT "}\n";
     
     close OUTPUT;
 }
-closedir $dirhandle;
-
-
 
 sub loadFile {
     my ($file) = @_;
diff --git a/util.js b/util.js
index 4820df7..5c7f8aa 100644
--- a/util.js
+++ b/util.js
@@ -285,6 +285,7 @@ function handleLinks () {
     $("body").on ("click", ".headright", function(){
         if ($("#tool").is(":hidden")) {
             $("#tool").slideDown("slow");
+            $("input[name=query]").focus();
             $.cookie('toolbar', '1', { expires: 365 });
         } else {
             $("#tool").slideUp();