ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script
2020-11-17 06:15:36 +01:00
parent b5b444f2f8
commit d9218b203d
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neochat.notifyrc
View File

@@ -2,6 +2,7 @@
IconName=neochat IconName=neochat
Name=Neochat Name=Neochat
Name[ca]=Neochat Name[ca]=Neochat
Name[ca@valencia]=Neochat
Name[en_GB]=Neochat Name[en_GB]=Neochat
Name[es]=Neochat Name[es]=Neochat
Name[fr]=Neochat Name[fr]=Neochat
@@ -35,6 +36,7 @@ Comment[x-test]=xxIM client for the Matrix protocolxx
[Event/message] [Event/message]
Name=New message Name=New message
Name[ca]=Missatge nou Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou
Name[en_GB]=New message Name[en_GB]=New message
Name[es]=Nuevo mensaje Name[es]=Nuevo mensaje
Name[fr]=Nouveau message Name[fr]=Nouveau message
@@ -50,6 +52,7 @@ Name[uk]=Нове повідомлення
Name[x-test]=xxNew messagexx Name[x-test]=xxNew messagexx
Comment=There is a new message Comment=There is a new message
Comment[ca]=Hi ha un missatge nou Comment[ca]=Hi ha un missatge nou
Comment[ca@valencia]=Hi ha un missatge nou
Comment[en_GB]=There is a new message Comment[en_GB]=There is a new message
Comment[es]=Hay un mensaje nuevo Comment[es]=Hay un mensaje nuevo
Comment[fr]=Il y a un nouveau message Comment[fr]=Il y a un nouveau message

2
org.kde.neochat.desktop
View File

@@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Neochat Name=Neochat
Name[ca]=Neochat Name[ca]=Neochat
Name[ca@valencia]=Neochat
Name[en_GB]=Neochat Name[en_GB]=Neochat
Name[es]=Neochat Name[es]=Neochat
Name[fr]=Neochat Name[fr]=Neochat
@@ -32,6 +33,7 @@ GenericName[uk]=Клієнт Matrix
GenericName[x-test]=xxMatrix Clientxx GenericName[x-test]=xxMatrix Clientxx
Comment=Client for the Matrix protocol Comment=Client for the Matrix protocol
Comment[ca]=Client per al protocol Matrix Comment[ca]=Client per al protocol Matrix
Comment[ca@valencia]=Client per al protocol Matrix
Comment[en_GB]=Client for the Matrix protocol Comment[en_GB]=Client for the Matrix protocol
Comment[es]=Cliente para el protocolo Matrix Comment[es]=Cliente para el protocolo Matrix
Comment[fr]=Client pour le protocole « Matrix » Comment[fr]=Client pour le protocole « Matrix »