Commit 53999eff authored by Script Kiddy's avatar Script Kiddy
Browse files

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 c44151a0
Pipeline #81420 skipped
......@@ -80,7 +80,7 @@ Name[ug]=ئورۇنلار
Name[uk]=Місця
Name[wa]=Plaeces
Name[x-test]=xxPlacesxx
Name[zh_CN]=位置
Name[zh_CN]=常用位置
Name[zh_TW]=地方
Comment=This is the list of places.
Comment[ar]=هذه لائحة بالأماكن
......
......@@ -64,6 +64,6 @@ Name[ug]=ئورۇن يان بالداق بۆلىكى
Name[uk]=Модуль місць бічної панелі
Name[wa]=Module del bår di costé des plaeces
Name[x-test]=xxPlaces SideBar Modulexx
Name[zh_CN]=位置侧边栏模块
Name[zh_CN]=常用位置侧边栏模块
Name[zh_TW]=地方邊列模組
X-KDE-Library=konqsidebar_places
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