Commit ca266eed authored by Script Kiddy's avatar Script Kiddy

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 0221513f
......@@ -14,6 +14,7 @@ Name[en_GB]=Documents
Name[es]=Documentos
Name[et]=Dokumendid
Name[fi]=Tiedostot
Name[fr]=Documents
Name[gl]=Documentos
Name[hu]=Dokumentumok
Name[ia]=Documentos
......@@ -50,6 +51,7 @@ Comment[en_GB]=Displays the open documents in a file tree
Comment[es]=Muestra los documentos abiertos en un árbol de archivos
Comment[et]=Avatud dokumentide näitamine failipuuna
Comment[fi]=Näyttää avoimet tiedostot puuna
Comment[fr]=Affiche les documents ouverts dans une arborescence
Comment[gl]=Mostra os documentos abertos nunha árbore de ficheiros.
Comment[hu]=Megnyitott dokumentumok megjelenítése fastruktúrában
Comment[ia]=Monstra le documentos aperite in un arbore de 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