Changeset 1045

Timestamp:

01/15/11 22:42:14 (2 years ago)

Author:

reyalP

Message:

• Updated badpixel messages from ultimA in ​http://chdk.setepontos.com/index.php?topic=5793.msg59721#msg59721
• Move script not supported message to lang, shorten.

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (2 diffs)
• CHDK/LANG/german.lng (modified) (1 diff)
• CHDK/LANG/hungarian.lng (modified) (1 diff)
• core/gui_lang.c (modified) (2 diffs)
• core/gui_lang.h (modified) (1 diff)
• core/script.c (modified) (2 diffs)

trunk/CHDK/LANG/english.lng

@@ -564 +564 @@
 424 "DNG format"
 425 "RAW buffer cached"
-426 "Cannot load CHDK/badpixel.bin\nUse Create badpixel.bin in raw menu"
+426 "Cannot load CHDK/badpixel.bin\nUse 'Create badpixel.bin' first"
 427 "Show raw saving time"
 428 "Connect 4"
@@ -597 +597 @@
 459 "Create badpixel.bin"
 460 "You need to be in REC-mode\nfor this operation."
+461 "%s disabled in build"

trunk/CHDK/LANG/german.lng

@@ -541 +541 @@
 424 "DNG-Format"
 425 "RAW-Puffer nutzen"
-426 "Datei badpixel.bin fehlt!\nBitte starte \nCHDK/SCRIPTS/TEST/badpixel.lua"
+426 "Datei badpixel.bin fehlt!\nFühre 'badpixel.bin erstellen' aus"
 427 "Zeige RAW Speicherzeit"
 

trunk/CHDK/LANG/hungarian.lng

@@ -552 +552 @@
 424 "DNG formátum"
 425 "RAW cache memória használata"
-426 "CHDK/badpixel.bin fájlt nem lehet betölteni\nFuttasd a következöt:\nCHDK/SCRIPTS/TEST/badpixel.lua"
+426 "CHDK/badpixel.bin fájlt nem lehet betölteni\nFuttasd a következöt:'badpixel.bin mentése'"
 427 "RAW mentés idejének megjelenítése"
 428 "Connect 4"

trunk/core/gui_lang.c

@@ -545 +545 @@
 "424 \"DNG format\"\n"
 "425 \"RAW buffer cached\"\n"
-"426 \"Cannot load CHDK/badpixel.bin\\nPlease run \\nCHDK/SCRIPTS/TEST/badpixel.lua\"\n"
+"426 \"Cannot load CHDK/badpixel.bin\\nUse 'Create badpixel.bin' first\"\n"
 "427 \"Show saving time\"\n"
 
@@ -582 +582 @@
 "459 \"Create badpixel.bin\"\n"
 "460 \"You need to be in REC-mode\\nfor this operation.\"\n"
+"461 \"%s disabled in build\"\n"
 ;
 

trunk/core/gui_lang.h

@@ -571 +571 @@
 #define LANG_MENU_BADPIXEL_CREATE  459
 #define LANG_MSG_RECMODE_REQUIRED  460
+#define LANG_CONSOLE_SCRIPT_DISABLED_IN_BUILD  461
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  460
+#define GUI_LANG_ITEMS                  461
 
 //-------------------------------------------------------------------

trunk/core/script.c

@@ -645 +645 @@
         state_lua_kbd_first_call_to_resume = 1;
 #else
-        console_add_line("Cannot run script.");
-        console_add_line("There is no Lua");
-        console_add_line("support in this build.");
+        char msg[64];
+        sprintf(msg,lang_str(LANG_CONSOLE_SCRIPT_DISABLED_IN_BUILD),"Lua");
+        console_add_line(msg);
         return -1;
 #endif
@@ -659 +659 @@
         }
 #else
-        console_add_line("Cannot run script.");
-        console_add_line("There is no UBasic");
-        console_add_line("support in this build.");
+        char msg[64];
+        sprintf(msg,lang_str(LANG_CONSOLE_SCRIPT_DISABLED_IN_BUILD),"UBASIC");
+        console_add_line(msg);
         return -1;
 #endif