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 2017-02-05 06:01:50 +01:00
parent 805c813537
commit bf97d8f606
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/remotecommands/kdeconnect_remotecommands.json
View file

@ -35,6 +35,7 @@
"Id": "kdeconnect_remotecommands", "Id": "kdeconnect_remotecommands",
"License": "GPL", "License": "GPL",
"Name": "Host remote commands", "Name": "Host remote commands",
"Name[ar]": "استضف الأوامر البعيدة",
"Name[ca@valencia]": "Allotja ordes remotes", "Name[ca@valencia]": "Allotja ordes remotes",
"Name[ca]": "Allotja ordres remotes", "Name[ca]": "Allotja ordres remotes",
"Name[cs]": "Přijímat vzdálené příkazy", "Name[cs]": "Přijímat vzdálené příkazy",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -9,6 +9,7 @@
} }
], ],
"Description": "Show notifications for calls and SMS", "Description": "Show notifications for calls and SMS",
"Description[ar]": "أظهر إخطارات المكالمات والرّسائل",
"Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS", "Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS",
"Description[ca]": "Mostra les notificacions de les trucades i els SMS", "Description[ca]": "Mostra les notificacions de les trucades i els SMS",
"Description[cs]": "Zobrazit upozornění pro telefonáty a SMS", "Description[cs]": "Zobrazit upozornění pro telefonáty a SMS",