Commit a9670e5a 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 024c1d08
......@@ -24,7 +24,7 @@
"Description[nn]": "Del utklippstavla mellom einingar",
"Description[pl]": "Współdziel schowek pomiędzy urządzeniami",
"Description[pt]": "Partilhar a área de transferência entre dispositivos",
"Description[pt_BR]": "Compartilhar a área de transferência entre dispositivos",
"Description[pt_BR]": "Compartilha a área de transferência entre dispositivos",
"Description[ru]": "Общий буфер обмена между устройствами",
"Description[sk]": "Zdieľať schránku medzi zariadeniami",
"Description[sv]": "Dela klippbordet mellan apparater",
......
......@@ -24,7 +24,7 @@
"Description[nn]": "Hindra pauseskjermen i å starta når eininga er kopla til",
"Description[pl]": "Powstrzymaj wygaszacz ekrany po podłączeniu urządzenia",
"Description[pt]": "Inibir o protector de ecrã quando o dispositivo estiver ligado",
"Description[pt_BR]": "Inibir o protetor de tela quando o dispositivo estiver conectado",
"Description[pt_BR]": "Inibe o protetor de tela quando o dispositivo estiver conectado",
"Description[ru]": "Предотвращение запуска блокировщика экрана, когда устройство подключено",
"Description[sk]": "Obmedziť šetrič obrazovky keď je pripojené zariadenie",
"Description[sv]": "Stoppa skärmsläckaren när apparaten ansluts",
......
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