Commit 3bfcb0d0 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 d47d429c
......@@ -11,6 +11,7 @@ Name[fr]=Action d'identification Snap
Name[gl]=Acción de identificación de Snap
Name[id]=Tindakan login snap
Name[it]=Azione di accesso Snap
Name[ko]=Snap 로그인 동작
Name[nl]=Actie voor aanmelden van snap
Name[pl]=Logowanie snap
Name[pt]=Acção de autenticação do Snap
......@@ -37,6 +38,7 @@ Description[fr]=Autoriser l'identification via les interfaces Snap
Description[gl]=Permite que as interfaces de usuario de Snap se identifiquen.
Description[id]=Izinkan front-end snap untuk login
Description[it]=Consenti alle interfacce snap di accedere
Description[ko]=Snap 프론트엔드 로그인 허용
Description[nl]=Front-ends van snap toestaan zich aan te melden
Description[pl]=Umożliwia interfejsowi snap logowanie
Description[pt]=Permitir a autenticação da interfaces do 'snap'
......
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