Commit 4fb45476 authored by Script Kiddy's avatar Script Kiddy

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"
parent fe02874c
Pipeline #2551 passed with stage
in 14 minutes and 19 seconds
......@@ -3,6 +3,7 @@ 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[gl]=Enviar o ficheiro mediante o servizo de KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen
Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect
Name[sv]=Skicka fil via KDE:s anslutningstjänst
......
......@@ -4,6 +4,7 @@ Name[ca]=Gestor d'URL de SMS del KDE Connect
Name[ca@valencia]=Gestor d'URL de SMS del KDE Connect
Name[en_GB]=KDE Connect SMS URL Handler
Name[es]=Controlador de URL de SMS de KDE Connect
Name[gl]=Xestor de URL de SMS de KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-SMS
Name[pt]=Tratamento de URL's de SMS do KDE Connect
Name[pt_BR]=Tratamento de URLs de SMS do KDE Connect
......
......@@ -11,7 +11,7 @@ Name[es]=Controlador de URL de teléfonos de KDE Connect
Name[eu]=KDE Connect-en telefono-URL-kudeatzailea
Name[fi]=KDE Connectin puhelinverkko-osoitekäsittelijä
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[gl]=Manexador de URL de teléfono de KDE Connect
Name[gl]=Xestor de URL de teléfono de KDE Connect
Name[id]=Penanganan URL Phone KDE Connect
Name[it]=Gestore URL del telefono di KDE Connect
Name[ko]=KDE Connect 휴대폰 URL 처리기
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment