diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 8c649f8f12f4f30bf25357f68f69b423c8fa194c..a707751188a2d3db7ca8c160e8032942d826a62a 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'rtl';
+$lang['doublequoteopening']  = '“';//“
+$lang['doublequoteclosing']  = '”';//”
+$lang['singlequoteopening']  = '‘';//‘
+$lang['singlequoteclosing']  = '’';//’
 
 $lang['btn_edit']   = 'حرر هذه الصفحة';
 $lang['btn_source'] = 'اعرض مصدر الصفحة';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 194cc506cc3a1bab7ead77a80d25144e6156b0d0..63b5f5cc03350c7cf9c44d2dd3451c83b959eb77 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//“
+$lang['doublequoteclosing']  = '”';//”
+$lang['singlequoteopening']  = '‘';//‘
+$lang['singlequoteclosing']  = '’';//’
 
 $lang['btn_edit']   = 'Edita aquesta pàgina';
 $lang['btn_source'] = 'Mostra codi font';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index 6b9e59d72536bb6441f90a1796fe2f356dcdff1c..8f19a42aa9a625f62597f396271937dbbeae7574 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//„
+$lang['doublequoteclosing']  = '“';//“
+$lang['singlequoteopening']  = '‚';//‚
+$lang['singlequoteclosing']  = '‘';//‘
 
 $lang['btn_edit']   = 'Upravit stránku';
 $lang['btn_source'] = 'Zdrojový kód stránky';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index de4b2dd608ddec6178e5da8aea7f5e4367e8858d..8a7b23c6012052dd251867affb4b152de02002ae 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -9,6 +9,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//„
+$lang['doublequoteclosing']  = '“';//“
+$lang['singlequoteopening']  = '‚';//‚
+$lang['singlequoteclosing']  = '‘';//‘
 
 $lang['btn_edit']   = 'Rediger dette dokument';
 $lang['btn_source'] = 'Vis kildekode';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index e2de6dd512f121805e08d58fd029211fa677868e..6a7c05de81af110df3560e999528338fd6891c3b 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -11,6 +11,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//„
