From 81d41a621f74f304a4561f4c2a8b10376d3fa892 Mon Sep 17 00:00:00 2001 From: ehouse Date: Wed, 16 Dec 2009 02:48:27 +0000 Subject: [PATCH] fix connsdlg: resize, respace and for French ifdef out unsupported choices (to match other .rc files) --- xwords4/wince/l10n/xwords4_catalan.rc | 22 +++++--- xwords4/wince/l10n/xwords4_czech.rc | 59 ++++++++++++---------- xwords4/wince/l10n/xwords4_english.rc | 72 +++++++++++++++------------ xwords4/wince/l10n/xwords4_french.rc | 42 +++++++++++----- xwords4/wince/l10n/xwords4_polish.rc | 44 +++++++++------- 5 files changed, 143 insertions(+), 96 deletions(-) diff --git a/xwords4/wince/l10n/xwords4_catalan.rc b/xwords4/wince/l10n/xwords4_catalan.rc index 7df3ad05e..873b75136 100644 --- a/xwords4/wince/l10n/xwords4_catalan.rc +++ b/xwords4/wince/l10n/xwords4_catalan.rc @@ -600,7 +600,8 @@ END # define LAB_COL_WIDTH 38 # define CTRL_COL 15 # define CTRL_COL_WIDTH 80 -# define CONN_LABEL_HT (LABEL_ROW_HT*3) /* try to make them all same ht! */ +# define CONN_LABEL_HT LABEL_ROW_HT /* try to make them all same ht! */ +# define CONN_HELP_HT 25 # define CONN_LABEL_ROW_1 2 # define CONN_EDIT_ROW_2 (CONN_LABEL_ROW_1+ROW_SPACE) # ifdef NEEDS_CHOOSE_CONNTYPE @@ -608,16 +609,16 @@ END # define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE+ROW_HEIGHT) # else # define CONN_LABEL_ROW_3 (CONN_LABEL_ROW_1) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+CONN_LABEL_HT+3) +# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE) # endif # ifndef RELAY_NOEDIT_ADDR -# define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+ROW_SPACE+5) +# define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+CONN_HELP_HT+5) # define CONN_EDIT_ROW_6 (CONN_LABEL_ROW_5+CONN_LABEL_HT+3) # define CONN_LABEL_ROW_7 (CONN_EDIT_ROW_6+ROW_SPACE+5) # define CONN_EDIT_ROW_8 (CONN_LABEL_ROW_7+CONN_LABEL_HT+3) # define BUTTON_ROW (CONN_EDIT_ROW_8+ROW_SPACE) #else -# define BUTTON_ROW (CONN_EDIT_ROW_4+ROW_SPACE) +# define BUTTON_ROW (CONN_EDIT_ROW_4+CONN_HELP_HT) #endif #ifdef _WIN32_WCE # define CONNSDLG_HT BUTTON_ROW @@ -639,10 +640,17 @@ BEGIN 0,58,0) #endif #if defined XWFEATURE_RELAY - LTEXT "Sala (ha de coincidir en tots els dispositius que s'uneixin a la partida):", - IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,90,CONN_LABEL_HT - EDITTEXT INVITE_EDIT,CTRL_COL,CONN_EDIT_ROW_4,CTRL_COL_WIDTH, + LTEXT "Sala:", + IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,23,CONN_LABEL_HT + EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_LABEL_ROW_3,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL + LTEXT "(As host, you name the room for the game, and must " + "connect first.)", + IDC_INVITE_HELP_HOST,LAB_COL,CONN_EDIT_ROW_4,110,CONN_HELP_HT + LTEXT "(As guest, wait for the host to connect then tell you " + "the room name.)", + IDC_INVITE_HELP_GUEST,LAB_COL,CONN_EDIT_ROW_4,100,CONN_HELP_HT + # ifndef RELAY_NOEDIT_ADDR LTEXT "Nom del repetidor (canvia poques vegades):", IDC_CRELAYNAME_LAB,LAB_COL,CONN_LABEL_ROW_5,90,CONN_LABEL_HT diff --git a/xwords4/wince/l10n/xwords4_czech.rc b/xwords4/wince/l10n/xwords4_czech.rc index a2b0ffaa4..87f9e88cd 100755 --- a/xwords4/wince/l10n/xwords4_czech.rc +++ b/xwords4/wince/l10n/xwords4_czech.rc @@ -601,23 +601,24 @@ END # define CTRL_COL 15 # define CTRL_COL_WIDTH 80 # define CONN_LABEL_HT (LABEL_ROW_HT*2) /* try to make them all same ht! */ -# define CONN_LABEL_ROW_1 2 -# define CONN_EDIT_ROW_2 (CONN_LABEL_ROW_1+ROW_SPACE) +# define CONN_HELP_HT 25 +# define CONN_ROW_1 2 +# define CONN_ROW_2 (CONN_ROW_1+ROW_SPACE) # ifdef NEEDS_CHOOSE_CONNTYPE -# define CONN_LABEL_ROW_3 (CONN_EDIT_ROW_2+ROW_SPACE) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE+ROW_HEIGHT) +# define CONN_ROW_3 (CONN_ROW_2+ROW_SPACE) +# define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE+ROW_HEIGHT) # else -# define CONN_LABEL_ROW_3 (CONN_LABEL_ROW_1) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+CONN_LABEL_HT+3) +# define CONN_ROW_3 (CONN_ROW_1) +# define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE) # endif # ifndef RELAY_NOEDIT_ADDR -# define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+ROW_SPACE+5) -# define CONN_EDIT_ROW_6 (CONN_LABEL_ROW_5+CONN_LABEL_HT+3) -# define CONN_LABEL_ROW_7 (CONN_EDIT_ROW_6+ROW_SPACE+5) -# define CONN_EDIT_ROW_8 (CONN_LABEL_ROW_7+CONN_LABEL_HT+3) -# define BUTTON_ROW (CONN_EDIT_ROW_8+ROW_SPACE) +# define CONN_ROW_5 (CONN_ROW_4+CONN_HELP_HT+5) +# define CONN_ROW_6 (CONN_ROW_5+CONN_LABEL_HT+3) +# define CONN_ROW_7 (CONN_ROW_6+ROW_SPACE+5) +# define CONN_ROW_8 (CONN_ROW_7+CONN_LABEL_HT+3) +# define BUTTON_ROW (CONN_ROW_8+ROW_SPACE) #else -# define BUTTON_ROW (CONN_EDIT_ROW_4+ROW_SPACE) +# define BUTTON_ROW (CONN_ROW_4+CONN_HELP_HT) #endif #ifdef _WIN32_WCE # define CONNSDLG_HT BUTTON_ROW @@ -633,25 +634,31 @@ FONT 4, "System" BEGIN #ifdef NEEDS_CHOOSE_CONNTYPE - LTEXT "Spojit přes:",IDC_CCONVIA_LAB,LAB_COL,CONN_LABEL_ROW_1, + LTEXT "Spojit přes:",IDC_CCONVIA_LAB,LAB_COL,CONN_ROW_1, 40,ROW_HEIGHT - XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_EDIT_ROW_2,CTRL_COL_WIDTH, + XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH, ROW_HEIGHT,0,58,0) #endif #if defined XWFEATURE_RELAY - LTEXT "Místnost (musí být stejná pro všechny účastníky hry):", - IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,90,CONN_LABEL_HT - EDITTEXT INVITE_EDIT,CTRL_COL,CONN_EDIT_ROW_4,CTRL_COL_WIDTH, + LTEXT "Místnost:", + IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,23,CONN_LABEL_HT + EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_ROW_3,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL + LTEXT "(As host, you name the room for the game, and must " + "connect first.)", /* translate */ + IDC_INVITE_HELP_HOST,LAB_COL,CONN_ROW_4,110,CONN_HELP_HT + LTEXT "(As guest, wait for the host to connect then tell you " + "the room name.)", /* translate */ + IDC_INVITE_HELP_GUEST,LAB_COL,CONN_ROW_4,100,CONN_HELP_HT #ifndef RELAY_NOEDIT_ADDR LTEXT "Název přenosu (málokdy změněno):",IDC_CRELAYNAME_LAB, - LAB_COL,CONN_LABEL_ROW_5,90,CONN_LABEL_HT - EDITTEXT RELAYNAME_EDIT,CTRL_COL,CONN_EDIT_ROW_6,CTRL_COL_WIDTH, + LAB_COL,CONN_ROW_5,90,CONN_LABEL_HT + EDITTEXT RELAYNAME_EDIT,CTRL_COL,CONN_ROW_6,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL LTEXT "Port přenosu (málokdy změněn):",IDC_CRELAYPORT_LAB,LAB_COL, - CONN_LABEL_ROW_7,90,CONN_LABEL_HT - EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_EDIT_ROW_8,CTRL_COL_WIDTH, + CONN_ROW_7,90,CONN_LABEL_HT + EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER #endif #elif defined NEEDS_CHOOSE_CONNTYPE @@ -666,20 +673,20 @@ BEGIN ES_AUTOHSCROLL #elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Přímé IP spojení není podporováno.",IDC_IPNAME_LAB,LAB_COL, - CONN_LABEL_ROW_3,40,40 + CONN_ROW_3,40,40 #endif #if defined XWFEATURE_SMS - LTEXT "Telefon hostitele:",IDC_SMS_PHONE_LAB,LAB_COL,CONN_LABEL_ROW_3,60, + LTEXT "Telefon hostitele:",IDC_SMS_PHONE_LAB,LAB_COL,CONN_ROW_3,60, ROW_HEIGHT - EDITTEXT IDC_SMS_PHONE_EDIT,CTRL_COL,CONN_EDIT_ROW_4,CTRL_COL_WIDTH, + EDITTEXT IDC_SMS_PHONE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Port hostitele:",IDC_SMS_PORT_LAB,LAB_COL,CONN_ROW_5,60,ROW_HEIGHT EDITTEXT IDC_SMS_PORT_EDIT,CTRL_COL,CONN_ROW_6,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER #elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Krátké zprávy nejsou podporovány.", - IDC_SMS_PHONE_LAB,LAB_COL,CONN_LABEL_ROW_3,40,ROW_HEIGHT + IDC_SMS_PHONE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT #endif #ifndef _WIN32_WCE @@ -979,7 +986,7 @@ BEGIN IDS_ROLE_STANDALONE "Samostatný" IDS_ROLE_HOST "Hostitel" /* translate (confirm: "host") */ - IDS_ROLE_GUEST "Host" /* translate (confirm: "guest") */ + IDS_ROLE_GUEST "Guest" /* translate (confirm: "guest") */ IDS_PLAYER_FORMAT "Hráč %d" IDS_UNTITLED_FORMAT "Neoznačený %d" IDS_PASSWDFMT_L "Vložte heslo pro %ls:" diff --git a/xwords4/wince/l10n/xwords4_english.rc b/xwords4/wince/l10n/xwords4_english.rc index 57834505a..fe65b0940 100755 --- a/xwords4/wince/l10n/xwords4_english.rc +++ b/xwords4/wince/l10n/xwords4_english.rc @@ -598,25 +598,26 @@ END # define LAB_COL_WIDTH 38 # define CTRL_COL 15 # define CTRL_COL_WIDTH 80 -# define CONN_LABEL_HT (LABEL_ROW_HT*2) /* try to make them all same ht! */ +# define CONN_LABEL_HT (LABEL_ROW_HT) /* try to make them all same ht! */ # define CONN_HELP_HT 25 -# define CONN_LABEL_ROW_1 2 -# define CONN_EDIT_ROW_2 (CONN_LABEL_ROW_1+ROW_SPACE) +# define CONN_ROW_1 2 +# define CONN_ROW_2 (CONN_ROW_1+ROW_SPACE) # ifdef NEEDS_CHOOSE_CONNTYPE -# define CONN_LABEL_ROW_3 (CONN_EDIT_ROW_2+ROW_SPACE) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE+ROW_HEIGHT) +# define CONN_ROW_3 (CONN_ROW_2+ROW_SPACE) +# define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE+ROW_HEIGHT) # else -# define CONN_LABEL_ROW_3 (CONN_LABEL_ROW_1) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE) +# define CONN_ROW_3 (CONN_ROW_1) +# define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE) # endif # ifndef RELAY_NOEDIT_ADDR -# define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+CONN_HELP_HT+5) -# define CONN_EDIT_ROW_6 (CONN_LABEL_ROW_5+CONN_LABEL_HT+3) -# define CONN_LABEL_ROW_7 (CONN_EDIT_ROW_6+ROW_SPACE+5) -# define CONN_EDIT_ROW_8 (CONN_LABEL_ROW_7+CONN_LABEL_HT+3) -# define BUTTON_ROW (CONN_EDIT_ROW_8+ROW_SPACE) +# define CONN_ROW_5 (CONN_ROW_4+CONN_HELP_HT+5) +# define CONN_ROW_6 (CONN_ROW_5+CONN_LABEL_HT+3) +# define CONN_ROW_7 (CONN_ROW_6+ROW_SPACE+5) +# define CONN_ROW_8 (CONN_ROW_7+CONN_HELP_HT+3) +# define CONN_ROW_9 (CONN_ROW_8+CONN_LABEL_HT+3) +# define BUTTON_ROW (CONN_ROW_9+CONN_HELP_HT) # else -# define BUTTON_ROW (CONN_EDIT_ROW_4+CONN_HELP_HT) +# define BUTTON_ROW (CONN_ROW_4+CONN_HELP_HT) #endif #ifdef _WIN32_WCE @@ -633,30 +634,37 @@ FONT 8, "System" BEGIN #ifdef NEEDS_CHOOSE_CONNTYPE - LTEXT "Connect via:",IDC_CCONVIA_LAB,LAB_COL,CONN_LABEL_ROW_1, + LTEXT "Connect via:",IDC_CCONVIA_LAB,LAB_COL,CONN_ROW_1, 40,ROW_HEIGHT - XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_EDIT_ROW_2,60,ROW_HEIGHT,0,58,0) + XWCOMBO(IDC_CONNECT_COMBO,CTRL_COL,CONN_ROW_2,60,ROW_HEIGHT,0,58,0) #endif #if defined XWFEATURE_RELAY LTEXT "Room:", - IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,23,CONN_LABEL_HT - EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_LABEL_ROW_3,CTRL_COL_WIDTH, + IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,23,CONN_LABEL_HT + EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_ROW_3,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL - LTEXT "(As host, you name the room for the game, and must connect first.)", - IDC_INVITE_HELP_HOST,LAB_COL,CONN_EDIT_ROW_4,110,CONN_HELP_HT - LTEXT "(As guest, wait for the host to connect then tell you the room name.)", - IDC_INVITE_HELP_GUEST,LAB_COL,CONN_EDIT_ROW_4,100,CONN_HELP_HT - + LTEXT "(As host, you name the room for the game, and must " + "connect first.)", + IDC_INVITE_HELP_HOST,LAB_COL,CONN_ROW_4,110,CONN_HELP_HT + LTEXT "(As guest, wait for the host to connect then tell you " + "the room name.)", + IDC_INVITE_HELP_GUEST,LAB_COL,CONN_ROW_4,100,CONN_HELP_HT #ifndef RELAY_NOEDIT_ADDR - LTEXT "Relay name (rarely changes):",IDC_CRELAYNAME_LAB, - LAB_COL,CONN_LABEL_ROW_5,90,CONN_LABEL_HT - EDITTEXT RELAYNAME_EDIT,CTRL_COL,CONN_EDIT_ROW_6,CTRL_COL_WIDTH, + LTEXT "Relay name:",IDC_CRELAYNAME_LAB, + LAB_COL,CONN_ROW_5,30,CONN_LABEL_HT + EDITTEXT RELAYNAME_EDIT,LAB_COL+30,CONN_ROW_5,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL - LTEXT "Relay port (rarely changes):",IDC_CRELAYPORT_LAB,LAB_COL, - CONN_LABEL_ROW_7,90,CONN_LABEL_HT - EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_EDIT_ROW_8,CTRL_COL_WIDTH, +/* LTEXT "(This should be eehouse.org unless you really know what you're doing)", */ +/* IDC_INVITE_HELP_RELAY,LAB_COL,CONN_ROW_6,110,CONN_HELP_HT */ + + + LTEXT "Relay port:",IDC_CRELAYPORT_LAB,LAB_COL,CONN_ROW_8, + 30,CONN_LABEL_HT + EDITTEXT RELAYPORT_EDIT,LAB_COL+30,CONN_ROW_8,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER +/* LTEXT "(This should be 10999 unless you really know what you're doing)", */ +/* IDC_INVITE_HELP_PORT,LAB_COL,CONN_ROW_9,110,CONN_HELP_HT */ #endif #elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Relay connection not supported.",IDC_INVITE_LAB,LAB_COL, @@ -670,20 +678,20 @@ BEGIN ES_AUTOHSCROLL #elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Direct IP connection not supported.",IDC_IPNAME_LAB,LAB_COL, - CONN_LABEL_ROW_3,40,40 + CONN_ROW_3,40,40 #endif #if defined XWFEATURE_SMS - LTEXT "Host Phone:",IDC_SMS_PHONE_LAB,LAB_COL,CONN_LABEL_ROW_3,60, + LTEXT "Host Phone:",IDC_SMS_PHONE_LAB,LAB_COL,CONN_ROW_3,60, ROW_HEIGHT - EDITTEXT IDC_SMS_PHONE_EDIT,CTRL_COL,CONN_EDIT_ROW_4,CTRL_COL_WIDTH, + EDITTEXT IDC_SMS_PHONE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER LTEXT "Host Port:",IDC_SMS_PORT_LAB,LAB_COL,CONN_ROW_5,60,ROW_HEIGHT EDITTEXT IDC_SMS_PORT_EDIT,CTRL_COL,CONN_ROW_6,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER #elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Texting not supported.", - IDC_SMS_PHONE_LAB,LAB_COL,CONN_LABEL_ROW_3,40,ROW_HEIGHT + IDC_SMS_PHONE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT #endif #ifndef _WIN32_WCE diff --git a/xwords4/wince/l10n/xwords4_french.rc b/xwords4/wince/l10n/xwords4_french.rc index d491e369a..af8d2ef66 100644 --- a/xwords4/wince/l10n/xwords4_french.rc +++ b/xwords4/wince/l10n/xwords4_french.rc @@ -179,15 +179,20 @@ DLL_VERS_RESOURCE #define REPOS_BUTTON_WIDTH 32 #define REPOS_BUTTON_VPAD 2 #define REPOS_BUTTON_HPAD 2 +/* How tall does a single line of label text turn out to be */ +# define LABEL_ROW_HT 10 +#ifdef CEFEATURE_CANSCROLL +# define ROW_HEIGHT 11 +#else +# define ROW_HEIGHT 12 +#endif // ******** IDD_GAMEINFO DIALOG ********* #define GAMEINFO_WIDTH 116 #ifdef CEFEATURE_CANSCROLL -# define ROW_HEIGHT 10 # define ROW_SPACE 12 # define ROW_SPACE_PL 11 #else -# define ROW_HEIGHT 12 # define ROW_SPACE 15 # define ROW_SPACE_PL ROW_SPACE #endif @@ -546,8 +551,8 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW5,80,PREFS_ROW_HT CONTROL "Cacher valeur des lettres",IDC_HIDETILEVALUES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,PR_LEFT,PR_ROW6,87,PREFS_ROW_HT - PUSHBUTTON "Editer les couleurs...",IDC_PREFCOLORS,PR_LEFT,PR_ROW7,70,12 - PUSHBUTTON "Changer la langue...",IDC_PREFLOCALE,PR_LEFT,PR_ROW8,70,12 // <-translate + PUSHBUTTON "Editer les couleurs...",IDC_PREFCOLORS,PR_LEFT,PR_ROW7,75,12 + PUSHBUTTON "Changer la langue...",IDC_PREFLOCALE,PR_LEFT,PR_ROW8,75,12 // <-translate #ifdef ALLOW_CHOOSE_FONTS PUSHBUTTON "Choisir une police...",IDC_PREFFONTS,PR_LEFT,PR_ROW9,60,12 #endif @@ -587,6 +592,8 @@ END # define LAB_COL_WIDTH 38 # define CTRL_COL 15 # define CTRL_COL_WIDTH 80 +# define CONN_LABEL_HT (LABEL_ROW_HT) /* try to make them all same ht! */ +# define CONN_HELP_HT 25 # define CONN_ROW_1 2 # define CONN_ROW_2 (CONN_ROW_1+ROW_SPACE) # ifdef NEEDS_CHOOSE_CONNTYPE @@ -594,16 +601,16 @@ END # define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE+ROW_HEIGHT) # else # define CONN_ROW_3 (CONN_ROW_1) -# define CONN_ROW_4 (CONN_ROW_2+ROW_SPACE) +# define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE) # endif # ifndef RELAY_NOEDIT_ADDR -# define CONN_ROW_5 (CONN_ROW_4+ROW_SPACE) +# define CONN_ROW_5 (CONN_ROW_4+CONN_HELP_HT+5) # define CONN_ROW_6 (CONN_ROW_5+ROW_SPACE) # define CONN_ROW_7 (CONN_ROW_6+ROW_SPACE) # define CONN_ROW_8 (CONN_ROW_7+ROW_SPACE) # define BUTTON_ROW (CONN_ROW_8+ROW_SPACE) # else -# define BUTTON_ROW (CONN_ROW_4+ROW_SPACE) +# define BUTTON_ROW (CONN_ROW_4+CONN_HELP_HT) # endif #ifdef _WIN32_WCE # define CONNSDLG_HT BUTTON_ROW @@ -622,9 +629,18 @@ BEGIN XWCOMBO(IDC_CONNECT_COMBO, CTRL_COL,CONN_ROW_2,CTRL_COL_WIDTH,ROW_HEIGHT,0,58,0) #endif #ifdef XWFEATURE_RELAY - LTEXT "Room:",IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT // <- translate - EDITTEXT INVITE_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT, - ES_AUTOHSCROLL + LTEXT "Room:", + IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,23,CONN_LABEL_HT // <- translate + EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_ROW_3,CTRL_COL_WIDTH, + ROW_HEIGHT,ES_AUTOHSCROLL + + LTEXT "(As host, you name the room for the game, and must " + "connect first.)", /* translate */ + IDC_INVITE_HELP_HOST,LAB_COL,CONN_ROW_4,110,CONN_HELP_HT + LTEXT "(As guest, wait for the host to connect then tell you " + "the room name.)", /* translate */ + IDC_INVITE_HELP_GUEST,LAB_COL,CONN_ROW_4,100,CONN_HELP_HT + # ifndef RELAY_NOEDIT_ADDR LTEXT "Nom du relai (change rarement):",IDC_CRELAYNAME_LAB, LAB_COL,CONN_ROW_5,120,ROW_HEIGHT @@ -635,7 +651,7 @@ BEGIN EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL | ES_NUMBER # endif -#else +#elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Connexion non supportée.",IDC_INVITE_LAB, LAB_COL,CONN_ROW_3,40,40 #endif @@ -644,7 +660,7 @@ BEGIN LTEXT "Nom et adresse de l'hôte",IDC_IPNAME_LAB, LAB_COL,CONN_ROW_3,100,ROW_HEIGHT EDITTEXT IPNAME_EDIT,CTRL_COL,CONN_ROW_4,CTRL_COL_WIDTH,ROW_HEIGHT,ES_AUTOHSCROLL -#else +#elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "Connexion IP directe non supportée.",IDC_IPNAME_LAB, LAB_COL,CONN_ROW_3,40,40 #endif @@ -656,7 +672,7 @@ BEGIN LTEXT "Port hôte:",IDC_SMS_PORT_LAB,LAB_COL,CONN_ROW_5,60,ROW_HEIGHT EDITTEXT IDC_SMS_PORT_EDIT,CTRL_COL,CONN_ROW_6,CTRL_COL_WIDTH,ROW_HEIGHT, ES_AUTOHSCROLL | ES_NUMBER -#else +#elif defined NEEDS_CHOOSE_CONNTYPE LTEXT "SMS non supporté.", IDC_SMS_PHONE_LAB,LAB_COL,CONN_ROW_3,40,ROW_HEIGHT #endif diff --git a/xwords4/wince/l10n/xwords4_polish.rc b/xwords4/wince/l10n/xwords4_polish.rc index f7a7252f2..bee83a596 100644 --- a/xwords4/wince/l10n/xwords4_polish.rc +++ b/xwords4/wince/l10n/xwords4_polish.rc @@ -595,23 +595,24 @@ END # define CTRL_COL 15 # define CTRL_COL_WIDTH 80 # define CONN_LABEL_HT (LABEL_ROW_HT*1) /* try to make them all same ht! */ -# define CONN_LABEL_ROW_1 2 -# define CONN_EDIT_ROW_2 (CONN_LABEL_ROW_1+ROW_SPACE) +# define CONN_HELP_HT 25 +# define CONN_ROW_1 2 +# define CONN_ROW_2 (CONN_ROW_1+ROW_SPACE) # ifdef NEEDS_CHOOSE_CONNTYPE -# define CONN_LABEL_ROW_3 (CONN_EDIT_ROW_2+ROW_SPACE) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+ROW_SPACE+ROW_HEIGHT) +# define CONN_ROW_3 (CONN_ROW_2+ROW_SPACE) +# define CONN_ROW_4 (CONN_ROW_3+ROW_SPACE+ROW_HEIGHT) # else -# define CONN_LABEL_ROW_3 (CONN_LABEL_ROW_1) -# define CONN_EDIT_ROW_4 (CONN_LABEL_ROW_3+CONN_LABEL_HT+3) +# define CONN_ROW_3 (CONN_ROW_1) +# define CONN_ROW_4 (CONN_ROW_3+CONN_LABEL_HT+3) # endif # ifndef RELAY_NOEDIT_ADDR -# define CONN_LABEL_ROW_5 (CONN_EDIT_ROW_4+ROW_SPACE+5) -# define CONN_EDIT_ROW_6 (CONN_LABEL_ROW_5+CONN_LABEL_HT+3) -# define CONN_LABEL_ROW_7 (CONN_EDIT_ROW_6+ROW_SPACE+5) -# define CONN_EDIT_ROW_8 (CONN_LABEL_ROW_7+CONN_LABEL_HT+3) -# define BUTTON_ROW (CONN_EDIT_ROW_8+ROW_SPACE) +# define CONN_ROW_5 (CONN_ROW_4+CONN_HELP_HT+5) +# define CONN_ROW_6 (CONN_ROW_5+CONN_LABEL_HT+3) +# define CONN_ROW_7 (CONN_ROW_6+ROW_SPACE+5) +# define CONN_ROW_8 (CONN_ROW_7+CONN_LABEL_HT+3) +# define BUTTON_ROW (CONN_ROW_8+ROW_SPACE) #else -# define BUTTON_ROW (CONN_EDIT_ROW_4+ROW_SPACE) +# define BUTTON_ROW (CONN_ROW_4+CONN_HELP_HT) #endif #ifdef _WIN32_WCE # define CONNSDLG_HT BUTTON_ROW @@ -634,17 +635,24 @@ BEGIN #endif #if defined XWFEATURE_RELAY - LTEXT "Pokój:",IDC_INVITE_LAB,LAB_COL,CONN_LABEL_ROW_3,40,ROW_HEIGHT - EDITTEXT INVITE_EDIT,CTRL_COL,CONN_EDIT_ROW_4,CTRL_COL_WIDTH, + LTEXT "Pokój:", + IDC_INVITE_LAB,LAB_COL,CONN_ROW_3,23,CONN_LABEL_HT + EDITTEXT INVITE_EDIT,LAB_COL+25,CONN_ROW_3,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL + LTEXT "(As host, you name the room for the game, and must " + "connect first.)", + IDC_INVITE_HELP_HOST,LAB_COL,CONN_ROW_4,110,CONN_HELP_HT + LTEXT "(As guest, wait for the host to connect then tell you " + "the room name.)", + IDC_INVITE_HELP_GUEST,LAB_COL,CONN_ROW_4,100,CONN_HELP_HT # ifndef RELAY_NOEDIT_ADDR LTEXT "Serwer (raczej niezmienny):",IDC_CRELAYNAME_LAB, - LAB_COL,CONN_LABEL_ROW_5,120,ROW_HEIGHT - EDITTEXT RELAYNAME_EDIT,CTRL_COL,CONN_EDIT_ROW_6,CTRL_COL_WIDTH, + LAB_COL,CONN_ROW_5,120,ROW_HEIGHT + EDITTEXT RELAYNAME_EDIT,CTRL_COL,CONN_ROW_6,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL LTEXT "Port (raczej niezmienny):",IDC_CRELAYPORT_LAB, - LAB_COL,CONN_LABEL_ROW_7,120,ROW_HEIGHT - EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_EDIT_ROW_8,CTRL_COL_WIDTH, + LAB_COL,CONN_ROW_7,120,ROW_HEIGHT + EDITTEXT RELAYPORT_EDIT,CTRL_COL,CONN_ROW_8,CTRL_COL_WIDTH, ROW_HEIGHT,ES_AUTOHSCROLL | ES_NUMBER # endif #elif defined NEEDS_CHOOSE_CONNTYPE