From 5d8c40caec8265db3268ab3b98ebf9f85d86b96a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Feb 2020 05:51:23 +0100 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/weather/ions/bbcukmet/ion-bbcukmet.desktop | 1 + kcms/translations/kcm_translations.desktop | 2 ++ kcms/translations/package/metadata.desktop | 1 + login-sessions/plasmawayland-dev.desktop.cmake | 1 + login-sessions/plasmawayland.desktop.cmake | 1 + login-sessions/plasmax11-dev.desktop.cmake | 1 + lookandfeel/metadata.desktop | 1 + menu/desktop/kf5-network.directory | 1 + menu/desktop/kf5-settingsmenu.directory | 2 +- menu/desktop/kf5-utilities-peripherals.directory | 4 ++-- phonon/platform_kde/phonon.notifyrc | 2 +- phonon/platform_kde/phononbackend.desktop | 2 +- plasma-windowed/plasma-windowed.desktop | 2 +- runners/activities/plasma-runner-activityrunner.desktop | 2 +- runners/windows/plasma-runner-windows.desktop | 4 ++-- sddm-theme/metadata.desktop | 1 + statusnotifierwatcher/statusnotifierwatcher.desktop | 2 +- 17 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop b/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop index abba08702..e3efb9a22 100644 --- a/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop +++ b/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop @@ -20,6 +20,7 @@ Name[lt]=BBC orai Name[lv]=BBC laikapstākļi Name[nl]=BBC Weather Name[nn]=BBC Weather +Name[pa]=BBC ਮੌਸਮ Name[pl]=Pogoda BBC Name[pt]=Meteorologia da BBC Name[pt_BR]=BBC Weather diff --git a/kcms/translations/kcm_translations.desktop b/kcms/translations/kcm_translations.desktop index ec5cc1ba3..ef2eaaafc 100644 --- a/kcms/translations/kcm_translations.desktop +++ b/kcms/translations/kcm_translations.desktop @@ -34,6 +34,7 @@ Name[lt]=Kalba Name[lv]=Valoda Name[nl]=Taal Name[nn]=Språk +Name[pa]=ਭਾਸ਼ਾ Name[pl]=Język Name[pt]=Língua Name[pt_BR]=Idioma @@ -65,6 +66,7 @@ Comment[ko]=작업 공간과 프로그램 언어 변경 Comment[lt]=Keisti darbo srities ir programų kalbas Comment[nl]=Werkruimte en talen van toepassingen wijzigen Comment[nn]=Endra språk for arbeidsflate og program +Comment[pa]=ਵਰਕਸਪੇਸ ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਭਾਸ਼ਾਵਾਂ ਬਦਲੋ Comment[pl]=Zmień język przestrzeni pracy i aplikacji 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 diff --git a/kcms/translations/package/metadata.desktop b/kcms/translations/package/metadata.desktop index 881c16e0a..0a293ea39 100644 --- a/kcms/translations/package/metadata.desktop +++ b/kcms/translations/package/metadata.desktop @@ -21,6 +21,7 @@ Name[lt]=Kalba Name[lv]=Valoda Name[nl]=Taal Name[nn]=Språk +Name[pa]=ਭਾਸ਼ਾ Name[pl]=Język Name[pt]=Língua Name[pt_BR]=Idioma diff --git a/login-sessions/plasmawayland-dev.desktop.cmake b/login-sessions/plasmawayland-dev.desktop.cmake index 31d28146a..377f978fd 100644 --- a/login-sessions/plasmawayland-dev.desktop.cmake +++ b/login-sessions/plasmawayland-dev.desktop.cmake @@ -19,6 +19,7 @@ Name[ko]=Plasma(개발, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[lt]=Plasma (Plėtojimas, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[nl]=Plasma (Ontwikkeling, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[nn]=Plasma (utvikling, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) +Name[pa]=ਪਲਾਜ਼ਮਾ (ਡਿਵੈਲਪਮੈਂਟ, ਵੇਅਲੈਂਡ ${CMAKE_INSTALL_FULL_BINDIR}) Name[pl]=Plazma (Rozwój , Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt_BR]=Plasma (Desenvolvimento, Wayland ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake index f1c6ebeb6..bb6a72fe2 100644 --- a/login-sessions/plasmawayland.desktop.cmake +++ b/login-sessions/plasmawayland.desktop.cmake @@ -22,6 +22,7 @@ Name[lt]=Plasma (Wayland) Name[lv]=Plasma (Wayland) Name[nl]=Plasma (Wayland) Name[nn]=Plasma (Wayland) +Name[pa]=ਪਲਾਜ਼ਮਾ (ਵੇਅਲੈਂਡ) Name[pl]=Plazma (Wayland) Name[pt]=Plasma (Wayland) Name[pt_BR]=Plasma (Wayland) diff --git a/login-sessions/plasmax11-dev.desktop.cmake b/login-sessions/plasmax11-dev.desktop.cmake index 30ebeb85c..61981eaac 100644 --- a/login-sessions/plasmax11-dev.desktop.cmake +++ b/login-sessions/plasmax11-dev.desktop.cmake @@ -20,6 +20,7 @@ Name[ko]=Plasma(개발, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[lt]=Plasma (Plėtojimas, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[nl]=Plasma (Ontwikkeling, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[nn]=Plasma (utvikling, X11 ${CMAKE_INSTALL_FULL_BINDIR}) +Name[pa]=ਪਲਾਜ਼ਮਾ (ਡਿਵੈਲਪਮੈਂਟ, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[pl]=Plazma (Rozwój , X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt_BR]=Plasma (Desenvolvimento, X11 ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 66c4c1ac4..b3fc00bf2 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -19,6 +19,7 @@ Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Comment[lt]=Breeze pagal KDE VDG Comment[nl]=Breeze door de KDE VDG Comment[nn]=Breeze frå KDE VDG +Comment[pa]=KDE VDG ਵਲੋਂ ਬਰੀਜ਼ Comment[pl]=Bryza autorstwa KDE VDG Comment[pt]=Brisa da VDG do KDE Comment[pt_BR]=Breeze pelo KDE VDG diff --git a/menu/desktop/kf5-network.directory b/menu/desktop/kf5-network.directory index e14a2b353..aeb93cca2 100644 --- a/menu/desktop/kf5-network.directory +++ b/menu/desktop/kf5-network.directory @@ -20,6 +20,7 @@ Name[lt]=Tinklas Name[lv]=Tīkls Name[nl]=Netwerk Name[nn]=Nettverk +Name[pa]=ਨੈੱਟਵਰਕ Name[pl]=Sieć Name[pt]=Rede Name[pt_BR]=Rede diff --git a/menu/desktop/kf5-settingsmenu.directory b/menu/desktop/kf5-settingsmenu.directory index f8068a1c4..984e025d5 100644 --- a/menu/desktop/kf5-settingsmenu.directory +++ b/menu/desktop/kf5-settingsmenu.directory @@ -63,7 +63,7 @@ Name[nl]=Instellingen Name[nn]=Innstillingar Name[oc]=Paramètres Name[or]=ସେଟିଙ୍ଗଗୁଡ଼ିକ -Name[pa]=ਸੈਟਿੰਗ +Name[pa]=ਸੈਟਿੰਗਾਂ Name[pl]=Ustawienia Name[pt]=Configuração Name[pt_BR]=Configurações diff --git a/menu/desktop/kf5-utilities-peripherals.directory b/menu/desktop/kf5-utilities-peripherals.directory index 0d357673e..0583f8713 100644 --- a/menu/desktop/kf5-utilities-peripherals.directory +++ b/menu/desktop/kf5-utilities-peripherals.directory @@ -61,7 +61,7 @@ Name[ne]=परिधि Name[nl]=Randapparaten Name[nn]=Tilleggseiningar Name[or]=ପେରିଫେରାଲ -Name[pa]=ਪਾਰਿਫ਼ਾਰਲ +Name[pa]=ਪੇਰੀਫ਼ੀਰਲ Name[pl]=Urządzenia peryferyjne Name[pt]=Periféricos Name[pt_BR]=Periféricos @@ -150,7 +150,7 @@ Comment[ne]=परिधि Comment[nl]=Randapparaten Comment[nn]=Tilleggseiningar Comment[or]=ପେରିଫେରାଲ -Comment[pa]=ਪਾਰਿਫ਼ਾਰਲ +Comment[pa]=ਪੇਰੀਫ਼ੀਰਲ Comment[pl]=Urządzenia peryferyjne Comment[pt]=Periféricos Comment[pt_BR]=Periféricos diff --git a/phonon/platform_kde/phonon.notifyrc b/phonon/platform_kde/phonon.notifyrc index 447cbfd05..9db99ff96 100644 --- a/phonon/platform_kde/phonon.notifyrc +++ b/phonon/platform_kde/phonon.notifyrc @@ -225,7 +225,7 @@ Comment[nb]=Varsling når utgangsenhet for lyd er endret automatisk Comment[nds]=Bescheed, wenn sik de Klangutgaavreedschap automaatsch ännert hett Comment[nl]=Melding als geluiduitvoerapparaat automatisch is gewijzigd Comment[nn]=Varsling når uteining for lyd vart automatisk endra -Comment[pa]=ਜਦੋਂ ਆਡੀਓ ਆਉਟਪੁੱਤ ਜੰਤਰ ਆਟੋਮੈਟਿਕ ਹੀ ਬਦਲਿਆ ਜਾਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਉ +Comment[pa]=ਜਦੋਂ ਆਡੀਓ ਆਉਟਪੁੱਤ ਜੰਤਰ ਆਟੋਮੈਟਿਕ ਹੀ ਬਦਲਿਆ ਜਾਵੇ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਓ Comment[pl]=Powiadamia, kiedy zmieniło się urządzenie wyjściowe dźwięku Comment[pt]=Notificação quando o dispositivo de saída do áudio mudou automaticamente Comment[pt_BR]=Notificação quando o dispositivo de saída do áudio for alterado automaticamente diff --git a/phonon/platform_kde/phononbackend.desktop b/phonon/platform_kde/phononbackend.desktop index 1577f67f8..5474bf116 100644 --- a/phonon/platform_kde/phononbackend.desktop +++ b/phonon/platform_kde/phononbackend.desktop @@ -53,7 +53,7 @@ Name[nds]=Multimedia-Hülpprogramm för KDE Name[nl]=KDE multimedia-backend Name[nn]=KDE-multimediemotor Name[or]=KDE ବହୁମାଧ୍ଯମ ପୃଷ୍ଠଭୂମି -Name[pa]=KDE ਮਲਟੀਮੀਡਿਆ ਬੈਕਐਡ +Name[pa]=KDE ਮਲਟੀਮੀਡਿਆ ਬੈਕਐਂਡ Name[pl]=Obsługa multimediów Name[pt]=Infra-estrutura Multimédia do KDE Name[pt_BR]=Infraestrutura de multimídia do KDE diff --git a/plasma-windowed/plasma-windowed.desktop b/plasma-windowed/plasma-windowed.desktop index 14c4c32b0..211b53a7c 100755 --- a/plasma-windowed/plasma-windowed.desktop +++ b/plasma-windowed/plasma-windowed.desktop @@ -25,7 +25,7 @@ Name[nb]=Plasma i vindu Name[nds]=Plasma-Finstern Name[nl]=Plasma weergegeven in vensters Name[nn]=Plasma i vindauge -Name[pa]=ਪਲਾਜ਼ਮਾ ਵਿੰਡੋ ਬਣਾਈ +Name[pa]=ਪਲਾਜ਼ਮਾ ਵਿੰਡੋ Name[pl]=Okienkowa Plazma Name[pt]=Plasma em Janelas Name[pt_BR]=Plasma em janelas diff --git a/runners/activities/plasma-runner-activityrunner.desktop b/runners/activities/plasma-runner-activityrunner.desktop index 9b6e31299..7968ccf9c 100644 --- a/runners/activities/plasma-runner-activityrunner.desktop +++ b/runners/activities/plasma-runner-activityrunner.desktop @@ -94,7 +94,7 @@ Comment[nb]=Vis og bytt mellom skrivebordsaktiviteter Comment[nds]=Aktiv Schriefdischakschonen ankieken un wesseln Comment[nl]=Bureaubladactiviteiten laten zien en er tussen schakelen Comment[nn]=Vis og byt mellom skrivebordsaktiviteter -Comment[pa]=ਡੈਸਕਟਾਪ ਸਰਗਰਮੀਆਂ ਵੇਖੋ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਜਾਉ +Comment[pa]=ਡੈਸਕਟਾਪ ਸਰਗਰਮੀਆਂ ਵੇਖੋ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਜਾਓ Comment[pl]=Wypisuje aktywności pulpitu oraz przełącza pomiędzy nimi Comment[pt]=Ver e mudar de actividades no ambiente de trabalho Comment[pt_BR]=Lista e alterna entre as atividades da área de trabalho diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop index c6729df7e..2d37fabae 100644 --- a/runners/windows/plasma-runner-windows.desktop +++ b/runners/windows/plasma-runner-windows.desktop @@ -47,7 +47,7 @@ Name[nb]=Vinduer Name[nds]=Finstern Name[nl]=Vensters Name[nn]=Vindauge -Name[pa]=ਵਿੰਡੋਜ਼ +Name[pa]=ਵਿੰਡੋਆਂ Name[pl]=Okna Name[pt]=Janelas Name[pt_BR]=Janelas @@ -110,7 +110,7 @@ Comment[nb]=List vinduer og skrivebord og bytt mellom dem Comment[nds]=Finstern un Schriefdischen oplisten un wesseln Comment[nl]=Toon vensters en bureaubladen en schakel ze om Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei -Comment[pa]=ਵਿੰਡੋਜ਼ ਅਤੇ ਡੈਸਕਟਾਪ ਦੀ ਲਿਸਟ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਬਦਲੋ +Comment[pa]=ਵਿੰਡੋ ਅਤੇ ਡੈਸਕਟਾਪ ਦੀ ਲਿਸਟ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਬਦਲੋ Comment[pl]=Wypisuje okna i pulpity oraz przełącza pomiędzy nimi Comment[pt]=Listar as janelas e ecrãs e mudar entre eles Comment[pt_BR]=Lista as janelas e áreas de trabalho e alterna entre elas diff --git a/sddm-theme/metadata.desktop b/sddm-theme/metadata.desktop index cbffabfed..a2bc5d173 100644 --- a/sddm-theme/metadata.desktop +++ b/sddm-theme/metadata.desktop @@ -66,6 +66,7 @@ Description[ko]=Breeze Description[lt]=Breeze Description[nl]=Breeze Description[nn]=Breeze +Description[pa]=ਬਰੀਜ਼ Description[pl]=Bryza Description[pt]=Brisa Description[pt_BR]=Breeze diff --git a/statusnotifierwatcher/statusnotifierwatcher.desktop b/statusnotifierwatcher/statusnotifierwatcher.desktop index bb916d640..f6d38e529 100644 --- a/statusnotifierwatcher/statusnotifierwatcher.desktop +++ b/statusnotifierwatcher/statusnotifierwatcher.desktop @@ -95,7 +95,7 @@ Comment[nb]=Håndterer tjenester som tilbyr brukerflater for statusvarsler Comment[nds]=Deensten plegen, de Statusbescheed-Brukerkoppelsteden praatstellt Comment[nl]=Beheert services die statusmeldingen leveren aan gebruikersinterfaces Comment[nn]=Handterer tenester som tilbyr brukargrensesnitt for statusvarslingar -Comment[pa]=ਸਰਵਿਸਾਂ ਦਾ ਪਰਬੰਧ ਕਰਦਾ ਹੈ, ਜੋ ਕਿ ਹਾਲਤ ਨੋਟੀਫਾਇਰ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਦਿੰਦਾ ਹੈ +Comment[pa]=ਸਰਵਿਸਾਂ ਦਾ ਇੰਤਜ਼ਾਮ ਕਰਦਾ ਹੈ, ਜੋ ਕਿ ਹਾਲਤ ਨੋਟੀਫਾਇਰ ਵਰਤੋਂਕਾਰ ਇੰਟਰਫੇਸ ਦਿੰਦਾ ਹੈ Comment[pl]=Zarządzanie usługami, które dostarczają powiadomień o stanie poprzez interfejs użytkownika Comment[pt]=Faz a gestão dos serviços que fornecem interface de notificação do estado Comment[pt_BR]=Gerencia os serviços que fornecem interfaces de notificação do status