wordpad: Change some string resource ids...

[Paul Vriens]

Michael Stefaniuc wrote:
> to logically group the strings in separate STRINGTABLEs.
> ---
>  programs/wordpad/En.rc     |   26 +++++++-------------------
>  programs/wordpad/wordpad.h |   28 ++++++++++++++--------------
>  2 files changed, 21 insertions(+), 33 deletions(-)
> 
> diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc
> index fe92de7..b6ade3a 100644
> --- a/programs/wordpad/En.rc
> +++ b/programs/wordpad/En.rc
> @@ -179,10 +179,14 @@ END
>  
>  STRINGTABLE DISCARDABLE
>  BEGIN
> -    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
> +    STRING_ALL_FILES,              "All documents (*.*)"
>      STRING_TEXT_FILES_TXT,         "Text documents (*.txt)"
>      STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)"
> -    STRING_ALL_FILES,              "All documents (*.*)"
> +    STRING_RICHTEXT_FILES_RTF,     "Rich text format (*.rtf)"
> +    STRING_NEWFILE_RICHTEXT,       "Rich text document"
> +    STRING_NEWFILE_TXT,            "Text document"
> +    STRING_NEWFILE_TXT_UNICODE,    "Unicode text document"
> +    STRING_PRINTER_FILES_PRN,      "Printer files (*.PRN)"
>  END
>  
>  STRINGTABLE DISCARDABLE
> @@ -194,18 +198,6 @@ END
>  
>  STRINGTABLE DISCARDABLE
>  BEGIN
> -    STRING_NEWFILE_RICHTEXT,     "Rich text document"
> -    STRING_NEWFILE_TXT,          "Text document"
> -    STRING_NEWFILE_TXT_UNICODE,  "Unicode text document"
> -END
> -
> -STRINGTABLE DISCARDABLE
> -BEGIN
> -    STRING_PRINTER_FILES_PRN,        "Printer files (*.PRN)"
> -END
> -
> -STRINGTABLE DISCARDABLE
> -BEGIN
>      STRING_VIEWPROPS_TITLE,          "Options"
>      STRING_VIEWPROPS_TEXT,           "Text"
>      STRING_VIEWPROPS_RICHTEXT,       "Rich text"
> @@ -219,11 +211,7 @@ BEGIN
>      STRING_PREVIEW_TWOPAGES,         "Two pages"
>      STRING_PREVIEW_ONEPAGE,          "One page"
>      STRING_PREVIEW_CLOSE,            "Close"
> -END
> -
> -STRINGTABLE DISCARDABLE
> -BEGIN
> -    STRING_UNITS_CM,             "cm"
> +    STRING_UNITS_CM,                 "cm"
>  END
>  
>  STRINGTABLE DISCARDABLE
> diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h
> index 6d3e64a..b51bec8 100644
> --- a/programs/wordpad/wordpad.h
> +++ b/programs/wordpad/wordpad.h
> @@ -172,24 +172,24 @@
>  #define STRING_NEWFILE_TXT 1405
>  #define STRING_NEWFILE_TXT_UNICODE 1406
>  
> -#define STRING_ALIGN_LEFT 1407
> -#define STRING_ALIGN_RIGHT 1408
> -#define STRING_ALIGN_CENTER 1409
> +#define STRING_PRINTER_FILES_PRN 1407
>  
> -#define STRING_PRINTER_FILES_PRN 1410
> +#define STRING_ALIGN_LEFT 1416
> +#define STRING_ALIGN_RIGHT 1417
> +#define STRING_ALIGN_CENTER 1418
>  
> -#define STRING_VIEWPROPS_TITLE 1411
> -#define STRING_VIEWPROPS_TEXT 1412
> -#define STRING_VIEWPROPS_RICHTEXT 1413
> +#define STRING_VIEWPROPS_TITLE 1432
> +#define STRING_VIEWPROPS_TEXT 1433
> +#define STRING_VIEWPROPS_RICHTEXT 1434
>  
> -#define STRING_PREVIEW_PRINT 1414
> -#define STRING_PREVIEW_NEXTPAGE 1415
> -#define STRING_PREVIEW_PREVPAGE 1416
> -#define STRING_PREVIEW_TWOPAGES 1417
> -#define STRING_PREVIEW_ONEPAGE 1418
> -#define STRING_PREVIEW_CLOSE 1419
> +#define STRING_PREVIEW_PRINT 1448
> +#define STRING_PREVIEW_NEXTPAGE 1449
> +#define STRING_PREVIEW_PREVPAGE 1450
> +#define STRING_PREVIEW_TWOPAGES 1451
> +#define STRING_PREVIEW_ONEPAGE 1452
> +#define STRING_PREVIEW_CLOSE 1453
>  
> -#define STRING_UNITS_CM 1420
> +#define STRING_UNITS_CM 1454
>  
>  #define STRING_DEFAULT_FILENAME 1700
>  #define STRING_PROMPT_SAVE_CHANGES 1701

There won't be any issue for the translations (just checked with 
transl), but the .rc files will look totally different now.

I guess we need to tell the translators to make those same changes for 
consistency sake?

-- 
Cheers,

Paul.