From 572000c842cd6323dd2509f53978d7670726afce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 5 Oct 2020 09:58:02 +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" --- printimages/templates/Thumbnails_5x4.desktop | 2 +- printimages/templates/Thumbnails_6x5.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/printimages/templates/Thumbnails_5x4.desktop b/printimages/templates/Thumbnails_5x4.desktop index a57c0b6f7..4cb2eabf1 100644 --- a/printimages/templates/Thumbnails_5x4.desktop +++ b/printimages/templates/Thumbnails_5x4.desktop @@ -20,7 +20,7 @@ Name[id]=Gambar-mini 5x4 foto Name[is]=Smámyndir 5x4 myndir Name[it]=Miniature, 5×4 foto Name[km]=រូប​ថត​របស់​រូបភាព​តូច​ៗ ៥x៤ -Name[ko]=미리 보기 그림 5x4 사진 +Name[ko]=축소판 5x4 사진 Name[lv]=Sīktēli 5x4 fotogrāfijas Name[nb]=Miniatyrer 5×4 bilder Name[nds]=Vöransichtbiller 5x4 Fotos diff --git a/printimages/templates/Thumbnails_6x5.desktop b/printimages/templates/Thumbnails_6x5.desktop index 79f58274f..6576838b9 100644 --- a/printimages/templates/Thumbnails_6x5.desktop +++ b/printimages/templates/Thumbnails_6x5.desktop @@ -20,7 +20,7 @@ Name[id]=Gambar-mini 6x5 foto Name[is]=Smámyndir 6x5 myndir Name[it]=Miniature, 6×5 foto Name[km]=រូប​ថត​របស់​រូបភាព​តូច​ៗ ៦x៥ -Name[ko]=미리 보기 그림 6x5 사진 +Name[ko]=축소판 6x5 사진 Name[lv]=Sīktēli 6x5 fotogrāfijas Name[nb]=Miniatyrer 6×5 bilder Name[nds]=Vöransichtbiller 6x5 Fotos -- GitLab