The translation was automatically locked due to following alerts: Could not merge the repository. Could not push the repository.
| Language | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|---|---|
English
CC-BY-SA-3.0
|
0 | 0 | 0 | 0 | 9 | 0 | 0 | ||
|
|
|||||||||
|
French
CC-BY-SA-3.0
|
0% | 26 | 41 | 1,211 | 26 | 25 | 26 | 0 | |
|
|
|||||||||
|
German
CC-BY-SA-3.0
|
0% | 26 | 41 | 1,211 | 26 | 0 | 1 | 0 | |
|
|
|||||||||
|
Indonesian
CC-BY-SA-3.0
|
0 | 0 | 0 | 0 | 8 | 1 | 0 | ||
|
|
|||||||||
|
Korean
CC-BY-SA-3.0
|
0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
|
Spanish
CC-BY-SA-3.0
|
0% | 26 | 41 | 1,211 | 26 | 1 | 26 | 0 | |
|
|
|||||||||
|
Turkish
CC-BY-SA-3.0
|
0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
|
Ukrainian
CC-BY-SA-3.0
|
0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
Please sign in to see the alerts.
Overview
| Project website | pagure.io/fedora-docs-l10n/fedora-release-notes |
|---|---|
| Instructions for translators | Mailing list for translators: <<trans@lists.fedoraproject.org> |
| Translation process |
|
| Translation license | Creative Commons Attribution Share Alike 3.0 Unported |
| Source code repository |
ssh://pagure.io/fedora-docs-l10n/fedora-release-notes.git
|
| Repository branch | master |
| Last remote commit |
automatic update of pot/po files
a80d72a9015
♪ I'm a bot, bot, bot ♪ authored a month ago |
| Last commit in Weblate |
Translated using Weblate (Indonesian)
69d584183a3
 atriwidada authored 3 months ago |
| Weblate repository |
https://translate.fedoraproject.org/git/fedora-docs-l10n-fedora-release-notes/nav/
|
| File mask | po/*/rawhide/nav.po |
String statistics
| Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
|---|---|---|---|---|---|---|
| Total | 208 | 328 | 9,688 | |||
| Source | 26 | 41 | 1,211 | |||
| Translated | 62% | 130 | 62% | 205 | 62% | 6,055 |
| Needs editing | 0% | 0 | 0% | 0 | 0% | 0 |
| Read-only | 12% | 26 | 12% | 41 | 12% | 1,211 |
| Failing checks | 20% | 43 | 17% | 57 | 19% | 1,925 |
| Strings with suggestions | 25% | 54 | 26% | 87 | 25% | 2,510 |
| Untranslated strings | 37% | 78 | 37% | 123 | 37% | 3,633 |
 None
New alert |
Broken project website URL
a month ago
|
|
None
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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
Received repository notification |
Pagure: https://pagure.io/fedora-docs-l10n/fedora-release-notes, master
a month ago
|
|
None
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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
Received repository notification |
Pagure: https://pagure.io/fedora-docs-l10n/fedora-release-notes, master
a month ago
|
|
None
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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
Failed rebase on repository |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Indonesian) Using index info to reconstruct a base tree... A po/id/rawhide/nav.po A po/id/rawhide/pages/Revision_History.po A po/id/rawhide/pages/_partials/Legal_Notice.po A po/id/rawhide/pages/desktop/Desktop_index.po A po/id/rawhide/pages/developers/Developers.po A po/id/rawhide/pages/developers/Development_Binutils.po A po/id/rawhide/pages/developers/Development_C.po A po/id/rawhide/pages/developers/Development_Go.po A po/id/rawhide/pages/developers/Development_Haskell.po A po/id/rawhide/pages/developers/Development_LLVM.po A po/id/rawhide/pages/developers/Development_Python.po A po/id/rawhide/pages/developers/Development_Ruby.po A po/id/rawhide/pages/developers/Development_Tools.po A po/id/rawhide/pages/developers/Development_Web.po A po/id/rawhide/pages/index.po A po/id/rawhide/pages/sysadmin/Distribution.po A po/id/rawhide/pages/sysadmin/Installation.po A po/id/rawhide/pages/sysadmin/Networking.po A po/id/rawhide/pages/sysadmin/Printing_Scanning.po A po/id/rawhide/pages/sysadmin/Security.po A po/id/rawhide/pages/sysadmin/Storage.po A po/id/rawhide/pages/sysadmin/Sysadmins.po A po/id/rawhide/pages/sysadmin/System_Utilities.po A po/id/rawhide/pages/welcome/Hardware_Overview.po A po/id/rawhide/pages/welcome/Welcome.po Falling back to patching base and 3-way merge... Auto-merging po/fr/rawhide/pages/index.po Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po Auto-merging po/fr/rawhide/nav.po Auto-merging po/es/f35/pages/developers/Development_Ruby.po Auto-merging po/de/f35/pages/welcome/Welcome.po Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po Auto-merging po/de/f35/pages/sysadmin/Storage.po Auto-merging po/de/f35/pages/sysadmin/Security.po Auto-merging po/de/f35/pages/sysadmin/Installation.po Auto-merging po/de/f35/pages/developers/Development_Go.po Auto-merging po/de/f35/pages/_partials/Legal_Notice.po Auto-merging po/de/f30/pages/developers/Development_Tools.po Auto-merging po/de/f30/pages/Revision_History.po Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~ CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~ Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po Auto-merging po/cs/f34/pages/developers/Development_C.po Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po Auto-merging po/ar/f34/pages/sysadmin/Networking.po Auto-merging po/ar/f34/pages/developers/Development_Web.po Auto-merging po/ar/f34/pages/developers/Development_Python.po Auto-merging po/ar/f34/pages/developers/Development_LLVM.po Auto-merging po/ar/f34/pages/developers/Development_Haskell.po Auto-merging po/ar/f34/pages/developers/Development_Binutils.po Auto-merging po/ar/f34/pages/developers/Developers.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (Indonesian) 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 |