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-02-13 02:56:56 +00:00
parent d1707c7b77
commit bd73ef548b
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

@ -914,6 +914,7 @@ Name[pt]=Texto Recebido
Name[pt_BR]=Texto recebido Name[pt_BR]=Texto recebido
Name[ro]=Text primit Name[ro]=Text primit
Name[ru]=Текст получен Name[ru]=Текст получен
Name[sk]=Správa prijatá
Name[sl]=Besedilo prejeto Name[sl]=Besedilo prejeto
Name[sv]=Text mottagen Name[sv]=Text mottagen
Name[ta]=குறுஞ்செய்தி வந்துள்ளது Name[ta]=குறுஞ்செய்தி வந்துள்ளது
@ -951,6 +952,7 @@ Comment[pt]=Recebeu algum texto
Comment[pt_BR]=Recebido algum texto Comment[pt_BR]=Recebido algum texto
Comment[ro]=S-a primit ceva text Comment[ro]=S-a primit ceva text
Comment[ru]=Получен некоторый текст Comment[ru]=Получен некоторый текст
Comment[sk]=Nejaká správa prijatá
Comment[sl]=Prejeto nekaj besedila Comment[sl]=Prejeto nekaj besedila
Comment[sv]=Tog emot text Comment[sv]=Tog emot text
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது Comment[ta]=குறுஞ்செய்தி வந்துள்ளது