Please log in to see the alerts.
Project website https://docs.ubports.com
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses bilingual files.
Translation license Creative Commons Attribution Share Alike 4.0 International
Repository https://github.com/ubports/docs.ubports.com.git
Repository branch master
Last remote commit ssh: find IP 37b30e6
Sanath Kumar U authored 2 weeks ago
Repository containing Weblate translations https://translate.ubports.com/git/ubports-docs/documentation-userguide/
Filemasklocales/*/LC_MESSAGES/userguide.po
Number of strings 5,040
Number of words 75,979
Number of characters 520,784
Number of languages 16
Number of source strings 315
Number of source words 2,404
Number of source characters 32,549
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
6 hours ago
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
yesterday
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
yesterday
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
yesterday
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
3 days ago
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
4 days ago
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
5 days ago
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
6 days ago
None

Failed rebase on repository

UBports Docs / Documentation: userguide

First, rewinding head to replay your work on top of it...
Applying: Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
Using index info to reconstruct a base tree...
M	locales/ca/LC_MESSAGES/about.po
M	locales/ca/LC_MESSAGES/appdev.po
M	locales/ca/LC_MESSAGES/contribute.po
M	locales/ca/LC_MESSAGES/porting.po
M	locales/ca/LC_MESSAGES/userguide.po
M	locales/cs/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/appdev.po
M	locales/de/LC_MESSAGES/contribute.po
M	locales/de/LC_MESSAGES/humanguide.po
M	locales/de/LC_MESSAGES/porting.po
M	locales/de/LC_MESSAGES/systemdev.po
M	locales/de/LC_MESSAGES/userguide.po
M	locales/es/LC_MESSAGES/appdev.po
M	locales/es/LC_MESSAGES/contribute.po
M	locales/es/LC_MESSAGES/porting.po
M	locales/es/LC_MESSAGES/userguide.po
M	locales/fr/LC_MESSAGES/appdev.po
M	locales/fr/LC_MESSAGES/contribute.po
M	locales/fr/LC_MESSAGES/porting.po
M	locales/fr/LC_MESSAGES/userguide.po
M	locales/id/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/appdev.po
M	locales/it/LC_MESSAGES/contribute.po
M	locales/it/LC_MESSAGES/porting.po
M	locales/it/LC_MESSAGES/userguide.po
M	locales/ja/LC_MESSAGES/about.po
M	locales/ja/LC_MESSAGES/appdev.po
M	locales/ja/LC_MESSAGES/contribute.po
M	locales/ja/LC_MESSAGES/porting.po
M	locales/ja/LC_MESSAGES/userguide.po
M	locales/ko/LC_MESSAGES/about.po
M	locales/ko/LC_MESSAGES/appdev.po
M	locales/ko/LC_MESSAGES/contribute.po
M	locales/ko/LC_MESSAGES/porting.po
M	locales/ko/LC_MESSAGES/userguide.po
M	locales/pl/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/about.po
M	locales/pt_BR/LC_MESSAGES/appdev.po
M	locales/pt_BR/LC_MESSAGES/contribute.po
M	locales/pt_BR/LC_MESSAGES/porting.po
M	locales/pt_BR/LC_MESSAGES/userguide.po
M	locales/pt_PT/LC_MESSAGES/about.po
M	locales/pt_PT/LC_MESSAGES/appdev.po
M	locales/pt_PT/LC_MESSAGES/contribute.po
M	locales/pt_PT/LC_MESSAGES/porting.po
M	locales/pt_PT/LC_MESSAGES/userguide.po
M	locales/ro/LC_MESSAGES/about.po
M	locales/ro/LC_MESSAGES/appdev.po
M	locales/ro/LC_MESSAGES/porting.po
M	locales/ro/LC_MESSAGES/userguide.po
M	locales/ru/LC_MESSAGES/about.po
M	locales/ru/LC_MESSAGES/appdev.po
M	locales/ru/LC_MESSAGES/contribute.po
M	locales/ru/LC_MESSAGES/humanguide.po
M	locales/ru/LC_MESSAGES/porting.po
M	locales/ru/LC_MESSAGES/systemdev.po
M	locales/ru/LC_MESSAGES/userguide.po
M	locales/sk/LC_MESSAGES/systemdev.po
M	locales/sq/LC_MESSAGES/about.po
M	locales/sq/LC_MESSAGES/appdev.po
M	locales/sq/LC_MESSAGES/contribute.po
M	locales/sq/LC_MESSAGES/porting.po
M	locales/sq/LC_MESSAGES/userguide.po
M	locales/tr/LC_MESSAGES/appdev.po
M	locales/tr/LC_MESSAGES/porting.po
M	locales/tr/LC_MESSAGES/userguide.po
M	locales/zh_Hans/LC_MESSAGES/about.po
M	locales/zh_Hans/LC_MESSAGES/appdev.po
M	locales/zh_Hans/LC_MESSAGES/contribute.po
M	locales/zh_Hans/LC_MESSAGES/porting.po
M	locales/zh_Hans/LC_MESSAGES/userguide.po
M	locales/zh_Hant/LC_MESSAGES/about.po
M	locales/zh_Hant/LC_MESSAGES/appdev.po
M	locales/zh_Hant/LC_MESSAGES/contribute.po
M	locales/zh_Hant/LC_MESSAGES/porting.po
M	locales/zh_Hant/LC_MESSAGES/userguide.po
Falling back to patching base and 3-way merge...
Auto-merging locales/ru/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/ru/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/userguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/userguide.po
Auto-merging locales/de/LC_MESSAGES/humanguide.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/humanguide.po
Auto-merging locales/de/LC_MESSAGES/appdev.po
CONFLICT (content): Merge conflict in locales/de/LC_MESSAGES/appdev.po
error: Failed to merge in the changes.
Patch failed at 0001 Translated by Simon Fritsche <simfrit@gmail.com> using Weblate (German) - 9.9% (26 of 261 strings)
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

 (128)
6 days ago
None

Committed changes

UBports Docs / Documentation: userguideRussian

Committed changes 6 days ago
Browse all component changes

Activity in last 30 days

Activity in last year