Please sign in to see the alerts.
| Project website | https://github.com/habitRPG/habitica-android | |
|---|---|---|
| Translation process |
|
|
| Translation license | Proprietary | |
| Repository |
git@github.com:HabitRPG/habitica-android.git
|
|
| Repository branch | develop | |
| Last remote commit |
Update pet detail design
901bd078f
Phillip Thelen authored 2 weeks ago |
|
| Repository containing Weblate translations |
https://translate.habitica.com/git/habitica-android/main-strings/
|
|
| Filemask | Habitica/res/values-*/strings.xml |
|
| Monolingual base language file | Habitica/res/values/strings.xml |
|
| Number of strings | 33,985 | |
| Number of words | 192,640 | |
| Number of characters | 1,107,848 | |
| Number of languages | 35 | |
| Number of source strings | 971 | |
| Number of source words | 5,504 | |
| Number of source characters | 31,659 | |
NoneFirst, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Japanese)
.git/rebase-apply/patch:10296: trailing whitespace.
<string name="profile_send_message">Отправить
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M Habitica/res/values-vi/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging Habitica/res/values-vi/strings.xml
CONFLICT (content): Merge conflict in Habitica/res/values-vi/strings.xml
Auto-merging Habitica/res/values-vi/strings.sidebar.xml
CONFLICT (add/add): Merge conflict in Habitica/res/values-vi/strings.sidebar.xml
error: Failed to merge in the changes.
Patch failed at 0001 Translated using Weblate (Japanese)
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
(128)
21 hours ago
bart