alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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 2021-07-02 01:11:12 +00:00
parent d809e9e4dc
commit 76d533df90
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/developerguide/basic/metadata.desktop
View File

@ -4,6 +4,7 @@ Comment[ar]=تطبيق أساسيّ
Comment[az]=Əsas Tətbiqlər
Comment[ca]=Aplicació bàsica
Comment[ca@valencia]=Aplicació bàsica
Comment[cs]=Základní aplikace
Comment[da]=Basal app
Comment[de]=Einfache Anwendung
Comment[en_GB]=Basic App