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 2020-07-20 08:37:34 +02:00
parent 11297e33e3
commit 641b5350d7
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

@ -12,6 +12,7 @@ Name[es]=Falkon
Name[fi]=Falkon Name[fi]=Falkon
Name[fr]=Falkon Name[fr]=Falkon
Name[gl]=Falkon Name[gl]=Falkon
Name[ia]=Falkon
Name[id]=Falkon Name[id]=Falkon
Name[it]=Falkon Name[it]=Falkon
Name[ko]=Falkon Name[ko]=Falkon