Commit 77524f0c 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 ed80503e
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Mycroft Bigscreen
Name[ca]=Bigscreen del Mycroft
Name[ca@valencia]=Bigscreen del Mycroft
Name[da]=Mycroft Bigscreen
Name[es]=Mycroft Bigscreen
Name[et]=Mycrofti suurekraan
Name[eu]=Mycroft Bigscreen
......@@ -21,6 +22,7 @@ Name[zh_TW]=Mycroft Bigscreen
Comment=Homescreen for Plasma and Mycroft based TVs
Comment[ca]=Pantalla d'inici del Plasma i Mycroft per a televisors
Comment[ca@valencia]=Pantalla d'inici del Plasma i Mycroft per a televisors
Comment[da]=Startskærm for Plasma- og Mycroft-baserede fjernsyn
Comment[es]=Pantalla de inicio para televisores basados en Plasma y Mycroft
Comment[et]=Plasma ja Mycrofti põhise TV avaekraan
Comment[eu]=Plasman eta Mycroft-en oinarritutako TBen atariko pantaila
......
......@@ -16,6 +16,7 @@ Name=Language
Name[ca]=Idioma
Name[ca@valencia]=Idioma
Name[cs]=Jazyk
Name[da]=Sprog
Name[es]=Idioma
Name[et]=Keel
Name[eu]=Hizkuntza
......@@ -36,6 +37,7 @@ Comment=Change workspace and application languages
Comment[ca]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[ca@valencia]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[cs]=Změnit pracovní prostředí a jazyk aplikace
Comment[da]=Skift sprog for skrivebordet og programmer
Comment[es]=Cambiar el idioma de las aplicaciones y el espacio de trabajo
Comment[et]=Töötsooni ja rakenduse keele muutmine
Comment[eu]=Aldatu languneko eta aplikazioetako hizkuntzak
......
......@@ -3,6 +3,7 @@ Name=Language
Name[ca]=Idioma
Name[ca@valencia]=Idioma
Name[cs]=Jazyk
Name[da]=Sprog
Name[es]=Idioma
Name[et]=Keel
Name[eu]=Hizkuntza
......
......@@ -16,6 +16,7 @@ Name=KDE Connect
Name[ca]=KDE Connect
Name[ca@valencia]=KDE Connect
Name[cs]=KDE Connect
Name[da]=KDE Connect
Name[es]=KDE Connect
Name[et]=KDE Connect
Name[eu]=KDE Connect
......@@ -36,6 +37,7 @@ Comment=Connect and sync your devices
Comment[ca]=Connecta i sincronitza els vostres dispositius
Comment[ca@valencia]=Connecta i sincronitza els vostres dispositius
Comment[cs]=Připojte a synchronizujte svá zařízení
Comment[da]=Forbind og synkronisér dine enheder
Comment[es]=Conecta y sincroniza sus dispositivos
Comment[et]=Seadmete ühendamine ja sünkroonimine
Comment[eu]=Konektatu eta sinkronizatu zure gailuak
......
......@@ -3,6 +3,7 @@ Name=KDE Connect
Name[ca]=KDE Connect
Name[ca@valencia]=KDE Connect
Name[cs]=KDE Connect
Name[da]=KDE Connect
Name[es]=KDE Connect
Name[et]=KDE Connect
Name[eu]=KDE Connect
......
......@@ -16,6 +16,7 @@ Name=Wifi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=WiFi
Name[da]=Wi-fi
Name[es]=Wifi
Name[et]=WiFi
Name[eu]=Wi-Fi
......@@ -35,6 +36,7 @@ Name[zh_TW]=Wi-Fi
Comment=Connect to Wifi networks
Comment[ca]=Connecta a les xarxes Wi-Fi
Comment[ca@valencia]=Connecta a les xarxes Wi-Fi
Comment[da]=Forbind til wi-fi-netværk
Comment[es]=Conectar a redes Wifi
Comment[et]=Ühendumine WiFi võrkudega
Comment[eu]=Konektatu Wi-Fi sareetara
......
......@@ -3,6 +3,7 @@ Name=Wifi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=WiFi
Name[da]=Wi-fi
Name[es]=Wifi
Name[et]=WiFi
Name[eu]=Wi-Fi
......
......@@ -2,6 +2,7 @@
Comment=Plasma Mycroft Big Screen look and feel
Comment[ca]=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[da]=Udseende og fornemmelse af Plasma Mycroft Big Screen
Comment[es]=Aspecto de Plasma Mycroft Big Screen
Comment[et]=Plasma Mycrofti suurekraani välimus
Comment[eu]=Plasma Mycroft pantaila handiaren itxura eta izaera
......@@ -21,6 +22,7 @@ Comment[zh_TW]=Plasma Mycroft 大螢幕外觀及感覺
Name=Mycroft Big Screen
Name[ca]=Pantalla gran del Mycroft
Name[ca@valencia]=Pantalla gran del Mycroft
Name[da]=Mycroft Big Screen
Name[es]=Mycroft Big Screen
Name[et]=Mycrofti suurekraan
Name[eu]=Mycroft-en pantaila handia
......
......@@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Plasma Big Screen
Name[ca]=Pantalla gran del Plasma
Name[ca@valencia]=Pantalla gran del Plasma
Name[da]=Plasma Big Screen
Name[es]=Plasma Big Screen
Name[et]=Plasma suurekraan
Name[eu]=Plasmaren pantaila handia
......@@ -21,6 +22,7 @@ Name[zh_TW]=Plasma 大螢幕
Comment=Plasma shell for TVs
Comment[ca]=Espai de treball Plasma per a televisors
Comment[ca@valencia]=Espai de treball Plasma per a televisors
Comment[da]=Plasma-skal til fjernsyn
Comment[es]=Intérprete de comandos para televisores
Comment[et]=Plasma televisioonikest
Comment[eu]=Plasmaren oskola TBrako
......
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