From 5042078495d89c0254e2a9e0ba87a05970e68012 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Mar 2022 02:04:54 +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" --- core/okularGenerator.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/okularGenerator.desktop b/core/okularGenerator.desktop index df979963d..f0db46ec0 100644 --- a/core/okularGenerator.desktop +++ b/core/okularGenerator.desktop @@ -7,7 +7,7 @@ Comment[az]=Okulyar üçün fayl formatı modulu Comment[bg]=Ядро на Okular за файлови формати Comment[bs]=Pozadina formata datoteke za Okular Comment[ca]=Dorsal del format de fitxer per a l'Okular -Comment[ca@valencia]=Dorsal del format de fitxer per a l'Okular +Comment[ca@valencia]=Dorsal del format de fitxer per a Okular Comment[cs]=Podpůrná vrstva formátu souboru pro Okular Comment[da]=Filformatmotor til Okular Comment[de]=Dateiformat-Modul für Okular