kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +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 2020-04-13 10:16:55 +02:00
parent ff490a4137
commit dcfbb6a314
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/latte-layouts.knsrc
View File

@ -8,7 +8,7 @@ Name[de]=Latte-Profile
Name[el]=Προφίλ Latte
Name[en_GB]=Latte Layouts
Name[es]=Distribuciones de Latte
Name[eu]=Latte diseinuak
Name[eu]=Latte antolamenduak
Name[fi]=Latte-asettelut
Name[gl]=Disposicións de Latte
Name[id]=Tataletak Latte

2
app/lattedock.notifyrc
View File

@ -235,7 +235,7 @@ Name[de]=Wechsel zu Profil
Name[el]=Εναλλαγή στο προφίλ
Name[en_GB]=Switch to layout
Name[es]=Cambiar a distribución
Name[eu]=Aldatu diseinura
Name[eu]=Aldatu antolamendura
Name[fi]=Vaihda asetteluun
Name[gl]=Cambiar á disposición
Name[id]=Beralih ke tataletak