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 · 886cc6f85a
parent 5b7422c2f4
commit 886cc6f85a
1 changed files with 1 additions and 1 deletions
--- a/plasma-windowed/plasma-windowed.desktop
+++ b/plasma-windowed/plasma-windowed.desktop
@ -58,7 +58,7 @@ Comment[et]=Plasmoidide käivitamine tavaliste rakendustena
 Comment[eu]=Exekutatu Plasmoideak aplikazio arrunt gisa
 Comment[fi]=Suorita plasmoideja sovelluksina
 Comment[fr]=Lancer les plasmoïdes comme de simples applications
-Comment[gl]=Execute trebellos de Plasma como se fosen aplicativos sinxelos.
+Comment[gl]=Execute plasmoides como se fosen aplicativos sinxelos
 Comment[hu]=Plazmoidok futtatása egyszerű alkalmazásként
 Comment[id]=Menjalankan Plasmoids sebagai aplikasi sederhana
 Comment[is]=Keyra Plasmíð sem einföld forrit