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 · 53facb3220
parent fc20aacd54
commit 53facb3220
2 changed files with 2 additions and 0 deletions
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@ -8,6 +8,7 @@ Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
 Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
 Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
 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[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@ -9,6 +9,7 @@ Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
 Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
 Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
 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[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})