From 8e9baf047f276a36f7252e82ee316516700c8c4b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Sep 2022 01:54:36 +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" --- linux/applications/org.kde.falkon.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 2556dbab5..7ce072596 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -187,7 +187,7 @@ Name[fi]=Avaa uusi ikkuna Name[fr]=Ouvrir une nouvelle fenêtre Name[gl]=Abrir unha xanela nova Name[ia]=Aperi nove fenestra -Name[id]=Buka window baru +Name[id]=Buka jendela baru Name[is]=Opna nýjan glugga Name[it]=Apre una nuova finestra Name[ka]=ახალ ფანჯრის გახსნა