kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-30 14:50:12 +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-09 06:33:14 +01:00
parent dadba11572
commit 1b93cbaa8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/org.kde.latte-dock.desktop.cmake
View File

@ -41,7 +41,7 @@ GenericName[de]=Dock
GenericName[el]=Πίνακας
GenericName[en_GB]=Dock
GenericName[es]=Dock
GenericName[it]=Aggancia
GenericName[it]=Aggancio
GenericName[nl]=Dock
GenericName[pl]=Dok
GenericName[pt]=Área Acoplável

2
shell/package/contents/controls/latte-separator.desktop
View File

@ -41,7 +41,7 @@ GenericName[de]=Dock
GenericName[el]=Πίνακας
GenericName[en_GB]=Dock
GenericName[es]=Dock
GenericName[it]=Aggancia
GenericName[it]=Aggancio
GenericName[nl]=Dock
GenericName[pl]=Dok
GenericName[pt]=Área Acoplável