The translation is temporarily closed for contributions due to maintenance, please come back later.
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 This language is used for source strings. Fix this component to clear its alerts. This translation is locked. 0 0 0 0 0 0 0
Chinese (Simplified) Fix this component to clear its alerts. This translation is locked. 0 0 0 0 0 0 0
Please sign in to see the alerts.

Overview

Project website gitee.com/openkylin/ukui-touch-settings-plugin
Project maintainers zouchang
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Only chosen users can contribute.
  • The translation uses bilingual files.
File mask stylus-settings/translations/*.ts

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 8 54 320
Source 4 27 160
Translated 100% 8 100% 54 100% 320
Needs editing 0% 0 0% 0 0% 0
Read-only 50% 4 50% 27 50% 160
Failing checks 0% 0 0% 0 0% 0
Strings with suggestions 0% 0 0% 0 0% 0
Untranslated strings 0% 0 0% 0 0% 0

Quick numbers

54
Hosted words
8
Hosted strings
100%
Translated
0
Contributors
and previous 30 days

Trends of last 30 days

Hosted words
Hosted strings
Translated
Contributors
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
11 days ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
11 days ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
11 days ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
2 weeks ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
2 weeks ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
2 weeks ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
2 weeks ago
None

Failed rebase on repository

ukui-touch-settings-plugin / stylus-settings

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 1.0.11.1
.git/rebase-apply/patch:1313: new blank line at EOF.
+
.git/rebase-apply/patch:267554: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
warning: Cannot merge binary files: touchscreen-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
warning: Cannot merge binary files: stylus-settings/translations/zh_CN.qm (HEAD vs. Import Upstream version 1.0.11.1)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.ts
Auto-merging touchscreen-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchscreen-settings/translations/zh_CN.qm
Auto-merging touchscreen-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.ui
Auto-merging touchscreen-settings/touchscreen.ui
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.h
Auto-merging touchscreen-settings/touchscreen.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen.cpp
Auto-merging touchscreen-settings/touchscreen.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.pro
Auto-merging touchscreen-settings/touchscreen-settings.pro
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.h
Auto-merging touchscreen-settings/touchscreen-settings.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/touchscreen-settings.cpp
Auto-merging touchscreen-settings/touchscreen-settings.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/resources.qrc
Auto-merging touchscreen-settings/resources.qrc
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.h
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.h
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesturewidget.cpp
Auto-merging touchscreen-settings/gesture-widget/gesturewidget.cpp
CONFLICT (add/add): Merge conflict in touchscreen-settings/gesture-widget/gesture-widget.pri
Auto-merging touchscreen-settings/gesture-widget/gesture-widget.pri
CONFLICT (add/add): Merge conflict in touchpad-settings/translations/zh_CN.ts
Auto-merging touchpad-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.h
Auto-merging touchpad-settings/touchpadsettingsui.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpadsettingsui.cpp
Auto-merging touchpad-settings/touchpadsettingsui.cpp
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.pro
Auto-merging touchpad-settings/touchpad-settings.pro
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.h
Auto-merging touchpad-settings/touchpad-settings.h
CONFLICT (add/add): Merge conflict in touchpad-settings/touchpad-settings.cpp
Auto-merging touchpad-settings/touchpad-settings.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.ts
Auto-merging stylus-settings/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in stylus-settings/translations/zh_CN.qm
Auto-merging stylus-settings/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.h
Auto-merging stylus-settings/stylussettingpage.h
CONFLICT (add/add): Merge conflict in stylus-settings/stylussettingpage.cpp
Auto-merging stylus-settings/stylussettingpage.cpp
CONFLICT (add/add): Merge conflict in stylus-settings/stylus-settings.cpp
Auto-merging stylus-settings/stylus-settings.cpp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Import Upstream version 1.0.11.1
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)
2 weeks ago
None

Component locked

ukui-touch-settings-plugin / stylus-settings

The component was automatically locked because of an alert. 2 weeks ago
None

New alert

ukui-touch-settings-plugin / stylus-settings

Could not merge the repository. 2 weeks ago
Browse all component changes