debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

message catalogs: fix comment lines, also remove linux hack in merge.c

Browse Source 
According to the spec, blank lines in message catalogs or lines
beginning with '$ ' are valid comments.

However, there were many cases where lines in the message catalogs
contained just a single '$', without the required space after it.

Under linux, this caused 126766 error lines (in my builds) of the
form:

... unknown directive `': line ignored

This also causes gencat to exit with a non-0 exit code.  Even though
gencat says it ignores the line, it really doesn't.

An early porting change to programs/localized/util/merge.c was made to
ignore this return value on linux.  This hack has now been removed.

Build logs are a lot smaller and cleaner now.
This commit is contained in:
Jon Trulson
2012-09-03 15:12:57 -06:00
parent e9bb2bcf09
commit a29fc20957
470 changed files with 22507 additions and 22515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cde/lib/DtHelp/DtHelp.msg
View File

@@ -1,21 +1,21 @@
$
$
$ COMPONENT_NAME: desktop
$
$
$ FUNCTIONS: mnemonic
$ name
$
$
$ ORIGINS: 27,118,119,120,121
$
$
$ This module contains IBM CONFIDENTIAL code. -- (IBM
$ Confidential Restricted when combined with the aggregated
$ modules for this product)
$ OBJECT CODE ONLY SOURCE MATERIALS
$
$
$ (C) COPYRIGHT International Business Machines Corp. 1995
$ All Rights Reserved
$ US Government Users Restricted Rights - Use, duplication or
$ disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
$
$
$ *************************************<+>*************************************
$ *****************************************************************************
$ **
@@ -58,13 +58,13 @@ $ *************************************<+>*************************************
$set 2
$ ***** Module: HelpDialog.c and a few from HelpQuickD.c *****
$
$
$ These Messages appear in the pulldown menus for Cde Help General Help
$ dialog widget.
$
$
$ They come in pairs where the first is the menu name (e.g. 1 Print...) and the
$ second is the mnemonic (e.g. 2 P).
$
$
$ Messages 1 through 6 are the pulldown menus for the File menu.
1 Print...
2 P
@@ -98,7 +98,7 @@ $ Messages 17 through 28 are the pulldown menus for the Help menu.
26 M
27 About Help
28 A
$
$
$ Messages 29 through 36 are the menu labels and mnemonics for for the
$ Help Dialog.
29 File
@@ -111,10 +111,10 @@ $ Help Dialog.
36 H
37 Edit
38 E
$
$
$
$
$ >>>>> Skip #39 through #49
$
$
$ Messages 50 through 55 are used to display formatting errors within the
$ help dialog and quick help dialog widgets.
$
@@ -126,29 +126,29 @@ present, or corrupt.
not present, or corrupt.
54 Help topic could not be formatted.
55 Nonexistent location ID:
$
$
$ Messages 56 and 67 are displayed when a hypertext link type is selected but
$ not supported within the current application.
$
$
56 The selected Hypertext link is not supported within this application.
57 Links to Man Pages are not supported by this application.
$
$
$ Messages 58 through 62 are used when bad or null help volumes or
$ locationId's are used.
$
$
58 The requested online help is either not installed or not in the proper help search path. For information on installing online help, consult the documentation for the product.\n
59 No location ID specified.
60 No help volume specified.
61 Help Volume:
62 Location ID:
$
$
$ >>>>> Skip #63 through #69
$
$
$
$
$ Message 70 is used when a null value for DtNtopicTitle is used.
$
$
70 Nonexistent Topic Title.
$
$
$ New messages added after early msg cat freeze; not in order
80 The specified help type is invalid.

22
cde/lib/DtHelp/fmt_tbl.msg
View File

@@ -1,6 +1,6 @@
$ $XConsortium: fmt_tbl.msg /main/1 1996/11/07 18:08:33 drk $
$set 1
$
$
$ This file is to specify special formatting characteristics of a
$ language. It defines which characters of the language can not end a
$ line of text, begin a line of text or whether to replace internal
@@ -11,27 +11,27 @@ $ sets. For single byte character sets (I.E. English, German, French,
$ etc.), the system has a built in default list of characters that can
$ not begin and end a line. For single byte languages, the system will
$ also always replace newlines with spaces.
$
$
$ This table is for <???>
$
$
$ message #1 indicates the list of 2byte punctuation, special characters
$ and double consonants that cannot start a line.
$
$
1 <20><place list here>
$
$
$ message #2 indicates the list of 2byte punctuation, special characters
$ and double consonants that cannot end a line.
$
$
2 <20><place list here>
$
$
$ message #3 indicates whether the language wants all end-of-lines in
$ text to be changed into spaces. I.E. in english if you had
$
$
$ 'the quick brown fox'
$ 'jumps over the lazy dog'
$
$
$ would be output as 'the quick brown fox jumps....'. If this was
$ translated into Japanese but leaving the break where it appeared in the
$ sentence, the newline between 'fox' and 'jumps' would be compressed out
@@ -39,7 +39,7 @@ $ and no space would be put between the two words. But if 'fox' was in
$ Japanese and 'jump' was in english, the newline would be turned into a
$ space. The same (newline -> space) would occur if 'fox' was in english
$ and 'jumps' was in Japanese.
$
$
$ Therefore, the values for message #3 should be
$ 1 - means that newlines are always turned into spaces.
$ 0 - means that newlines are turned into space only if they
@@ -47,5 +47,5 @@ $ occur between a multibyte character and a single byte
$ character.
$ Example:
$ For Japanese, the 'value' of message #3 would be '0'
$
$
3 1