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
2022-04-10 01:45:29 +00:00
parent 0f5425e030
commit c83f4b4f75
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ Name[x-test]=xxNeoChatxx
Name[zh_CN]=NeoChat Name[zh_CN]=NeoChat
Comment=Find rooms in NeoChat Comment=Find rooms in NeoChat
Comment[ar]=اعثر على غرف في نيوتشات Comment[ar]=اعثر على غرف في نيوتشات
Comment[az]=NeoChat-da otaqları tapın
Comment[ca]=Cerca sales en el NeoChat Comment[ca]=Cerca sales en el NeoChat
Comment[ca@valencia]=Busca sales en NeoChat Comment[ca@valencia]=Busca sales en NeoChat
Comment[en_GB]=Find rooms in NeoChat Comment[en_GB]=Find rooms in NeoChat