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
8fd954b6d8
commit
20e8f41bb4
1 changed files with 3 additions and 0 deletions
|
@ -3,10 +3,12 @@ Type=Service
|
|||
Name=Send file via KDE Connect service
|
||||
Name[ca]=Envia el fitxer a través del servei KDE Connect
|
||||
Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect
|
||||
Name[en_GB]=Send file via KDE Connect service
|
||||
Name[es]=Enviar archivo a través del servicio KDE Connect
|
||||
Name[fr]=Envoyer un fichier via le service KDE Connect
|
||||
Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect
|
||||
Name[nl]=Bestand via KDE Connect-service versturen
|
||||
Name[nn]=Send fil med KDE Connect-tenesta
|
||||
Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect
|
||||
Name[sv]=Skicka fil via KDE:s anslutningstjänst
|
||||
Name[uk]=Надіслати файл за допомогою служби KDE Connect
|
||||
|
@ -36,6 +38,7 @@ X-KDE-Submenu[id]=Connect
|
|||
X-KDE-Submenu[it]=Connetti
|
||||
X-KDE-Submenu[ko]=연결
|
||||
X-KDE-Submenu[nl]=Verbinden
|
||||
X-KDE-Submenu[nn]=Kopla til
|
||||
X-KDE-Submenu[pl]=Połącz
|
||||
X-KDE-Submenu[pt]=Connect
|
||||
X-KDE-Submenu[ru]=KDE Connect
|
||||
|
|
Loading…
Reference in a new issue