Commit ad31c750 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 e06e897f
......@@ -4,6 +4,7 @@ Name[ca]=Cerca
Name[cs]=Hledat
Name[es]=Buscar
Name[fi]=Etsi
Name[id]=Pencarian
Name[it]=Ricerca
Name[lt]=Paieška
Name[nl]=Zoeken
......@@ -16,6 +17,7 @@ Comment[ca]=Configura l'indexador de fitxers
Comment[cs]=Nastavit indexování souborů
Comment[es]=Configurar el indexador de archivos
Comment[fi]=Tiedostoindeksoinnin asetukset
Comment[id]=Konfigurasikan Pengindeks File
Comment[it]=Configura l'indicizzatore dei file
Comment[lt]=Konfigūruoti failų indeksatorių
Comment[nl]=De bestandenindexering configureren
......
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