The translation was automatically locked due to following alerts: Could not merge the repository.
| Language | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|---|---|
| English CC-BY-4.0 | 0 | 0 | 0 | 0 | 10 | 0 | 0 | ||
|
|
|||||||||
| Arabic CC-BY-4.0 | 3% | 338 | 1,108 | 7,121 | 336 | 0 | 0 | 0 | |
|
|
|||||||||
| Chinese (Simplified Han script) CC-BY-4.0 | 98% | 4 | 7 | 43 | 0 | 1 | 0 | 0 | |
|
|
|||||||||
| Czech CC-BY-4.0 | 71% | 100 | 293 | 1,865 | 75 | 9 | 0 | 0 | |
|
|
|||||||||
| Dutch CC-BY-4.0 | 41% | 206 | 793 | 5,091 | 185 | 4 | 0 | 0 | |
|
|
|||||||||
| Finnish CC-BY-4.0 | 31% | 240 | 879 | 5,653 | 226 | 2 | 0 | 0 | |
|
|
|||||||||
| French CC-BY-4.0 | 76% | 82 | 229 | 1,435 | 50 | 6 | 0 | 0 | |
|
|
|||||||||
| German CC-BY-4.0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | ||
|
|
|||||||||
| Hebrew CC-BY-4.0 | 5% | 330 | 1,099 | 7,064 | 330 | 0 | 0 | 0 | |
|
|
|||||||||
| Italian CC-BY-4.0 | 17% | 290 | 973 | 6,220 | 290 | 6 | 0 | 0 | |
|
|
|||||||||
| Japanese CC-BY-4.0 | 11% | 310 | 1,029 | 6,621 | 308 | 0 | 0 | 0 | |
|
|
|||||||||
| Korean CC-BY-4.0 | 21% | 274 | 991 | 6,379 | 262 | 2 | 0 | 0 | |
|
|
|||||||||
| Occitan CC-BY-4.0 | 27% | 255 | 977 | 6,336 | 224 | 13 | 0 | 0 | |
|
|
|||||||||
| Polish CC-BY-4.0 | 0% | 350 | 1,139 | 7,307 | 350 | 0 | 0 | 0 | |
|
|
|||||||||
| Portuguese (Brazil) CC-BY-4.0 | 78% | 74 | 218 | 1,362 | 56 | 6 | 0 | 0 | |
|
|
|||||||||
| Portuguese (Portugal) CC-BY-4.0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
| Russian CC-BY-4.0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
| Spanish CC-BY-4.0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
| Turkish CC-BY-4.0 | 20% | 277 | 965 | 6,158 | 276 | 0 | 0 | 0 | |
|
|
|||||||||
| Ukrainian CC-BY-4.0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | ||
|
|
|||||||||
Overview
| Project website | qprompt.app |
|---|---|
| Instructions for translators |
|
| Translation license | Creative Commons Attribution 4.0 International |
| Contributor agreement |
Contributor License AgreementThis Contribution License Agreement (“Agreement”) is agreed to by the party signing (“You”), and conveys certain license rights to Javier Oscar Cordero Pérez and its affiliates (“Cuperino”) for Your contributions to Cuperino open source projects. 1. Definitions
2. Your SubmissionYou must agree to the terms of this Agreement before making a Submission to any Project. This Agreement covers any and all Submissions that You, now or in the future (except as described in Section 4 below), Submit to any Project. 3. Originality of WorkYou represent that each of Your Submissions is entirely Your original work. Should You wish to Submit materials that are not Your original work, You may Submit them separately to the Project if You (a) retain all copyright and license information that was in the materials as You received them, (b) in the description accompanying Your Submission, include the phrase “Submission containing materials of a third party:” followed by the names of the third party and any licenses or other restrictions of which You are aware, and (c) follow any other instructions in the Project’s written guidelines concerning Submissions. 4. Your EmployerReferences to “employer” in this Agreement include Your employer or anyone else for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your Submission is made in the course of Your work for an employer or Your employer has intellectual property rights in Your Submission by contract or applicable law, You must secure permission from Your employer to make the Submission before signing this Agreement. In that case, the term “You” in this Agreement will refer to You and the employer collectively. If You change employers in the future and desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Submissions. 5. Licenses
6. Representations and WarrantiesYou represent that You are legally entitled to grant the above licenses. You represent that each of Your Submissions is entirely Your original work (except as You may have disclosed under Section 3). You represent that You have secured permission from Your employer to make the Submission in cases where Your Submission is made in the course of Your work for Your employer or Your employer has intellectual property rights in Your Submission by contract or applicable law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You have the necessary authority to bind the listed employer to the obligations contained in this Agreement. You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. 7. Notice to CuperinoYou agree to notify Cuperino in writing of any facts or circumstances of which You later become aware that would make Your representations in this Agreement inaccurate in any respect. 8. Information about SubmissionsYou agree that contributions to Projects and information about contributions may be maintained indefinitely and disclosed publicly, including Your name and other information that You submit with Your Submission. 9. Governing Law/JurisdictionThis Agreement is governed by the laws of the Government of Puerto Rico, and the parties consent to exclusive jurisdiction and venue in the federal courts sitting in San Juan, Puerto Rico, unless no federal subject matter jurisdiction exists. The parties waive all defenses of lack of personal jurisdiction and forum non-conveniens. 10. Entire Agreement/AssignmentThis Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by Cuperino. By signing, You accept and agree to the terms of this Contribution License Agreement for Your present and future Submissions to Cuperino. |
| Translation process |
|
| File mask | po/*.po |
String statistics
| Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
|---|---|---|---|---|---|---|
| Total | 7,000 | 22,654 | 146,140 | |||
| Source | 350 | 1,130 | 7,307 | |||
| Translated | 55% | 3,870 | 52% | 11,954 | 53% | 77,485 |
| Needs editing | 2% | 162 | 1% | 438 | 1% | 2,885 |
| Read-only | 5% | 350 | 4% | 1,130 | 5% | 7,307 |
| Failing checks | 1% | 59 | 1% | 114 | 1% | 833 |
| Strings with suggestions | 0% | 0 | 0% | 0 | 0% | 0 |
| Untranslated strings | 42% | 2,968 | 45% | 10,262 | 45% | 65,770 |
Quick numbers
Trends of last 30 days
None
Repository rebase failed |
35 minutes ago
|
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)an hour ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)2 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)3 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)4 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)5 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)6 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)6 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)7 hours ago |
None
Repository rebase failed |
warning: skipped previously applied commit 5b67eabd warning: skipped previously applied commit fc4a1098 warning: skipped previously applied commit 53509407 warning: skipped previously applied commit 890a5a84 warning: skipped previously applied commit 4eab8124 warning: skipped previously applied commit d5df0eca warning: skipped previously applied commit fb68439e warning: skipped previously applied commit 7d67a52b warning: skipped previously applied commit 8787382e warning: skipped previously applied commit ba7766e1 warning: skipped previously applied commit dd11325e warning: skipped previously applied commit 43ff1b26 warning: skipped previously applied commit 8ae5762a warning: skipped previously applied commit dba0576b warning: skipped previously applied commit 81f60ee1 warning: skipped previously applied commit 49fcd94b warning: skipped previously applied commit c06cc6a6 warning: skipped previously applied commit cf5b83d3 warning: skipped previously applied commit 5bd90f7c warning: skipped previously applied commit 43987b3b warning: skipped previously applied commit 338a3fbc warning: skipped previously applied commit a4fdb88b warning: skipped previously applied commit 7ea90c55 warning: skipped previously applied commit 8fbace4a warning: skipped previously applied commit 2f1ac940 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/6) Auto-merging src/kirigami_ui/+android/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+android/main.qml Auto-merging src/kirigami_ui/+windows/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/+windows/main.qml Auto-merging src/kirigami_ui/main.qml CONFLICT (content): Merge conflict in src/kirigami_ui/main.qml Auto-merging src/prompter/PointerSettings.qml Auto-merging src/prompter/Prompter.qml error: could not apply 95332ced... Revert "Change Files API to the non-deprecated one" hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 95332ced... Revert "Change Files API to the non-deprecated one" (1)8 hours ago |
None