tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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-01-21 02:50:26 +00:00
parent 930bcfd096
commit 69d3f30fc7
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/kdeconnect.notifyrc
View file

@ -906,6 +906,7 @@ Name[ia]=Texto Recipite
Name[it]=Testo ricevuto
Name[ka]=მიღებულია ტექსტი
Name[ko]=텍스트 수신
Name[lt]=Gautas tekstas
Name[nl]=Tekst ontvangen
Name[nn]=Tekst motteke
Name[pl]=Otrzymano tekst
@ -942,6 +943,7 @@ Comment[ia]=Recipite alcun texto
Comment[it]=Testo ricevuto
Comment[ka]=მიღებულია რაღაც ტექსტი
Comment[ko]=텍스트를 받음
Comment[lt]=Gautas kažkoks tekstas
Comment[nl]=Enige tekst ontvangen
Comment[nn]=Fekk noko tekst
Comment[pl]=Otrzymano jakiś tekst