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-04-17 01:43:52 +00:00
parent 9f9cbf9070
commit cb19b72df7
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/kdeconnect.notifyrc
View file

@ -864,6 +864,7 @@ Name[bg]=Текстът е приет
Name[ca]=Text rebut Name[ca]=Text rebut
Name[ca@valencia]=Text rebut Name[ca@valencia]=Text rebut
Name[cs]=Text byl přijat Name[cs]=Text byl přijat
Name[de]=Text empfangen
Name[en_GB]=Text Received Name[en_GB]=Text Received
Name[fr]=Texte reçu Name[fr]=Texte reçu
Name[gl]=Recibiuse texto Name[gl]=Recibiuse texto