Commit b700c94d 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 e34eba7e
......@@ -7,6 +7,7 @@
"Description[ca]": "Configura les opcions generals del gestor de fitxers",
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
"Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
"Description[ia]": "Configura preferentias del gerente general de file",
"Description[id]": "Konfigurasikan pengaturan pengelola file umum",
"Description[it]": "Configura le impostazioni generali del gestore dei file",
"Description[ko]": "일반 파일 관리자 설정",
......@@ -32,6 +33,7 @@
"Name[cs]": "Obecné",
"Name[es]": "General",
"Name[fr]": "Général",
"Name[ia]": "General",
"Name[id]": "Umum",
"Name[it]": "Generale",
"Name[ko]": "일반",
......@@ -7,6 +7,7 @@
"Description[ca]": "Configura la navegació del gestor de fitxers",
"Description[es]": "Configurar la navegación del gestor de archivos",
"Description[fr]": "Configurer la navigation dans le gestionnaire de fichiers",
"Description[ia]": "Configura navigation del gerente de file",
"Description[id]": "Konfigurasikan navigasi pengelola file",
"Description[it]": "Configura la navigazione col gestore dei file",
"Description[ko]": "파일 관리자 탐색 설정",
......@@ -7,6 +7,7 @@
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
"Description[ia]": "Configura le modos de vista del gerente de file",
"Description[id]": "Konfigurasikan mode tampilan pengelola file",
"Description[it]": "Configura le viste del gestore dei file",
"Description[ko]": "파일 관리자 보기 모드 설정",
Supports Markdown
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