From b5392802c271c9c8d4e756a8a6591ad787c1bf46 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 Mar 2020 06:17:10 +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 | 2 ++ effects/windowaperture/package/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 4a59e2aa69..6512150283 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Eye on Screen Name[ca]=Ull a la pantalla +Name[es]=Ojo a la pantalla Name[et]=Eye on Screen Name[eu]=Begirada pantailan Name[id]=Mata di Layar @@ -16,6 +17,7 @@ Name[zh_TW]=螢幕之眼 Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into the desktop Comment[ca]=Enganxa les finestres a l'escriptori +Comment[es]=Aspirar las ventanas en el escritorio Comment[et]=Akende imemine töölauale Comment[eu]=Mahaigainak leihoak xurgatu Comment[id]=Sedot window ke desktop diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index cf82c7fd60..1699e47473 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -43,6 +43,7 @@ Name[zh_TW]=視窗光圈 Icon=preferences-system-windows-effect-windowaperture Comment=Move windows into screen corners Comment[ca]=Mou les finestres cap a les cantonades de la pantalla +Comment[es]=Mover las ventanas a las esquinas de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[eu]=Eraman leihoak pantailako bazterretara Comment[id]=Pindahkan window ke sudut layar