From eef93418673149cb41965fd9dae634a2960c95eb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 2 Aug 2022 01:45:26 +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" --- wallpapers/Next/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 80de2ec9..c9cb4aa4 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -24,7 +24,7 @@ Name[ro]=Aterizare ușoară Name[sk]=Bezpečné pristátie Name[sl]=Varen pristanek Name[sv]=Säker landning -Name[tr]=Sakın İniş +Name[tr]=Güvenli İniş Name[uk]=Безпечне приземлення Name[x-test]=xxSafe Landingxx Name[zh_CN]=Safe Landing 着陆