Commit bb17fc85 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 130ee177
......@@ -14,6 +14,7 @@ Name[sk]=Station
Name[sl]=Postaja
Name[sv]=Station
Name[uk]=Station
Name[x-test]=xxStationxx
Name[zh_TW]=Station
Comment=Terminal Emulator
Comment[ca]=Emulador de terminal
......@@ -31,6 +32,7 @@ Comment[sk]=Emulátor terminálu
Comment[sl]=Emulator terminala
Comment[sv]=Terminalemulator
Comment[uk]=Емулятор термінала
Comment[x-test]=xxTerminal Emulatorxx
Comment[zh_TW]=終端機模擬器
TryExec=station
Exec=station %U
......
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