Move some more strings to messages.properties and report (but don't throw) an error for unknown strings.

1 files changed, 78 insertions, 43 deletions

diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index 25a0fb0c..ae36efeb 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -1,107 +1,142 @@
 abbrev.noSuch = No such abbreviation
 abbrev.none = No abbreviations found
 
-autocmd.executing- = Executing %S Auto commands for %S
-autocmd.autocommand- = autocommand %S
+autocmd.executing-2 = Executing %S Auto commands for %S
+autocmd.autocommand-1 = autocommand %S
 autocmd.noMatching = No matching autocommands
-autocmd.noGroup- = No such group or event: %S
+autocmd.noGroup-1 = No such group or event: %S
 autocmd.cantExecuteAll = Can't execute autocommands for ALL events
 
-bookmark.noMatching- = No bookmarks matching tags %S and string %S
-bookmark.noMatchingTags- = No bookmarks matching tags %S
-bookmark.noMatchingString- = No bookmarks matching string %S
+bookmark.noMatching-2 = No bookmarks matching tags %S and string %S
+bookmark.noMatchingTags-1 = No bookmarks matching tags %S
+bookmark.noMatchingString-1 = No bookmarks matching string %S
 bookmark.none = No bookmarks set
-bookmark.cantAdd- = Could not add bookmark %S
+bookmark.cantAdd-1 = Could not add bookmark %S
 bookmark.allGone = All bookmarks deleted
 
-buffer.fewer- = %S fewer tab%S
+buffer.fewer-2 = %S fewer tab%S
 buffer.cantDetatchLast = Can't detach the last tab
-buffer.noMatching- = No matching buffer for %S
-buffer.multipleMatching- = More than one match for %S
+buffer.noMatching-1 = No matching buffer for %S
+buffer.multipleMatching-1 = More than one match for %S
 buffer.noClosed = No matching closed tab
 buffer.noAlternate = No alternate page
 
-dactyl.parsingCommandLine = Parsing command line options: %S
-
-dialog.notAvailable = Dialog %S not available
+command.commands = commands
+
+command.cantDelete = Cannot delete non-user commands
+command.cantReplace-1 = E182: Can't replace non-user command: %S
+command.wontReplace-1 = Not replacing command: %S
+command.eof = Unexpected end of file waiting for %S
+command.noSuch = No such command
+command.noSuch-1 = No such command: %S
+command.noSuchUser-1 = No such user-defined command: %S
+command.notUseful-1 = This command is not useful in this version of %S
+command.invalidName-1 = "Invalid command name: %S
+command.invalidOpt-1 = "Invalid option: %S
+command.invalidOptArg-2 = "Invalid argument for option %S: %S
+command.invalidOptTypeArg-3 = "Invalid argument for %S option %S: %S
+command.parsing-1 = Error parsing arguments: %S
+
+command.colorscheme.notFound = E185: Cannot find color scheme %S
+command.conditional.illegal = Invalid use of conditional
+command.finish.illegal = E168: :finish used outside of a sourced file
+
+dactyl.parsingCommandLine-1 = Parsing command line options: %S
+
+dialog.notAvailable-1 = Dialog %S not available
+
+group.cantChangeBuiltin = Cannot change %S in the builtin group
+group.cantModifyBuiltin = Cannot modify builtin group
+group.cantRemoveBuiltin = Cannot remove builtin group
+group.noSuch = No such group: %S
+group.invalidName-1 = Invalid group name: %S
+group.noCurrent = No current group
 
 editor.noEditor = No editor specified
 
-emenu.notFound = Menu not found: %S
+emenu.notFound-1 = Menu not found: %S
 
-event.error = Processing %S event: %S
+event.error-2 = Processing %S event: %S
 event.nothingToPass = No events to pass
 
 help.dontPanic = E478: Don't panic!
-help.noFile = Sorry, help file %S not found
-help.noTopic = Sorry, no help for %S
+help.noFile-1 = Sorry, help file %S not found
+help.noTopic-1 = Sorry, no help for %S
 
-hints.noMatcher = Invalid hintmatching type: %S
+hints.noMatcher-1 = Invalid hintmatching type: %S
 
-history.noMatching- = No history matching %S
+history.noMatching-1 = No history matching %S
 history.none = No history set
 history.noURL = URL not found in history
 
-io.notReadable- = Can't open file %S
-io.notWriteable- = %S: Can't open file for writing
+io.noSuchDir = E344: Can't find directory %S
+io.noPrevDir = E186: No previous directory
+io.notReadable-1 = Can't open file %S
+io.notWriteable-1 = %S: Can't open file for writing
 io.exists = File exists (add ! to override)
 
-macro.canceled- = Canceled playback of macro '%S'
-macro.recorded- = Recorded macro '%S'
-macro.loadFailed- = Page did not load completely in %S seconds.
+macro.canceled-1 = Canceled playback of macro '%S'
+macro.recorded-1 = Recorded macro '%S'
+macro.loadFailed-1 = Page did not load completely in %S seconds.
 macro.loadWaiting = Waiting for page to load...
-macro.noSuch- = Macro '%S' not set
+macro.noSuch-1 = Macro '%S' not set
 macro.noPrevious = No previous macro
-macro.invalid- = Invalid macro name: '%S'
+macro.invalid-1 = Invalid macro name: '%S'
 
 map.builtinImmutable = Cannot change mappings in the builtin group
 map.none = No mapping found
-map.noSuch- = No such mapping: %S
-map.recursive = Attempt to execute mapping recursively: %S
+map.noSuch-1 = No such mapping: %S
+map.recursive-1 = Attempt to execute mapping recursively: %S
 
 mark.none = No marks set
 mark.invalid = Invalid mark
-mark.unset- = Mark not set: %S
-mark.noMatching = E283: No marks matching %S
+mark.unset-1 = Mark not set: %S
+mark.noMatching-1 = E283: No marks matching %S
 
 mow.noPreviousOutput = No previous command output
 
-plugin.searchingFor = Searching for %S
-plugin.searchingForIn = Searching for %S in %S
+option.noSuch = No such option
+option.noSuch-1 = No such option: %S
+
+plugin.searchingFor-1 = Searching for %S
+plugin.searchingForIn-2 = Searching for %S in %S
 
-print.toFile = Printing to file: %S
+print.toFile-1 = Printing to file: %S
 print.sending = Sending to printer...
 print.sent = Print job sent.
-print.printed = Printed: %S
+print.printed-1 = Printed: %S
 
 quickmark.none = No QuickMarks set
-quickmark.noMatching = No QuickMarks matching %S
+quickmark.noMatching-1 = No QuickMarks matching %S
 quickmark.notSet = QuickMark not set
 quickmark.invalid = Argument must be an ASCII letter or digit
 
-save.invalidDestination = Invalid destination: %S
+save.invalidDestination-1 = Invalid destination: %S
 
-status.link- = Link: %S
+status.link-1 = Link: %S
 
 time.total = Total time: %S
 
 window.cantAttachSame = Can't reattach to the same window
-window.noIndex = Window %S does not exist
+window.noIndex-1 = Window %S does not exist
 
-zoom.outOfRange = Zoom value out of range (%S - %S%%)
+zoom.outOfRange-2 = Zoom value out of range (%S - %S%%)
 zoom.illegal = Illegal zoom value
 
 error.clipboardEmpty = No clipboard data
-error.countRequired- = Count required for %S
-error.cantOpen- = Error opening %S: %S
+error.countRequired-1 = Count required for %S
+error.cantOpen-2 = Error opening %S: %S
 error.interrupted = Interrupted
-error.invalidSort- = Invalid sort order: %S
+error.invalidSort-1 = Invalid sort order: %S
 error.argRequired = Argument required
 
 error.trailing = Trailing characters
+error.invalid-1 = Invalid %S
 error.invalidArgument = Invalid argument
-error.invalidArgument- = Invalid argument: %S
+error.invalidArgument-1 = Invalid argument: %S
+error.unavailable-2 = Not available on %S %S
 error.argumentRequired = Argument required
 error.argumentOrBang = Argument or ! required
+error.invalidOperation = Invalid operation
 
 # vim:se ft=jproperties tw=0: