Changes @ Translate CubeCraft

153 / 153

/ 153

alm

Repository rebase failed

Rebasing (1/29)
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
error: could not apply 4eccebfd272... Translation update
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".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 4eccebfd272... # Translation update
 (1)

10/07/2025

alm

Repository rebase failed

Rebasing (1/29)
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
error: could not apply 4eccebfd272... Translation update
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".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 4eccebfd272... # Translation update
 (1)

10/07/2025

alm

Repository rebase failed

Rebasing (1/29)
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
error: could not apply 4eccebfd272... Translation update
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".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 4eccebfd272... # Translation update
 (1)

10/07/2025

alm

Repository rebase failed

Rebasing (1/29)
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
error: could not apply 4eccebfd272... Translation update
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".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 4eccebfd272... # Translation update
 (1)

10/07/2025

alm

Repository rebase failed

Rebasing (1/29)
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
error: could not apply 4eccebfd272... Translation update
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".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 4eccebfd272... # Translation update
 (1)

10/07/2025

alm

Repository rebase failed

Rebasing (1/29)
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
error: could not apply 4eccebfd272... Translation update
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".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 4eccebfd272... # Translation update
 (1)

10/07/2025

alm

Changes committed

Changes committed 10/07/2025

alm

Component removed

player-messaging

10/07/2025

153 / 153

/ 153

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.