Commits

hominem_te_esse committed 0431b73

adding i18n strings

Comments (0)

Files changed (8)

 #define _STR_RECONNECT					116
 #define _STR_HINT_SHARENAME				117
 #define _STR_ETH_PREFIX					118
+#define _STR_BACKSPACE					119
+#define _STR_SPACE						120
+#define _STR_ENTER						121
+#define _STR_MODE						122
+#define _STR_VMC_SLOT1					123
+#define _STR_VMC_SLOT2					124
+#define _STR_GAME_ID					125
+#define _STR_DMA_MODE					126
+#define _STR_VSYNC						127
+#define _STR_MODE1						128
+#define _STR_MODE2						129
+#define _STR_MODE3						130
+#define _STR_MODE4						131
+#define _STR_MODE5						132
+#define _STR_MODE6						133
+#define _STR_MODE7						134
+#define _STR_MODE8						135
+#define _STR_MODE9						136
 
-#define LANG_STR_COUNT 119
+#define LANG_STR_COUNT 137
 
 // Maximum external languages supported
 #define MAX_LANGUAGE_FILES 15

lng/lang_English.lng

 Color selection
 Reconnect
 Leave empty to list shares
-ETH prefix path
+ETH prefix path
+Backspace
+Space
+Enter
+Mode
+VMC Slot 1
+VMC Slot 2
+Game ID
+DMA Mode
+V-Sync
+Mode 1
+Mode 2
+Mode 3
+Mode 4
+Mode 5
+Mode 6
+Mode 7
+Mode 8
+Mode 9

lng/lang_French.lng

 Choix de la couleur
 Reconnection
 Laisser vide pour lister les partages
-Préfixe ETH
+Préfixe ETH
+Retour arrière
+Espace
+Entrée
+Mode
+Carte VMC 1
+Carte VMC 2
+ID de jeu
+Mode DMA
+V-Sync
+Mode 1
+Mode 2
+Mode 3
+Mode 4
+Mode 5
+Mode 6
+Mode 7
+Mode 8
+Mode 9
 		'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', '~', '.' };
 	char *keyb = keyb0;
 
-	char *commands[KEYB_HEIGHT] = {"BACKSPACE", "SPACE", "ENTER", "MODE"};
+	char *commands[KEYB_HEIGHT] = {_l(_STR_BACKSPACE), _l(_STR_SPACE), _l(_STR_ENTER), _l(_STR_MODE)};
 	GSTEXTURE *cmdicons[KEYB_HEIGHT];
 	cmdicons[0] = thmGetTexture(SQUARE_ICON);
 	cmdicons[1] = thmGetTexture(TRIANGLE_ICON);
 			for (i = 0; i < KEYB_WIDTH; i++) {
 				c[0] = keyb[i + j * KEYB_WIDTH];
 
-				x = 50 + i * 32;
+				x = 50 + i * 31;
 				w = fntRenderString(FNT_DEFAULT, x, 170 + 3 * UI_SPACING_H * j, ALIGN_NONE, 0, 0, c, gTheme->uiTextColor) - x;
 				if ((i + j * KEYB_WIDTH) == selchar)
 					diaDrawBoundingBox(x, 170 + 3 * UI_SPACING_H * j, w, UI_SPACING_H, 0);
 		// Commands
 		for (i = 0; i < KEYB_HEIGHT; i++) {
 			if (cmdicons[i])
-				rmDrawPixmap(cmdicons[i], 448, 170 + 3 * UI_SPACING_H * i, ALIGN_NONE, cmdicons[i]->Width, cmdicons[i]->Height, SCALING_RATIO, gDefaultCol);
+				rmDrawPixmap(cmdicons[i], 436, 170 + 3 * UI_SPACING_H * i, ALIGN_NONE, cmdicons[i]->Width, cmdicons[i]->Height, SCALING_RATIO, gDefaultCol);
 			
-			x = 489;
+			x = 477;
 			w = fntRenderString(FNT_DEFAULT, x, 170 + 3 * UI_SPACING_H * i, ALIGN_NONE, 0, 0, commands[i], gTheme->uiTextColor) - x;
 			if (i == selcommand)
 				diaDrawBoundingBox(x, 170 + 3 * UI_SPACING_H * i, w, UI_SPACING_H, 0);
 	
 	{UI_SPLITTER},
 
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 1", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE    , 1, _STR_HINT_MODE1, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 2", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 1, 1, _STR_HINT_MODE2, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 3", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 2, 1, _STR_HINT_MODE3, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 4", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 3, 1, _STR_HINT_MODE4, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 5", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 4, 1, _STR_HINT_MODE5, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 6", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 5, 1, _STR_HINT_MODE6, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 7", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 6, 1, _STR_HINT_MODE7, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Mode 8", -1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 7, 1, _STR_HINT_MODE8, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE1}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE    , 1, _STR_HINT_MODE1, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE2}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 1, 1, _STR_HINT_MODE2, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE3}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 2, 1, _STR_HINT_MODE3, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE4}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 3, 1, _STR_HINT_MODE4, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE5}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 4, 1, _STR_HINT_MODE5, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE6}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 5, 1, _STR_HINT_MODE6, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE7}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 6, 1, _STR_HINT_MODE7, -10, 0, {.intvalue = {0, 0}}}, {UI_SPACER},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_MODE8}}}, {UI_SPACER}, {UI_BOOL, COMPAT_MODE_BASE + 7, 1, _STR_HINT_MODE8, -10, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
 	
 	{UI_BREAK},
 	
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"DMA Mode", -1}}}, {UI_SPACER}, {UI_ENUM, COMPAT_DMA, 1, -1, 0, 0, {.intvalue = {0, 0}}},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_DMA_MODE}}}, {UI_SPACER}, {UI_ENUM, COMPAT_DMA, 1, -1, 0, 0, {.intvalue = {0, 0}}},
 	
 	{UI_SPLITTER},
 	
 #ifdef VMC
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"VMC Slot 1", -1}}}, {UI_SPACER},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_VMC_SLOT1}}}, {UI_SPACER},
 #ifndef __CHILDPROOF
 	{UI_BUTTON, COMPAT_VMC1_DEFINE, 1, -1, 0, 0, {.label = {NULL, -1}}}, {UI_SPACER}, {UI_BUTTON, COMPAT_VMC1_ACTION, 1, -1, 0, 0, {.label = {NULL, -1}}}, {UI_BREAK},
 #else
 	{UI_BUTTON, COMPAT_VMC1_DEFINE, 0, -1, 0, 0, {.label = {NULL, -1}}}, {UI_BREAK},
 #endif
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"VMC Slot 2", -1}}}, {UI_SPACER},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_VMC_SLOT2}}}, {UI_SPACER},
 #ifndef __CHILDPROOF
 	{UI_BUTTON, COMPAT_VMC2_DEFINE, 1, -1, 0, 0, {.label = {NULL, -1}}}, {UI_SPACER}, {UI_BUTTON, COMPAT_VMC2_ACTION, 1, -1, 0, 0, {.label = {NULL, -1}}},
 #else
 	{UI_SPLITTER},
 #endif
 	
