Commit a87fcdf0 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 7601750a
...@@ -70,7 +70,6 @@ Name[tr]=KMag ...@@ -70,7 +70,6 @@ Name[tr]=KMag
Name[ug]=KMag Name[ug]=KMag
Name[uk]=KMag Name[uk]=KMag
Name[vi]=Kính lúp K Name[vi]=Kính lúp K
Name[zh_CN]=放大镜 Name[zh_CN]=放大镜
Name[zh_TW]=K-放大鏡 Name[zh_TW]=K-放大鏡
GenericName=Screen Magnifier GenericName=Screen Magnifier
...@@ -142,7 +141,6 @@ GenericName[uk]=Збільшувач екрана ...@@ -142,7 +141,6 @@ GenericName[uk]=Збільшувач екрана
GenericName[uz]=Ekranni kattalashtiruvchi GenericName[uz]=Ekranni kattalashtiruvchi
GenericName[uz@cyrillic]=Экранни катталаштирувчи GenericName[uz@cyrillic]=Экранни катталаштирувчи
GenericName[vi]=Phóng đại Màn hình GenericName[vi]=Phóng đại Màn hình
GenericName[x-test]=xxScreen Magnifierxx
GenericName[zh_CN]=屏幕放大镜 GenericName[zh_CN]=屏幕放大镜
GenericName[zh_TW]=螢幕放大鏡 GenericName[zh_TW]=螢幕放大鏡
Comment=A screen magnification tool Comment=A screen magnification tool
...@@ -177,7 +175,6 @@ Comment[sr@latin]=Alatka za uveličavanje ekrana ...@@ -177,7 +175,6 @@ Comment[sr@latin]=Alatka za uveličavanje ekrana
Comment[sv]=Ett skärmförstoringsglas Comment[sv]=Ett skärmförstoringsglas
Comment[tr]=Bir ekran büyütme aracı Comment[tr]=Bir ekran büyütme aracı
Comment[uk]=Цифрове збільшувальне скло для екрана Comment[uk]=Цифрове збільшувальне скло для екрана
Comment[x-test]=xxA screen magnification toolxx
Comment[zh_CN]=屏幕放大工具 Comment[zh_CN]=屏幕放大工具
Comment[zh_TW]=螢幕放大工具 Comment[zh_TW]=螢幕放大工具
Categories=Qt;KDE;Utility;Accessibility; Categories=Qt;KDE;Utility;Accessibility;
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