mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 09:23:03 +00:00
903778bc83
# Conflicts: # frame/window/mainwindow.cpp # plugins/network/item/wirelessitem.cpp # plugins/power/powerplugin.cpp # translations/dde-dock.ts # translations/dde-dock_ar.ts # translations/dde-dock_ca.ts # translations/dde-dock_cs.ts # translations/dde-dock_da.ts # translations/dde-dock_de.ts # translations/dde-dock_es.ts # translations/dde-dock_fi.ts # translations/dde-dock_fr.ts # translations/dde-dock_hr.ts # translations/dde-dock_hu.ts # translations/dde-dock_it.ts # translations/dde-dock_ko.ts # translations/dde-dock_lt.ts # translations/dde-dock_ms.ts # translations/dde-dock_pl.ts # translations/dde-dock_pt.ts # translations/dde-dock_pt_BR.ts # translations/dde-dock_ro.ts # translations/dde-dock_ru.ts # translations/dde-dock_si.ts # translations/dde-dock_sk.ts # translations/dde-dock_sq.ts # translations/dde-dock_sr.ts # translations/dde-dock_tr.ts # translations/dde-dock_uk.ts # translations/dde-dock_vi.ts # translations/dde-dock_zh_CN.ts # translations/dde-dock_zh_HK.ts # translations/dde-dock_zh_TW.ts