Commit 3a2c6ade 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 4ed56a24
......@@ -6,6 +6,7 @@ Name[ca@valencia]=Pantalla gran del Mycroft
Name[es]=Mycroft Bigscreen
Name[et]=Mycrofti suurekraan
Name[it]=Mycroft Bigscreen
Name[ko]=Mycroft 큰 화면
Name[nl]=Mycroft Bigscreen
Name[pt]=Mycroft de Grande Ecrã
Name[sk]=Mycroft Bigscreen
......@@ -19,6 +20,7 @@ Comment[ca@valencia]=Pantalla d'inici del Plasma i Mycroft per a televisors
Comment[es]=Pantalla de inicio para televisores basados en Plasma y Mycroft
Comment[et]=Plasma ja Mycrofti põhine teleekraan
Comment[it]=Schermata principale per i televisori basati su Plasma e Mycroft
Comment[ko]=Plasma 및 Mycroft 기반 TV 홈 화면
Comment[nl]=Standaardscherm voor Plasma en op Mycroft gebaseerde TV's
Comment[pt]=Ecrã inicial para TV's baseadas no Plasma e Mycroft
Comment[sv]=Hemskärm för Plasma- och Mycroft-baserade tv-apparater
......
......@@ -19,6 +19,7 @@ Name[cs]=Jazyk
Name[es]=Idioma
Name[et]=Keel
Name[it]=Lingua
Name[ko]=언어
Name[nl]=Taal
Name[pt]=Língua
Name[sk]=Jazyk
......@@ -33,6 +34,7 @@ Comment[cs]=Změnit pracovní prostředí a jazyk aplikace
Comment[es]=Cambiar el idioma de las aplicaciones y el espacio de trabajo
Comment[et]=Töötsooni ja rakenduse keele muutmine
Comment[it]=Cambia la lingua dello spazio di lavoro e dell'applicazione
Comment[ko]=작업 공간과 프로그램 언어 변경
Comment[nl]=Werkruimte en talen van toepassingen wijzigen
Comment[pt]=Mudar as línguas da área de trabalho e da aplicação
Comment[sv]=Ändra arbetsområde och programspråk
......
......@@ -6,6 +6,7 @@ Name[cs]=Jazyk
Name[es]=Idioma
Name[et]=Keel
Name[it]=Lingua
Name[ko]=언어
Name[nl]=Taal
Name[pt]=Língua
Name[sk]=Jazyk
......
......@@ -19,6 +19,7 @@ Name[cs]=WiFi
Name[es]=Wifi
Name[et]=WiFi
Name[it]=Wifi
Name[ko]=Wi-Fi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[sk]=Wifi
......@@ -32,6 +33,7 @@ Comment[ca@valencia]=Connecta a les xarxes Wi-Fi
Comment[es]=Conectar a redes Wifi
Comment[et]=Ühendumine WiFi võrkudega
Comment[it]=Connettiti alle reti senza fili
Comment[ko]=Wi-Fi 네트워크에 연결
Comment[nl]=Met WiFi-netwerken verbinden
Comment[pt]=Ligar a redes Wi-Fi
Comment[sv]=Anslut till WIFI-nätverk
......
......@@ -6,6 +6,7 @@ Name[cs]=WiFi
Name[es]=Wifi
Name[et]=WiFi
Name[it]=Wifi
Name[ko]=Wi-Fi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[sk]=Wifi
......
......@@ -5,6 +5,7 @@ Comment[ca@valencia]=Aparença i comportament de la pantalla gran del Mycroft pe
Comment[es]=Aspecto de Plasma Mycroft Big Screen
Comment[et]=Plasma Mycrofti suurekraani välimus
Comment[it]=Aspetto di Mycroft Bigscreen di Plasma
Comment[ko]=Plasma Mycroft 큰 화면 모습과 느낌
Comment[nl]=Plasma uiterlijk en gedrag van Mycroft Big Screen
Comment[pt]=Aparência e comportamento do Plasma Mycroft para Grande Ecrã
Comment[sv]=Utseende och känsla för Plasma Mycroft storbildsskärm
......@@ -18,6 +19,7 @@ Name[ca@valencia]=Pantalla gran del Mycroft
Name[es]=Mycroft Big Screen
Name[et]=Mycrofti suurekraan
Name[it]=Mycroft Bigscreen
Name[ko]=Mycroft 큰 화면
Name[nl]=Mycroft Big Screen
Name[pt]=Mycroft para Grande Ecrã
Name[sv]=Mycroft storbildsskärm
......
......@@ -6,6 +6,7 @@ Name[ca@valencia]=Pantalla gran del Plasma
Name[es]=Plasma Big Screen
Name[et]=Plasma suurekraan
Name[it]=Plasma Bigscreen
Name[ko]=Plasma 큰 화면
Name[nl]=Plasma Big Screen
Name[pt]=Plasma para Grande Ecrã
Name[sv]=Plasma storbildsskärm
......@@ -18,6 +19,7 @@ Comment[ca@valencia]=Espai de treball Plasma per a televisors
Comment[es]=Intérprete de comandos para televisores
Comment[et]=Plasma televisioonikest
Comment[it]=Shell di Plasma per TV
Comment[ko]=TV용 Plasma 셸
Comment[nl]=Plasma-shell voor TV's
Comment[pt]=Consola do Plasma para TV's
Comment[sv]=Plasma skal för tv-apparater
......
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