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 2019-03-30 05:58:33 +01:00
parent 362b0ba2e2
commit e2d1284a93
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/photo/kdeconnect_photo.json
View file

@ -38,6 +38,7 @@
"Description[gl]": "Usar un dispositivo conectado para sacar unha foto", "Description[gl]": "Usar un dispositivo conectado para sacar unha foto",
"Description[nl]": "Gebruik een verbonden apparaat om een foto te nemen", "Description[nl]": "Gebruik een verbonden apparaat om een foto te nemen",
"Description[nn]": "Bruk tilkopla eining til å ta eit bilete", "Description[nn]": "Bruk tilkopla eining til å ta eit bilete",
"Description[pt]": "Usar um dispositivo ligado para tirar uma fotografia",
"Description[pt_BR]": "Usa um dispositivo conectado para tirar uma foto", "Description[pt_BR]": "Usa um dispositivo conectado para tirar uma foto",
"Description[sk]": "Použiť pripojené zariadenie na vytvorenie fotky", "Description[sk]": "Použiť pripojené zariadenie na vytvorenie fotky",
"Description[sv]": "Använd en ansluten apparat för att ta ett foto", "Description[sv]": "Använd en ansluten apparat för att ta ett foto",
@ -57,6 +58,7 @@
"Name[gl]": "Foto", "Name[gl]": "Foto",
"Name[nl]": "Foto", "Name[nl]": "Foto",
"Name[nn]": "Foto", "Name[nn]": "Foto",
"Name[pt]": "Fotografia",
"Name[pt_BR]": "Foto", "Name[pt_BR]": "Foto",
"Name[sk]": "Fotka", "Name[sk]": "Fotka",
"Name[sv]": "Foto", "Name[sv]": "Foto",

1
plugins/telephony/kdeconnect_telephony.json
View file

@ -48,6 +48,7 @@
"Description[gl]": "Mostrar notificacións de chamadas entrantes", "Description[gl]": "Mostrar notificacións de chamadas entrantes",
"Description[nl]": "Meldingen tonen van inkomende oproepen", "Description[nl]": "Meldingen tonen van inkomende oproepen",
"Description[nn]": "Vis varsling ved oppringing", "Description[nn]": "Vis varsling ved oppringing",
"Description[pt]": "Mostrar notificações para as chamadas recebidas",
"Description[sv]": "Visa underrättelser om inkommande samtal", "Description[sv]": "Visa underrättelser om inkommande samtal",
"Description[uk]": "Показ сповіщень щодо вхідних дзвінків", "Description[uk]": "Показ сповіщень щодо вхідних дзвінків",
"Description[x-test]": "xxShow notifications for incoming callsxx", "Description[x-test]": "xxShow notifications for incoming callsxx",