Commit 6aff97b7 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 84c271b7
...@@ -5,7 +5,7 @@ Name[ca]=Pantalla gran del Mycroft ...@@ -5,7 +5,7 @@ Name[ca]=Pantalla gran del Mycroft
Name[ca@valencia]=Pantalla gran del Mycroft Name[ca@valencia]=Pantalla gran del Mycroft
Name[es]=Mycroft Bigscreen Name[es]=Mycroft Bigscreen
Name[et]=Mycrofti suurekraan Name[et]=Mycrofti suurekraan
Name[it]=Mycroft Grande Schermo Name[it]=Mycroft Bigscreen
Name[nl]=Mycroft Bigscreen Name[nl]=Mycroft Bigscreen
Name[pt]=Mycroft de Grande Ecrã Name[pt]=Mycroft de Grande Ecrã
Name[sk]=Mycroft Bigscreen Name[sk]=Mycroft Bigscreen
......
...@@ -4,7 +4,7 @@ Comment[ca]=Aparença i comportament de la pantalla gran del Mycroft per a Plasm ...@@ -4,7 +4,7 @@ Comment[ca]=Aparença i comportament de la pantalla gran del Mycroft per a Plasm
Comment[ca@valencia]=Aparença i comportament de la pantalla gran del Mycroft per a Plasma Comment[ca@valencia]=Aparença i comportament de la pantalla gran del Mycroft per a Plasma
Comment[es]=Aspecto de Plasma Mycroft Big Screen Comment[es]=Aspecto de Plasma Mycroft Big Screen
Comment[et]=Plasma Mycrofti suurekraani välimus Comment[et]=Plasma Mycrofti suurekraani välimus
Comment[it]=Aspetto di Mycroft Grande Schermo di Plasma Comment[it]=Aspetto di Mycroft Bigscreen di Plasma
Comment[nl]=Plasma uiterlijk en gedrag van Mycroft Big Screen Comment[nl]=Plasma uiterlijk en gedrag van Mycroft Big Screen
Comment[pt]=Aparência e comportamento do Plasma Mycroft para Grande Ecrã Comment[pt]=Aparência e comportamento do Plasma Mycroft para Grande Ecrã
Comment[sv]=Utseende och känsla för Plasma Mycroft storbildsskärm Comment[sv]=Utseende och känsla för Plasma Mycroft storbildsskärm
...@@ -17,7 +17,7 @@ Name[ca]=Pantalla gran del Mycroft ...@@ -17,7 +17,7 @@ Name[ca]=Pantalla gran del Mycroft
Name[ca@valencia]=Pantalla gran del Mycroft Name[ca@valencia]=Pantalla gran del Mycroft
Name[es]=Mycroft Big Screen Name[es]=Mycroft Big Screen
Name[et]=Mycrofti suurekraan Name[et]=Mycrofti suurekraan
Name[it]=Mycroft Grande Schermo Name[it]=Mycroft Bigscreen
Name[nl]=Mycroft Big Screen Name[nl]=Mycroft Big Screen
Name[pt]=Mycroft para Grande Ecrã Name[pt]=Mycroft para Grande Ecrã
Name[sv]=Mycroft storbildsskärm Name[sv]=Mycroft storbildsskärm
......
...@@ -5,7 +5,7 @@ Name[ca]=Pantalla gran del Plasma ...@@ -5,7 +5,7 @@ Name[ca]=Pantalla gran del Plasma
Name[ca@valencia]=Pantalla gran del Plasma Name[ca@valencia]=Pantalla gran del Plasma
Name[es]=Plasma Big Screen Name[es]=Plasma Big Screen
Name[et]=Plasma suurekraan Name[et]=Plasma suurekraan
Name[it]=Plasma Grande Schermo Name[it]=Plasma Bigscreen
Name[nl]=Plasma Big Screen Name[nl]=Plasma Big Screen
Name[pt]=Plasma para Grande Ecrã Name[pt]=Plasma para Grande Ecrã
Name[sv]=Plasma storbildsskärm Name[sv]=Plasma storbildsskärm
......
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