From 7e7b9728af7e312b976709c9e651ac10c9107855 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 2 Jul 2023 03:46:09 +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 ++ src/plasma-runner-neochat.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 51e52c504..cd027f718 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -178,6 +178,7 @@ Name[it]=Nuovo invito Name[ka]=ახალი მოსაწვევი Name[ko]=새 초대장 Name[nl]=Nieuwe uitnodiging +Name[nn]=Ny invitasjon Name[pa]=ਨਵਾਂ ਸੱਦਾ Name[pl]=Nowe zaproszenie Name[pt]=Novo Convite @@ -210,6 +211,7 @@ Comment[it]=È presente un nuovo invito a una stanza Comment[ka]=გაქვთ ახალი ოთახის მოსაწვევი Comment[ko]=새로운 대화방 초대장을 받음 Comment[nl]=Er is een nieuwe uitnodiging naar een room +Comment[nn]=Du har ein ny invitasjon til eit rom Comment[pa]=ਰੂਮ ਲਈ ਨਵਾਂ ਸੱਦਾ ਹੈ Comment[pl]=Dostępna jest nowe zaproszenie do pokoju Comment[pt]=Existe um novo convite para uma sala diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index 5ee493176..f0e939a85 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -59,6 +59,7 @@ Comment[it]=Trova stanze in NeoChat Comment[ka]=იპოვე ოთახები NeoChat-ში Comment[ko]=NeoChat에서 대화방 찾기 Comment[nl]=Rooms zoeken in NeoChat +Comment[nn]=Finn rom i NeoChat Comment[pl]=Znajdź pokoje w NeoChat Comment[pt]=Procurar salas no NeoChat Comment[pt_BR]=Encontrar salas no NeoChat