From 3ecc2844fb60bc9424d218858b89ca2e36def8eb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 27 May 2022 01:43:07 +0000 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" --- look-and-feel/metadata.desktop | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index 208e4d70..7718aec7 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -3,6 +3,44 @@ [Desktop Entry] Name=Plasma Mobile +Name[ast]=Plasma Mobile +Name[az]=Plasma Mobil +Name[ca]=Plasma Mobile +Name[ca@valencia]=Plasma Mobile +Name[cs]=Plasma Mobile +Name[da]=Plasma Mobile +Name[de]=Plasma Mobile +Name[en_GB]=Plasma Mobile +Name[es]=Plasma Mobile +Name[et]=Plasma Mobile +Name[eu]=Plasma Mugikorra +Name[fi]=Plasma Mobile +Name[fr]=Plasma Mobile +Name[gl]=Plasma Mobile +Name[hi]=प्लाज़्मा मोबाइल +Name[hu]=Plasma Mobile +Name[ia]=Plasma Mobile +Name[id]=Plasma Mobile +Name[it]=Plasma Mobile +Name[ka]=Plasma Mobile +Name[ko]=Plasma 모바일 +Name[lt]=Plasma mobilioji sąsaja +Name[nl]=Plasma-mobiel +Name[nn]=Plasma Mobile +Name[pa]=ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ +Name[pl]=Przenośna Plazma +Name[pt]=Plasma Mobile +Name[pt_BR]=Plasma Mobile +Name[ro]=Plasma Mobile +Name[ru]=Plasma Mobile +Name[sk]=Plasma Mobile +Name[sl]=Plasma Mobile +Name[sv]=Plasma mobil +Name[tr]=Plasma Mobile +Name[uk]=Мобільна Плазма +Name[x-test]=xxPlasma Mobilexx +Name[zh_CN]=Plasma Mobile +Name[zh_TW]=Plasma 行動 Comment=Plasma workspace for smartphones Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes Comment[az]=Smartfonlar üçün Plasma iş sahəsi