Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history 
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"
  • Loading branch information
l10n daemon script committed Aug 28, 2024
1 parent 9e3f533 commit 3f43a2e
Show file tree
Hide file tree
Showing 7 changed files with 253 additions and 7 deletions.
29 changes: 28 additions & 1 deletion containment/package/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
{
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar",
"Name[az]": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[cs]": "Michail Vourlakos, Smith Ar",
"Name[en_GB]": "Michail Vourlakos, Smith Ar",
"Name[eo]": "Michail Vourlakos, Smith Ar",
"Name[es]": "Michail Vourlakos, Smith Ar",
"Name[eu]": "Michail Vourlakos, Smith Ar",
"Name[fi]": "Michail Vourlakos, Smith Ar",
"Name[fr]": "Michail Vourlakos, Smith Ar",
"Name[gl]": "Michail Vourlakos, Smith Ar",
"Name[it]": "Michail Vourlakos, Smith Ar",
"Name[ka]": "Michail Vourlakos, Smith Ar",
"Name[ko]": "Michail Vourlakos, Smith Ar",
"Name[nl]": "Michail Vourlakos, Smith Ar",
"Name[nn]": "Michail Vourlakos, Smith Ar",
"Name[pl]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[pt_BR]": "Michail Vourlakos, Smith Ar",
"Name[sl]": "Michail Vourlakos, Smith Ar",
"Name[sv]": "Michail Vourlakos, Smith Ar",
"Name[tr]": "Michail Vourlakos, Smith Ar",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)",
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx"
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx",
"Name[zh_CN]": "Michail Vourlakos, Smith Ar",
"Name[zh_TW]": "Michail Vourlakos, Smith Ar"
}
],
"Category": "",
Expand All @@ -15,6 +39,7 @@
"Description[ca@valencia]": "Contenidor proporcionat per Latte Dock",
"Description[ca]": "Contenidor proporcionat pel Latte Dock",
"Description[cs]": "Kontejner pro Latte Dock",
"Description[en_GB]": "Containment provided for the Latte Dock",
"Description[eo]": "Reteno disponigita por la Latte Doko",
"Description[es]": "Contenedor proporcionado para Latte Dock",
"Description[eu]": "«Latte dock»erako emandako konfinamendua",
Expand Down Expand Up @@ -44,6 +69,7 @@
"Name[ca@valencia]": "Contenidor de Latte",
"Name[ca]": "Contenidor del Latte",
"Name[cs]": "Kontejner Latte",
"Name[en_GB]": "Latte Containment",
"Name[eo]": "Lakto Enteno",
"Name[es]": "Contenedor de Latte",
"Name[eu]": "«Latte» konfinamendua",
Expand All @@ -58,6 +84,7 @@
"Name[pl]": "Pojemnik Latte",
"Name[pt]": "Contentor do Latte",
"Name[pt_BR]": "Contêiner do Latte",
"Name[sk]": "Latte Containment",
"Name[sl]": "Latte zadrževalnik",
"Name[sv]": "Latte-omgivning",
"Name[tr]": "Latte Kapsama",
Expand Down
27 changes: 26 additions & 1 deletion containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[cs]": "Michail Vourlakos",
"Name[en_GB]": "Michail Vourlakos",
"Name[eo]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos",
"Name[eu]": "Michail Vourlakos",
"Name[fi]": "Michail Vourlakos",
"Name[fr]": "Michail Vourlakos",
"Name[gl]": "Michail Vourlakos",
"Name[it]": "Michail Vourlakos",
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
"Name[sl]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[tr]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
"Name[x-test]": "xxMichail Vourlakosxx",
"Name[zh_CN]": "Michail Vourlakos",
"Name[zh_TW]": "Michail Vourlakos"
}
],
"Dependencies": [],
Expand Down Expand Up @@ -47,6 +71,7 @@
"Name[cs]": "Standardní nabídka Latte",
"Name[de]": "Standard-Latte-Menü",
"Name[el]": "Προκαθορισμένο Μενού Latte",
"Name[en_GB]": "Standard Latte Menu",
"Name[eo]": "Norma Lattea Menuo",
"Name[es]": "Menú estándar de Latte",
"Name[et]": "Latte standardmenüü",
Expand Down
60 changes: 59 additions & 1 deletion indicators/default/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[cs]": "Michail Vourlakos",
"Name[en_GB]": "Michail Vourlakos",
"Name[eo]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos",
"Name[eu]": "Michail Vourlakos",
"Name[fi]": "Michail Vourlakos",
"Name[fr]": "Michail Vourlakos",
"Name[gl]": "Michail Vourlakos",
"Name[it]": "Michail Vourlakos",
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
"Name[sl]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[tr]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
"Name[x-test]": "xxMichail Vourlakosxx",
"Name[zh_CN]": "Michail Vourlakos",
"Name[zh_TW]": "Michail Vourlakos"
}
],
"Category": "Latte Indicator",
Expand All @@ -14,6 +38,7 @@
"Description[ca@valencia]": "Indicador predeterminat de Latte",
"Description[ca]": "Indicador predeterminat del Latte",
"Description[cs]": "Výchozí ukazatel Latte",
"Description[en_GB]": "Latte default indicator",
"Description[eo]": "Latte defaŭlta indikilo",
"Description[es]": "Indicador por omisión de Latte",
"Description[eu]": "«Latte» adierazle lehenetsia",
Expand All @@ -40,9 +65,42 @@
"License": "GPL v2+",
"Name": "Latte",
"Name[ar]": "لاتيه",
"Name[az]": "Latte",
"Name[ca@valencia]": "Latte",
"Name[ca]": "Latte",
"Name[cs]": "Latte",
"Name[da]": "Latte",
"Name[de]": "Latte",
"Name[el]": "Latte",
"Name[en_GB]": "Latte",
"Name[eo]": "Latteo",
"Name[es]": "Latte",
"Name[et]": "Latte",
"Name[eu]": "Latte",
"Name[fi]": "Latte",
"Name[fr]": "Latte",
"Name[gl]": "Latte",
"Name[hsb]": "Latte",
"Name[ia]": "Latte",
"Name[id]": "Latte",
"Name[it]": "Latte",
"Name[ka]": "Latte",
"Name[ko]": "Latte",
"Name[lt]": "Latte",
"Name[nl]": "Latte",
"Name[nn]": "Latte",
"Name[pl]": "Latte",
"Name[pt]": "Latte",
"Name[pt_BR]": "Latte",
"Name[ru]": "Latte",
"Name[sk]": "Latte",
"Name[sl]": "Latte",
"Name[sv]": "Latte",
"Name[tr]": "Latte",
"Name[uk]": "Латте",
"Name[x-test]": "xxLattexx",
"Name[zh_CN]": "Latte",
"Name[zh_TW]": "Latte",
"ServiceTypes": [
"Latte/Indicator"
],
Expand Down
56 changes: 55 additions & 1 deletion indicators/org.kde.latte.plasma/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[cs]": "Michail Vourlakos",
"Name[en_GB]": "Michail Vourlakos",
"Name[eo]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos",
"Name[eu]": "Michail Vourlakos",
"Name[fi]": "Michail Vourlakos",
"Name[fr]": "Michail Vourlakos",
"Name[gl]": "Michail Vourlakos",
"Name[it]": "Michail Vourlakos",
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
"Name[sl]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[tr]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
"Name[x-test]": "xxMichail Vourlakosxx",
"Name[zh_CN]": "Michail Vourlakos",
"Name[zh_TW]": "Michail Vourlakos"
}
],
"Category": "Latte Indicator",
Expand All @@ -14,6 +38,7 @@
"Description[ca@valencia]": "Indicador a l'estil Plasma de Latte",
"Description[ca]": "Indicador a l'estil Plasma del Latte",
"Description[cs]": "Ukazatel Latte ve stylu Plasma",
"Description[en_GB]": "Latte Plasma style indicator",
"Description[eo]": "Latte Plasma stila indikilo",
"Description[es]": "Estilo del indicador Plasma Latte",
"Description[eu]": "«Latte» plasma estiloko adierazlea",
Expand All @@ -40,11 +65,40 @@
"License": "GPL v2+",
"Name": "Plasma",
"Name[ar]": "بلازما",
"Name[az]": "Plasma",
"Name[ca@valencia]": "Plasma",
"Name[ca]": "Plasma",
"Name[cs]": "Plasma",
"Name[de]": "Plasma",
"Name[el]": "Plasma",
"Name[en_GB]": "Plasma",
"Name[eo]": "Plasmo",
"Name[es]": "Plasma",
"Name[et]": "Plasma",
"Name[eu]": "Plasma",
"Name[fi]": "Plasma",
"Name[fr]": "Plasma",
"Name[gl]": "Plasma",
"Name[ia]": "Plasma",
"Name[id]": "Plasma",
"Name[it]": "Plasma",
"Name[ka]": "პლაზმა",
"Name[ko]": "Plasma",
"Name[lt]": "Plasma",
"Name[nl]": "Plasma",
"Name[nn]": "Plasma",
"Name[pl]": "Plazma",
"Name[pt]": "Plasma",
"Name[pt_BR]": "Plasma",
"Name[ru]": "Plasma",
"Name[sk]": "Plasma",
"Name[sl]": "Plasma",
"Name[sv]": "Plasma",
"Name[tr]": "Plasma",
"Name[uk]": "Плазма",
"Name[x-test]": "xxPlasmaxx",
"Name[zh_CN]": "Plasma",
"Name[zh_TW]": "Plasma",
"ServiceTypes": [
"Latte/Indicator"
],
Expand Down
28 changes: 27 additions & 1 deletion indicators/org.kde.latte.plasmatabstyle/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos",
"Name[az]": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[cs]": "Michail Vourlakos",
"Name[en_GB]": "Michail Vourlakos",
"Name[eo]": "Michail Vourlakos",
"Name[es]": "Michail Vourlakos",
"Name[eu]": "Michail Vourlakos",
"Name[fi]": "Michail Vourlakos",
"Name[fr]": "Michail Vourlakos",
"Name[gl]": "Michail Vourlakos",
"Name[it]": "Michail Vourlakos",
"Name[ka]": "Michail Vourlakos",
"Name[ko]": "Michail Vourlakos",
"Name[nl]": "Michail Vourlakos",
"Name[nn]": "Michail Vourlakos",
"Name[pl]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[pt_BR]": "Michail Vourlakos",
"Name[sl]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[tr]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
"Name[x-test]": "xxMichail Vourlakosxx",
"Name[zh_CN]": "Michail Vourlakos",
"Name[zh_TW]": "Michail Vourlakos"
}
],
"Category": "Latte Indicator",
Expand All @@ -14,6 +38,7 @@
"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[cs]": "Ukazatel stylu Karet Plasma pro Latte",
"Description[en_GB]": "Plasma Tab style indicator for Latte",
"Description[eo]": "Plasma Tab stilindikilo por Latte",
"Description[es]": "Indicador de estilo de pestaña Plasma para Latte",
"Description[eu]": "«Latte»ako, Plasmako fitxa estiloko adierazlea",
Expand Down Expand Up @@ -44,6 +69,7 @@
"Name[ca@valencia]": "Estil pestanya de Plasma",
"Name[ca]": "Estil pestanya del Plasma",
"Name[cs]": "Styl Karet Plasma",
"Name[en_GB]": "Plasma Tab Style",
"Name[eo]": "Plasma Tab Stilo",
"Name[es]": "Estilo de pestaña Plasma",
"Name[et]": "Plasma kaardistiil",
Expand Down
28 changes: 27 additions & 1 deletion plasmoid/package/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,32 @@
{
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar",
"Name[az]": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[cs]": "Michail Vourlakos, Smith Ar",
"Name[en_GB]": "Michail Vourlakos, Smith Ar",
"Name[eo]": "Michail Vourlakos, Smith Ar",
"Name[es]": "Michail Vourlakos, Smith Ar",
"Name[eu]": "Michail Vourlakos, Smith Ar",
"Name[fi]": "Michail Vourlakos, Smith Ar",
"Name[fr]": "Michail Vourlakos, Smith Ar",
"Name[gl]": "Michail Vourlakos, Smith Ar",
"Name[it]": "Michail Vourlakos, Smith Ar",
"Name[ka]": "Michail Vourlakos, Smith Ar",
"Name[ko]": "Michail Vourlakos, Smith Ar",
"Name[nl]": "Michail Vourlakos, Smith Ar",
"Name[nn]": "Michail Vourlakos, Smith Ar",
"Name[pl]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[pt_BR]": "Michail Vourlakos, Smith Ar",
"Name[sl]": "Michail Vourlakos, Smith Ar",
"Name[sv]": "Michail Vourlakos, Smith Ar",
"Name[tr]": "Michail Vourlakos, Smith Ar",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)",
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx"
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx",
"Name[zh_CN]": "Michail Vourlakos, Smith Ar",
"Name[zh_TW]": "Michail Vourlakos, Smith Ar"
}
],
"Category": "Windows and Tasks",
Expand All @@ -14,6 +38,7 @@
"Description[ca@valencia]": "Plasmoide de tasques de Latte Dock",
"Description[ca]": "Plasmoide de tasques del Latte Dock",
"Description[cs]": "Plasmoid úloh z doku Latte",
"Description[en_GB]": "Tasks plasmoid from Latte Dock",
"Description[eo]": "Taskoj plasmoido de Latte Dock",
"Description[es]": "Plasmoide de tareas de Latte Dock",
"Description[eu]": "Atazen plasmoidea «Latte Dock»etik",
Expand Down Expand Up @@ -45,6 +70,7 @@
"Name[ca]": "Tasques del Latte",
"Name[cs]": "Úlohy Latte",
"Name[el]": "Εργασίες Latte",
"Name[en_GB]": "Latte Tasks",
"Name[eo]": "Latteaj Taskoj",
"Name[es]": "Tareas de Latte",
"Name[et]": "Latte ülesanded",
Expand Down
Loading

0 comments on commit 3f43a2e

Please sign in to comment.