The translation was automatically locked due to following alerts: Could not merge the repository.
Please sign in to see the alerts.
Overview
Project website | jami.net |
---|---|
Project maintainers |
![]() |
Translation process |
|
Translation license | GNU General Public License v3.0 only |
Source code repository |
https://git.jami.net/savoirfairelinux/ring-client-macosx.git
|
Repository branch | master |
Last remote commit |
i18n: automatic bump
188308d7
Jenkins authored 5 months ago |
Last commit in Weblate |
i18n: update translations
ec4e122a
![]() |
Weblate repository |
https://hosted.weblate.org/git/jami/client-macos/
|
File mask | ui/*.lproj/Localizable.strings |
Monolingual base language file | ui/Base.lproj/Localizable.strings |
String statistics
Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
---|---|---|---|---|---|---|
Total | 3,807 | 16,638 | 94,799 | |||
Source | 81 | 354 | 2,017 | |||
Translated | 78% | 2,979 | 78% | 13,096 | 78% | 74,237 |
Needs editing | 0% | 0 | 0% | 0 | 0% | 0 |
Read-only | 2% | 81 | 2% | 354 | 2% | 2,017 |
Failing checks | 39% | 1,520 | 48% | 8,127 | 48% | 46,121 |
Strings with suggestions | 0% | 0 | 0% | 0 | 0% | 0 |
Untranslated strings | 21% | 828 | 21% | 3,542 | 21% | 20,562 |
![]() New alert |
Could not update the repository.
6 months ago
|
![]() Failed rebase on repository |
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)9 months ago |
![]() Failed rebase on repository |
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)9 months ago |
![]() Failed rebase on repository |
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)9 months ago |
![]() Failed rebase on repository |
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)9 months ago |
![]() Failed rebase on repository |
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 year ago |
![]() Failed rebase on repository |
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 year ago |
![]() Failed rebase on repository |
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 year ago |
![]() Failed rebase on repository |
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 year ago |
![]() Failed rebase on repository |
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 year ago |