Commit c0497ce2 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 a7a406a3
......@@ -36,8 +36,8 @@ Name[x-test]=xxWifixx
Name[zh_TW]=Wi-Fi
Comment=Connect to Wifi networks
Comment[az]=Wifi şəbəkələrinə qoşulun
Comment[ca]=Connecta a les xarxes Wi-Fi
Comment[ca@valencia]=Connecta a les xarxes Wi-Fi
Comment[ca]=Connecta amb les xarxes Wi-Fi
Comment[ca@valencia]=Connecta amb les xarxes Wi-Fi
Comment[da]=Forbind til wi-fi-netværk
Comment[es]=Conectar a redes Wifi
Comment[et]=Ühendumine WiFi võrkudega
......
[Desktop Entry]
Comment=Plasma Mycroft Big Screen look and feel
Comment[az]=Plasma Mycroft Böyük Ekran xarici görünüşü
Comment[ca]=Aparença i comportament de la pantalla gran del Mycroft per a Plasma
Comment[ca@valencia]=Aparença i comportament de la pantalla gran del Mycroft per a Plasma
Comment[ca]=Aparença i comportament de la pantalla gran del Mycroft per al Plasma
Comment[ca@valencia]=Aparença i comportament de la pantalla gran del Mycroft per al Plasma
Comment[da]=Udseende og fornemmelse af Plasma Mycroft Big Screen
Comment[es]=Aspecto de Plasma Mycroft Big Screen
Comment[et]=Plasma Mycrofti suurekraani välimus
......
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