mirror of
https://github.com/KDE/latte-dock.git
synced 2025-03-07 08:58:17 +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
1ac1a76b53
commit
824feedbe2
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
|
||||
"Name": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ar]": "مايكل فورلاكوس، سميث آر",
|
||||
"Name[az]": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ca]": "Michail Vourlakos, Smith Ar",
|
||||
@ -35,6 +36,7 @@
|
||||
"Category": "",
|
||||
"Dependencies": [],
|
||||
"Description": "Containment provided for the Latte Dock",
|
||||
"Description[ar]": "حاوية موفرة لرصيف لاتيه",
|
||||
"Description[az]": "Latte Dok paneli üçün nəzərdə tutulmuş saxlama",
|
||||
"Description[ca@valencia]": "Contenidor proporcionat per Latte Dock",
|
||||
"Description[ca]": "Contenidor proporcionat pel Latte Dock",
|
||||
|
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com",
|
||||
"Name": "Michail Vourlakos",
|
||||
"Name[ar]": "مايكل فورلاكوس",
|
||||
"Name[az]": "Michail Vourlakos",
|
||||
"Name[ca@valencia]": "Michail Vourlakos",
|
||||
"Name[ca]": "Michail Vourlakos",
|
||||
@ -34,6 +35,7 @@
|
||||
],
|
||||
"Dependencies": [],
|
||||
"Description": "The latte menu that normally shows on right-click",
|
||||
"Description[ar]": "قائمة لاتيه التي تظهر في المعتاد عن النقر باليمين",
|
||||
"Description[az]": "Latte menyusu sağ düyməyə vurduqda normal göstərilir",
|
||||
"Description[ca@valencia]": "El menú Latte que es mostra normalment amb un clic del botó dret",
|
||||
"Description[ca]": "El menú Latte que es mostra normalment amb un clic del botó dret",
|
||||
|
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com",
|
||||
"Name": "Michail Vourlakos",
|
||||
"Name[ar]": "مايكل فورلاكوس",
|
||||
"Name[az]": "Michail Vourlakos",
|
||||
"Name[ca@valencia]": "Michail Vourlakos",
|
||||
"Name[ca]": "Michail Vourlakos",
|
||||
@ -34,6 +35,7 @@
|
||||
],
|
||||
"Category": "Latte Indicator",
|
||||
"Description": "Latte default indicator",
|
||||
"Description[ar]": "مؤشر لاتيه المبدئي",
|
||||
"Description[az]": "Latte standart göstəricisi",
|
||||
"Description[ca@valencia]": "Indicador predeterminat de Latte",
|
||||
"Description[ca]": "Indicador predeterminat del Latte",
|
||||
|
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com",
|
||||
"Name": "Michail Vourlakos",
|
||||
"Name[ar]": "مايكل فورلاكوس",
|
||||
"Name[az]": "Michail Vourlakos",
|
||||
"Name[ca@valencia]": "Michail Vourlakos",
|
||||
"Name[ca]": "Michail Vourlakos",
|
||||
@ -34,6 +35,7 @@
|
||||
],
|
||||
"Category": "Latte Indicator",
|
||||
"Description": "Latte Plasma style indicator",
|
||||
"Description[ar]": "مؤشر نمط بلازما لاتيه",
|
||||
"Description[az]": "Latte Plasma üslubu göstəricisi",
|
||||
"Description[ca@valencia]": "Indicador a l'estil Plasma de Latte",
|
||||
"Description[ca]": "Indicador a l'estil Plasma del Latte",
|
||||
|
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com",
|
||||
"Name": "Michail Vourlakos",
|
||||
"Name[ar]": "مايكل فورلاكوس",
|
||||
"Name[az]": "Michail Vourlakos",
|
||||
"Name[ca@valencia]": "Michail Vourlakos",
|
||||
"Name[ca]": "Michail Vourlakos",
|
||||
@ -34,6 +35,7 @@
|
||||
],
|
||||
"Category": "Latte Indicator",
|
||||
"Description": "Plasma Tab style indicator for Latte",
|
||||
"Description[ar]": "مؤشر نمط ألسنة بلازما للاتيه",
|
||||
"Description[az]": "Latte üçün Plasma Vərəq Üslubu göstəricisi",
|
||||
"Description[ca@valencia]": "Indicador a l'estil pestanya de Plasma per a Latte",
|
||||
"Description[ca]": "Indicador a l'estil pestanya del Plasma per al Latte",
|
||||
|
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
|
||||
"Name": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ar]": "مايكل فورلاكوس، سميث آر",
|
||||
"Name[az]": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ca]": "Michail Vourlakos, Smith Ar",
|
||||
@ -34,6 +35,7 @@
|
||||
],
|
||||
"Category": "Windows and Tasks",
|
||||
"Description": "Tasks plasmoid from Latte Dock",
|
||||
"Description[ar]": "بلازمويد المهام من رصيف لاتيه",
|
||||
"Description[az]": "Latte Dokdan Tapşırıqlar plasmoidi",
|
||||
"Description[ca@valencia]": "Plasmoide de tasques de Latte Dock",
|
||||
"Description[ca]": "Plasmoide de tasques del Latte Dock",
|
||||
|
@ -4,6 +4,7 @@
|
||||
{
|
||||
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
|
||||
"Name": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ar]": "مايكل فورلاكوس، سميث آر",
|
||||
"Name[az]": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
|
||||
"Name[ca]": "Michail Vourlakos, Smith Ar",
|
||||
@ -33,6 +34,7 @@
|
||||
}
|
||||
],
|
||||
"Description": "Shell provided for the Latte Dock",
|
||||
"Description[ar]": "صدفة موفرة لرصيف لاتيه",
|
||||
"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]": "Intèrpret d'ordres proporcionat pel Latte Dock",
|
||||
|
Loading…
x
Reference in New Issue
Block a user