Commit 6eddccd0 authored by Script Kiddy's avatar Script Kiddy

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 99406844
......@@ -23,6 +23,7 @@ Name[it]=Lingua
Name[ko]=언어
Name[nl]=Taal
Name[pt]=Língua
Name[pt_BR]=Idioma
Name[sk]=Jazyk
Name[sv]=Språk
Name[uk]=Мова
......@@ -39,6 +40,7 @@ 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[pt_BR]=Altera os idiomas do espaço de trabalho e aplicativos
Comment[sk]=Zmeniť jazyky pracovného priestoru a aplikácií
Comment[sv]=Ändra arbetsområde och programspråk
Comment[uk]=Зміна мови перекладу робочого простору і програм
......
......@@ -10,6 +10,7 @@ Name[it]=Lingua
Name[ko]=언어
Name[nl]=Taal
Name[pt]=Língua
Name[pt_BR]=Idioma
Name[sk]=Jazyk
Name[sv]=Språk
Name[uk]=Мова
......
......@@ -23,6 +23,7 @@ Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[pt]=KDE Connect
Name[pt_BR]=KDE Connect
Name[sk]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
......@@ -39,6 +40,7 @@ Comment[it]=Connetti e sincronizza i tuoi dispositivi
Comment[ko]=내 장치에 연결하고 동기화
Comment[nl]=Uw apparaten verbinden en synchroniseren
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
Comment[sv]=Anslut och synkronisera dina apparater
Comment[uk]=З'єднання і синхронізація ваших пристроїв
......
......@@ -10,6 +10,7 @@ Name[it]=KDE Connect
Name[ko]=KDE Connect
Name[nl]=KDE Connect
Name[pt]=KDE Connect
Name[pt_BR]=KDE Connect
Name[sk]=KDE Connect
Name[sv]=KDE-anslut
Name[uk]=KDE Connect
......
......@@ -23,6 +23,7 @@ Name[it]=Wifi
Name[ko]=Wi-Fi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[pt_BR]=Wi-Fi
Name[sk]=Wifi
Name[sv]=WIFI
Name[uk]=Wi-Fi
......@@ -38,6 +39,7 @@ 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[pt_BR]=Conectar à redes Wi-Fi
Comment[sk]=Pripojiť sa na Wifi siete
Comment[sv]=Anslut till WIFI-nätverk
Comment[uk]=З'єднання із мережами Wi-Fi
......
......@@ -10,6 +10,7 @@ Name[it]=Wifi
Name[ko]=Wi-Fi
Name[nl]=Wi-Fi
Name[pt]=Wi-Fi
Name[pt_BR]=Wi-Fi
Name[sk]=Wifi
Name[sv]=WIFI
Name[uk]=Wi-Fi
......
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