Component Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
kylin-nm Fix this component to clear its alerts. This translation is locked. 49% 258 545 3,531 236 8 0 0
Glossary Glossary 0 0 0 0 0 0 0

Overview

Project website gitee.com/openkylin/kylin-nm
Project maintainers zouchang

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 512 1,076 6,968
Source 128 269 1,742
Translated 49% 254 49% 531 49% 3,437
Needs editing 4% 22 3% 37 3% 247
Read-only 25% 128 25% 269 25% 1,742
Failing checks 1% 8 1% 16 1% 103
Strings with suggestions 0% 0 0% 0 0% 0
Untranslated strings 46% 236 47% 508 47% 3,284

Quick numbers

1,076
Hosted words
512
Hosted strings
49%
Translated
0
Contributors
and previous 30 days

Trends of last 30 days

+100%
Hosted words
+100%
Hosted strings
+49%
Translated
Contributors
Language Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
English This language is used for source strings. Some of the components within this project have alerts. 0 0 0 0 2 0 0
Chinese (Simplified) Some of the components within this project have alerts. 94% 7 13 82 7 0 0 0
Tibetan Some of the components within this project have alerts. 0% 128 269 1,742 128 0 0 0
Turkish Some of the components within this project have alerts. 3% 123 263 1,707 101 6 0 0
None

New alert

kylin-nm / kylin-nm

Repository outdated. yesterday
None

Failed rebase on repository

kylin-nm / kylin-nm

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 3.14.0.0+0512
.git/rebase-apply/patch:696: trailing whitespace.
  麒麟网络工具(kylin-network-manager,简称kylin-nm)是操作系统的网络前端,其主要功能有:  
.git/rebase-apply/patch:697: trailing whitespace.
  1、托盘栏图标及右键菜单  
.git/rebase-apply/patch:698: trailing whitespace.
     查看当前网络状态  
.git/rebase-apply/patch:699: trailing whitespace.
     左键点击托盘网络图标显示kylin-nm主界面  
.git/rebase-apply/patch:700: trailing whitespace.
     右键点击托盘网络图标显示右键菜单  
