Commit 555388c1 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 8737dbdc
...@@ -19,6 +19,7 @@ Name[sv]=Breeze ...@@ -19,6 +19,7 @@ Name[sv]=Breeze
Name[tr]=Esinti Name[tr]=Esinti
Name[uk]=Breeze Name[uk]=Breeze
Name[x-test]=xxBreezexx Name[x-test]=xxBreezexx
Name[zh_CN]=微风
Name[zh_TW]=Breeze Name[zh_TW]=Breeze
Inherits=default Inherits=default
Directories=default Directories=default
......
...@@ -243,6 +243,7 @@ Name[sv]=Kalibrering lyckades ...@@ -243,6 +243,7 @@ Name[sv]=Kalibrering lyckades
Name[tr]=Kalibrasyon Başarılı Name[tr]=Kalibrasyon Başarılı
Name[uk]=Калібрування успішне Name[uk]=Калібрування успішне
Name[x-test]=xxCalibration Successxx Name[x-test]=xxCalibration Successxx
Name[zh_CN]=校准成功
Name[zh_TW]=調校完成 Name[zh_TW]=調校完成
Comment=Guiding calibration completed successfully Comment=Guiding calibration completed successfully
Comment[ca]=El calibratge amb guiatge s'ha completat correctament Comment[ca]=El calibratge amb guiatge s'ha completat correctament
......
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