Commit f0a78c43 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 57577e70
[Desktop Entry]
Encoding=UTF-8
Name=Mycroft Bigscreen
Name[ca]=Pantalla gran del Mycroft
Name[nl]=Mycroft Bigscreen
Name[pt]=Mycroft de Grande Ecrã
Name[sv]=Mycroft storbildsskärm
Name[uk]=Mycroft для великих екранів
Name[x-test]=xxMycroft Bigscreenxx
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[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
Comment[uk]=Домашнє вікно для телевізорів на основі Плазми і Mycroft
Comment[x-test]=xxHomescreen for Plasma and Mycroft based TVsxx
Comment[zh_TW]=適用於 Plasma 跟基於 Mycroft 的電視的主畫面
Type=Service
X-KDE-ParentApp=
......
......@@ -13,6 +13,20 @@ X-KDE-Weight=40
X-KDE-FormFactors=tablet,handset,desktop
Name=Language
Name[ca]=Idioma
Name[nl]=Taal
Name[pt]=Língua
Name[sv]=Språk
Name[uk]=Мова
Name[x-test]=xxLanguagexx
Name[zh_TW]=語言
Comment=Change workspace and application languages
Comment[ca]=Canvi dels idiomes de l'espai de treball i les aplicacions
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
Comment[uk]=Зміна мови перекладу робочого простору і програм
Comment[x-test]=xxChange workspace and application languagesxx
Comment[zh_TW]=變更工作區及應用程式語言
Categories=Qt;KDE;X-KDE-settings-audiodevice;
[Desktop Entry]
Name=Language
Name[ca]=Idioma
Name[nl]=Taal
Name[pt]=Língua
Name[sv]=Språk
Name[uk]=Мова
Name[x-test]=xxLanguagexx
Name[zh_TW]=語言
Icon=headphone
Type=Service
......
......@@ -13,6 +13,20 @@ X-KDE-Weight=40
X-KDE-FormFactors=mediacenter
Name=Wifi
Name[ca]=Wi-Fi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[sv]=WIFI
Name[uk]=Wi-Fi
Name[x-test]=xxWifixx
Name[zh_TW]=Wi-Fi
Comment=Connect to Wifi networks
Comment[ca]=Connecta a les xarxes Wi-Fi
Comment[nl]=Met WiFi-netwerken verbinden
Comment[pt]=Ligar a redes Wi-Fi
Comment[sv]=Anslut till WIFI-nätverk
Comment[uk]=З'єднання із мережами Wi-Fi
Comment[x-test]=xxConnect to Wifi networksxx
Comment[zh_TW]=連線至 Wi-Fi 網路
Categories=Qt;KDE;X-KDE-settings-wifi;
[Desktop Entry]
Name=Wifi
Name[ca]=Wi-Fi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[sv]=WIFI
Name[uk]=Wi-Fi
Name[x-test]=xxWifixx
Name[zh_TW]=Wi-Fi
Icon=network-wireless-signal-exellent
Type=Service
......
[Desktop Entry]
Comment=Plasma Mycroft Big Screen look and feel
Comment[ca]=Aparença i comportament de la pantalla gran del Mycroft per a Plasma
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
Comment[uk]=Вигляд і поведінка Плазми Mycroft для великих екранів
Comment[x-test]=xxPlasma Mycroft Big Screen look and feelxx
Comment[zh_TW]=Plasma Mycroft 大螢幕外觀及感覺
Name=Mycroft Big Screen
Name[ca]=Pantalla gran del Mycroft
Name[nl]=Mycroft Big Screen
Name[pt]=Mycroft para Grande Ecrã
Name[sv]=Mycroft storbildsskärm
Name[uk]=Mycroft для великих екранів
Name[x-test]=xxMycroft Big Screenxx
Name[zh_TW]=Mycroft 大螢幕
Type=Service
......
[Desktop Entry]
Encoding=UTF-8
Name=Plasma Big Screen
Name[ca]=Pantalla gran del Plasma
Name[nl]=Plasma Big Screen
Name[pt]=Plasma para Grande Ecrã
Name[sv]=Plasma storbildsskärm
Name[uk]=Плазма для великих екранів
Name[x-test]=xxPlasma Big Screenxx
Name[zh_TW]=Plasma 大螢幕
Comment=Plasma shell for TVs
Comment[ca]=Espai de treball Plasma per a televisors
Comment[nl]=Plasma-shell voor TV's
Comment[pt]=Consola do Plasma para TV's
Comment[sv]=Plasma skal för tv-apparater
Comment[uk]=Оболонка Плазми для телевізорів
Comment[x-test]=xxPlasma shell for TVsxx
Comment[zh_TW]=適用於電視的 Plasma Shell
Type=Service
X-KDE-ServiceTypes=Plasma/Shell
......
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