== Base ==
Base
== ChangedResultFile ==
Do you want to save the result file?
== ChangedDestinationFile ==
Do you want to save the destination file?
== CloseButton ==
Close
== ConfiguredStatus ==
configured!
== NotConfigureStatus ==
not configured
== Destination ==
Destination
== ErrorAutomaticOptionNeeded ==
In silent mode the automatic merge option is needed
== ErrorComparisonMethod ==
Invalid comparison method
== ErrorConflictCanNotBeApplied ==
The conflict resolution cannot be applied because it depends on other conflict's resolution. Please try to resolve conflicts in a different order. The conflict resolution returned the following error: {0}
== ErrorContributorsMustBeSpecified ==
The contributors must be specified
== ErrorEncoding ==
Specified encoding cannot be identified ({0}).
== ErrorExecutingExternalDiffTool ==
An error occurred when executing external diff tool:
== ErrorExecutingExternalMergeTool ==
An error occurred when executing external merge tool:
== ErrorExecutingExternal2WayMergeTool ==
An error occurred when executing external 2-way merge tool:
== ErrorFileTitleType ==
Oops! We do not support your language... yet!
== ErrorFileType ==
SemanticMerge received the following files: {0}.
The file extensions are not recognized as supported languages.
You can run your default text-based {1} tool.
Note: in case you know these files contain a supported language check how to use the -l param in SemanticMerge.
== ErrorJVMNotAvailableTitle ==
Oops! JVM not found - required to parse your files
== ErrorJVMNotAvailable ==
SemanticMerge requires a valid JVM installation available
in order to parse your {0} files.
You can run your default text-based {1} tool instead.
== ErrorNumberOfContributorsDoesNotMatch ==
The number of contributors does not match
== ErrorTabSpaces ==
Invalid tab spaces
== ErrorVersionControl ==
Invalid version control to configure
== OpenDialogFilterForExecutableFile ==
Executable Files (*.exe)|*.exe
== OpenDialogTitleForConfigFile ==
Browse for config file
== OpenDialogTitleForExecutableFile ==
Browse for executable file
== PlasticSCMConfigurationNotification ==
Changes won't take effect until you reopen the Unity VCS GUI
== RestartMergeWithConfigChangesMessage ==
In order to apply the new saved configuration, the merge should be restarted.
== RestartDiffWithConfigChangesMessage ==
In order to apply the new saved configuration, the diff should be restarted.
== RestartMergeQuestion ==
You have already resolved {0} conflict(s) that will be lost. Are you sure you want to restart the merge?
== ResultNeeded ==
A result file path must be specified
== Source ==
Source
== UnsolvedPendingConflicts ==
The file still has {0} unsolved conflicts.
== UnexpectedError ==
An unexpected error has occurred.
== UsageDescription ==
Please read below the usage of the tool
== UsageAvalonia ==
Usage: {0} semanticmerge []
mergeOptions: [-a|--automatic] [--silent] [--merge-decl] [--process-all-merges]
[--include-format-change] [--log-external-parser]
[] [] []
files: {{ | }}
sortedFiles:
fileparamorder: {{-fpo | --fileparamorder}}=
The default value is --fileparamorder=s;d;b;r
unsortedFiles:
sourceFile: {{-s | --source}}=
destinationFile: {{-d | --destination}}=
baseFile: {{-b | --base}}=
resultFile: {{-r | --result}}=
-a | --automatic: Automatically merge without user interaction unless conflicts are found.
--silent: This option must be used combined with the --automatic option.
When a merge can't be solved automatically, this option causes the tool to return immediately
with a non-zero exit code (no semanticmerge tool is shown).
If the tool was able to solve the merge automatically, the program returns exit code 0.
--merge-decl: Merge automatically as many declarations* as possible.
--process-all-merges: Merge automatically as many declarations* as possible and
run the external text based tool for each non-automatic merge declaration.
*A declaration is the statement that defines any of the supported syntax elements: classes, methods, attributes, etc.
Depending on the element type (e.g. classes, methods), they include a body where the element is implemented.
--include-format-change: Include changes where only indentation and EOLs have been modified.
This includes differences in white spaces and tabs at the beginning of lines and
differences in EOLs. It also includes white lines at the beginning of declarations.
By default all these differences are ignored to simplify the merge/diff.
--log-external-parser: Enable logging the file contents to debug external parsers.
contributorSymbolicNames:
srcSymbolicName: {{-sn | --srcsymbolicname}}=
dstSymbolicName: {{-dn | --dstsymbolicname}}=
baseSymbolicName: {{-bn | --basesymbolicname}}=
generalOptions: [] [] [] []
[] [] []
[] [] [
