From ced2990c8ae13610c472aa1b3ca7f350add7a6d6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Sep 2021 01:13:57 +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" --- src/effects/eyeonscreen/package/metadata.desktop | 2 ++ src/effects/windowaperture/package/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/src/effects/eyeonscreen/package/metadata.desktop b/src/effects/eyeonscreen/package/metadata.desktop index e8adc9fecd..14127a47fd 100644 --- a/src/effects/eyeonscreen/package/metadata.desktop +++ b/src/effects/eyeonscreen/package/metadata.desktop @@ -14,6 +14,7 @@ Name[fr]=Jeter un œil sur le bureau Name[ia]=Eye On Screen (Oculo sur schermo) Name[id]=Eye on Screen Name[it]=Eye On Screen +Name[ja]=Eye on Screen Name[ko]=화면 위의 눈 Name[lt]=Akis ekrane Name[nl]=Oog op scherm @@ -47,6 +48,7 @@ Comment[fr]=Faire disparaître les fenêtres dans le bureau Comment[ia]=Suger fenestras in le scriptorio Comment[id]=Sedot window ke desktop Comment[it]=Risucchia le finestre nel desktop +Comment[ja]=ウィンドウをデスクトップに吸い込みます Comment[ko]=창을 바탕 화면으로 흡수 Comment[lt]=Įtraukti langus į darbalaukį Comment[nl]=Zuig vensters in het bureaublad diff --git a/src/effects/windowaperture/package/metadata.desktop b/src/effects/windowaperture/package/metadata.desktop index 75982c36a2..fe14dd3131 100644 --- a/src/effects/windowaperture/package/metadata.desktop +++ b/src/effects/windowaperture/package/metadata.desktop @@ -57,6 +57,7 @@ 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[ja]=ウィンドウを画面の角に移動します Comment[ko]=창을 화면 꼭짓점으로 이동 Comment[lt]=Perkelti langus į kampus Comment[nl]=Verplaats vensters in de hoeken van het scherm