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"
4 years ago · ce39fee584
parent cde4e3ac95
commit ce39fee584
30 changed files with 30 additions and 29 deletions
--- a/applets/activitybar/metadata.json
+++ b/applets/activitybar/metadata.json
@ -142,7 +142,7 @@
        "Name[nb]": "Aktivitetsstolpe",
        "Name[nds]": "Aktivitetenbalken",
        "Name[nl]": "Activiteitenbalk",
-        "Name[nn]": "Aktivitetslinje",
+        "Name[nn]": "Aktivitetslinje",
        "Name[pa]": "ਸਰਗਰਮੀ ਪੱਟੀ",
        "Name[pl]": "Pasek aktywności",
        "Name[pt]": "Barra de Actividades",
--- a/applets/clipboard/metadata.json
+++ b/applets/clipboard/metadata.json
@ -128,7 +128,7 @@
        "Name[nb]": "Utklippstavle",
        "Name[nds]": "Twischenaflaag",
        "Name[nl]": "Klembord",
-        "Name[nn]": "Utklippstavle",
+        "Name[nn]": "Utklippstavle",
        "Name[pa]": "ਕਲਿੱਪਬੋਰਡ",
        "Name[pl]": "Schowek",
        "Name[pt]": "Área de Transferência",
--- a/applets/lock_logout/metadata.json
+++ b/applets/lock_logout/metadata.json
@ -146,7 +146,7 @@
        "Name[nds]": "Afsluten/Afmellen",
        "Name[ne]": "ताल्चा लगाउनुहोस्/लगआउट गर्नुहोस्",
        "Name[nl]": "Vergrendelen/Afmelden",
-        "Name[nn]": "Lås / logg ut",
+        "Name[nn]": "Lås / logg ut",
        "Name[or]": "ଅପରିବର୍ତ୍ତନୀୟ/ଲଗଆଉଟ କରନ୍ତୁ",
        "Name[pa]": "ਲਾਕ/ਲਾਗ ਆਉਟ",
        "Name[pl]": "Blokowanie/wylogowywanie",
--- a/applets/manage-inputmethod/metadata.json
+++ b/applets/manage-inputmethod/metadata.json
@ -123,7 +123,7 @@
        "Name[lt]": "Įvesties metodai",
        "Name[ml]": "നിവേശന രീതി",
        "Name[nl]": "Invoermethode",
-        "Name[nn]": "Skrivemetode",
+        "Name[nn]": "Skrivemetode",
        "Name[pa]": "ਇਨਪੁ਼ੱਟ ਢੰਗ",
        "Name[pl]": "Metoda wprowadzania",
        "Name[pt]": "Método de Entrada",
--- a/applets/mediacontroller/metadata.json
+++ b/applets/mediacontroller/metadata.json
@ -129,7 +129,7 @@
        "Name[nb]": "Mediespiller",
        "Name[nds]": "Medienafspeler",
        "Name[nl]": "Mediaspeler",
-        "Name[nn]": "Mediespelar",
+        "Name[nn]": "Mediespelar",
        "Name[pa]": "ਮੀਡਿਆ ਪਲੇਅਰ",
        "Name[pl]": "Odtwarzacz multimedialny",
        "Name[pt]": "Reprodutor Multimédia",
--- a/applets/panelspacer/package/metadata.json
+++ b/applets/panelspacer/package/metadata.json
@ -134,7 +134,7 @@
        "Name[nb]": "Avstandsholder for panel",
        "Name[nds]": "Paneel-Platzmaker",
        "Name[nl]": "Paneelscheider",
-        "Name[nn]": "Panelmellomrom",
+        "Name[nn]": "Panelmellomrom",
        "Name[pa]": "ਪੈਨਲ ਸਪੇਸਰ",
        "Name[pl]": "Odstęp w panelu",
        "Name[pt]": "Espaço do Painel",
--- a/applets/systemmonitor/diskactivity/metadata.json
+++ b/applets/systemmonitor/diskactivity/metadata.json
@ -120,7 +120,7 @@
        "Name[lt]": "Standžiojo disko veikla",
        "Name[ml]": "ഹാർഡ് ഡിസ്ക് പ്രവർത്തനം",
        "Name[nl]": "Activiteit van de vaste schijf",
-        "Name[nn]": "Harddiskaktivitet",
+        "Name[nn]": "Harddiskaktivitet",
        "Name[pa]": "ਹਾਰਡ ਡਿਸਕ ਸਰਗਰਮੀ",
        "Name[pl]": "Ruch na dysku twardym",
        "Name[pt]": "Actividade do Disco Rígido",
--- a/applets/systemmonitor/memory/metadata.json
+++ b/applets/systemmonitor/memory/metadata.json
@ -118,7 +118,7 @@
        "Name[lt]": "Atminties naudojimas",
        "Name[ml]": "മെമ്മറി ഉപയോഗം",
        "Name[nl]": "Geheugengebruik",