+$lang['doublequoteclosing']  = '“';//“
+$lang['singlequoteopening']  = '‚';//‚
+$lang['singlequoteclosing']  = '‘';//‘
 
 $lang['btn_edit']   = 'Diese Seite bearbeiten';
 $lang['btn_source'] = 'Zeige Quelltext';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 16ac3a4af98e0c50abcde42611360f6a13cad88a..6c58cae31464b335ffaba8c544e30659e3940523 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -7,6 +7,11 @@
  * @author     Anika Henke <henke@cosmocode.de>
  * @author     Thanos Massias <tm@navarino.gr>
  */
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '„';//&bdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '‚';//&sbquo;
+
 $lang['admin_register']         = 'Προσθήκη νέου χρήστη...';
 $lang['authmodfailed']          = 'Κακή ρύθμιση λίστας χρηστών. Παρακαλούμε ενημερώστε τον διαχειριστή του wiki.';
 $lang['authtempfail']           = 'Η είσοδος χρηστών δεν λειτουργεί αυτή την στιγμή. Εάν αυτό διαρκεί για πολύ χρόνο, παρακαλούμε ενημερώστε τον διαχειριστή του wiki.';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 27211605a73f832141352086c1975243eecd7dfa..4860415225cea8669fb39c0f9ffd94e8c8f72f6b 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -9,6 +9,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Edit this page';
 $lang['btn_source'] = 'Show pagesource';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index c77c6d23493bb6997c4ed5b5a818737892c8fa69..8e3db24365be4e2e1a53cfc46e958786c7954be2 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -8,6 +8,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Redakti paĝon';
 $lang['btn_source'] = 'Montri fontan tekston';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 4db73a746f843db2647dadb679b5ede494a69770..5d8210d2826830c11fe2909a6e44fb23ad11f164 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -12,6 +12,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_back']   = 'Atrás';
 $lang['btn_edit']   = 'Editar esta página';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index f9734c72c1384839acf5e38d1f4fe423da9d390f..58b3cfa02768d2acef542c12352e5b3fa153ed11 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -9,6 +9,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Toimeta seda lehte';
 $lang['btn_source'] = 'Näita lehepõhja';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index 2b387fb10dc181809a0e9d15b0df23722fcc9431..8eb72a1d76c911e4c766e5c4ca970750e3d6ffb5 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -8,6 +8,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '”';//&rdquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '’';//&rsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Muokkaa tätä sivua';
 $lang['btn_source'] = 'Näytä sivun lähdekoodi';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index e1c0639d53e6cb7776915064147d46ca3836f30c..be363e05426414bfa8c89ece5590e07ea65b0473 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -13,6 +13,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Éditer cette page';
 $lang['btn_source'] = 'Afficher le texte source';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 8810e8e032c37fa1fd1efdd63925250f7d64e630..43a36baeda4dac3ef5aac7ed9358a8b79ac77339 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -10,6 +10,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'rtl';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_draft']  = 'עריכת טיוטה';
 $lang['btn_recover']= 'שחזור טיוטה';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 3532f3aa2b075b1b5ad7d08f7414c491af5dcd82..81dfbb77226b347db0fc9866a2a053598e45b0b5 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Oldal szerkesztése';
 $lang['btn_source'] = 'Oldalforrás megtekintése';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 23f94c113e5c726d83e6da90f00986ba285a30dc..c9f2c1dcdcc79739dc28eb5fb557e643e0aab751 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -9,6 +9,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Modifica questa pagina';
 $lang['btn_source'] = 'Mostra sorgente';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index 6ddbbc03b169851a5210e2c2a795424488752d30..37ff27c8ae97b1eb6a67978edd5f15ed10edbd2f 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -9,6 +9,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Redaguoti šį puslapį';
 $lang['btn_source'] = 'Parodyti puslapio kodÄ…';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index cbbd5031600cbbe991b9e8b1f6e909831e03fef8..91ea7cda365c4e7d60d68e1f2b3f91a3bec097b0 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Labot lapu';
 $lang['btn_source'] = 'Parādīt lapas kodu';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 7776ea3d0be4c332f1099eb9d5608d07bb3207a7..747feb723117fb7f463fad7776939c3261497339 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -10,6 +10,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Pagina aanpassen';
 $lang['btn_source'] = 'Toon pagina broncode';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 1c423b9c718edca3022c5d09633991a99a6db17c..d1f597bc535c98c34d208202ac5a7e4a4744ff7e 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -9,6 +9,10 @@
 
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Edytuj stronÄ™';
 $lang['btn_source'] = 'Pokaż źródło strony';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index a4b489f5c0f8beca06efcdf08bec56f60e12a9c9..fe65fcae112d4bfc9f722e2a7a25b46a247720ec 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -9,6 +9,10 @@
  */
 $lang['encoding']     = 'utf-8';
 $lang['direction']    = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']     = 'Editar essa página';
 $lang['btn_source']   = 'Mostrar código fonte';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 81990073a3e1ac472de12073ffb922630de5f473..8f4da0d09051aeb26700496b2ff0f2e655a67ce4 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']     = 'utf-8';
 $lang['direction']    = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']     = 'Editar Página';
 $lang['btn_source']   = 'Ver em bruto';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index 9048d34d3a0037307b92f5f22d571d55f543b887..21d6896b12dd2a0f5489b012a1f9d4a57c0b0955 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Editează această pagină';
 $lang['btn_source'] = 'Arată sursa paginii';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index dc9a78399bfab7afc856cc5bf25063ef7170de60..22722ba74ee500a2c57cf61dbffd3b0d02c29dcb 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Upraviť stránku';
 $lang['btn_source'] = 'Zobraziť zdroj stránky';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index 703b7bee5cf7c321ceafab174b071dcd6c403b93..ae78f9909f69f963eb0407255941e3d4f3baf7df 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -6,6 +6,10 @@
  * @author     Jaka Kranjc <lynxlupodian@hotmail.com>
  */
 $lang['encoding']   = 'utf-8';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Uredi to stran';
 $lang['btn_source'] = 'Prikaži izvorno kodo strani';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index 92d42a25e6b1c3d9aff9a54d02f0697c2c546a58..e9a386ecb3817bb59734992033fa995273c268c6 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
 
 $lang['btn_edit']   = 'Изнеми ову страницу';
 $lang['btn_source'] = 'Прикажи изворни код';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index fe6bf65a0df894b0e4d00068a5ed60b0ec46338e..dd1d4e5534db890f3208ec9b3fb37404494e75f2 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '”';//&rdquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '’';//&rsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Redigera den här sidan';
 $lang['btn_source'] = 'Visa sidkälla';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index c3bd650b43d780185bcdd88f181a70c70b6458a2..633325b4b65f6af58b3b107b2b2ba0f8af247fb8 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -7,6 +7,10 @@
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
 
 $lang['btn_edit']   = 'Sayfayı değiştir';
 $lang['btn_source'] = 'Kaynağı göster';
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 5a9f6a122191ff92500cc616940175c6ec0b7235..6e2c27b2ad30042fdede7e4c7a8bbfa438148214 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -206,12 +206,12 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 
   function quote_open(){
-    if ($this->capture) $this->doc .= DOKU_LF.DOKU_TAB.'“';
+    if ($this->capture) $this->doc .= DOKU_LF.DOKU_TAB.'"';
   }
 
   function quote_close(){
     if ($this->capture){
-      $this->doc .= '”';
+      $this->doc .= '"';
       if (strlen($this->doc) > 250) $this->capture = false;
       else $this->doc .= DOKU_LF;
     }
@@ -242,19 +242,23 @@ class Doku_Renderer_metadata extends Doku_Renderer {
   }
 
   function singlequoteopening(){
-    if ($this->capture) $this->doc .= '‘';
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['singlequoteopening'];
   }
 
   function singlequoteclosing(){
-    if ($this->capture) $this->doc .= '’';
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['singlequoteclosing'];
   }
 
   function doublequoteopening(){
-    if ($this->capture) $this->doc .= '“';
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['doublequoteopening'];
   }
 
   function doublequoteclosing(){
-    if ($this->capture) $this->doc .= '”';
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['doublequoteclosing'];
   }
 
   function camelcaselink($link) {
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5390ae843a55ef6a3de26879af374e60340857c0..ea5b72495b926948aec7607f61573402e4bff390 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -441,19 +441,23 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
     }
 
     function singlequoteopening() {
-        $this->doc .= "&lsquo;";
+        global $lang;
+        $this->doc .= $lang['singlequoteopening'];
     }
 
     function singlequoteclosing() {
-        $this->doc .= "&rsquo;";
+        global $lang;
+        $this->doc .= $lang['singlequoteclosing'];
     }
 
     function doublequoteopening() {
-        $this->doc .= "&ldquo;";
+        global $lang;
+        $this->doc .= $lang['doublequoteopening'];
     }
 
     function doublequoteclosing() {
-        $this->doc .= "&rdquo;";
+        global $lang;
+        $this->doc .= $lang['doublequoteclosing'];
     }
 
     /**
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 66780ac50b0bf081c52f0098d44ba53d66f92473..d6f7685574303b1ef393e737b960fceac89457e2 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -160,7 +160,7 @@ function toolbar_JSdefines($varname){
             'type'   => 'picker',
             'title'  => $lang['qb_chars'],
             'icon'   => 'chars.png',
-            'list'   => explode(' ','À à Á á  â à ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘'),
+            'list'   => explode(' ','À à Á á  â à ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ ‹ ›'),
            ),
       array(
             'type'   => 'signature',