From 2f88b38da8e1166e827564c430b556ad5d2d7aa0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Jun 2021 01:13:25 +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" --- 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 + 5 files changed, 10 insertions(+) diff --git a/kcms/formats/formats.desktop b/kcms/formats/formats.desktop index 23b649d1a..b5f1fbd77 100644 --- a/kcms/formats/formats.desktop +++ b/kcms/formats/formats.desktop @@ -22,6 +22,7 @@ Name[ia]=Formatos Name[it]=Formati Name[ko]=형식 Name[nl]=Formaten +Name[pa]=ਫਾਰਮੈਟ Name[pl]=Formaty Name[pt]=Formatos Name[pt_BR]=Formatos @@ -45,6 +46,7 @@ Comment[ia]=Formatos numeric, de numerario e de tempore Comment[it]=Formati numerici, delle valute e dell'orario Comment[ko]=숫자, 통화, 시간 형식 Comment[nl]=Indeling voor numerieke getallen, valuta en tijd +Comment[pa]=ਅੰਕੀ, ਕਰੰਸੀ ਅਤੇ ਸਮੇਂ ਦੇ ਫਾਰਮੈਟ Comment[pl]=Formaty liczb, waluty i czasu Comment[pt]=Formatos Numéricos, Monetários e de Datas Comment[pt_BR]=Formatos de data/hora, numérico e monetário @@ -69,6 +71,7 @@ X-KDE-Keywords[ia]=linguage,traduction,formato de numero,locale,Pais,charsets,in 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[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 X-KDE-Keywords[pt]=língua,tradução,formato numérico,região,país,codificações,conjuntos de caracteres,símbolo decimal,separador dos milhares,símbolo,separador,sinal,positivo,negativo,moeda,dinheiro,casas decimais,calendário,hora,data,formatos,semana,início da semana,primeiro,papel,tamanho,carta,A4,medida,métrica,inglês,imperial X-KDE-Keywords[pt_BR]=idioma,tradução,formato de números,localização,país,codificações,codificações de caracteres,símbolo decimal,separador de milhares,símbolo,separador,sinal,positivo,negativo,moeda,monetário,casas decimais,calendário,hora,data,formatos,semana,início da semana,primeiro,papel,tamanho,carta,A4,medida,medir,Inglês,Imperial diff --git a/kcms/nightcolor/kcm_nightcolor.desktop b/kcms/nightcolor/kcm_nightcolor.desktop index 5ab7e5ea6..35b7ceca2 100644 --- a/kcms/nightcolor/kcm_nightcolor.desktop +++ b/kcms/nightcolor/kcm_nightcolor.desktop @@ -24,6 +24,7 @@ Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상 Name[nl]=Nachtkleur +Name[pa]=ਰਾਤ ਦਾ ਰੰਗ Name[pl]=Barwy nocne Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna @@ -46,6 +47,7 @@ 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[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 Comment[pt]=Ajustar a temperatura da cor à noite para reduzir o cansaço ocular Comment[pt_BR]=Ajustar a temperatura de cor a noite para reduzir a tensão visual @@ -69,6 +71,7 @@ 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[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 X-KDE-Keywords[pt]=kwin,janela,gestor,noite,cores,desvio do vermelho,cores X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,noite,noturno,cores,deslocamento de vermelho,olhos diff --git a/kcms/nightcolor/package/metadata.desktop b/kcms/nightcolor/package/metadata.desktop index 718cb1634..c49e6ff6d 100644 --- a/kcms/nightcolor/package/metadata.desktop +++ b/kcms/nightcolor/package/metadata.desktop @@ -11,6 +11,7 @@ Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상 Name[nl]=Nachtkleur +Name[pa]=ਰਾਤ ਦਾ ਰੰਗ Name[pl]=Barwy nocne Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna @@ -33,6 +34,7 @@ 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[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 Comment[pt]=Ajustar a temperatura da cor à noite para reduzir o cansaço ocular Comment[pt_BR]=Ajustar a temperatura de cor a noite para reduzir a tensão visual diff --git a/kcms/notifications/kcm_notifications.desktop b/kcms/notifications/kcm_notifications.desktop index c61a7d82a..56cd6a0eb 100644 --- a/kcms/notifications/kcm_notifications.desktop +++ b/kcms/notifications/kcm_notifications.desktop @@ -109,6 +109,7 @@ Comment[ia]=Notificationes de evento e Actiones Comment[it]=Notifiche degli eventi e azioni Comment[ko]=이벤트 알림과 동작 Comment[nl]=Meldingen en acties van gebeurtenissen +Comment[pa]=ਈਵੈਂਟ ਨੋਟੀਫਿਕੇਸ਼ਨ ਤੇ ਕਾਰਵਾਈਆਂ Comment[pl]=Powiadomienia i działania zdarzeń Comment[pt]=Notificações de Eventos e Acções Comment[pt_BR]=Notificações e ações dos eventos diff --git a/kcms/notifications/package/metadata.desktop b/kcms/notifications/package/metadata.desktop index b358414e8..1b18bdf90 100644 --- a/kcms/notifications/package/metadata.desktop +++ b/kcms/notifications/package/metadata.desktop @@ -98,6 +98,7 @@ Comment[ia]=Notificationes de evento e Actiones Comment[it]=Notifiche degli eventi e azioni Comment[ko]=이벤트 알림과 동작 Comment[nl]=Meldingen en acties van gebeurtenissen +Comment[pa]=ਈਵੈਂਟ ਨੋਟੀਫਿਕੇਸ਼ਨ ਤੇ ਕਾਰਵਾਈਆਂ Comment[pl]=Powiadomienia i działania zdarzeń Comment[pt]=Notificações de Eventos e Acções Comment[pt_BR]=Notificações e ações dos eventos