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-12-09 03:17:34 +00:00
parent 252fb6eb21
commit 6df2ebd1eb
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
org.kde.neochat.desktop
View File

@@ -95,6 +95,7 @@ Comment[de]=Über Matrix unterhalten
Comment[en_GB]=Chat on Matrix Comment[en_GB]=Chat on Matrix
Comment[es]=Chat en Matrix Comment[es]=Chat en Matrix
Comment[eu]=Berriketa Matrix-en Comment[eu]=Berriketa Matrix-en
Comment[fi]=Keskustele Matrixissä
Comment[fr]=Clavarder sur Matrix Comment[fr]=Clavarder sur Matrix
Comment[gl]=Charle en Matrix Comment[gl]=Charle en Matrix
Comment[he]=התכתבות דרך Matrix Comment[he]=התכתבות דרך Matrix