Commit 9a728848 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 22896540
......@@ -57,6 +57,7 @@ Comment[es]=Este guion extrae archivos de sonido de https://commons.wikimedia.or
Comment[et]=See skript tõmbab helifaile aadressilt https://commons.wikimedia.org.
Comment[fr]=Ce script télécharge des fichiers de sons à partir de « https://commons.wikimedia.org ».
Comment[it]=Questo script scarica suoni da https://commons.wikimedia.org.
Comment[ko]=이 스크립트는 https://commons.wikimedia.org 사이트에서 소리 파일을 가져옵니다.
Comment[nl]=Dit script haalt geluidsbestanden op van https://commons.wikimedia.org.
Comment[pt]=Este programa obtém ficheiros de sons do https://commons.wikimedia.org.
Comment[pt_BR]=Este script obtém arquivos de som de https://commons.wikimedia.org.
......
......@@ -72,6 +72,7 @@ Comment[fi]=Ohjelma asioiden ulkoa opettelemiseen.
Comment[fr]=Un programme qui vous aide à mémoriser des connaissances.
Comment[gl]=Un programa para axudalo a memorizar cousas.
Comment[it]=Un programma per aiutarti a memorizzare le cose.
Comment[ko]=기억하는 것을 도와 주는 프로그램입니다.
Comment[nl]=Een programma om u te helpen dingen te onthouden.
Comment[nn]=Eit program for å hjelpa deg å hugsa ting.
Comment[pl]=Program pomagający ci zapamiętać różne rzeczy.
......
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