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"
6 years ago · 823442d2ab
parent 02bbef3b50
commit 823442d2ab
5 changed files with 6 additions and 6 deletions
--- a/runners/activities/plasma-runner-activityrunner.desktop
+++ b/runners/activities/plasma-runner-activityrunner.desktop
@ -93,7 +93,7 @@ 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[pl]=Wypisuje i przełącza pomiędzy aktywnościami pulpitu
+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
 Comment[ro]=Vizualizează și schimbă între activitățile biroului
--- a/runners/calculator/plasma-runner-calculator.desktop
+++ b/runners/calculator/plasma-runner-calculator.desktop
@ -130,7 +130,7 @@ Comment[nl]=Expressies berekenen
 Comment[nn]=Grafisk kalkulator
 Comment[or]=ଅଭିବ୍ୟକ୍ତିଗୁଡ଼ିକୁ ଗଣନା କରନ୍ତୁ
 Comment[pa]=ਸਮੀਕਰਨ ਕੱਢੋ
-Comment[pl]=Oblicza wyrażenia
+Comment[pl]=Oblicza wyrażenia matematyczne
 Comment[pt]=Calcular expressões
 Comment[pt_BR]=Calcula expressões
 Comment[ro]=Calculează expresii
--- a/runners/places/plasma-runner-places.desktop
+++ b/runners/places/plasma-runner-places.desktop
@ -111,7 +111,7 @@ Comment[nds]=Reedschappen un Orner-Leestekens opmaken
 Comment[nl]=Apparaten- en mappenbladwijzers openen
 Comment[nn]=Opna einingar og mappebokmerke
 Comment[pa]=ਜੰਤਰ ਅਤੇ ਫੋਲਡਰ ਬੁੱਕਮਾਰਕ ਖੋਲ੍ਹੋ
-Comment[pl]=Otwiera urządzenia i zakładki katalogów
+Comment[pl]=Otwiera urządzenia i katalogi ze skrótów
 Comment[pt]=Abrir os favoritos dos dispositivos e pastas
 Comment[pt_BR]=Abre os favoritos dos dispositivos e pastas
 Comment[ro]=Deschide semne de carte pentru dispozitive și dosare
--- a/runners/powerdevil/plasma-runner-powerdevil.desktop
+++ b/runners/powerdevil/plasma-runner-powerdevil.desktop
@ -47,7 +47,7 @@ Comment[nl]=Basis energiebeheeroperaties
 Comment[nn]=Grunnleggjande straumstyringsfunksjonar
 Comment[or]=ମୌଳିକ ଶକ୍ତି ପରିଚାଳନା ପ୍ରୟୋଗଗୁଡ଼ିକ
 Comment[pa]=ਬੇਸਿਕ ਪਾਵਰ ਮੈਨਿਜਮੈਂਟ ਓਪਰੇਸ਼ਨ
-Comment[pl]=Podstawowe zarządzanie energią
+Comment[pl]=Umożliwia zarządzanie energią
 Comment[pt]=Operações Básicas de Gestão da Energia
 Comment[pt_BR]=Operações básicas de gerenciamento de energia
 Comment[ro]=Operații de bază pentru gestiunea energiei
--- a/systemmonitor/ksysguard.desktop
+++ b/systemmonitor/ksysguard.desktop
@ -37,7 +37,7 @@ Name[nds]=KSysguard
 Name[nl]=KSysguard
 Name[nn]=KSysguard
 Name[pa]=ਕੇ-ਸਿਸਗਾਰਡ
-Name[pl]=KSysguard
+Name[pl]=Monitor Systemu
 Name[pt]=KSysguard
 Name[pt_BR]=KSysguard
 Name[ru]=Запуск системного монитора
@ -82,7 +82,7 @@ Comment[nds]=Röppt KSysGuard mit Strg + Utknieptast op
 Comment[nl]=Start KSysguard bij Ctrl + Escape
 Comment[nn]=Startar KSysGuard ved «Ctrl + Escape»
 Comment[pa]=Ctrl + Escape ਨਾਲ ਕੇਸਿਸ-ਗਾਰਡ ਚੱਲਦਾ ਹੈ
-Comment[pl]=Uruchamia KSysguard na Ctrl + Escape
+Comment[pl]=Uruchamia Monitor Systemu na Ctrl + Escape
 Comment[pt]=Invoca o KSysguard com o Ctrl + Escape
 Comment[pt_BR]=Carrega o KSysguard com o Ctrl + Escape
 Comment[ru]=Запускает системный монитор при нажатии Ctrl+Esc