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 2015-06-21 10:17:25 +00:00
parent d8b3d829e4
commit c1a9ffd305
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/mprisremote/kdeconnect_mprisremote.json
View file

@ -9,6 +9,7 @@
],
"Description": "Control MPRIS services",
"Description[ca]": "Serveis de control del MPRIS",
"Description[fi]": "Ohjaa MPRIS-palveluita",
"Description[gl]": "Controle servizos de MPRIS.",
"Description[nl]": "MPRIS-services besturen",
"Description[pl]": "Sterowanie usługami MPRIS",
@ -24,6 +25,7 @@
"License": "GPL",
"Name": "MprisRemote",
"Name[ca]": "MprisRemote",
"Name[fi]": "MPRIS-kaukosäädin",
"Name[gl]": "MprisRemote",
"Name[nl]": "MprisRemote",
"Name[pl]": "PilotMPRIS",