From fbf7f956fffeef054e1e67095fd6abb929ad2e56 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 May 2019 05:52:11 +0200 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" --- linux/applications/org.kde.falkon.desktop | 4 ++-- src/lib/adblock/metadata.desktop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 5a3247bc3..febbf24de 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -44,7 +44,7 @@ Comment[id]=Sebuah penelusur web yang cepat dan aman Comment[it]=Un browser web veloce e sicuro Comment[nl]=Een snelle en veilige webbrowser Comment[nn]=Ein kjapp og sikker nettlesar -Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa +Comment[pl]=Szybka i bezpieczna przeglądarka internetowa Comment[pt]=Um navegador Web rápido e seguro Comment[pt_BR]=Um navegar Web rápido e seguro Comment[sk]=Rýchly a bezpečný prehliadač internetu @@ -69,7 +69,7 @@ GenericName[id]=Penelusur Web GenericName[it]=Browser web GenericName[nl]=Webbrowser GenericName[nn]=Nettlesar -GenericName[pl]=Przeglądarka sieciowa +GenericName[pl]=Przeglądarka internetowa GenericName[pt]=Navegador Web GenericName[pt_BR]=Navegador Web GenericName[sk]=Webový prehliadač diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index f40247487..c506b396d 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -38,7 +38,7 @@ Comment[id]=Memblokir konten web yang tak diinginkan Comment[it]=Blocca i contenuti web non desiderati Comment[nl]=Blokkeert niet-gewilde webinhoud Comment[nn]=Blokkerer uønskt vevinnhald -Comment[pl]=Blokuje niechciane treści z sieci +Comment[pl]=Blokuje niechciane treści na stronach WWW Comment[pt]=Bloqueia o conteúdo Web indesejado Comment[pt_BR]=Bloqueie conteúdos web indesejados Comment[sk]=Blokuje nechcený obsah