Commit a7a406a3 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 77524f0c
[Desktop Entry]
Encoding=UTF-8
Name=Mycroft Bigscreen
Name[az]=Mycroft Böyük_ekran
Name[ca]=Bigscreen del Mycroft
Name[ca@valencia]=Bigscreen del Mycroft
Name[da]=Mycroft Bigscreen
......@@ -20,6 +21,7 @@ Name[uk]=Mycroft для великих екранів
Name[x-test]=xxMycroft Bigscreenxx
Name[zh_TW]=Mycroft Bigscreen
Comment=Homescreen for Plasma and Mycroft based TVs
Comment[az]=Plasma və Mycroft əsaslı TV-lər üçün Ev_ekranı
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
......
......@@ -13,6 +13,7 @@ X-KDE-Weight=40
X-KDE-FormFactors=tablet,handset,desktop
Name=Language
Name[az]=Dil
Name[ca]=Idioma
Name[ca@valencia]=Idioma
Name[cs]=Jazyk
......@@ -34,6 +35,7 @@ Name[uk]=Мова
Name[x-test]=xxLanguagexx
Name[zh_TW]=語言
Comment=Change workspace and application languages
Comment[az]=İş mühiti və tətbiq dillərini seçin
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
......
[Desktop Entry]
Name=Language
Name[az]=Dil
Name[ca]=Idioma
Name[ca@valencia]=Idioma
Name[cs]=Jazyk
......
......@@ -13,6 +13,7 @@ X-KDE-Weight=40
X-KDE-FormFactors=mediacenter
Name=KDE Connect
Name[az]=KDE Connect
Name[ca]=KDE Connect
Name[ca@valencia]=KDE Connect
Name[cs]=KDE Connect
......@@ -34,6 +35,7 @@ Name[uk]=KDE Connect
Name[x-test]=xxKDE Connectxx
Name[zh_TW]=KDE 連線
Comment=Connect and sync your devices
Comment[az]=Cihazlarınızı qoşun və eyniləşdirin
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í
......
[Desktop Entry]
Name=KDE Connect
Name[az]=KDE Connect
Name[ca]=KDE Connect
Name[ca@valencia]=KDE Connect
Name[cs]=KDE Connect
......
......@@ -13,6 +13,7 @@ X-KDE-Weight=40
X-KDE-FormFactors=mediacenter
Name=Wifi
Name[az]=Wifi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=WiFi
......@@ -34,6 +35,7 @@ Name[uk]=Wi-Fi
Name[x-test]=xxWifixx
Name[zh_TW]=Wi-Fi
Comment=Connect to Wifi networks
Comment[az]=Wifi şəbəkələrinə qoşulun
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
......
[Desktop Entry]
Name=Wifi
Name[az]=Wifi
Name[ca]=Wi-Fi
Name[ca@valencia]=Wi-Fi
Name[cs]=WiFi
......
[Desktop Entry]
Comment=Plasma Mycroft Big Screen look and feel
Comment[az]=Plasma Mycroft Böyük Ekran xarici görünüşü
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
......@@ -20,6 +21,7 @@ Comment[x-test]=xxPlasma Mycroft Big Screen look and feelxx
Comment[zh_TW]=Plasma Mycroft 大螢幕外觀及感覺
Name=Mycroft Big Screen
Name[az]=Mycroft Böyük Ekran
Name[ca]=Pantalla gran del Mycroft
Name[ca@valencia]=Pantalla gran del Mycroft
Name[da]=Mycroft Big Screen
......
[Desktop Entry]
Encoding=UTF-8
Name=Plasma Big Screen
Name[az]=Plasma Böyük Ekran
Name[ca]=Pantalla gran del Plasma
Name[ca@valencia]=Pantalla gran del Plasma
Name[da]=Plasma Big Screen
......@@ -20,6 +21,7 @@ Name[uk]=Плазма для великих екранів
Name[x-test]=xxPlasma Big Screenxx
Name[zh_TW]=Plasma 大螢幕
Comment=Plasma shell for TVs
Comment[az]=TV-lər üçün Plasma örtüyü
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
......
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