Commit 20e6bc2e 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 a03ceb7e
......@@ -13,6 +13,7 @@
"Description[ia]": "Statisticas de ressources de GPU per processo pro cartas de Nvidia",
"Description[id]": "Status sumberdaya GPU tiap proses untuk kartu Nvidia",
"Description[it]": "Statistiche delle risorse GPU per processo delle schede Nvidia",
"Description[ko]": "Nvidia 카드의 프로세스별 GPU 자원 통계",
"Description[lt]": "Nvidia plokščių grafinio procesoriaus išteklių statistika kiekvienam atskiram procesui",
"Description[nl]": "Statistieken van per-proces GPU-hulpbronnen voor Nvidia kaarten",
"Description[nn]": "Statistikk til prosessorspesifikke GPU-ressursar for NVIDIA-kort",
......
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