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-03-17 08:06:34 +01:00
parent fa4ecd7d41
commit 571ee638bd
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neochat.notifyrc
View File

@@ -4,6 +4,7 @@ Name=Neochat
Name[az]=Neochat Name[az]=Neochat
Name[ca]=Neochat Name[ca]=Neochat
Name[ca@valencia]=Neochat Name[ca@valencia]=Neochat
Name[cs]=Neochat
Name[da]=Neochat Name[da]=Neochat
Name[de]=Neochat Name[de]=Neochat
Name[en_GB]=Neochat Name[en_GB]=Neochat
@@ -56,6 +57,7 @@ Name=New message
Name[az]=Yeni ismarıc Name[az]=Yeni ismarıc
Name[ca]=Missatge nou Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou Name[ca@valencia]=Missatge nou
Name[cs]=Nová zpráva
Name[de]=Neue Nachricht Name[de]=Neue Nachricht
Name[en_GB]=New message Name[en_GB]=New message
Name[es]=Nuevo mensaje Name[es]=Nuevo mensaje

1
org.kde.neochat.desktop
View File

@@ -3,6 +3,7 @@ Name=Neochat
Name[az]=Neochat Name[az]=Neochat
Name[ca]=Neochat Name[ca]=Neochat
Name[ca@valencia]=Neochat Name[ca@valencia]=Neochat
Name[cs]=Neochat
Name[da]=Neochat Name[da]=Neochat
Name[de]=Neochat Name[de]=Neochat
Name[en_GB]=Neochat Name[en_GB]=Neochat