From 34de0b746ea3593e6d87019eec96b584a0a68add Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 29 Apr 2020 06:38:00 +0200 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" --- effects/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 1 + kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 1 + 3 files changed, 4 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index ae8aaa824d..66c5cf742c 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -7,6 +7,7 @@ Name[es]=Ojo a la pantalla Name[et]=Eye on Screen Name[eu]=Begirada pantailan Name[fr]=Jeter un oeil sur le bureau +Name[ia]=Eye On Screen (Oculo sur schermo) Name[id]=Mata di Layar Name[it]=Eye On Screen Name[ko]=화면 위의 눈 @@ -29,6 +30,7 @@ Comment[en_GB]=Suck windows into the desktop Comment[es]=Aspirar las ventanas en el escritorio Comment[et]=Akende imemine töölauale Comment[eu]=Mahaigainak leihoak xurgatu +Comment[ia]=Suger fenestras in le scriptorio Comment[id]=Sedot window ke desktop Comment[it]=Risucchia le finestre nel desktop Comment[ko]=창을 바탕 화면으로 흡수 diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 90cefa6738..ba9b3063ff 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -49,6 +49,7 @@ Comment[es]=Mover las ventanas a las esquinas de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[eu]=Eraman leihoak pantailako bazterretara Comment[fr]=Déplace les fenêtres dans les coins de l'écran +Comment[ia]=Move fenestra in angulos de schermo Comment[id]=Pindahkan window ke sudut layar Comment[it]=Sposta le finestre negli angoli dello schermo Comment[ko]=창을 화면 꼭짓점으로 이동 diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index baa9e48afc..d42b71cb28 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -63,6 +63,7 @@ Comment[fi]=Aseta kosketusnäytön pyyhkäisyeleet Comment[fr]=Configurer les mouvements sur l'écran tactile Comment[gl]=Configurar os xestos de pantalla táctil Comment[hu]=Érintőképernyő-gesztusok beállítása +Comment[ia]=Configura gestos e glissar de schermo tactil Comment[id]=Konfigurasikan gestur usapan layar sentuh Comment[it]=Configura gesti dello schermo a sfioramento Comment[ko]=터치 스크린 밀기 제스처 설정