From 6e134dbbc69558f251614bca411b622624f738ea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Feb 2019 05:25:08 +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" --- plasma-windowed/plasma-windowed.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma-windowed/plasma-windowed.desktop b/plasma-windowed/plasma-windowed.desktop index d40790615..57b000c46 100755 --- a/plasma-windowed/plasma-windowed.desktop +++ b/plasma-windowed/plasma-windowed.desktop @@ -56,7 +56,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