From 276e5e1aaa32ca7f9f192dacd136c1d03fa1efb5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Dec 2017 04:49:42 +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-mobile.desktop.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plasma-mobile.desktop.cmake b/plasma-mobile.desktop.cmake index 3786d597..4417d4f5 100644 --- a/plasma-mobile.desktop.cmake +++ b/plasma-mobile.desktop.cmake @@ -8,6 +8,7 @@ Name[ca]=Plasma Mòbil Name[ca@valencia]=Plasma Mòbil Name[es]=Plasma Mobile Name[nl]=Plasma-mobiel +Name[pl]=Plazma Mobile Name[pt]=Plasma Mobile Name[sv]=Plasma mobil Name[uk]=Мобільна Плазма @@ -17,6 +18,7 @@ Comment[ca]=Plasma Mòbil, creat per la comunitat KDE Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE Comment[es]=Plasma Mobile creado por KDE Comment[nl]=Plasma-mobiel door KDE +Comment[pl]=Plazma Mobile stworzona przez KDE Comment[pt]=Plasma Mobile do KDE Comment[sv]=Plasma mobil av KDE Comment[uk]=Мобільна Плазма від KDE