SVN_SILENT made messages (.desktop file) - always resolve ours

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-12 05:40:56 +01:00
parent 12865f44f7
commit af1ab23e0a
2 changed files with 4 additions and 0 deletions

View file

@ -2,6 +2,7 @@
Name= Find my device
Name[ca]= Troba el meu dispositiu
Name[ca@valencia]= Troba el meu dispositiu
Name[es]=Encontrar mi dispositivo
Name[gl]=Atopar o meu dispositivo
Name[nl]= Zoek mijn apparaat
Name[pt]= Procurar o meu dispositivo
@ -11,6 +12,7 @@ Name[x-test]=xx Find my devicexx
Comment=Ring connected devices
Comment[ca]=Fa sonar als dispositius connectats
Comment[ca@valencia]=Fa sonar als dispositius connectats
Comment[es]=Hacer sonar los dispositivos conectados
Comment[gl]=Facer soar os dispositivos conectados
Comment[nl]=Bel verbonden apparaten
Comment[pt]=Tocar os dispositivos ligados

View file

@ -2,6 +2,7 @@
Name=Run command
Name[ca]=Executa una ordre
Name[ca@valencia]=Executa una ordre
Name[es]=Ejecutar orden
Name[gl]=Executar unha orde
Name[nl]=Commando uitvoeren
Name[pt]=Executar um comando
@ -11,6 +12,7 @@ Name[x-test]=xxRun commandxx
Comment=Run commands on connected devices
Comment[ca]=Executa les ordres als dispositius connectats
Comment[ca@valencia]=Executa les ordres als dispositius connectats
Comment[es]=Ejecutar órdenes en los dispositivos conectados
Comment[gl]=Executar ordes nos dispositivos conectados
Comment[nl]=Commando's op verbonden apparaten uitvoeren
Comment[pt]=Executar comandos nos dispositivos ligados