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
2021-02-10 08:16:48 +01:00
parent 7816d220ea
commit 07dffa7e73
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

@@ -1,6 +1,7 @@
[Global] [Global]
IconName=org.kde.neochat IconName=org.kde.neochat
Name=Neochat Name=Neochat
Name[az]=Neochat
Name[ca]=Neochat Name[ca]=Neochat
Name[ca@valencia]=Neochat Name[ca@valencia]=Neochat
Name[da]=Neochat Name[da]=Neochat
@@ -26,6 +27,7 @@ Name[x-test]=xxNeochatxx
Name[zh_CN]=Neochat Name[zh_CN]=Neochat
DesktopEntry=org.kde.neochat DesktopEntry=org.kde.neochat
Comment=A client for matrix, the decentralized communication protocol Comment=A client for matrix, the decentralized communication protocol
Comment[az]=Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu
Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat Comment[ca]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat Comment[ca@valencia]=Un client per al Matrix, el protocol de comunicacions descentralitzat
Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
@@ -47,6 +49,7 @@ Comment[x-test]=xxA client for matrix, the decentralized communication protocolx
[Event/message] [Event/message]
Name=New message Name=New message
Name[az]=Yeni ismarıc
Name[ca]=Missatge nou Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou Name[ca@valencia]=Missatge nou
Name[de]=Neue Nachricht Name[de]=Neue Nachricht
@@ -70,6 +73,7 @@ Name[uk]=Нове повідомлення
Name[x-test]=xxNew messagexx Name[x-test]=xxNew messagexx
Name[zh_CN]=新消息 Name[zh_CN]=新消息
Comment=There is a new message Comment=There is a new message
Comment[az]=Yeni ismarıc var
Comment[ca]=Hi ha un missatge nou Comment[ca]=Hi ha un missatge nou
Comment[ca@valencia]=Hi ha un missatge nou Comment[ca@valencia]=Hi ha un missatge nou
Comment[de]=Es ist eine neue Nachricht vorhanden Comment[de]=Es ist eine neue Nachricht vorhanden

3
org.kde.neochat.desktop
View File

@@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Neochat Name=Neochat
Name[az]=Neochat
Name[ca]=Neochat Name[ca]=Neochat
Name[ca@valencia]=Neochat Name[ca@valencia]=Neochat
Name[da]=Neochat Name[da]=Neochat
@@ -24,6 +25,7 @@ Name[uk]=Neochat
Name[x-test]=xxNeochatxx Name[x-test]=xxNeochatxx
Name[zh_CN]=Neochat Name[zh_CN]=Neochat
GenericName=Matrix Client GenericName=Matrix Client
GenericName[az]=Matrix Müştərisi
GenericName[ca]=Client del Matrix GenericName[ca]=Client del Matrix
GenericName[ca@valencia]=Client del Matrix GenericName[ca@valencia]=Client del Matrix
GenericName[de]=Matrix-Programm GenericName[de]=Matrix-Programm
@@ -47,6 +49,7 @@ GenericName[uk]=Клієнт Matrix
GenericName[x-test]=xxMatrix Clientxx GenericName[x-test]=xxMatrix Clientxx
GenericName[zh_CN]=Matrix 客户端 GenericName[zh_CN]=Matrix 客户端
Comment=Client for the Matrix protocol Comment=Client for the Matrix protocol
Comment[az]=Matrix protokolu üçün müştəri
Comment[ca]=Client per al protocol Matrix Comment[ca]=Client per al protocol Matrix
Comment[ca@valencia]=Client per al protocol Matrix Comment[ca@valencia]=Client per al protocol Matrix
Comment[de]=Programm für das Matrix-Protokoll Comment[de]=Programm für das Matrix-Protokoll