2. Changes

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

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)

4 months ago

The component was automatically locked because of an alert. 4 months ago

Could not merge the repository. 4 months ago

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)

4 months ago

Changes committed 4 months ago

Changes committed 4 months ago

English Chinese (Traditional) 18 characters edited 4 months ago

English Chinese (Traditional) 4 characters edited 4 months ago

English Chinese (Traditional) 10 characters edited 4 months ago