User avatar None

Suggestion added

Monero CLI & GUI / CLI WalletItalian

a year ago
User avatar None

Suggestion added

Monero CLI & GUI / CLI WalletItalian

a year ago
User avatar None

Suggestion added

Monero CLI & GUI / CLI WalletItalian

a year ago
User avatar None

Failed rebase on repository

Getmonero / monero-site

First, rewinding head to replay your work on top of it...
Applying: German
Applying: German
Applying: German
Applying: Russian
Using index info to reconstruct a base tree...
M	_i18n/ru.yml
A	_i18n/ru/resources/moneropedia/weblate/canonically-unique-host.po
M	_i18n/ru/resources/moneropedia/weblate/ring-size.po
M	_i18n/ru/resources/user-guides/weblate/restore_account.po
Falling back to patching base and 3-way merge...
Auto-merging _i18n/ru/resources/user-guides/weblate/restore_account.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/user-guides/weblate/restore_account.po
Auto-merging _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (modify/delete): _i18n/ru/resources/moneropedia/weblate/canonically-unique-host.po deleted in HEAD and modified in Russian. Version Russian of _i18n/ru/resources/moneropedia/weblate/canonically-unique-host.po left in tree.
Auto-merging _i18n/ru.yml
error: Failed to merge in the changes.
Patch failed at 0004 Russian
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (128)
a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion accepted

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar turgay_d

Suggestion added

Getmonero / monero-siteTurkish

a year ago
User avatar None

Failed rebase on repository

Getmonero / monero-site

First, rewinding head to replay your work on top of it...
Applying: German
Applying: German
Applying: German
Applying: Russian
Using index info to reconstruct a base tree...
M	_i18n/ru.yml
A	_i18n/ru/resources/moneropedia/weblate/canonically-unique-host.po
M	_i18n/ru/resources/moneropedia/weblate/ring-size.po
M	_i18n/ru/resources/user-guides/weblate/restore_account.po
Falling back to patching base and 3-way merge...
Auto-merging _i18n/ru/resources/user-guides/weblate/restore_account.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/user-guides/weblate/restore_account.po
Auto-merging _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (content): Merge conflict in _i18n/ru/resources/moneropedia/weblate/ring-size.po
CONFLICT (modify/delete): _i18n/ru/resources/moneropedia/weblate/canonically-unique-host.po deleted in HEAD and modified in Russian. Version Russian of _i18n/ru/resources/moneropedia/weblate/canonically-unique-host.po left in tree.
Auto-merging _i18n/ru.yml
error: Failed to merge in the changes.
Patch failed at 0004 Russian
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (128)
a year ago
User avatar jorgesumle

Suggestion added

Getmonero / monero-siteEsperanto

a year ago
User avatar jorgesumle

Suggestion added

Getmonero / monero-siteEsperanto

a year ago
User avatar jorgesumle

Suggestion added

Getmonero / monero-siteEsperanto

a year ago
User avatar jorgesumle

Suggestion added

Getmonero / monero-siteEsperanto

a year ago
User avatar jorgesumle

Suggestion added

Getmonero / monero-siteEsperanto

a year ago

Search