Commit 899604ef 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 137c62ef
......@@ -9,6 +9,7 @@ Name[es]=Selector de emojis
Name[et]=Emojide valija
Name[eu]=Emoji hautatzailea
Name[fi]=Emoji-valitsin
Name[fr]=Sélecteur d'Emoji
Name[gl]=Selector de cariñas
Name[hu]=Emodzsiválasztó
Name[id]=Pemilih Emoji
......
......@@ -8,6 +8,7 @@ Name[es]=Buscar
Name[et]=Otsing
Name[eu]=Bilatu
Name[fi]=Etsi
Name[fr]=Rechercher
Name[gl]=Buscar
Name[hu]=Keresés
Name[id]=Pencarian
......@@ -35,6 +36,7 @@ Comment[es]=Configurar el indexador de archivos
Comment[et]=Failide indekseerimise seadistamine
Comment[eu]=Konfiguratu fitxategi indexatzailea
Comment[fi]=Tiedostoindeksoinnin asetukset
Comment[fr]=Configurer l'indexation de fichiers
Comment[gl]=Configurar o indexador de ficheiros
Comment[hu]=A fájlindexelés beállítása
Comment[id]=Konfigurasikan Pengindeks File
......
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