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-11-19 01:31:57 +00:00
parent 560bd739e0
commit 5b9a95878e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
neochat.notifyrc
View File

@@ -125,5 +125,17 @@ Action=Popup
[Event/invite]
Name=New Invite
Name[ca]=Invitació nova
Name[es]=Nueva invitación
Name[nl]=Nieuwe uitnodiging
Name[sv]=Ny inbjudan
Name[uk]=Нове запрошення
Name[x-test]=xxNew Invitexx
Comment=There is a new invite to a room
Comment[ca]=Hi ha una invitació nova a una sala
Comment[es]=Hay una nueva invitación a una sala
Comment[nl]=Er is een nieuwe uitnodiging naar een room
Comment[sv]=Det finns en ny inbjudan till ett rum
Comment[uk]=У кімнаті нове запрошення
Comment[x-test]=xxThere is a new invite to a roomxx
Action=Popup