Commit f8cbca63 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 bb2678cd
......@@ -20,6 +20,7 @@
"Description[lt]": "Tinklo naudojimas kiekvienai atskirai programai",
"Description[nl]": "Netwerkgebruik per toepassing",
"Description[nn]": "Programspesifikk nettverksbruk",
"Description[pa]": "ਹਰ-ਐਪਲੀਕੇਸ਼ਨ ਨੈ਼ਟਵਰਕ ਵਰਤੋਂ",
"Description[pl]": "Wykorzystanie sieci wg aplikacji",
"Description[pt]": "Utilização da rede por aplicação",
"Description[pt_BR]": "Uso da rede por aplicativo",
......
......@@ -19,6 +19,7 @@
"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",
"Description[pa]": "ਇਨਵੀਡੀਆ ਕਾਰਡ ਲਈ ਹਰ ਪਰੋਸੈਸ GPU ਸਰੋਤਾਂ ਦੇ ਅੰਕੜੇ",
"Description[pl]": "Statystyka dla zasobów GPU na proces dla kart Nvidii",
"Description[pt]": "Estatísticas dos recursos do GPU por processo nas placas Nvidia",
"Description[pt_BR]": "Estatísticas de recursos GPU por processo para placas Nvidia",
......
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