# HG changeset patch # User ib # Date 1301056820 0 # Node ID 7f06781043d98d1506d5e900be301712e213a17d # Parent 21e0de9c355f3ce0d4fd47d14137c978a4ccd811 Revise some GUI error message texts. diff -r 21e0de9c355f -r 7f06781043d9 gui/interface.c --- a/gui/interface.c Fri Mar 25 11:28:25 2011 +0000 +++ b/gui/interface.c Fri Mar 25 12:40:20 2011 +0000 @@ -223,7 +223,7 @@ exit_player(EXIT_ERROR); case -2: - gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgReadError, skinName); + gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName); exit_player(EXIT_ERROR); } diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-bg.h --- a/help/help_mp-bg.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-bg.h Fri Mar 25 12:40:20 2011 +0000 @@ -622,7 +622,6 @@ #define MSGTR_SKIN_UnknownParameter "неизвестен параметър (%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "Скинът не е намерен (%s).\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Избраният скин ( %s ) не е намерен, ще се ползва 'default'...\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Грешка в конфигурационен файл (%s)\n" #define MSGTR_SKIN_LABEL "Скинове:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-cs.h --- a/help/help_mp-cs.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-cs.h Fri Mar 25 12:40:20 2011 +0000 @@ -582,7 +582,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "chyba při čtení konfiguračního souboru témat (%s)\n" #define MSGTR_SKIN_LABEL "Témata:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-de.h --- a/help/help_mp-de.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-de.h Fri Mar 25 12:40:20 2011 +0000 @@ -765,9 +765,9 @@ #define MSGTR_Browse "Durchsuchen" // --- error messages --- -#define MSGTR_NEMDB "Sorry, nicht genug Speicher zum Zeichnen des Puffers." +#define MSGTR_NEMDB "Sorry, nicht genug Speicher zum Zeichnen des Puffers.\n" #define MSGTR_NEMFMR "Sorry, nicht genug Speicher für Menü-Rendering." -#define MSGTR_IDFGCVD "Sorry, habe keinen GUI-kompatiblen Ausgabetreiber gefunden." +#define MSGTR_IDFGCVD "Sorry, es wurde kein GUI-kompatibler Ausgabetreiber gefunden.\n" #define MSGTR_NEEDLAVC "Sorry, du versuchst, Nicht-MPEG Dateien ohne erneute Encodierung abzuspielen.\nBitte aktiviere lavc in der DXR3/H+-Konfigurationsbox." #define MSGTR_UNKNOWNWINDOWTYPE "Unbekannten Fenstertyp gefunden ..." @@ -793,9 +793,9 @@ #define MSGTR_SKIN_FONT_FontImageNotFound "Schriftbilddatei nicht gefunden.\n" #define MSGTR_SKIN_FONT_NonExistentFontID "nicht existierende Schriftbezeichnung (%s)\n" #define MSGTR_SKIN_UnknownParameter "unbekannter Parameter (%s)\n" -#define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin nicht gefunden (%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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin-Konfigurationsdatei: Lesefehler (%s)\n" +#define MSGTR_SKIN_SKINCFG_SkinCfgError "Verarbeitungsfehler in Konfigurationsdatei des Skins '%s'\n" #define MSGTR_SKIN_LABEL "Skins:" // --- GTK-Menüs diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-dk.h --- a/help/help_mp-dk.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-dk.h Fri Mar 25 12:40:20 2011 +0000 @@ -383,7 +383,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "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_SKINCFG_SkinCfgReadError "Tema config-fil læse fejl (%s).\n" #define MSGTR_SKIN_LABEL "Temaer:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-el.h --- a/help/help_mp-el.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-el.h Fri Mar 25 12:40:20 2011 +0000 @@ -392,7 +392,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "μη-υπαρκτή η ταυτότητα της γραμματοσειράς (%s)\n" #define MSGTR_SKIN_UnknownParameter "μη αναγνωρίσιμη παράμετρος (%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "Δεν βρέθηκε skin (%s).\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "σφάλμα ανάγνωσης του skin configfile (%s).\n" #define MSGTR_SKIN_LABEL "Skins:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-en.h --- a/help/help_mp-en.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-en.h Fri Mar 25 12:40:20 2011 +0000 @@ -568,9 +568,9 @@ #define MSGTR_Browse "Browse" // --- error messages --- -#define MSGTR_NEMDB "Sorry, not enough memory to draw buffer." +#define MSGTR_NEMDB "Sorry, not enough memory to draw buffer.\n" #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering." -#define MSGTR_IDFGCVD "Sorry, I did not find a GUI-compatible video output driver." +#define MSGTR_IDFGCVD "Sorry, no GUI-compatible video output driver found.\n" #define MSGTR_NEEDLAVC "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box." #define MSGTR_UNKNOWNWINDOWTYPE "Unknown window type found ..." @@ -596,9 +596,9 @@ #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_UnknownParameter "unknown parameter (%s)\n" -#define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin not found (%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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "skin config file read error (%s)\n" +#define MSGTR_SKIN_SKINCFG_SkinCfgError "Config file processing error with skin '%s'\n" #define MSGTR_SKIN_LABEL "Skins:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-es.h --- a/help/help_mp-es.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-es.h Fri Mar 25 12:40:20 2011 +0000 @@ -601,7 +601,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Error de lectura del archivo de configuración del skin (%s).\n" #define MSGTR_SKIN_LABEL "Skins:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-fr.h --- a/help/help_mp-fr.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-fr.h Fri Mar 25 12:40:20 2011 +0000 @@ -764,7 +764,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "erreur de lecture du fichier de configuration du peau (%s)\n" #define MSGTR_SKIN_LABEL "Peaux :" // --- menus gtk diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-hu.h --- a/help/help_mp-hu.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-hu.h Fri Mar 25 12:40:20 2011 +0000 @@ -595,7 +595,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin konfigurációs fájl olvasási hiba (%s).\n" #define MSGTR_SKIN_LABEL "Skin-ek:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-it.h --- a/help/help_mp-it.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-it.h Fri Mar 25 12:40:20 2011 +0000 @@ -590,7 +590,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Errore nella lettura del file di configurazione della skin (%s).\n" #define MSGTR_SKIN_LABEL "Skins:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-ja.h --- a/help/help_mp-ja.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-ja.h Fri Mar 25 12:40:20 2011 +0000 @@ -317,7 +317,6 @@ #define MSGTR_SKIN_FONT_FontImageNotFound "フォントイメージファイルが存在しません\n" #define MSGTR_SKIN_UnknownParameter "未知のパラメータ(%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "スキンが存在しません( %s ).\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "スキン設定ファイルの読み込みエラー(%s).\n" #define MSGTR_SKIN_LABEL "スキン:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-ko.h --- a/help/help_mp-ko.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-ko.h Fri Mar 25 12:40:20 2011 +0000 @@ -385,7 +385,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "폰트 지정자가 존재하지 않습니다. (%s)\n" #define MSGTR_SKIN_UnknownParameter "알 수 없는 매개변수입니다. (%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "스킨을 찾을 수 없습니다. (%s)\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "스킨 설정파일 읽기 오류입니다. (%s)\n" #define MSGTR_SKIN_LABEL "스킨:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-mk.h --- a/help/help_mp-mk.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-mk.h Fri Mar 25 12:40:20 2011 +0000 @@ -383,7 +383,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "непостоечки фонт идентификувач ( %s )\n" #define MSGTR_SKIN_UnknownParameter "непознат параметар ( %s )\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "Не е пронајден скин ( %s ).\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Грешка во читање на конфигурационата датотека за скинови ( %s ).\n" #define MSGTR_SKIN_LABEL "Скинови:" // --- gtk менија diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-nb.h --- a/help/help_mp-nb.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-nb.h Fri Mar 25 12:40:20 2011 +0000 @@ -200,7 +200,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "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_SKINCFG_SkinCfgReadError "Skin konfigurasjonfil lesefeil (%s).\n" #define MSGTR_SKIN_LABEL "Skins:" diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-nl.h --- a/help/help_mp-nl.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-nl.h Fri Mar 25 12:40:20 2011 +0000 @@ -601,7 +601,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "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_SKINCFG_SkinCfgReadError "Leesfout in skin-configuratiebestand (%s).\n" #define MSGTR_SKIN_LABEL "Skins:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-pl.h --- a/help/help_mp-pl.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-pl.h Fri Mar 25 12:40:20 2011 +0000 @@ -733,7 +733,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "błąd odczytu pliku konfiguracyjnego skórki (%s)\n" #define MSGTR_SKIN_LABEL "Skórki:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-pt_BR.h --- a/help/help_mp-pt_BR.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-pt_BR.h Fri Mar 25 12:40:20 2011 +0000 @@ -388,7 +388,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "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_SKINCFG_SkinCfgReadError "Erro na leitura do arquivo de configuração do skin (%s).\n" #define MSGTR_SKIN_LABEL "Skins:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-ru.h --- a/help/help_mp-ru.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-ru.h Fri Mar 25 12:40:20 2011 +0000 @@ -584,7 +584,6 @@ #define MSGTR_SKIN_UnknownParameter "неизвестный параметр (%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "Скин не найден (%s).\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Выбранный скин '%s' не найден, пробую 'default'...\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Ошибка чтения файла конфигурации шкур (%s)\n" #define MSGTR_SKIN_LABEL "Шкуры:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-sk.h --- a/help/help_mp-sk.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-sk.h Fri Mar 25 12:40:20 2011 +0000 @@ -714,7 +714,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Chyba pri čítaní konfiguračného súboru tém (%s).\n" #define MSGTR_SKIN_LABEL "Témy:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-sv.h --- a/help/help_mp-sv.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-sv.h Fri Mar 25 12:40:20 2011 +0000 @@ -616,7 +616,6 @@ #define MSGTR_SKIN_FONT_NonExistentFontID "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_SKINCFG_SkinCfgReadError "skinkonfigurationsfilsläsfel (%s)\n" #define MSGTR_SKIN_LABEL "Skin:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-tr.h --- a/help/help_mp-tr.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-tr.h Fri Mar 25 12:40:20 2011 +0000 @@ -775,7 +775,6 @@ #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" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Arayüz ayar dosyası okuma hatası (%s).\n" #define MSGTR_SKIN_LABEL "Arayüzler:" // --- gtk menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-uk.h --- a/help/help_mp-uk.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-uk.h Fri Mar 25 12:40:20 2011 +0000 @@ -578,7 +578,6 @@ #define MSGTR_SKIN_UnknownParameter "невідомий параметр (%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "Скін не знайдено (%s).\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Обраний скін ( %s ) не знайдено, обираю 'default'...\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "помилка читання файлу налаштування скіну (%s)\n" #define MSGTR_SKIN_LABEL "Скіни:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-zh_CN.h --- a/help/help_mp-zh_CN.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-zh_CN.h Fri Mar 25 12:40:20 2011 +0000 @@ -582,7 +582,6 @@ #define MSGTR_SKIN_UnknownParameter "未知参数(%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "找不到界面外观(%s)。\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "未找到选定的界面外观‘%s’,尝试使用‘default’参数...\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "界面外观配置文件(%s)读取错误。\n" #define MSGTR_SKIN_LABEL "界面外观:" // --- GTK menus diff -r 21e0de9c355f -r 7f06781043d9 help/help_mp-zh_TW.h --- a/help/help_mp-zh_TW.h Fri Mar 25 11:28:25 2011 +0000 +++ b/help/help_mp-zh_TW.h Fri Mar 25 12:40:20 2011 +0000 @@ -748,7 +748,6 @@ #define MSGTR_SKIN_UnknownParameter "未知參數 (%s)\n" #define MSGTR_SKIN_SKINCFG_SkinNotFound "找不到皮膚 (%s)。\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "没找到選定的皮膚 (%s), 試着使用默認的...\n" -#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "皮膚配置文件 (%s) 讀取錯誤。\n" #define MSGTR_SKIN_LABEL "Skins:" // --- gtk menus