Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +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-02-24 05:28:07 +01:00
parent 102bd219b7
commit 2860504d6b
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

@ -18,6 +18,7 @@ Name[nn]=Falkon
Name[pl]=Falkon Name[pl]=Falkon
Name[pt]=Falkon Name[pt]=Falkon
Name[pt_BR]=Falkon Name[pt_BR]=Falkon
Name[ru]=Falkon
Name[sk]=Falkon Name[sk]=Falkon
Name[sv]=Falkon Name[sv]=Falkon
Name[uk]=Falkon Name[uk]=Falkon