Commit 93c1a362 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 6845ba7d
......@@ -2,9 +2,11 @@
Name=Index
Name[ca]=Índex
Name[es]=Índice
Name[it]=Index
Name[lt]=Index
Name[nl]=Index
Name[pt]=Índice
Name[pt_BR]=Index
Name[sk]=Index
Name[uk]=Індекс
Name[x-test]=xxIndexxx
......@@ -12,9 +14,11 @@ Name[zh_TW]=索引
Comment=File manager
Comment[ca]=Gestor de fitxers
Comment[es]=Gestor de archivos
Comment[it]=Gestore dei file
Comment[lt]=Failų tvarkytuvė
Comment[nl]=Bestandsbeheerder
Comment[pt]=Gestor de ficheiros
Comment[pt_BR]=Gerenciador de arquivos
Comment[sk]=Správca súborov
Comment[uk]=Менеджер файлів
Comment[x-test]=xxFile managerxx
......@@ -27,9 +31,11 @@ Categories=Qt;KDE;System;FileTools;FileManager;
GenericName=File Manager
GenericName[ca]=Gestor de fitxers
GenericName[es]=Gestor de archivos
GenericName[it]=Gestore dei file
GenericName[lt]=Failų tvarkytuvė
GenericName[nl]=Bestandsbeheerder
GenericName[pt]=Gestor de Ficheiros
GenericName[pt_BR]=Gerenciador de Arquivos
GenericName[sk]=Správca súborov
GenericName[uk]=Менеджер файлів
GenericName[x-test]=xxFile Managerxx
......
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