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-02-11 05:29:21 +01:00
parent afe8c95afa
commit 12865f44f7
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
runners/findmyphone/plasma-runner-kdeconnect-findmyphone.desktop
View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name= Find my device Name= Find my device
Name[ca]= Troba el meu dispositiu Name[ca]= Troba el meu dispositiu
Name[ca@valencia]= Troba el meu dispositiu
Name[gl]=Atopar o meu dispositivo Name[gl]=Atopar o meu dispositivo
Name[nl]= Zoek mijn apparaat Name[nl]= Zoek mijn apparaat
Name[pt]= Procurar o meu dispositivo Name[pt]= Procurar o meu dispositivo
@ -9,6 +10,7 @@ Name[uk]=Знайти пристрій
Name[x-test]=xx Find my devicexx Name[x-test]=xx Find my devicexx
Comment=Ring connected devices Comment=Ring connected devices
Comment[ca]=Fa sonar als dispositius connectats Comment[ca]=Fa sonar als dispositius connectats
Comment[ca@valencia]=Fa sonar als dispositius connectats
Comment[gl]=Facer soar os dispositivos conectados Comment[gl]=Facer soar os dispositivos conectados
Comment[nl]=Bel verbonden apparaten Comment[nl]=Bel verbonden apparaten
Comment[pt]=Tocar os dispositivos ligados Comment[pt]=Tocar os dispositivos ligados

2
runners/remotecommands/plasma-runner-kdeconnect-remotecommands.desktop
View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Run command Name=Run command
Name[ca]=Executa una ordre Name[ca]=Executa una ordre
Name[ca@valencia]=Executa una ordre
Name[gl]=Executar unha orde Name[gl]=Executar unha orde
Name[nl]=Commando uitvoeren Name[nl]=Commando uitvoeren
Name[pt]=Executar um comando Name[pt]=Executar um comando
@ -9,6 +10,7 @@ Name[uk]=Виконати команду
Name[x-test]=xxRun commandxx Name[x-test]=xxRun commandxx
Comment=Run commands on connected devices Comment=Run commands on connected devices
Comment[ca]=Executa les ordres als dispositius connectats Comment[ca]=Executa les ordres als dispositius connectats
Comment[ca@valencia]=Executa les ordres als dispositius connectats
Comment[gl]=Executar ordes nos dispositivos conectados Comment[gl]=Executar ordes nos dispositivos conectados
Comment[nl]=Commando's op verbonden apparaten uitvoeren Comment[nl]=Commando's op verbonden apparaten uitvoeren
Comment[pt]=Executar comandos nos dispositivos ligados Comment[pt]=Executar comandos nos dispositivos ligados