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-05-31 03:16:55 +00:00
parent a6a4008944
commit 409579b287
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neochat.notifyrc
View File

@@ -253,6 +253,7 @@ Action=Popup
[Event/Share] [Event/Share]
Name=Share Name=Share
Name[ar]=شارك
Name[ca]=Compartició Name[ca]=Compartició
Name[ca@valencia]=Compartiu Name[ca@valencia]=Compartiu
Name[cs]=Sdílet Name[cs]=Sdílet
@@ -274,6 +275,7 @@ Name[uk]=Оприлюднення
Name[x-test]=xxSharexx Name[x-test]=xxSharexx
Name[zh_TW]=分享 Name[zh_TW]=分享
Comment=The result of sharing a piece of content Comment=The result of sharing a piece of content
Comment[ar]=نتيجة مشاركة محتوى
Comment[ca]=El resultat de compartir una peça de contingut Comment[ca]=El resultat de compartir una peça de contingut
Comment[ca@valencia]=El resultat de compartir una peça de contingut Comment[ca@valencia]=El resultat de compartir una peça de contingut
Comment[eo]=La rezulto el kundividado de enhavero Comment[eo]=La rezulto el kundividado de enhavero