Commit 937e0713 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 91fc3a4a
......@@ -10,6 +10,7 @@ X-KDE-AuthorizeAction=shell_access
Name=Terminal
Name[ca]=Terminal
Name[cs]=Terminál
Name[es]=Terminal
Name[fr]=Console
Name[it]=Terminale
......@@ -22,9 +23,11 @@ Name[sk]=Terminál
Name[sl]=Terminal
Name[sv]=Terminal
Name[uk]=Термінал
Name[x-test]=xxTerminalxx
Name[zh_CN]=终端
GenericName=Terminal
GenericName[ca]=Terminal
GenericName[cs]=Terminál
GenericName[es]=Terminal
GenericName[fr]=Console
GenericName[it]=Terminale
......@@ -37,4 +40,5 @@ GenericName[sk]=Terminál
GenericName[sl]=Terminal
GenericName[sv]=Terminal
GenericName[uk]=Термінал
GenericName[x-test]=xxTerminalxx
GenericName[zh_CN]=终端
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