Commit cf1b88a8 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 d5521d2e
......@@ -60,6 +60,7 @@ Name[tg]=KCachegrind
Name[tr]=KCachegrind
Name[ug]=KCachegrind
Name[uk]=KCachegrind
Name[x-test]=xxKCachegrindxx
Name[zh_CN]=KCachegrind
Name[zh_TW]=KCachegrind
GenericName=Profiler Frontend
......@@ -114,6 +115,7 @@ GenericName[tg]=Интерфейс ба профилкунанда
GenericName[tr]=Profil Önyüzü
GenericName[uk]=Інтерфейс до Profiler
GenericName[wa]=Eterface grafike po Profiler
GenericName[x-test]=xxProfiler Frontendxx
GenericName[zh_CN]=分析器前端
GenericName[zh_TW]=分析器前端
Comment=Visualization of Performance Profiling Data
......@@ -165,6 +167,7 @@ Comment[tg]=Утилита барои гузориши профили визуа
Comment[tr]=Performans Profilleme Verisinin Görünür Hali
Comment[ug]=سانلىق-مەلۇماتلارنىڭ سەپلىنىشىنى سۈرەتلەشتۈرۈش
Comment[uk]=Візуалізація даних профілювання швидкодії
Comment[x-test]=xxVisualization of Performance Profiling Dataxx
Comment[zh_CN]=性能测试数据的可视化表现
Comment[zh_TW]=效能分析資料視覺化
StartupWMClass=kcachegrind
......
......@@ -43,6 +43,7 @@ Name[sr@latin]=QCacheGrind
Name[sv]=Qcachegrind
Name[tr]=QCachegrind
Name[uk]=QCachegrind
Name[x-test]=xxQCachegrindxx
Name[zh_CN]=QCachegrind
Name[zh_TW]=QCachegrind
GenericName=Profiler Frontend
......@@ -97,6 +98,7 @@ GenericName[tg]=Интерфейс ба профилкунанда
GenericName[tr]=Profil Önyüzü
GenericName[uk]=Інтерфейс до Profiler
GenericName[wa]=Eterface grafike po Profiler
GenericName[x-test]=xxProfiler Frontendxx
GenericName[zh_CN]=分析器前端
GenericName[zh_TW]=分析器前端
Comment=Visualization of Performance Profiling Data
......@@ -148,6 +150,7 @@ Comment[tg]=Утилита барои гузориши профили визуа
Comment[tr]=Performans Profilleme Verisinin Görünür Hali
Comment[ug]=سانلىق-مەلۇماتلارنىڭ سەپلىنىشىنى سۈرەتلەشتۈرۈش
Comment[uk]=Візуалізація даних профілювання швидкодії
Comment[x-test]=xxVisualization of Performance Profiling Dataxx
Comment[zh_CN]=性能测试数据的可视化表现
Comment[zh_TW]=效能分析資料視覺化
Categories=Qt;Development;
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