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 2018-02-28 05:21:18 +01:00
parent 0118c0cb96
commit 1f0443532f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/hellopython/metadata.desktop
View File

@ -1,6 +1,10 @@
[Desktop Entry] [Desktop Entry]
Name=Hello Python Name=Hello Python
Name[uk]=Привіт, Python
Name[x-test]=xxHello Pythonxx
Comment=Example Python extension Comment=Example Python extension
Comment[uk]=Приклад розширення мовою Python
Comment[x-test]=xxExample Python extensionxx
Icon= Icon=
Type=Service Type=Service