|
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
|
|
|
|
%s de %s
|
|
Translated and reviewed by
Mykas0
|
|
|
|
Located in
lib/merge.tcl:107
|
|
567.
|
|
|
Merging %s and %s...
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:120
|
|
568.
|
|
|
Merge completed successfully.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:131
|
|
569.
|
|
|
Merge failed. Conflict resolution is required.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:133
|
|
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:158
|
|
572.
|
|
|
Revision To Merge
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib/merge.tcl:177
|
|
573.
|
|
|
Cannot abort while amending.
![](/@@/translation-newline)
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:212
|
|
574.
|
|
|
Abort merge?
![](/@@/translation-newline)
Aborting the current merge will cause *ALL* uncommitted changes to be lost.
![](/@@/translation-newline)
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:222
|