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 2020-10-11 09:36:48 +02:00
parent fc4d868014
commit 37f82dcc8f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
urlhandler/org.kde.kdeconnect.handler.desktop
View file

@ -8,6 +8,7 @@ Name[da]=URL-håndtering til KDE Connect
Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen) Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)
Name[en_GB]=KDE Connect URL Handler Name[en_GB]=KDE Connect URL Handler
Name[es]=Controlador de URL de KDE Connect Name[es]=Controlador de URL de KDE Connect
Name[et]=KDE Connecti URL-ide käitleja
Name[eu]=KDE Connect-eko URL maneiatzailea Name[eu]=KDE Connect-eko URL maneiatzailea
Name[fi]=KDE Connectin verkko-osoitekäsittelijä Name[fi]=KDE Connectin verkko-osoitekäsittelijä
Name[fr]=Gestionnaire d'URL de KDE Connect Name[fr]=Gestionnaire d'URL de KDE Connect