Commit 3fe12480 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 c9ff145e
......@@ -9,6 +9,7 @@ Name[es]=Acciones de inicio de sesión en Snap
Name[eu]=Snap saioa hasteko ekintza
Name[fr]=Action d'identification Snap
Name[gl]=Acción de identificación de Snap
Name[hu]=Snap bejelentkezési művelet
Name[id]=Tindakan login snap
Name[it]=Azione di accesso Snap
Name[ko]=Snap 로그인 동작
......@@ -36,6 +37,7 @@ Description[es]=Permite que las interfaces de Snap inicien sesión
Description[eu]=Baimendu snap aurrealdekoei saioa hastea
Description[fr]=Autoriser l'identification via les interfaces Snap
Description[gl]=Permite que as interfaces de usuario de Snap se identifiquen.
Description[hu]=Lehetővé teszi a snap frontendeknek a bejelentkezést
Description[id]=Izinkan front-end snap untuk login
Description[it]=Consenti alle interfacce snap di accedere
Description[ko]=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