kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-12 17:17: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 2021-05-15 01:19:32 +00:00
parent 53aad2f979
commit 09de9c13df
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
containment/metadata.desktop.cmake
View File

@ -5,6 +5,7 @@ Name[az]=Latte əhatəsi
Name[ca]=Contenidor del Latte
Name[ca@valencia]=Contenidor del Latte
Name[es]=Contenedor de Latte
Name[fr]=Conteneur pour Latte
Name[nl]=Latte-container
Name[pl]=Pojemnik Latte
Name[pt]=Contentor do Latte

1
containment/package/metadata.desktop
View File

@ -5,6 +5,7 @@ Name[az]=Latte əhatəsi
Name[ca]=Contenidor del Latte
Name[ca@valencia]=Contenidor del Latte
Name[es]=Contenedor de Latte
Name[fr]=Conteneur pour Latte
Name[nl]=Latte-container
Name[pl]=Pojemnik Latte
Name[pt]=Contentor do Latte