|
90.
|
|
|
rename
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1558
|
|
91.
|
|
|
renamed
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1558
|
|
92.
|
|
|
%s is a directory in %s adding as %s instead
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1708
|
|
93.
|
|
|
CONFLICT (rename/rename): Rename "%s "->"%s " in branch "%s " rename "%s "->"%s " in "%s "%s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1740
|
|
94.
|
|
|
(left unresolved)
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1745
|
|
95.
|
|
|
CONFLICT (rename/rename): Rename %s ->%s in %s . Rename %s ->%s in %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1837
|
|
96.
|
|
|
Renaming %s to %s and %s to %s instead
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1379
|
|
97.
|
|
|
CONFLICT (rename/add): Rename %s ->%s in %s . %s added in %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1582
|
|
98.
|
|
|
Adding merged %s
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:1597
|
|
99.
|
|
|
Adding as %s instead
|
|
|
|
(no translation yet)
|
|
|
|
Located in
merge-recursive.c:3181
|