2. Changes

Repository reset

Original revision: 6f7470af585854c633abb289754119d9be5ca826
New revision: 6f7470af585854c633abb289754119d9be5ca826 8 months ago

Rebasing (1/1)
Auto-merging collectionText_ja.properties
CONFLICT (content): Merge conflict in collectionText_ja.properties
error: could not apply fca3f6f... Translated using Weblate (Japanese)
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 fca3f6f... Translated using Weblate (Japanese)
 (1)

8 months ago

Rebasing (1/1)
Auto-merging collectionText_ja.properties
CONFLICT (content): Merge conflict in collectionText_ja.properties
error: could not apply fca3f6f... Translated using Weblate (Japanese)
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 fca3f6f... Translated using Weblate (Japanese)
 (1)

8 months ago

Rebasing (1/1)
Auto-merging collectionText_ja.properties
CONFLICT (content): Merge conflict in collectionText_ja.properties
error: could not apply fca3f6f... Translated using Weblate (Japanese)
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 fca3f6f... Translated using Weblate (Japanese)
 (1)

8 months ago

Changes committed 8 months ago

Repository rebased

Original revision: d5313cabb00297d1eef7a8eca3236b6a654c12c4
New revision: 43bc8569e75ef2c07442980c3b80975eda38a0f8 8 months ago

Changes pushed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

Changes committed 8 months ago

English Ukrainian 6 characters edited Current translation State: Translated 8 months ago

English Turkish 6 characters edited Current translation State: Translated 8 months ago

English Spanish 6 characters edited Current translation State: Translated 8 months ago