From 928e4ae5ed464bb1d6c83b0c53fdbec19f9a6cc6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Sep 2024 01:20:59 +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 48b32830f..ab5358d99 100644 --- a/src/neochat.notifyrc +++ b/src/neochat.notifyrc @@ -263,6 +263,7 @@ Name[ar]=شارك Name[ca]=Compartició Name[ca@valencia]=Compartició Name[cs]=Sdílet +Name[el]=Κοινοποίηση Name[en_GB]=Share Name[eo]=Kundividi Name[es]=Compartir @@ -291,6 +292,7 @@ Comment=The result of sharing a piece of content Comment[ar]=نتيجة مشاركة محتوى Comment[ca]=El resultat de compartir una peça de contingut Comment[ca@valencia]=El resultat de compartir una peça de contingut +Comment[el]=Το αποτέλεσμα του διαμοιρασμού ενός περιεχομένου Comment[en_GB]=The result of sharing a piece of content Comment[eo]=La rezulto el kundividado de enhavero Comment[es]=El resultado de compartir una parte de contenido