2. Changes

The "de.json" file was changed. 8 months ago

The "ru.json" file was changed. 8 months ago

Repository reset

Original revision: 094d7ac8addfcbb19b7f0205db6f1be67d22e1b7
New revision: cbc4399c07342fe681d04b45e00c59da74c9a0ae 8 months ago

Auto-merging en.json
CONFLICT (content): Merge conflict in en.json
Auto-merging ru.json
CONFLICT (content): Merge conflict in ru.json
Auto-merging tt.json
CONFLICT (content): Merge conflict in tt.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

8 months ago

Rebasing (1/3)
Auto-merging ru.json
CONFLICT (content): Merge conflict in ru.json
error: could not apply 29c8724... 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 29c8724... Translated using Weblate (Russian)
 (1)

8 months ago

Auto-merging en.json
CONFLICT (content): Merge conflict in en.json
Auto-merging ru.json
CONFLICT (content): Merge conflict in ru.json
Auto-merging tt.json
CONFLICT (content): Merge conflict in tt.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)

8 months ago

Rebasing (1/3)
Auto-merging ru.json
CONFLICT (content): Merge conflict in ru.json
error: could not apply 29c8724... 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 29c8724... Translated using Weblate (Russian)
 (1)

8 months ago

Rebasing (1/3)
Auto-merging ru.json
CONFLICT (content): Merge conflict in ru.json
error: could not apply 29c8724... 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 29c8724... Translated using Weblate (Russian)
 (1)

8 months ago

Rebasing (1/3)
Auto-merging ru.json
CONFLICT (content): Merge conflict in ru.json
error: could not apply 29c8724... 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 29c8724... Translated using Weblate (Russian)
 (1)

8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

8 months ago

8 months ago

8 months ago

8 months ago

8 months ago

8 months ago

Russian Russian 255 characters edited Current translation Translated 8 months ago

8 months ago