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"
7 years ago · 4656d3fac0
parent 87f636006c
commit 4656d3fac0
3 changed files with 3 additions and 0 deletions
--- a/krunner/krunner.desktop
+++ b/krunner/krunner.desktop
@ -67,6 +67,7 @@ Name[nn]=Køyr kommando på innhaldet på utklippstavla
 Name[pl]=Wykonaj polecenie na zawartości schowka
 Name[pt]=Executar o comando no conteúdo da área de transferência
 Name[pt_BR]=Executar comando no conteúdo da área de transferência
+Name[sk]=Spustiť príkaz na obsahu schránky
 Name[sv]=Kör kommando med klippbordets innehåll
 Name[uk]=Виконати команду над вмістом буфера обміну
 Name[x-test]=xxRun command on clipboard contentsxx
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@ -11,6 +11,7 @@ Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pl]=Plazma (Rozwój ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
+Name[sk]=Plasma (Development ${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
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@ -12,6 +12,7 @@ Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pl]=Plazma (Rozwój ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
+Name[sk]=Plasma (Development ${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