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-11-18 01:25:11 +00:00
parent 240cf6a0ed
commit 02d2d31cf3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.kde.neochat.desktop
View File

@@ -90,6 +90,7 @@ GenericName[zh_TW]=Matrix 用戶端
Comment=Chat on Matrix Comment=Chat on Matrix
Comment[ca]=Xat a Matrix Comment[ca]=Xat a Matrix
Comment[ca@valencia]=Xat a Matrix Comment[ca@valencia]=Xat a 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[fr]=Clavarder sur Matrix Comment[fr]=Clavarder sur Matrix
@@ -101,6 +102,7 @@ Comment[ka]=ჩატი Matrix-ზე
Comment[nl]=Chat op Matrix Comment[nl]=Chat op Matrix
Comment[pl]=Rozmawiaj na Matriksie Comment[pl]=Rozmawiaj na Matriksie
Comment[sl]=Klepet na Matrixu Comment[sl]=Klepet na Matrixu
Comment[ta]=மேட்ரிக்ஸில் உரையாட உதவும்
Comment[tr]=Matrix Üzerinde Sohbet Et Comment[tr]=Matrix Üzerinde Sohbet Et
Comment[uk]=Спілкування у Matrix Comment[uk]=Спілкування у Matrix
Comment[x-test]=xxChat on Matrixxx Comment[x-test]=xxChat on Matrixxx