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-13 06:21:10 +01:00
parent baddb79a4d
commit 4240d55669
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neochat.notifyrc
View File

@@ -2,6 +2,7 @@
IconName=neochat
Name=Neochat
Name[ca]=Neochat
Name[en_GB]=Neochat
Name[es]=Neochat
Name[fr]=Neochat
Name[hu]=Neochat
@@ -18,6 +19,7 @@ DesktopEntry=org.kde.neochat
Comment=IM client for the Matrix protocol
Comment[ca]=Client de MI per al protocol Matrix
Comment[ca@valencia]=Client de MI per al protocol Matrix
Comment[en_GB]=IM client for the Matrix protocol
Comment[es]=Cliente de MI para el protocolo Matrix
Comment[fr]=Client « IM » pour le protocole « Matrix »
Comment[hu]=Azonnali üzenetküldő kliens a Matrix protokollhoz
@@ -33,6 +35,7 @@ Comment[x-test]=xxIM client for the Matrix protocolxx
[Event/message]
Name=New message
Name[ca]=Missatge nou
Name[en_GB]=New message
Name[es]=Nuevo mensaje
Name[fr]=Nouveau message
Name[hu]=Új üzenet
@@ -47,6 +50,7 @@ Name[uk]=Нове повідомлення
Name[x-test]=xxNew messagexx
Comment=There is a new message
Comment[ca]=Hi ha un missatge nou
Comment[en_GB]=There is a new message
Comment[es]=Hay un mensaje nuevo
Comment[fr]=Il y a un nouveau message
Comment[hu]=Új üzenet érkezett

3
org.kde.neochat.desktop
View File

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