Commit 3910ba9b 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 bfd7f2a8
......@@ -9,6 +9,7 @@ Name[pt]=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_TW]=Plasma(開發版本 ${CMAKE_INSTALL_FULL_BINDIR}
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe
......
......@@ -10,6 +10,7 @@ Name[pt]=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_TW]=Plasma(開發版本 ${CMAKE_INSTALL_FULL_BINDIR}
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe
......
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