Commit 6c996c1f 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 c03bba6e
......@@ -75,7 +75,7 @@ Name[th]=การกระทำต่าง ๆ กับอุปกรณ์
Name[tr]=Aygıt Eylemleri
Name[ug]=ئۈسكۈنە مەشغۇلاتى
Name[uk]=Дії з пристроями
Name[vi]=Hành động cho thiết bị
Name[vi]=Hành động với thiết bị
Name[wa]=Accions di l' éndjin
Name[x-test]=xxDevice Actionsxx
Name[zh_CN]=设备动作
......@@ -184,7 +184,7 @@ X-KDE-Keywords[sr@latin]=Solid Devices Actions,Solidove radnje nad uređajima
X-KDE-Keywords[sv]=Solid enhetsåtgärder
X-KDE-Keywords[tr]=Solid Aygıt Eylemleri
X-KDE-Keywords[uk]=solid,пристрій,пристрої,дія,дії
X-KDE-Keywords[vi]=Hành động cho thiết bị Solid
X-KDE-Keywords[vi]=Hành động với thiết bị Solid
X-KDE-Keywords[x-test]=xxSolid Devices Actionsxx
X-KDE-Keywords[zh_CN]=Solid Devices Actions,设备动作
X-KDE-Keywords[zh_TW]=Solid Devices Actions
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