From 64f1efc24989d3cd59cd472733a38c6652ed1f41 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Feb 2017 08:15:35 +0100 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" --- krfb/krfb.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krfb/krfb.notifyrc b/krfb/krfb.notifyrc index f0ff763e..012a8d4f 100644 --- a/krfb/krfb.notifyrc +++ b/krfb/krfb.notifyrc @@ -949,7 +949,7 @@ Comment[bg]=Новата връзка е автоматично приета Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল Comment[bs]=Nova veza je automatski uspostavljena Comment[ca]=Connexió nova establerta automàticament -Comment[ca@valencia]=Connexió nova establerta automàticament +Comment[ca@valencia]=Connexió nova establida automàticament Comment[cs]=Automaticky navázáno nové spojení Comment[cy]=Sefydlwyd cysylltiad newydd yn awtomatig Comment[da]=Ny forbindelse automatisk etableret