mirror of
https://github.com/KDE/latte-dock.git
synced 2024-12-23 01:33:50 +03:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
ec51d21eae
commit
4ae96e718c
@ -22,7 +22,7 @@
|
||||
],
|
||||
"Description": "Shell provided for the Latte Dock",
|
||||
"Description[az]": "Latte Dok paneli üçün nəzərdə tutulan üzlük",
|
||||
"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",
|
||||
@ -40,7 +40,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",
|
||||
|
Loading…
Reference in New Issue
Block a user