Author: ib
Date: Mon Apr 4 14:40:20 2011
New Revision: 33201
Log:
Remove useless warning message.
Instead, add debug message and return whether conversion was successful
or not and use the return code to issue an appropriate error message.
Modified:
trunk/help/help_mp-bg.h
trunk/help/help_mp-cs.h
trunk/help/help_mp-de.h
trunk/help/help_mp-es.h
trunk/help/help_mp-fr.h
trunk/help/help_mp-hu.h
trunk/help/help_mp-it.h
trunk/help/help_mp-pl.h
trunk/help/help_mp-ru.h
trunk/help/help_mp-tr.h
trunk/help/help_mp-uk.h
trunk/help/help_mp-zh_CN.h
trunk/help/help_mp-zh_TW.h
Changes in other areas also in this revision:
Modified:
trunk/gui/skin/skin.c
trunk/gui/util/bitmap.c
trunk/gui/util/bitmap.h
trunk/help/help_mp-en.h
Modified: trunk/help/help_mp-bg.h
==============================================================================
--- trunk/help/help_mp-bg.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-bg.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -795,10 +795,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Грешка!"
#define MSGTR_MSGBOX_LABEL_Warning "Внимание!"
-// bitmap.c
-
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] недостатъчно памет за изображението\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] грешка при четене на конфигурационния файл ...\n"
Modified: trunk/help/help_mp-cs.h
==============================================================================
--- trunk/help/help_mp-cs.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-cs.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -771,9 +771,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Chyba!"
#define MSGTR_MSGBOX_LABEL_Warning "Varování!"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] nedostatek paměti pro obrázek\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] chyba při čtení konfiguračního souboru...\n"
#define MSGTR_UnableToSaveOption "[cfg] Nelze uložit volbu '%s'.\n"
Modified: trunk/help/help_mp-de.h
==============================================================================
--- trunk/help/help_mp-de.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-de.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -989,9 +989,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Fehler!"
#define MSGTR_MSGBOX_LABEL_Warning "Warnung!"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] Für das Bild ist nicht genügend Speicher vorhanden.\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] Fehler beim Lesen der Konfigurationsdatei ...\n"
#define MSGTR_UnableToSaveOption "[cfg] Kann die Option '%s' nicht speichern.\n"
@@ -2176,3 +2173,4 @@ static const char help_text[]=
#define MSGTR_TVI_DS_NoVideoCaptureDevice "tvi_dshow: Kein Gerät für Videoerfassung gefunden\n"
#define MSGTR_TVI_DS_NoAudioCaptureDevice "tvi_dshow: Kein Gerät für Audioerfassung gefunden\n"
#define MSGTR_TVI_DS_GetActualMediatypeFailed "tvi_dshow: Kann eigentlichen Medientyp nicht ermitteln (Fehler:0x%x).\nNehme an, dieser entspricht dem angeforderten.\n"
+
Modified: trunk/help/help_mp-es.h
==============================================================================
--- trunk/help/help_mp-es.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-es.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -787,9 +787,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Error"
#define MSGTR_MSGBOX_LABEL_Warning "Advertencia"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] no hay suficiente memoria para la imagen\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] error al leer archivo de configuración ...\n"
#define MSGTR_UnableToSaveOption "[cfg] No se puede guardar la opción '%s'.\n"
Modified: trunk/help/help_mp-fr.h
==============================================================================
--- trunk/help/help_mp-fr.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-fr.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -950,10 +950,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Erreur !"
#define MSGTR_MSGBOX_LABEL_Warning "Attention !"
-// bitmap.c
-
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] mémoire insuffisante pour image\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] Erreur lecture fichier config ...\n"
Modified: trunk/help/help_mp-hu.h
==============================================================================
--- trunk/help/help_mp-hu.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-hu.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -784,9 +784,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Hiba!"
#define MSGTR_MSGBOX_LABEL_Warning "Figyelmeztetés!"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] nincs elég memória a képhez\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] hiba a konfigurációs fájl olvasásakor ...\n"
#define MSGTR_UnableToSaveOption "[cfg] A(z) '%s' opciót nem sikerült elmenteni.\n"
Modified: trunk/help/help_mp-it.h
==============================================================================
--- trunk/help/help_mp-it.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-it.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -778,9 +778,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Errore!"
#define MSGTR_MSGBOX_LABEL_Warning "Avvertimento!"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] non c'è abbastanza memoria per l'immagine\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] errore di lettura file di configurazione...\n"
#define MSGTR_UnableToSaveOption "[cfg] non riesco a salvare l'opzione '%s'.\n"
Modified: trunk/help/help_mp-pl.h
==============================================================================
--- trunk/help/help_mp-pl.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-pl.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -921,10 +921,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Błąd!"
#define MSGTR_MSGBOX_LABEL_Warning "Uwaga!"
-// bitmap.c
-
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] za mało pamięci na obraz\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] błąd wczytywania pliku konfiguracyjnego ...\n"
Modified: trunk/help/help_mp-ru.h
==============================================================================
--- trunk/help/help_mp-ru.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-ru.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -773,9 +773,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Ошибка!"
#define MSGTR_MSGBOX_LABEL_Warning "Предупреждение!"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] недостаточно памяти для изображения\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] ошибка чтения конфигурационного файла...\n"
#define MSGTR_UnableToSaveOption "[cfg] Не могу сохранить опцию '%s'.\n"
Modified: trunk/help/help_mp-tr.h
==============================================================================
--- trunk/help/help_mp-tr.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-tr.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -964,10 +964,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Hata!"
#define MSGTR_MSGBOX_LABEL_Warning "Uyarı!"
-// bitmap.c
-
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] görüntü için yeterli bellek yok\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] ayar dosyası okuma hatası...\n"
Modified: trunk/help/help_mp-uk.h
==============================================================================
--- trunk/help/help_mp-uk.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-uk.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -766,9 +766,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "Помилка!"
#define MSGTR_MSGBOX_LABEL_Warning "Попередження!"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] недостатньо пам'яті для картинки\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] помилка читання файлу налаштунків ...\n"
#define MSGTR_UnableToSaveOption "[cfg] Не можу зберегти '%s' опцію.\n"
Modified: trunk/help/help_mp-zh_CN.h
==============================================================================
--- trunk/help/help_mp-zh_CN.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-zh_CN.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -774,9 +774,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "错误！"
#define MSGTR_MSGBOX_LABEL_Warning "警告！"
-// bitmap.c
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] 用于图像的内存不足\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] 配置文件读取错误...\n"
#define MSGTR_UnableToSaveOption "[cfg] 无法保存‘%s’选项。\n"
Modified: trunk/help/help_mp-zh_TW.h
==============================================================================
--- trunk/help/help_mp-zh_TW.h Mon Apr 4 14:14:26 2011 (r33200)
+++ trunk/help/help_mp-zh_TW.h Mon Apr 4 14:40:20 2011 (r33201)
@@ -936,10 +936,6 @@ static const char help_text[]=
#define MSGTR_MSGBOX_LABEL_Error "錯誤!"
#define MSGTR_MSGBOX_LABEL_Warning "警告!"
-// bitmap.c
-
-#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] 内存不够, 容不下圖片\n"
-
// cfg.c
#define MSGTR_ConfigFileReadError "[cfg] 配置文件讀取錯誤...\n"