-        "Name[nn]": "Minnebruk",
+        "Name[nn]": "Minnebruk",
        "Name[pa]": "ਮੈਮੋਰੀ ਦੀ ਵਰਤੋਂ",
        "Name[pl]": "Wykorzystanie pamięci",
        "Name[pt]": "Utilização da Memória",
--- a/applets/systemmonitor/net/metadata.json
+++ b/applets/systemmonitor/net/metadata.json
@ -117,7 +117,7 @@
        "Name[lt]": "Tinklo greitis",
        "Name[ml]": "നെറ്റ്‍വർക്ക് വേഗത",
        "Name[nl]": "Netwerksnelheid",
-        "Name[nn]": "Nettverksfart",
+        "Name[nn]": "Nettverksfart",
        "Name[pa]": "ਨੈੱਟਵਰਕ ਸਪੀਡ",
        "Name[pl]": "Szybkość sieci",
        "Name[pt]": "Velocidade da rede",
--- a/applets/systemmonitor/systemmonitor/package/metadata.json
+++ b/applets/systemmonitor/systemmonitor/package/metadata.json
@ -117,7 +117,7 @@
        "Name[lt]": "Sistemos prižiūryklės jutiklis",
        "Name[ml]": "സിസ്റ്റം നിരീക്ഷക സെൻസർ",
        "Name[nl]": "Systeemmonitorsensor",
-        "Name[nn]": "Systemovervakingssensor",
+        "Name[nn]": "Systemovervakingssensor",
        "Name[pa]": "ਸਿਸਟਮ ਮਾਨੀਟਰ ਸੈਂਸਰ",
        "Name[pl]": "Miernik monitora systemowego",
        "Name[pt]": "Sensor de monitorização do sistema",
--- a/applets/systemtray/container/package/metadata.json
+++ b/applets/systemtray/container/package/metadata.json
@ -151,7 +151,7 @@
        "Name[nds]": "Paneel-Systeemafsnitt",
        "Name[ne]": "प्रणाली ट्रे",
        "Name[nl]": "Systeemvak",
-        "Name[nn]": "Systemtrau",
+        "Name[nn]": "Systemtrau",
        "Name[or]": "ତନ୍ତ୍ର ଧାରକ",
        "Name[pa]": "ਸਿਸਟਮ ਟਰੇ",
        "Name[pl]": "Tacka systemowa",
--- a/applets/systemtray/package/metadata.json
+++ b/applets/systemtray/package/metadata.json
@ -112,7 +112,7 @@
        "Name[nds]": "Paneel-Systeemafsnitt",
        "Name[ne]": "प्रणाली ट्रे",
        "Name[nl]": "Systeemvak",
-        "Name[nn]": "Systemtrau",
+        "Name[nn]": "Systemtrau",
        "Name[or]": "ତନ୍ତ୍ର ଧାରକ",
        "Name[pa]": "ਸਿਸਟਮ ਟਰੇ",
        "Name[pl]": "Tacka systemowa",
--- a/appmenu/appmenu.json
+++ b/appmenu/appmenu.json
@ -76,7 +76,7 @@
        "Name[nb]": "Daemon for programmenyer",
        "Name[nds]": "Programmmenü-Dämoon",
        "Name[nl]": "Daemon voor menu van toepassingen",
-        "Name[nn]": "Programmeny-teneste",
+        "Name[nn]": "Programmeny-teneste",
        "Name[pa]": "ਐਪਲੀਕੇਸ਼ਨ ਮੈਨੂ ਡੈਮਨ",
        "Name[pl]": "Usługa menu programów",
        "Name[pt]": "Servidor dos menus da aplicação",
--- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.json
+++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.json
@ -133,7 +133,7 @@
        "Name[nb]": "Standardmeny",
        "Name[nds]": "Standardmenü",
        "Name[nl]": "Standaardmenu",
-        "Name[nn]": "Standardmeny",
+        "Name[nn]": "Standardmeny",
        "Name[pa]": "ਸਟੈਂਡਰਡ ਮੇਨੂ",
        "Name[pl]": "Menu standardowe",
        "Name[pt]": "Menu Normal",
--- a/containmentactions/paste/plasma-containmentactions-paste.json
+++ b/containmentactions/paste/plasma-containmentactions-paste.json
@ -134,7 +134,7 @@
        "Name[nb]": "Lim inn",
        "Name[nds]": "Infögen",
        "Name[nl]": "Plakken",
-        "Name[nn]": "Tekstbitar",
+        "Name[nn]": "Tekstbitar",
        "Name[pa]": "ਚੇਪੋ",
        "Name[pl]": "Wklej",
        "Name[pt]": "Colar",
