From 3f04b037c6dadbaf7857aa7dd0947036e8490538 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 Jun 2022 01:44:37 +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, 2 insertions(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index e8cb1145..920d843d 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Aterratge segur Name[ca@valencia]=Aterratge segur Name[es]=Aterrizaje seguro Name[fr]=Atterrissage en douceur +Name[it]=Atterraggio sicuro Name[nl]=Veilige landing Name[pl]=Bezpieczne lądowanie Name[pt]=Aterragem Segura @@ -14,6 +15,7 @@ Name[sv]=Säker landning Name[tr]=Sakın İniş Name[uk]=Безпечне приземлення Name[x-test]=xxSafe Landingxx +Name[zh_CN]=Safe Landing 着陆 X-KDE-PluginInfo-Name=Next X-KDE-PluginInfo-Author=Louis Durrant