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-07-28 02:18:15 +00:00
parent 559da66197
commit 8c14f8d2eb
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
neochat.notifyrc
View File

@@ -8,6 +8,7 @@ Name[cs]=NeoChat
Name[de]=NeoChat Name[de]=NeoChat
Name[en_GB]=NeoChat Name[en_GB]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[eu]=NeoChat
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat

1
org.kde.neochat.desktop
View File

@@ -7,6 +7,7 @@ Name[cs]=NeoChat
Name[de]=NeoChat Name[de]=NeoChat
Name[en_GB]=NeoChat Name[en_GB]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[eu]=NeoChat
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat