From e4a83b797045bcf37c19cfee580a3b9bbc5265ca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 22 Sep 2020 09:54:50 +0200 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 726e04ea..01d23c75 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -10,6 +10,7 @@ Name[it]=Shell Name[nl]=Shell Name[nn]=Skal Name[pt]=Consola +Name[pt_BR]=Concha Name[ro]=Înveliș Name[sv]=Skal Name[uk]=Оболонка