Commit 8b9e0e3e 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 ef525ffd
......@@ -93,7 +93,7 @@ Name[ug]=ياردەم ئىقتىدارى
Name[uk]=Доступність
Name[uz]=Qulayliklar
Name[uz@cyrillic]=Қулайликлар
Name[vi]=Khả năng truy cập
Name[vi]=Hỗ trợ truy cập
Name[wa]=Accessibilité
Name[xh]=Unikezelo
Name[x-test]=xxAccessibilityxx
......
......@@ -24,6 +24,7 @@ Name[pa]=ਰੂਟ
Name[pt]=Raiz
Name[pt_BR]=Raiz
Name[ro]=Rădăcină
Name[ru]=Корень
Name[sk]=Koreň
Name[sl]=Root
Name[sv]=Rot
......
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