Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02: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 2017-09-06 08:25:21 +02:00
parent a9add1b568
commit ca377a0d65
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux/applications/org.kde.Falkon.desktop
View File

@ -34,6 +34,7 @@ GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web
GenericName[cs]=Webový prohlížeč
GenericName[es]=Navegador web
GenericName[fr]=Navigateur Web
GenericName[nl]=Webbrowser
GenericName[pt]=Navegador Web
GenericName[sk]=Webový prehliadač

1
src/lib/data/breeze-fallback/index.theme
View File

@ -6,6 +6,7 @@ Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[cs]=Breeze
Name[es]=Brisa
Name[fr]=Brise
Name[nl]=Breeze
Name[pt]=Brisa
Name[sk]=Vánok