warning: squelched 323 whitespace errors
warning: 328 lines add whitespace errors.
warning: Cannot merge binary files: translations/kylin-nm_zh_CN.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
warning: Cannot merge binary files: translations/kylin-nm_tr.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
warning: Cannot merge binary files: plugins/wlanconnect/translations/zh_CN.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
warning: Cannot merge binary files: plugins/mobilehotspot/translations/zh_CN.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in translations/kylin-nm_zh_CN.ts
Auto-merging translations/kylin-nm_zh_CN.ts
CONFLICT (add/add): Merge conflict in translations/kylin-nm_zh_CN.qm
Auto-merging translations/kylin-nm_zh_CN.qm
CONFLICT (add/add): Merge conflict in translations/kylin-nm_tr.ts
Auto-merging translations/kylin-nm_tr.ts
CONFLICT (add/add): Merge conflict in translations/kylin-nm_tr.qm
Auto-merging translations/kylin-nm_tr.qm
CONFLICT (add/add): Merge conflict in translations/kylin-nm_bo.ts
Auto-merging translations/kylin-nm_bo.ts
CONFLICT (add/add): Merge conflict in src/src.pro
Auto-merging src/src.pro
CONFLICT (add/add): Merge conflict in src/main.cpp
Auto-merging src/main.cpp
CONFLICT (add/add): Merge conflict in src/frontend/wificonfigdialog.h
Auto-merging src/frontend/wificonfigdialog.h
CONFLICT (add/add): Merge conflict in src/frontend/wificonfigdialog.cpp
Auto-merging src/frontend/wificonfigdialog.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/switchbutton.cpp
Auto-merging src/frontend/tools/switchbutton.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/radioitembutton.h
Auto-merging src/frontend/tools/radioitembutton.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/radioitembutton.cpp
Auto-merging src/frontend/tools/radioitembutton.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/loadingdiv.h
Auto-merging src/frontend/tools/loadingdiv.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/loadingdiv.cpp
Auto-merging src/frontend/tools/loadingdiv.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/kylable.h
Auto-merging src/frontend/tools/kylable.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/kylable.cpp
Auto-merging src/frontend/tools/kylable.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/infobutton.h
Auto-merging src/frontend/tools/infobutton.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/infobutton.cpp
Auto-merging src/frontend/tools/infobutton.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/divider.h
Auto-merging src/frontend/tools/divider.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/divider.cpp
Auto-merging src/frontend/tools/divider.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/wlanpage.h
Auto-merging src/frontend/tab-pages/wlanpage.h
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/wlanpage.cpp
Auto-merging src/frontend/tab-pages/wlanpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/tabpage.h
Auto-merging src/frontend/tab-pages/tabpage.h
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/tabpage.cpp
Auto-merging src/frontend/tab-pages/tabpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/lanpage.h
Auto-merging src/frontend/tab-pages/lanpage.h
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/lanpage.cpp
Auto-merging src/frontend/tab-pages/lanpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/securitypage.h
Auto-merging src/frontend/netdetails/securitypage.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/securitypage.cpp
Auto-merging src/frontend/netdetails/securitypage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/netdetails.pri
Auto-merging src/frontend/netdetails/netdetails.pri
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/netdetail.h
Auto-merging src/frontend/netdetails/netdetail.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/netdetail.cpp
Auto-merging src/frontend/netdetails/netdetail.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv6page.h
Auto-merging src/frontend/netdetails/ipv6page.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv6page.cpp
Auto-merging src/frontend/netdetails/ipv6page.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv4page.h
Auto-merging src/frontend/netdetails/ipv4page.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv4page.cpp
Auto-merging src/frontend/netdetails/ipv4page.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailwidget.h
Auto-merging src/frontend/netdetails/detailwidget.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailwidget.cpp
Auto-merging src/frontend/netdetails/detailwidget.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailpage.h
Auto-merging src/frontend/netdetails/detailpage.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailpage.cpp
Auto-merging src/frontend/netdetails/detailpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/customtabstyle.h
Auto-merging src/frontend/netdetails/customtabstyle.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/customtabstyle.cpp
Auto-merging src/frontend/netdetails/customtabstyle.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/creatnetpage.h
Auto-merging src/frontend/netdetails/creatnetpage.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/creatnetpage.cpp
Auto-merging src/frontend/netdetails/creatnetpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/coninfo.h
Auto-merging src/frontend/netdetails/coninfo.h
CONFLICT (add/add): Merge conflict in src/frontend/mainwindow.h
Auto-merging src/frontend/mainwindow.h
CONFLICT (add/add): Merge conflict in src/frontend/mainwindow.cpp
Auto-merging src/frontend/mainwindow.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanmoreitem.h
Auto-merging src/frontend/list-items/wlanmoreitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanmoreitem.cpp
Auto-merging src/frontend/list-items/wlanmoreitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanlistitem.h
Auto-merging src/frontend/list-items/wlanlistitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanlistitem.cpp
Auto-merging src/frontend/list-items/wlanlistitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/listitem.h
Auto-merging src/frontend/list-items/listitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/listitem.cpp
Auto-merging src/frontend/list-items/listitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/lanlistitem.h
Auto-merging src/frontend/list-items/lanlistitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/lanlistitem.cpp
Auto-merging src/frontend/list-items/lanlistitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/frontend.pri
Auto-merging src/frontend/frontend.pri
CONFLICT (add/add): Merge conflict in src/frontend/enterprise-wlan/enterprisewlandialog.h
Auto-merging src/frontend/enterprise-wlan/enterprisewlandialog.h
CONFLICT (add/add): Merge conflict in src/frontend/enterprise-wlan/enterprisewlandialog.cpp
Auto-merging src/frontend/enterprise-wlan/enterprisewlandialog.cpp
CONFLICT (add/add): Merge conflict in src/frontend/customstyle.h
Auto-merging src/frontend/customstyle.h
CONFLICT (add/add): Merge conflict in src/frontend/customstyle.cpp
Auto-merging src/frontend/customstyle.cpp
CONFLICT (add/add): Merge conflict in src/backend/wifi-auth-thread.h
Auto-merging src/backend/wifi-auth-thread.h
CONFLICT (add/add): Merge conflict in src/backend/wifi-auth-thread.cpp
Auto-merging src/backend/wifi-auth-thread.cpp
CONFLICT (add/add): Merge conflict in src/backend/utils.h
Auto-merging src/backend/utils.h
CONFLICT (add/add): Merge conflict in src/backend/sysdbusregister.h
Auto-merging src/backend/sysdbusregister.h
CONFLICT (add/add): Merge conflict in src/backend/kylinipv6arping.h
Auto-merging src/backend/kylinipv6arping.h
CONFLICT (add/add): Merge conflict in src/backend/kylinipv6arping.cpp
Auto-merging src/backend/kylinipv6arping.cpp
CONFLICT (add/add): Merge conflict in src/backend/kylinipv4arping.h
Auto-merging src/backend/kylinipv4arping.h
CONFLICT (add/add): Merge conflict in src/backend/kylinipv4arping.cpp
Auto-merging src/backend/kylinipv4arping.cpp
CONFLICT (add/add): Merge conflict in src/backend/kylinarping.h
Auto-merging src/backend/kylinarping.h
CONFLICT (add/add): Merge conflict in src/backend/hotspot/dlghotspotcreate.h
Auto-merging src/backend/hotspot/dlghotspotcreate.h
CONFLICT (add/add): Merge conflict in src/backend/hotspot/dlghotspotcreate.cpp
Auto-merging src/backend/hotspot/dlghotspotcreate.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbusadaptor.h
Auto-merging src/backend/dbusadaptor.h
CONFLICT (add/add): Merge conflict in src/backend/dbusadaptor.cpp
Auto-merging src/backend/dbusadaptor.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/nm-macros-internal.h
Auto-merging src/backend/dbus-interface/nm-macros-internal.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetresource.h
Auto-merging src/backend/dbus-interface/kywirelessnetresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetresource.cpp
Auto-merging src/backend/dbus-interface/kywirelessnetresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetitem.h
Auto-merging src/backend/dbus-interface/kywirelessnetitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetitem.cpp
Auto-merging src/backend/dbus-interface/kywirelessnetitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessconnectoperation.h
Auto-merging src/backend/dbus-interface/kywirelessconnectoperation.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessconnectoperation.cpp
Auto-merging src/backend/dbus-interface/kywirelessconnectoperation.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinwiredconnectoperation.h
Auto-merging src/backend/dbus-interface/kylinwiredconnectoperation.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinwiredconnectoperation.cpp
Auto-merging src/backend/dbus-interface/kylinwiredconnectoperation.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinvpnrequest.h
Auto-merging src/backend/dbus-interface/kylinvpnrequest.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinvpnconnectitem.h
Auto-merging src/backend/dbus-interface/kylinvpnconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinvpnconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinvpnconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinutil.h
Auto-merging src/backend/dbus-interface/kylinutil.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinutil.cpp
Auto-merging src/backend/dbus-interface/kylinutil.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkresourcemanager.h
Auto-merging src/backend/dbus-interface/kylinnetworkresourcemanager.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkresourcemanager.cpp
Auto-merging src/backend/dbus-interface/kylinnetworkresourcemanager.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkdeviceresource.h
Auto-merging src/backend/dbus-interface/kylinnetworkdeviceresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkdeviceresource.cpp
Auto-merging src/backend/dbus-interface/kylinnetworkdeviceresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectresource.h
Auto-merging src/backend/dbus-interface/kylinconnectresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectresource.cpp
Auto-merging src/backend/dbus-interface/kylinconnectresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectoperation.h
Auto-merging src/backend/dbus-interface/kylinconnectoperation.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectoperation.cpp
Auto-merging src/backend/dbus-interface/kylinconnectoperation.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectitem.h
Auto-merging src/backend/dbus-interface/kylinconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinbluetoothconnectitem.h
Auto-merging src/backend/dbus-interface/kylinbluetoothconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinbluetoothconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinbluetoothconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinapconnectitem.h
Auto-merging src/backend/dbus-interface/kylinapconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinapconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinapconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinagentinterface.h
Auto-merging src/backend/dbus-interface/kylinagentinterface.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinagent.h
Auto-merging src/backend/dbus-interface/kylinagent.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinactiveconnectresource.h
Auto-merging src/backend/dbus-interface/kylinactiveconnectresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinactiveconnectresource.cpp
Auto-merging src/backend/dbus-interface/kylinactiveconnectresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kyenterpricesettinginfo.h
Auto-merging src/backend/dbus-interface/kyenterpricesettinginfo.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kyenterpricesettinginfo.cpp
Auto-merging src/backend/dbus-interface/kyenterpricesettinginfo.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/gsystem-local-alloc.h
Auto-merging src/backend/dbus-interface/gsystem-local-alloc.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanitem.h
Auto-merging plugins/wlanconnect/wlanitem.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanitem.cpp
Auto-merging plugins/wlanconnect/wlanitem.cpp
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanconnect.pro
Auto-merging plugins/wlanconnect/wlanconnect.pro
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanconnect.h
Auto-merging plugins/wlanconnect/wlanconnect.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanconnect.cpp
Auto-merging plugins/wlanconnect/wlanconnect.cpp
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/zh_CN.ts
Auto-merging plugins/wlanconnect/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/zh_CN.qm
Auto-merging plugins/wlanconnect/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/tr.ts
Auto-merging plugins/wlanconnect/translations/tr.ts
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/bo.ts
Auto-merging plugins/wlanconnect/translations/bo.ts
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/itemframe.h
Auto-merging plugins/wlanconnect/itemframe.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/itemframe.cpp
Auto-merging plugins/wlanconnect/itemframe.cpp
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/deviceframe.h
Auto-merging plugins/wlanconnect/deviceframe.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/deviceframe.cpp
Auto-merging plugins/wlanconnect/deviceframe.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/netconnect.pro
Auto-merging plugins/netconnect/netconnect.pro
CONFLICT (add/add): Merge conflict in plugins/netconnect/netconnect.h
Auto-merging plugins/netconnect/netconnect.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/netconnect.cpp
Auto-merging plugins/netconnect/netconnect.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/lanitem.h
Auto-merging plugins/netconnect/lanitem.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/lanitem.cpp
Auto-merging plugins/netconnect/lanitem.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/itemframe.h
Auto-merging plugins/netconnect/itemframe.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/itemframe.cpp
Auto-merging plugins/netconnect/itemframe.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/deviceframe.h
Auto-merging plugins/netconnect/deviceframe.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/deviceframe.cpp
Auto-merging plugins/netconnect/deviceframe.cpp
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/zh_CN.ts
Auto-merging plugins/mobilehotspot/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/zh_CN.qm
Auto-merging plugins/mobilehotspot/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/tr.ts
Auto-merging plugins/mobilehotspot/translations/tr.ts
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/bo.ts
Auto-merging plugins/mobilehotspot/translations/bo.ts
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspotwidget.h
Auto-merging plugins/mobilehotspot/mobilehotspotwidget.h
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspotwidget.cpp
Auto-merging plugins/mobilehotspot/mobilehotspotwidget.cpp
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspot.pro
Auto-merging plugins/mobilehotspot/mobilehotspot.pro
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspot.cpp
Auto-merging plugins/mobilehotspot/mobilehotspot.cpp
CONFLICT (add/add): Merge conflict in plugins/component/InfoButton/infobutton.h
Auto-merging plugins/component/InfoButton/infobutton.h
CONFLICT (add/add): Merge conflict in plugins/component/InfoButton/infobutton.cpp
Auto-merging plugins/component/InfoButton/infobutton.cpp
CONFLICT (add/add): Merge conflict in plugins/component/DrownLabel/drownlabel.h
Auto-merging plugins/component/DrownLabel/drownlabel.h
CONFLICT (add/add): Merge conflict in plugins/component/DrownLabel/drownlabel.cpp
Auto-merging plugins/component/DrownLabel/drownlabel.cpp
CONFLICT (add/add): Merge conflict in nmqrc.qrc
Auto-merging nmqrc.qrc
CONFLICT (add/add): Merge conflict in kylin-nm.pro
Auto-merging kylin-nm.pro
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 3.14.0.0+0512
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)
yesterday
None

