Commit 53d4488a 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 700d6f86
Pipeline #81412 skipped
......@@ -21,6 +21,7 @@ Name[sl]=Odpadki cigaret št. 2
Name[sv]=Fimpödemark nr. 2
Name[uk]=Попільничка №2
Name[x-test]=xxCig Waste No. 2xx
Name[zh_CN]=烟头垃圾 2
Description=The cleaning of the Earth begins
Description[ca]=Ha començat la neteja de la Terra
Description[ca@valencia]=Ha començat la neteja de la Terra
......@@ -43,6 +44,7 @@ Description[sl]=Začne se čiščenje planeta Zemlje
Description[sv]=Städning av jorden börjar
Description[uk]=Починаємо очищення Землі
Description[x-test]=xxThe cleaning of the Earth beginsxx
Author=Gregor Mitsch, based on Oxygen Theme
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