Commit a9954dc1 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 87da6e5d
......@@ -70,5 +70,6 @@ Name[pt_BR]=Executar comando no conteúdo da área de transferência
Name[sv]=Kör kommando med klippbordets innehåll
Name[uk]=Виконати команду над вмістом буфера обміну
Name[x-test]=xxRun command on clipboard contentsxx
Name[zh_CN]=在剪贴板内容上运行命令
Name[zh_TW]=執行剪貼簿內容中的指令
X-KDE-Shortcuts=Alt+Shift+F2
......@@ -14,6 +14,7 @@ Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx
Name[zh_CN]=Plasma (开发 ${CMAKE_INSTALL_FULL_BINDIR})
Name[zh_TW]=Plasma(開發版本 ${CMAKE_INSTALL_FULL_BINDIR}
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
......
......@@ -15,6 +15,7 @@ Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx
Name[zh_CN]=Plasma (开发 ${CMAKE_INSTALL_FULL_BINDIR})
Name[zh_TW]=Plasma(開發版本 ${CMAKE_INSTALL_FULL_BINDIR}
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
......
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