From 1425b02fd397801ab1781159d6e4aa2af808bdf2 Mon Sep 17 00:00:00 2001 From: ehouse Date: Sun, 12 Jul 2009 23:06:28 +0000 Subject: [PATCH] Tweak locations of dialog elements to fit Polish strings. Add "translate" comments where needed. --- xwords4/wince/l10n/xwords4_polish.rc | 89 ++++++++++++++-------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/xwords4/wince/l10n/xwords4_polish.rc b/xwords4/wince/l10n/xwords4_polish.rc index 155032b9f..cd3255c68 100644 --- a/xwords4/wince/l10n/xwords4_polish.rc +++ b/xwords4/wince/l10n/xwords4_polish.rc @@ -199,7 +199,7 @@ DLL_VERS_RESOURCE # define GAME_NAMELABEL_WIDTH (GAME_NAME_WIDTH-ROBOT_LABEL_ADJUST-NAME_LABEL_ADJUST) # define GAME_ROBOTLABEL_LEFT (GAME_ROBOT_LEFT-7) # define GAME_ROBOTLABEL_WIDTH (GAME_PWD_LEFT-GAME_ROBOT_LEFT+ROBOT_LABEL_ADJUST) -# define GAME_PWDLABEL_LEFT (GAME_PWD_LEFT-4) +# define GAME_PWDLABEL_LEFT (GAME_PWD_LEFT) # define GAME_PWDLABEL_WIDTH (GAMEINFO_WIDTH-GAME_PWD_LEFT) #else # define SERVERROLE_ROW 3 @@ -261,7 +261,7 @@ BEGIN #endif LTEXT "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,43,8 - XWCOMBO(IDC_NPLAYERSCOMBO,74,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) + XWCOMBO(IDC_NPLAYERSCOMBO,68,NPLAYERS_ROW,24,ROW_HEIGHT,0,58,0) PUSHBUTTON "Miesz.",GIJUGGLE_BUTTON,75,NPLAYERS_ROW,20,ROW_HEIGHT @@ -419,12 +419,12 @@ BEGIN XWCOMBO(IDC_SVGM_GAMELIST, SVGM_LEFT_COL,SVGM_ROW_2,70,ROW_HEIGHT,LBS_SORT,58,CBS_SORT) PUSHBUTTON "Otwórz",IDC_SVGM_OPEN, - SVGM_LEFT_COL,SVGM_ROW_3,40,14,WS_DISABLED + SVGM_LEFT_COL,SVGM_ROW_3,32,14,WS_DISABLED PUSHBUTTON "Kopia",IDC_SVGM_DUP, - SVGM_LEFT_COL,SVGM_ROW_4,20,14,WS_DISABLED + SVGM_LEFT_COL,SVGM_ROW_4,26,14,WS_DISABLED PUSHBUTTON "Usuń",IDC_SVGM_DEL, - SVGM_LEFT_COL+22,SVGM_ROW_4,28,14,WS_DISABLED + SVGM_LEFT_COL+28,SVGM_ROW_4,22,14,WS_DISABLED PUSHBUTTON "Zmień",IDC_SVGM_CHANGE, SVGM_LEFT_COL+52,SVGM_ROW_4,32,14,WS_DISABLED @@ -520,45 +520,45 @@ CAPTION "Ustawienia" FONT 8, "System" BEGIN CONTROL "Bieżąca gra",IDC_RADIOLOCAL,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,4,PR_ROW1,47,10 + BS_AUTORADIOBUTTON | WS_GROUP,0,PR_ROW1,44,10 CONTROL "Wszystkie gry",IDC_RADIOGLOBAL,"Button", - BS_AUTORADIOBUTTON,52,PR_ROW1,53,10 + BS_AUTORADIOBUTTON,44,PR_ROW1,56,10 /* Global */ CONTROL "Koloruj używane klocki ",IDC_CHECKCOLORPLAYED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP, - 8,PR_ROW2,80,PREFS_ROW_HT + 4,PR_ROW2,85,PREFS_ROW_HT CONTROL "Włącz kursor",IDC_CHECKSHOWCURSOR,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW3,80,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,4,PR_ROW3,80,PREFS_ROW_HT CONTROL "Wyjaśniaj punkty robotów",IDC_CHECKROBOTSCORES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW4,80,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,4,PR_ROW4,90,PREFS_ROW_HT CONTROL "Ukryj wartość klocków",IDC_HIDETILEVALUES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW5,80,PREFS_ROW_HT - PUSHBUTTON "Ustaw kolory...",IDC_PREFCOLORS,8,PR_ROW6,60,12 - PUSHBUTTON "Change language...",IDC_PREFLOCALE,8,PR_ROW7,70,12 + BS_AUTOCHECKBOX | WS_TABSTOP,4,PR_ROW5,82,PREFS_ROW_HT + PUSHBUTTON "Ustaw kolory...",IDC_PREFCOLORS,4,PR_ROW6,60,12 + PUSHBUTTON "Change language...",IDC_PREFLOCALE,4,PR_ROW7,70,12 /* translate */ #ifdef ALLOW_CHOOSE_FONTS - PUSHBUTTON "Wybierz font...",IDC_PREFFONTS,8,PR_ROW7,60,12 + PUSHBUTTON "Wybierz font...",IDC_PREFFONTS,4,PR_ROW7,60,12 #endif /* Per game */ CONTROL "Mądry robot",IDC_CHECKSMARTROBOT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,8,PR_ROW2,60, + BS_AUTOCHECKBOX | WS_TABSTOP | WS_GROUP,4,PR_ROW2,60, PREFS_ROW_HT CONTROL "Włącz podpowiedzi",IDC_CHECKHINTSOK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW3,60,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,4,PR_ROW3,80,PREFS_ROW_HT #ifdef XWFEATURE_SEARCHLIMIT CONTROL "Ogranicz podp.",IDC_CHECKHINTSLIMITS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8+10,PR_ROW4-2,50,10 + BS_AUTOCHECKBOX | WS_TABSTOP,8+10,PR_ROW4-2,60,10 #endif CONTROL "Włącz zegar (minuty)",TIMER_CHECK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW5,75,PREFS_ROW_HT - EDITTEXT TIMER_EDIT,85,PR_ROW5,16,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Zmyślone:",PHONIES_LABEL,8,PR_ROW6,28,PREFS_ROW_HT - XWCOMBO(PHONIES_COMBO, 38,PR_ROW6,50,PREFS_ROW_HT,0,58,0) + BS_AUTOCHECKBOX | WS_TABSTOP,4,PR_ROW5,74,PREFS_ROW_HT + EDITTEXT TIMER_EDIT,79,PR_ROW5,16,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Zmyślone:",PHONIES_LABEL,4,PR_ROW6,32,PREFS_ROW_HT + XWCOMBO(PHONIES_COMBO, 42,PR_ROW6,40,PREFS_ROW_HT,0,58,0) #ifdef FEATURE_TRAY_EDIT CONTROL "Pokaż awers klocków", IDC_PICKTILES, "Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,PR_ROW7,90,PREFS_ROW_HT + BS_AUTOCHECKBOX | WS_TABSTOP,4,PR_ROW7,90,PREFS_ROW_HT #else #endif #ifndef _WIN32_WCE @@ -665,13 +665,13 @@ END #define CLR_ROW_5 (CLR_ROW_4+CLR_LRG_GAP) #define CLR_ROW_6 (CLR_ROW_5+CLR_SMALL_GAP) #define CLR_ROW_7 (CLR_ROW_6+CLR_SMALL_GAP) -#define CLR_ROW_8 (CLR_ROW_7+CLR_LRG_GAP) +#define CLR_ROW_8 (CLR_ROW_7+CLR_LRG_GAP+5) #define CLR_ROW_9 (CLR_ROW_8+CLR_SMALL_GAP) #define CLR_ROW_10 (CLR_ROW_9+CLR_SMALL_GAP) #define CLR_ROW_11 (CLR_ROW_10+CLR_SMALL_GAP) #define CLR_BUTTON_ROW CLR_ROW_11 + CLR_LRG_GAP -#define CLR_COL_1 7 +#define CLR_COL_1 4 #define CLR_COL_2 (CLR_COL_1 + CLR_LAB_WIDTH+2) /* #define CLR_COL_3 58 */ /* #define CLR_COL_4 99 */ @@ -683,8 +683,8 @@ END # define COLORSDLG_HT CLR_BUTTON_ROW + BUTTON_HT + 3 #endif -#define COLOR_BUTTON(txt,id,xx,yy) \ - LTEXT txt,id,xx,yy,CLR_LAB_WIDTH,CLR_LAB_HT +#define COLOR_BUTTON(txt,id,xx,yy,ht) \ + LTEXT txt,id,xx,yy,CLR_LAB_WIDTH,ht /* Hack alert. Smartphone isn't delivering WM_COMMAND events for clicks on BS_OWNERDRAW buttons, and WinMo (PPC and Smartphone) won't deliver WM_DRAWITEM events for SS_OWNERDRAW static @@ -693,36 +693,37 @@ END and have a separate button to trigger the edit dialog. */ #define COLOR_SAMPLE(id1,id2,xx,yy) \ PUSHBUTTON "",id2,xx,yy,CLR_BUT_WIDTH,CLR_BUT_HT,BS_OWNERDRAW \ - PUSHBUTTON "Edycja",id1,xx+CLR_SAMPLE_WIDTH+4,yy,20,CLR_BUT_HT,BS_NOTIFY + PUSHBUTTON "Edycja",id1,xx+CLR_SAMPLE_WIDTH+4,yy,26,CLR_BUT_HT,BS_NOTIFY IDD_COLORSDLG DIALOG DISCARDABLE 0, 20, CLR_WIDTH, COLORSDLG_HT STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER | WS_VSCROLL CAPTION "Ustawienia kolorów" FONT 8, "System" BEGIN - COLOR_BUTTON("Litera x2:",DLBLTR_LABEL,CLR_COL_1,CLR_ROW_1) + COLOR_BUTTON("Litera x2:",DLBLTR_LABEL,CLR_COL_1,CLR_ROW_1,CLR_LAB_HT) COLOR_SAMPLE(DLBLTR_BUTTON,DLBLTR_SAMPLE,CLR_COL_2,CLR_ROW_1) - COLOR_BUTTON("Słowo x2:",DBLWRD_LABEL,CLR_COL_1,CLR_ROW_2 ) + COLOR_BUTTON("Słowo x2:",DBLWRD_LABEL,CLR_COL_1,CLR_ROW_2,CLR_LAB_HT ) COLOR_SAMPLE(DBLWRD_BUTTON,DBLWRD_SAMPLE,CLR_COL_2,CLR_ROW_2) - COLOR_BUTTON("Litera x3:",TPLLTR_LABEL,CLR_COL_1,CLR_ROW_3 ) + COLOR_BUTTON("Litera x3:",TPLLTR_LABEL,CLR_COL_1,CLR_ROW_3,CLR_LAB_HT ) COLOR_SAMPLE(TPLLTR_BUTTON,TPLLTR_SAMPLE,CLR_COL_2,CLR_ROW_3) - COLOR_BUTTON("Słowo x3:",TPLWRD_LABEL,CLR_COL_3,CLR_ROW_4) + COLOR_BUTTON("Słowo x3:",TPLWRD_LABEL,CLR_COL_3,CLR_ROW_4,CLR_LAB_HT) COLOR_SAMPLE(TPLWRD_BUTTON,TPLWRD_SAMPLE,CLR_COL_4,CLR_ROW_4) - COLOR_BUTTON("Pusta:",EMPCELL_LABEL,CLR_COL_1,CLR_ROW_5) + COLOR_BUTTON("Pusta:",EMPCELL_LABEL,CLR_COL_1,CLR_ROW_5,CLR_LAB_HT) COLOR_SAMPLE(EMPCELL_BUTTON,EMPCELL_SAMPLE,CLR_COL_2,CLR_ROW_5) - COLOR_BUTTON("Rewers klocka:",TBACK_LABEL,CLR_COL_3,CLR_ROW_6) + COLOR_BUTTON("Rewers klocka:",TBACK_LABEL,CLR_COL_3,CLR_ROW_6,CLR_LAB_HT) COLOR_SAMPLE(TBACK_BUTTON,TBACK_SAMPLE,CLR_COL_4,CLR_ROW_6) - COLOR_BUTTON("Kolor wybranego:",FOCUSCLR_LABEL,CLR_COL_1,CLR_ROW_7) - COLOR_SAMPLE(FOCUSCLR_BUTTON,FOCUSCLR_SAMPLE,CLR_COL_2,CLR_ROW_7) - COLOR_BUTTON("Gracz 1:",PLAYER1_LABEL,CLR_COL_1,CLR_ROW_8) + COLOR_BUTTON("Kolor wybranego:",FOCUSCLR_LABEL,CLR_COL_1,CLR_ROW_7, + CLR_LAB_HT+10) + COLOR_SAMPLE(FOCUSCLR_BUTTON,FOCUSCLR_SAMPLE,CLR_COL_2,CLR_ROW_7+5) + COLOR_BUTTON("Gracz 1:",PLAYER1_LABEL,CLR_COL_1,CLR_ROW_8,CLR_LAB_HT) COLOR_SAMPLE(PLAYER1_BUTTON,PLAYER1_SAMPLE,CLR_COL_2,CLR_ROW_8) - COLOR_BUTTON("Gracz 2:",PLAYER2_LABEL,CLR_COL_3,CLR_ROW_9) + COLOR_BUTTON("Gracz 2:",PLAYER2_LABEL,CLR_COL_3,CLR_ROW_9,CLR_LAB_HT) COLOR_SAMPLE(PLAYER2_BUTTON,PLAYER2_SAMPLE,CLR_COL_4,CLR_ROW_9) - COLOR_BUTTON("Gracz 3:",PLAYER3_LABEL,CLR_COL_1,CLR_ROW_10) + COLOR_BUTTON("Gracz 3:",PLAYER3_LABEL,CLR_COL_1,CLR_ROW_10,CLR_LAB_HT) COLOR_SAMPLE(PLAYER3_BUTTON,PLAYER3_SAMPLE,CLR_COL_2,CLR_ROW_10) - COLOR_BUTTON("Gracz 4:",PLAYER4_LABEL,CLR_COL_3,CLR_ROW_11) + COLOR_BUTTON("Gracz 4:",PLAYER4_LABEL,CLR_COL_3,CLR_ROW_11,CLR_LAB_HT) COLOR_SAMPLE(PLAYER4_BUTTON,PLAYER4_SAMPLE,CLR_COL_4,CLR_ROW_11) #ifndef _WIN32_WCE @@ -856,10 +857,10 @@ BEGIN IDS_TURN_SCORE "punktacja za kolejkę: %d" XP_CR IDS_COMMIT_CONFIRM "wykonać ruch?" XP_CR IDS_LOCAL_NAME "%s" - IDS_REM "Rem" - IDS_IGNORE_L "Ignore" - IDS_WARN_L "Warn" - IDS_DISALLOW_L "Disallow" + IDS_REM "Rem" /* translate? Short for "remaining" */ + IDS_IGNORE_L "Ignore" /* translate */ + IDS_WARN_L "Warn" /* translate */ + IDS_DISALLOW_L "Disallow" /* translate */ IDS_NONLOCAL_NAME "%s (zdalne)" IDS_TIME_PENALTY_SUB " - %d [czas]" IDS_CUMULATIVE_SCORE "wynik kumulowany: %d" XP_CR @@ -880,7 +881,7 @@ BEGIN #ifndef XWFEATURE_STANDALONE_ONLY IDS_LOCALPLAYERS "lokalni gracze:" #endif - IDS_TOTALPLAYERS "ilość graczy:" + IDS_TOTALPLAYERS "Ilość graczy:" IDS_VALUES_HEADER "%s liczone/wartości:" XP_CR IDS_QUERY_TRADE "Na pewno wymienić wybrane literki?" IDS_DOUBLE_LETTER "Litera x2"