From 2c3715aef6316632d26f981492f4c719cb44e663 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 27 Oct 2022 01:49:19 +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" --- org.kde.neochat.desktop | 3 +++ src/neochat.notifyrc | 6 ++++++ src/plasma-runner-neochat.desktop | 2 ++ 3 files changed, 11 insertions(+) diff --git a/org.kde.neochat.desktop b/org.kde.neochat.desktop index 8380ed94a..403f76b6d 100644 --- a/org.kde.neochat.desktop +++ b/org.kde.neochat.desktop @@ -17,6 +17,7 @@ Name[fr]=NeoChat Name[hu]=NeoChat Name[ia]=Neochat Name[id]=NeoChat +Name[ie]=NeoChat Name[it]=NeoChat Name[ka]=NeoChat Name[ko]=NeoChat @@ -51,6 +52,7 @@ GenericName[fr]=Client « Matrix » GenericName[hu]=Matrix kliens GenericName[ia]=Cliente de Matrice GenericName[id]=Klien Matrix +GenericName[ie]=Cliente de Matrix GenericName[it]=Client Matrix GenericName[ka]=Matrix -ის კლიენტი GenericName[ko]=Matrix 클라이언트 @@ -84,6 +86,7 @@ Comment[fr]=Client pour le protocole « Matrix » Comment[hu]=Kliens a Matrix protokollhoz Comment[ia]=Cliente per le protocollo de Matrix Comment[id]=Klien untuk protokol Matrix +Comment[ie]=Un cliente del protocol Matrix Comment[it]=Client per il protocollo Matrix Comment[ka]=კლიენტი Matrix-ის პროტოკოლისთვის Comment[ko]=Matrix 프로토콜용 클라이언트 diff --git a/src/neochat.notifyrc b/src/neochat.notifyrc index 870c6060f..1aa655a4a 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -15,6 +15,7 @@ Name[fr]=NeoChat Name[hu]=NeoChat Name[ia]=Neochat Name[id]=NeoChat +Name[ie]=NeoChat Name[it]=NeoChat Name[ka]=NeoChat Name[ko]=NeoChat @@ -50,6 +51,7 @@ Comment[fr]=Un client pour « Matrix », le protocole décentralisé de commun Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate Comment[id]=Sebuah klien untuk matrix, protokol komunikasi terdecentralisasi +Comment[ie]=Un cliente de Matrix, li protocol de communication decentralisat. Comment[it]=Un client per matrix, il protocollo di comunicazione decentralizzato Comment[ka]=კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის Comment[ko]=Matrix, 분산 대화 프로토콜 클라이언트 @@ -86,6 +88,7 @@ Name[fr]=Nouveau message Name[hu]=Új üzenet Name[ia]=Nove message Name[id]=Pesan baru +Name[ie]=Nov missage Name[it]=Nuovo messaggio Name[ka]=ახალი შეტყობინება Name[ko]=새 메시지 @@ -119,6 +122,7 @@ Comment[fr]=Il y a un nouveau message Comment[hu]=Új üzenet érkezett Comment[ia]=Il ha un nove message Comment[id]=Ada pesan baru +Comment[ie]=Vu have un nov missage Comment[it]=È presente un nuovo messaggio Comment[ka]=გაქვთ ახალი შეტყობინება Comment[ko]=새 메시지가 있음 @@ -155,6 +159,7 @@ Name[fi]=Uusi kutsu Name[fr]=Nouvelle invitation Name[ia]=Nove invitation Name[id]=Undangan Baru +Name[ie]=Nov invitation Name[it]=Nuovo invito Name[ka]=ახალი მოსაწვევი Name[ko]=새 초대장 @@ -183,6 +188,7 @@ Comment[fi]=Uusi kutsu huoneeseen Comment[fr]=Il y a une nouvelle invitation dans un salon. Comment[ia]=Il ha un nove invitation a un sala Comment[id]=Ada undangan baru ke sebuah ruangan +Comment[ie]=Vu have un nov invitation a un chambre Comment[it]=È presente un nuovo invito a una stanza Comment[ka]=გაქვთ ახალი ოთახის მოსაწვევი Comment[ko]=새로운 대화방 초대장을 받음 diff --git a/src/plasma-runner-neochat.desktop b/src/plasma-runner-neochat.desktop index 334839e0f..c61fc3238 100644 --- a/src/plasma-runner-neochat.desktop +++ b/src/plasma-runner-neochat.desktop @@ -16,6 +16,7 @@ Name[fr]=NeoChat Name[hu]=NeoChat Name[ia]=Neochat Name[id]=NeoChat +Name[ie]=NeoChat Name[it]=NeoChat Name[ka]=NeoChat Name[ko]=NeoChat @@ -47,6 +48,7 @@ Comment[fi]=Etsi huoneita NeoChatissä Comment[fr]=Trouver des salons dans NeoChat Comment[ia]=Trova salas in NeoChat Comment[id]=Cari ruangan di NeoChat +Comment[ie]=Trovar chambres in NeoChat Comment[it]=Trova stanze in NeoChat Comment[ka]=იპოვე ოთახები NeoChat-ში Comment[ko]=NeoChat에서 대화방 찾기