--- a/dataengines/activities/plasma-dataengine-activities.json
+++ b/dataengines/activities/plasma-dataengine-activities.json
@ -129,7 +129,7 @@
        "Name[nb]": "Aktivitetsmotor",
        "Name[nds]": "Aktivitetenpleger",
        "Name[nl]": "Activiteiten-engine",
-        "Name[nn]": "Aktivitetsmotor",
+        "Name[nn]": "Aktivitetsmotor",
        "Name[pa]": "ਸਰਗਰਮੀ ਇੰਜਣ",
        "Name[pl]": "Silnik aktywności",
        "Name[pt]": "Motor de Actividades",
--- a/dataengines/apps/plasma-dataengine-apps.json
+++ b/dataengines/apps/plasma-dataengine-apps.json
@ -134,7 +134,7 @@
        "Name[nb]": "Informasjon om program",
        "Name[nds]": "Programm-Informatschoon",
        "Name[nl]": "Programmainformatie",
-        "Name[nn]": "Programinformasjon",
+        "Name[nn]": "Programinformasjon",
        "Name[pa]": "ਐਪਲੀਕੇਸ਼ਨ ਜਾਣਕਾਰੀ",
        "Name[pl]": "Informacje o programie",
        "Name[pt]": "Informação da Aplicação",
--- a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.json
+++ b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.json
@ -128,7 +128,7 @@
        "Name[nb]": "Enhetsvarslinger",
        "Name[nds]": "Reedschap-Bescheden",
        "Name[nl]": "Meldingen van apparaten",
-        "Name[nn]": "Einingssvarslingar",
+        "Name[nn]": "Einingsvarslingar",
        "Name[pa]": "ਜੰਤਰ ਨੋਟੀਫਿਕੇਸ਼ਨ",
        "Name[pl]": "Powiadomienia urządzeń",
        "Name[pt]": "Notificações de Dispositivos",
--- a/dataengines/favicons/plasma-dataengine-favicons.json
+++ b/dataengines/favicons/plasma-dataengine-favicons.json
@ -98,7 +98,7 @@
        "Name[nb]": "Ikoner for favorittsteder",
        "Name[nds]": "Nettsieden-Lüttbiller",
        "Name[nl]": "Favicons",
-        "Name[nn]": "Bokmerkeikon",
+        "Name[nn]": "Bokmerkeikon",
        "Name[or]": "Favicons",
        "Name[pa]": "ਫੇਵੀਕਾਨ",
        "Name[pl]": "Ikony stron internetowych",
--- a/dataengines/mouse/plasma-dataengine-mouse.json
+++ b/dataengines/mouse/plasma-dataengine-mouse.json
@ -96,7 +96,7 @@
        "Name[nb]": "Pekerposisjon",
        "Name[nds]": "Muuswieser-Steed",
        "Name[nl]": "Muisaanwijzerpositie",
-        "Name[nn]": "Peikarplassering",
+        "Name[nn]": "Peikarplassering",
        "Name[or]": "ସୂଚକ ସ୍ଥାନ",
        "Name[pa]": "ਪੁਆਇੰਟਰ ਸਥਿਤੀ",
        "Name[pl]": "Położenie wskaźnika myszy",
--- a/dataengines/notifications/plasma-dataengine-notifications.json
+++ b/dataengines/notifications/plasma-dataengine-notifications.json
@ -99,7 +99,7 @@
        "Name[nb]": "Programvarslinger",
        "Name[nds]": "Programm-Bescheden",
        "Name[nl]": "Programmameldingen",
-        "Name[nn]": "Programvarsel",
+        "Name[nn]": "Programvarsel",
        "Name[or]": "ପ୍ରୟୋଗ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ",
        "Name[pa]": "ਐਪਲੀਕੇਸ਼ਨ ਨੋਟੀਫਿਕੇਸ਼ਨ",
        "Name[pl]": "Powiadomienia programów",
--- a/dataengines/powermanagement/plasma-dataengine-powermanagement.json
+++ b/dataengines/powermanagement/plasma-dataengine-powermanagement.json
@ -72,7 +72,7 @@
        "Name[ko]": "전원 관리",
        "Name[lt]": "Energijos valdymas",
        "Name[nl]": "Energiebeheer",
-        "Name[nn]": "Straumstyring",
+        "Name[nn]": "Straumstyring",
        "Name[pa]": "ਪਾਵਰ ਇੰਤਜ਼ਾਮ",
        "Name[pl]": "Zarządzanie energią",
        "Name[pt]": "Gestão de Energia",
--- a/dataengines/soliddevice/plasma-dataengine-soliddevice.json
+++ b/dataengines/soliddevice/plasma-dataengine-soliddevice.json
@ -139,7 +139,7 @@
        "Name[nb]": "Enhetsinformasjon",
        "Name[nds]": "Reedschap-Informatschonen",
        "Name[nl]": "Apparaatinformatie",
