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"
6 years ago · 23a5d0ce75
parent c9c0f070a9
commit 23a5d0ce75
5 changed files with 5 additions and 1 deletions
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@ -6,6 +6,7 @@ Name[ast]=Plasma (Desendolcu, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ca]=Plasma (Desenvolupament, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[es]=Plasma (Desarrollo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[gl]=Plasma (desenvolvemento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
+Name[it]=Plasma (Sviluppo, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[nl]=Plasma (Ontwikkeling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmawayland.desktop.cmake
+++ b/login-sessions/plasmawayland.desktop.cmake
@ -8,6 +8,7 @@ Name[ca]=Plasma (Wayland)
 Name[cs]=Plasma (Wayland)
 Name[es]=Plasma (Wayland)
 Name[gl]=Plasma (Wayland)
+Name[it]=Plasma (Wayland)
 Name[lt]=Plasma (Wayland)
 Name[nl]=Plasma (Wayland)
 Name[pt]=Plasma (Wayland)
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@ -7,6 +7,7 @@ Name[ast]=Plasma (Desendolcu, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[ca]=Plasma (Desenvolupament, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[es]=Plasma (Desarrollo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[gl]=Plasma (desenvolvemento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
+Name[it]=Plasma (Sviluppo, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[nl]=Plasma (Ontwikkeling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
--- a/menu/desktop/kf5-network.directory
+++ b/menu/desktop/kf5-network.directory
@ -6,6 +6,7 @@ Name[ca]=Xarxa
 Name[cs]=Síť
 Name[es]=Red
 Name[gl]=Rede
+Name[it]=Rete
 Name[lt]=Tinklas
 Name[nl]=Netwerk
 Name[pt]=Rede
--- a/runners/recentdocuments/plasma-runner-recentdocuments.desktop
+++ b/runners/recentdocuments/plasma-runner-recentdocuments.desktop
@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Recent Documents
 Name[ar]=المستندات الأخيرة
-Name[ast]=Documentos de recién
+Name[ast]=Documentos d'apocayá
 Name[be]=Нядаўнія дакументы
 Name[be@latin]=Niadaŭnyja dakumenty
 Name[bg]=Последно използвани