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"
7 years ago · 3fdd1d95d3
parent 483f5f70b5
commit 3fdd1d95d3
11 changed files with 18 additions and 0 deletions
--- a/src/plugins/KDEFrameworksIntegration/metadata.desktop
+++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop
@ -14,6 +14,7 @@ Name[it]=Integrazione con KDE Frameworks
 Name[ko]=KDE 프레임워크 통합
 Name[nl]=KDE Frameworks integratie
 Name[nn]=Integrering med KDE Frameworks
+Name[pl]=Integracja ze Szkieletami KDE
 Name[pt]=Integração com as Plataformas do KDE
 Name[pt_BR]=Integração com o KDE Frameworks
 Name[sk]=KDE Frameworks Integrácia
@ -37,6 +38,7 @@ Comment[it]=Fornisce un supporto per KIO e per l'immagazzinamento delle password
 Comment[ko]=KIO 지원 및 KWallet에 암호 저장
 Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet
 Comment[nn]=Gjev støtte for KIO og lagring av passord i KWallet
+Comment[pl]=Zapewnia obsługę KIO i przechowywania haseł w KPortfelu
 Comment[pt]=Oferece o suporte para o KIO e guardar as senhas no KWallet
 Comment[pt_BR]=Fornece suporte ao KIO e armazenamento de senhas no KWallet
 Comment[sk]=Poskytuje podporu pre KIO a ukladanie hesiel do KWalletu
--- a/src/scripts/helloqml/metadata.desktop
+++ b/src/scripts/helloqml/metadata.desktop
@ -14,6 +14,7 @@ Name[it]=Hello Qml
 Name[ko]=안녕 QML
 Name[nl]=Hello Qml
 Name[nn]=Hei, QML
+Name[pl]=Hello QML
 Name[pt]=Olá em QML
 Name[pt_BR]=Olá Qml
 Name[sk]=Hello Qml
@ -37,6 +38,7 @@ Comment[it]=Estensione di esempio in Qml
 Comment[ko]=예제 QML 플러그인
 Comment[nl]=Voorbeeld Qml-plug-in
 Comment[nn]=Eksempel på QML-tillegg
+Comment[pl]=Przykładowa wtyczka QML
 Comment[pt]='Plugin' de Exemplo em QML
 Comment[pt_BR]=Plug-in QML de exemplo
 Comment[sk]=Ukážkový QML plugin
--- a/src/scripts/middleclickloader/metadata.desktop
+++ b/src/scripts/middleclickloader/metadata.desktop
@ -14,6 +14,7 @@ Name[it]=Caricatore al clic centrale
 Name[ko]=가운데 단추 누름 로더
 Name[nl]=MiddleClickLoader
 Name[nn]=Lasting med midtklikk
+Name[pl]=MiddleClickLoader
 Name[pt]=MiddleClickLoader
 Name[pt_BR]=CarregadorBotãoMeio
 Name[sk]=MiddleClickLoader
@ -37,6 +38,7 @@ Comment[it]=Carica come URL il testo negli appunti della selezione
 Comment[ko]=선택 클립보드에 있는 텍스트를 URL로 불러오기
 Comment[nl]=Tekst laden in selectieklembord als URL
 Comment[nn]=Last tekst i utvals-utklippstavla som adresser
+Comment[pl]=Wczytaj tekst ze schowka jako adres URL
 Comment[pt]=Carrega o texto na área de transferência da selecção como um URL
 Comment[pt_BR]=Carrega o texto na área de transferência como uma URL
 Comment[sk]=Načítať text vo výbere schránky ako URL
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@ -14,6 +14,7 @@ Name[it]=Dizionario
 Name[ko]=사전
 Name[nl]=Woordenboek
 Name[nn]=Ordliste
+Name[pl]=Słownik
 Name[pt]=Dicionário
 Name[pt_BR]=Dicionário
 Name[sk]=Slovník
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -14,6 +14,7 @@ Name[it]=Google
 Name[ko]=Google
 Name[nl]=Google
 Name[nn]=Google
+Name[pl]=Google
 Name[pt]=Google
 Name[pt_BR]=Google
 Name[sk]=Google
