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
2024-10-10 03:01:02 +00:00
parent 588266d7c3
commit a0fef7b397
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
org.kde.neochat.desktop
View File

@@ -15,6 +15,7 @@ Name[en_GB]=NeoChat
Name[eo]=NeoChat Name[eo]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[eu]=NeoChat Name[eu]=NeoChat
Name[fa]=نئوچت
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[gl]=NeoChat Name[gl]=NeoChat

1
src/neochat.notifyrc
View File

@@ -13,6 +13,7 @@ Name[en_GB]=NeoChat
Name[eo]=NeoChat Name[eo]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[eu]=NeoChat Name[eu]=NeoChat
Name[fa]=نئوچت
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[gl]=NeoChat Name[gl]=NeoChat

1
src/plasma-runner-neochat.desktop
View File

@@ -14,6 +14,7 @@ Name[en_GB]=NeoChat
Name[eo]=NeoChat Name[eo]=NeoChat
Name[es]=NeoChat Name[es]=NeoChat
Name[eu]=NeoChat Name[eu]=NeoChat
Name[fa]=نئوچت
Name[fi]=NeoChat Name[fi]=NeoChat
Name[fr]=NeoChat Name[fr]=NeoChat
Name[gl]=NeoChat Name[gl]=NeoChat