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-03-23 05:43:12 +01:00
parent df2933ff01
commit dec5e40acd
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neochat.notifyrc
View File

@@ -1,7 +1,9 @@
[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[es]=NeoChat Name[es]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[nl]=NeoChat Name[nl]=NeoChat

2
org.kde.neochat.desktop
View File

@@ -1,6 +1,8 @@
[Desktop Entry] [Desktop Entry]
Name=NeoChat Name=NeoChat
Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[nl]=NeoChat Name[nl]=NeoChat