-        "Name[nn]": "Einingsinformasjon",
+        "Name[nn]": "Einingsinformasjon",
        "Name[or]": "ଯନ୍ତ୍ର ସୂଚନା",
        "Name[pa]": "ਜੰਤਰ ਜਾਣਕਾਰੀ",
        "Name[pl]": "Informacje o urządzeniach",
--- a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json
+++ b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json
@ -105,7 +105,7 @@
        "Name[nds]": "Systeemkieker",
        "Name[ne]": "प्रणाली मनिटर",
        "Name[nl]": "Systeemmonitor",
-        "Name[nn]": "Systemovervaking",
+        "Name[nn]": "Systemovervaking",
        "Name[oc]": "Monitor sistèma",
        "Name[pa]": "ਸਿਸਟਮ ਮਾਨੀਟਰ",
        "Name[pl]": "Monitor systemowy",
--- a/kcms/colors/accentColorService/accentColorService.json
+++ b/kcms/colors/accentColorService/accentColorService.json
@ -26,6 +26,7 @@
        "Name[it]": "Colore secondario",
        "Name[ka]": "აქცენტის ფერი",
        "Name[nl]": "Accentueringskleur",
+        "Name[nn]": "Kontrastfarge",
        "Name[pl]": "Kolor akcentu",
        "Name[pt]": "Cor Acentuada",
        "Name[tr]": "Vurgu Rengi",
--- a/kcms/feedback/kcm_feedback.json
+++ b/kcms/feedback/kcm_feedback.json
@ -74,7 +74,7 @@
        "Name[lt]": "Naudotojo grįžtamasis ryšys",
        "Name[ml]": "ഉപയോക്തൃ അഭിപ്രായം",
        "Name[nl]": "Terugkoppeling van gebruiker",
-        "Name[nn]": "Tilbakemeldingar",
+        "Name[nn]": "Tilbakemeldingar",
        "Name[pa]": "ਵਰਤੋਂਕਾਰ ਸੁਝਾਅ",
        "Name[pl]": "Informacja zwrotna",
        "Name[pt]": "Reacções do Utilizador",
--- a/kcms/kfontinst/viewpart/kfontviewpart.json
+++ b/kcms/kfontinst/viewpart/kfontviewpart.json
@ -38,7 +38,7 @@
        "Name[lt]": "Šriftų žiūryklė",
        "Name[ml]": "അക്ഷരസഞ്ചയ ദര്‍ശിനി",
        "Name[nl]": "Lettertypeweergave",
-        "Name[nn]": "Skriftvisar",
+        "Name[nn]": "Skriftvisar",
        "Name[pa]": "ਫੋਂਟ ਦਰਸ਼ਕ",
        "Name[pl]": "Przeglądarka czcionek",
        "Name[pt]": "Visualizador de Tipos de Letra",
--- a/kcms/nightcolor/kcm_nightcolor.json
+++ b/kcms/nightcolor/kcm_nightcolor.json
@ -73,7 +73,7 @@
        "Name[lt]": "Naktinė spalva",
        "Name[ml]": "രാത്രി നിറം",
        "Name[nl]": "Nachtkleur",
-        "Name[nn]": "Kveldsfargar",
+        "Name[nn]": "Kveldsfargar",
        "Name[pa]": "ਰਾਤ ਦਾ ਰੰਗ",
        "Name[pl]": "Barwy nocne",
        "Name[pt]": "Cor Nocturna",
--- a/kioslave/desktop/desktopnotifier.json
+++ b/kioslave/desktop/desktopnotifier.json
@ -73,7 +73,7 @@
        "Name[lv]": "Mapju novērotājs",
        "Name[ml]": "ഡയറക്ടറി നിരീക്ഷകൻ",
        "Name[nl]": "Mappenbewaker",
-        "Name[nn]": "Mappeovervaking",
+        "Name[nn]": "Mappeovervaking",
        "Name[pa]": "ਡਾਇਰੈਕਟਰੀ ਨਿਗਰਾਨ",
        "Name[pl]": "Monitorowanie katalogów",
        "Name[pt]": "Monitorização de Pastas",
--- a/klipper/plasma-dataengine-clipboard.json
+++ b/klipper/plasma-dataengine-clipboard.json
@ -124,7 +124,7 @@
        "Name[nb]": "Utklippstavle",
        "Name[nds]": "Twischenaflaag",
        "Name[nl]": "Klembord",
-        "Name[nn]": "Utklippstavle",
+        "Name[nn]": "Utklippstavle",
        "Name[pa]": "ਕਲਿੱਪਬੋਰਡ",
        "Name[pl]": "Schowek",
        "Name[pt]": "Área de Transferência",