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"
8 years ago · 9c8a9d677c
parent 36daf5fb86
commit 9c8a9d677c
1 changed files with 1 additions and 0 deletions
--- a/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
+++ b/gmenu-dbusmenu-proxy/gmenudbusmenuproxy.desktop
@ -18,6 +18,7 @@ Name[nn]=GMenuDBusMenuProxy
 Name[pl]=GMenuDBusMenuProxy
 Name[pt]=GMenuDBusMenuProxy
 Name[pt_BR]=GMenuDBusMenuProxy
+Name[ru]=GMenuDBusMenuProxy
 Name[sk]=GMenuDBusMenuProxy
 Name[sv]=GMenuDBusMenuProxy
 Name[uk]=Проксі-меню GMenu D-Bus