From 70edbdfd28f73a902b9516e0a9192f08d54d5ca5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 Jun 2021 01:25:05 +0000 Subject: [PATCH] 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" --- dataengines/devicenotifications/devicenotifications.notifyrc | 1 + kcms/autostart/package/metadata.desktop | 3 +++ kcms/desktoptheme/plasma-themes.knsrc | 1 + kcms/formats/formats.desktop | 3 +++ kcms/nightcolor/kcm_nightcolor.desktop | 3 +++ kcms/nightcolor/package/metadata.desktop | 2 ++ kcms/notifications/kcm_notifications.desktop | 1 + kcms/notifications/package/metadata.desktop | 1 + 8 files changed, 15 insertions(+) diff --git a/dataengines/devicenotifications/devicenotifications.notifyrc b/dataengines/devicenotifications/devicenotifications.notifyrc index 3e684d51c..851aa2db2 100644 --- a/dataengines/devicenotifications/devicenotifications.notifyrc +++ b/dataengines/devicenotifications/devicenotifications.notifyrc @@ -92,6 +92,7 @@ Name[ia]=Stato de dispositivo Name[id]=Status Perangkat Name[it]=Stato dei dispositivi Name[ko]=장치 상태 +Name[lt]=Įrenginio būsena Name[nl]=Apparaatstatus Name[nn]=Einingsstatus Name[pa]=ਡਿਵਾਈਸ ਹਾਲਤ diff --git a/kcms/autostart/package/metadata.desktop b/kcms/autostart/package/metadata.desktop index 8460723fa..4f43cf71c 100644 --- a/kcms/autostart/package/metadata.desktop +++ b/kcms/autostart/package/metadata.desktop @@ -11,6 +11,7 @@ Name[fr]=Démarrage automatique Name[ia]=Auto starta Name[it]=Avvio automatico Name[ko]=자동 시작 +Name[lt]=Automatinis paleidimas Name[nl]=Autostart Name[pa]=ਆਟੋ-ਸਟਾਰਟ Name[pl]=Samo-uruchamiane @@ -38,6 +39,7 @@ Comment[fr]=Applications automatiquement démarrées Comment[ia]=Applicationes initiate automaticamente Comment[it]=Applicazioni avviate automaticamente Comment[ko]=자동으로 시작되는 프로그램 +Comment[lt]=Automatiškai paleidžiamos programos Comment[nl]=Automatisch gestarte toepassingen Comment[pa]=ਆਪਣੇ-ਆਪ ਸ਼ੁਰੂ ਹੋਣ ਵਾਲੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ Comment[pl]=Samoczynnie uruchamiane programy @@ -73,6 +75,7 @@ X-KDE-Keywords[fr]=Gestion de démarrage automatique, démarrage automatique, d X-KDE-Keywords[ia]=Gestor de autoinitio,autoinitio,initio,initio de systema.initio de plasma,cron X-KDE-Keywords[it]=Gestore avvio automatico,avvio automatico,avvio,avvio del sistema,avvio di plasma,cron X-KDE-Keywords[ko]=Autostart Manager,autostart,startup,system startup,plasma start,cron,자동 시작,자동시작,시작프로그램,시스템 시작,plasma 시작 +X-KDE-Keywords[lt]=Automatinio paleidimo tvarkytuvė,automatinio paleidimo tvarkytuve,automatinis paleidimas,paleistis,sistemos paleidimas,kde paleidimas,plasma paleidimas,cron X-KDE-Keywords[nl]=Autostartbeheerder,autostarten,opstarten,opstarten systeem,opstarten plasma,cron X-KDE-Keywords[pa]=ਆਟੋ-ਸਟਾਰਟ ਮੈਨੇਜਰ,ਆਟੋ-ਸਟਾਰਟ,ਸ਼ੁਰੂ,ਸਿਸਟਮ ਸ਼ੁਰੂਆਤ,ਪਲਾਜ਼ਮਾ ਸ਼ੁਰੂ,ਕਰੋਨ X-KDE-Keywords[pl]=Menadżer autostartu,autostart,uruchamianie,uruchamianie systemu,plasma,kde start,cron diff --git a/kcms/desktoptheme/plasma-themes.knsrc b/kcms/desktoptheme/plasma-themes.knsrc index 737ce16e6..9b61ef7da 100644 --- a/kcms/desktoptheme/plasma-themes.knsrc +++ b/kcms/desktoptheme/plasma-themes.knsrc @@ -12,6 +12,7 @@ Name[fr]=Thèmes Plasma Name[ia]=Themas de Plasma Name[it]=Temi di Plasma Name[ko]=Plasma 테마 +Name[lt]=Plasma apipavidalinimai Name[nl]=Plasma-thema's Name[nn]=Plasma-tema Name[pa]=ਪਲਾਜ਼ਮਾ ਥੀਮ diff --git a/kcms/formats/formats.desktop b/kcms/formats/formats.desktop index fe84f0ac7..a8713b48e 100644 --- a/kcms/formats/formats.desktop +++ b/kcms/formats/formats.desktop @@ -22,6 +22,7 @@ Name[fr]=Formats Name[ia]=Formatos Name[it]=Formati Name[ko]=형식 +Name[lt]=Formatai Name[nl]=Formaten Name[pa]=ਫਾਰਮੈਟ Name[pl]=Formaty @@ -47,6 +48,7 @@ Comment[fr]=Format numérique, de monnaie et d'heure Comment[ia]=Formatos numeric, de numerario e de tempore Comment[it]=Formati numerici, delle valute e dell'orario Comment[ko]=숫자, 통화, 시간 형식 +Comment[lt]=Skaitmenų, valiutos ir laiko formatai Comment[nl]=Indeling voor numerieke getallen, valuta en tijd Comment[pa]=ਅੰਕੀ, ਕਰੰਸੀ ਅਤੇ ਸਮੇਂ ਦੇ ਫਾਰਮੈਟ Comment[pl]=Formaty liczb, waluty i czasu @@ -73,6 +75,7 @@ X-KDE-Keywords[fr]=langue, traduction, format numérique, paramètres régionaux X-KDE-Keywords[ia]=linguage,traduction,formato de numero,locale,Pais,charsets,insimul de characteres, Symbolo decimal,separator de milles,symbolo,separator,signo,positive,negative,numerario,moneta,cifras fractional,calendario,tempore,data,formatos,septimana,initio de septimana, prime,papiro,grandor,littera,A4,me X-KDE-Keywords[it]=lingua,traduzione,formato dei numeri,localizzazione,nazione,codifica,insieme dei caratteri,simbolo decimale,separatore delle migliaia,simbolo,separatore,segno,positivo,negativo,valuta,moneta,cifre decimali,calendario,ora,data,formati,settimana,inizio settimana,primo,carta,dimensione,lettera,A4,misura,metrico,inglese,imperiale X-KDE-Keywords[ko]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,언어,번역,숫자,로캘,로케일,국가,나라,지역,문자셋,문자 인코딩,인코딩,소숫점,기호,구분자,양수,음수,통화,화폐,돈,달력,시간,시각,날짜,주,시작 요일,요일,종이,크기,미터법 +X-KDE-Keywords[lt]=kalba,vertimas,skaičių formatas,skaiciu formatas,lokalė,lokale,šalis,salis,simbolių rinkinys,simboliu rinkinys,dešimtainis simbolis,desimtainis simbolis,tūkstančių skirtukas,tukstanciu skirtukas,simbolis,simbolių,simboliu,skirtukas,skyriklis,ženklas,zenklas,teigiamas,neigiamas,valiuta,pinigai,trupmeniniai skaitmenys,trupmenų skaitmenys,trupmenu skaitmenys,kalendorius,laikas,data,formatai,savaitė,savaite,savaitės pradžia,savaites pradzia,pirmas,pirma,popierius,popieriaus,dydis,letter,A4,matavimai,matavimo vienetai,metrinė,metrine,metriniai,anglų,anglu,imperiniai,imperinė,imperine X-KDE-Keywords[nl]=taal,vertaling,getalformaat,locale,land,tekensets,decimaalsymbool,duizendscheidingsteken,symbool,scheidingsteken,teken,positief,negatief,valuta,geld,decimale cijfers,agenda,tijd,datum,formaten,week,weekbegin,eerst,papier,grootte,letter,A4,afmeting,metrisch,Engels,Imperiaal X-KDE-Keywords[pa]=ਭਾਸ਼ਾ,ਅਨੁਵਾਦ,ਨੰਬਰ ਫਾਰਮੈਟ,ਅੰਕ,ਲੋਕੇਲ,ਦੇਸ਼,ਅੱਖਰਸੈੱਟ,ਅੱਖਰ-ਸੈੱਟ,ਦਸ਼ਮਵਲ ਨਿਸ਼ਾਨ,ਹਜ਼ਾਰ,ਨਿਸ਼ਾਨ,ਵੱਖਰੇਵਾਂ,ਸਾਈਨ,ਧਨਾਤਮਕ,ਰਿਣਾਤਮਕ,ਮੁਦਰਾ,ਪੈਸਾ,ਧਨ,ਭਿੰਨ ਅੰਕ,ਕੈਲੰਡਰ,ਸਮਾਂ,ਮਿਤੀ,ਤਿਥੀ,ਤਾਰੀਖ,ਹਫ਼ਤਾ,ਹਫ਼ਤਾ ਸ਼ੁਰੂ,ਪਹਿਲਾਂ,ਪੇਪਰ,ਸਫ਼ਾ,ਆਕਾਰ,ਸਾਈਜ਼,ਪੱਤਰ,ਲੈਟਰ,A4,ਏ4,ਮਾਪ,ਮਾਪਕ,ਅੰਗਰੇਜ਼ੀ,ਮੀਟਰ X-KDE-Keywords[pl]=język,tłumaczenie,format liczb,regionalność,kraj,zestaw znaków,symbol dziesiętny,separator tysięcy,symbol,separator,znak,dodatni,ujemny,waluta,pieniądze,ułamkowe cyfry,kalendarz,czas,data,formaty,tydzień,początek tygodnia,pierwszy,papier,rozmiar,list,A4,miara,metryczna,Angielski,Cesarskie diff --git a/kcms/nightcolor/kcm_nightcolor.desktop b/kcms/nightcolor/kcm_nightcolor.desktop index 66ab6f9ed..5147c5683 100644 --- a/kcms/nightcolor/kcm_nightcolor.desktop +++ b/kcms/nightcolor/kcm_nightcolor.desktop @@ -24,6 +24,7 @@ Name[fr]=Couleur de nuit Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상 +Name[lt]=Naktinė spalva Name[nl]=Nachtkleur Name[pa]=ਰਾਤ ਦਾ ਰੰਗ Name[pl]=Barwy nocne @@ -48,6 +49,7 @@ Comment[fr]=Ajuster la température de couleurs vers le mode « Nuit » pour r Comment[ia]=Adapta temperatura de color a nocte per reducer stresse de oculo Comment[it]=Regola la temperatura dei colori nelle ore notturne per ridurre l'affaticamento degli occhi Comment[ko]=눈의 피로를 줄이려고 야간에 색 온도 조절 +Comment[lt]=Reguliuoti naktį spalvos temperatūrą, kad būtų sumažinta akių įtampa Comment[nl]=Kleurtemperatuur bij nacht aanpassen on vermoeidheid van de ogen te vermijden Comment[pa]=ਰਾਤ ਦੇ ਸਮੇਂ ਅੱਖਾਂ ਉੱਤੇ ਦਬਾਅ ਘਟਾਉਣ ਲਈ ਰੰਗ ਦੇ ਤਾਪਮਾਨ ਨੂੰ ਤਰਤੀਬ ਦਿਓ Comment[pl]=Dostosuj temperaturę barwy w nocy, aby zmniejszyć wytężenie oka @@ -73,6 +75,7 @@ X-KDE-Keywords[fr]=kwin, gestionnaire, fenêtres, couleurs, nuit, colors, redshi X-KDE-Keywords[ia]=kwin,window,manager,night,colors,redshift,eyes X-KDE-Keywords[it]=kwin,finestra,gestore,notte,colori,spostamento verso il rosso,occhi X-KDE-Keywords[ko]=kwin,window,manager,night,colors,redshift,eyes,창,관리자,밤,야간,색,눈,안구,블루라이트 +X-KDE-Keywords[lt]=kwin,langas,langų,langu,tvarkytuvė,tvarkytuve,naktinė,naktine,naktis,nakties,spalva,spalvos,redshift,akys,akių,akiu X-KDE-Keywords[nl]=kwin,venster,manager,nacht,kleuren,roodverschuiving,ogen X-KDE-Keywords[pa]=ਕੇਵਿਨ,ਵਿੰਡੋ,ਮੈਨੇਜਰ,ਰਾਤ,ਰੰਗ,ਲਾਲ-ਸਿਫਟ,ਅੱਖਾਂ X-KDE-Keywords[pl]=kwin,okno,zarządzanie,noc,kolory,barwa,redshift,oczy diff --git a/kcms/nightcolor/package/metadata.desktop b/kcms/nightcolor/package/metadata.desktop index ab54b63f8..7da73c74f 100644 --- a/kcms/nightcolor/package/metadata.desktop +++ b/kcms/nightcolor/package/metadata.desktop @@ -11,6 +11,7 @@ Name[fr]=Couleur de nuit Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상 +Name[lt]=Naktinė spalva Name[nl]=Nachtkleur Name[pa]=ਰਾਤ ਦਾ ਰੰਗ Name[pl]=Barwy nocne @@ -35,6 +36,7 @@ Comment[fr]=Ajuster la température de couleurs vers le mode « Nuit » pour r Comment[ia]=Adapta temperatura de color a nocte per reducer stresse de oculo Comment[it]=Regola la temperatura dei colori nelle ore notturne per ridurre l'affaticamento degli occhi Comment[ko]=눈의 피로를 줄이려고 야간에 색 온도 조절 +Comment[lt]=Reguliuoti naktį spalvos temperatūrą, kad būtų sumažinta akių įtampa Comment[nl]=Kleurtemperatuur bij nacht aanpassen on vermoeidheid van de ogen te vermijden Comment[pa]=ਰਾਤ ਦੇ ਸਮੇਂ ਅੱਖਾਂ ਉੱਤੇ ਦਬਾਅ ਘਟਾਉਣ ਲਈ ਰੰਗ ਦੇ ਤਾਪਮਾਨ ਨੂੰ ਤਰਤੀਬ ਦਿਓ Comment[pl]=Dostosuj temperaturę barwy w nocy, aby zmniejszyć wytężenie oka diff --git a/kcms/notifications/kcm_notifications.desktop b/kcms/notifications/kcm_notifications.desktop index 5d3f0b972..385168e9f 100644 --- a/kcms/notifications/kcm_notifications.desktop +++ b/kcms/notifications/kcm_notifications.desktop @@ -109,6 +109,7 @@ Comment[fr]=Notifications d'évènements et d'actions Comment[ia]=Notificationes de evento e Actiones Comment[it]=Notifiche degli eventi e azioni Comment[ko]=이벤트 알림과 동작 +Comment[lt]=Pranešimai apie įvykius ir veiksmai Comment[nl]=Meldingen en acties van gebeurtenissen Comment[pa]=ਈਵੈਂਟ ਨੋਟੀਫਿਕੇਸ਼ਨ ਤੇ ਕਾਰਵਾਈਆਂ Comment[pl]=Powiadomienia i działania zdarzeń diff --git a/kcms/notifications/package/metadata.desktop b/kcms/notifications/package/metadata.desktop index 21b0faf8c..906f9b84f 100644 --- a/kcms/notifications/package/metadata.desktop +++ b/kcms/notifications/package/metadata.desktop @@ -98,6 +98,7 @@ Comment[fr]=Notifications d'évènements et d'actions Comment[ia]=Notificationes de evento e Actiones Comment[it]=Notifiche degli eventi e azioni Comment[ko]=이벤트 알림과 동작 +Comment[lt]=Pranešimai apie įvykius ir veiksmai Comment[nl]=Meldingen en acties van gebeurtenissen Comment[pa]=ਈਵੈਂਟ ਨੋਟੀਫਿਕੇਸ਼ਨ ਤੇ ਕਾਰਵਾਈਆਂ Comment[pl]=Powiadomienia i działania zdarzeń