Commit 2998fcc2 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 91e7ba38
Pipeline #13038 passed with stages
in 38 minutes and 33 seconds
......@@ -6,6 +6,7 @@ Name=Kaidan
Name[ca]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
Name[sv]=Kaidan
Name[uk]=Kaidan
Name[x-test]=xxKaidanxx
......
......@@ -11,6 +11,7 @@ Name=Kaidan
Name[ca]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
Name[sv]=Kaidan
Name[uk]=Kaidan
Name[x-test]=xxKaidanxx
......@@ -20,6 +21,7 @@ Name=New message
Name[ca]=Missatge nou
Name[nl]=Nieuw bericht
Name[pt]=Nova mensagem
Name[sk]=Nová správa
Name[sv]=Nytt meddelande
Name[uk]=Нове повідомлення
Name[x-test]=xxNew messagexx
......
......@@ -5,6 +5,7 @@ Name=Kaidan
Name[ca]=Kaidan
Name[nl]=Kaidan
Name[pt]=Kaidan
Name[sk]=Kaidan
Name[sv]=Kaidan
Name[uk]=Kaidan
Name[x-test]=xxKaidanxx
......
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