Commit fe91e853 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 7f3d373b
......@@ -20,6 +20,7 @@ Comment[sk]=Integrácia aplikácií do pracovnej plochy KDE Plasma
Comment[sv]=Integrera program i KDE:s Plasma-skrivbord
Comment[uk]=Інтеграція програм до стільниці Плазми KDE
Comment[x-test]=xxIntegrating applications into the KDE Plasma desktopxx
Comment[zh_CN]=将应用程序整合到 KDE Plasma 桌面
Name=KDE Portal Integration
Name[ca]=Integració del Portal del KDE
Name[en_GB]=KDE Portal Integration
......@@ -40,6 +41,7 @@ Name[sk]=Integrácia KDE portálu
Name[sv]=Integrering av KDE:s portal
Name[uk]=Інтеграція через Портал KDE
Name[x-test]=xxKDE Portal Integrationxx
Name[zh_CN]=KDE 门户集成
[Context/screencast]
Name=Screencasting
......@@ -62,6 +64,7 @@ Name[sk]=Prenos obrazovky
Name[sv]=Skärmutsändning
Name[uk]=Трансляція
Name[x-test]=xxScreencastingxx
Name[zh_CN]=屏幕录像
[Event/screencastfailure]
Name=Screencasting failed
......@@ -84,6 +87,7 @@ Name[sk]=Prenos obrazovky zlyhal
Name[sv]=Skärmutsändning misslyckades
Name[uk]=Помилка трансляції даних
Name[x-test]=xxScreencasting failedxx
Name[zh_CN]=屏幕录像失败
Comment=An error was encountered while screencasting
Comment[ca]=S'ha trobat un error en fer el vídeo de captura de pantalla
Comment[en_GB]=An error was encountered while screencasting
......@@ -104,6 +108,7 @@ Comment[sk]=Nastala chyba počas prenosu obrazovkyk
Comment[sv]=Ett fel påträffades vid skärmutsändning
Comment[uk]=Сталася помилка під час трансляції даних з екрана
Comment[x-test]=xxAn error was encountered while screencastingxx
Comment[zh_CN]=进行投屏时发生错误
Contexts=screencast
Action=Popup
Urgency=Normal
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