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 2023-11-17 03:04:29 +00:00
parent 9f8afaca2f
commit b39be1636d
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

@ -881,6 +881,7 @@ Name[nn]=Tekst motteke
Name[pl]=Otrzymano tekst
Name[pt]=Texto Recebido
Name[pt_BR]=Texto recebido
Name[ru]=Текст получен
Name[sl]=Besedilo prejeto
Name[sv]=Text mottagen
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
@ -910,6 +911,7 @@ Comment[nn]=Fekk noko tekst
Comment[pl]=Otrzymano jakiś tekst
Comment[pt]=Recebeu algum texto
Comment[pt_BR]=Recebido algum texto
Comment[ru]=Получен некоторый текст
Comment[sl]=Prejeto nekaj besedila
Comment[sv]=Ta emot text
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது