Commit d7939fda 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 f1002ba3
......@@ -183,7 +183,7 @@ Comment[ug]=ئاددىي سۈرەت كۆرگۈ
Comment[uk]=Простий переглядач зображень
Comment[vi]=Bộ xem ảnh đơn giản
Comment[x-test]=xxA simple image viewerxx
Comment[zh_CN]=简图像查看器
Comment[zh_CN]=简图像查看器
Comment[zh_TW]=一個簡單的影像檢視程式
Exec=gwenview %U
Terminal=false
......
......@@ -64,7 +64,7 @@ Name[tr]=Bir Slayt Gösterisi Başlat
Name[ug]=تام تەسۋىرى باشلايدۇ
Name[uk]=Почати показ слайдів
Name[x-test]=xxStart a Slideshowxx
Name[zh_CN]=幻灯模式启动
Name[zh_CN]=开启幻灯模式放映照片
Name[zh_TW]=開始投影秀
Icon=gwenview
Exec=gwenview -s %u
......@@ -65,5 +65,5 @@ Name[tr]=Gwenview ile Fotoğrafları İndir
Name[ug]=سۈرەتلەرنى Gwenview بىلەن چۈشۈرۈش
Name[uk]=Отримати фотографії за допомогою Gwenview
Name[x-test]=xxDownload Photos with Gwenviewxx
Name[zh_CN]= Gwenview 下载照片
Name[zh_CN]=通过 Gwenview 下载照片
Name[zh_TW]=用 Gwenview 下載相片
......@@ -64,5 +64,5 @@ Name[tr]=Gwenview ile Fotoğrafları İndir
Name[ug]=سۈرەتلەرنى Gwenview بىلەن چۈشۈرۈش
Name[uk]=Отримати фотографії за допомогою Gwenview
Name[x-test]=xxDownload Photos with Gwenviewxx
Name[zh_CN]= Gwenview 下载照片
Name[zh_CN]=通过 Gwenview 下载照片
Name[zh_TW]=用 Gwenview 下載相片
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