kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13: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 2022-06-01 01:57:59 +00:00
parent ac3505b076
commit 220b8b98da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/package/metadata.json
View File

@ -20,7 +20,7 @@
}
],
"Description": "Shell provided for the Latte Dock",
"Description[ca@valencia]": "Intèrpret d'ordres proporcionat per Latte Dock",
"Description[ca@valencia]": "Intérpret d'ordres proporcionat per Latte Dock",
"Description[ca]": "Intèrpret d'ordres proporcionat pel Latte Dock",
"Description[es]": "Shell proporcionada para Latte Dock",
"Description[fr]": "Interpréteur de commandes fourni pour le panneau de Latte",
@ -38,7 +38,7 @@
"Name": "Latte Shell",
"Name[ar]": "صدفة لاتيه",
"Name[az]": "Latte Üzlüyü",
"Name[ca@valencia]": "Intèrpret d'ordres de Latte",
"Name[ca@valencia]": "Intérpret d'ordres de Latte",
"Name[ca]": "Intèrpret d'ordres del Latte",
"Name[cs]": "Shell Latte",
"Name[da]": "Latte-skal",