User avatar None

String added in the repository

11 months ago
User avatar None

String added in the repository

11 months ago
User avatar None

String added in the repository

11 months ago
User avatar None

String added in the repository

11 months ago
User avatar redsky17

Repository reset

Repository reset

Original revision: ce1bf474026365209c05392f0c1715776ae40746
New revision: 785494511a4c195662cb85cab12ec0a4457bd462 11 months ago
User avatar redsky17

Repository rebase failed

warning: skipped previously applied commit 4f9b1190
warning: skipped previously applied commit 53166a27
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/9)
dropping 2f9f00621ec4612709f65f0b286ec73b893cad84 Translated using Weblate (Indonesian) -- patch contents already upstream
Rebasing (2/9)
dropping d9874ae8e0c31796f1032ab70ac0ef28ea61d395 Translated using Weblate (Estonian) -- patch contents already upstream
Rebasing (3/9)
dropping dc9d5343e9fe80eaebae9ec0b906f4f7d7afa7db Translated using Weblate (Esperanto) -- patch contents already upstream
Rebasing (4/9)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar redsky17

Component unlocked

Component unlocked 11 months ago
User avatar redsky17

Component unlocked

Component unlocked 11 months ago
User avatar redsky17

Repository rebase failed

warning: skipped previously applied commit 4f9b1190
warning: skipped previously applied commit 53166a27
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/9)
dropping 2f9f00621ec4612709f65f0b286ec73b893cad84 Translated using Weblate (Indonesian) -- patch contents already upstream
Rebasing (2/9)
dropping d9874ae8e0c31796f1032ab70ac0ef28ea61d395 Translated using Weblate (Estonian) -- patch contents already upstream
Rebasing (3/9)
dropping dc9d5343e9fe80eaebae9ec0b906f4f7d7afa7db Translated using Weblate (Esperanto) -- patch contents already upstream
Rebasing (4/9)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar redsky17

Component locked

Component locked 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Repository rebase failed

Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Auto-merging resources/langs/nheko_ru.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_ru.ts
error: could not apply 2c835cd8... Translated using Weblate (Russian)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2c835cd8... Translated using Weblate (Russian)
 (1)
11 months ago
User avatar None

Changes committed

Changes committed 11 months ago
User avatar MrPlap

Translation completed

Translation completed 11 months ago

Search