Commit 5ccdb3d4 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 c0497ce2
......@@ -13,6 +13,7 @@ Name[fr]=Grand écran pour Mycroft
Name[it]=Mycroft Bigscreen
Name[ko]=Mycroft 큰 화면
Name[nl]=Mycroft Bigscreen
Name[nn]=Mycroft Bigscreen
Name[pt]=Mycroft de Grande Ecrã
Name[sk]=Mycroft Bigscreen
Name[sl]=Mycroft Bigscreen
......@@ -33,6 +34,7 @@ Comment[fr]=Grand écran pour les télévisions utilisant Plasma et Mycroft
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[nn]=Heimeskjerm for Plasma- og Mycroft-baserte TV-ar
Comment[pt]=Ecrã inicial para TV's baseadas no Plasma e Mycroft
Comment[sk]=Domovská obrazovka pre televízory s Plasma a Mycroft
Comment[sl]=Domači zaslon za Plasmo in televizorje Mycroft
......
......@@ -26,6 +26,7 @@ Name[fr]=Langage
Name[it]=Lingua
Name[ko]=언어
Name[nl]=Taal
Name[nn]=Språk
Name[pt]=Língua
Name[pt_BR]=Idioma
Name[sk]=Jazyk
......@@ -48,6 +49,7 @@ Comment[fr]=Modifier la langue pour l'espace de travail et les applications
Comment[it]=Cambia la lingua dello spazio di lavoro e dell'applicazione
Comment[ko]=작업 공간과 프로그램 언어 변경
Comment[nl]=Werkruimte en talen van toepassingen wijzigen
Comment[nn]=Endra språk for arbeidsflate og program
Comment[pt]=Mudar as línguas da área de trabalho e da aplicação
Comment[pt_BR]=Altera os idiomas do espaço de trabalho e aplicativos
Comment[sk]=Zmeniť jazyky pracovného priestoru a aplikácií
......
......@@ -13,6 +13,7 @@ Name[fr]=Langage
Name[it]=Lingua
Name[ko]=언어
Name[nl]=Taal
Name[nn]=Språk
Name[pt]=Língua
Name[pt_BR]=Idioma
Name[sk]=Jazyk
......
......@@ -26,6 +26,7 @@ Name[fr]=KDE Connect
Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[nn]=KDE Connect
Name[pt]=KDE Connect
Name[pt_BR]=KDE Connect
Name[sk]=KDE Connect
......@@ -48,6 +49,7 @@ Comment[fr]=Connecter et synchroniser vos périphériques
Comment[it]=Connetti e sincronizza i tuoi dispositivi
Comment[ko]=내 장치에 연결하고 동기화
Comment[nl]=Uw apparaten verbinden en synchroniseren
Comment[nn]=Kopla til og synkroniser einingar
Comment[pt]=Ligue e sincronize os seus dispositivos
Comment[pt_BR]=Conecta e sincroniza seus dispositivos
Comment[sk]=Pripojiť sa a synchronizovať vaše zariadenia
......
......@@ -13,6 +13,7 @@ Name[fr]=KDE Connect
Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[nn]=KDE Connect
Name[pt]=KDE Connect
Name[pt_BR]=KDE Connect
Name[sk]=KDE Connect
......
......@@ -26,6 +26,7 @@ Name[fr]=Wifi
Name[it]=Wifi
Name[ko]=Wi-Fi
Name[nl]=Wi-Fi
Name[nn]=Wi-Fi
Name[pt]=Wi-Fi
Name[pt_BR]=Wi-Fi
Name[sk]=Wifi
......@@ -47,6 +48,7 @@ Comment[fr]=Se connecter aux réseaux Wifi
Comment[it]=Connettiti alle reti senza fili
Comment[ko]=Wi-Fi 네트워크에 연결
Comment[nl]=Met WiFi-netwerken verbinden
Comment[nn]=Kopla til Wi-Fi-nettverk
Comment[pt]=Ligar a redes Wi-Fi
Comment[pt_BR]=Conectar à redes Wi-Fi
Comment[sk]=Pripojiť sa na Wifi siete
......
......@@ -13,6 +13,7 @@ Name[fr]=Wifi
Name[it]=Wifi
Name[ko]=Wi-Fi
Name[nl]=Wi-Fi
Name[nn]=Wi-Fi
Name[pt]=Wi-Fi
Name[pt_BR]=Wi-Fi
Name[sk]=Wifi
......
......@@ -12,6 +12,7 @@ Comment[fr]=Interface Plasma moderne et intuitive pour Mycroft
Comment[it]=Aspetto di Mycroft Bigscreen di Plasma
Comment[ko]=Plasma Mycroft 큰 화면 모습과 느낌
Comment[nl]=Plasma uiterlijk en gedrag van Mycroft Big Screen
Comment[nn]=Utsjånad for Plasma Mycroft Big Screen
Comment[pt]=Aparência e comportamento do Plasma Mycroft para Grande Ecrã
Comment[sk]=Vzhľad pre Plasma Mycroft Big Screen
Comment[sl]=Izgled in občutek Plasme na velikem zaslonu Mycroft
......@@ -33,6 +34,7 @@ Name[fr]=Grand écran pour Mycroft
Name[it]=Mycroft Bigscreen
Name[ko]=Mycroft 큰 화면
Name[nl]=Mycroft Big Screen
Name[nn]=Mycroft Big Screen
Name[pt]=Mycroft para Grande Ecrã
Name[sk]=Mycroft Big Screen
Name[sl]=Veliki zaslon Mycroft
......
......@@ -13,6 +13,7 @@ Name[fr]=Grand écran pour Plasma
Name[it]=Plasma Bigscreen
Name[ko]=Plasma 큰 화면
Name[nl]=Plasma Big Screen
Name[nn]=Plasma Big Screen
Name[pt]=Plasma para Grande Ecrã
Name[sk]=Plasma Big Screen
Name[sl]=Veliki zaslon Plasma
......@@ -33,6 +34,7 @@ Comment[fr]=Composant « plasmashell » pour des télévisions
Comment[it]=Shell di Plasma per TV
Comment[ko]=TV용 Plasma 셸
Comment[nl]=Plasma-shell voor TV's
Comment[nn]=Plasma-utforming for TV-ar
Comment[pt]=Consola do Plasma para TV's
Comment[pt_BR]=Shell do Plasma para TVs
Comment[sk]=Plasma shell pre televízory
......
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