Commit 08de2191 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 48851021
Pipeline #77473 skipped
......@@ -18,6 +18,7 @@ Name[es]=Crear un proyecto de datos con K3b
Name[eu]=Sortu datu-proiektua bat K3b erabiliz
Name[fi]=Luo tiedostoprojekti K3b:llä
Name[fr]=Créer un projet de données avec K3b
Name[ia]=Crea projecto de datos con K3b
Name[it]=Crea progetto di dati con K3b
Name[ko]=K3b로 데이터 프로젝트 만들기
Name[nl]=Gegevensproject aanmaken met K3b
......
......@@ -17,6 +17,7 @@ Name[es]=Crear un proyecto de datos con K3b
Name[eu]=Sortu datu-proiektua bat K3b erabiliz
Name[fi]=Luo tiedostoprojekti K3b:llä
Name[fr]=Créer un projet de données avec K3b
Name[ia]=Crea projecto de datos con K3b
Name[it]=Crea progetto di dati con K3b
Name[ko]=K3b로 데이터 프로젝트 만들기
Name[nl]=Gegevensproject aanmaken met K3b
......
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