kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-24 17:33:50 +03:00
Code Issues 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 2018-01-27 04:58:45 +01:00
parent 4212d57ca7
commit d69048cf2f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/latte-layouts.knsrc
View File

@ -3,6 +3,7 @@ Name=Latte Layouts
Name[ca]=Disposicions del Latte
Name[ca@valencia]=Disposicions del Latte
Name[de]=Latte-Profile
Name[es]=Distribuciones de Latte
Name[it]=Disposizioni di Latte
Name[nl]=Latte-indelingen
Name[pl]=Układy Latte