Commit 1a6f86b0 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 c33458d3
[Global]
IconName=start-here-kde-plasma
Comment=Integrating applications into the KDE Plasma desktop
Comment[az]=Tətbiqlərin KDE İş Masasına İnteqrasiyası
Comment[ca]=Integració d'aplicacions a l'escriptori Plasma del KDE
Comment[cs]=Integrace aplikací do pracovního prostředí KDE Plasma
Comment[da]=Integration af programmer med KDE Plasma-skrivebordet
......@@ -26,6 +27,7 @@ Comment[uk]=Інтеграція програм до стільниці Плаз
Comment[x-test]=xxIntegrating applications into the KDE Plasma desktopxx
Comment[zh_CN]=将应用程序整合到 KDE Plasma 桌面
Name=KDE Portal Integration
Name[az]=KDE Portalı İnteqrasiyası
Name[ca]=Integració del Portal del KDE
Name[cs]=Integrace Portálu KDE
Name[da]=Integration med KDE Portal
......@@ -53,6 +55,7 @@ Name[zh_CN]=KDE 门户集成
[Context/screencast]
Name=Screencasting
Name[az]=Ekranın video çəkilişi
Name[ca]=Vídeo de captura de pantalla
Name[da]=Skærmoptagelse
Name[en_GB]=Screencasting
......@@ -79,6 +82,7 @@ Name[zh_CN]=屏幕录像
[Event/screencastfailure]
Name=Screencasting failed
Name[az]=Ekranın video çəkilişi baş tutmadı
Name[ca]=Ha fallat el vídeo de captura de pantalla
Name[da]=Skærmoptagelse mislykkedes
Name[en_GB]=Screencasting failed
......@@ -103,6 +107,7 @@ Name[uk]=Помилка трансляції даних
Name[x-test]=xxScreencasting failedxx
Name[zh_CN]=屏幕录像失败
Comment=An error was encountered while screencasting
Comment[az]=Ekran video çəkilişi zamanı xəta baş verdi
Comment[ca]=S'ha trobat un error en fer el vídeo de captura de pantalla
Comment[da]=Der opstod en fejl under skærmoptagelse
Comment[en_GB]=An error was encountered while screencasting
......
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