|
565.
|
|
|
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:55
|
|
566.
|
|
|
%s of %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:108
|
|
567.
|
|
|
Merging %s and %s...
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:126
|
|
568.
|
|
|
Merge completed successfully.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:137
|
|
569.
|
|
|
Merge failed. Conflict resolution is required.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:139
|
|
570.
|
|
|
%s (%s): Merge
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:156
|
|
571.
|
|
|
Merge Into %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:164
|
|
572.
|
|
|
Revision To Merge
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:183
|
|
573.
|
|
|
Cannot abort while amending.
You must finish amending this commit.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:218
|
|
574.
|
|
|
Abort merge?
Aborting the current merge will cause *ALL* uncommitted changes to be lost.
Continue with aborting the current merge?
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:228
|