2. Changes

Auto-merging HactarFull/src/main/res/raw-uk/go_capturing_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_capturing_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/go_connecting_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_connecting_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/go_end_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_end_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/go_ld_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/go_ld_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/rules_atarigo_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_atarigo_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/rules_capture3_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_capture3_text.properties
Auto-merging HactarFull/src/main/res/raw-uk/rules_go_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/rules_go_text.properties
Auto-merging HactarFull/src/main/res/values-uk/strings.xml
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/values-uk/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

04/06/2024

Rebasing (1/9)
Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian)
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 d4a73b3d... Added translation using Weblate (Ukrainian)
 (1)

04/06/2024

Rebasing (1/9)
Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian)
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 d4a73b3d... Added translation using Weblate (Ukrainian)
 (1)

04/06/2024

Rebasing (1/9)
Auto-merging HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
CONFLICT (add/add): Merge conflict in HactarFull/src/main/res/raw-uk/hactar_intro_text.properties
error: could not apply d4a73b3d... Added translation using Weblate (Ukrainian)
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 d4a73b3d... Added translation using Weblate (Ukrainian)
 (1)

04/06/2024

The “collectionText_ca.properties” file was changed. 04/06/2024

Repository rebased

Original revision: 9f14ec270acd7f8d1e71b0096bb689889998a04a
New revision: 741407e11847299d5d62a354f72c8474f281bb86 04/06/2024

The “collectionText_zh_TW.properties” file was changed. 04/06/2024

The “collectionText_zh-CN.properties” file was changed. 04/06/2024

The “collectionText_uk.properties” file was changed. 04/06/2024

The “collectionText_tr.properties” file was changed. 04/06/2024

The “collectionText_ru.properties” file was changed. 04/06/2024

The “collectionText_pl.properties” file was changed. 04/06/2024

The “collectionText_ko.properties” file was changed. 04/06/2024

The “collectionText_ja.properties” file was changed. 04/06/2024

The “collectionText_it.properties” file was changed. 04/06/2024

The “collectionText_fr.properties” file was changed. 04/06/2024

The “collectionText_fi.properties” file was changed. 04/06/2024

The “collectionText_es.properties” file was changed. 04/06/2024

The “collectionText_de.properties” file was changed. 04/06/2024

The “collectionText_ca.properties” file was changed. 04/06/2024