-	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {"Game ID", -1}}}, {UI_SPACER}, {UI_STRING, COMPAT_GAMEID, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}},
+	{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_GAME_ID}}}, {UI_SPACER}, {UI_STRING, COMPAT_GAMEID, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}},
 	{UI_SPACER}, {UI_BUTTON, COMPAT_LOADFROMDISC, 1, -1, 0, 0, {.label = {NULL, _STR_LOAD_FROM_DISC}}},
 
 	{UI_SPLITTER},
 	{UI_SPLITTER},
 
 	{UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VMODE}}}, {UI_SPACER}, {UI_ENUM, UICFG_VMODE, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
-	{UI_LABEL, 0, 1, -1, -20, 0, {.label = {"V-Sync", -1}}}, {UI_SPACER}, {UI_BOOL, UICFG_VSYNC, 1, -1, 0, 0, {.intvalue = {1, 1}}}, {UI_BREAK},
+	{UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_VSYNC}}}, {UI_SPACER}, {UI_BOOL, UICFG_VSYNC, 1, -1, 0, 0, {.intvalue = {1, 1}}}, {UI_BREAK},
 	{UI_LABEL, 0, 1, -1, -20, 0, {.label = {NULL, _STR_WIDE_SCREEN}}}, {UI_SPACER}, {UI_BOOL, UICFG_WIDESCREEN, 1, -1, 0, 0, {.intvalue = {0, 0}}},
 
 	{UI_SPLITTER},
 
 	// configure the enumerations
 	const char* scrollSpeeds[] = { _l(_STR_SLOW), _l(_STR_MEDIUM),	_l(_STR_FAST), NULL };
-	const char* vmodeNames[] = { "AUTO", "PAL", "NTSC", NULL };
+	const char* vmodeNames[] = { _l(_STR_AUTO), "PAL", "NTSC", NULL };
 	diaSetEnum(diaUIConfig, UICFG_SCROLL, scrollSpeeds);
 	diaSetEnum(diaUIConfig, UICFG_THEME, (const char **) thmGetGuiList());
 	diaSetEnum(diaUIConfig, UICFG_LANG, (const char **) lngGetGuiList());
 	"Color selection",
 	"Reconnect",
 	"Leave empty to list shares",
-	"ETH prefix path"
+	"ETH prefix path",
+	"Backspace",
+	"Space",
+	"Enter",
+	"Mode",
+	"VMC Slot 1",
+	"VMC Slot 2",
+	"Game ID",
+	"DMA Mode",
+	"V-Sync",
+	"Mode 1",
+	"Mode 2",
+	"Mode 3",
+	"Mode 4",
+	"Mode 5",
+	"Mode 6",
+	"Mode 7",
+	"Mode 8",
+	"Mode 9"
 };
 
 static int guiLangID = 0;
 			}
 		}
 		if (mutableText->currentValue) {
-			if (mutableText->displayMode == DISPLAY_NEVER)
+			if (mutableText->displayMode == DISPLAY_NEVER) {
 				if (mutableText->sizingMode == SIZING_NONE)
 					fntRenderString(elem->font, elem->posX, elem->posY, elem->aligned, 0, 0, mutableText->currentValue, elem->color);
 				else
 					fntRenderString(elem->font, elem->posX, elem->posY, elem->aligned, elem->width, elem->height, mutableText->currentValue, elem->color);
-			else {
+			} else {
 				char result[300];
 				snprintf(result, 300, "%s%s", mutableText->alias, mutableText->currentValue);
 				if (mutableText->sizingMode == SIZING_NONE)
 			return;
 		}
 	}
-	if (mutableText->displayMode == DISPLAY_ALWAYS)
+	if (mutableText->displayMode == DISPLAY_ALWAYS) {
 		if (mutableText->sizingMode == SIZING_NONE)
 			fntRenderString(elem->font, elem->posX, elem->posY, elem->aligned, 0, 0, mutableText->alias, elem->color);
 		else
 			fntRenderString(elem->font, elem->posX, elem->posY, elem->aligned, elem->width, elem->height, mutableText->alias, elem->color);
+	}
 }
 
 static void initAttributeText(char* themePath, config_set_t* themeConfig, theme_t* theme, theme_element_t* elem, char* name,