Commit 21758ebc 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 5f3afb23
......@@ -46,7 +46,7 @@ Name[sv]=Uppdateringsverktyg för sökkataloger
Name[tr]=Arama Klasörü Güncelleyici
Name[uk]=Засіб оновлення тек пошуку
Name[x-test]=xxSearch Folder Updaterxx
Name[zh_CN]=搜索文件夹更新
Name[zh_CN]=搜索文件夹更新程序
Name[zh_TW]=搜尋資料夾更新器
Comment=Allows automatic updates of Search Folders
Comment[ca]=Permet l'actualització automàtica de les carpetes de cerca
......
......@@ -98,6 +98,6 @@ Description[uz@cyrillic]=FISH протоколи учун КЧ-слейв
Description[vi]=A kioslave cho giao thức FISH
Description[wa]=On vårlet d' I/R pol protocole FISH
Description[x-test]=xxA kioslave for the FISH protocolxx
Description[zh_CN]=FISH 协议的 KIO slave
Description[zh_CN]=用于 FISH 协议的 KIO 从属程序
Description[zh_TW]=用於 FISH 通訊協定的 kioslave
X-DocPath=kioslave5/fish/index.html
......@@ -74,7 +74,7 @@ Description[uk]=Підлеглий засіб введення-виведенн
Description[vi]=Một kioslave để duyệt mạng
Description[wa]=On vårlet d' I/R po betchter el rantoele
Description[x-test]=xxA kioslave to browse the networkxx
Description[zh_CN]=浏览网络的 KIO slave
Description[zh_CN]=用于浏览网络的 KIO 从属程序
Description[zh_TW]=瀏覽網路的 kioslave
exec=kf5/kio/network
......
......@@ -74,7 +74,7 @@ Name[uk]=Наглядач мережі
Name[vi]=Trình theo dõi mạng
Name[wa]=Waiteu d' rantoele
Name[x-test]=xxNetwork Watcherxx
Name[zh_CN]=网络监视器
Name[zh_CN]=网络文件系统监视程序
Name[zh_TW]=網路監控器
Comment=Keeps track of the network and updates directory listings of the network:/ protocol
Comment[bg]=Наблюдение на мрежата и обновяване на съответните списъци на мрежовия протокол
......@@ -142,5 +142,5 @@ Comment[uk]=Стежить за мережею і оновлює списки к
Comment[vi]=Theo dõi mạng và cập nhật danh sách thư mục trong giao thức network://
Comment[wa]=Wåde ene trace des djivêyes des ridants del rantoele et des metaedjes a djoû do protocole network:/
Comment[x-test]=xxKeeps track of the network and updates directory listings of the network:/ protocolxx
Comment[zh_CN]=跟踪网络及 network:/ 协议所列目录的更新情况
Comment[zh_CN]=监视网络文件系统变化,更新 network:/ 协议列出的目录
Comment[zh_TW]=保持追蹤此網路,並更新 network:/ 協定中的目錄清單
......@@ -58,7 +58,7 @@ Name[uk]=Наглядач за недавніми документами
Name[vi]=Trình theo dõi tài liệu gần đây
Name[wa]=Waiteu des documint eployîs dierinnmint
Name[x-test]=xxRecent Document Watcherxx
Name[zh_CN]=最近文档监视
Name[zh_CN]=最近文档监视程序
Name[zh_TW]=最近文件監控器
ServiceTypes=KDEDModule
X-KDE-ServiceTypes=KDEDModule
......
......@@ -102,7 +102,7 @@ Description[uz@cyrillic]=SFTP учун КЧ-слейв
Description[vi]=A kioslave cho SFTP
Description[wa]=On vårlet d' I/R pol protocole sftp
Description[x-test]=xxA kioslave for sftpxx
Description[zh_CN]=sftp 的 KIO slave
Description[zh_CN]=用于 SFTP 的 KIO 从属程序
Description[zh_TW]=sftp 的 kioslave
X-DocPath=kioslave5/sftp/index.html
Class=:internet
......@@ -42,6 +42,7 @@ Name[sl]=Opazovalnik SMB
Name[sv]=SMB-övervakare
Name[uk]=Наглядач SMB
Name[x-test]=xxSMB Watcherxx
Name[zh_CN]=SMB 监视程序
Comment=Monitors directories on the smb:/ protocol for changes
Comment[ca]=Controla els canvis als directoris en el protocol «smb:/»
Comment[ca@valencia]=Controla els canvis als directoris en el protocol «smb:/»
......@@ -69,3 +70,4 @@ Comment[sl]=Nadzira direktorije smb:/ za spremembami
Comment[sv]=Övervakar katalogen med protokollet smb:/ för ändringar
Comment[uk]=Стежить за змінами у теках, доступ до яких здійснюється за протоколом smb:/
Comment[x-test]=xxMonitors directories on the smb:/ protocol for changesxx
Comment[zh_CN]=监视 smb:/ 协议目录的更改
......@@ -29,7 +29,7 @@ Name[sl]=AppImage
Name[sv]=AppImage
Name[uk]=AppImage
Name[x-test]=xxAppImagexx
Name[zh_CN]=AppImage
Name[zh_CN]=AppImage 软件包
Name[zh_TW]=AppImage
X-KDE-ServiceTypes=ThumbCreator
MimeType=application/x-iso9660-appimage;application/vnd.appimage;
......
......@@ -69,7 +69,7 @@ Name[uk]=Комікси
Name[vi]=Truyện tranh
Name[wa]=Binde d' imådjes
Name[x-test]=xxComic Booksxx
Name[zh_CN]=漫画书
Name[zh_CN]=漫画电子
Name[zh_TW]=漫畫書
ServiceTypes=ThumbCreator
MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/vnd.comicbook+zip;application/vnd.comicbook-rar;application/vnd.comicbook+tar;application/x-cb7;
......
......@@ -69,7 +69,7 @@ Name[uk]=Стільничні файли
Name[vi]=Tệp desktop
Name[wa]=Fitchîs di scribannes
Name[x-test]=xxDesktop Filesxx
Name[zh_CN]=桌面文件
Name[zh_CN]=桌面配置文件
Name[zh_TW]=桌面檔
X-KDE-ServiceTypes=ThumbCreator
MimeType=application/x-desktop;
......
......@@ -66,7 +66,7 @@ Name[uk]=Зображення (GIF, PNG, BMP…)
Name[vi]=Ảnh (GIF, PNG, BMP,... )
Name[wa]=Imådjes (GIF, PNG, BMP...)
Name[x-test]=xxImages (GIF, PNG, BMP, ...)xx
Name[zh_CN]=图像 (GIF、PNG、BMP ...)
Name[zh_CN]=图像 (GIF、PNG、BMP )
Name[zh_TW]=影像(GIF、PNG、BMP...)
X-KDE-ServiceTypes=ThumbCreator
MimeType=image/cgm;image/fax-g3;image/gif;image/jp2;image/png;image/tiff;image/bmp;image/x-dds;image/x-jng;image/x-pcx;image/vnd.zbrush.pcx;image/x-photo-cd;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-rgb;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-sun-raster;image/vnd.adobe.photoshop;image/x-psd;image/x-hdr;image/x-pic;image/x-icon;image/x-webp;image/webp;image/x-icns;video/x-mng;image/rle;image/avif;
......
......@@ -38,7 +38,7 @@ Name[sv]=Krita-dokument
Name[tr]=Krita Belgeleri
Name[uk]=Документи Krita
Name[x-test]=xxKrita Documentsxx
Name[zh_CN]=Krita 文档
Name[zh_CN]=Krita 图像
Name[zh_TW]=Krita 文件
X-KDE-ServiceTypes=ThumbCreator
......
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