New alert

kylin-nm / kylin-nm

Could not update the repository. yesterday
None

Component locked

kylin-nm / kylin-nm

The component was automatically locked because of an alert. yesterday
None

New alert

kylin-nm / kylin-nm

Could not merge the repository. yesterday
None

Failed rebase on repository

kylin-nm / kylin-nm

First, rewinding head to replay your work on top of it...
Applying: Import Upstream version 3.14.0.0+0512
.git/rebase-apply/patch:696: trailing whitespace.
  麒麟网络工具(kylin-network-manager,简称kylin-nm)是操作系统的网络前端,其主要功能有:  
.git/rebase-apply/patch:697: trailing whitespace.
  1、托盘栏图标及右键菜单  
.git/rebase-apply/patch:698: trailing whitespace.
     查看当前网络状态  
.git/rebase-apply/patch:699: trailing whitespace.
     左键点击托盘网络图标显示kylin-nm主界面  
.git/rebase-apply/patch:700: trailing whitespace.
     右键点击托盘网络图标显示右键菜单  
warning: squelched 323 whitespace errors
warning: 328 lines add whitespace errors.
warning: Cannot merge binary files: translations/kylin-nm_zh_CN.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
warning: Cannot merge binary files: translations/kylin-nm_tr.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
warning: Cannot merge binary files: plugins/wlanconnect/translations/zh_CN.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
warning: Cannot merge binary files: plugins/mobilehotspot/translations/zh_CN.qm (HEAD vs. Import Upstream version 3.14.0.0+0512)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in translations/kylin-nm_zh_CN.ts
Auto-merging translations/kylin-nm_zh_CN.ts
CONFLICT (add/add): Merge conflict in translations/kylin-nm_zh_CN.qm
Auto-merging translations/kylin-nm_zh_CN.qm
CONFLICT (add/add): Merge conflict in translations/kylin-nm_tr.ts
Auto-merging translations/kylin-nm_tr.ts
CONFLICT (add/add): Merge conflict in translations/kylin-nm_tr.qm
Auto-merging translations/kylin-nm_tr.qm
CONFLICT (add/add): Merge conflict in translations/kylin-nm_bo.ts
Auto-merging translations/kylin-nm_bo.ts
CONFLICT (add/add): Merge conflict in src/src.pro
Auto-merging src/src.pro
CONFLICT (add/add): Merge conflict in src/main.cpp
Auto-merging src/main.cpp
CONFLICT (add/add): Merge conflict in src/frontend/wificonfigdialog.h
Auto-merging src/frontend/wificonfigdialog.h
CONFLICT (add/add): Merge conflict in src/frontend/wificonfigdialog.cpp
Auto-merging src/frontend/wificonfigdialog.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/switchbutton.cpp
Auto-merging src/frontend/tools/switchbutton.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/radioitembutton.h
Auto-merging src/frontend/tools/radioitembutton.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/radioitembutton.cpp
Auto-merging src/frontend/tools/radioitembutton.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/loadingdiv.h
Auto-merging src/frontend/tools/loadingdiv.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/loadingdiv.cpp
Auto-merging src/frontend/tools/loadingdiv.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/kylable.h
Auto-merging src/frontend/tools/kylable.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/kylable.cpp
Auto-merging src/frontend/tools/kylable.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/infobutton.h
Auto-merging src/frontend/tools/infobutton.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/infobutton.cpp
Auto-merging src/frontend/tools/infobutton.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tools/divider.h
Auto-merging src/frontend/tools/divider.h
CONFLICT (add/add): Merge conflict in src/frontend/tools/divider.cpp
Auto-merging src/frontend/tools/divider.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/wlanpage.h
Auto-merging src/frontend/tab-pages/wlanpage.h
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/wlanpage.cpp
Auto-merging src/frontend/tab-pages/wlanpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/tabpage.h
Auto-merging src/frontend/tab-pages/tabpage.h
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/tabpage.cpp
Auto-merging src/frontend/tab-pages/tabpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/lanpage.h
Auto-merging src/frontend/tab-pages/lanpage.h
CONFLICT (add/add): Merge conflict in src/frontend/tab-pages/lanpage.cpp
Auto-merging src/frontend/tab-pages/lanpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/securitypage.h
Auto-merging src/frontend/netdetails/securitypage.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/securitypage.cpp
Auto-merging src/frontend/netdetails/securitypage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/netdetails.pri
Auto-merging src/frontend/netdetails/netdetails.pri
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/netdetail.h
Auto-merging src/frontend/netdetails/netdetail.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/netdetail.cpp
Auto-merging src/frontend/netdetails/netdetail.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv6page.h
Auto-merging src/frontend/netdetails/ipv6page.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv6page.cpp
Auto-merging src/frontend/netdetails/ipv6page.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv4page.h
Auto-merging src/frontend/netdetails/ipv4page.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/ipv4page.cpp
Auto-merging src/frontend/netdetails/ipv4page.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailwidget.h
Auto-merging src/frontend/netdetails/detailwidget.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailwidget.cpp
Auto-merging src/frontend/netdetails/detailwidget.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailpage.h
Auto-merging src/frontend/netdetails/detailpage.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/detailpage.cpp
Auto-merging src/frontend/netdetails/detailpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/customtabstyle.h
Auto-merging src/frontend/netdetails/customtabstyle.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/customtabstyle.cpp
Auto-merging src/frontend/netdetails/customtabstyle.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/creatnetpage.h
Auto-merging src/frontend/netdetails/creatnetpage.h
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/creatnetpage.cpp
Auto-merging src/frontend/netdetails/creatnetpage.cpp
CONFLICT (add/add): Merge conflict in src/frontend/netdetails/coninfo.h
Auto-merging src/frontend/netdetails/coninfo.h
CONFLICT (add/add): Merge conflict in src/frontend/mainwindow.h
Auto-merging src/frontend/mainwindow.h
CONFLICT (add/add): Merge conflict in src/frontend/mainwindow.cpp
Auto-merging src/frontend/mainwindow.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanmoreitem.h
Auto-merging src/frontend/list-items/wlanmoreitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanmoreitem.cpp
Auto-merging src/frontend/list-items/wlanmoreitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanlistitem.h
Auto-merging src/frontend/list-items/wlanlistitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/wlanlistitem.cpp
Auto-merging src/frontend/list-items/wlanlistitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/listitem.h
Auto-merging src/frontend/list-items/listitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/listitem.cpp
Auto-merging src/frontend/list-items/listitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/list-items/lanlistitem.h
Auto-merging src/frontend/list-items/lanlistitem.h
CONFLICT (add/add): Merge conflict in src/frontend/list-items/lanlistitem.cpp
Auto-merging src/frontend/list-items/lanlistitem.cpp
CONFLICT (add/add): Merge conflict in src/frontend/frontend.pri
Auto-merging src/frontend/frontend.pri
CONFLICT (add/add): Merge conflict in src/frontend/enterprise-wlan/enterprisewlandialog.h
Auto-merging src/frontend/enterprise-wlan/enterprisewlandialog.h
CONFLICT (add/add): Merge conflict in src/frontend/enterprise-wlan/enterprisewlandialog.cpp
Auto-merging src/frontend/enterprise-wlan/enterprisewlandialog.cpp
CONFLICT (add/add): Merge conflict in src/frontend/customstyle.h
Auto-merging src/frontend/customstyle.h
CONFLICT (add/add): Merge conflict in src/frontend/customstyle.cpp
Auto-merging src/frontend/customstyle.cpp
CONFLICT (add/add): Merge conflict in src/backend/wifi-auth-thread.h
Auto-merging src/backend/wifi-auth-thread.h
CONFLICT (add/add): Merge conflict in src/backend/wifi-auth-thread.cpp
Auto-merging src/backend/wifi-auth-thread.cpp
CONFLICT (add/add): Merge conflict in src/backend/utils.h
Auto-merging src/backend/utils.h
CONFLICT (add/add): Merge conflict in src/backend/sysdbusregister.h
Auto-merging src/backend/sysdbusregister.h
CONFLICT (add/add): Merge conflict in src/backend/kylinipv6arping.h
Auto-merging src/backend/kylinipv6arping.h
CONFLICT (add/add): Merge conflict in src/backend/kylinipv6arping.cpp
Auto-merging src/backend/kylinipv6arping.cpp
CONFLICT (add/add): Merge conflict in src/backend/kylinipv4arping.h
Auto-merging src/backend/kylinipv4arping.h
CONFLICT (add/add): Merge conflict in src/backend/kylinipv4arping.cpp
Auto-merging src/backend/kylinipv4arping.cpp
CONFLICT (add/add): Merge conflict in src/backend/kylinarping.h
Auto-merging src/backend/kylinarping.h
CONFLICT (add/add): Merge conflict in src/backend/hotspot/dlghotspotcreate.h
Auto-merging src/backend/hotspot/dlghotspotcreate.h
CONFLICT (add/add): Merge conflict in src/backend/hotspot/dlghotspotcreate.cpp
Auto-merging src/backend/hotspot/dlghotspotcreate.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbusadaptor.h
Auto-merging src/backend/dbusadaptor.h
CONFLICT (add/add): Merge conflict in src/backend/dbusadaptor.cpp
Auto-merging src/backend/dbusadaptor.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/nm-macros-internal.h
Auto-merging src/backend/dbus-interface/nm-macros-internal.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetresource.h
Auto-merging src/backend/dbus-interface/kywirelessnetresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetresource.cpp
Auto-merging src/backend/dbus-interface/kywirelessnetresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetitem.h
Auto-merging src/backend/dbus-interface/kywirelessnetitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessnetitem.cpp
Auto-merging src/backend/dbus-interface/kywirelessnetitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessconnectoperation.h
Auto-merging src/backend/dbus-interface/kywirelessconnectoperation.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kywirelessconnectoperation.cpp
Auto-merging src/backend/dbus-interface/kywirelessconnectoperation.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinwiredconnectoperation.h
Auto-merging src/backend/dbus-interface/kylinwiredconnectoperation.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinwiredconnectoperation.cpp
Auto-merging src/backend/dbus-interface/kylinwiredconnectoperation.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinvpnrequest.h
Auto-merging src/backend/dbus-interface/kylinvpnrequest.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinvpnconnectitem.h
Auto-merging src/backend/dbus-interface/kylinvpnconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinvpnconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinvpnconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinutil.h
Auto-merging src/backend/dbus-interface/kylinutil.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinutil.cpp
Auto-merging src/backend/dbus-interface/kylinutil.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkresourcemanager.h
Auto-merging src/backend/dbus-interface/kylinnetworkresourcemanager.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkresourcemanager.cpp
Auto-merging src/backend/dbus-interface/kylinnetworkresourcemanager.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkdeviceresource.h
Auto-merging src/backend/dbus-interface/kylinnetworkdeviceresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinnetworkdeviceresource.cpp
Auto-merging src/backend/dbus-interface/kylinnetworkdeviceresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectresource.h
Auto-merging src/backend/dbus-interface/kylinconnectresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectresource.cpp
Auto-merging src/backend/dbus-interface/kylinconnectresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectoperation.h
Auto-merging src/backend/dbus-interface/kylinconnectoperation.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectoperation.cpp
Auto-merging src/backend/dbus-interface/kylinconnectoperation.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectitem.h
Auto-merging src/backend/dbus-interface/kylinconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinbluetoothconnectitem.h
Auto-merging src/backend/dbus-interface/kylinbluetoothconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinbluetoothconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinbluetoothconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinapconnectitem.h
Auto-merging src/backend/dbus-interface/kylinapconnectitem.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinapconnectitem.cpp
Auto-merging src/backend/dbus-interface/kylinapconnectitem.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinagentinterface.h
Auto-merging src/backend/dbus-interface/kylinagentinterface.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinagent.h
Auto-merging src/backend/dbus-interface/kylinagent.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinactiveconnectresource.h
Auto-merging src/backend/dbus-interface/kylinactiveconnectresource.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kylinactiveconnectresource.cpp
Auto-merging src/backend/dbus-interface/kylinactiveconnectresource.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kyenterpricesettinginfo.h
Auto-merging src/backend/dbus-interface/kyenterpricesettinginfo.h
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/kyenterpricesettinginfo.cpp
Auto-merging src/backend/dbus-interface/kyenterpricesettinginfo.cpp
CONFLICT (add/add): Merge conflict in src/backend/dbus-interface/gsystem-local-alloc.h
Auto-merging src/backend/dbus-interface/gsystem-local-alloc.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanitem.h
Auto-merging plugins/wlanconnect/wlanitem.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanitem.cpp
Auto-merging plugins/wlanconnect/wlanitem.cpp
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanconnect.pro
Auto-merging plugins/wlanconnect/wlanconnect.pro
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanconnect.h
Auto-merging plugins/wlanconnect/wlanconnect.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/wlanconnect.cpp
Auto-merging plugins/wlanconnect/wlanconnect.cpp
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/zh_CN.ts
Auto-merging plugins/wlanconnect/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/zh_CN.qm
Auto-merging plugins/wlanconnect/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/tr.ts
Auto-merging plugins/wlanconnect/translations/tr.ts
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/translations/bo.ts
Auto-merging plugins/wlanconnect/translations/bo.ts
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/itemframe.h
Auto-merging plugins/wlanconnect/itemframe.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/itemframe.cpp
Auto-merging plugins/wlanconnect/itemframe.cpp
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/deviceframe.h
Auto-merging plugins/wlanconnect/deviceframe.h
CONFLICT (add/add): Merge conflict in plugins/wlanconnect/deviceframe.cpp
Auto-merging plugins/wlanconnect/deviceframe.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/netconnect.pro
Auto-merging plugins/netconnect/netconnect.pro
CONFLICT (add/add): Merge conflict in plugins/netconnect/netconnect.h
Auto-merging plugins/netconnect/netconnect.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/netconnect.cpp
Auto-merging plugins/netconnect/netconnect.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/lanitem.h
Auto-merging plugins/netconnect/lanitem.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/lanitem.cpp
Auto-merging plugins/netconnect/lanitem.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/itemframe.h
Auto-merging plugins/netconnect/itemframe.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/itemframe.cpp
Auto-merging plugins/netconnect/itemframe.cpp
CONFLICT (add/add): Merge conflict in plugins/netconnect/deviceframe.h
Auto-merging plugins/netconnect/deviceframe.h
CONFLICT (add/add): Merge conflict in plugins/netconnect/deviceframe.cpp
Auto-merging plugins/netconnect/deviceframe.cpp
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/zh_CN.ts
Auto-merging plugins/mobilehotspot/translations/zh_CN.ts
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/zh_CN.qm
Auto-merging plugins/mobilehotspot/translations/zh_CN.qm
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/tr.ts
Auto-merging plugins/mobilehotspot/translations/tr.ts
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/translations/bo.ts
Auto-merging plugins/mobilehotspot/translations/bo.ts
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspotwidget.h
Auto-merging plugins/mobilehotspot/mobilehotspotwidget.h
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspotwidget.cpp
Auto-merging plugins/mobilehotspot/mobilehotspotwidget.cpp
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspot.pro
Auto-merging plugins/mobilehotspot/mobilehotspot.pro
CONFLICT (add/add): Merge conflict in plugins/mobilehotspot/mobilehotspot.cpp
Auto-merging plugins/mobilehotspot/mobilehotspot.cpp
CONFLICT (add/add): Merge conflict in plugins/component/InfoButton/infobutton.h
Auto-merging plugins/component/InfoButton/infobutton.h
CONFLICT (add/add): Merge conflict in plugins/component/InfoButton/infobutton.cpp
Auto-merging plugins/component/InfoButton/infobutton.cpp
CONFLICT (add/add): Merge conflict in plugins/component/DrownLabel/drownlabel.h
Auto-merging plugins/component/DrownLabel/drownlabel.h
CONFLICT (add/add): Merge conflict in plugins/component/DrownLabel/drownlabel.cpp
Auto-merging plugins/component/DrownLabel/drownlabel.cpp
CONFLICT (add/add): Merge conflict in nmqrc.qrc
Auto-merging nmqrc.qrc
CONFLICT (add/add): Merge conflict in kylin-nm.pro
Auto-merging kylin-nm.pro
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 3.14.0.0+0512
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)
yesterday
None

Component unlocked

kylin-nm / kylin-nm

Fixing an alert automatically unlocked the component. yesterday
None

Component locked

kylin-nm / kylin-nm

The component was automatically locked because of an alert. yesterday
None

New alert

kylin-nm / kylin-nm

Could not update the repository. yesterday
None

Resource update

kylin-nm / GlossaryChinese (Simplified)

File zh_Hans.tbx was added. 11 days ago
Browse all project changes