message catalogs: fix comment lines, also remove linux hack in merge.c
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:
@@ -215,7 +215,7 @@ $ "PackIcons" and the "P" should be localized unless the
|
||||
$ accelerator interferes with the local keyboard.
|
||||
$ The accelerator is OSF standard for this item and should only be
|
||||
$ changed if this accelerator would lock out a local key use.
|
||||
$
|
||||
$
|
||||
$ The underbar
|
||||
$ is part of the syntax for mnemonics and should not be changed.
|
||||
$ The letter after the underbar should match a letter (case sensitive)
|
||||
@@ -223,7 +223,7 @@ $ in the item title .
|
||||
$ (e.g. CompressIcons _C Alt Shift<Key>F7 f.pack_icons\n
|
||||
$ OR
|
||||
$ CompressIcons _I Alt Shift<Key>F7 f.pack_icons\n )
|
||||
$
|
||||
$
|
||||
$ The mnemonic should also be chosen such such that it does not
|
||||
$ conflict with another mnemonic in the menu.
|
||||
|
||||
@@ -388,12 +388,12 @@ $set 60
|
||||
$ THIS COMMENT FOR DTWM TEAM ONLY -- WmResParse.c --
|
||||
$ Messages 1-39 and 41-42 are written to an error file.
|
||||
$ YOU DO NOT NEED TO LOCALIZE MESSAGES 1-39, 41-42.
|
||||
$
|
||||
$
|
||||
$ Message 40 allows you to alter the labels for the modifier
|
||||
$ keys on the menu accelerators. You may wish to localize
|
||||
$ message 40 so that these labels match the keycaps on your
|
||||
$ local keyboard.
|
||||
$
|
||||
$
|
||||
1 Insufficient memory for session geometry item
|
||||
2 Insufficient memory for workspaces list in sesssion item
|
||||
3 Insufficient memory for commandArgv array
|
||||
@@ -440,17 +440,17 @@ $ modifier key labels to the keycaps that the user sees on the
|
||||
$ local keyboard. If modifier key labels are not remapped, then
|
||||
$ the key label used in the accelerator spec will appear on
|
||||
$ the menu
|
||||
$
|
||||
$
|
||||
$ Example: menu spec in dtwmrc file
|
||||
$ "Close" _C Alt<Key>F4 f.kill
|
||||
$
|
||||
$
|
||||
$ Appears as
|
||||
$ Close Alt+F4
|
||||
$ - (the 'C' in Close is underlined)
|
||||
$
|
||||
$
|
||||
$ if message 40 doesn't remap "Alt" then accelerator text is "Alt+F4"
|
||||
$ if message 40 is "Alt XYZ" then accelerator text is "XYZ+F4"
|
||||
$
|
||||
$
|
||||
$ The format of this message is a sequence of strings separated
|
||||
$ by spaces. The strings are taken in pairs. If the first string
|
||||
$ in a pair matches a accelerator key label, the second string
|
||||
@@ -460,10 +460,10 @@ $ case of the second string is preserved.
|
||||
$
|
||||
40
|
||||
|
||||
$
|
||||
$
|
||||
$ Messages 41-42 are written to an error file.
|
||||
$ YOU DO NOT NEED TO LOCALIZE MESSAGE 41-42.
|
||||
$
|
||||
$
|
||||
41 Insufficient memory to get LANG environment variable.
|
||||
42 Insufficient memory for menu item label
|
||||
|
||||
@@ -694,14 +694,14 @@ $ copy of the main panel control exists in the subpanel.
|
||||
|
||||
$ Message 10 - 19 are the menu title, menu items, and mnemonics in the
|
||||
$ Main/Subpanel Menu.
|
||||
$
|
||||
$
|
||||
$ The entries are paired (label + mnemonic). The label appears in the
|
||||
$ menu. The mnemonic is the character in the label that is underlined by
|
||||
$ the menu system indicating that it is a keyboard shortcut.
|
||||
$
|
||||
$
|
||||
$ The mnemonic must be a character in the label. Each mnemonic must be
|
||||
$ unique within this particular menu.
|
||||
$
|
||||
$
|
||||
10 Add Subpanel
|
||||
11 A
|
||||
12 Delete Subpanel
|
||||
@@ -721,14 +721,14 @@ $ arg in the format.
|
||||
|
||||
$ Message 22 - 30 are the menu title, menu items, and mnemonics in the
|
||||
$ Switch Menu.
|
||||
$
|
||||
$
|
||||
$ The entries are paired (label + mnemonic). The label appears in the
|
||||
$ menu. The mnemonic is the character in the label that is underlined by
|
||||
$ the menu system indicating that it is a keyboard shortcut.
|
||||
$
|
||||
$
|
||||
$ The mnemonic must be a character in the label. Each mnemonic must be
|
||||
$ unique within this particular menu.
|
||||
$
|
||||
$
|
||||
22 Switch Area
|
||||
23 Add Workspace
|
||||
24 A
|
||||
@@ -755,7 +755,7 @@ $ Used for Install Icon title in Install Icon popup menu.
|
||||
$set 84
|
||||
$ THIS COMMENT FOR DTWM TEAM ONLY -- UI.c --
|
||||
$ This entire set should be localized.
|
||||
$
|
||||
$
|
||||
$ Message used for the label of the dynamic install area.
|
||||
1 Install Icon
|
||||
|
||||
|
||||
Reference in New Issue
Block a user