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-10-12 01:18:05 +00:00
parent e6c594f3d2
commit ecc6c6e2eb
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

@@ -11,6 +11,7 @@ Name[es]=NeoChat
Name[eu]=NeoChat Name[eu]=NeoChat
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[hu]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[it]=NeoChat Name[it]=NeoChat
Name[ko]=NeoChat Name[ko]=NeoChat

1
org.kde.neochat.desktop
View File

@@ -12,6 +12,7 @@ Name[es]=NeoChat
Name[eu]=NeoChat Name[eu]=NeoChat
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[hu]=NeoChat
Name[ia]=Neochat Name[ia]=Neochat
Name[it]=NeoChat Name[it]=NeoChat
Name[ko]=NeoChat Name[ko]=NeoChat