|
128.
|
|
|
It is not possible to %s because you have unmerged files.
|
|
|
|
Δεν είναι δυνατό να γίνει %s επειδή έχετε μη συγχωνευμένα αρχεία.
|
|
Translated by
Jimmy Angelakos
|
|
|
|
Located in
advice.c:174
|
|
129.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution and make a commit.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Φτιάξτε τα στο δέντρο εργασίας, και μετά χρησιμοποιήστε 'git add/rm <αρχείο>'
έτσι ώστε να επισημάνετε την επίλυση και να κάνετε μία υποβολή.
|
|
Translated by
Jimmy Angelakos
|
|
|
|
Located in
advice.c:182
|
|
130.
|
|
|
Exiting because of an unresolved conflict.
|
|
|
|
Έξοδος λόγω ανεπίλυτης σύγκρουσης.
|
|
Translated by
Jimmy Angelakos
|
|
|
|
Located in
advice.c:190
|
|
131.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
Δεν έχετε ολοκληρώσει τη συγχώνευσή σας (Υπάρχει το MERGE_HEAD).
|
|
Translated by
Jimmy Angelakos
|
|
|
|
Located in
advice.c:195 builtin/merge.c:1332
|
|
132.
|
|
|
Please, commit your changes before merging.
|
|
|
|
Παρακαλώ, υποβάλετε τις αλλαγές σας πριν συγχωνεύσετε.
|
|
Translated by
Jimmy Angelakos
|
|
|
|
Located in
advice.c:197
|
|
133.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
Έξοδος λόγω μη ολοκληρωμένης συγχώνευσης.
|
|
Translated by
Jimmy Angelakos
|
|
|
|
Located in
advice.c:198
|
|
134.
|
|
|
Not possible to fast-forward, aborting.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
builtin/merge.c:1575
|
|
135.
|
|
|
The following paths and/or pathspecs matched paths that exist
outside of your sparse-checkout definition, so will not be
updated in the index:
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:227
|
|
136.
|
|
|
If you intend to update such entries, try one of the following:
* Use the --sparse option.
* Disable or modify the sparsity rules.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:234
|
|
137.
|
|
|
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
(no translation yet)
|
|
|
|
Located in
advice.c:204
|