Commit 87981fe8 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 d99cab45
......@@ -47,7 +47,7 @@ Name[nb]=Åpne fjerntilkobling til skrivebord til denne maskinen
Name[nds]=Schriefdisch-Feernverbinnen na dissen Reekner opmaken
Name[ne]=यो मेशिनमा टाढाको डेस्कटप जडान खोल्नुहोस्
Name[nl]=Externe bureaubladverbinding met deze computer openen
Name[nn]=Opna samband til skrivebordet over nettverket til denne maskina
Name[nn]=Opna nettverkssamband til skrivebordet til maskina
Name[pa]=ਇਸ ਮਸ਼ੀਨ ਨਾਲ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਕੁਨੈਕਸ਼ਨ ਖੋਲ੍ਹੋ
Name[pl]=Otwórz zdalne połączenie z pulpitem na tej maszynie
Name[pt]=Abrir uma Ligação Remota ao Ecrã deste Computador
......
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