Commit 365eea16 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 5b1d3ef2
......@@ -81,7 +81,7 @@ Name[th]=ชื่อที่ใช้แทน
Name[tr]=Takma İsim
Name[ug]=تەخەللۇس
Name[uk]=Псевдонім
Name[vi]=Bí danh
Name[vi]=Biệt danh
Name[x-test]=xxAliasxx
Name[zh_CN]=别名
Name[zh_HK]=別名
......@@ -149,7 +149,7 @@ Comment[tg]=Барои фармонҳо тахаллусҳои дигарро и
Comment[th]=เพิ่มชื่อแทนที่กำหนดเองให้กับคำสั่งต่าง ๆ
Comment[tr]=Komutlar için özel takma isimler ekler
Comment[uk]=Додає псевдоніми для команд
Comment[vi]=Thêm bí danh riêng cho câu lệnh
Comment[vi]=Thêm biệt danh riêng cho câu lệnh
Comment[x-test]=xxAdds custom aliases for commandsxx
Comment[zh_CN]=添加命令的自定义别名
Comment[zh_HK]=為命令加上自訂別名
......
......@@ -76,7 +76,7 @@ Name[th]=ชื่อที่ใช้แทน
Name[tr]=Takma İsim
Name[ug]=تەخەللۇس
Name[uk]=Псевдонім
Name[vi]=Bí danh
Name[vi]=Biệt danh
Name[x-test]=xxAliasxx
Name[zh_CN]=别名
Name[zh_HK]=別名
......@@ -144,7 +144,7 @@ Comment[tg]=Барои фармонҳо тахаллусҳои дигарро и
Comment[th]=เพิ่มชื่อแทนที่กำหนดเองให้กับคำสั่งต่าง ๆ
Comment[tr]=Komutlar için özel takma isimler ekler
Comment[uk]=Додає псевдоніми для команд
Comment[vi]=Thêm bí danh riêng cho câu lệnh
Comment[vi]=Thêm biệt danh riêng cho câu lệnh
Comment[x-test]=xxAdds custom aliases for commandsxx
Comment[zh_CN]=添加命令的自定义别名
Comment[zh_HK]=為命令加上自訂別名
......
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