| Project website | https://jami.net/ | |
|---|---|---|
| Translation process |
|
|
| Translation license | GNU General Public License v3.0 only | |
| Repository |
https://git.jami.net/savoirfairelinux/ring-client-macosx.git
|
|
| Repository branch | master | |
| Last remote commit |
i18n: automatic bump
3e48799
Jenkins authored yesterday |
|
| Repository containing Weblate translations |
https://hosted.weblate.org/git/jami/client-macos/
|
|
| Filemask | ui/*.lproj/Localizable.strings |
|
| Monolingual base language file | ui/Base.lproj/Localizable.strings |
|
| Number of strings | 3,888 | |
| Number of words | 16,992 | |
| Number of characters | 96,816 | |
| Number of languages | 48 | |
| Number of source strings | 81 | |
| Number of source words | 354 | |
| Number of source characters | 2,017 | |
First, rewinding head to replay your work on top of it... Applying: i18n: update translations Using index info to reconstruct a base tree... M ui/sv.lproj/RingWizardChoose.strings M ui/sv.lproj/RingWizardNewAccount.strings Falling back to patching base and 3-way merge... Auto-merging ui/sv.lproj/RingWizardNewAccount.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardNewAccount.strings Auto-merging ui/sv.lproj/RingWizardChoose.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardChoose.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 i18n: update translations 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". (1)a month ago
First, rewinding head to replay your work on top of it... Applying: i18n: update translations Using index info to reconstruct a base tree... M ui/sv.lproj/RingWizardChoose.strings M ui/sv.lproj/RingWizardNewAccount.strings Falling back to patching base and 3-way merge... Auto-merging ui/sv.lproj/RingWizardNewAccount.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardNewAccount.strings Auto-merging ui/sv.lproj/RingWizardChoose.strings CONFLICT (content): Merge conflict in ui/sv.lproj/RingWizardChoose.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 i18n: update translations 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". (1)a month ago
None