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:
parent
2687ee5483
commit
9d3fe2cba0
2 changed files with 28 additions and 0 deletions
|
@ -1,6 +1,20 @@
|
|||
[Desktop Entry]
|
||||
Name= Find my device
|
||||
Name[ca]= Troba el meu dispositiu
|
||||
Name[gl]=Atopar o meu dispositivo
|
||||
Name[nl]= Zoek mijn apparaat
|
||||
Name[pt]= Procurar o meu dispositivo
|
||||
Name[sv]=Hitta min apparat
|
||||
Name[uk]=Знайти пристрій
|
||||
Name[x-test]=xx Find my devicexx
|
||||
Comment=Ring connected devices
|
||||
Comment[ca]=Fa sonar als dispositius connectats
|
||||
Comment[gl]=Facer soar os dispositivos conectados
|
||||
Comment[nl]=Bel verbonden apparaten
|
||||
Comment[pt]=Tocar os dispositivos ligados
|
||||
Comment[sv]=Ring anslutna apparater
|
||||
Comment[uk]=Дзвінок на з'єднаних пристроях
|
||||
Comment[x-test]=xxRing connected devicesxx
|
||||
Icon=kdeconnect
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=Plasma/Runner
|
||||
|
|
|
@ -1,6 +1,20 @@
|
|||
[Desktop Entry]
|
||||
Name=Run command
|
||||
Name[ca]=Executa una ordre
|
||||
Name[gl]=Executar unha orde
|
||||
Name[nl]=Commando uitvoeren
|
||||
Name[pt]=Executar um comando
|
||||
Name[sv]=Kör kommando
|
||||
Name[uk]=Виконати команду
|
||||
Name[x-test]=xxRun commandxx
|
||||
Comment=Run commands on connected devices
|
||||
Comment[ca]=Executa les ordres als dispositius connectats
|
||||
Comment[gl]=Executar ordes nos dispositivos conectados
|
||||
Comment[nl]=Commando's op verbonden apparaten uitvoeren
|
||||
Comment[pt]=Executar comandos nos dispositivos ligados
|
||||
Comment[sv]=Kör kommando på anslutna apparater
|
||||
Comment[uk]=Виконання команд на з'єднаних пристроях
|
||||
Comment[x-test]=xxRun commands on connected devicesxx
|
||||
Icon=kdeconnect
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=Plasma/Runner
|
||||
|
|
Loading…
Reference in a new issue