From e86f70db8518a38c5ce9ff9545541beef91be995 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 2 Jan 2022 01:57:27 +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" --- src/neochat.notifyrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 30633e2e0..2c5e5a41e 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -128,6 +128,7 @@ Name=New Invitation Name[az]=Yeni dəvət Name[ca]=Invitació nova Name[ca@valencia]=Invitació nova +Name[en_GB]=New Invitation Name[es]=Nueva invitación Name[fi]=Uusi kutsu Name[fr]=Nouvelle invitation @@ -147,6 +148,7 @@ Comment=There is a new invitation to a room Comment[az]=Otağa bir yeni dəvət var Comment[ca]=Hi ha una invitació nova a una sala Comment[ca@valencia]=Hi ha una invitació nova a una sala +Comment[en_GB]=There is a new invitation to a room Comment[es]=Hay una nueva invitación a una sala Comment[fi]=Uusi kutsu huoneeseen Comment[fr]=Il y a une nouvelle invitation dans un salon.