From bbcc51fabfb66a953b833e586cd0fb3d4efd2a1d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Mar 2020 05:53:52 +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" --- effects/eyeonscreen/package/metadata.desktop | 6 ++++++ effects/windowaperture/package/metadata.desktop | 3 +++ kcmkwin/kwincompositing/kwincompositing.desktop | 1 + 3 files changed, 10 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 70bd83110b..4a59e2aa69 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -3,6 +3,9 @@ Name=Eye on Screen Name[ca]=Ull a la pantalla Name[et]=Eye on Screen Name[eu]=Begirada pantailan +Name[id]=Mata di Layar +Name[it]=Eye On Screen +Name[ko]=화면 위의 눈 Name[nl]=Oog op scherm Name[pt]=Olho no Ecrã Name[pt_BR]=Olho na tela @@ -15,6 +18,9 @@ Comment=Suck windows into the desktop Comment[ca]=Enganxa les finestres a l'escriptori Comment[et]=Akende imemine töölauale Comment[eu]=Mahaigainak leihoak xurgatu +Comment[id]=Sedot window ke desktop +Comment[it]=Risucchia le finestre nel desktop +Comment[ko]=창을 바탕 화면으로 흡수 Comment[nl]=Zuig vensters in het bureaublad Comment[pt]=Aspira as janelas para o ecrã Comment[pt_BR]=Suga as janelas para a área de trabalho diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index dd01f91c70..cf82c7fd60 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -45,6 +45,9 @@ Comment=Move windows into screen corners Comment[ca]=Mou les finestres cap a les cantonades de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[eu]=Eraman leihoak pantailako bazterretara +Comment[id]=Pindahkan window ke sudut layar +Comment[it]=Sposta le finestre negli angoli dello schermo +Comment[ko]=창을 화면 꼭짓점으로 이동 Comment[nl]=Verplaats vensters in de hoeken van het scherm Comment[pt]=Mover as janelas para os cantos do ecrã Comment[pt_BR]=Move as janelas para os cantos da tela diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 516063aa67..75e5a97192 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -112,6 +112,7 @@ X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektu X-KDE-Keywords[fi]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,ikkunointiohjelma,ikkunaohjelma,ikkunanhallinta,tehoste,3D-tehosteet,2D-tehosteet,videoasetukset,graafiset tehosteet,työpöytätehosteet X-KDE-Keywords[fr]=Gestionnaire de fenêtres KWin, kwin,window,manager,compositeur, effet, effets 3D,effets 2D,OpenGL,XRender,paramétrage video,effets graphiques ,effects du bureau X-KDE-Keywords[ia]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects +X-KDE-Keywords[id]=kwin,window,pengelola,kompositing,efek,efek 3D,efek 2D,OpenGL,XRender,pengaturan video,efek grafis,efek desktop X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과 X-KDE-Keywords[lt]=kwin,langas,langai,tvarkytuvė,tvarkytuve,komponavimas,kompozicionavimas,efektas,efektai,3D efektai,2D efektai,trimačiai efektai,trimaciai efektai,dvimačiai efektai,dvimaciai efektai,OpenGL,XRender,vaizdo nustatymai,vaizdo nuostatos,video nustatymai,video nuostatos,grafiniai efektai,grafikos efektai,darbalaukio efektai,darbastalio efektai