# HG changeset patch
# User ib
# Date 1301690526 0
# Node ID 533c658a18dafaa83594dfc16a4afbdcc344bfb0
# Parent  ca1a01b56c904100fd204cd052ff60234ccffd28
Revise font related error messages.

diff -r ca1a01b56c90 -r 533c658a18da gui/skin/skin.c
--- a/gui/skin/skin.c	Fri Apr 01 13:59:50 2011 +0000
+++ b/gui/skin/skin.c	Fri Apr 01 20:42:06 2011 +0000
@@ -679,7 +679,7 @@
 
     switch (item->fontid) {
     case -1:
-        skin_error(MSGTR_SKIN_FONT_NotEnoughtMemory);
+        skin_error(MSGTR_SKIN_NotEnoughMemory);
         return 1;
 
     case -2:
@@ -728,7 +728,7 @@
     id = fntFindID(fnt);
 
     if (id < 0) {
-        skin_error(MSGTR_SKIN_FONT_NonExistentFontID, fnt);
+        skin_error(MSGTR_SKIN_FONT_NonExistentFont, fnt);
         return 1;
     }
 
@@ -745,7 +745,7 @@
     item->label  = strdup(txt);
 
     if (!item->label) {
-        skin_error(MSGTR_SKIN_FONT_NotEnoughtMemory);
+        skin_error(MSGTR_SKIN_NotEnoughMemory);
         return 1;
     }
 
@@ -783,7 +783,7 @@
     id = fntFindID(fnt);
 
     if (id < 0) {
-        skin_error(MSGTR_SKIN_FONT_NonExistentFontID, fnt);
+        skin_error(MSGTR_SKIN_FONT_NonExistentFont, fnt);
         return 1;
     }
 
@@ -801,7 +801,7 @@
     item->label  = strdup(txt);
 
     if (!item->label) {
-        skin_error(MSGTR_SKIN_FONT_NotEnoughtMemory);
+        skin_error(MSGTR_SKIN_NotEnoughMemory);
         return 1;
     }
 
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-bg.h
--- a/help/help_mp-bg.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-bg.h	Fri Apr 01 20:42:06 2011 +0000
@@ -609,11 +609,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "грешка при четене на PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "Грешка при преобразуване от 24 към 32 бита (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "неизвестно съобщение: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "недостатъчно памет\n"
+#define MSGTR_SKIN_NotEnoughMemory "недостатъчно памет\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Декларирани са твърде много шрифтове.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Файлът със шрифта не е намерен.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Файл с изображението на шрифта не е намерен.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "несъществуващ идентификатор на шрифт (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "несъществуващ идентификатор на шрифт (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "неизвестен параметър (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Скинът не е намерен (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Избраният скин ( %s ) не е намерен, ще се ползва 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-cs.h
--- a/help/help_mp-cs.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-cs.h	Fri Apr 01 20:42:06 2011 +0000
@@ -569,11 +569,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "chyba čtení PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "chyba konverze z 24 do 32 bitů (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "neznámá zpráva: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "nedostatek paměti\n"
+#define MSGTR_SKIN_NotEnoughMemory "nedostatek paměti\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "deklarováno příliš mnoho fontů\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "soubor fontu nebyl nalezen\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "soubor obrazu fontu nebyl nalezen\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "neexistující identifikátor fontu (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "neexistující identifikátor fontu (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "neznámý parametr (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Téma nenalezeno (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Vybraný skin ( %s ) nenalezen, zkouším 'výchozí'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-de.h
--- a/help/help_mp-de.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-de.h	Fri Apr 01 20:42:06 2011 +0000
@@ -784,11 +784,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG-Lesefehler in %s\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24-bpp-zu-32-bpp-Konvertierungsfehler in %s\n"
 #define MSGTR_SKIN_UnknownMessage "Unbekannte Nachricht '%s'\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "nicht genug Speicher\n"
+#define MSGTR_SKIN_NotEnoughMemory "Nicht genug Speicher\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Zu viele Schriften deklariert.\n"
-#define MSGTR_SKIN_FONT_FontFileNotFound "Schriftdatei nicht gefunden.\n"
-#define MSGTR_SKIN_FONT_FontImageNotFound "Schriftbilddatei nicht gefunden.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "nicht existierende Schriftbezeichnung (%s)\n"
+#define MSGTR_SKIN_FONT_FontFileNotFound "Schrift-Beschreibungsdatei nicht gefunden.\n"
+#define MSGTR_SKIN_FONT_FontImageNotFound "Schrift-Bilddatei nicht gefunden.\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "Schrift '%s' nicht gefunden.\n"
 #define MSGTR_SKIN_UnknownParameter "Unbekannter Parameter '%s'\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin '%s' nicht gefunden.\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Ausgewähltes Skin '%s' nicht gefunden, Skin 'default' wird versucht ...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-dk.h
--- a/help/help_mp-dk.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-dk.h	Fri Apr 01 20:42:06 2011 +0000
@@ -372,11 +372,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG læse fejl (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "Fejl i 24 bit to 32 bit convertering (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "ukendt besked: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "ikke nok ram\n"
+#define MSGTR_SKIN_NotEnoughMemory "ikke nok ram\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "for mange skrifttyper specificeret\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "skriftypefilen ikke fundet\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "skrifttypebilled ikke fundet\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "ikke eksisterende font (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "ikke eksisterende font (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "ukendt parameter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Tema blev ikke fundet (%s).\n"
 #define MSGTR_SKIN_LABEL "Temaer:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-el.h
--- a/help/help_mp-el.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-el.h	Fri Apr 01 20:42:06 2011 +0000
@@ -381,11 +381,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "σφάλμα κατά την ανάγνωση του PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "σφάλμα κατά τη μετατροπή από 24 bit σε 32 bit (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "μη αναγνωρίσιμο μήνυμα: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "δεν υπάρχει αρκετή μνήμη διαθέσιμη\n"
+#define MSGTR_SKIN_NotEnoughMemory "δεν υπάρχει αρκετή μνήμη διαθέσιμη\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "πολλαπλές ορισμένες γραμματοσειρές\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "δεν βρέθηκε αρχείο γραμματοσειράς\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "δεν βρέθηκε εικόνα του αρχείου γραμματοσειράς\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "μη-υπαρκτή η ταυτότητα της γραμματοσειράς (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "μη-υπαρκτή η ταυτότητα της γραμματοσειράς (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "μη αναγνωρίσιμη παράμετρος (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Δεν βρέθηκε skin (%s).\n"
 #define MSGTR_SKIN_LABEL "Skins:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-en.h
--- a/help/help_mp-en.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-en.h	Fri Apr 01 20:42:06 2011 +0000
@@ -587,11 +587,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG read error in %s\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 bit to 32 bit conversion error in %s\n"
 #define MSGTR_SKIN_UnknownMessage "Unknown message '%s'\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "not enough memory\n"
+#define MSGTR_SKIN_NotEnoughMemory "Not enough memory\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Too many fonts declared.\n"
-#define MSGTR_SKIN_FONT_FontFileNotFound "Font file not found.\n"
+#define MSGTR_SKIN_FONT_FontFileNotFound "Font description file not found.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Font image file not found.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "non-existent font identifier (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "Font '%s' not found.\n"
 #define MSGTR_SKIN_UnknownParameter "Unknown parameter '%s'\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin '%s' not found.\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Selected skin '%s' not found, trying skin 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-es.h
--- a/help/help_mp-es.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-es.h	Fri Apr 01 20:42:06 2011 +0000
@@ -588,11 +588,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "Error al leer PNG (%s).\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "Error de conversión de 24 bit a 32 bit (%s).\n"
 #define MSGTR_SKIN_UnknownMessage "Mensaje desconocido: %s.\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "No hay suficiente memoria.\n"
+#define MSGTR_SKIN_NotEnoughMemory "No hay suficiente memoria.\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Demasiadas fuentes declaradas.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Archivo de fuentes no encontrado.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Archivo de imagen de fuente no encontrado.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "identificador de fuente no existente (%s).\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "identificador de fuente no existente (%s).\n"
 #define MSGTR_SKIN_UnknownParameter "parámetro desconocido (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin no encontrado (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Skin elegida ( %s ) no encontrada, probando 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-fr.h
--- a/help/help_mp-fr.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-fr.h	Fri Apr 01 20:42:06 2011 +0000
@@ -751,11 +751,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "erreur de lecture PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "Erreur de conversion 24 bit vers 32 bit (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "message inconnu : %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "pas assez de mémoire\n"
+#define MSGTR_SKIN_NotEnoughMemory "pas assez de mémoire\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "trop de polices déclarées.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "fichier de police introuvable.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "fichier d'image de police introuvable\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "identificateur de fonte inéxistant (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "identificateur de fonte inéxistant (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "paramètre inconnu (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin non trouvée (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Peau choisi ( %s ) non trouvé, essaie de 'par défaut'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-hu.h
--- a/help/help_mp-hu.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-hu.h	Fri Apr 01 20:42:06 2011 +0000
@@ -582,11 +582,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG olvasási hiba (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "hiba a 24-ről 32 bitre konvertálás közben (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "ismeretlen üzenet: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "nincs elég memória\n"
+#define MSGTR_SKIN_NotEnoughMemory "nincs elég memória\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Túl sok betűtipus van deklarálva.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Nem találom a betűtipus fájlt.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Nem találom a betűtipus képfájlt.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "nemlétező betűtipus azonosító (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "nemlétező betűtipus azonosító (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "ismeretlen paraméter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin nem található (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "A kiválasztott skin ( %s ) nem található, a 'default'-ot próbálom meg...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-it.h
--- a/help/help_mp-it.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-it.h	Fri Apr 01 20:42:06 2011 +0000
@@ -577,11 +577,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG, errore di lettura (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "errore nella conversione da 24 bit a 32 bit (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "messaggio sconosciuto: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "memoria insufficiente\n"
+#define MSGTR_SKIN_NotEnoughMemory "memoria insufficiente\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "dichiarati troppi font\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "file dei font non trovato\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "file delle immagini dei font non trovato\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "identificatore del font inesistente (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "identificatore del font inesistente (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "parametro sconosciuto  (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin non trovata (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Skin scelta ( %s ) not trovata, provo con la 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-ja.h
--- a/help/help_mp-ja.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-ja.h	Fri Apr 01 20:42:06 2011 +0000
@@ -308,7 +308,7 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "png 読み込みエラー (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24bitから32bitへの変換エラー (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "未知のメッセージ: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "メモリが不足しています\n"
+#define MSGTR_SKIN_NotEnoughMemory "メモリが不足しています\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "フォントファイルが存在しません\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "フォントイメージファイルが存在しません\n"
 #define MSGTR_SKIN_UnknownParameter "未知のパラメータ(%s)\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-ko.h
--- a/help/help_mp-ko.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-ko.h	Fri Apr 01 20:42:06 2011 +0000
@@ -374,11 +374,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG 읽기 오류입니다. (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 비트에서 32 비트로 전환 오류 (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "알 수 없는 메세지입니다.: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "메모리가 부족합니다.\n"
+#define MSGTR_SKIN_NotEnoughMemory "메모리가 부족합니다.\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "폰트가 너무 많이 선언되어 있습니다.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "폰트파일을 찾을 수 없습니다.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "폰트 이미지파일을 찾을 수 없습니다.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "폰트 지정자가 존재하지 않습니다. (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "폰트 지정자가 존재하지 않습니다. (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "알 수 없는 매개변수입니다. (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "스킨을 찾을 수 없습니다. (%s)\n"
 #define MSGTR_SKIN_LABEL "스킨:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-mk.h
--- a/help/help_mp-mk.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-mk.h	Fri Apr 01 20:42:06 2011 +0000
@@ -372,11 +372,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG грешка во читањето ( %s )\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "грешка при конвертирање од 24 бита во 32 бита ( %s )\n"
 #define MSGTR_SKIN_UnknownMessage "непозната порака: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "нема доволно меморија\n"
+#define MSGTR_SKIN_NotEnoughMemory "нема доволно меморија\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "премногу означени фонтови\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "фонт датотеката не е пронајдена\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "датотеката со фонт сликата не е пронајдена\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "непостоечки фонт идентификувач ( %s )\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "непостоечки фонт идентификувач ( %s )\n"
 #define MSGTR_SKIN_UnknownParameter "непознат параметар ( %s )\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Не е пронајден скин ( %s ).\n"
 #define MSGTR_SKIN_LABEL "Скинови:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-nb.h
--- a/help/help_mp-nb.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-nb.h	Fri Apr 01 20:42:06 2011 +0000
@@ -189,11 +189,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG lesefeil (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 bit til 32 bit konverteringsfeil (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "ukjent beskjed: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "ikke nok minne\n"
+#define MSGTR_SKIN_NotEnoughMemory "ikke nok minne\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "for mange skrifttyper deklarert\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "skrifttypefil ikke funnet\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "skrifttype image fil ikke funnet\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "ikke-ekstisterende skrifttype identifikasjon (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "ikke-ekstisterende skrifttype identifikasjon (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "ukjent parameter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin ikke funnet (%s).\n"
 #define MSGTR_SKIN_LABEL "Skins:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-nl.h
--- a/help/help_mp-nl.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-nl.h	Fri Apr 01 20:42:06 2011 +0000
@@ -590,11 +590,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG lees fout (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 bit naar 32 bit converteerfout (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "onbekende boodschap: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "onvoldoende geheugen\n"
+#define MSGTR_SKIN_NotEnoughMemory "onvoldoende geheugen\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "te veel fonts gedeclareerd\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "font bestand niet gevonden\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "font image bestand niet gevonden\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "onbestaande font identifier (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "onbestaande font identifier (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "onbekende parameter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin niet gevonden (%s).\n"
 #define MSGTR_SKIN_LABEL "Skins:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-pl.h
--- a/help/help_mp-pl.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-pl.h	Fri Apr 01 20:42:06 2011 +0000
@@ -720,11 +720,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "Błąd odczytu PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "Błąd konwersji 24 bitów do 32 bitów (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "nieznana wiadomość: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "za mało pamięci\n"
+#define MSGTR_SKIN_NotEnoughMemory "za mało pamięci\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Zadeklarowano za dużo czcionek.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Nie znalazłem pliku z czcionką.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Nie znalazłem pliku z obrazem czcionki.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "Nieistniejący identyfikator czcionki (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "Nieistniejący identyfikator czcionki (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "nieznany parametr (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skórka nie znaleziona (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Wybrana skórka ( %s ) nie odnaleziona, próbuję 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-pt_BR.h
--- a/help/help_mp-pt_BR.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-pt_BR.h	Fri Apr 01 20:42:06 2011 +0000
@@ -377,11 +377,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "erro na leitura do PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "erro na conversão 24 bit para 32 bit (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "mensagem desconhecida: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "memória insuficiente\n"
+#define MSGTR_SKIN_NotEnoughMemory "memória insuficiente\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "muitas fontes declaradas\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "arquivo da fonte não encontrado\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "arquivo de imagem da fonte não encontrado\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "indentificador de fonte não existente (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "indentificador de fonte não existente (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "parâmetro desconhecido (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin não encontrado (%s).\n"
 #define MSGTR_SKIN_LABEL "Skins:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-ru.h
--- a/help/help_mp-ru.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-ru.h	Fri Apr 01 20:42:06 2011 +0000
@@ -571,11 +571,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "ошибка чтения PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "ошибка преобразования 24-бит в 32-бит (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "неизвестное сообщение: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "не хватает памяти\n"
+#define MSGTR_SKIN_NotEnoughMemory "не хватает памяти\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Объявлено слишком много шрифтов.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Файл шрифта не найден.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Файл образов шрифта не найден.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "несуществующий идентификатор шрифта (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "несуществующий идентификатор шрифта (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "неизвестный параметр (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Скин не найден (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Выбранный скин '%s' не найден, пробую 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-sk.h
--- a/help/help_mp-sk.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-sk.h	Fri Apr 01 20:42:06 2011 +0000
@@ -701,11 +701,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "chyba čítania PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "chyba konverzie z 24 bit do 32 bit (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "neznáma správa: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "nedostatok pamäte\n"
+#define MSGTR_SKIN_NotEnoughMemory "nedostatok pamäte\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "príliš mnoho fontov deklarovaných\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "súbor fontov nenájdený\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "súbor obrazov fontu nenájdený\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "neexistujúci identifikátor fontu (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "neexistujúci identifikátor fontu (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "neznámy parameter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Téma nenájdená (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Vybraná téma ( %s ) nenájdená, skúšam 'prednastavenú'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-sv.h
--- a/help/help_mp-sv.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-sv.h	Fri Apr 01 20:42:06 2011 +0000
@@ -605,11 +605,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG läsfel (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24-bitars till 32-bitars konverteringsfel (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "okänt meddelande: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "ej tillräckligt minne\n"
+#define MSGTR_SKIN_NotEnoughMemory "ej tillräckligt minne\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Allt för många fonter deklarerade.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Fontfil ej funnen.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Fontbildsfil ej funnen.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "icke-existerande fontidentifkator (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "icke-existerande fontidentifkator (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "okänd parameter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin ej funnen (%s).\n"
 #define MSGTR_SKIN_LABEL "Skin:"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-tr.h
--- a/help/help_mp-tr.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-tr.h	Fri Apr 01 20:42:06 2011 +0000
@@ -762,11 +762,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG okuma hatası (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 bit --> 32 bit dönüştürme hatası (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "Bilinmeyen ileti: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "yetersiz bellek\n"
+#define MSGTR_SKIN_NotEnoughMemory "yetersiz bellek\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Çok sayıda yazıtipi tanıtıldı\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "yazıtipi dosyası bulunamadı\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "yazıtipi görüntü dosyası bulunamadı\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "Varolmayan yazıtipi tanımlayıcısı (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "Varolmayan yazıtipi tanımlayıcısı (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "bilinmeyen parametre (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Arayüz bulunamadı (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Seçili arayüz ( %s ) bulunamadı , 'varsayılan'ı deneyiniz...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-uk.h
--- a/help/help_mp-uk.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-uk.h	Fri Apr 01 20:42:06 2011 +0000
@@ -565,11 +565,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "Помилка читання PNG (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "помилка конвертування з 24 до 32 біт (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "невідоме повідомлення: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "недостатньо пам'яті\n"
+#define MSGTR_SKIN_NotEnoughMemory "недостатньо пам'яті\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "Вказано забагато шрифтів.\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "Файл шрифту не знайдено.\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "Font image file not found.\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "ідентифікатор шрифту не існує (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "ідентифікатор шрифту не існує (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "невідомий параметр (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Скін не знайдено (%s).\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Обраний скін ( %s ) не знайдено, обираю 'default'...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-zh_CN.h
--- a/help/help_mp-zh_CN.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-zh_CN.h	Fri Apr 01 20:42:06 2011 +0000
@@ -569,11 +569,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG 读取错误（%s）\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 比特至 32 比特转换出错（%s）\n"
 #define MSGTR_SKIN_UnknownMessage "未知信息：%s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "内存不够\n"
+#define MSGTR_SKIN_NotEnoughMemory "内存不够\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "声明了太多的字体。\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "找不到字体文件。\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "找不到字体图像文件。\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "不存在的字体标识符（%s）\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "不存在的字体标识符（%s）\n"
 #define MSGTR_SKIN_UnknownParameter "未知参数（%s）\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "未找到界面外观‘%s’。\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "未找到选定的界面外观‘%s’，尝试使用‘default’参数...\n"
diff -r ca1a01b56c90 -r 533c658a18da help/help_mp-zh_TW.h
--- a/help/help_mp-zh_TW.h	Fri Apr 01 13:59:50 2011 +0000
+++ b/help/help_mp-zh_TW.h	Fri Apr 01 20:42:06 2011 +0000
@@ -735,11 +735,11 @@
 #define MSGTR_SKIN_BITMAP_PNGReadError "PNG 讀取錯誤 (%s)\n"
 #define MSGTR_SKIN_BITMAP_ConversionError "24 比特到 32 比特的轉換發生錯誤 (%s)\n"
 #define MSGTR_SKIN_UnknownMessage "未知信息: %s\n"
-#define MSGTR_SKIN_FONT_NotEnoughtMemory "内存不够\n"
+#define MSGTR_SKIN_NotEnoughMemory "内存不够\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "聲明字體太多。\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "找不到字體文件。\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "找不到字體圖像文件。\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "不存在的字體標簽 (%s)\n"
+#define MSGTR_SKIN_FONT_NonExistentFont "不存在的字體標簽 (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "未知參數 (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "找不到皮膚 (%s)。\n"
 #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "没找到選定的皮膚 (%s), 試着使用默認的...\n"