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 · d9b20a4e9b
parent 70ef082998
commit d9b20a4e9b
1 changed files with 1 additions and 1 deletions
--- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
@ -86,7 +86,7 @@ Comment[fi]=Valikko, joka tavallisesti näkyy hiiren kakkospainikkeella
 Comment[fr]=Le menu s'affichant normalement lors d'un clic droit
 Comment[fy]=It menu dat normaal mei rjochts klik ferskynt
 Comment[ga]=An roghchlár a thaispeántar tar éis deaschliceáil
-Comment[gl]=O menú que se mostra xeralmente ao premer co botón dereito
+Comment[gl]=O menú que se mostra xeralmente ao facer clic dereito
 Comment[he]=התפריט שמופיע בעת לחיצה על הכפתור הימני בעכבר
 Comment[hr]=Izbornik koji se obično pojavljuje na desni klik
 Comment[hu]=A jobb egérkattintásra megjelenő menü