@ -37,6 +38,7 @@ Comment[it]=Cerca con...
 Comment[ko]=다음으로 검색...
 Comment[nl]=Zoeken met...
 Comment[nn]=Søk med …
+Comment[pl]=Szukaj w...
 Comment[pt]=Procurar com...
 Comment[pt_BR]=Pesquisar com...
 Comment[sk]=Hľadať s...
--- a/src/scripts/runaction/actions/mpv.desktop
+++ b/src/scripts/runaction/actions/mpv.desktop
@ -14,6 +14,7 @@ Name[it]=Apri con mpv
 Name[ko]=mpv로 열기
 Name[nl]=Met mpv openen
 Name[nn]=Opna med mpv
+Name[pl]=Otwórz w mpv
 Name[pt]=Abrir com o MPV
 Name[pt_BR]=Abrir com o mpv
 Name[sk]=Otvoriť s mpv
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -14,6 +14,7 @@ Name[it]=TinEye
 Name[ko]=TinEye
 Name[nl]=TinEye
 Name[nn]=TinEye
+Name[pl]=TinEye
 Name[pt]=TinEye
 Name[pt_BR]=TinEye
 Name[sk]=TinEye
@ -37,6 +38,7 @@ Comment[it]=Cerca con...
 Comment[ko]=다음으로 검색...
 Comment[nl]=Zoeken met...
 Comment[nn]=Søk med …
+Comment[pl]=Szukaj w...
 Comment[pt]=Procurar com...
 Comment[pt_BR]=Pesquisar com...
 Comment[sk]=Hľadať s...
--- a/src/scripts/runaction/actions/translate.desktop
+++ b/src/scripts/runaction/actions/translate.desktop
@ -14,6 +14,7 @@ Name[it]=Traduci la pagina
 Name[ko]=웹 페이지 번역하기
 Name[nl]=Pagina vertalen
 Name[nn]=Set om side
+Name[pl]=Przetłumacz stronę
 Name[pt]=Traduzir a página
 Name[pt_BR]=Traduzir página
 Name[sk]=Preložiť stránku
--- a/src/scripts/runaction/actions/w3.desktop
+++ b/src/scripts/runaction/actions/w3.desktop
@ -14,6 +14,7 @@ Name[it]=Convalida la pagina
 Name[ko]=페이지 검사
 Name[nl]=Pagina valideren
 Name[nn]=Valider side
+Name[pl]=Potwierdź stronę
 Name[pt]=Validar a página
 Name[pt_BR]=Validar página
 Name[sk]=Skontrolovať stránku
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -14,6 +14,7 @@ Name[it]=Yandex
 Name[ko]=Yandex
 Name[nl]=Yandex
 Name[nn]=Yandex
+Name[pl]=Yandex
 Name[pt]=Yandex
 Name[pt_BR]=Yandex
 Name[sk]=Yandex
@ -37,6 +38,7 @@ Comment[it]=Cerca con...
 Comment[ko]=다음으로 검색...
 Comment[nl]=Zoeken met...
 Comment[nn]=Søk med …
+Comment[pl]=Szukaj w...
 Comment[pt]=Procurar com...
 Comment[pt_BR]=Pesquisar com...
 Comment[sk]=Hľadať s...
--- a/src/scripts/runaction/metadata.desktop
+++ b/src/scripts/runaction/metadata.desktop
@ -13,6 +13,7 @@ Name[it]=Esegui azione
 Name[ko]=동작 실행
 Name[nl]=Uitvoeractie
 Name[nn]=Køyr handling
+Name[pl]=Wykonaj działanie
 Name[pt]=Executar a Acção
 Name[pt_BR]=Executar ação
 Name[sk]=Spustiť akciu
@ -35,6 +36,7 @@ Comment[it]=Esegue numerose azioni nei siti
 Comment[ko]=사이트에 다양한 동작 실행
 Comment[nl]=Verschillende acties op sites uitvoeren
 Comment[nn]=Køyr ymse handlingar på nettstadar
+Comment[pl]=Wykonuj różne działania na stronach
 Comment[pt]=Executar várias acções nos 'sites'
 Comment[pt_BR]=Executar várias ações nos sites
 Comment[sk]=Spustiť rôzne akcie na stránkach