Commit fce712fb 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 e4bb461f
......@@ -145,7 +145,7 @@ Name[uk]=Збіг з шаблоном
Name[vi]=Mẫu khớp
Name[wa]=Patron ki corespondèt
Name[x-test]=xxPattern Matchedxx
Name[zh_CN]=匹配模式
Name[zh_CN]=匹配模式
Name[zh_TW]=樣式已符合
Comment=Search pattern matched
Comment[af]=Soek patroon opgespoor
......@@ -226,7 +226,7 @@ Comment[uk]=Збіг з шаблоном пошуку
Comment[vi]=Mẫu tìm kiếm khớp
Comment[wa]=Trover des patrons k' corespondèt
Comment[x-test]=xxSearch pattern matchedxx
Comment[zh_CN]=搜索匹配的模式
Comment[zh_CN]=匹配的搜索模式
Comment[zh_TW]=搜尋樣式比對符合
[Event/sensor_alarm]
......@@ -391,5 +391,5 @@ Comment[vi]=Cảm biến vượt quá giới hạn nguy cấp
Comment[wa]=Li sinteu a stî pus lon kel limite critike
Comment[xh]=Umda wokufumana ingxaki ekhoyo woluvo
Comment[x-test]=xxSensor exceeded critical limitxx
Comment[zh_CN]=传感器达到关键限制
Comment[zh_CN]=传感器超出危险限制
Comment[zh_TW]=感應器已超過限制
......@@ -72,7 +72,7 @@ Name[vi]=KSysGuard
Name[wa]=KSisGåde
Name[xh]=KSysGuard
Name[x-test]=xxKSysGuardxx
Name[zh_CN]=系统卫士
Name[zh_CN]=KDE 系统监视器
Name[zh_TW]=KSysGuard
GenericName=System Monitor
GenericName[af]=Stelsel Monitor
......@@ -207,7 +207,7 @@ Comment[tr]=Çalışan süreçleri ve sistem performansını izleyin
Comment[uk]=Стеження за процесами та швидкодією системи
Comment[vi]=Giám sát các tiến trình đang chạy và hiệu năng hệ thống
Comment[x-test]=xxMonitor running processes and system performancexx
Comment[zh_CN]=监运行的进程和系统效率
Comment[zh_CN]=监控正在运行的程序进程和系统性能
Comment[zh_TW]=監視正在執行的處理程序與系統效能
Exec=ksysguard %U
Icon=utilities-system-monitor
......
......@@ -30,7 +30,7 @@
"Description[tg]": "Истифодаи шабака барои ҳар як барнома",
"Description[uk]": "Використання мережі окремими програмами",
"Description[x-test]": "xxPer-application network usagexx",
"Description[zh_CN]": "分应用的网络用量",
"Description[zh_CN]": "每个应用程序的网络使用率",
"Description[zh_TW]": "每個應用程式的網路使用量"
}
}
......@@ -29,7 +29,7 @@
"Description[tg]": "Омори ҳар як раванди манбаъи GPU барои кортҳои Nvidia",
"Description[uk]": "Статистика ресурсів окремих процесів графічного процесора для карток NVidia",
"Description[x-test]": "xxStats of per-process GPU resources for Nvidia cardsxx",
"Description[zh_CN]": "进程的 GPU 资源状态,仅限 NVIDIA 显卡",
"Description[zh_CN]": "每个进程的 GPU 资源状态,仅限 Nvidia 显卡",
"Description[zh_TW]": "適用於 Nvidia 卡的各處理程序 GPU 資源統計"
}
}
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