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 2020-06-25 05:46:03 +02:00
parent 3bb9314603
commit 30ca8c3aeb
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

@ -24,6 +24,7 @@ Name[pt]=Falkon
Name[pt_BR]=Falkon
Name[ru]=Falkon
Name[sk]=Falkon
Name[sl]=Falkon
Name[sv]=Falkon
Name[uk]=Falkon
Name[x-test]=xxFalkonxx