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-29 01:35:58 +00:00
parent 724e9d50a6
commit babc87d023
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neochat.notifyrc
View File

@@ -133,6 +133,7 @@ Name[fr]=Nouvelle invitation
Name[ia]=Nove invitation Name[ia]=Nove invitation
Name[ko]=새 초대장 Name[ko]=새 초대장
Name[nl]=Nieuwe uitnodiging Name[nl]=Nieuwe uitnodiging
Name[pl]=Nowe zaproszenie
Name[pt]=Novo Convite Name[pt]=Novo Convite
Name[pt_BR]=Novo convite Name[pt_BR]=Novo convite
Name[sl]=Novo povabilo Name[sl]=Novo povabilo
@@ -148,6 +149,7 @@ Comment[fr]=Il y a une nouvelle invitation dans un salon.
Comment[ia]=Il ha un nove invitation a un sala Comment[ia]=Il ha un nove invitation a un sala
Comment[ko]=새로운 대화방 초대장을 받음 Comment[ko]=새로운 대화방 초대장을 받음
Comment[nl]=Er is een nieuwe uitnodiging naar een room Comment[nl]=Er is een nieuwe uitnodiging naar een room
Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
Comment[pt]=Existe um novo convite para uma sala Comment[pt]=Existe um novo convite para uma sala
Comment[pt_BR]=Existe um novo convite para uma sala Comment[pt_BR]=Existe um novo convite para uma sala
Comment[sl]=Tam je novo povabilo v sobo Comment[sl]=Tam je novo povabilo v sobo