Commit 147dec5d 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 2477570a
......@@ -52,7 +52,6 @@ Comment[sv]=Skärmlinjal
Comment[th]=ไม้บรรทัดบนหน้าจอ
Comment[tr]=Ekran Cetveli
Comment[uk]=Екранна лінійка
Comment[x-test]=xxOn-Screen Rulerxx
Comment[zh_CN]=屏幕标尺
Comment[zh_TW]=螢幕尺規
......@@ -120,7 +119,6 @@ Name[th]=ย้ายด้วยปุ่มลูกศร
Name[tr]=Yön Tuşlarıyla Hareket Ettirildi
Name[uk]=Пересунуто клавішами курсора
Name[xh]=Ishukunyiswa zizitshixo zesalathisi
Name[x-test]=xxMoved by Cursor Keysxx
Name[zh_CN]=用光标键移动
Name[zh_HK]=用游標鍵移動
Name[zh_TW]=以游標移動
......@@ -186,7 +184,6 @@ Comment[th]=ไม้บรรทัดจะถูกย้ายทีละ
Comment[tr]=Cetvel piksel piksel yön tuşlarıyla hareket ettirildi
Comment[uk]=Лінійка пересувається по пікселях за допомогою клавіш курсора
Comment[xh]=Umlawuli ushukume jikelele kwipixel esebenzisa izitshixi zesalathisi
Comment[x-test]=xxThe ruler has moved pixelwise using the cursor keysxx
Comment[zh_CN]=标尺已经用光标键按像素移动
Comment[zh_HK]=使用游標鍵移動尺規單一個像素
Comment[zh_TW]=尺規已由游標移動數個像素
......
......@@ -69,7 +69,6 @@ GenericName[uz]=Ekran lineykasi
GenericName[uz@cyrillic]=Экран линейкаси
GenericName[vi]=Thước đo màn hình
GenericName[xh]=Screen Ruler
GenericName[x-test]=xxScreen Rulerxx
GenericName[zh_CN]=屏幕标尺
GenericName[zh_HK]=螢幕尺規
GenericName[zh_TW]=螢幕尺規
......@@ -143,7 +142,6 @@ Name[uz]=KRuler
Name[uz@cyrillic]=KRuler
Name[vi]=KRuler
Name[xh]=KRuler
Name[x-test]=xxKRulerxx
Name[zh_CN]=直尺
Name[zh_HK]=KRuler
Name[zh_TW]=KRuler 尺規
......
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