Changes @ Hactar

59 / 340

/ 340

lauri

Resource updated

Parsing of the “ca.tbx” file was enforced. 04/06/2024

lauri

Repository reset

Repository reset

Original revision: 38819d7f580bdf31389ce430bcd47ced88d27570
New revision: 38819d7f580bdf31389ce430bcd47ced88d27570 04/06/2024

lauri

Repository rebase failed

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

lauri

Repository rebase failed

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

lauri

Repository merge failed

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

lauri

Repository rebase failed

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

lauri

Changes committed

Changes committed 04/06/2024

lauri

Repository rebase failed

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

lauri

Repository merge failed

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

lauri

Repository rebase failed

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

lauri

Repository rebase failed

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

lauri

Repository rebase failed

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

lauri

Resource updated

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

lauri

Repository rebased

Repository rebased

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

lauri

Resource updated

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

lauri

Resource updated

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

lauri

Resource updated

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

lauri

Resource updated

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

lauri

Resource updated

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

lauri

Resource updated

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

59 / 340

/ 340

Search

Action

Author username

Exclude author (username)

Date range

Shortcut	Action
`?`	Open available keyboard shortcuts.
`Alt` + `Home`	Navigate to the first translation in the current search.
`Alt` + `End`	Navigate to the last translation in the current search.
`Alt` + `PageUp` or `Ctrl` + `↑` or `Alt` + `↑` or `Cmd` + `↑` or	Navigate to the previous translation in the current search.
`Alt` + `PageDown` or `Ctrl` + `↓` or `Alt` + `↓` or `Cmd` + `↓` or	Navigate to the next translation in the current search.
`Ctrl` + `Enter` or `Cmd` + `Enter`	Submit current form; this works the same as pressing Save and continue while editing translation.
`Ctrl` + `Shift` + `Enter` or `Cmd` + `Shift` +`Enter`	Unmark translation as Needing edit and submit it.
`Alt` + `Enter` or `Option` + `Enter`	Submit the string as a suggestion; this works the same as pressing Suggest while editing translation.
`Ctrl` + `E` or `Cmd` + `E`	Focus on translation editor.
`Ctrl` + `U` or `Cmd` + `U`	Focus on comment editor.
`Ctrl` + `M` or `Cmd` + `M`	Shows Automatic suggestions tab.
`Ctrl` + `1` to `Ctrl` + `9` or `Cmd` + `1` to `Cmd` + `9`	Copies placeable of a given number from source string.
`Ctrl` + `M` followed by `1` to `9` or `Cmd` + `M` followed by `1` to `9`	Copy the machine translation of a given number to current translation.
`Ctrl` + `I` followed by `1` to `9` or `Cmd` + `I` followed by `1` to `9`	Ignore one item in the list of failing checks.
`Ctrl` + `J` or `Cmd` + `J`	Shows the Nearby strings tab.
`Ctrl` + `S` or `Cmd` + `S`	Focus on search field.
`Ctrl` + `O` or `Cmd` + `O`	Copy the source string.
`Ctrl` + `Y` or `Cmd` + `Y`	Toggle the Needs editing checkbox.
`→`	Browse the next translation string.
`←`	Browse the previous translation string.