Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52: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-03-01 05:29:40 +01:00
parent 05acda3da3
commit d61b117959
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,8 +1,12 @@
[Desktop Entry] [Desktop Entry]
Name=Hello Python Name=Hello Python
Name[pt]=Olá em Python
Name[sv]=Hej Python
Name[uk]=Привіт, Python Name[uk]=Привіт, Python
Name[x-test]=xxHello Pythonxx Name[x-test]=xxHello Pythonxx
Comment=Example Python extension Comment=Example Python extension
Comment[pt]=Extensão de exemplo em Python
Comment[sv]=Exempel på Python-utökning
Comment[uk]=Приклад розширення мовою Python Comment[uk]=Приклад розширення мовою Python
Comment[x-test]=xxExample Python extensionxx Comment[x-test]=xxExample Python extensionxx