Commit 638f908d 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 66fa27ca
......@@ -32,6 +32,7 @@ Name[ko]=KDE 포털 통합
Name[nl]=Integratie in KDE Portal
Name[nn]=KDE-portalintegrering
Name[pt]=Integração do Portal no KDE
Name[pt_BR]=Integração do KDE Portal
Name[ru]=Портал встраивания KDE
Name[sk]=Integrácia KDE portálu
Name[sv]=Integrering av KDE:s portal
......@@ -52,6 +53,7 @@ Name[ko]=스크린캐스팅
Name[nl]=Screencasting
Name[nn]=Skjermdeling
Name[pt]=Partilha do ecrã
Name[pt_BR]=Transmissão de tela
Name[ru]=Трансляция экрана
Name[sk]=Prenos obrazovky
Name[sv]=Skärmutsändning
......@@ -72,6 +74,7 @@ Name[ko]=스크린캐스팅 실패
Name[nl]=Screencasting is mislukt
Name[nn]=Feil ved skjermdeling
Name[pt]=Não foi possível partilhar o ecrã
Name[pt_BR]=Falha na transmissão de tela
Name[ru]=Не удалось запустить трансляцию экрана
Name[sk]=Prenos obrazovky zlyhal
Name[sv]=Skärmutsändning misslyckades
......@@ -90,6 +93,7 @@ Comment[ko]=스크린캐스팅 중 오류 발생
Comment[nl]=Er deed zich een fout voor bij screencasting
Comment[nn]=Det oppstod ein feil ved skjermdeling
Comment[pt]=Ocorreu um erro ao partilhar o ecrã
Comment[pt_BR]=Ocorreu um erro ao transmitir a tela
Comment[ru]=Произошла ошибка во время трансляции экрана
Comment[sk]=Nastala chyba počas prenosu obrazovkyk
Comment[sv]=Ett fel påträffades vid skärmutsändning
......
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