Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2019-05-12 05:52:11 +02:00
parent fb19df1aa2
commit fbf7f956ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/applications/org.kde.falkon.desktop
View File

@ -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č

2
src/lib/adblock/metadata.desktop
View File

@ -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