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 · ae7a05e113
parent 27fa3f7e0c
commit ae7a05e113
5 changed files with 5 additions and 1 deletions
--- a/applets/activitybar/metadata.desktop
+++ b/applets/activitybar/metadata.desktop
@ -92,7 +92,7 @@ Comment[fi]=Välilehtipalkki aktiviteettien vaihtamiseen
 Comment[fr]=Barre d'onglets permettant de changer d'activité
 Comment[fy]=Ljepper om tusken aktiviteiten te wikseljen
 Comment[ga]=Barra na gcluaisíní chun an ghníomhaíocht a mhalartú
-Comment[gl]=Barra de lapelas para cambiar entre actividades
+Comment[gl]=Barra de separadores para cambiar entre actividades
 Comment[gu]=ક્રિયાઓ બદલવા માટે ટેબ પટ્ટી
 Comment[he]=סרגל לשוניות למעבר בין פעילויות
 Comment[hi]=क्रिया स्विच करने के लिए टैबपट्टी
--- a/login-sessions/plasmawayland-dev.desktop.cmake
+++ b/login-sessions/plasmawayland-dev.desktop.cmake
@ -20,6 +20,7 @@ Name[nn]=Plasma (utvikling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pl]=Plazma (Rozwój , Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt_BR]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
+Name[ru]=Plasma (разрабатываемая версия, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[sk]=Plasma (Development, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[sv]=Plasma (utveckling, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
 Name[uk]=Пзазма (Розробка, Wayland ${CMAKE_INSTALL_FULL_BINDIR})
--- a/login-sessions/plasmawayland.desktop.cmake
+++ b/login-sessions/plasmawayland.desktop.cmake
@ -23,6 +23,7 @@ Name[nn]=Plasma (Wayland)
 Name[pl]=Plazma (Wayland)
 Name[pt]=Plasma (Wayland)
 Name[pt_BR]=Plasma (Wayland)
+Name[ru]=Plasma (Wayland)
 Name[sk]=Plasma (Wayland)
 Name[sv]=Plasma (Wayland)
 Name[uk]=Плазма (Wayland)
--- a/login-sessions/plasmax11-dev.desktop.cmake
+++ b/login-sessions/plasmax11-dev.desktop.cmake
@ -21,6 +21,7 @@ Name[nn]=Plasma (utvikling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pl]=Plazma (Rozwój , X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[pt_BR]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR})
+Name[ru]=Plasma (разрабатываемая версия, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[sk]=Plasma (Development, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[sv]=Plasma (utveckling, X11 ${CMAKE_INSTALL_FULL_BINDIR})
 Name[uk]=Пзазма (Розробка, X11 ${CMAKE_INSTALL_FULL_BINDIR})
--- a/menu/desktop/kf5-network.directory
+++ b/menu/desktop/kf5-network.directory
@ -21,6 +21,7 @@ Name[nn]=Nettverk
 Name[pl]=Sieć
 Name[pt]=Rede
 Name[pt_BR]=Rede
+Name[ru]=Сеть
 Name[sk]=Sieť
 Name[sv]=Nätverk
 Name[uk]=Мережа