kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 01: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-16 01:55:13 +00:00
parent 2157c0d455
commit 73abdf7a13
7 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containment/package/metadata.json
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org", "Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar", "Name": "Michail Vourlakos, Smith Ar",
"Name[az]": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[es]": "Michail Vourlakos, Smith Ar", "Name[es]": "Michail Vourlakos, Smith Ar",
@ -22,6 +23,7 @@
"Category": "", "Category": "",
"Dependencies": [], "Dependencies": [],
"Description": "Containment provided for the Latte Dock", "Description": "Containment provided for the Latte Dock",
"Description[az]": "Latte Dok paneli üçün nəzərdə tutulmuş saxlama",
"Description[ca@valencia]": "Contenidor proporcionat per Latte Dock", "Description[ca@valencia]": "Contenidor proporcionat per Latte Dock",
"Description[ca]": "Contenidor proporcionat pel Latte Dock", "Description[ca]": "Contenidor proporcionat pel Latte Dock",
"Description[es]": "Contenedor proporcionado para Latte Dock", "Description[es]": "Contenedor proporcionado para Latte Dock",

2
containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com", "Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos", "Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos",
@ -21,6 +22,7 @@
], ],
"Dependencies": [], "Dependencies": [],
"Description": "The latte menu that normally shows on right-click", "Description": "The latte menu that normally shows on right-click",
"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@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", "Description[ca]": "El menú Latte que es mostra normalment amb un clic del botó dret",
"Description[es]": "Este es el menú de Latte que normalmente se muestra tras un clic derecho", "Description[es]": "Este es el menú de Latte que normalmente se muestra tras un clic derecho",

2
indicators/default/metadata.json
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com", "Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos", "Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos",
@ -21,6 +22,7 @@
], ],
"Category": "Latte Indicator", "Category": "Latte Indicator",
"Description": "Latte default indicator", "Description": "Latte default indicator",
"Description[az]": "Latte standart göstəricisi",
"Description[ca@valencia]": "Indicador predeterminat de Latte", "Description[ca@valencia]": "Indicador predeterminat de Latte",
"Description[ca]": "Indicador predeterminat del Latte", "Description[ca]": "Indicador predeterminat del Latte",
"Description[es]": "Indicador por omisión de Latte", "Description[es]": "Indicador por omisión de Latte",

2
indicators/org.kde.latte.plasma/metadata.json
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com", "Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos", "Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos",
@ -21,6 +22,7 @@
], ],
"Category": "Latte Indicator", "Category": "Latte Indicator",
"Description": "Latte Plasma style indicator", "Description": "Latte Plasma style indicator",
"Description[az]": "Latte Plasma üslubu göstəricisi",
"Description[ca@valencia]": "Indicador a l'estil Plasma de Latte", "Description[ca@valencia]": "Indicador a l'estil Plasma de Latte",
"Description[ca]": "Indicador a l'estil Plasma del Latte", "Description[ca]": "Indicador a l'estil Plasma del Latte",
"Description[es]": "Estilo del indicador Plasma Latte", "Description[es]": "Estilo del indicador Plasma Latte",

2
indicators/org.kde.latte.plasmatabstyle/metadata.json
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com", "Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos", "Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos", "Name[es]": "Michail Vourlakos",
@ -21,6 +22,7 @@
], ],
"Category": "Latte Indicator", "Category": "Latte Indicator",
"Description": "Plasma Tab style indicator for Latte", "Description": "Plasma Tab style indicator for Latte",
"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@valencia]": "Indicador a l'estil pestanya de Plasma per a Latte",
"Description[ca]": "Indicador a l'estil pestanya del Plasma per al Latte", "Description[ca]": "Indicador a l'estil pestanya del Plasma per al Latte",
"Description[es]": "Indicador de estilo de pestaña Plasma para Latte", "Description[es]": "Indicador de estilo de pestaña Plasma para Latte",

2
plasmoid/metadata.json.in
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org", "Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar", "Name": "Michail Vourlakos, Smith Ar",
"Name[az]": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[es]": "Michail Vourlakos, Smith Ar", "Name[es]": "Michail Vourlakos, Smith Ar",
@ -21,6 +22,7 @@
], ],
"Category": "Windows and Tasks", "Category": "Windows and Tasks",
"Description": "Tasks plasmoid from Latte Dock", "Description": "Tasks plasmoid from Latte Dock",
"Description[az]": "Latte Dokdan Tapşırılar plasmoidi",
"Description[ca@valencia]": "Plasmoide de tasques de Latte Dock", "Description[ca@valencia]": "Plasmoide de tasques de Latte Dock",
"Description[ca]": "Plasmoide de tasques del Latte Dock", "Description[ca]": "Plasmoide de tasques del Latte Dock",
"Description[es]": "Plasmoide de tareas de Latte Dock", "Description[es]": "Plasmoide de tareas de Latte Dock",

2
shell/package/metadata.json
View File

@ -4,6 +4,7 @@
{ {
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org", "Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar", "Name": "Michail Vourlakos, Smith Ar",
"Name[az]": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[es]": "Michail Vourlakos, Smith Ar", "Name[es]": "Michail Vourlakos, Smith Ar",
@ -20,6 +21,7 @@
} }
], ],
"Description": "Shell provided for the Latte Dock", "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[ca]": "Intèrpret d'ordres proporcionat pel Latte Dock",
"Description[es]": "Shell proporcionada para Latte Dock", "Description[es]": "Shell proporcionada para Latte Dock",