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:
Jon Trulson
@@ -622,33 +622,33 @@ $ */
|
||||
237 "Copier"
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ DTMC_BADSTATE
|
||||
$ The mailbox is in a state which cannot be deciphered by the Mailer, i.e.
|
||||
$ portions of the file have been deleted by another process (the Mailer
|
||||
$ only knows how to handle other processes adding to the end of the mailbox.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
238 "Mailer is confused about the state of this mailbox.\nIt may be that another process has rewritten this mailbox in an unexpected way.\n\nSelecting OK will cause the Mailer to close and reopen the mailbox.\nNOTE that any changes made to the mailbox since the last save may be lost."
|
||||
|
||||
$
|
||||
$
|
||||
$ DTMC_ACCESSFAILED
|
||||
$ The Mailer cannot perform routine file operations on the mailbox file,
|
||||
$ a.k.a. stat, fstat, write, ...
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
239 "Mailer can no longer access this mailbox.\nIt may be that another process has deleted the mailbox file.\n\nSelecting OK will cause the Mailer to close and reopen the mailbox.\nNOTE that any changes made to the mailbox since the last save may be lost.\n\nSelecting CANCEL will leave the mailbox unchanged."
|
||||
|
||||
$
|
||||
$
|
||||
$ DTMC_INODECHANGED
|
||||
$ The mailbox has been rewritten by another process.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
240 "Mailer can no longer access this mailbox.\nAnother process has rewritten the mailbox file changing the inode.\n\nSelecting OK will cause the Mailer to close and reopen the mailbox.\nNOTE that any changes made to the mailbox since the last save may be lost.\n\nSelecting CANCEL will leave the mailbox unchanged."
|
||||
|
||||
$
|
||||
$
|
||||
$ Messages 241-244 are header field labels for SendMsgDialog.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
241 "A"
|
||||
$ "-NEW"
|
||||
@@ -658,31 +658,31 @@ $ "-NEW"
|
||||
$ "-NEW"
|
||||
244 "Bcc"
|
||||
|
||||
$
|
||||
$
|
||||
$ Message 245 is the label for the Open command in the File menu
|
||||
$ Message 246 is the label for the command in the OpenContainer menu
|
||||
$ which opens Mailboxes not in the users folder list.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
245 "Ouvrir"
|
||||
$ "-NEW"
|
||||
246 "Autres boîtes aux lettres..."
|
||||
|
||||
$
|
||||
$
|
||||
$ Message 247 is the label for the command in the Aliases menu
|
||||
$ which opens the MailOptions dialog allowing the user to create
|
||||
$ other aliases.
|
||||
$ Message 248 is the label for the Aliases popup menu
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
247 "Autres Alias..."
|
||||
$ "-NEW"
|
||||
248 "Programme courrier - Alias"
|
||||
|
||||
$
|
||||
$
|
||||
$ Messages 249-255 are strings used to generate attachment summaries
|
||||
$ in included messages.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
249 "------------- Begin Included Attachment -------------\n\n"
|
||||
$ "-NEW"
|
||||
@@ -795,9 +795,9 @@ vous devez s
|
||||
24 "Quitter"
|
||||
25 " Des erreurs de syntaxes irréparables ont eu lieu dans le fichier ~/.mailrc.\nVous pouvez appliquer les configurations d'options de courrier dans la session en cours mais \nvous ne pourrez pas les sauvegarder dans le fichier."
|
||||
|
||||
$
|
||||
$
|
||||
$ Messages for file locking dialog displayed from the Advanced option pane.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
26 "The value of the file locking option has changed.\nTo take immediate effect, folders need to be closed and reopened.\n o Click on 'Reopen' to reopen folders,\n making the new option take effect immediately.\n o Click on 'Continue' to avoid reopening folders.\n The new option will take effect the next time you open a folder.\n o Click on 'Cancel' to cancel the Apply and return to editing options."
|
||||
$ "-NEW"
|
||||
@@ -807,9 +807,9 @@ $ "-NEW"
|
||||
$ "-NEW"
|
||||
29 "Cancel"
|
||||
|
||||
$
|
||||
$
|
||||
$ Messages for ToolTalk errors.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
30 "%s returned ToolTalk error: %s\n"
|
||||
|
||||
@@ -1045,27 +1045,27 @@ $ */
|
||||
95 "Lecture seule"
|
||||
96 "Lecture-Ecriture"
|
||||
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
$
|
||||
$
|
||||
$ This message appears when dtmail tries to open a mailbox which has been
|
||||
$ opened by another dtmail process.
|
||||
$
|
||||
$
|
||||
$ Parameters:
|
||||
$ 1. Error message saying that the <mailbox>.dtmail lockfile has been found.
|
||||
$ 2. The mailbox path.
|
||||
$ 3. "OK"
|
||||
$ 4. "Cancel"
|
||||
$ 5. The <mailbox>.dtmail lockfile path.
|
||||
$
|
||||
$
|
||||
97 "%s\n\nThis may indicate that another Mailer has opened\n%s\n\nYou may open this mailbox READ ONLY by choosing '%s'.\n\nOtherwise, you may choose '%s',\nmake sure that another Mailer has not opened this mailbox,\ndelete %s,\nand reopen this mailbox."
|
||||
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
$
|
||||
$
|
||||
$ Messages 98-100 check for problems in the paths specified by users of
|
||||
$ the file selection box.
|
||||
$
|
||||
$
|
||||
98 "Search permission denied on a component of the path prefix,\n'%s'."
|
||||
99 "A component of the path prefix is not a directory,\n'%s'."
|
||||
100 "A component of the path prefix does not exist,\n'%s'."
|
||||
@@ -1181,9 +1181,9 @@ $set 15
|
||||
1 "Des modifications ne sont pas sauvegardées.\nVous pouvez les sauvegarder, les supprimer\nou retourner à l'emplacement précédent dans la boîte de dialogue."
|
||||
2 "Sauvegarder"
|
||||
3 "Supprimer"
|
||||
$
|
||||
$
|
||||
$ The followings are added by IBM for 41J release
|
||||
$
|
||||
$
|
||||
$set 20
|
||||
1 "La boîte aux lettres %s est déjà ouverte."
|
||||
$ The above message is used in RoamMenuWindow::open
|
||||
@@ -1195,17 +1195,17 @@ $ see AIX cmvc defect 176608
|
||||
$ The above message is used in RoamMenuWindow::mapnotify()
|
||||
$ see AIX cmvc defect 176608
|
||||
|
||||
$
|
||||
$
|
||||
$ SETS 21 - 25 WERE ADDED TO SUPPORT CDEnext PRINTING
|
||||
$
|
||||
$
|
||||
$ The following set was added to support CDEnext printing based on
|
||||
$ the Xp Print Server.
|
||||
$
|
||||
$
|
||||
$set 21
|
||||
$
|
||||
$
|
||||
$ Messages 1 - 11 are used in DmxPrintJob.
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
$ This is the status message that gets displayed in the MainWindow
|
||||
$ and RoamMenuWindow status lines when a print job is being executed.
|
||||
$ The '%s' is the name of the temporary file containing the message(s)
|
||||
@@ -1214,7 +1214,7 @@ $ to be printed.
|
||||
|
||||
$ Messages 2 - 4 are used in the error popup which gets displayed
|
||||
$ when an invalid margin specifier has been supplied by the user.
|
||||
$
|
||||
$
|
||||
$ Message 2 is the actual error messagactual error message
|
||||
$ Message 3 is the title which is displayed in the error popup.
|
||||
$ Message 4 is the label on the OK button of the error popup.
|
||||
@@ -1224,7 +1224,7 @@ $ Message 4 is the label on the OK button of the error popup.
|
||||
|
||||
$ Messages 5 - 11 are format string used to construct the header
|
||||
$ and footer strings which appear in the printing output.
|
||||
$
|
||||
$
|
||||
$ Message 5 is the format string used to make a Cc header/footer.
|
||||
$ Message 6 is the format string used to make a Date header/footer.
|
||||
$ Message 7 is the format string used to make a From header/footer.
|
||||
@@ -1240,11 +1240,11 @@ $ Message 11 is the format string used to make a UserName header/footer.
|
||||
10 "Page %d de %d"
|
||||
11 "Courrier pour : %s"
|
||||
|
||||
$
|
||||
$
|
||||
$ Messages 12 - 13, 20 are used in DmxPrintSetup to construct the
|
||||
$ app-specific printing options for DtMail which will be included
|
||||
$ in the DtPrintSetupBox.
|
||||
$
|
||||
$
|
||||
$ Message 12 is the label used on the Toggle Button to indicate that
|
||||
$ multiple messages should be printed in separate spool jobs.
|
||||
$ Message 13 is the label used on the Toggle Button to indicate that
|
||||
@@ -1255,7 +1255,7 @@ $ "wrapped" to the next line.
|
||||
|
||||
|
||||
$ Messages 14 - 15 are status messages for the PrintToFile function.
|
||||
$
|
||||
$
|
||||
$ Message 14 indicates that the PrintToFile function was unsuccessful.
|
||||
$ Message 15 indicates that the PrintToFile function was successful.
|
||||
$ NOTE: 'Print to File' should be translated as in DtPrint.msg
|
||||
@@ -1265,9 +1265,9 @@ $ Set 1, Message 3.
|
||||
|
||||
$ NL_COMMENT
|
||||
$ Messages 16 - 19 are obsolete, and have been replaced by 24
|
||||
$
|
||||
$
|
||||
$ Messages 16 - 19 are status messages for the popup PDM function.
|
||||
$
|
||||
$
|
||||
$ Message 16 indicates that there was no pdm deamon running.
|
||||
$ Message 17 indicates that the pdm deamon was unable to start a pdm.
|
||||
$ Message 18 indicates that the pdm couldnt connect to the video display.
|
||||
@@ -1300,14 +1300,14 @@ $ Messages 24 & 25 are used to handle errors from the PDM
|
||||
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ The messages in this set are used in pulldown menu for the
|
||||
$ header/footer $ frame which is part of the "Printing" pane
|
||||
$ in the Options dialog.
|
||||
$
|
||||
$
|
||||
$ Messages 1 - 8 are used in DmxPrintOptions.
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
$ Message 1 specifies that the page header/footer field be empty.
|
||||
$ Message 2 put the Cc msg header in the page header/footer field.
|
||||
$ Message 3 put the Date msg header in the page header/footer field.
|
||||
@@ -1326,18 +1326,18 @@ $set 22
|
||||
7 "Numéro de page"
|
||||
8 "Nom de l'utilisateur"
|
||||
|
||||
$
|
||||
$
|
||||
$ The messages in this set are used in pulldown menu for the
|
||||
$ Printed Message Headers option which is part of the "Printing" pane
|
||||
$ in the Options dialog.
|
||||
$
|
||||
$
|
||||
$ Messages 1 - 4 are used in DmxPrintOptions.
|
||||
$
|
||||
$
|
||||
$ Message 1 don't print any message headers.
|
||||
$ Message 2 print the "standard" msg headers (To, From, Subject, Cc).
|
||||
$ Message 3 print the "abbreviated" msg headers as defined by the user.
|
||||
$ Message 4 print all message headers.
|
||||
$
|
||||
$
|
||||
$set 23
|
||||
|
||||
1 "Aucun"
|
||||
@@ -1345,19 +1345,19 @@ $set 23
|
||||
3 "Abrégé"
|
||||
4 "Tous"
|
||||
|
||||
$
|
||||
$
|
||||
$ The messages in this set are used in pulldown menu for the
|
||||
$ Printed Message Headers option which is part of the "Printing" pane
|
||||
$ in the Options dialog.
|
||||
$
|
||||
$
|
||||
$ Messages 1 - 5 are used in DmxPrintOptions.
|
||||
$
|
||||
$
|
||||
$ Message 1 use a New Line (CRLF) to separate multiple messages.
|
||||
$ Message 2 use a Blank Line (2xCRLF) to separate multiple messages.
|
||||
$ Message 3 use a Line of characters to separate multiple messages.
|
||||
$ Message 4 start each new message on a new page.
|
||||
$ Message 5 print each message in it's own spool job.
|
||||
$
|
||||
$
|
||||
$set 24
|
||||
1 "Nouvelle Ligne"
|
||||
2 "Ligne en blanc"
|
||||
@@ -1365,32 +1365,32 @@ $set 24
|
||||
4 "Nouvelle Page"
|
||||
5 "Nouvelle tâche"
|
||||
|
||||
$
|
||||
$
|
||||
$ The following set was added to support CDEnext printing based on
|
||||
$ the Xp Print Server.
|
||||
$
|
||||
$
|
||||
$ Messages 1 - 2 are used in DmxPrintOptions.
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
$set 25
|
||||
$
|
||||
$
|
||||
$ Label for the option menu used to specify which message headers are
|
||||
$ printed.
|
||||
1 "En-têtes des messages imprimés : "
|
||||
$
|
||||
$
|
||||
$ Label for the option menu used to specify which how multiple messages
|
||||
$ are separated.
|
||||
2 "Séparer les messages multiples par : "
|
||||
|
||||
$
|
||||
$
|
||||
$ The following set was added to support CDEnext printing based on
|
||||
$ the Xp Print Server.
|
||||
$
|
||||
$
|
||||
$ Messages 1-4 are used in error dialogs to indicate an invalid
|
||||
$ entry for margin specifiers in the printing options pane.
|
||||
$ Message 5 is the label string on the button to dismiss the error dialog.
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
$set 26
|
||||
1 "La valeur de l'indicateur de la marge du haut est incorrecte : "
|
||||
2 " La valeur de l'indicateur de la marge de droite est incorrecte: "
|
||||
@@ -1398,15 +1398,15 @@ $set 26
|
||||
4 " La valeur de l'indicateur de la marge de gauche est incorrecte: "
|
||||
5 "Continuer"
|
||||
|
||||
$
|
||||
$
|
||||
$ The following set was added to support the Mail Retrieval option pane.
|
||||
$
|
||||
$
|
||||
$ Messages 1-5 Used in the Server Protocol option menu to indicate the
|
||||
$ set of mail server network protocols which are supported.
|
||||
$ Messages 6-15 Are used to label the options in the pane.
|
||||
$
|
||||
$
|
||||
$ "-NEW"
|
||||
$
|
||||
$
|
||||
$set 27
|
||||
1 "Auto"
|
||||
2 "POP3"
|
||||
|
||||
Reference in New Issue
Block a user