Commit 36792ff3 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent fdedfdba
Pipeline #19024 passed with stage
in 8 minutes and 50 seconds
......@@ -42,6 +42,7 @@ Comment[pt_BR]=Interface de configuração do Plasma Mobile amigável para telas
Comment[sv]=Pekskärmsvänliga inställningar av användargränssnitt för Plasma mobil
Comment[uk]=Інтерфейс параметрів сенсорного доступу для мобільної Плазми
Comment[x-test]=xxTouchscreen friendly settings UI for Plasma Mobilexx
Comment[zh_TW]=專為 Plasma Mobile 設計的觸控螢幕友好設定介面
Encoding=UTF-8
Type=Service
Icon=preferences-desktop
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment