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
2023-10-26 02:17:19 +00:00
parent a64c80109e
commit 5828ee1ada
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

@@ -4,6 +4,7 @@
Version=1.5 Version=1.5
Name=NeoChat Name=NeoChat
Name[ar]=نيوتشات Name[ar]=نيوتشات
Name[ast]=NeoChat
Name[az]=NeoChat Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat

1
src/neochat.notifyrc
View File

@@ -2,6 +2,7 @@
IconName=org.kde.neochat IconName=org.kde.neochat
Name=NeoChat Name=NeoChat
Name[ar]=نيوتشات Name[ar]=نيوتشات
Name[ast]=NeoChat
Name[az]=NeoChat Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat

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

@@ -3,6 +3,7 @@
[Desktop Entry] [Desktop Entry]
Name=NeoChat Name=NeoChat
Name[ar]=نيوتشات Name[ar]=نيوتشات
Name[ast]=NeoChat
Name[az]=NeoChat Name[az]=NeoChat
Name[ca]=NeoChat Name[ca]=NeoChat
Name[ca@valencia]=NeoChat Name[ca@valencia]=NeoChat