From d9b20a4e9bdaf5036d082be3c501ecb8675debe1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Mar 2019 08:33:21 +0100 Subject: [PATCH] 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" --- .../contextmenu/plasma-containmentactions-contextmenu.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop index 5aaaa89a1..e9f89aabd 100644 --- 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ü