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 2022-07-12 02:56:25 +00:00
parent 6acf90a825
commit 9d65b64a42
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/kdeconnect.notifyrc
View file

@ -483,7 +483,7 @@ Name=Ping Received
Name[ar]=استُلمت وكزة Name[ar]=استُلمت وكزة
Name[ast]=Ping recibíu Name[ast]=Ping recibíu
Name[az]=Siqnal alındı Name[az]=Siqnal alındı
Name[bg]=Получен е пинг Name[bg]=Пингът е приет
Name[ca]=S'ha rebut un ping Name[ca]=S'ha rebut un ping
Name[ca@valencia]=S'ha rebut un ping Name[ca@valencia]=S'ha rebut un ping
Name[cs]=Ping přijat Name[cs]=Ping přijat
@ -529,7 +529,7 @@ Comment=Ping received
Comment[ar]=استُلمت وكزة Comment[ar]=استُلمت وكزة
Comment[ast]=Recibióse un ping Comment[ast]=Recibióse un ping
Comment[az]=Siqnal alındı Comment[az]=Siqnal alındı
Comment[bg]=Получен е пинг Comment[bg]=Пингът е приет
Comment[bs]=Primili ste ping Comment[bs]=Primili ste ping
Comment[ca]=S'ha rebut un ping Comment[ca]=S'ha rebut un ping
Comment[ca@valencia]=S'ha rebut un ping Comment[ca@valencia]=S'ha rebut un ping