Commit 8b9511db 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 86159d83
......@@ -10,9 +10,11 @@ Name[id]=Pemilih Emoji
Name[it]=Selettore di emoji
Name[lt]=Jaustukų parinkiklis
Name[nl]=Emoji selectieprogramma
Name[nn]=Emoji-veljar
Name[pt]=Selector de Emojis
Name[pt_BR]=Seletor de Emojis
Name[sk]=Výber emoji
Name[sv]=Väljare av emoji
Name[uk]=Вибір емодзі
Name[x-test]=xxEmoji Selectorxx
Name[zh_TW]=Emoji 選擇工具
......
......@@ -9,6 +9,7 @@ Name[id]=Pencarian
Name[it]=Ricerca
Name[lt]=Paieška
Name[nl]=Zoeken
Name[nn]=Søk
Name[pt]=Pesquisa
Name[pt_BR]=Pesquisar
Name[sk]=Hľadať
......@@ -27,6 +28,7 @@ Comment[id]=Konfigurasikan Pengindeks File
Comment[it]=Configura l'indicizzatore dei file
Comment[lt]=Konfigūruoti failų indeksatorių
Comment[nl]=De bestandenindexering configureren
Comment[nn]=Set opp filindeksering
Comment[pt]=Configurar a Indexação de Ficheiros
Comment[pt_BR]=Configura o Indexador de Arquivos
Comment[sk]=Nastaviť indexer súborov
......
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