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-12-12 03:06:10 +00:00
parent f9bbc2f9e3
commit 9b67493f37
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

@ -901,6 +901,7 @@ Name[pl]=Otrzymano tekst
Name[pt]=Texto Recebido
Name[pt_BR]=Texto recebido
Name[ru]=Текст получен
Name[sk]=Prijatá správa SMS
Name[sl]=Besedilo prejeto
Name[sv]=Text mottagen
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
@ -932,6 +933,7 @@ Comment[pl]=Otrzymano jakiś tekst
Comment[pt]=Recebeu algum texto
Comment[pt_BR]=Recebido algum texto
Comment[ru]=Получен некоторый текст
Comment[sk]=Prijatá textová správa
Comment[sl]=Prejeto nekaj besedila
Comment[sv]=Ta emot text
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது