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 2018-01-05 05:02:06 +01:00
parent 30e3f98878
commit 7615773a43
1 changed files with 1 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

@ -9,6 +9,7 @@ Name[de]=Falkon
Name[en_GB]=Falkon
Name[es]=Falkon
Name[fi]=Falkon
Name[fr]=Falkon
Name[nl]=Falkon
Name[pt]=Falkon
Name[sk]=Falkon