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-03-12 02:22:02 +00:00
parent 05e5c53206
commit 16db8149b5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/kdeconnect.notifyrc
View file

@ -244,7 +244,7 @@ Name[sr@ijekavianlatin]=Dolazni poziv
Name[sr@latin]=Dolazni poziv
Name[sv]=Inkommande samtal
Name[ta]=உள்வரும் அழைப்பு
Name[tr]=Gelen Çağrı
Name[tr]=Gelen Arama
Name[uk]=Вхідний дзвінок
Name[x-test]=xxIncoming Callxx
Name[zh_CN]=收到呼叫
@ -344,7 +344,7 @@ Name[sr@ijekavianlatin]=Propušten poziv
Name[sr@latin]=Propušten poziv
Name[sv]=Missat samtal
Name[ta]=தவறிய அழைப்பு
Name[tr]=Yanıtsız Çağrı
Name[tr]=Yanıtsız Arama
Name[uk]=Пропущений дзвінок
Name[x-test]=xxMissed Callxx
Name[zh_CN]=错过的呼叫
@ -392,7 +392,7 @@ Comment[sr@ijekavianlatin]=Imate propušten poziv
Comment[sr@latin]=Imate propušten poziv
Comment[sv]=Du har missat ett samtal
Comment[ta]=உங்களுக்கு ஒரு தவறிய அழைப்பு உள்ளது
Comment[tr]=Yanıtsız çağrınız var
Comment[tr]=Yanıtsız aramanız var
Comment[uk]=Вами пропущено телефонний дзвінок
Comment[x-test]=xxYou have a missed callxx
Comment[zh_CN]=您有未接来电