From 2daea905809893a9ae188ab2335c463f1aa680fb Mon Sep 17 00:00:00 2001 From: ehouse Date: Fri, 16 Oct 2009 12:42:05 +0000 Subject: [PATCH] cleanup prefs dialog (and comment where needs translation changes to fit) --- xwords4/wince/l10n/xwords4_catalan.rc | 79 ++++++++++++++------------- 1 file changed, 42 insertions(+), 37 deletions(-) diff --git a/xwords4/wince/l10n/xwords4_catalan.rc b/xwords4/wince/l10n/xwords4_catalan.rc index 1305556c2..bc5936636 100644 --- a/xwords4/wince/l10n/xwords4_catalan.rc +++ b/xwords4/wince/l10n/xwords4_catalan.rc @@ -63,29 +63,29 @@ BEGIN #ifndef _WIN32_WCE POPUP "Button" BEGIN - MENUITEM "--", W32_DUMMY_ID + MENUITEM "--", W32_DUMMY_ID END #endif POPUP "Menú" BEGIN - MENUITEM "Fet", ID_MOVE_TURNDONE - MENUITEM "Remena", ID_MOVE_JUGGLE - MENUITEM "Canvia l'horientació", ID_MOVE_FLIP - MENUITEM "Canvia", ID_MOVE_TRADE - MENUITEM "Amaga el faristol", ID_MOVE_HIDETRAY + MENUITEM "Fet", ID_MOVE_TURNDONE + MENUITEM "Remena", ID_MOVE_JUGGLE + MENUITEM "Canvia l'horientació", ID_MOVE_FLIP + MENUITEM "Canvia", ID_MOVE_TRADE + MENUITEM "Amaga el faristol", ID_MOVE_HIDETRAY POPUP "Desfés" BEGIN - MENUITEM "Desfés l'actual", ID_MOVE_UNDOCURRENT - MENUITEM "Desfés l'últim", ID_MOVE_UNDOLAST + MENUITEM "Desfés l'actual", ID_MOVE_UNDOCURRENT + MENUITEM "Desfés l'últim", ID_MOVE_UNDOLAST END POPUP "Pista" BEGIN - MENUITEM "Pista següent", ID_MOVE_NEXTHINT - MENUITEM "Pista", ID_MOVE_HINT + MENUITEM "Pista següent", ID_MOVE_NEXTHINT + MENUITEM "Pista", ID_MOVE_HINT #ifdef XWFEATURE_SEARCHLIMIT - MENUITEM "Límits de pistes...", ID_MOVE_LIMITEDHINT + MENUITEM "Límits de pistes...", ID_MOVE_LIMITEDHINT #endif MENUITEM SEPARATOR MENUITEM "Mostra els valors", ID_MOVE_VALUES @@ -96,26 +96,26 @@ BEGIN MENUITEM "Nombre i valor de les fitxes", ID_GAME_TILECOUNTSANDVALUES MENUITEM "Fitxes romanents", ID_GAME_TILESLEFT MENUITEM SEPARATOR - MENUITEM "Informació de la partida", ID_GAME_GAMEINFO - MENUITEM "Historial", ID_GAME_HISTORY - MENUITEM "Puntuacions finals", ID_GAME_FINALSCORES + MENUITEM "Informació de la partida", ID_GAME_GAMEINFO + MENUITEM "Historial", ID_GAME_HISTORY + MENUITEM "Puntuacions finals", ID_GAME_FINALSCORES #if defined XWFEATURE_RELAY || defined XWFEATURE_BLUETOOTH MENUITEM SEPARATOR - MENUITEM "Torna a enviar els missatges", ID_GAME_RESENDMSGS + MENUITEM "Torna a enviar els missatges", ID_GAME_RESENDMSGS #endif END POPUP "Fitxer" BEGIN - MENUITEM "Pantalla completa", ID_FILE_FULLSCREEN + MENUITEM "Pantalla completa", ID_FILE_FULLSCREEN MENUITEM SEPARATOR - MENUITEM "Partida nova...", ID_FILE_NEWGAME - MENUITEM "Partides desades...", ID_FILE_SAVEDGAMES - MENUITEM "Preferències...", ID_FILE_PREFERENCES + MENUITEM "Partida nova...", ID_FILE_NEWGAME + MENUITEM "Partides desades...", ID_FILE_SAVEDGAMES + MENUITEM "Preferències...", ID_FILE_PREFERENCES MENUITEM SEPARATOR - MENUITEM "Quant a...", ID_FILE_ABOUT + MENUITEM "Quant a...", ID_FILE_ABOUT MENUITEM SEPARATOR - MENUITEM "Surt", ID_FILE_EXIT + MENUITEM "Surt", ID_FILE_EXIT END END END @@ -264,8 +264,8 @@ BEGIN SERVERCONF_ROW,60,ROW_HEIGHT #endif - LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,63,8 - XWCOMBO(IDC_NPLAYERSCOMBO,66,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) + LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,70,8 + XWCOMBO(IDC_NPLAYERSCOMBO,74,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) LTEXT "Nom",IDC_NAMELABEL,GAME_NAMELABEL_LEFT, LABELS_ROW,GAME_NAMELABEL_WIDTH,8,SS_NOPREFIX @@ -424,7 +424,7 @@ CAPTION "Partides desades" FONT 8, "System" BEGIN LTEXT /* wince windres can't handle split lines....*/ - "Select a saved game. (Some buttons will be disabled when the current game is selected.)", + "Select a saved game. (Some buttons will be disabled when the current game is selected.)", /* translate */ IDC_SVGM_SELLAB,SVGM_LEFT_COL, SVGM_ROW_1,90,35 XWCOMBO(IDC_SVGM_GAMELIST, SVGM_LEFT_COL,SVGM_ROW_2,70,ROW_HEIGHT,LBS_SORT,58,CBS_SORT) @@ -432,6 +432,9 @@ BEGIN PUSHBUTTON "Obre",IDC_SVGM_OPEN, SVGM_LEFT_COL,SVGM_ROW_3,40,14,WS_DISABLED + /* translate: can these be shortened? Otherwise they need to be on + separate lines (which being iPhone-like looks modern and might be ok) */ + PUSHBUTTON "Duplica",IDC_SVGM_DUP, SVGM_LEFT_COL,SVGM_ROW_4,20,14,WS_DISABLED PUSHBUTTON "Suprimeix",IDC_SVGM_DEL, @@ -519,6 +522,7 @@ END #define PR_ROW6 (PR_ROW5+PR_SPACING) #define PR_ROW7 (PR_ROW6+PR_SPACING) #define PR_BUTTONROW (PR_ROW7+PR_SPACING+3) +#define PR_LEFT 6 #ifdef _WIN32_WCE # define PREFS_DLG_HT PR_BUTTONROW @@ -539,38 +543,39 @@ BEGIN /* Global */ CONTROL "Color de les fitxes jugades",IDC_CHECKCOLORPLAYED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP, - 8,PR_ROW2,80,PREFS_ROW_HT + PR_LEFT,PR_ROW2,95,PREFS_ROW_HT CONTROL "Habilita el cursor",IDC_CHECKSHOWCURSOR,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW3,80,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW3,80,PREFS_ROW_HT CONTROL "Explica la puntuació dels robots",IDC_CHECKROBOTSCORES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW4,80,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW4,95,PREFS_ROW_HT CONTROL "Amaga els valors de les lletres",IDC_HIDETILEVALUES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW5,80,PREFS_ROW_HT - PUSHBUTTON "Edita els colors...",IDC_PREFCOLORS,8,PR_ROW6,60,12 - PUSHBUTTON "Canvia la llengua...",IDC_PREFLOCALE,8,PR_ROW7,70,12 + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,95,PREFS_ROW_HT + PUSHBUTTON "Edita els colors...",IDC_PREFCOLORS,PR_LEFT,PR_ROW6,70,12 + PUSHBUTTON "Canvia la llengua...",IDC_PREFLOCALE,PR_LEFT,PR_ROW7,70,12 #ifdef ALLOW_CHOOSE_FONTS - PUSHBUTTON "Trieu el tipus de lletra...",IDC_PREFFONTS,8,PR_ROW8,60,12 + PUSHBUTTON "Trieu el tipus de lletra...",IDC_PREFFONTS,PR_LEFT,PR_ROW8,60,12 #endif /* Per game */ CONTROL "Robot intel·ligent",IDC_CHECKSMARTROBOT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,8,PR_ROW2,60, + BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,PR_LEFT,PR_ROW2,70, PREFS_ROW_HT CONTROL "Permet mostrar les pistes",IDC_CHECKHINTSOK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW3,60,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW3,95,PREFS_ROW_HT #ifdef XWFEATURE_SEARCHLIMIT CONTROL "Límit de les pistes",IDC_CHECKHINTSLIMITS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8+10,PR_ROW4-2,50,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8+10,PR_ROW4-2,85,10 #endif CONTROL "Temps (min.)",TIMER_CHECK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW5,75,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,75,PREFS_ROW_HT EDITTEXT TIMER_EDIT,85,PR_ROW5,16,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Mots fora-diccionari:",PHONIES_LABEL,8,PR_ROW6,28,PREFS_ROW_HT + /* translate: can this be shorter or does it need to be on separate row? */ + LTEXT "Mots fora-diccionari:",PHONIES_LABEL,PR_LEFT,PR_ROW6,28,PREFS_ROW_HT XWCOMBO(PHONIES_COMBO, 38,PR_ROW6,50,PREFS_ROW_HT, 0, 58, 0) #ifdef FEATURE_TRAY_EDIT CONTROL "Les fitxes es trien veient-les", IDC_PICKTILES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW7,90,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW7,95,PREFS_ROW_HT #else #endif #ifndef _WIN32_WCE