Commit 7f3d373b 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 638f908d
......@@ -6,6 +6,7 @@ Comment[en_GB]=Integrating applications into the KDE Plasma desktop
Comment[es]=Integración de aplicaciones en el escritorio KDE Plasma
Comment[et]=Rakenduste lõimimine KDE Plasma töölauda
Comment[eu]=Aplikazioak KDE Plasma mahaigainean bateratzea
Comment[fr]=Intégration des applications dans le bureau Plasma de KDE
Comment[ia]=Integrante applicationes in le scriptorio de KDE Plasma
Comment[id]=Pengintegrasian aplikasi ke dalam desktop KDE Plasma
Comment[it]=Integrazione delle applicazioni nel desktop KDE Plasma
......@@ -25,6 +26,7 @@ Name[en_GB]=KDE Portal Integration
Name[es]=Integración del portal de KDE
Name[et]=KDE portaali lõimimine
Name[eu]=KDE atari bateratzea
Name[fr]=Intégration du portail KDE
Name[ia]=Integration de portal de KDE
Name[id]=Integrasi Portal KDE
Name[it]=Portale di integrazione di KDE
......@@ -46,6 +48,7 @@ Name[en_GB]=Screencasting
Name[es]=Grabación de pantalla
Name[et]=Ekraanivideo tegemine
Name[fr]=Capture d'écran
Name[it]=Trasmissione dello schermo
......@@ -67,6 +70,7 @@ Name[en_GB]=Screencasting failed
Name[es]=La grabación de pantalla ha fallado
Name[et]=Ekraanivideo tegemine nurjus
Name[eu]=Pantaila-grabatzea huts egin du
Name[fr]=Échec de la capture d'écran
Name[ia]=Screencasting falleva
Name[id]=Gagal meng-screencasting
Name[it]=Trasmissione dello schermo non riuscita
......@@ -86,6 +90,7 @@ Comment[en_GB]=An error was encountered while screencasting
Comment[es]=Se ha producido un error durante la grabación de la pantalla
Comment[et]=Ekraanivideo tegemisel tekkis tõrge
Comment[eu]=Errore bat jazo da pantaila-grabatzean
Comment[fr]=Une erreur est survenue durant la copie d'écran
Comment[ia]=Il incontrava un error incognite dum screencasting
Comment[id]=Sebuah error telah terjadi ketika sedang men-screencasting
Comment[it]=Si è verificato un errore durante la trasmissione dello schermo
Supports Markdown
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