Commit 3b445e95 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 fe91e853
...@@ -50,7 +50,7 @@ Name[en_GB]=Screencasting ...@@ -50,7 +50,7 @@ Name[en_GB]=Screencasting
Name[es]=Grabación de pantalla Name[es]=Grabación de pantalla
Name[et]=Ekraanivideo tegemine Name[et]=Ekraanivideo tegemine
Name[eu]=Pantaila-grabatzea Name[eu]=Pantaila-grabatzea
Name[fr]=Capture d'écran Name[fr]=Capture vidéo de l'écran
Name[ia]=Screencasting Name[ia]=Screencasting
Name[id]=Screencasting Name[id]=Screencasting
Name[it]=Trasmissione dello schermo Name[it]=Trasmissione dello schermo
...@@ -73,7 +73,7 @@ Name[en_GB]=Screencasting failed ...@@ -73,7 +73,7 @@ Name[en_GB]=Screencasting failed
Name[es]=La grabación de pantalla ha fallado Name[es]=La grabación de pantalla ha fallado
Name[et]=Ekraanivideo tegemine nurjus Name[et]=Ekraanivideo tegemine nurjus
Name[eu]=Pantaila-grabatzea huts egin du Name[eu]=Pantaila-grabatzea huts egin du
Name[fr]=Échec de la capture d'écran Name[fr]=Échec de la capture vidéo de l'écran
Name[ia]=Screencasting falleva Name[ia]=Screencasting falleva
Name[id]=Gagal meng-screencasting Name[id]=Gagal meng-screencasting
Name[it]=Trasmissione dello schermo non riuscita Name[it]=Trasmissione dello schermo non riuscita
...@@ -94,7 +94,7 @@ Comment[en_GB]=An error was encountered while screencasting ...@@ -94,7 +94,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[es]=Se ha producido un error durante la grabación de la pantalla
Comment[et]=Ekraanivideo tegemisel tekkis tõrge Comment[et]=Ekraanivideo tegemisel tekkis tõrge
Comment[eu]=Errore bat jazo da pantaila-grabatzean Comment[eu]=Errore bat jazo da pantaila-grabatzean
Comment[fr]=Une erreur est survenue durant la copie d'écran Comment[fr]=Une erreur est survenue durant la capture vidéo de l'écran
Comment[ia]=Il incontrava un error incognite dum screencasting Comment[ia]=Il incontrava un error incognite dum screencasting
Comment[id]=Sebuah error telah terjadi ketika sedang men-screencasting Comment[id]=Sebuah error telah terjadi ketika sedang men-screencasting
Comment[it]=Si è verificato un errore durante la trasmissione dello schermo Comment[it]=Si è verificato un errore durante la trasmissione dello schermo
......
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