From 93e8231b6104b529bce565d79a2c3c8520b6b483 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Mar 2020 06:03:07 +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 | 1 + effects/windowaperture/package/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index dda7ecc893..fd386d1ed7 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[cs]=Oko na obrazovce Name[es]=Ojo a la pantalla Name[et]=Eye on Screen Name[eu]=Begirada pantailan diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index d5b2854ad1..5c962eba3b 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[cs]=Přesunout okna do rohů obrazovky Comment[es]=Mover las ventanas a las esquinas de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[eu]=Eraman leihoak pantailako bazterretara