30 files changed, 277 insertions, 277 deletions

diff --git a/firmware/common/crc32.c b/firmware/common/crc32.c
index f02243dbb6..d64faa88d1 100644
--- a/firmware/common/crc32.c
+++ b/firmware/common/crc32.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2003 Jörg Hohensohn [IDC]Dragon
+ * Copyright (C) 2003 Jörg Hohensohn [IDC]Dragon
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/common/dir_uncached.c b/firmware/common/dir_uncached.c
index 105265bc8f..5303e32df6 100644
--- a/firmware/common/dir_uncached.c
+++ b/firmware/common/dir_uncached.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id: dir.c 13741 2007-06-30 02:08:27Z jethead71 $
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index a81d57dd01..653f17e946 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/common/file.c b/firmware/common/file.c
index 4e08e50558..a0bfb82ec6 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/drivers/lcd-charset-player.c b/firmware/drivers/lcd-charset-player.c
index 6b68d47344..6ed4229f20 100644
--- a/firmware/drivers/lcd-charset-player.c
+++ b/firmware/drivers/lcd-charset-player.c
@@ -213,97 +213,97 @@ const struct xchar_info xchar_info_newlcd[] = {
 #ifndef BOOTLOADER /* bootloader only supports pure ASCII */
     /* Latin 1 */
     {   0xa0, 0, 0, 0x20 }, /*   (non-breaking space) */
-    {   0xa1, XF_INVEXCLAMATION, 1, 0x21 }, /* ¡ (inverted !) */
-    {   0xa2, XF_CENTSIGN,       1, 0x63 }, /* ¢ (cent sign) */
-    {   0xa3, XF_POUNDSIGN,      1, 0x4c }, /* £ (pound sign) */
-    {   0xa4, XF_CURRENCY,       1, 0x6f }, /* ¤ (currency sign) */
-    {   0xa5, 0, 0, 0x5c }, /* ¥ (yen sign) */
+    {   0xa1, XF_INVEXCLAMATION, 1, 0x21 }, /* ¡ (inverted !) */
+    {   0xa2, XF_CENTSIGN,       1, 0x63 }, /* ¢ (cent sign) */
+    {   0xa3, XF_POUNDSIGN,      1, 0x4c }, /* £ (pound sign) */
+    {   0xa4, XF_CURRENCY,       1, 0x6f }, /* ¤ (currency sign) */
+    {   0xa5, 0, 0, 0x5c }, /* ¥ (yen sign) */
 
-    {   0xa7, 0, 0, 0x15 }, /* § (paragraph sign) */
+    {   0xa7, 0, 0, 0x15 }, /* § (paragraph sign) */
 
-    {   0xab, 0, 0, 0x9e }, /* « (left double-angle quotation mark) */
+    {   0xab, 0, 0, 0x9e }, /* « (left double-angle quotation mark) */
 
-    {   0xad, 0, 0, 0x2d }, /* ­ (soft hyphen) */
+    {   0xad, 0, 0, 0x2d }, /* ­ (soft hyphen) */
 
-    {   0xaf, XF_MACRON, 1, 0x2d }, /* ¯ (macron) */
+    {   0xaf, XF_MACRON, 1, 0x2d }, /* ¯ (macron) */
 
-    {   0xb1, 0, 0, 0x95 }, /* ± (plus-minus sign) */
-    {   0xb2, 0, 0, 0x99 }, /* ³ (superscript 2) */
-    {   0xb3, 0, 0, 0x9a }, /* ³ (superscript 3) */
+    {   0xb1, 0, 0, 0x95 }, /* ± (plus-minus sign) */
+    {   0xb2, 0, 0, 0x99 }, /* ³ (superscript 2) */
+    {   0xb3, 0, 0, 0x9a }, /* ³ (superscript 3) */
 
-    {   0xb5, 0, 0, 0xe6 }, /* µ (micro sign) */
-    {   0xb6, 0, 0, 0x14 }, /* ¶ (pilcrow sign) */
-    {   0xb7, 0, 0, 0xa5 }, /* · (middle dot) */
+    {   0xb5, 0, 0, 0xe6 }, /* µ (micro sign) */
+    {   0xb6, 0, 0, 0x14 }, /* ¶ (pilcrow sign) */
+    {   0xb7, 0, 0, 0xa5 }, /* · (middle dot) */
 
-    {   0xbb, 0, 0, 0x9f }, /* » (right double-angle quotation mark) */
-    {   0xbc, 0, 0, 0x9c }, /* ¼ (one quarter) */
-    {   0xbd, 0, 0, 0x9b }, /* ½ (one half) */
-    {   0xbe, 0, 0, 0x9d }, /* ¾ (three quarters) */
-    {   0xbf, XF_INVQUESTION, 1, 0x3f }, /* ¿ (inverted ?) */
-    {   0xc0, XF_AGRAVE,      1, 0x41 }, /* À (A grave) */
-    {   0xc1, XF_AACUTE,      1, 0x41 }, /* Á (A acute) */
-    {   0xc2, XF_ACIRCUMFLEX, 1, 0x41 }, /* Â (A circumflex) */
-    {   0xc3, XF_ATILDE,      1, 0x41 }, /* Ã (A tilde) */
-    {   0xc4, XF_ADIERESIS,   1, 0x41 }, /* Ä (A dieresis) */
-    {   0xc5, XF_ARING,       1, 0x41 }, /* Å (A with ring above) */
-    {   0xc6, XF_AELIGATURE,  1, 0x41 }, /* Æ (AE ligature) */
-    {   0xc7, XF_CCEDILLA,    1, 0x43 }, /* Ç (C cedilla) */
-    {   0xc8, XF_EGRAVE,      1, 0x45 }, /* È (E grave) */
-    {   0xc9, XF_EACUTE,      1, 0x45 }, /* É (E acute) */
-    {   0xca, XF_ECIRCUMFLEX, 1, 0x45 }, /* Ê (E circumflex) */
-    {   0xcb, XF_EDIERESIS,   1, 0x45 }, /* Ë (E dieresis) */
-    {   0xcc, XF_IGRAVE,      1, 0x49 }, /* Ì (I grave) */
-    {   0xcd, XF_IACUTE,      1, 0x49 }, /* Í (I acute) */
-    {   0xce, XF_ICIRCUMFLEX, 1, 0x49 }, /* Î (I circumflex) */
-    {   0xcf, XF_IDIERESIS,   1, 0x49 }, /* Ï (I dieresis) */
-    {   0xd0, XF_ETH,         1, 0x44 }, /* Ð (ETH) */
-    {   0xd1, XF_NTILDE,      1, 0x4e }, /* Ñ (N tilde) */
-    {   0xd2, XF_OGRAVE,      1, 0x4f }, /* Ò (O grave) */
-    {   0xd3, XF_OACUTE,      1, 0x4f }, /* Ó (O acute) */
-    {   0xd4, XF_OCIRCUMFLEX, 1, 0x4f }, /* Ô (O circumflex) */
-    {   0xd5, XF_OTILDE,      1, 0x4f }, /* Õ (O tilde) */
-    {   0xd6, XF_ODIERESIS,   1, 0x4f }, /* Ö (O dieresis) */
-    {   0xd7, 0, 0, 0x96 }, /* × (multiplication sign) */
-    {   0xd8, XF_OSTROKE,     1, 0x30 }, /* Ø (O stroke) */
-    {   0xd9, XF_UGRAVE,      1, 0x55 }, /* Ù (U grave) */
-    {   0xda, XF_UACUTE,      1, 0x55 }, /* Ú (U acute) */
-    {   0xdb, XF_UCIRCUMFLEX, 1, 0x55 }, /* Û (U circumflex) */
-    {   0xdc, XF_UDIERESIS,   1, 0x55 }, /* Ü (U dieresis) */
-    {   0xdd, XF_YACUTE,      1, 0x59 }, /* Ý (Y acute) */
+    {   0xbb, 0, 0, 0x9f }, /* » (right double-angle quotation mark) */
+    {   0xbc, 0, 0, 0x9c }, /* ¼ (one quarter) */
+    {   0xbd, 0, 0, 0x9b }, /* ½ (one half) */
+    {   0xbe, 0, 0, 0x9d }, /* ¾ (three quarters) */
+    {   0xbf, XF_INVQUESTION, 1, 0x3f }, /* ¿ (inverted ?) */
+    {   0xc0, XF_AGRAVE,      1, 0x41 }, /* À (A grave) */
+    {   0xc1, XF_AACUTE,      1, 0x41 }, /* � (A acute) */
+    {   0xc2, XF_ACIRCUMFLEX, 1, 0x41 }, /* Â (A circumflex) */
+    {   0xc3, XF_ATILDE,      1, 0x41 }, /* Ã (A tilde) */
+    {   0xc4, XF_ADIERESIS,   1, 0x41 }, /* Ä (A dieresis) */
+    {   0xc5, XF_ARING,       1, 0x41 }, /* Ã… (A with ring above) */
+    {   0xc6, XF_AELIGATURE,  1, 0x41 }, /* Æ (AE ligature) */
+    {   0xc7, XF_CCEDILLA,    1, 0x43 }, /* Ç (C cedilla) */
+    {   0xc8, XF_EGRAVE,      1, 0x45 }, /* È (E grave) */
+    {   0xc9, XF_EACUTE,      1, 0x45 }, /* É (E acute) */
+    {   0xca, XF_ECIRCUMFLEX, 1, 0x45 }, /* Ê (E circumflex) */
+    {   0xcb, XF_EDIERESIS,   1, 0x45 }, /* Ë (E dieresis) */
+    {   0xcc, XF_IGRAVE,      1, 0x49 }, /* Ì (I grave) */
+    {   0xcd, XF_IACUTE,      1, 0x49 }, /* � (I acute) */
+    {   0xce, XF_ICIRCUMFLEX, 1, 0x49 }, /* ÃŽ (I circumflex) */
+    {   0xcf, XF_IDIERESIS,   1, 0x49 }, /* � (I dieresis) */
+    {   0xd0, XF_ETH,         1, 0x44 }, /* � (ETH) */
+    {   0xd1, XF_NTILDE,      1, 0x4e }, /* Ñ (N tilde) */
+    {   0xd2, XF_OGRAVE,      1, 0x4f }, /* Ã’ (O grave) */
+    {   0xd3, XF_OACUTE,      1, 0x4f }, /* Ó (O acute) */
+    {   0xd4, XF_OCIRCUMFLEX, 1, 0x4f }, /* Ô (O circumflex) */
+    {   0xd5, XF_OTILDE,      1, 0x4f }, /* Õ (O tilde) */
+    {   0xd6, XF_ODIERESIS,   1, 0x4f }, /* Ö (O dieresis) */
+    {   0xd7, 0, 0, 0x96 }, /* × (multiplication sign) */
+    {   0xd8, XF_OSTROKE,     1, 0x30 }, /* Ø (O stroke) */
+    {   0xd9, XF_UGRAVE,      1, 0x55 }, /* Ù (U grave) */
+    {   0xda, XF_UACUTE,      1, 0x55 }, /* Ú (U acute) */
+    {   0xdb, XF_UCIRCUMFLEX, 1, 0x55 }, /* Û (U circumflex) */
+    {   0xdc, XF_UDIERESIS,   1, 0x55 }, /* Ü (U dieresis) */
+    {   0xdd, XF_YACUTE,      1, 0x59 }, /* � (Y acute) */
 
-    {   0xdf, 0, 0, 0xe1 }, /* ß (sharp s) */
-    {   0xe0, XF_aGRAVE,      1, 0x61 }, /* à (a grave) */
-    {   0xe1, XF_aACUTE,      1, 0x61 }, /* á (a acute) */
-    {   0xe2, XF_aCIRCUMFLEX, 1, 0x61 }, /* â (a circumflex) */
-    {   0xe3, XF_aTILDE,      1, 0x61 }, /* ã (a tilde) */
-    {   0xe4, XF_aDIERESIS,   1, 0x61 }, /* ä (a dieresis) */
-    {   0xe5, XF_aRING,       1, 0x61 }, /* å (a with ring above) */
-    {   0xe6, XF_aeLIGATURE,  1, 0x61 }, /* æ (ae ligature) */
-    {   0xe7, XF_cCEDILLA,    1, 0x63 }, /* ç (c cedilla) */
-    {   0xe8, XF_eGRAVE,      1, 0x65 }, /* è (e grave) */
-    {   0xe9, XF_eACUTE,      1, 0x65 }, /* é (e acute) */
-    {   0xea, XF_eCIRCUMFLEX, 1, 0x65 }, /* ê (e circumflex) */
-    {   0xeb, XF_eDIERESIS,   1, 0x65 }, /* ë (e dieresis) */
-    {   0xec, XF_iGRAVE,      1, 0x69 }, /* ì (i grave) */
-    {   0xed, XF_iACUTE,      1, 0x69 }, /* í (i acute) */
-    {   0xee, XF_iCIRCUMFLEX, 1, 0x69 }, /* î (i circumflex) */
-    {   0xef, XF_iDIERESIS,   1, 0x69 }, /* ï (i dieresis) */
+    {   0xdf, 0, 0, 0xe1 }, /* ß (sharp s) */
+    {   0xe0, XF_aGRAVE,      1, 0x61 }, /* à (a grave) */
+    {   0xe1, XF_aACUTE,      1, 0x61 }, /* á (a acute) */
+    {   0xe2, XF_aCIRCUMFLEX, 1, 0x61 }, /* â (a circumflex) */
+    {   0xe3, XF_aTILDE,      1, 0x61 }, /* ã (a tilde) */
+    {   0xe4, XF_aDIERESIS,   1, 0x61 }, /* ä (a dieresis) */
+    {   0xe5, XF_aRING,       1, 0x61 }, /* å (a with ring above) */
+    {   0xe6, XF_aeLIGATURE,  1, 0x61 }, /* æ (ae ligature) */
+    {   0xe7, XF_cCEDILLA,    1, 0x63 }, /* ç (c cedilla) */
+    {   0xe8, XF_eGRAVE,      1, 0x65 }, /* è (e grave) */
+    {   0xe9, XF_eACUTE,      1, 0x65 }, /* é (e acute) */
+    {   0xea, XF_eCIRCUMFLEX, 1, 0x65 }, /* ê (e circumflex) */
+    {   0xeb, XF_eDIERESIS,   1, 0x65 }, /* ë (e dieresis) */
+    {   0xec, XF_iGRAVE,      1, 0x69 }, /* ì (i grave) */
+    {   0xed, XF_iACUTE,      1, 0x69 }, /* í (i acute) */
+    {   0xee, XF_iCIRCUMFLEX, 1, 0x69 }, /* î (i circumflex) */
+    {   0xef, XF_iDIERESIS,   1, 0x69 }, /* ï (i dieresis) */
 
-    {   0xf1, XF_nTILDE,      1, 0x6e }, /* ñ (n tilde) */
-    {   0xf2, XF_oGRAVE,      1, 0x6f }, /* ò (o grave) */
-    {   0xf3, XF_oACUTE,      1, 0x6f }, /* ó (o acute) */
-    {   0xf4, XF_oCIRCUMFLEX, 1, 0x6f }, /* ô (o circumflex) */
-    {   0xf5, XF_oTILDE,      1, 0x6f }, /* õ (o tilde) */
-    {   0xf6, XF_oDIERESIS,   1, 0x6f }, /* ö (o dieresis) */
-    {   0xf7, 0, 0, 0x97 }, /* ÷ (division sign) */
-    {   0xf8, XF_oSLASH,      1, 0x6f }, /* ø (o slash) */
-    {   0xf9, XF_uGRAVE,      1, 0x75 }, /* ù (u grave) */
-    {   0xfa, XF_uACUTE,      1, 0x75 }, /* ú (u acute) */
-    {   0xfb, XF_uCIRCUMFLEX, 1, 0x75 }, /* û (u circumflex) */
-    {   0xfc, XF_uDIERESIS,   1, 0x75 }, /* ü (u dieresis) */
-    {   0xfd, XF_yACUTE,      1, 0x79 }, /* ý (y acute) */
+    {   0xf1, XF_nTILDE,      1, 0x6e }, /* ñ (n tilde) */
+    {   0xf2, XF_oGRAVE,      1, 0x6f }, /* ò (o grave) */
+    {   0xf3, XF_oACUTE,      1, 0x6f }, /* ó (o acute) */
+    {   0xf4, XF_oCIRCUMFLEX, 1, 0x6f }, /* ô (o circumflex) */
+    {   0xf5, XF_oTILDE,      1, 0x6f }, /* õ (o tilde) */
+    {   0xf6, XF_oDIERESIS,   1, 0x6f }, /* ö (o dieresis) */
+    {   0xf7, 0, 0, 0x97 }, /* ÷ (division sign) */
+    {   0xf8, XF_oSLASH,      1, 0x6f }, /* ø (o slash) */
+    {   0xf9, XF_uGRAVE,      1, 0x75 }, /* ù (u grave) */
+    {   0xfa, XF_uACUTE,      1, 0x75 }, /* ú (u acute) */
+    {   0xfb, XF_uCIRCUMFLEX, 1, 0x75 }, /* û (u circumflex) */
+    {   0xfc, XF_uDIERESIS,   1, 0x75 }, /* ü (u dieresis) */
+    {   0xfd, XF_yACUTE,      1, 0x79 }, /* ý (y acute) */
 
-    {   0xff, XF_yDIERESIS,   1, 0x79 }, /* ÿ (y dieresis) */
+    {   0xff, XF_yDIERESIS,   1, 0x79 }, /* ÿ (y dieresis) */
     
     /* Latin extended A */
     { 0x0103, XF_aBREVE,      1, 0x61 }, /* a breve */
@@ -715,97 +715,97 @@ const struct xchar_info xchar_info_oldlcd[] = {
 #ifndef BOOTLOADER /* bootloader only supports pure ASCII */
     /* Latin 1 */
     {   0xa0, 0, 0, 0x24 }, /*   (non-breaking space) */
-    {   0xa1, 0, 0, 0x44 }, /* ¡ (inverted !) */
-    {   0xa2, 0, 0, 0xa8 }, /* ¢ (cent sign) */
-    {   0xa3, 0, 0, 0x05 }, /* £ (pound sign) */
-    {   0xa4, 0, 0, 0x28 }, /* ¤ (currency sign) */
-    {   0xa5, 0, 0, 0x07 }, /* ¥ (yen sign) */
+    {   0xa1, 0, 0, 0x44 }, /* ¡ (inverted !) */
+    {   0xa2, 0, 0, 0xa8 }, /* ¢ (cent sign) */
+    {   0xa3, 0, 0, 0x05 }, /* £ (pound sign) */
+    {   0xa4, 0, 0, 0x28 }, /* ¤ (currency sign) */
+    {   0xa5, 0, 0, 0x07 }, /* ¥ (yen sign) */
 
-    {   0xa7, 0, 0, 0x63 }, /* § (paragraph sign) */
+    {   0xa7, 0, 0, 0x63 }, /* § (paragraph sign) */
 
-        {   0xab, XF_LEFTDBLANGLEQUOT, 1, 0x40 }, /* « (left double-angle quotation mark) */
+        {   0xab, XF_LEFTDBLANGLEQUOT, 1, 0x40 }, /* « (left double-angle quotation mark) */
 
-    {   0xad, 0, 0, 0x31 }, /* ­ (soft hyphen) */
+    {   0xad, 0, 0, 0x31 }, /* ­ (soft hyphen) */
 
-    {   0xaf, 0, 0, 0xee }, /* ¯ (macron) */
+    {   0xaf, 0, 0, 0xee }, /* ¯ (macron) */
 
-    {   0xb1, XF_PLUSMINUS, 1, 0x2f }, /* ± (plus-minus sign) */
-    {   0xb2, XF_SUPER2,    1, 0x36 }, /* ³ (superscript 2) */
-    {   0xb3, XF_SUPER3,    1, 0x37 }, /* ³ (superscript 3) */
+    {   0xb1, XF_PLUSMINUS, 1, 0x2f }, /* ± (plus-minus sign) */
+    {   0xb2, XF_SUPER2,    1, 0x36 }, /* ³ (superscript 2) */
+    {   0xb3, XF_SUPER3,    1, 0x37 }, /* ³ (superscript 3) */
 
-    {   0xb5, XF_MICRO,     1, 0x79 }, /* µ (micro sign) */
-    {   0xb6, 0, 0, 0x1a }, /* ¶ (pilcrow sign) */
-    {   0xb7, XF_MIDDLEDOT, 1, 0x32 }, /* · (middle dot) */
+    {   0xb5, XF_MICRO,     1, 0x79 }, /* µ (micro sign) */
+    {   0xb6, 0, 0, 0x1a }, /* ¶ (pilcrow sign) */
+    {   0xb7, XF_MIDDLEDOT, 1, 0x32 }, /* · (middle dot) */
 
-    {   0xbb, XF_RIGHTDBLANGLEQUOT, 1, 0x42 }, /* » (right double-angle quotation mark) */
-    {   0xbc, XF_ONEQUARTER,    1, 0x29 }, /* ¼ (one quarter) */
-    {   0xbd, XF_ONEHALF,       1, 0x29 }, /* ½ (one half) */
-    {   0xbe, XF_THREEQUARTERS, 1, 0x29 }, /* ¾ (three quarters) */
-    {   0xbf, 0, 0, 0x64 }, /* ¿ (inverted ?) */
-    {   0xc0, 0, 0, 0x8c }, /* À (A grave) */
-    {   0xc1, 0, 0, 0x8d }, /* Á (A acute) */
-    {   0xc2, 0, 0, 0x8e }, /* Â (A circumflex) */
-    {   0xc3, 0, 0, 0x8f }, /* Ã (A tilde) */
-    {   0xc4, 0, 0, 0x5f }, /* Ä (A dieresis) */
-    {   0xc5, 0, 0, 0x12 }, /* Å (A with ring above) */
-    {   0xc6, 0, 0, 0x20 }, /* Æ (AE ligature) */
-    {   0xc7, 0, 0, 0x0d }, /* Ç (C cedilla) */
-    {   0xc8, 0, 0, 0x90 }, /* È (E grave) */
-    {   0xc9, 0, 0, 0x23 }, /* É (E acute) */
-    {   0xca, 0, 0, 0x91 }, /* Ê (E circumflex) */
-    {   0xcb, 0, 0, 0x92 }, /* Ë (E dieresis) */
-    {   0xcc, 0, 0, 0x93 }, /* Ì (I grave) */
-    {   0xcd, 0, 0, 0x94 }, /* Í (I acute) */
-    {   0xce, XF_ICIRCUMFLEX, 1, 0x4d }, /* Î (I circumflex) */
-    {   0xcf, XF_IDIERESIS,   1, 0x4d }, /* Ï (I dieresis) */
-    {   0xd0, 0, 0, 0x95 }, /* Ð (ETH) */
-    {   0xd1, 0, 0, 0x61 }, /* Ñ (N tilde) */
-    {   0xd2, 0, 0, 0x96 }, /* Ò (O grave) */
-    {   0xd3, 0, 0, 0x97 }, /* Ó (O acute) */
-    {   0xd4, 0, 0, 0x98 }, /* Ô (O circumflex) */
-    {   0xd5, 0, 0, 0x99 }, /* Õ (O tilde) */
-    {   0xd6, 0, 0, 0x60 }, /* Ö (O dieresis) */
-    {   0xd7, 0, 0, 0xde }, /* × (multiplication sign) */
-    {   0xd8, 0, 0, 0x0f }, /* Ø (O stroke) */
-    {   0xd9, 0, 0, 0x9a }, /* Ù (U grave) */
-    {   0xda, 0, 0, 0x9b }, /* Ú (U acute) */
-    {   0xdb, XF_UCIRCUMFLEX, 1, 0x59 }, /* Û (U circumflex) */
-    {   0xdc, 0, 0, 0x62 }, /* Ü (U dieresis) */
-    {   0xdd, XF_YACUTE,      1, 0x5d }, /* Ý (Y acute) */
+    {   0xbb, XF_RIGHTDBLANGLEQUOT, 1, 0x42 }, /* » (right double-angle quotation mark) */
+    {   0xbc, XF_ONEQUARTER,    1, 0x29 }, /* ¼ (one quarter) */
+    {   0xbd, XF_ONEHALF,       1, 0x29 }, /* ½ (one half) */
+    {   0xbe, XF_THREEQUARTERS, 1, 0x29 }, /* ¾ (three quarters) */
+    {   0xbf, 0, 0, 0x64 }, /* ¿ (inverted ?) */
+    {   0xc0, 0, 0, 0x8c }, /* À (A grave) */
+    {   0xc1, 0, 0, 0x8d }, /* � (A acute) */
+    {   0xc2, 0, 0, 0x8e }, /* Â (A circumflex) */
+    {   0xc3, 0, 0, 0x8f }, /* Ã (A tilde) */
+    {   0xc4, 0, 0, 0x5f }, /* Ä (A dieresis) */
+    {   0xc5, 0, 0, 0x12 }, /* Ã… (A with ring above) */
+    {   0xc6, 0, 0, 0x20 }, /* Æ (AE ligature) */
+    {   0xc7, 0, 0, 0x0d }, /* Ç (C cedilla) */
+    {   0xc8, 0, 0, 0x90 }, /* È (E grave) */
+    {   0xc9, 0, 0, 0x23 }, /* É (E acute) */
+    {   0xca, 0, 0, 0x91 }, /* Ê (E circumflex) */
+    {   0xcb, 0, 0, 0x92 }, /* Ë (E dieresis) */
+    {   0xcc, 0, 0, 0x93 }, /* Ì (I grave) */
+    {   0xcd, 0, 0, 0x94 }, /* � (I acute) */
+    {   0xce, XF_ICIRCUMFLEX, 1, 0x4d }, /* ÃŽ (I circumflex) */
+    {   0xcf, XF_IDIERESIS,   1, 0x4d }, /* � (I dieresis) */
+    {   0xd0, 0, 0, 0x95 }, /* � (ETH) */
+    {   0xd1, 0, 0, 0x61 }, /* Ñ (N tilde) */
+    {   0xd2, 0, 0, 0x96 }, /* Ã’ (O grave) */
+    {   0xd3, 0, 0, 0x97 }, /* Ó (O acute) */
+    {   0xd4, 0, 0, 0x98 }, /* Ô (O circumflex) */
+    {   0xd5, 0, 0, 0x99 }, /* Õ (O tilde) */
+    {   0xd6, 0, 0, 0x60 }, /* Ö (O dieresis) */
+    {   0xd7, 0, 0, 0xde }, /* × (multiplication sign) */
+    {   0xd8, 0, 0, 0x0f }, /* Ø (O stroke) */
+    {   0xd9, 0, 0, 0x9a }, /* Ù (U grave) */
+    {   0xda, 0, 0, 0x9b }, /* Ú (U acute) */
+    {   0xdb, XF_UCIRCUMFLEX, 1, 0x59 }, /* Û (U circumflex) */
+    {   0xdc, 0, 0, 0x62 }, /* Ü (U dieresis) */
+    {   0xdd, XF_YACUTE,      1, 0x5d }, /* � (Y acute) */
 
-    {   0xdf, 0, 0, 0x22 }, /* ß (sharp s) */
-    {   0xe0, 0, 0, 0x83 }, /* à (a grave) */
-    {   0xe1, 0, 0, 0x9c }, /* á (a acute) */
-    {   0xe2, 0, 0, 0x9d }, /* â (a circumflex) */
-    {   0xe3, 0, 0, 0x9e }, /* ã (a tilde) */
-    {   0xe4, 0, 0, 0x7f }, /* ä (a dieresis) */
-    {   0xe5, 0, 0, 0x13 }, /* å (a with ring above) */
-    {   0xe6, 0, 0, 0x21 }, /* æ (ae ligature */
-    {   0xe7, 0, 0, 0x84 }, /* ç (c cedilla) */
-    {   0xe8, 0, 0, 0x08 }, /* è (e grave) */
-    {   0xe9, 0, 0, 0x09 }, /* é (e acute) */
-    {   0xea, 0, 0, 0x9f }, /* ê (e circumflex) */
-    {   0xeb, 0, 0, 0xa0 }, /* ë (e dieresis) */
-    {   0xec, XF_iGRAVE, 1, 0x6d }, /* ì (i grave) */
-    {   0xed, 0, 0, 0xa1 }, /* í (i acute) */
-    {   0xee, 0, 0, 0xa2 }, /* î (i circumflex) */
-    {   0xef, 0, 0, 0xa3 }, /* ï (i dieresis) */
+    {   0xdf, 0, 0, 0x22 }, /* ß (sharp s) */
+    {   0xe0, 0, 0, 0x83 }, /* à (a grave) */
+    {   0xe1, 0, 0, 0x9c }, /* á (a acute) */
+    {   0xe2, 0, 0, 0x9d }, /* â (a circumflex) */
+    {   0xe3, 0, 0, 0x9e }, /* ã (a tilde) */
+    {   0xe4, 0, 0, 0x7f }, /* ä (a dieresis) */
+    {   0xe5, 0, 0, 0x13 }, /* å (a with ring above) */
+    {   0xe6, 0, 0, 0x21 }, /* æ (ae ligature */
+    {   0xe7, 0, 0, 0x84 }, /* ç (c cedilla) */
+    {   0xe8, 0, 0, 0x08 }, /* è (e grave) */
+    {   0xe9, 0, 0, 0x09 }, /* é (e acute) */
+    {   0xea, 0, 0, 0x9f }, /* ê (e circumflex) */
+    {   0xeb, 0, 0, 0xa0 }, /* ë (e dieresis) */
+    {   0xec, XF_iGRAVE, 1, 0x6d }, /* ì (i grave) */
+    {   0xed, 0, 0, 0xa1 }, /* í (i acute) */
+    {   0xee, 0, 0, 0xa2 }, /* î (i circumflex) */
+    {   0xef, 0, 0, 0xa3 }, /* ï (i dieresis) */
 
-    {   0xf1, 0, 0, 0x81 }, /* ñ (n tilde) */
-    {   0xf2, 0, 0, 0x0c }, /* ò (o grave) */
-    {   0xf3, 0, 0, 0xa4 }, /* ó (o acute) */
-    {   0xf4, 0, 0, 0xa5 }, /* ô (o circumflex) */
-    {   0xf5, 0, 0, 0xa6 }, /* õ (o tilde) */
-    {   0xf6, 0, 0, 0x80 }, /* ö (o dieresis) */
-    {   0xf7, XF_DIVISION,    1, 0x2f }, /* ÷ (division sign) */
-    {   0xf8, 0, 0, 0x10 }, /* ø (o slash) */
-    {   0xf9, 0, 0, 0x0a }, /* ù (u grave) */
-    {   0xfa, 0, 0, 0xa7 }, /* ú (u acute) */
-    {   0xfb, XF_uCIRCUMFLEX, 1, 0x79 }, /* û (u circumflex) */
-    {   0xfc, 0, 0, 0xa2 }, /* ü (u dieresis) */
-    {   0xfd, 0, 0, 0xaf }, /* ý (y acute) */
+    {   0xf1, 0, 0, 0x81 }, /* ñ (n tilde) */
+    {   0xf2, 0, 0, 0x0c }, /* ò (o grave) */
+    {   0xf3, 0, 0, 0xa4 }, /* ó (o acute) */
+    {   0xf4, 0, 0, 0xa5 }, /* ô (o circumflex) */
+    {   0xf5, 0, 0, 0xa6 }, /* õ (o tilde) */
+    {   0xf6, 0, 0, 0x80 }, /* ö (o dieresis) */
+    {   0xf7, XF_DIVISION,    1, 0x2f }, /* ÷ (division sign) */
+    {   0xf8, 0, 0, 0x10 }, /* ø (o slash) */
+    {   0xf9, 0, 0, 0x0a }, /* ù (u grave) */
+    {   0xfa, 0, 0, 0xa7 }, /* ú (u acute) */
+    {   0xfb, XF_uCIRCUMFLEX, 1, 0x79 }, /* û (u circumflex) */
+    {   0xfc, 0, 0, 0xa2 }, /* ü (u dieresis) */
+    {   0xfd, 0, 0, 0xaf }, /* ý (y acute) */
 
-    {   0xff, XF_yDIERESIS,   1, 0x7d }, /* ÿ (y dieresis) */
+    {   0xff, XF_yDIERESIS,   1, 0x7d }, /* ÿ (y dieresis) */
     
     /* Latin extended A */
     { 0x0103, 0, 0, 0xe9 }, /* a breve */
@@ -1072,81 +1072,81 @@ const unsigned char xfont_fixed[][HW_PATTERN_SIZE] = {
     [XF_ICON_TEXTFILE] = { 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x1f},
     [XF_ICON_CONFIG] =   { 0x0b, 0x10, 0x0b, 0x00, 0x1f, 0x00, 0x1f},
     /* Latin 1 */
-    [XF_INVEXCLAMATION]= { 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04}, /* ¡ */
-    [XF_CENTSIGN] =      { 0x04, 0x04, 0x0f, 0x10, 0x10, 0x0f, 0x04}, /* ¢ */
-    [XF_POUNDSIGN] =     { 0x06, 0x09, 0x08, 0x1e, 0x08, 0x08, 0x1f}, /* £ */
-    [XF_CURRENCY] =      { 0x00, 0x11, 0x0e, 0x0a, 0x0e, 0x11, 0x00}, /* ¤ */
-    [XF_LEFTDBLANGLEQUOT] = { 0x00, 0x05, 0x0a, 0x14, 0x0a, 0x05, 0x00}, /* « */
-    [XF_MACRON] =        { 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* ¯ */
-    [XF_PLUSMINUS] =     { 0x04, 0x04, 0x1f, 0x04, 0x04, 0x00, 0x1f}, /* ± */
-    [XF_SUPER2] =        { 0x1c, 0x04, 0x1c, 0x10, 0x1c, 0x00, 0x00}, /* ³ */
-    [XF_SUPER3] =        { 0x1c, 0x04, 0x1c, 0x04, 0x1c, 0x00, 0x00}, /* ³ */
-    [XF_MICRO] =         { 0x00, 0x09, 0x09, 0x09, 0x0f, 0x08, 0x10}, /* µ */
-    [XF_MIDDLEDOT] =     { 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00}, /* · */
-    [XF_RIGHTDBLANGLEQUOT] = { 0x00, 0x14, 0x0a, 0x05, 0x0a, 0x14, 0x00}, /* » */
-    [XF_ONEQUARTER] =    { 0x11, 0x12, 0x14, 0x09, 0x13, 0x07, 0x01}, /* ¼ */
-    [XF_ONEHALF] =       { 0x11, 0x12, 0x17, 0x09, 0x17, 0x04, 0x07}, /* ½ */
-    [XF_THREEQUARTERS] = { 0x18, 0x09, 0x1a, 0x0d, 0x1b, 0x17, 0x01}, /* ¾ */
-    [XF_INVQUESTION] =   { 0x04, 0x00, 0x04, 0x08, 0x10, 0x11, 0x0e}, /* ¿ */
-    [XF_AGRAVE] =        { 0x08, 0x04, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* À */
-    [XF_AACUTE] =        { 0x02, 0x04, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* Á */
-    [XF_ACIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* Â */
-    [XF_ATILDE] =        { 0x0d, 0x12, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* Ã */
-    [XF_ADIERESIS] =     { 0x0a, 0x00, 0x04, 0x0a, 0x11, 0x1f, 0x11}, /* Ä */
-    [XF_ARING] =         { 0x04, 0x0a, 0x04, 0x0e, 0x11, 0x1f, 0x11}, /* Å */
-    [XF_AELIGATURE] =    { 0x0f, 0x14, 0x14, 0x1f, 0x14, 0x14, 0x17}, /* Æ */
-    [XF_CCEDILLA] =      { 0x0f, 0x10, 0x10, 0x10, 0x0f, 0x02, 0x0e}, /* Ç */
-    [XF_EGRAVE] =        { 0x08, 0x04, 0x1f, 0x10, 0x1e, 0x10, 0x1f}, /* È */
-    [XF_EACUTE] =        { 0x02, 0x04, 0x1f, 0x10, 0x1c, 0x10, 0x1f}, /* É */
-    [XF_ECIRCUMFLEX] =   { 0x04, 0x0a, 0x1f, 0x10, 0x1c, 0x10, 0x1f}, /* Ê */
-    [XF_EDIERESIS] =     { 0x0a, 0x00, 0x1f, 0x10, 0x1c, 0x10, 0x1f}, /* Ë */
-    [XF_IGRAVE] =        { 0x08, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* Ì */
-    [XF_IACUTE] =        { 0x02, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* Í */
-    [XF_ICIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* Î */
-    [XF_IDIERESIS] =     { 0x0a, 0x00, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* Ï */
-    [XF_ETH] =           { 0x0c, 0x0a, 0x09, 0x1d, 0x09, 0x0a, 0x0c}, /* Ð */
-    [XF_NTILDE] =        { 0x0d, 0x12, 0x00, 0x19, 0x15, 0x13, 0x11}, /* Ñ */
-    [XF_OGRAVE] =        { 0x08, 0x04, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ò */
-    [XF_OACUTE] =        { 0x02, 0x04, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ó */
-    [XF_OCIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ô */
-    [XF_OTILDE] =        { 0x0d, 0x12, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Õ */
-    [XF_ODIERESIS] =     { 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ö */
-    [XF_OSTROKE] =       { 0x01, 0x0e, 0x13, 0x15, 0x19, 0x0e, 0x10}, /* Ø */
-    [XF_UGRAVE] =        { 0x08, 0x04, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Ù */
-    [XF_UACUTE] =        { 0x02, 0x04, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Ú */
-    [XF_UCIRCUMFLEX] =   { 0x04, 0x0a, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Û */
-    [XF_UDIERESIS] =     { 0x0a, 0x00, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Ü */
-    [XF_YACUTE] =        { 0x02, 0x04, 0x11, 0x11, 0x0a, 0x04, 0x04}, /* Ý */
-    [XF_aGRAVE] =        { 0x08, 0x04, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* à */
-    [XF_aACUTE] =        { 0x02, 0x04, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* á */
-    [XF_aCIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* â */
-    [XF_aTILDE] =        { 0x0d, 0x12, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* ã */
-    [XF_aDIERESIS] =     { 0x0a, 0x00, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* ä */
-    [XF_aRING] =         { 0x04, 0x0a, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* å */
-    [XF_aeLIGATURE] =    { 0x00, 0x00, 0x1a, 0x05, 0x0f, 0x14, 0x0f}, /* æ */
-    [XF_cCEDILLA] =      { 0x00, 0x0f, 0x10, 0x10, 0x0f, 0x02, 0x04}, /* ç */
-    [XF_eGRAVE] =        { 0x08, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* è */
-    [XF_eACUTE] =        { 0x02, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* é */
-    [XF_eCIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* ê */
-    [XF_eDIERESIS] =     { 0x0a, 0x00, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* ë */
-    [XF_iGRAVE] =        { 0x08, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* ì */
-    [XF_iACUTE] =        { 0x02, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* í */
-    [XF_iCIRCUMFLEX] =   { 0x04, 0x0a, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* î */
-    [XF_iDIERESIS] =     { 0x0a, 0x00, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* ï */
-    [XF_nTILDE] =        { 0x0d, 0x12, 0x00, 0x16, 0x19, 0x11, 0x11}, /* ñ */
-    [XF_oGRAVE] =        { 0x08, 0x04, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ò */
-    [XF_oACUTE] =        { 0x02, 0x04, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ó */
-    [XF_oCIRCUMFLEX] =   { 0x04, 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ô */
-    [XF_oTILDE] =        { 0x0d, 0x12, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* õ */
-    [XF_oDIERESIS] =     { 0x00, 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ö */
-    [XF_DIVISION] =      { 0x00, 0x04, 0x00, 0x1f, 0x00, 0x04, 0x00}, /* ÷ */
-    [XF_oSLASH] =        { 0x00, 0x02, 0x0e, 0x15, 0x15, 0x0e, 0x08}, /* ø */
-    [XF_uGRAVE] =        { 0x08, 0x04, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* ù */
-    [XF_uACUTE] =        { 0x02, 0x04, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* ú */
-    [XF_uCIRCUMFLEX] =   { 0x04, 0x0a, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* û */
-    [XF_uDIERESIS] =     { 0x00, 0x0a, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* ü */
-    [XF_yACUTE] =        { 0x02, 0x04, 0x11, 0x11, 0x0f, 0x01, 0x0e}, /* ý */
-    [XF_yDIERESIS] =     { 0x0a, 0x00, 0x11, 0x11, 0x0f, 0x01, 0x0e}, /* ÿ */
+    [XF_INVEXCLAMATION]= { 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04}, /* ¡ */
+    [XF_CENTSIGN] =      { 0x04, 0x04, 0x0f, 0x10, 0x10, 0x0f, 0x04}, /* ¢ */
+    [XF_POUNDSIGN] =     { 0x06, 0x09, 0x08, 0x1e, 0x08, 0x08, 0x1f}, /* £ */
+    [XF_CURRENCY] =      { 0x00, 0x11, 0x0e, 0x0a, 0x0e, 0x11, 0x00}, /* ¤ */
+    [XF_LEFTDBLANGLEQUOT] = { 0x00, 0x05, 0x0a, 0x14, 0x0a, 0x05, 0x00}, /* « */
+    [XF_MACRON] =        { 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* ¯ */
+    [XF_PLUSMINUS] =     { 0x04, 0x04, 0x1f, 0x04, 0x04, 0x00, 0x1f}, /* ± */
+    [XF_SUPER2] =        { 0x1c, 0x04, 0x1c, 0x10, 0x1c, 0x00, 0x00}, /* ³ */
+    [XF_SUPER3] =        { 0x1c, 0x04, 0x1c, 0x04, 0x1c, 0x00, 0x00}, /* ³ */
+    [XF_MICRO] =         { 0x00, 0x09, 0x09, 0x09, 0x0f, 0x08, 0x10}, /* µ */
+    [XF_MIDDLEDOT] =     { 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00}, /* · */
+    [XF_RIGHTDBLANGLEQUOT] = { 0x00, 0x14, 0x0a, 0x05, 0x0a, 0x14, 0x00}, /* » */
+    [XF_ONEQUARTER] =    { 0x11, 0x12, 0x14, 0x09, 0x13, 0x07, 0x01}, /* ¼ */
+    [XF_ONEHALF] =       { 0x11, 0x12, 0x17, 0x09, 0x17, 0x04, 0x07}, /* ½ */
+    [XF_THREEQUARTERS] = { 0x18, 0x09, 0x1a, 0x0d, 0x1b, 0x17, 0x01}, /* ¾ */
+    [XF_INVQUESTION] =   { 0x04, 0x00, 0x04, 0x08, 0x10, 0x11, 0x0e}, /* ¿ */
+    [XF_AGRAVE] =        { 0x08, 0x04, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* À */
+    [XF_AACUTE] =        { 0x02, 0x04, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* � */
+    [XF_ACIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* Â */
+    [XF_ATILDE] =        { 0x0d, 0x12, 0x0e, 0x11, 0x1f, 0x11, 0x11}, /* Ã */
+    [XF_ADIERESIS] =     { 0x0a, 0x00, 0x04, 0x0a, 0x11, 0x1f, 0x11}, /* Ä */
+    [XF_ARING] =         { 0x04, 0x0a, 0x04, 0x0e, 0x11, 0x1f, 0x11}, /* Ã… */
+    [XF_AELIGATURE] =    { 0x0f, 0x14, 0x14, 0x1f, 0x14, 0x14, 0x17}, /* Æ */
+    [XF_CCEDILLA] =      { 0x0f, 0x10, 0x10, 0x10, 0x0f, 0x02, 0x0e}, /* Ç */
+    [XF_EGRAVE] =        { 0x08, 0x04, 0x1f, 0x10, 0x1e, 0x10, 0x1f}, /* È */
+    [XF_EACUTE] =        { 0x02, 0x04, 0x1f, 0x10, 0x1c, 0x10, 0x1f}, /* É */
+    [XF_ECIRCUMFLEX] =   { 0x04, 0x0a, 0x1f, 0x10, 0x1c, 0x10, 0x1f}, /* Ê */
+    [XF_EDIERESIS] =     { 0x0a, 0x00, 0x1f, 0x10, 0x1c, 0x10, 0x1f}, /* Ë */
+    [XF_IGRAVE] =        { 0x08, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* Ì */
+    [XF_IACUTE] =        { 0x02, 0x04, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* � */
+    [XF_ICIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* ÃŽ */
+    [XF_IDIERESIS] =     { 0x0a, 0x00, 0x0e, 0x04, 0x04, 0x04, 0x0e}, /* � */
+    [XF_ETH] =           { 0x0c, 0x0a, 0x09, 0x1d, 0x09, 0x0a, 0x0c}, /* � */
+    [XF_NTILDE] =        { 0x0d, 0x12, 0x00, 0x19, 0x15, 0x13, 0x11}, /* Ñ */
+    [XF_OGRAVE] =        { 0x08, 0x04, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ã’ */
+    [XF_OACUTE] =        { 0x02, 0x04, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ó */
+    [XF_OCIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ô */
+    [XF_OTILDE] =        { 0x0d, 0x12, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Õ */
+    [XF_ODIERESIS] =     { 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x11, 0x0e}, /* Ö */
+    [XF_OSTROKE] =       { 0x01, 0x0e, 0x13, 0x15, 0x19, 0x0e, 0x10}, /* Ø */
+    [XF_UGRAVE] =        { 0x08, 0x04, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Ù */
+    [XF_UACUTE] =        { 0x02, 0x04, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Ú */
+    [XF_UCIRCUMFLEX] =   { 0x04, 0x0a, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Û */
+    [XF_UDIERESIS] =     { 0x0a, 0x00, 0x11, 0x11, 0x11, 0x11, 0x0e}, /* Ü */
+    [XF_YACUTE] =        { 0x02, 0x04, 0x11, 0x11, 0x0a, 0x04, 0x04}, /* � */
+    [XF_aGRAVE] =        { 0x08, 0x04, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* à */
+    [XF_aACUTE] =        { 0x02, 0x04, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* á */
+    [XF_aCIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* â */
+    [XF_aTILDE] =        { 0x0d, 0x12, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* ã */
+    [XF_aDIERESIS] =     { 0x0a, 0x00, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* ä */
+    [XF_aRING] =         { 0x04, 0x0a, 0x0e, 0x01, 0x0f, 0x11, 0x0f}, /* å */
+    [XF_aeLIGATURE] =    { 0x00, 0x00, 0x1a, 0x05, 0x0f, 0x14, 0x0f}, /* æ */
+    [XF_cCEDILLA] =      { 0x00, 0x0f, 0x10, 0x10, 0x0f, 0x02, 0x04}, /* ç */
+    [XF_eGRAVE] =        { 0x08, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* è */
+    [XF_eACUTE] =        { 0x02, 0x04, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* é */
+    [XF_eCIRCUMFLEX] =   { 0x04, 0x0a, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* ê */
+    [XF_eDIERESIS] =     { 0x0a, 0x00, 0x0e, 0x11, 0x1f, 0x10, 0x0e}, /* ë */
+    [XF_iGRAVE] =        { 0x08, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* ì */
+    [XF_iACUTE] =        { 0x02, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* í */
+    [XF_iCIRCUMFLEX] =   { 0x04, 0x0a, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* î */
+    [XF_iDIERESIS] =     { 0x0a, 0x00, 0x00, 0x0c, 0x04, 0x04, 0x0e}, /* ï */
+    [XF_nTILDE] =        { 0x0d, 0x12, 0x00, 0x16, 0x19, 0x11, 0x11}, /* ñ */
+    [XF_oGRAVE] =        { 0x08, 0x04, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ò */
+    [XF_oACUTE] =        { 0x02, 0x04, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ó */
+    [XF_oCIRCUMFLEX] =   { 0x04, 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ô */
+    [XF_oTILDE] =        { 0x0d, 0x12, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* õ */
+    [XF_oDIERESIS] =     { 0x00, 0x0a, 0x00, 0x0e, 0x11, 0x11, 0x0e}, /* ö */
+    [XF_DIVISION] =      { 0x00, 0x04, 0x00, 0x1f, 0x00, 0x04, 0x00}, /* ÷ */
+    [XF_oSLASH] =        { 0x00, 0x02, 0x0e, 0x15, 0x15, 0x0e, 0x08}, /* ø */
+    [XF_uGRAVE] =        { 0x08, 0x04, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* ù */
+    [XF_uACUTE] =        { 0x02, 0x04, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* ú */
+    [XF_uCIRCUMFLEX] =   { 0x04, 0x0a, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* û */
+    [XF_uDIERESIS] =     { 0x00, 0x0a, 0x00, 0x11, 0x11, 0x13, 0x0d}, /* ü */
+    [XF_yACUTE] =        { 0x02, 0x04, 0x11, 0x11, 0x0f, 0x01, 0x0e}, /* ý */
+    [XF_yDIERESIS] =     { 0x0a, 0x00, 0x11, 0x11, 0x0f, 0x01, 0x0e}, /* ÿ */
     /* Latin extended A */
     [XF_aBREVE] =        { 0x09, 0x06, 0x0e, 0x01, 0x0f, 0x11, 0x0f},
     [XF_aOGONEK] =       { 0x0e, 0x01, 0x0f, 0x11, 0x0f, 0x02, 0x03},
diff --git a/firmware/drivers/lcd-remote-1bit-v.c b/firmware/drivers/lcd-remote-1bit-v.c
index 8e6898a8a2..5349fa0f91 100644
--- a/firmware/drivers/lcd-remote-1bit-v.c
+++ b/firmware/drivers/lcd-remote-1bit-v.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2005 by Richard S. La Charité III
+ * Copyright (C) 2005 by Richard S. La Charité III
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/drivers/tuner/tea5767.c b/firmware/drivers/tuner/tea5767.c
index da7cdfb65a..1693b63751 100644
--- a/firmware/drivers/tuner/tea5767.c
+++ b/firmware/drivers/tuner/tea5767.c
@@ -8,7 +8,7 @@
  * $Id$
  * Tuner "middleware" for Philips TEA5767 chip
  *
- * Copyright (C) 2004 Jörg Hohensohn
+ * Copyright (C) 2004 Jörg Hohensohn
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/disk.h b/firmware/export/disk.h
index d6d6796e9e..1f07007c2b 100644
--- a/firmware/export/disk.h
+++ b/firmware/export/disk.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/fmradio_i2c.h b/firmware/export/fmradio_i2c.h
index 6483594d04..fcb35d119d 100644
--- a/firmware/export/fmradio_i2c.h
+++ b/firmware/export/fmradio_i2c.h
@@ -8,7 +8,7 @@
  * $Id$
  * Physical interface of the Philips TEA5767 in Archos Ondio
  *
- * Copyright (C) 2004 by Jörg Hohensohn
+ * Copyright (C) 2004 by Jörg Hohensohn
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index e9f2bfcbaa..60c37bd3f1 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 55d3f6fb38..bccc1e4b29 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2005 by Richard S. La Charité
+ * Copyright (C) 2005 by Richard S. La Charité
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index c1bd326c0f..1f78f530c5 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -8,7 +8,7 @@
  * $Id$
  * Tuner abstraction layer
  *
- * Copyright (C) 2004 Jörg Hohensohn
+ * Copyright (C) 2004 Jörg Hohensohn
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h
index 5d888ce438..3629645d53 100644
--- a/firmware/export/usb_core.h
+++ b/firmware/export/usb_core.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2007 by Björn Stenberg
+ * Copyright (C) 2007 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h
index da7500f1ab..3e4b04b911 100644
--- a/firmware/export/usb_drv.h
+++ b/firmware/export/usb_drv.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2007 by Björn Stenberg
+ * Copyright (C) 2007 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/include/crc32.h b/firmware/include/crc32.h
index a2b7ae2f0a..1d1bdc2d80 100644
--- a/firmware/include/crc32.h
+++ b/firmware/include/crc32.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2003 Jörg Hohensohn [IDC]Dragon
+ * Copyright (C) 2003 Jörg Hohensohn [IDC]Dragon
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 6433f1d2ba..d4ead2df10 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2007 by Kévin Ferrare
+ * Copyright (C) 2007 by Kévin Ferrare
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/include/dir_uncached.h b/firmware/include/dir_uncached.h
index dd00c2c66b..30ead756a3 100644
--- a/firmware/include/dir_uncached.h
+++ b/firmware/include/dir_uncached.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id: dir.h 13741 2007-06-30 02:08:27Z jethead71 $
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/include/file.h b/firmware/include/file.h
index d050a695d1..0cc272044e 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/kernel.c b/firmware/kernel.c
index 4ccf2bbe17..0dec8705ae 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2002 by Björn Stenberg
+ * Copyright (C) 2002 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/mp3data.c b/firmware/mp3data.c
index 79e334072d..9f51b9827c 100644
--- a/firmware/mp3data.c
+++ b/firmware/mp3data.c
@@ -19,7 +19,7 @@
 
 /*
  * Parts of this code has been stolen from the Ample project and was written
- * by David Härdeman. It has since been extended and enhanced pretty much by
+ * by David Härdeman. It has since been extended and enhanced pretty much by
  * all sorts of friendly Rockbox people.
  *
  * A nice reference for MPEG header info:
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
index 334ef25683..836d46c067 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
@@ -271,7 +271,7 @@ void send_command_to_pic(unsigned char in, unsigned char* out,
     IO_INTC_EINT1 &= ~INTR_EINT1_EXT0;
     /* Clear EXT0 interrupt */
     IO_INTC_IRQ1 = INTR_IRQ1_EXT0;
-    /* Write command to I²C */
+    /* Write command to I²C */
     restart:
     i2c_write(PIC_ADR, &in, 1);
     /* Wait for PIC */
@@ -283,7 +283,7 @@ void send_command_to_pic(unsigned char in, unsigned char* out,
         if(i > 50)
             goto restart;
     }
-    /* Read return from I²C */
+    /* Read return from I²C */
     i2c_read(PIC_ADR, out, length);
     /* Re-enable GIO0 interrupt */
     IO_INTC_EINT1 |= INTR_EINT1_EXT0;
diff --git a/firmware/target/arm/tms320dm320/i2c-dm320.c b/firmware/target/arm/tms320dm320/i2c-dm320.c
index a87019c69c..7915ca5a94 100755
--- a/firmware/target/arm/tms320dm320/i2c-dm320.c
+++ b/firmware/target/arm/tms320dm320/i2c-dm320.c
@@ -9,7 +9,7 @@
  *
  * Copyright (C) 2008 by Maurus Cuelenaere
  *
- * DM320 I²C driver
+ * DM320 I²C driver
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
@@ -145,12 +145,12 @@ int i2c_read(unsigned short address, unsigned char* buf, int count)
 void i2c_init(void)
 {
 #if 0 //TODO: mimic OF I2C clock settings; currently this is done by the bootloader
-    IO_CLK_MOD2 &= ~CLK_MOD2_I2C; // turn I²C clock off (just to be sure)
+    IO_CLK_MOD2 &= ~CLK_MOD2_I2C; // turn I²C clock off (just to be sure)
     IO_CLK_LPCTL1 &= ~1; // set Powerdown mode to off
-    IO_CLK_SEL0 &= ~0x800; // set I²C clock to PLLA
-    IO_CLK_DIV4 &= ~0x1F; // I²C clock division = 1
-    IO_CLK_MOD2 |= CLK_MOD2_I2C; // enable I²C clock
+    IO_CLK_SEL0 &= ~0x800; // set I²C clock to PLLA
+    IO_CLK_DIV4 &= ~0x1F; // I²C clock division = 1
+    IO_CLK_MOD2 |= CLK_MOD2_I2C; // enable I²C clock
 #endif
     IO_I2C_SCS &= ~0x8; //set clock to 100 kHz
-    IO_INTC_EINT2 &= ~INTR_EINT2_I2C; // disable I²C interrupt
+    IO_INTC_EINT2 &= ~INTR_EINT2_I2C; // disable I²C interrupt
 }
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index 7758cba2e7..f785535100 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -9,7 +9,7 @@
  *
  * Driver for ARC USBOTG Device Controller
  *
- * Copyright (C) 2007 by Björn Stenberg
+ * Copyright (C) 2007 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/target/coldfire/iaudio/m3/adc-m3.c b/firmware/target/coldfire/iaudio/m3/adc-m3.c
index 5997f2419a..9f5bf04a64 100644
--- a/firmware/target/coldfire/iaudio/m3/adc-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/adc-m3.c
@@ -25,8 +25,8 @@
 
 #define ADC_I2C_ADDR 0xa0
 
-/* The M3 ADC is hooked exclusively to the secondary I²C bus, and requires
- * very slow transfers (I²C clock <= 16kHz). So we start one 4-byte read
+/* The M3 ADC is hooked exclusively to the secondary I²C bus, and requires
+ * very slow transfers (I²C clock <= 16kHz). So we start one 4-byte read
  * transfer each tick, and handle it via an ISR. At 11MHz, one transfer
  * takes too long to be started every tick, but it seems we have to live 
  * with that. */
@@ -92,7 +92,7 @@ unsigned short adc_read(int channel)
 
 void adc_init(void)
 {
-    MFDR2 = 0x1f;             /* I²C clock = SYSCLK / 3840 */
+    MFDR2 = 0x1f;             /* I²C clock = SYSCLK / 3840 */
     MBCR2 = IEN;              /* Enable interface */
     MBSR2 = 0;                /* Clear flags */
     MBCR2 = (IEN|IIEN);       /* Enable interrupts */
@@ -105,7 +105,7 @@ void adc_init(void)
         sleep(1);             /* Ensure valid readings when adc_init returns */
 }
 
-/* The ADC (most probably the PIC12F675) obviously has a slow and buggy I²C
+/* The ADC (most probably the PIC12F675) obviously has a slow and buggy I²C
  * implementation. If a transfer is stopped prematurely, it often locks up
  * and doesn't react anymore until the unit is power cycled. */
 
diff --git a/firmware/target/coldfire/iriver/h100/lcd-as-h100.S b/firmware/target/coldfire/iriver/h100/lcd-as-h100.S
index 8e483d23ad..4cb6d13adf 100644
--- a/firmware/target/coldfire/iriver/h100/lcd-as-h100.S
+++ b/firmware/target/coldfire/iriver/h100/lcd-as-h100.S
@@ -8,7 +8,7 @@
  * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
- * Based on the work of Alan Korr and Jörg Hohensohn
+ * Based on the work of Alan Korr and Jörg Hohensohn
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/target/coldfire/iriver/lcd-remote-iriver.c b/firmware/target/coldfire/iriver/lcd-remote-iriver.c
index 85ba0fef7a..83b7a022e5 100644
--- a/firmware/target/coldfire/iriver/lcd-remote-iriver.c
+++ b/firmware/target/coldfire/iriver/lcd-remote-iriver.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2005 by Richard S. La Charité III
+ * Copyright (C) 2005 by Richard S. La Charité III
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/target/sh/archos/lcd-as-archos-bitmap.S b/firmware/target/sh/archos/lcd-as-archos-bitmap.S
index f2ac525976..c6f95c23a3 100644
--- a/firmware/target/sh/archos/lcd-as-archos-bitmap.S
+++ b/firmware/target/sh/archos/lcd-as-archos-bitmap.S
@@ -8,7 +8,7 @@
  * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
- * Based on the work of Alan Korr and Jörg Hohensohn
+ * Based on the work of Alan Korr and Jörg Hohensohn
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
@@ -121,7 +121,7 @@ _lcd_write_data:
 
     /* This code will fail if an interrupt changes the contents of PBDRL.
      * If so, we must disable the interrupt here. If disabling interrupts
-     * for a long time (~9200 clks = ~830 µs for transferring 112 bytes on
+     * for a long time (~9200 clks = ~830 µs for transferring 112 bytes on
      * recorders)is undesirable, the loop has to be rewritten to
      * disable/precalculate/transfer/enable for each iteration. However,
      * this would significantly decrease performance. */
diff --git a/firmware/target/sh/archos/player/lcd-as-player.S b/firmware/target/sh/archos/player/lcd-as-player.S
index 6c19e1ab2f..3a80782735 100644
--- a/firmware/target/sh/archos/player/lcd-as-player.S
+++ b/firmware/target/sh/archos/player/lcd-as-player.S
@@ -8,7 +8,7 @@
  * $Id$
  *
  * Copyright (C) 2004 by Jens Arnold
- * Based on the work of Alan Korr and Jörg Hohensohn
+ * Based on the work of Alan Korr and Jörg Hohensohn
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
@@ -167,7 +167,7 @@ _lcd_write_data:
 
     /* This code will fail if an interrupt changes the contents of PBDRL.
      * If so, we must disable the interrupt here. If disabling interrupts
-     * for a long time (~9200 clks = ~830 µs for transferring 112 bytes on
+     * for a long time (~9200 clks = ~830 µs for transferring 112 bytes on
      * recorders)is undesirable, the loop has to be rewritten to
      * disable/precalculate/transfer/enable for each iteration. However,
      * this would significantly decrease performance. */
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 3b2c3c3466..1796bd41fc 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2007 by Björn Stenberg
+ * Copyright (C) 2007 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.
diff --git a/firmware/usbstack/usb_storage.h b/firmware/usbstack/usb_storage.h
index e657e03825..ca5199c6aa 100644
--- a/firmware/usbstack/usb_storage.h
+++ b/firmware/usbstack/usb_storage.h
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2007 by Björn Stenberg
+ * Copyright (C) 2007 by Björn Stenberg
  *
  * All files in this archive are subject to the GNU General Public License.
  * See the file COPYING in the source tree root for full license agreement.